pool/QR-Code-generator
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1125245 from home:ecsos:python

Browse Source 
- 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
This commit is contained in:
Danilo Spinella 2023-11-17 10:52:50 +00:00 committed by Git OBS Bridge
parent d6aa3cd03d
commit 9f0aa91e5b
7 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0003-Generate-both-shared-and-static-libraries.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Generate both shared and static libraries
cpp/Makefile | 14 ++++++++++---- cpp/Makefile | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-) 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.8.0.orig/c/Makefile
+++ QR-Code-generator-1.6.0/c/Makefile +++ QR-Code-generator-1.8.0/c/Makefile
@@ -51,16 +51,19 @@ CFLAGS += -std=c99 -O @@ -51,16 +51,19 @@ CFLAGS += -std=c99 -O
# ---- Targets to build ---- # ---- 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 +# Bump the soname number when the ABI changes and gets incompatible
+SO_NAME = $(LIBFILE).1 +SO_NAME = $(LIBFILE).1
LIBOBJ = qrcodegen.o LIBOBJ = qrcodegen.o
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker MAINS = qrcodegen-demo qrcodegen-test
# Build all binaries # Build all binaries
-all: $(LIBFILE) $(MAINS) -all: $(LIBFILE) $(MAINS)
@ -36,7 +36,7 @@ Index: QR-Code-generator-1.6.0/c/Makefile
# Executable files # Executable files
@@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOB @@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOB
$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^ $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^
# The library # The library
-$(LIBFILE): $(LIBOBJ) -$(LIBFILE): $(LIBOBJ)
@ -49,25 +49,25 @@ Index: QR-Code-generator-1.6.0/c/Makefile
# Object files # Object files
%.o: %.c .deps/timestamp %.o: %.c .deps/timestamp
$(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< $(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.8.0.orig/cpp/Makefile
+++ QR-Code-generator-1.6.0/cpp/Makefile +++ QR-Code-generator-1.8.0/cpp/Makefile
@@ -51,16 +51,19 @@ CXXFLAGS += -std=c++11 -O @@ -51,16 +51,19 @@ CXXFLAGS += -std=c++11 -O
# ---- Targets to build ---- # ---- Targets to build ----
LIB = qrcodegen LIB = qrcodegencpp
-LIBFILE = lib$(LIB).a -LIBFILE = lib$(LIB).a
+ARFILE = lib$(LIB).a +ARFILE = lib$(LIB).a
+LIBFILE = lib$(LIB).so +LIBFILE = lib$(LIB).so
+# Bump the soname number when the ABI changes and gets incompatible +# Bump the soname number when the ABI changes and gets incompatible
+SO_NAME = $(LIBFILE).1 +SO_NAME = $(LIBFILE).1
LIBOBJ = QrCode.o LIBOBJ = qrcodegen.o
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker MAINS = QrCodeGeneratorDemo
# Build all binaries # Build all binaries
-all: $(LIBFILE) $(MAINS) -all: $(LIBFILE) $(MAINS)
+all: $(ARFILE) $(LIBFILE) $(MAINS) +all: $(LIBFILE) $(LIBFILE) $(MAINS)
# Delete build output # Delete build output
clean: clean:
@ -77,7 +77,7 @@ Index: QR-Code-generator-1.6.0/cpp/Makefile
# Executable files # Executable files
@@ -68,9 +71,12 @@ clean: @@ -68,9 +71,12 @@ clean:
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
# The library # The library
-$(LIBFILE): $(LIBOBJ) -$(LIBFILE): $(LIBOBJ)

30
0004-Create-install-targets-for-C-and-CPP.patch
View File

@ -8,16 +8,16 @@ Subject: [PATCH 4/5] Create install targets for C and CPP
cpp/Makefile | 27 +++++++++++++++++++++++++++ cpp/Makefile | 27 +++++++++++++++++++++++++++
2 files changed, 53 insertions(+) 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.8.0.orig/c/Makefile
+++ QR-Code-generator-1.6.0/c/Makefile +++ QR-Code-generator-1.8.0/c/Makefile
@@ -34,6 +34,8 @@ CFLAGS += -std=c99 -O @@ -34,6 +34,8 @@ CFLAGS += -std=c99 -O
# Extra flags for diagnostics: # Extra flags for diagnostics:
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
+# Version information +# Version information
+VERSION = 1.5.0 +VERSION = 1.8.0
# ---- Controlling make ---- # ---- Controlling make ----
@ -28,7 +28,7 @@ Index: QR-Code-generator-1.6.0/c/Makefile
+REAL_NAME = $(LIBFILE).$(VERSION) +REAL_NAME = $(LIBFILE).$(VERSION)
+HEADERS = qrcodegen.h +HEADERS = qrcodegen.h
LIBOBJ = qrcodegen.o LIBOBJ = qrcodegen.o
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker MAINS = qrcodegen-demo qrcodegen-test
+# define paths to install +# define paths to install
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen +INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
@ -61,17 +61,17 @@ Index: QR-Code-generator-1.6.0/c/Makefile
+ +
# Executable files # Executable files
%: %.o $(LIBFILE) %: %.o $(LIBFILE)
$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
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.8.0.orig/cpp/Makefile
+++ QR-Code-generator-1.6.0/cpp/Makefile +++ QR-Code-generator-1.8.0/cpp/Makefile
@@ -34,6 +34,8 @@ CXXFLAGS += -std=c++11 -O @@ -34,6 +34,8 @@ CXXFLAGS += -std=c++11 -O
# Extra flags for diagnostics: # Extra flags for diagnostics:
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
+# Version information +# Version information
+VERSION = 1.5.0 +VERSION = 1.8.0
# ---- Controlling make ---- # ---- 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 # Bump the soname number when the ABI changes and gets incompatible
SO_NAME = $(LIBFILE).1 SO_NAME = $(LIBFILE).1
+REAL_NAME = $(LIBFILE).$(VERSION) +REAL_NAME = $(LIBFILE).$(VERSION)
+HEADERS = QrCode.hpp +HEADERS = qrcodegen.hpp
LIBOBJ = QrCode.o LIBOBJ = qrcodegen.o
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker MAINS = QrCodeGeneratorDemo
+# define paths to install +# define paths to install
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen +INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
+LIBDIR ?= $(DESTDIR)/usr/lib +LIBDIR ?= $(DESTDIR)/usr/lib
+ +
# Build all binaries # Build all binaries
all: $(ARFILE) $(LIBFILE) $(MAINS) all: $(LIBFILE) $(LIBFILE) $(MAINS)
@@ -66,6 +74,24 @@ clean: @@ -66,6 +74,24 @@ clean:
rm -f -- $(LIBOBJ) $(ARFILE) $(LIBFILE) $(MAINS:=.o) $(MAINS) rm -f -- $(LIBOBJ) $(ARFILE) $(LIBFILE) $(MAINS:=.o) $(MAINS)
@ -115,4 +115,4 @@ Index: QR-Code-generator-1.6.0/cpp/Makefile
+ +
# Executable files # Executable files
%: %.o $(LIBFILE) %: %.o $(LIBFILE)
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)

22
0005-Rename-cpp-library-to-qrcodegencpp-to-avoid-conflict.patch
View File

@ -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?= <tchvatal@suse.com>
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

10
QR-Code-generator.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Nov 12 12:17:20 UTC 2023 - ecsos <ecsos@opensuse.org>
- 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 <dmueller@suse.com> Mon Mar 8 23:39:10 UTC 2021 - Dirk Müller <dmueller@suse.com>

7
QR-Code-generator.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package QR-Code-generator # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 libcname libqrcodegen1
%define libcppname libqrcodegencpp1 %define libcppname libqrcodegencpp1
%{?sle15_python_module_pythons}
Name: QR-Code-generator Name: QR-Code-generator
Version: 1.6.0 Version: 1.8.0
Release: 0 Release: 0
Summary: QR Code generator library Summary: QR Code generator library
License: MIT 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 Patch2: 0002-Make-use-of-fPIC-parameter-when-building.patch
Patch3: 0003-Generate-both-shared-and-static-libraries.patch Patch3: 0003-Generate-both-shared-and-static-libraries.patch
Patch4: 0004-Create-install-targets-for-C-and-CPP.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: %{python_module setuptools}
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros

3
v1.6.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8
size 135432

3
v1.8.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60
size 193288