diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/Manifest.gz | bin | 17664 -> 17661 bytes | |||
| -rw-r--r-- | x11-libs/gtk+/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch | 31 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.24.48.ebuild | 214 |
4 files changed, 248 insertions, 0 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex b7822b4528ed..9cfc0f9b7120 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 7d3006ade0ff..42ea58966803 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -6,15 +6,18 @@ AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc9 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10 AUX gtk+-3.24.36-update-icon-cache.patch 774 BLAKE2B 0e7a5b3612147906c91772f496de25175314b601d7ff91c855902f19cb0081e932cc96a90752ae8aa147c4c80868e8d7b01c5e5044695b7710aecaedbd92d5ec SHA512 b8049f77063ac994a0f2222d9e776dd1038636a0920624b027e891f72dd393b825304190118dafc97c733f56554a41e9ceed4f1069980b2913b7b3f4ace23d83 +AUX gtk+-3.24.48-signal-handler.patch 1004 BLAKE2B fa4109c2fc22a1706dae6c2357a062853fdd1ed553b40c956d0c93952c4c0de3be148e5a65e563de6df5b50b63f0c2bb168524ac94f76545f827ddc4a9b31b57 SHA512 fc0e8076613ce823f50ef52749e7340a7040b369f1379b07d765e4bd587355bfbca5d55bed14c1d0c58387ff5b12c3b29aea7521f8fa8a7c14106ba5937fce2f AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 DIST gtk+-3.24.42.tar.xz 13226980 BLAKE2B 04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9 SHA512 53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643 +DIST gtk-3.24.48.tar.xz 13414436 BLAKE2B d5201f434d2045feb68bf9cdbf1e254eba8377a17fcc1d32daf3298338cd3482b5f26158f1c498d70dc122451da45dfdbcea3a39ecd0b074a3659a362a4eb3ea SHA512 aea1c4e2c5c7415692ffedc238321a58c6fc1a56000694e00f7bfe374c6e52fde89f510c1bcccfe3713f8f645e5a117323186e4bb1cffc62855caa5ab08e6b1f EBUILD gtk+-2.24.33-r3.ebuild 9925 BLAKE2B 3b6be759a171e784c78509f185be00b8d6dcfe0bc7a0028d5f5c7c0fd32913bba34da24ee6cf3969ac520ebdf7951cef21f8eb831ecdaedff3518443c0035b01 SHA512 1c50f9419fc460cd74f4aa8ac760f16a8214253d6ee46c9c8a939111799440271ca06f2349edc3bb861cc4358c803412c6a380ab92175965f89cdae7a21d8d8f EBUILD gtk+-3.24.35.ebuild 6969 BLAKE2B 6f2dd4fa4285bc425d5d75b6b3b90f5a150c4fb140b9a6d007f6a1634d4052da25705b0a425ee017703af94f71e20b23aa2280e4d001f9cc1b6850394499b4e4 SHA512 4d090b3cdc9fe8d1ed56e6800959ade3a4dcc59dd3ac8a91cb211cda3d4aa7c379173c98763e4cb2acd7977e7fefffeacf235a92b3a9d593cb93a6df73f21e9e EBUILD gtk+-3.24.41-r1.ebuild 5975 BLAKE2B 5a161d3dd100bf2d2dc83cbd90eb2504c6c2d07c2dd6fb3e905d3a19d7926bff21159f2b0d7b7b27b8e2ac5fe79a0699304afd0b2b8c5fbd9ffdf523329d1843 SHA512 872673157fee15c748b750091c8707c38152524c20466a4901bfe16ef7346adbb9135f38b7f779c58669598de05ec8c92be8f9edd4e55b35e6a3c6352bf6aa0d EBUILD gtk+-3.24.41.ebuild 5692 BLAKE2B 88e0ef98410aa8fc2bb683bdef611dc02c15e6ade888fdfdb6a2016098ff707667505fe92117248971746e51982b853aae3727aedeec132e9a19f344eba2aaf3 SHA512 f2dfe1754a6c41b7cc402783000a86991d382189558a71297cc37ce8e41e722928369b0c0a78eb237165108e946dd133a86acbd1cd5a80b9314711a6093ef0ba EBUILD gtk+-3.24.42-r1.ebuild 6376 BLAKE2B 910968980a542a6aa1e4b515d536ec18c84dac7f5ef9a0b88eed3e805f4dcbc7fbbad854aaf40d991b7e49d16a0958fff116894c8b7a41f298588b686b3ee85d SHA512 c66027fcb9e22f4d73fe58c6abdefecbabbb520807c7b6b91d09c7df29ec1b4d54fe4860b3446dd681120d97039eaf71dc0ecf38d8f00ac448424c83a70729af +EBUILD gtk+-3.24.48.ebuild 6474 BLAKE2B 1893f15494cc4625a318c22c72cab9210d37dfd9e304dbeb8c4b8f515cd1ed4d5e31e6aef4300347e0e701807e8fdd2169fbb3fa27a89e74a1554e78361e340f SHA512 993c20d4404b6066a8c7b4f3ca6b736ef7f24b59b9807cd8cb80fee5120fe5d5c8974fee69340922ae8e6fe9c92573d354b36f487daa5dcb98fb0fb7aa9a32bc MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e diff --git a/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch b/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch new file mode 100644 index 000000000000..40ca24d90093 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.24.48-signal-handler.patch @@ -0,0 +1,31 @@ +https://gitlab.gnome.org/GNOME/gtk/-/commit/32381771b1cfa55770036e525a6c53c70be6c920 + +From 32381771b1cfa55770036e525a6c53c70be6c920 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Wed, 12 Feb 2025 12:16:34 +0100 +Subject: [PATCH] im: Fix signal handler signature + +This was causing crashes, probably since 2019 :( + +Fixes: #7306 +Fixes: #7331 +--- + gtk/gtkimmulticontext.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c +index 50363559d7b..2d70cdeda06 100644 +--- a/gtk/gtkimmulticontext.c ++++ b/gtk/gtkimmulticontext.c +@@ -282,7 +282,8 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext) + } + + static void +-im_module_setting_changed (GtkSettings *settings, ++im_module_setting_changed (GtkSettings *settings, ++ GParamSpec *pspec, + GtkIMMulticontext *self) + { + gtk_im_multicontext_set_slave (self, NULL, FALSE); +-- +GitLab diff --git a/x11-libs/gtk+/gtk+-3.24.48.ebuild b/x11-libs/gtk+/gtk+-3.24.48.ebuild new file mode 100644 index 000000000000..6192c794e833 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.48.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GNOME_ORG_MODULE=gtk +inherit gnome2 meson-multilib multilib toolchain-funcs virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + test? ( X ) + xinerama? ( X ) +" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.2.0:= + >=media-libs/libepoxy-1.4[X(+)?,egl(+),${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.32 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + media-libs/libglvnd[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.33.2:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + wayland? ( dev-util/wayland-scanner ) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) + test? ( sys-apps/dbus ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch + # Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds + # with USE="-wayland -X" to trick gtk into claiming that it wasn't built with + # such support. + # https://bugs.gentoo.org/624960 + "${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch + # Backport from 3.24 branch + "${FILESDIR}"/${P}-signal-handler.patch +) + +src_prepare() { + default + + # Force sysprof-capture-4 instead of checking sysprof-capture-3 first; either is + # fine as far as deps are concerned, as it static links, but sysprof-capture-3 + # links to glib which would be done statically if there's glib[static-libs], + # making the whole of gtk+ static link to glib instead of dynamic linking to glib. + sed -i -e "s/'sysprof-capture-3'/'sysprof-capture-4'/g" meson.build || die + + # The border-image-excess-size.ui test is known to fail on big-endian platforms + # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 + if [[ $(tc-endian) == big ]]; then + sed -i \ + -e "/border-image-excess-size.ui/d" \ + -e "/^xfails =/a 'border-image-excess-size.ui'," \ + testsuite/reftests/meson.build || die + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use aqua quartz_backend) + $(meson_use broadway broadway_backend) + $(meson_use cloudproviders) + $(meson_use examples demos) + $(meson_use examples) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_bool introspection) + $(meson_use sysprof profiler) + $(meson_use wayland wayland_backend) + $(meson_use X x11_backend) + -Dcolord=$(usex colord yes no) + -Dprint_backends=$(usex cups cups,file,lpr file,lpr) + -Dxinerama=$(usex xinerama yes no) + # Include backend immodules into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + -Dbuiltin_immodules=backend + -Dman=true + $(meson_use test tests) + -Dtracker3=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.win32.md that would get installed by default + DOCS=( NEWS README.md ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die + else + touch "${ED}${cache}" || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + } + multilib_foreach_abi multilib_pkg_postrm + fi +} |