diff options
| -rw-r--r-- | x11-libs/gtk+/Manifest | 6 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch | 34 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch | 13 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch | 42 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild (renamed from x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild) | 32 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild (renamed from x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild) | 29 |
6 files changed, 73 insertions, 83 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 2c580d37..152115f2 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,2 +1,4 @@ -DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 -DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc +DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858 +DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 +DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e +DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1 diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch new file mode 100644 index 00000000..629a2d75 --- /dev/null +++ b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch @@ -0,0 +1,34 @@ +From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Wed, 23 Jan 2019 12:02:27 -0500 +Subject: [PATCH] switch: Avoid problems with glyph availability + +If none of the glyphs we want are available, fall +back to using empty strings here, rather than causing +critical warnings. +--- + gtk/gtkswitch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c +index 1d42f572a9..4c49e243ed 100644 +--- a/gtk/gtkswitch.c ++++ b/gtk/gtkswitch.c +@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) + const char *on_glyphs[] = { + "⏽", /* U+23FD POWER ON SYMBOL */ + "❙", /* U+2759 MEDIUM VERTICAL BAR */ ++ "" + }; + + /* Glyphs for the OFF state, in descending order of preference */ + const char *off_glyphs[] = { + "⭘", /* U+2B58 HEAVY CIRCLE */ + "○", /* U+25CB WHITE CIRCLE */ ++ "" + }; + int i; + +-- +2.17.0 + diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch deleted file mode 100644 index b2a33155..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk+-2.24.31/gtk/gtk.symbols.orig 2018-03-18 15:17:39.296719190 -0000 -+++ gtk+-2.24.31/gtk/gtk.symbols 2018-03-18 15:17:57.490053094 -0000 -@@ -2498,8 +2498,8 @@ - #endif - #endif - --#if IN_HEADER(__gtk_marshal_MARSHAL_H__) --#if IN_FILE(__gtk_marshal_MARSHAL_C__) -+#if IN_HEADER(__gtk_marshal_MARSHAL_H__) || IN_HEADER(__GTK_MARSHAL_MARSHAL_H__) -+#if IN_FILE(__gtk_marshal_MARSHAL_C__) || IN_FILE(__GTK_MARSHAL_MARSHAL_C__) - #ifndef GTK_DISABLE_DEPRECATED - gtk_marshal_BOOLEAN__POINTER - gtk_marshal_BOOLEAN__POINTER_INT_INT diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch deleted file mode 100644 index 1d09721b..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch +++ /dev/null @@ -1,42 +0,0 @@ -From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 5 Oct 2016 12:20:14 -0400 -Subject: [PATCH] entry: Fix a corner case of overwrite mode - -We currently beep when a character is appended at the end in -overwrite mode. That is obviously not right. Patch based on -a patch by Ian MacDonald. - -https://bugzilla.gnome.org/show_bug.cgi?id=772389 ---- - gtk/gtkentry.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c -index b522039..bc33754 100644 ---- a/gtk/gtkentry.c -+++ b/gtk/gtkentry.c -@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry, - GtkEditable *editable = GTK_EDITABLE (entry); - gint tmp_pos; - gboolean old_need_im_reset; -+ guint text_length; - - old_need_im_reset = entry->need_im_reset; - entry->need_im_reset = FALSE; -@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry, - else - { - if (entry->overwrite_mode) -- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ { -+ text_length = gtk_entry_buffer_get_length (get_buffer (entry)); -+ if (entry->current_pos < text_length) -+ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ } - } - - tmp_pos = entry->current_pos; --- -2.10.0 - diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild index 644eb562..dd921c55 100644 --- a/x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" -inherit autotools eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx +inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz" LICENSE="LGPL-2+" SLOT="2" @@ -16,7 +18,7 @@ REQUIRED_USE=" xinerama? ( !aqua ) " -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 @@ -55,6 +57,7 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-libs/gobject-introspection-common + dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] @@ -92,6 +95,15 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/gtk-query-immodules-2.0$(get_exeext) ) +PATCHES=( + # Fix tests running when building out of sources, bug #510596, upstream bug #730319 + "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch + # Rely on split gtk-update-icon-cache package, bug #528810 + "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf + # Upstream gtk-2-24 branch up to 2018-09-08 state, bug #650536 safety + "${WORKDIR}"/patches/ # requires eautoreconf +) + strip_builddir() { local rule=$1 shift @@ -107,7 +119,7 @@ set_gtk2_confdir() { } src_prepare() { - # marshalers code was pre-generated with glib-2.31, upstream bug #662109 + # Various glib marshaller churn could break build against a different glib version, force regeneration rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \ perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die @@ -157,18 +169,6 @@ src_prepare() { strip_builddir SRC_SUBDIRS demos Makefile.{am,in} fi - # Fix tests running when building out of sources, bug #510596, upstream bug #730319 - eapply "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch - - # Rely on split gtk-update-icon-cache package, bug #528810 - eapply "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch - - # Fix beep when overwriting at the end of a gtkentry, from gtk-2-24 branch - eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtkentry-beep.patch - - eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch - - eautoreconf gnome2_src_prepare } diff --git a/x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild b/x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild index c76927c7..bd9020ce 100644 --- a/x11-libs/gtk+/gtk+-3.22.29-r1337.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal +inherit flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-20190206.tar.xz" LICENSE="LGPL-2+" SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" +IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X ) " -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 @@ -27,12 +29,14 @@ RESTRICT="test" # bug #???? COMMON_DEPEND=" >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] + >=media-libs/libepoxy-1.4[X(+)?,${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.37.3[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( @@ -43,7 +47,7 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.9 + >=dev-libs/wayland-protocols-1.12 media-libs/mesa[wayland,${MULTILIB_USEDEP}] >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] ) @@ -66,10 +70,12 @@ DEPEND="${COMMON_DEPEND} dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 + gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) @@ -117,13 +123,15 @@ src_prepare() { strip_builddir SRC_SUBDIRS examples Makefile.{am,in} fi + # gtk-3-24 branch at morning of 2019-02-07 - fribidi explicit linking, compiler warning fixes, small bugfixes + eapply "${WORKDIR}"/patches + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch # Fix broken autotools logic eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch - eautoreconf gnome2_src_prepare } @@ -138,6 +146,7 @@ multilib_src_configure() { $(use_enable cloudprint) \ $(use_enable colord) \ $(use_enable cups cups auto) \ + $(multilib_native_use_enable gtk-doc) \ $(multilib_native_use_enable introspection) \ $(use_enable wayland wayland-backend) \ $(use_enable X x11-backend) \ |