[rpms/qr-code-generator] epel10.3: Updated to version 1.7.0. Switched to CMake build system.

[rpms/qr-code-generator] epel10.3: Updated to version 1.7.0. Switched to CMake build system.

[Vitaly Zaitsev]

A new commit has been pushed.

Repo   : rpms/qr-code-generator
Branch : epel10.3
Commit : d495e2ac644cb0a062f7939bf5eda66a888ecb88
Author : Vitaly Zaitsev <vitaly@easycoding.org>
Date   : 2021-08-09T16:53:24+02:00
Stats  : +26/-177 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/qr-code-generator/c/d495e2ac644cb0a062f7939bf5eda66a888ecb88?branch=epel10.3

Log:
Updated to version 1.7.0. Switched to CMake build system.

---
diff --git a/.gitignore b/.gitignore
index f05f10b..b8dd9b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /qr-code-generator-67c6246.tar.gz
 /qr-code-generator-1.6.0.tar.gz
+/qr-code-generator-1.7.0.tar.gz
+/qrcodegen-cmake-1.7.0.tar.gz

diff --git a/qr-code-generator-build-fixes.patch b/qr-code-generator-build-fixes.patch
deleted file mode 100644
index 06c19c9..0000000
--- a/qr-code-generator-build-fixes.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/c/Makefile b/c/Makefile
-index fd0c367..e3a60ad 100644
---- a/c/Makefile
-+++ b/c/Makefile
-@@ -29,11 +29,13 @@
- # - CFLAGS: Any extra user-specified compiler flags (can be blank).
- 
- # Recommended compiler flags:
--CFLAGS += -std=c99 -O
-+CFLAGS += -std=c99
- 
- # Extra flags for diagnostics:
- # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
- 
-+# Version information
-+VERSION = 1.6.0
- 
- # ---- Controlling make ----
- 
-@@ -51,10 +53,18 @@ CFLAGS += -std=c99 -O
- # ---- Targets to build ----
- 
- LIB = qrcodegen
--LIBFILE = lib$(LIB).a
-+LIBFILE = lib$(LIB).so
-+# Bump the soname number when the ABI changes and gets incompatible
-+SO_NAME = $(LIBFILE).1
-+REAL_NAME = $(LIBFILE).$(VERSION)
-+HEADERS = qrcodegen.h
- LIBOBJ = qrcodegen.o
- MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
- 
-+# define paths to install
-+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
-+LIBDIR ?= $(DESTDIR)/usr/lib
-+
- # Build all binaries
- all: $(LIBFILE) $(MAINS)
- 
-@@ -63,6 +73,18 @@ clean:
- 	rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
- 	rm -rf .deps
- 
-+install-shared: $(LIBFILE)
-+	install -d $(LIBDIR) || true
-+	install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
-+	ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
-+	ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
-+
-+install-header: $(HEADERS)
-+	install -d $(INCLUDEDIR) || true
-+	install -m 0644 $(HEADERS) $(INCLUDEDIR)/
-+
-+install: install-shared install-header
-+
- # Executable files
- %: %.o $(LIBFILE)
- 	$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
-@@ -73,11 +95,11 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
- 
- # The library
- $(LIBFILE): $(LIBOBJ)
--	$(AR) -crs $@ -- $^
-+	$(CC) $(CXXFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
- 
- # Object files
- %.o: %.c .deps/timestamp
--	$(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
-+	$(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
- 
- # Have a place to store header dependencies automatically generated by compiler
- .deps/timestamp:
-diff --git a/cpp/Makefile b/cpp/Makefile
-index f83c512..d48ed74 100644
---- a/cpp/Makefile
-+++ b/cpp/Makefile
-@@ -29,11 +29,13 @@
- # - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
- 
- # Recommended compiler flags:
--CXXFLAGS += -std=c++11 -O
-+CXXFLAGS += -std=c++11
- 
- # Extra flags for diagnostics:
- # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
- 
-+# Version information
-+VERSION = 1.6.0
- 
- # ---- Controlling make ----
- 
-@@ -50,11 +52,20 @@ CXXFLAGS += -std=c++11 -O
- 
- # ---- Targets to build ----
- 
--LIB = qrcodegen
--LIBFILE = lib$(LIB).a
-+LIB = qrcodegencpp
-+LIBFILE = lib$(LIB).so
-+# 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
- 
-+# define paths to install
-+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
-+LIBDIR ?= $(DESTDIR)/usr/lib
-+
-+
- # Build all binaries
- all: $(LIBFILE) $(MAINS)
- 
-@@ -63,17 +74,29 @@ clean:
- 	rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS)
- 	rm -rf .deps
- 
-+install-shared: $(LIBFILE)
-+	install -d $(LIBDIR) || true
-+	install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME)
-+	ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME)
-+	ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE)
-+
-+install-header: $(HEADERS)
-+	install -d $(INCLUDEDIR) || true
-+	install -m 0644 $(HEADERS) $(INCLUDEDIR)/
-+
-+install: install-shared install-header
-+
- # Executable files
- %: %.o $(LIBFILE)
- 	$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
- 
- # The library
- $(LIBFILE): $(LIBOBJ)
--	$(AR) -crs $@ -- $^
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^
- 
- # Object files
- %.o: %.cpp .deps/timestamp
--	$(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $<
-+	$(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $<
- 
- # Have a place to store header dependencies automatically generated by compiler
- .deps/timestamp:

diff --git a/qr-code-generator.spec b/qr-code-generator.spec
index c2deffd..57b3880 100644
--- a/qr-code-generator.spec
+++ b/qr-code-generator.spec
@@ -1,22 +1,22 @@
 %global richname QR-Code-generator
+%global cmakename qrcodegen-cmake
 
 Name: qr-code-generator
-Version: 1.6.0
-Release: 5%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 
 License: MIT
 Summary: High-quality QR Code generator library
 URL: https://github.com/nayuki/%{richname}
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1: https://github.com/EasyCoding/%{cmakename}/archive/v%{version}/%{cmakename}-%{version}.tar.gz
 
-# https://github.com/nayuki/QR-Code-generator/pull/72
-Patch100: %{name}-build-fixes.patch
-
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: ninja-build
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
-BuildRequires: gcc-c++
-BuildRequires: gcc
-BuildRequires: make
 
 %description
 This project aims to be the best, clearest QR Code generator library in
@@ -78,21 +78,16 @@ Secondary goals are compact implementation size and good documentation
 comments.
 
 %prep
-%autosetup -n %{richname}-%{version} -p1
-
-%build
-# Exporting correct build flags...
-%set_build_flags
+%autosetup -n %{richname}-%{version}
 
-# Building plain C version...
-pushd c
-%make_build
-popd
+# Unpacking CMake build script...
+tar -xf %{SOURCE1} %{cmakename}-%{version}/CMakeLists.txt --strip=1
 
-# Building C++ version...
-pushd cpp
-%make_build
-popd
+%build
+# Building C and C++ versions...
+%cmake -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release
+%cmake_build
 
 # Building Python version...
 pushd python
@@ -100,15 +95,8 @@ pushd python
 popd
 
 %install
-# Installing plain C version...
-pushd c
-%make_install LIBDIR=%{buildroot}%{_libdir} INCLUDEDIR=%{buildroot}%{_includedir}/qrcodegen
-popd
-
-# Installing C++ version...
-pushd cpp
-%make_install LIBDIR=%{buildroot}%{_libdir} INCLUDEDIR=%{buildroot}%{_includedir}/qrcodegencpp
-popd
+# Installing C and C++ versions...
+%cmake_install
 
 # Installing Python version...
 pushd python
@@ -138,6 +126,10 @@ popd
 %{python3_sitelib}/qrcodegen-*.egg-info/
 
 %changelog
+* Mon Aug 09 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.7.0-1
+- Updated to version 1.7.0.
+- Switched to CMake build system.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

diff --git a/sources b/sources
index b4550dc..9fd7d0d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (qr-code-generator-1.6.0.tar.gz) = 7cf62d29ba7706eab7982bea9f022e5739b38a8c37f6b01e6c8f63458db1b05ad56ba17cd4382639eb60603ce4dd3aff1ee94f993b430d312cdee9b9204af16e
+SHA512 (qr-code-generator-1.7.0.tar.gz) = 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328
+SHA512 (qrcodegen-cmake-1.7.0.tar.gz) = 54f3e5463c1e9d1d8a74ff832dad6f4ba27888e1bcd298f252fa8d85818a74e67ac27c7093be786c97b1da3c04f0d7b19e26ccf1b37f71eb0f5b66adecc752fa