From 61faa1ea0e8302df305bc281038fc00dc7eb1dd4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Jun 2023 07:34:25 +0100 Subject: gentoo auto-resync : 27:06:2023 - 07:34:25 --- net-misc/Manifest.gz | Bin 54080 -> 54082 bytes net-misc/spice-gtk/Manifest | 3 +- ...spice-gtk-0.42-libtool-export-symbols-fix.patch | 66 +++++++++ net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild | 155 -------------------- net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild | 159 +++++++++++++++++++++ 5 files changed, 227 insertions(+), 156 deletions(-) create mode 100644 net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch delete mode 100644 net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild create mode 100644 net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index b8da53e001b5..972bf7e3f912 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 717645a434f5..dab2d34bdc01 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,5 +1,6 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b +AUX spice-gtk-0.42-libtool-export-symbols-fix.patch 2413 BLAKE2B afb7fb5763d28f9666e71ff55b3d66587922175bc518396a18cfe97544b3871185d51c170287508fc4a47e2ebc8ca0cf39ebdebb829b5213432eb15019a7e587 SHA512 df284e95f970149a75d87dbad6e06899e80f68721979f91b3246037b37e432e48beab832fe3d376814681f9e11611b9f4c3d3463f969f32c171879c2e6cd1c38 DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 -EBUILD spice-gtk-0.42-r2.ebuild 3918 BLAKE2B 041aadd8194b703fb4bc840c1a7eb646f6a6ce4edc510c1142da2938b5b2c58a2f0d3ebd3fc4b9d80bb937e750af8127c0a4b38fe65e494c3817e9744b40d9c3 SHA512 4739b4baad3093cc35de65c4024a17f7bde796fbbd8d02a7db75e218452ddce3d237d9c458fa360d264f26ac3be859cfc64908939c66880875f11cfd6a82f5a5 +EBUILD spice-gtk-0.42-r3.ebuild 3990 BLAKE2B ad55103c8966d6ff6c581e3de31073b9bb66147e21df26121f1f528552cb21d1c100af9462d1139bb83e12ce30e8a001379463a365dbbb3de222f74184e804c1 SHA512 7e9e602a39f36a2d4fa4fefa4bba579ee0859fb547832211eefb7a74970999954073097259cae4deb6805f739d102c3cde6606da6da2900c4a73bb2fa88f3502 EBUILD spice-gtk-9999.ebuild 3921 BLAKE2B f331e45d82b251cb46015fd1825fc616968bfe0a5059002191c5a756283b34d7662bc854532cb05ee00d607a1e5aa8ac5b7d1053933d554f58ede25ef77030d5 SHA512 9bef8e2563a856e24fe230b4e3b8f433786493e31a84e72476f929839dad4ee7b35575d5a1238e059a76f5ce5614650d63af31f50646f8a27a5963431c0ef4a9 MISC metadata.xml 878 BLAKE2B ed1c920773825632995e541e6bc7ec0b894005edcff41c90c2af4a47279db54bcc695b22e91e7aa3c1376cee6ed509f985cb7486a2f7d75e8b6ebbb8c6caa67b SHA512 308ea78d044e3c13ed40154b4835f202dc523fc8925aa3ad0304ddb6518a9c51437ebccc539998b8d55d6919649358a073b5c80a2e8dd0d8e82bb4e0ab6c6d0a diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch new file mode 100644 index 000000000000..1af5ba26790f --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch @@ -0,0 +1,66 @@ +Bug: https://bugs.gentoo.org/902853 +Bug: https://bugs.gentoo.org/888705 +Upstream: https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/119 +Upstream Bug: https://gitlab.freedesktop.org/spice/spice-gtk/-/issues/169 + +From 1511f0ad5ea67b4657540c631e3a8c959bb8d578 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Wed, 21 Jun 2023 18:43:59 +0100 +Subject: [PATCH] Do not use libtool -export-symbols option + +This option is intended for libtool, not for any linker. +Check the support of --version-script option using an empty +list of symbols to catch some faulty linker supporting that +option but not allowing not existing symbols (some buggy mold +versions). + +Signed-off-by: Frediano Ziglio +--- a/src/meson.build ++++ b/src/meson.build +@@ -181,14 +181,19 @@ endif + # + + # version-script ++test_syms_path = meson.current_source_dir() / 'test-map-file' ++test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path) ++spice_has_version_script = compiler.has_link_argument(test_version_script) ++ + spice_client_glib_syms = files('map-file') + spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' + spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) +-spice_gtk_has_version_script = compiler.has_link_argument(spice_gtk_version_script) +-if not spice_gtk_has_version_script +- spice_client_glib_syms = files('spice-glib-sym-file') +- spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_glib_syms_path] ++if not spice_has_version_script ++ if host_machine.system() == 'linux' ++ error('Version scripts should be supported on Linux') ++ endif ++ spice_client_glib_syms = [] ++ spice_gtk_version_script = [] + endif + + # soversion +@@ -373,11 +378,6 @@ if spice_gtk_has_gtk + # libspice-client-gtk.so + # + spice_client_gtk_syms = spice_client_glib_syms +- if not spice_gtk_has_version_script +- spice_client_gtk_syms = files('spice-gtk-sym-file') +- spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_gtk_syms_path] +- endif + + # soversion + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +--- /dev/null ++++ b/src/test-map-file +@@ -0,0 +1,4 @@ ++TEST_LIB { ++local: ++*; ++}; +-- +GitLab + diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild deleted file mode 100644 index fe18fb9f4736..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" - inherit git-r3 - - SPICE_PROTOCOL_VER=9999 -else - SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" - - SPICE_PROTOCOL_VER=0.14.3 -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - media-libs/libjpeg-turbo:= - sys-libs/zlib - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - x11-libs/libX11 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:= - lz4? ( app-arch/lz4 ) - policykit? ( - >=sys-auth/polkit-0.110-r1 - ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwdata - >=sys-apps/usbredir-0.4.2 - virtual/acl - virtual/libusb:1 - ) - webdav? ( - net-libs/phodav:3.0 - net-libs/libsoup:3.0 - ) -" -# TODO: spice-gtk has an automagic dependency on media-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND=" - ${RDEPEND} - amd64? ( media-libs/libva:= ) - arm64? ( media-libs/libva:= ) - x86? ( media-libs/libva:= ) -" -DEPEND=" - ${RDEPEND} - >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - $(python_gen_any_dep ' - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - dev-perl/Text-CSV - dev-util/glib-utils - >=sys-devel/gettext-0.17 - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - vala? ( $(vala_depend) ) -" - -python_check_deps() { - python_has_version "dev-python/six[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen - - use vala && vala_setup -} - -src_configure() { - local emesonargs=( - $(meson_feature gtk-doc gtk_doc) - $(meson_feature gtk3 gtk) - $(meson_feature introspection) - $(meson_use mjpeg builtin-mjpeg) - $(meson_feature policykit polkit) - $(meson_feature lz4) - $(meson_feature sasl) - $(meson_feature smartcard) - $(meson_feature usbredir) - $(meson_feature vala vapi) - $(meson_use valgrind) - $(meson_feature webdav) - $(meson_feature wayland wayland-protocols) - ) - - if use elibc_musl; then - emesonargs+=( - -Dcoroutine=gthread - ) - fi - - if use usbredir; then - emesonargs+=( - -Dusb-acl-helper-dir=/usr/libexec - -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - if use usbredir && use policykit; then - # bug #775554 (and bug #851657) - fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper - fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper - fi - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse -} diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild new file mode 100644 index 000000000000..83318d830e49 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{9..11} ) + +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + >=dev-libs/glib-2.46:2 + dev-libs/json-glib:0= + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0[introspection?] + media-libs/opus + media-libs/libjpeg-turbo:= + sys-libs/zlib + >=x11-libs/cairo-1.2 + >=x11-libs/pixman-0.17.7 + x11-libs/libX11 + gtk3? ( x11-libs/gtk+:3[introspection?] ) + introspection? ( dev-libs/gobject-introspection ) + dev-libs/openssl:= + lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwdata + >=sys-apps/usbredir-0.4.2 + virtual/acl + virtual/libusb:1 + ) + webdav? ( + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) +" +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a +# configure knob. The package is relatively lightweight so we just depend +# on it unconditionally for now. It would be cleaner to transform this into +# a USE="vaapi" conditional and patch the buildsystem... +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) +" +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-util/valgrind ) +" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch" +) + +python_check_deps() { + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk-doc gtk_doc) + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature lz4) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(meson_feature vala vapi) + $(meson_use valgrind) + $(meson_feature webdav) + $(meson_feature wayland wayland-protocols) + ) + + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + + if use usbredir; then + emesonargs+=( + -Dusb-acl-helper-dir=/usr/libexec + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} -- cgit v1.2.3