diff --git a/srcpkgs/qrcodegen/patches/cpp_Makefile.patch b/srcpkgs/qrcodegen/patches/cpp_Makefile.patch deleted file mode 100644 index e1b88f0aff9..00000000000 --- a/srcpkgs/qrcodegen/patches/cpp_Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: sanitizer does not link and is missing for musl; enable PIC - ---- cpp/Makefile 2019-07-16 01:16:50.000000000 +0200 -+++ cpp/Makefile 2020-01-29 22:57:19.157930868 +0100 -@@ -29,12 +29,7 @@ - # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). - - # Mandatory compiler flags --CXXFLAGS += -std=c++11 --# Diagnostics. Adding '-fsanitize=address' is helpful for most versions of Clang and newer versions of GCC. --CXXFLAGS += -Wall -fsanitize=undefined --# Optimization level --CXXFLAGS += -O1 -- -+CXXFLAGS += -std=c++11 -Wall -fPIC - - # ---- Controlling make ---- - diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template index 0bd595dcb71..e28561ed1c8 100644 --- a/srcpkgs/qrcodegen/template +++ b/srcpkgs/qrcodegen/template @@ -1,7 +1,7 @@ # Template file for 'qrcodegen' pkgname=qrcodegen -version=1.5.0 -revision=2 +version=1.6.0 +revision=1 wrksrc="QR-Code-generator-${version}" build_wrksrc="cpp" build_style=gnu-makefile @@ -10,14 +10,12 @@ maintainer="Jürgen Buchmüller " license="MIT" homepage="https://www.nayuki.io/page/qr-code-generator-library" distfiles="https://github.com/nayuki/QR-Code-generator/archive/v${version}.tar.gz" -checksum=6cf993c10fbf96b5e8f8e4eaad8ea1ca3bbc58fb4d00a4728b4f818c27fb4d5e +checksum=8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8 do_install() { sed -n "/^License/,/xxxx/p" ../Readme.markdown > LICENSE vlicense LICENSE - for f in BitBuffer QrCode QrSegment; do - vinstall $f.hpp 644 usr/include/qrcodegen - done + vinstall QrCode.hpp 644 usr/include/qrcodegen vinstall libqrcodegen.a 644 usr/lib libqrcodegencpp.a }