summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-09-21 10:41:32 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 12:36:03 +0200
commitc4828167f7bac211cd65387085d28d4854456994 (patch)
treee7179dd2fcf25a6d050abbd502edb3884dd44169 /meta-xfce
parent3e084acd07fc413d678e9401674d24a5d594ff5a (diff)
downloadmeta-openembedded-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.patch37
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb1
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 000000000..a93fabfac
--- /dev/null
+++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
@@ -0,0 +1,37 @@
1From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 18 Sep 2013 20:50:11 +0200
4Subject: [PATCH] configure.ac.in: remove optional gtk3 support
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9it drags in gtk3 if that was build before. This is not yet wanted
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
14---
15 configure.ac.in | 6 ------
16 1 file changed, 6 deletions(-)
17
18diff --git a/configure.ac.in b/configure.ac.in
19index e47df04..b6edab1 100644
20--- a/configure.ac.in
21+++ b/configure.ac.in
22@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0])
23 XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
24 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
25
26-dnl ***********************************************************
27-dnl *** Optional support for a GTK+3 version of the library ***
28-dnl ***********************************************************
29-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
30- [gtk+-3.0], [3.2.0], [gtk3],
31- [GTK+ 3 support])
32 AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"])
33
34 dnl *************************************************
35--
361.8.3.1
37
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 594358dae..1a2b58ad9 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
9SRC_URI = " \ 9SRC_URI = " \
10 git://git.xfce.org/xfce/libxfce4ui;protocol=git \ 10 git://git.xfce.org/xfce/libxfce4ui;protocol=git \
11 file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ 11 file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
12 file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
12" 13"
13SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e" 14SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e"
14PV = "4.10.0+git${SRCPV}" 15PV = "4.10.0+git${SRCPV}"