groups/261.native_packages_x11.group: drop gtk2

Signed-off-by: Ørjan Malde <red@foxi.me>

2 files changed, 1 insertions, 44 deletions

diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index d2db5261..cb4f389b 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -3,7 +3,7 @@
 #
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-atk cairo fontconfig freetype freetype_pre gdk gtk2 gxemul harfbuzz imlib2
+atk cairo fontconfig freetype freetype_pre gdk gxemul harfbuzz imlib2
 libcaca libfontenc libICE libpthread_stubs libSM libX11 libXau
 libXaw libXdamage libXdmcp libXext libXfixes libXfont2 libXft libXi libxkbfile
 libXmu libXpm libXt libXtst libXcursor pango pixman rdesktop rxvt_unicode
@@ -40,13 +40,6 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_GDK_SHA256SUM:=f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace};
 : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz};
 : ${PKG_GDK_CONFIG_CACHE_EXTRA:="enable_gio_sniffing=yes"};
-: ${PKG_GTK2_DEPENDS:="atk cairo freetype gdk glib libX11 pango Xrender"};
-: ${PKG_GTK2_SHA256SUM:=68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658};
-: ${PKG_GTK2_VERSION:=2.24.31};
-: ${PKG_GTK2_URL:=http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_GTK2_VERSION%.*}/gtk+-${PKG_GTK2_VERSION}.tar.xz};
-: ${PKG_GTK2_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/pango-1.0 -I${PREFIX_NATIVE}/include/gdk-pixbuf-2.0 -I${PREFIX_NATIVE}/include/atk-1.0 -I${PREFIX_NATIVE}/include/cairo -I${PREFIX_NATIVE}/include/glib-2.0 -I${PREFIX_NATIVE}/include/glib-2.0/gio -I${PREFIX_NATIVE}/lib/glib-2.0/include"};
-: ${PKG_GTK2_CONFIGURE_ARGS_EXTRA:="--disable-cups --disable-papi"};
-: ${PKG_GTK2_DISABLED:=1};
 : ${PKG_GXEMUL_DEPENDS:="libX11"};
 : ${PKG_GXEMUL_SHA256SUM:=79c4437c6f8ca904f46d33ac36062a65fdcf4a92a248478e408ab11295cf8e83};
 : ${PKG_GXEMUL_VERSION:=0.7.0};
diff --git a/patches/gtk2-2.24.31.local.patch b/patches/gtk2-2.24.31.local.patch
deleted file mode 100644
index fe47cd61..00000000
--- a/patches/gtk2-2.24.31.local.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru gtk+-2.24.31.orig/gtk/Makefile.in gtk+-2.24.31/gtk/Makefile.in
---- gtk+-2.24.31.orig/gtk/Makefile.in	2016-09-09 21:33:09.000000000 +0200
-+++ gtk+-2.24.31/gtk/Makefile.in	2017-10-20 00:08:05.310575203 +0200
-@@ -1937,7 +1937,7 @@
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
- libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
--libgtk_x11_2_0_la_LIBADD = $(libadd)
-+libgtk_x11_2_0_la_LIBADD = $(libadd) -latk-1.0 -lglib-2.0 -lgobject-2.0
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
- libgtk_quartz_2_0_la_LIBADD = $(libadd)
- libgtk_directfb_2_0_la_LIBADD = $(libadd)
-diff -ru gtk+-2.24.31.orig/Makefile.in gtk+-2.24.31/Makefile.in
---- gtk+-2.24.31.orig/Makefile.in	2016-09-09 21:33:07.000000000 +0200
-+++ gtk+-2.24.31/Makefile.in	2017-10-20 00:07:42.010704831 +0200
-@@ -564,7 +564,7 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SRC_SUBDIRS = gdk gtk modules demos tests perf
-+SRC_SUBDIRS = gdk gtk modules perf
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- 
- # require automake 1.4
-
---- gtk+-2.24.31/configure.orig	2016-09-09 19:33:11.000000000 +0000
-+++ gtk+-2.24.31/configure	2017-11-28 09:52:56.536000000 +0000
-@@ -24351,7 +24351,7 @@
- GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
- ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
- PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
--CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
-+CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
- 
- 
-