From nobody Mon Jan 16 15:47:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nwby74YvGz2sh29; Mon, 16 Jan 2023 15:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nwby73dlFz3D5N; Mon, 16 Jan 2023 15:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673884063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ly79rmTzfmRSogeMrCV1QaN0SaOZOEUudos1i+7oPeM=; b=hNekXuEOM1TuAILVodv3Zg9gG3GEiv2+NFw2npgZEidwehSkRDRdL6tDLDtc1VZeXFbURS NUrjBbQwBKH+aZJAOJasfhzDcZNOWvbY+Ob74GUsvQzDVyfQloyplOwy9xBJSOcaHgPJmM yskKX6WC2nS4crOoq5V275mXkTX0BGYqel01tzohvi/iJb2y2C7lVr1Q2RdABJ8sahzNBh 2S+snQvIdkmDkUWfBty3qBTwWiGkoJjYV/cByaO6PqN+2j3QFagrd987AfCrlaAL+3trXM WN2FTKM86bsSoOZu1G4uSbaHY0xR1YmTa7CeGpUZ4jDyJQaollEIpUDgVnkp5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673884063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ly79rmTzfmRSogeMrCV1QaN0SaOZOEUudos1i+7oPeM=; b=XO4likpT9AquqhvAUZqVUJnPBa33hcQyL2BuR3Z73z2xSw2hvEgYD4IRi+WRa4zw3d5K8v fkEuGRKkt2+TV9eeICi0ZGYt+6/LI1DF7HciQWSW7xR3iOUtSpedWKSkL5iKZBrevDq8sY DUtZOeL76U2hbd3zK3ugei7omQVLi0NXZHPw0woBOfNTJkM4oAbsb/s1UzUUke1MgcczY9 bLk4l/0WswAGsAn6QgPy8sjv8EzOOntdzKQ5guIHYYhTv3BEbf2lnOtuxfBjzej54fmrBr Lee1zsX2NPspQLCkzjVKOvXbpdmzIoCtTml+X8w2tb+DGODxw8SARcIrvf3u/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673884063; a=rsa-sha256; cv=none; b=MB8st5bpMscfcR27N0bld5mwU4u8tsa+2uWXqG0tOxVpqtGA6tkEBU0No5MwCNMOWDCz6M kfXFIYr2UtUcgIsOKjyUu4k0T510+qsG7rCtQ521A7EyjViBuISb2TveRYZJmKLUGaz7th 4qGMkSbeQVXoWZDPRYzf0RAtA2cab959RD1bS4dbDtthlR7pgmSByrXoFzzpXjYZLP2hz1 q23LukoXsFGL0zMaMdBmMXsuBV/joDeMLdRcmuc33OYfAqfCFkGXEgkrALKDhTIAIaYdmO FsSRD7M0L5lPMN6KaGcFbtsn5S7bSlP+XV0xS5OaqJl+UYUii9SfPMhePKrLYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nwby72l7kz1CF7; Mon, 16 Jan 2023 15:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30GFlhHp049993; Mon, 16 Jan 2023 15:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GFlhj2049992; Mon, 16 Jan 2023 15:47:43 GMT (envelope-from git) Date: Mon, 16 Jan 2023 15:47:43 GMT Message-Id: <202301161547.30GFlhj2049992@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 7c1533ccde6c - main - graphics/qr-code-generator: Update to 1.8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c1533ccde6c6ec90981789ce3a38eb812cef462 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c1533ccde6c6ec90981789ce3a38eb812cef462 commit 7c1533ccde6c6ec90981789ce3a38eb812cef462 Author: Li-Wen Hsu AuthorDate: 2023-01-16 15:46:48 +0000 Commit: Li-Wen Hsu CommitDate: 2023-01-16 15:47:21 +0000 graphics/qr-code-generator: Update to 1.8.0 --- graphics/qr-code-generator/Makefile | 5 +++-- graphics/qr-code-generator/distinfo | 6 +++--- graphics/qr-code-generator/files/patch-c_Makefile | 13 ++++++----- .../qr-code-generator/files/patch-cpp_Makefile | 25 +++++++++++----------- graphics/qr-code-generator/pkg-plist | 4 +--- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/graphics/qr-code-generator/Makefile b/graphics/qr-code-generator/Makefile index a1146c7d6f11..2ca7af89be1b 100644 --- a/graphics/qr-code-generator/Makefile +++ b/graphics/qr-code-generator/Makefile @@ -1,5 +1,5 @@ PORTNAME= qr-code-generator -PORTVERSION= 1.6.0 +PORTVERSION= 1.8.0 DISTVERSIONPREFIX= v CATEGORIES= graphics @@ -16,7 +16,6 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= nayuki GH_PROJECT= QR-Code-generator -GH_TAGNAME= 67c6246 PLIST_SUB= VERSION=${PORTVERSION} @@ -24,6 +23,8 @@ post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC} ${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/c/Makefile ${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/cpp/Makefile + ${REINPLACE_CMD} -e 's,%%VERSION%%,${PORTVERSION},' ${WRKSRC}/c/Makefile + ${REINPLACE_CMD} -e 's,%%VERSION%%,${PORTVERSION},' ${WRKSRC}/cpp/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqrcodegen.so.${PORTVERSION} diff --git a/graphics/qr-code-generator/distinfo b/graphics/qr-code-generator/distinfo index fac201807607..e280ef7073df 100644 --- a/graphics/qr-code-generator/distinfo +++ b/graphics/qr-code-generator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1583603728 -SHA256 (nayuki-QR-Code-generator-v1.6.0-67c6246_GH0.tar.gz) = a9b83deee76bbe35770bf36a669494358dfe1d8aec3b2e6f9e216c9e830457ac -SIZE (nayuki-QR-Code-generator-v1.6.0-67c6246_GH0.tar.gz) = 136401 +TIMESTAMP = 1673860287 +SHA256 (nayuki-QR-Code-generator-v1.8.0_GH0.tar.gz) = 2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60 +SIZE (nayuki-QR-Code-generator-v1.8.0_GH0.tar.gz) = 193288 diff --git a/graphics/qr-code-generator/files/patch-c_Makefile b/graphics/qr-code-generator/files/patch-c_Makefile index 40fb9449a62b..4462f4adee50 100644 --- a/graphics/qr-code-generator/files/patch-c_Makefile +++ b/graphics/qr-code-generator/files/patch-c_Makefile @@ -1,5 +1,5 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 ---- c/Makefile.orig 2019-10-14 00:20:16 UTC +--- c/Makefile.orig 2023-01-16 09:13:33 UTC +++ c/Makefile @@ -29,11 +29,13 @@ # - CFLAGS: Any extra user-specified compiler flags (can be blank). @@ -12,12 +12,11 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +# Version information -+VERSION = 1.6.0 ++VERSION = %%VERSION%% # ---- Controlling make ---- -@@ -51,18 +53,45 @@ CFLAGS += -std=c99 -O - # ---- Targets to build ---- +@@ -52,17 +54,44 @@ CFLAGS += -std=c99 -O LIB = qrcodegen -LIBFILE = lib$(LIB).a @@ -28,7 +27,7 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 +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 @@ -64,9 +63,9 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 + # Executable files %: %.o $(LIBFILE) - $(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) @@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) - $(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ # The library -$(LIBFILE): $(LIBOBJ) diff --git a/graphics/qr-code-generator/files/patch-cpp_Makefile b/graphics/qr-code-generator/files/patch-cpp_Makefile index 809d6b64888b..23aa5c040db7 100644 --- a/graphics/qr-code-generator/files/patch-cpp_Makefile +++ b/graphics/qr-code-generator/files/patch-cpp_Makefile @@ -1,7 +1,7 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 ---- cpp/Makefile.orig 2019-10-14 00:20:16 UTC +--- cpp/Makefile.orig 2023-01-16 09:17:10 UTC +++ cpp/Makefile -@@ -29,11 +29,13 @@ +@@ -29,12 +29,14 @@ # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). # Recommended compiler flags: @@ -11,31 +11,30 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 # Extra flags for diagnostics: # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +- +# Version information -+VERSION = 1.6.0 - ++VERSION = %%VERSION%% ++ # ---- Controlling make ---- -@@ -50,30 +52,61 @@ CXXFLAGS += -std=c++11 -O - + # Clear default suffix rules +@@ -51,29 +53,59 @@ CXXFLAGS += -std=c++11 -O # ---- Targets to build ---- --LIB = qrcodegen + LIB = qrcodegencpp -LIBFILE = lib$(LIB).a -+LIB = qrcodegencpp +ARFILE = 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 = BitBuffer.hpp QrCode.hpp QrSegment.hpp - LIBOBJ = BitBuffer.o QrCode.o QrSegment.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: $(LIBFILE) $(MAINS) @@ -67,7 +66,7 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72 + # Executable files %: %.o $(LIBFILE) - $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) # The library -$(LIBFILE): $(LIBOBJ) diff --git a/graphics/qr-code-generator/pkg-plist b/graphics/qr-code-generator/pkg-plist index bdd62dd1b9f3..669bcd448aac 100644 --- a/graphics/qr-code-generator/pkg-plist +++ b/graphics/qr-code-generator/pkg-plist @@ -1,7 +1,5 @@ -include/qrcodegen/BitBuffer.hpp -include/qrcodegen/QrCode.hpp -include/qrcodegen/QrSegment.hpp include/qrcodegen/qrcodegen.h +include/qrcodegen/qrcodegen.hpp lib/libqrcodegen.a lib/libqrcodegen.so lib/libqrcodegen.so.1