summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch (renamed from meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch)10
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb (renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb)14
2 files changed, 11 insertions, 13 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-remove-optional-gtk3-support.patch
index a93fabfac..e15471192 100644
--- 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-remove-optional-gtk3-support.patch
@@ -1,7 +1,7 @@
1From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001 1From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 18 Sep 2013 20:50:11 +0200 3Date: Wed, 18 Sep 2013 20:50:11 +0200
4Subject: [PATCH] configure.ac.in: remove optional gtk3 support 4Subject: [PATCH] configure.ac: remove optional gtk3 support
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -12,13 +12,13 @@ Upstream-Status: Inappropriate [configuration]
12 12
13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
14--- 14---
15 configure.ac.in | 6 ------ 15 configure.ac | 6 ------
16 1 file changed, 6 deletions(-) 16 1 file changed, 6 deletions(-)
17 17
18diff --git a/configure.ac.in b/configure.ac.in 18diff --git a/configure.ac b/configure.ac
19index e47df04..b6edab1 100644 19index e47df04..b6edab1 100644
20--- a/configure.ac.in 20--- a/configure.ac
21+++ b/configure.ac.in 21+++ b/configure.ac
22@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0]) 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]) 23 XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
24 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) 24 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
index 6534f940c..36f42d3f9 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
@@ -4,18 +4,16 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" 4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
5DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" 5DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
6 6
7inherit autotools gettext gtk-doc xfce xfce-git 7inherit xfce autotools gettext gtk-doc
8 8
9SRC_URI = " \ 9SRC_URI += " \
10 git://git.xfce.org/xfce/libxfce4ui;protocol=git \
11 file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ 10 file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
12 file://0002-configure.ac.in-remove-optional-gtk3-support.patch \ 11 file://0002-configure.ac-remove-optional-gtk3-support.patch \
13" 12"
14SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e" 13SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9"
15PV = "4.10.0+git${SRCPV}" 14SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"
16S = "${WORKDIR}/git"
17 15
18EXTRA_OECONF += "--enable-maintainer-mode --disable-debug --with-vendor-info=${DISTRO}" 16EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
19 17
20PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
21PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" 19PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"