pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gcr4: revert package naming to allow installation alongside gcr3
Module Name: pkgsrc-wip
Committed By: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By: vms
Date: Sun May 3 11:24:38 2026 +0200
Changeset: 648eb32eeb4b93806092d4f8269c7a52dd78c65c
Modified Files:
gcr4/Makefile
gcr4/PLIST
gcr4/TODO
gcr4/buildlink3.mk
gcr4/distinfo
gcr4/options.mk
Added Files:
gcr4/patches/patch-gcr_gcr-ssh-agent.c
gcr4/patches/patch-gcr_meson.build
Log Message:
gcr4: revert package naming to allow installation alongside gcr3
Update TODO.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=648eb32eeb4b93806092d4f8269c7a52dd78c65c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gcr4/Makefile | 4 +++-
gcr4/PLIST | 4 ++--
gcr4/TODO | 19 +++----------------
gcr4/buildlink3.mk | 24 ++++++++++++------------
gcr4/distinfo | 2 ++
gcr4/options.mk | 4 ++--
gcr4/patches/patch-gcr_gcr-ssh-agent.c | 21 +++++++++++++++++++++
gcr4/patches/patch-gcr_meson.build | 15 +++++++++++++++
8 files changed, 60 insertions(+), 33 deletions(-)
diffs:
diff --git a/gcr4/Makefile b/gcr4/Makefile
index 05132bcbe4..a3c01d087e 100644
--- a/gcr4/Makefile
+++ b/gcr4/Makefile
@@ -1,6 +1,7 @@
# $NetBSD$
DISTNAME= gcr-4.4.0.1
+PKGNAME= ${DISTNAME:S/gcr/gcr4/}
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcr/4.4/}
EXTRACT_SUFX= .tar.xz
@@ -24,7 +25,8 @@ REPLACE_BASH= gcr/fixtures/gnupg-mock/mock-status-and-attribute
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gck
TEST_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/output/gc
-MESON_ARGS+= -Dgpg_path=${PREFIX}/bin/gpg2 \
+MESON_ARGS+= --localedir=${PKGLOCALEDIR}/locale \
+ -Dgpg_path=${PREFIX}/bin/gpg2 \
-Dssh_agent=true \
-Dsystemd=disabled
diff --git a/gcr4/PLIST b/gcr4/PLIST
index 5053d9626e..583beb531d 100644
--- a/gcr4/PLIST
+++ b/gcr4/PLIST
@@ -41,10 +41,10 @@ lib/libgck-2.so.2
lib/libgck-2.so.2.4.0
lib/libgcr-4.so
lib/libgcr-4.so.4
-lib/libgcr-4.so.4.0
+lib/libgcr-4.so.4.4.0
lib/pkgconfig/gck-2.pc
lib/pkgconfig/gcr-4.pc
-libexec/gcr-ssh-agent
+libexec/gcr4-ssh-agent
libexec/gcr4-ssh-askpass
${PLIST.doc}share/doc/gck-2/RedHatDisplay-Black.woff
${PLIST.doc}share/doc/gck-2/RedHatDisplay-Black.woff2
diff --git a/gcr4/TODO b/gcr4/TODO
index 8db955d5a0..e72639e21f 100644
--- a/gcr4/TODO
+++ b/gcr4/TODO
@@ -1,16 +1,3 @@
-It would be better to update security/gcr using this wip package
-instead, again, of having two major branches ofg the same software in
-the main tree.
-
-Upstream has no plan of maintaining gcr 3.x.
-
-It should be noted on the other side that gcr3 and gcr4 can be
-installed alongisde each other, as their PLIST do not conflict (almost).
-
-What is currently stopping this from being imported:
-
-- gcr4 expects gtk4 and won't build with gtk3. The gtk frontend can,
- however be toggled off and made optional (as it is currently).
-- gcr4 hasn't been tested on any platform but NetBSD.
-- Additional testing has to be performed on software depending on this
- package.
+Package is ready to be imported.
+gcr4 should be imported alongside security/gcr, as software may alternatively
+require gcr-3 or gcr-4.
diff --git a/gcr4/buildlink3.mk b/gcr4/buildlink3.mk
index fb84ba3a6b..abb584fbfe 100644
--- a/gcr4/buildlink3.mk
+++ b/gcr4/buildlink3.mk
@@ -1,35 +1,35 @@
# $NetBSD$
-BUILDLINK_TREE+= gcr
+BUILDLINK_TREE+= gcr4
-.if !defined(GCR_BUILDLINK3_MK)
-GCR_BUILDLINK3_MK:=
+.if !defined(GCR4_BUILDLINK3_MK)
+GCR4_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gcr+= gcr>=4.3.0
-BUILDLINK_PKGSRCDIR.gcr?= ../../wip/gcr4
+BUILDLINK_API_DEPENDS.gcr4+= gcr4>=4.3.0
+BUILDLINK_PKGSRCDIR.gcr4?= ../../wip/gcr4
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
.include "../../security/p11-kit/buildlink3.mk"
-pkgbase := gcr
+pkgbase := gcr4
.include "../../mk/pkg-build-options.mk"
-.if ${PKG_BUILD_OPTIONS.gcr:Mgtk4}
+.if ${PKG_BUILD_OPTIONS.gcr4:Mgtk4}
. include "../../x11/gtk4/buildlink3.mk"
.endif
-.if ${PKG_BUILD_OPTIONS.gcr:Mintrospection}
+.if ${PKG_BUILD_OPTIONS.gcr4:Mintrospection}
. include "../../devel/gobject-introspection/buildlink3.mk"
.endif
-.if ${PKG_BUILD_OPTIONS.gcr:Mlibgcrypt}
+.if ${PKG_BUILD_OPTIONS.gcr4:Mlibgcrypt}
. include "../../security/libgcrypt/buildlink3.mk"
-.elif ${PKG_BUILD_OPTIONS.gcr:Mgnutls}
+.elif ${PKG_BUILD_OPTIONS.gcr4:Mgnutls}
. include "../../security/gnutls/buildlink3.mk"
.endif
-.endif # GCR_BUILDLINK3_MK
+.endif # GCR4_BUILDLINK3_MK
-BUILDLINK_TREE+= -gcr
+BUILDLINK_TREE+= -gcr4
diff --git a/gcr4/distinfo b/gcr4/distinfo
index 81b0a81fe0..734ff8c907 100644
--- a/gcr4/distinfo
+++ b/gcr4/distinfo
@@ -3,4 +3,6 @@ $NetBSD: distinfo,v 1.7 2024/08/14 08:58:42 adam Exp $
BLAKE2s (gcr-4.4.0.1.tar.xz) = f1a927bb0f6766e0fb8171e1e3708d9734cdea66a6af786aa6c779dfe0cf7e49
SHA512 (gcr-4.4.0.1.tar.xz) = f84724e0e9850c6150ec93430a0c3a714f4b4376df2fd3fd68340463acf04d89de236510b40bab4f3dc8fd82a2e8dc98b53c2684df07fdb9a6a3528ed35652d1
Size (gcr-4.4.0.1.tar.xz) = 745244 bytes
+SHA1 (patch-gcr_gcr-ssh-agent.c) = 924877650d01231c44dbc76bb84b59540c10a92e
+SHA1 (patch-gcr_meson.build) = 316e015e9c330fb9ac93e0683dd9068898527788
SHA1 (patch-gcr_test-secure-memory.c) = e8002f64467d001e06c8af28f16b0c1ffe7211ad
diff --git a/gcr4/options.mk b/gcr4/options.mk
index 8d4384afd2..c99802b9ad 100644
--- a/gcr4/options.mk
+++ b/gcr4/options.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-PKG_OPTIONS_VAR= PKG_OPTIONS.gcr
+PKG_OPTIONS_VAR= PKG_OPTIONS.gcr4
PKG_OPTIONS_OPTIONAL_GROUPS= crypto
PKG_OPTIONS_GROUP.crypto= libgcrypt gnutls
PKG_SUPPORTED_OPTIONS= doc gtk4 introspection vapi
-PKG_SUGGESTED_OPTIONS+= libgcrypt introspection vapi
+PKG_SUGGESTED_OPTIONS+= gtk4 introspection vapi libgcrypt
.include "../../mk/bsd.options.mk"
diff --git a/gcr4/patches/patch-gcr_gcr-ssh-agent.c b/gcr4/patches/patch-gcr_gcr-ssh-agent.c
new file mode 100644
index 0000000000..beaaf334ed
--- /dev/null
+++ b/gcr4/patches/patch-gcr_gcr-ssh-agent.c
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Honor the actual ssh-agent's binary name.
+
+--- gcr/gcr-ssh-agent.c.orig 2026-05-03 08:07:50.857445299 +0000
++++ gcr/gcr-ssh-agent.c
+@@ -61,12 +61,12 @@ main (int argc,
+ parse_arguments(&argc, &argv);
+
+ if (!base_dir) {
+- g_printerr ("Usage: gcr-ssh-agent --base-dir <base-dir> --\n");
++ g_printerr ("Usage: gcr4-ssh-agent --base-dir <base-dir> --\n");
+ return EXIT_FAILURE;
+ }
+
+ if (!g_path_is_absolute (base_dir)) {
+- g_printerr ("gcr-ssh-agent: base-dir must be specified as an absolute path\n");
++ g_printerr ("gcr4-ssh-agent: base-dir must be specified as an absolute path\n");
+ return EXIT_FAILURE;
+ }
+
diff --git a/gcr4/patches/patch-gcr_meson.build b/gcr4/patches/patch-gcr_meson.build
new file mode 100644
index 0000000000..5279fc882f
--- /dev/null
+++ b/gcr4/patches/patch-gcr_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Prevent PLIST conflict with gcr-3.
+
+--- gcr/meson.build.orig 2026-05-03 07:32:47.935548756 +0000
++++ gcr/meson.build
+@@ -257,7 +257,7 @@ if get_option('ssh_agent')
+ 'gcr-ssh-agent-util.c',
+ ]
+
+- gcr_ssh_agent = executable('gcr-ssh-agent',
++ gcr_ssh_agent = executable('gcr4-ssh-agent',
+ gcr_ssh_agent_lib_sources + [ 'gcr-ssh-agent.c' ],
+ dependencies: [ gcr_deps, gcr_dep, libsecret_dep, libsystemd_deps ],
+ c_args: [
Home |
Main Index |
Thread Index |
Old Index