diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-09-21 10:41:32 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-05 12:36:03 +0200 |
| commit | c4828167f7bac211cd65387085d28d4854456994 (patch) | |
| tree | e7179dd2fcf25a6d050abbd502edb3884dd44169 /meta-xfce | |
| parent | 3e084acd07fc413d678e9401674d24a5d594ff5a (diff) | |
| download | meta-openembedded-contrib-c4828167f7bac211cd65387085d28d4854456994.tar.gz | |
libxfce4ui: avoid dragging in gtk3
gtk3 support was introduced in b3a2a01b40affbedc2b0951f7180c1212d24d532 when we
moved to latest git
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
| -rw-r--r-- | meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch | 37 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch new file mode 100644 index 00000000000..a93fabface8 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch @@ -0,0 +1,37 @@ +From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Wed, 18 Sep 2013 20:50:11 +0200 +Subject: [PATCH] configure.ac.in: remove optional gtk3 support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +it drags in gtk3 if that was build before. This is not yet wanted + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.ac.in | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index e47df04..b6edab1 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0]) + XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) + +-dnl *********************************************************** +-dnl *** Optional support for a GTK+3 version of the library *** +-dnl *********************************************************** +-XDT_CHECK_OPTIONAL_PACKAGE([GTK3], +- [gtk+-3.0], [3.2.0], [gtk3], +- [GTK+ 3 support]) + AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"]) + + dnl ************************************************* +-- +1.8.3.1 + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb index 594358dae50..1a2b58ad9de 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb @@ -9,6 +9,7 @@ inherit xfce SRC_URI = " \ git://git.xfce.org/xfce/libxfce4ui;protocol=git \ file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-configure.ac.in-remove-optional-gtk3-support.patch \ " SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e" PV = "4.10.0+git${SRCPV}" |