aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-03-02 00:50:34 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-03-21 16:42:24 +0100
commit5f1cfd0879696a56f05c0bb3f5a3bb48a2dc4873 (patch)
tree4cd9d15adba5691bdf9cab7504e6871d901f056a /meta-xfce
parent0b6abbbcb033ee95d9d1f12c9d72cbbb784362d8 (diff)
downloadmeta-openembedded-contrib-5f1cfd0879696a56f05c0bb3f5a3bb48a2dc4873.tar.gz
meta-openembedded-contrib-5f1cfd0879696a56f05c0bb3f5a3bb48a2dc4873.tar.bz2
meta-openembedded-contrib-5f1cfd0879696a56f05c0bb3f5a3bb48a2dc4873.zip
libxfce4ui: update to 4.12.1
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-xfce')
-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 a93fabface..e154711927 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 @@
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
+Subject: [PATCH] configure.ac: remove optional gtk3 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -12,13 +12,13 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- configure.ac.in | 6 ------
+ configure.ac | 6 ------
1 file changed, 6 deletions(-)
-diff --git a/configure.ac.in b/configure.ac.in
+diff --git a/configure.ac b/configure.ac
index e47df04..b6edab1 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
+--- a/configure.ac
++++ b/configure.ac
@@ -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])
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 6534f940cf..36f42d3f94 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"
LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
-inherit autotools gettext gtk-doc xfce xfce-git
+inherit xfce autotools gettext gtk-doc
-SRC_URI = " \
- git://git.xfce.org/xfce/libxfce4ui;protocol=git \
+SRC_URI += " \
file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
- file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
+ file://0002-configure.ac-remove-optional-gtk3-support.patch \
"
-SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e"
-PV = "4.10.0+git${SRCPV}"
-S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9"
+SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"
-EXTRA_OECONF += "--enable-maintainer-mode --disable-debug --with-vendor-info=${DISTRO}"
+EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
PACKAGECONFIG ??= ""
PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"