summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch13
-rw-r--r--x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild6
2 files changed, 17 insertions, 2 deletions
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
new file mode 100644
index 00000000..b2a33155
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch
@@ -0,0 +1,13 @@
+--- 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+/gtk+-2.24.31-r1337.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild
index 37b52316..968ec491 100644
--- a/x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.31-r1337.ebuild
@@ -115,8 +115,8 @@ set_gtk2_confdir() {
src_prepare() {
# marshalers code was pre-generated with glib-2.31, upstream bug #662109
- rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
- perf/marshalers.c || die
+ 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
# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
@@ -173,6 +173,8 @@ src_prepare() {
# 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
}