From bc75b42f7650c33ffdb61e5e29b0b96cb9111932 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Mar 2023 17:57:54 +0000 Subject: gentoo auto-resync : 07:03:2023 - 17:57:54 --- app-crypt/gcr/Manifest | 3 +- .../gcr/files/3.41.1-implicit-func-decl.patch | 30 ++++++ app-crypt/gcr/gcr-3.41.1-r1.ebuild | 106 -------------------- app-crypt/gcr/gcr-3.41.1-r2.ebuild | 107 +++++++++++++++++++++ 4 files changed, 139 insertions(+), 107 deletions(-) create mode 100644 app-crypt/gcr/files/3.41.1-implicit-func-decl.patch delete mode 100644 app-crypt/gcr/gcr-3.41.1-r1.ebuild create mode 100644 app-crypt/gcr/gcr-3.41.1-r2.ebuild (limited to 'app-crypt/gcr') diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest index c98325f9dab1..da939f479027 100644 --- a/app-crypt/gcr/Manifest +++ b/app-crypt/gcr/Manifest @@ -1,6 +1,7 @@ AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e +AUX 3.41.1-implicit-func-decl.patch 1132 BLAKE2B 90cd16d7821667d3f5790cce9503b9202f07499a5ebf65b3c4144d103602b2e163b6f1200276c54d13ed9dc14882cc0b695f119aba7eecba5792be17384c4ef5 SHA512 6bdde9de3816c8c182e47802f4ed13fcb21c50dc9b402cb969086285a6c33a0314e68197965eb49de27bc5fd877dc151d9d3132fddb1f970bbcc1990a7dc0b54 DIST gcr-3.41.1.tar.xz 1030368 BLAKE2B 9d254b7f2ad864c45200e58b685db97c1ffbc83d29ba8cbda94d30ec565aa3dc5a2535305dc63b3264131b68ec9e48f37ac30d5ba08d0ce156f3b6091cd62dc1 SHA512 dd70d41636ede863d05824b26823a8f572902f7a9b6f09b0c70586ef0d4c046864e6956130b9231850a515a9fbfcd56faf20354c1cf8f697f005827c048a2325 DIST gcr-4.0.0.tar.xz 715600 BLAKE2B 8f656cea44bc9c2ab710d33db61f26b7c7f1df73a59430945aa3c9e4acad503d7d93f916f90e2c4efb0e1379eabd9616e974a76c3d3564657b16cd46dd5954c6 SHA512 5d036710c9ae58016467e63b60ab18e461ec1db1740880dccf555dd8c555b382b1ceac3e3ee6fda22dce395e93ba8ecf0578d6c815d08c2790e618f7ca5bfd50 -EBUILD gcr-3.41.1-r1.ebuild 2338 BLAKE2B 108b05f845a0a66214909db9e5364109b7bec12941e98cc23138158bb9abd3fd7837758e175a5ab91a8f7f6a4ff4480344bb5a3d6664bd9905417d4c88bbafa3 SHA512 bccdeb5070a94101a77f483efccdf3f3e6f574dba388e733ff942eacaaf42e4a3993db3c17d9c512b0fc3c3a6dd5cd5fec24d46771c3c79571b452bcddf6af4b +EBUILD gcr-3.41.1-r2.ebuild 2385 BLAKE2B 37e94ba8892b569ee0850a3a7f61c633708216122964b533969172a2b3e9a1942163216d10412bea9f9eee677125edc71af564c1a8a1783ed2f11108ec432032 SHA512 3a225646344563bc1af82cb09aea7c6755c5c93b4bddade3dde981b0c91f15f97a3dabaaa52fea9b426371e5f97bf4018129acbd448dea12b4b6ca93c36e6d7c EBUILD gcr-4.0.0.ebuild 2076 BLAKE2B fbdadaff52ace8a6c5329998a9eeeec90c61d9301802258166a35f269f4339988ea483241fdcce131e2e7390e117ebc53a268b588a9e8474377e3e866fda7c97 SHA512 6b4c41db6e16c5a5662a4186ba8034aa803298fee167878791b86f00879f44fde5d2bcb902e8ac24f8f437428a063ebe1173d5ae8dadea1adacafa080113baac MISC metadata.xml 344 BLAKE2B a5b129a4c722cc7b8b0e40ba087dab0449ed91ffeaec73b433fc2fcaa1d1c67a1f1db3ab639676880f526bb9ea55d71c7e876a947116c279cbc186d14090b10c SHA512 502308ab38854c2b61212f4b049bd20534147b9a7c565f5a5246a129fbcd12dc4a7cf1d39b560dd991a3211628afaf964a6c8f020c4e446ef0b8cb8688df0028 diff --git a/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch b/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch new file mode 100644 index 000000000000..f1f1ddc0b5d9 --- /dev/null +++ b/app-crypt/gcr/files/3.41.1-implicit-func-decl.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/900152 + +It doesn't make sense to default XOPEN_SOURCE and subsequently DEFAULT_SOURCE +as DEFAULT_SOURCE is asking for no extensions. Anyway, just ask for GNU_SOURCE +as it'll placate both musl and glibc for all of strptime/timegm/getpass and +gcr-3 is obsolete anyway. +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -77,8 +77,7 @@ gck_cflags = [ + '-DGCK_API_SUBJECT_TO_CHANGE', + '-DP11_KIT_API_SUBJECT_TO_CHANGE', + '-DPKCS11_REGISTRY_DIR="@0@"'.format(get_option('prefix') / get_option('libdir') / 'pkcs11'), +- '-D_XOPEN_SOURCE', # Needed for strptime() +- '-D_DEFAULT_SOURCE', # Needed for timegm ++ '-D_GNU_SOURCE', # Needed for strptime(), timegm, getpass + ] + + gck_symbolmap = meson.current_source_dir() / 'libgck.map' +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -146,7 +146,7 @@ gcr_base_cflags = [ + '-DGCR_API_SUBJECT_TO_CHANGE', + '-DGCK_API_SUBJECT_TO_CHANGE', + '-DP11_KIT_API_SUBJECT_TO_CHANGE', +- '-D_XOPEN_SOURCE', # Needed for strptime() ++ '-D_GNU_SOURCE', # Needed for strptime(), timegm, getpass + ] + + gcr_base_symbolmap = meson.current_source_dir() / 'libgcr-base.map' + diff --git a/app-crypt/gcr/gcr-3.41.1-r1.ebuild b/app-crypt/gcr/gcr-3.41.1-r1.ebuild deleted file mode 100644 index fa27a868884a..000000000000 --- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit gnome.org gnome2-utils meson python-any-r1 vala xdg - -DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0/1" # subslot = suffix of libgcr-base-3 and co - -IUSE="gtk gtk-doc +introspection systemd test +vala" -REQUIRED_USE=" - gtk-doc? ( introspection ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -DEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/libgcrypt-1.2.2:0= - >=app-crypt/p11-kit-0.19.0 - >=app-crypt/libsecret-0.20 - systemd? ( sys-apps/systemd:= ) - gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] ) - >=sys-apps/dbus-1 - introspection? ( >=dev-libs/gobject-introspection-1.58:= ) -" -RDEPEND="${DEPEND}" -PDEPEND="app-crypt/gnupg" -BDEPEND=" - ${PYTHON_DEPS} - gtk? ( dev-libs/libxml2:2 ) - dev-util/gdbus-codegen - dev-util/glib-utils - gtk-doc? ( dev-util/gi-docgen ) - >=sys-devel/gettext-0.19.8 - test? ( app-crypt/gnupg ) - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/3.38.0-optional-vapi.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - use vala && vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use introspection) - $(meson_use gtk) - $(meson_use gtk-doc gtk_doc) - -Dgpg_path="${EPREFIX}"/usr/bin/gpg - -Dssh_agent=true - $(meson_feature systemd) - $(meson_use vala vapi) - ) - meson_src_configure -} - -src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' -} - -src_install() { - meson_src_install - - # These files are installed by gcr:4 - local conflicts=( - "${ED}"/usr/libexec/gcr-ssh-agent - ) - use systemd && conflicts+=( - "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.{service,socket} - ) - einfo "${conflicts[@]}" - rm "${conflicts[@]}" || die - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{gck-1,gcr-3,gcr-ui-3} "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-crypt/gcr/gcr-3.41.1-r2.ebuild b/app-crypt/gcr/gcr-3.41.1-r2.ebuild new file mode 100644 index 000000000000..24ad67b9bce4 --- /dev/null +++ b/app-crypt/gcr/gcr-3.41.1-r2.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0/1" # subslot = suffix of libgcr-base-3 and co + +IUSE="gtk gtk-doc +introspection systemd test +vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +DEPEND=" + >=dev-libs/glib-2.44.0:2 + >=dev-libs/libgcrypt-1.2.2:0= + >=app-crypt/p11-kit-0.19.0 + >=app-crypt/libsecret-0.20 + systemd? ( sys-apps/systemd:= ) + gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] ) + >=sys-apps/dbus-1 + introspection? ( >=dev-libs/gobject-introspection-1.58:= ) +" +RDEPEND="${DEPEND}" +PDEPEND="app-crypt/gnupg" +BDEPEND=" + ${PYTHON_DEPS} + gtk? ( dev-libs/libxml2:2 ) + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( dev-util/gi-docgen ) + >=sys-devel/gettext-0.19.8 + test? ( app-crypt/gnupg ) + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}"/3.38.0-optional-vapi.patch + "${FILESDIR}"/3.41.1-implicit-func-decl.patch +) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + use vala && vala_setup + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + $(meson_use introspection) + $(meson_use gtk) + $(meson_use gtk-doc gtk_doc) + -Dgpg_path="${EPREFIX}"/usr/bin/gpg + -Dssh_agent=true + $(meson_feature systemd) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} + +src_install() { + meson_src_install + + # These files are installed by gcr:4 + local conflicts=( + "${ED}"/usr/libexec/gcr-ssh-agent + ) + use systemd && conflicts+=( + "${ED}"/usr/lib/systemd/user/gcr-ssh-agent.{service,socket} + ) + einfo "${conflicts[@]}" + rm "${conflicts[@]}" || die + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/{gck-1,gcr-3,gcr-ui-3} "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3