diff options
| -rw-r--r-- | metadata/md5-cache/x11-libs/gtk+-3.24.41-r5 (renamed from metadata/md5-cache/x11-libs/gtk+-3.24.40-r1) | 6 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch | 50 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch | 82 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.24.41-r5.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.40-r1.ebuild) | 5 |
6 files changed, 6 insertions, 141 deletions
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.40-r1 b/metadata/md5-cache/x11-libs/gtk+-3.24.41-r5 index fcc784a9..a7f29658 100644 --- a/metadata/md5-cache/x11-libs/gtk+-3.24.40-r1 +++ b/metadata/md5-cache/x11-libs/gtk+-3.24.41-r5 @@ -7,13 +7,13 @@ HOMEPAGE=https://www.gtk.org/ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info INHERIT=gnome2 meson-multilib multilib toolchain-funcs virtualx IUSE=aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris +KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris LICENSE=LGPL-2+ PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax ) RDEPEND=>=app-accessibility/at-spi2-core-2.46.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.32 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( media-libs/libglvnd[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 REQUIRED_USE=|| ( aqua wayland X ) test? ( X ) xinerama? ( X ) RESTRICT=!test? ( test ) !test? ( test ) SLOT=3 -SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.40.tar.xz +SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.41.tar.xz _eclasses_=flag-o-matic e503ea5acc20410237ba33ec3f7c857d gnome.org e1b4f392dbfedfb8974b71b017937f08 gnome2 26fd01914b36038dc8e964ff4bd03a95 gnome2-utils a8cf148ec7f5ae0b1f1d33ae5f7f9e88 libtool 5f49a16f67f81bdf873e3d1f10b10001 meson 99466844dd8d4fcfb07578a76f5a9922 meson-multilib 8989922d980e5e870cc3de949d1b2586 multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multilib-build e8aed98bd43dbd25694310a660ad562c multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-utils-r1 8b220bbce5c119fb1d4d5c2f5588f3ea toolchain-funcs e56c7649b804f051623c8bc1a1c44084 virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3 -_md5_=d0826a9b5d8a9a3257d0aceb6a70bcfd +_md5_=c4dbf3502754f1ec07901259dd076159 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 455df3d6..fe1f4165 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -82,7 +82,7 @@ virtual/udev 314.1337-r1: Virtual to select between different udev daemon provid www-client/ungoogled-chromium 126.0.6478.126: Modifications to Chromium for removing Google integration and enhancing privacy x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package) x11-drivers/nvidia-drivers 390.157-r8 470.239.06-r1 535.171.04-r1: NVIDIA Accelerated Graphics Driver -x11-libs/gtk+ 2.24.33-r5 3.24.40-r1: Gimp ToolKit + +x11-libs/gtk+ 2.24.33-r5 3.24.41-r5: Gimp ToolKit + x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities x11-misc/nvidia-settings 390.157-r6 470.239.06-r1 535.171.04-r1: NVIDIA Linux X11 Settings Utility x11-misc/pcmanfm-qt-share 1337-r1: PCManFM-QT custom action to share folder using Samba diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 1a85517b..4cf0e2c5 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,2 +1,2 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 -DIST gtk+-3.24.40.tar.xz 13189496 BLAKE2B 6c098e879264051e61a639c327687ead6459c79f226aed5634e4b912d066913a006a5555483e3fab92352dc355fac6af04b910f76b909e99e33d79a03a8dde1f SHA512 21fac23b6375c2e545128e60d4e39f7ee9516a824e4a1834a318af5f2a9f125a8a8572a83bf94b4c179a16c66b6a913e74574ccf2e810301f1a593006a1980c7 +DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 diff --git a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch b/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch deleted file mode 100644 index e096e920..00000000 --- a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6880ac90a0211095cfea753316e002bd668a4e92 Mon Sep 17 00:00:00 2001 -From: Michael Wyraz <mw@brick4u.de> -Date: Fri, 19 Jan 2024 19:15:52 +0100 -Subject: [PATCH 1/2] don't free monitor->name twice (fixes #6345) - ---- - gdk/x11/gdkscreen-x11.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index f54bf51d04..4ac3167b30 100644 ---- a/gdk/x11/gdkscreen-x11.c -+++ b/gdk/x11/gdkscreen-x11.c -@@ -922,7 +922,6 @@ init_randr13 (GdkScreen *screen, gboolean *changed) - g_object_ref (monitor); - g_ptr_array_remove (x11_display->monitors, monitor); - gdk_display_monitor_removed (display, GDK_MONITOR (monitor)); -- free (monitor->name); - g_object_unref (monitor); - *changed = TRUE; - } --- -2.43.0 - - -From ba58b3a23df4213e17a80816c7687a59e104769d Mon Sep 17 00:00:00 2001 -From: Michael Wyraz <mw@brick4u.de> -Date: Fri, 19 Jan 2024 22:20:02 +0100 -Subject: [PATCH 2/2] Fix for #6342 - ---- - gdk/x11/gdkscreen-x11.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 4ac3167b30..6207b5f443 100644 ---- a/gdk/x11/gdkscreen-x11.c -+++ b/gdk/x11/gdkscreen-x11.c -@@ -851,7 +851,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed) - monitor = g_object_new (gdk_x11_monitor_get_type (), - "display", display, - NULL); -- monitor->name = g_steal_pointer (&name); -+ monitor->name = g_strdup (name); - monitor->output = output; - monitor->add = TRUE; - g_ptr_array_add (x11_display->monitors, monitor); --- -2.43.0 - diff --git a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch b/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch deleted file mode 100644 index aadbd7be..00000000 --- a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 76bc2a57136fd6cf0374fa3f86a7ba646b779803 Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Fri, 19 Jan 2024 10:41:33 +0000 -Subject: [PATCH 1/2] tests: Add GdkEvent casts in testinput - ---- - tests/testinput.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/testinput.c b/tests/testinput.c -index b68552a428..3d4d7f6f87 100644 ---- a/tests/testinput.c -+++ b/tests/testinput.c -@@ -194,7 +194,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event) - - print_axes (event->device, event->axes); - gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure); -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - event->x, event->y, pressure); - - motion_time = event->time; -@@ -239,10 +239,10 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event) - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_X, &x); - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_Y, &y); - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_PRESSURE, &pressure); -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - x, y, pressure); - -- print_axes (gdk_event_get_source_device (event), events[i]->axes); -+ print_axes (gdk_event_get_source_device ((GdkEvent *)event), events[i]->axes); - } - gdk_device_free_history (events, n_events); - } -@@ -252,7 +252,7 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event) - - gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure); - -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - event->x, event->y, pressure); - } - motion_time = event->time; --- -2.43.0 - - -From 05a12b1c5f8eecc621a7135eb313d6bfe6ccdc3b Mon Sep 17 00:00:00 2001 -From: David King <amigadave@amigadave.com> -Date: Fri, 19 Jan 2024 11:04:37 +0000 -Subject: [PATCH 2/2] testsuite: Fix casts in reftests - ---- - testsuite/reftests/gtk-reftest.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 1a51a9756b..88d8a849ca 100644 ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -381,7 +381,7 @@ enforce_default_settings (void) - - klass = g_type_class_ref (G_OBJECT_TYPE (settings)); - -- pspecs = g_object_class_list_properties (klass, &n_pspecs); -+ pspecs = g_object_class_list_properties (G_OBJECT_CLASS (klass), &n_pspecs); - for (i = 0; i < n_pspecs; i++) - { - GParamSpec *pspec = pspecs[i]; -@@ -394,7 +394,7 @@ enforce_default_settings (void) - continue; - - value = g_param_spec_get_default_value (pspec); -- g_object_set_property (settings, pspec->name, value); -+ g_object_set_property (G_OBJECT (settings), pspec->name, value); - } - - g_free (pspecs); --- -2.43.0 - diff --git a/x11-libs/gtk+/gtk+-3.24.40-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.41-r5.ebuild index 3b353a3e..8e646b38 100644 --- a/x11-libs/gtk+/gtk+-3.24.40-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.41-r5.ebuild @@ -18,7 +18,7 @@ REQUIRED_USE=" " RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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}] @@ -93,9 +93,6 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - # Upstream gtk-3-24 branch regression fixes and tests compile compat for modern C - "${FILESDIR}"/${PV}-gdkscreen-x11-fixes.patch - "${FILESDIR}"/${PV}-test-casts-gcc14.patch # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch ) |