From 9f0aa91e5b6f497283358621b81759d51968b6a593ecb017b1df879d5bf25983 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 17 Nov 2023 10:52:50 +0000 Subject: [PATCH] Accepting request 1125245 from home:ecsos:python - Update to 1.8.0 * https://github.com/nayuki/QR-Code-generator/compare/v1.6.0...v1.8.0 - Rebase 0003-Generate-both-shared-and-static-libraries.patch - Rebase 0004-Create-install-targets-for-C-and-CPP.patch - Drop 0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch - Add %{?sle15_python_module_pythons} OBS-URL: https://build.opensuse.org/request/show/1125245 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/QR-Code-generator?expand=0&rev=8 --- ...ate-both-shared-and-static-libraries.patch | 26 ++++++++-------- ...Create-install-targets-for-C-and-CPP.patch | 30 +++++++++---------- ...ry-to-qrcodegencpp-to-avoid-conflict.patch | 22 -------------- QR-Code-generator.changes | 10 +++++++ QR-Code-generator.spec | 7 ++--- v1.6.0.tar.gz | 3 -- v1.8.0.tar.gz | 3 ++ 7 files changed, 44 insertions(+), 57 deletions(-) delete mode 100644 0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch delete mode 100644 v1.6.0.tar.gz create mode 100644 v1.8.0.tar.gz diff --git a/0003-Generate-both-shared-and-static-libraries.patch b/0003-Generate-both-shared-and-static-libraries.patch index 7af923e..37fc05e 100644 --- a/0003-Generate-both-shared-and-static-libraries.patch +++ b/0003-Generate-both-shared-and-static-libraries.patch @@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Generate both shared and static libraries cpp/Makefile | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) -Index: QR-Code-generator-1.6.0/c/Makefile +Index: QR-Code-generator-1.8.0/c/Makefile =================================================================== ---- QR-Code-generator-1.6.0.orig/c/Makefile -+++ QR-Code-generator-1.6.0/c/Makefile +--- QR-Code-generator-1.8.0.orig/c/Makefile ++++ QR-Code-generator-1.8.0/c/Makefile @@ -51,16 +51,19 @@ CFLAGS += -std=c99 -O # ---- Targets to build ---- @@ -22,7 +22,7 @@ Index: QR-Code-generator-1.6.0/c/Makefile +# Bump the soname number when the ABI changes and gets incompatible +SO_NAME = $(LIBFILE).1 LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker + MAINS = qrcodegen-demo qrcodegen-test # Build all binaries -all: $(LIBFILE) $(MAINS) @@ -36,7 +36,7 @@ Index: QR-Code-generator-1.6.0/c/Makefile # Executable files @@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOB - $(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ # The library -$(LIBFILE): $(LIBOBJ) @@ -49,25 +49,25 @@ Index: QR-Code-generator-1.6.0/c/Makefile # Object files %.o: %.c .deps/timestamp $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< -Index: QR-Code-generator-1.6.0/cpp/Makefile +Index: QR-Code-generator-1.8.0/cpp/Makefile =================================================================== ---- QR-Code-generator-1.6.0.orig/cpp/Makefile -+++ QR-Code-generator-1.6.0/cpp/Makefile +--- QR-Code-generator-1.8.0.orig/cpp/Makefile ++++ QR-Code-generator-1.8.0/cpp/Makefile @@ -51,16 +51,19 @@ CXXFLAGS += -std=c++11 -O # ---- Targets to build ---- - LIB = qrcodegen + LIB = qrcodegencpp -LIBFILE = lib$(LIB).a +ARFILE = lib$(LIB).a +LIBFILE = lib$(LIB).so +# Bump the soname number when the ABI changes and gets incompatible +SO_NAME = $(LIBFILE).1 - LIBOBJ = QrCode.o - MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker + LIBOBJ = qrcodegen.o + MAINS = QrCodeGeneratorDemo # Build all binaries -all: $(LIBFILE) $(MAINS) -+all: $(ARFILE) $(LIBFILE) $(MAINS) ++all: $(LIBFILE) $(LIBFILE) $(MAINS) # Delete build output clean: @@ -77,7 +77,7 @@ Index: QR-Code-generator-1.6.0/cpp/Makefile # Executable files @@ -68,9 +71,12 @@ clean: - $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) # The library -$(LIBFILE): $(LIBOBJ) diff --git a/0004-Create-install-targets-for-C-and-CPP.patch b/0004-Create-install-targets-for-C-and-CPP.patch index a243ea2..1b4ba7f 100644 --- a/0004-Create-install-targets-for-C-and-CPP.patch +++ b/0004-Create-install-targets-for-C-and-CPP.patch @@ -8,16 +8,16 @@ Subject: [PATCH 4/5] Create install targets for C and CPP cpp/Makefile | 27 +++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) -Index: QR-Code-generator-1.6.0/c/Makefile +Index: QR-Code-generator-1.8.0/c/Makefile =================================================================== ---- QR-Code-generator-1.6.0.orig/c/Makefile -+++ QR-Code-generator-1.6.0/c/Makefile +--- QR-Code-generator-1.8.0.orig/c/Makefile ++++ QR-Code-generator-1.8.0/c/Makefile @@ -34,6 +34,8 @@ CFLAGS += -std=c99 -O # Extra flags for diagnostics: # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +# Version information -+VERSION = 1.5.0 ++VERSION = 1.8.0 # ---- Controlling make ---- @@ -28,7 +28,7 @@ Index: QR-Code-generator-1.6.0/c/Makefile +REAL_NAME = $(LIBFILE).$(VERSION) +HEADERS = qrcodegen.h LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker + MAINS = qrcodegen-demo qrcodegen-test +# define paths to install +INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen @@ -61,17 +61,17 @@ Index: QR-Code-generator-1.6.0/c/Makefile + # Executable files %: %.o $(LIBFILE) - $(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB) -Index: QR-Code-generator-1.6.0/cpp/Makefile + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) +Index: QR-Code-generator-1.8.0/cpp/Makefile =================================================================== ---- QR-Code-generator-1.6.0.orig/cpp/Makefile -+++ QR-Code-generator-1.6.0/cpp/Makefile +--- QR-Code-generator-1.8.0.orig/cpp/Makefile ++++ QR-Code-generator-1.8.0/cpp/Makefile @@ -34,6 +34,8 @@ CXXFLAGS += -std=c++11 -O # Extra flags for diagnostics: # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +# Version information -+VERSION = 1.5.0 ++VERSION = 1.8.0 # ---- Controlling make ---- @@ -80,16 +80,16 @@ Index: QR-Code-generator-1.6.0/cpp/Makefile # Bump the soname number when the ABI changes and gets incompatible SO_NAME = $(LIBFILE).1 +REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = QrCode.hpp - LIBOBJ = QrCode.o - MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker ++HEADERS = qrcodegen.hpp + LIBOBJ = qrcodegen.o + MAINS = QrCodeGeneratorDemo +# define paths to install +INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen +LIBDIR ?= $(DESTDIR)/usr/lib + # Build all binaries - all: $(ARFILE) $(LIBFILE) $(MAINS) + all: $(LIBFILE) $(LIBFILE) $(MAINS) @@ -66,6 +74,24 @@ clean: rm -f -- $(LIBOBJ) $(ARFILE) $(LIBFILE) $(MAINS:=.o) $(MAINS) @@ -115,4 +115,4 @@ Index: QR-Code-generator-1.6.0/cpp/Makefile + # Executable files %: %.o $(LIBFILE) - $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) diff --git a/0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch b/0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch deleted file mode 100644 index e5ab9c6..0000000 --- a/0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ac482f00f1ad08ba692a24ef5abffe31b659c1d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 12:50:39 +0100 -Subject: [PATCH 5/5] Rename cpp library to qrcodegencpp to avoid conflict - ---- - cpp/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: QR-Code-generator-1.6.0/cpp/Makefile -=================================================================== ---- QR-Code-generator-1.6.0.orig/cpp/Makefile -+++ QR-Code-generator-1.6.0/cpp/Makefile -@@ -52,7 +52,7 @@ VERSION = 1.5.0 - - # ---- Targets to build ---- - --LIB = qrcodegen -+LIB = qrcodegencpp - ARFILE = lib$(LIB).a - LIBFILE = lib$(LIB).so - # Bump the soname number when the ABI changes and gets incompatible diff --git a/QR-Code-generator.changes b/QR-Code-generator.changes index 1a9c45a..932c0cf 100644 --- a/QR-Code-generator.changes +++ b/QR-Code-generator.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Nov 12 12:17:20 UTC 2023 - ecsos + +- Update to 1.8.0 + * https://github.com/nayuki/QR-Code-generator/compare/v1.6.0...v1.8.0 +- Rebase 0003-Generate-both-shared-and-static-libraries.patch +- Rebase 0004-Create-install-targets-for-C-and-CPP.patch +- Drop 0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch +- Add %{?sle15_python_module_pythons} + ------------------------------------------------------------------- Mon Mar 8 23:39:10 UTC 2021 - Dirk Müller diff --git a/QR-Code-generator.spec b/QR-Code-generator.spec index 86fca15..e0a586c 100644 --- a/QR-Code-generator.spec +++ b/QR-Code-generator.spec @@ -1,7 +1,7 @@ # # spec file for package QR-Code-generator # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define libcname libqrcodegen1 %define libcppname libqrcodegencpp1 +%{?sle15_python_module_pythons} Name: QR-Code-generator -Version: 1.6.0 +Version: 1.8.0 Release: 0 Summary: QR Code generator library License: MIT @@ -29,7 +29,6 @@ Source: https://github.com/nayuki/QR-Code-generator/archive/v%{version}. Patch2: 0002-Make-use-of-fPIC-parameter-when-building.patch Patch3: 0003-Generate-both-shared-and-static-libraries.patch Patch4: 0004-Create-install-targets-for-C-and-CPP.patch -Patch5: 0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch BuildRequires: %{python_module setuptools} BuildRequires: gcc-c++ BuildRequires: python-rpm-macros diff --git a/v1.6.0.tar.gz b/v1.6.0.tar.gz deleted file mode 100644 index 0f7c322..0000000 --- a/v1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8 -size 135432 diff --git a/v1.8.0.tar.gz b/v1.8.0.tar.gz new file mode 100644 index 0000000..3ee9b3c --- /dev/null +++ b/v1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60 +size 193288