From 5f1cfd0879696a56f05c0bb3f5a3bb48a2dc4873 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 2 Mar 2015 00:50:34 +0100 Subject: libxfce4ui: update to 4.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...configure.ac-remove-optional-gtk3-support.patch | 37 ++++++++++++++++++++++ ...figure.ac.in-remove-optional-gtk3-support.patch | 37 ---------------------- .../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 29 ----------------- .../recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb | 27 ++++++++++++++++ 4 files changed, 64 insertions(+), 66 deletions(-) create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch new file mode 100644 index 0000000000..e154711927 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-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?= +Date: Wed, 18 Sep 2013 20:50:11 +0200 +Subject: [PATCH] configure.ac: 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 +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e47df04..b6edab1 100644 +--- 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]) + +-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/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 deleted file mode 100644 index a93fabface..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 deleted file mode 100644 index 6534f940cf..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -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 - -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}" -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--enable-maintainer-mode --disable-debug --with-vendor-info=${DISTRO}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" -FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \ - ${datadir}/glade3/catalogs/*.in" -PACKAGES += "${PN}-glade" -FILES_${PN}-glade = "${libdir}/glade3 \ - ${datadir}/glade3" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb new file mode 100644 index 0000000000..36f42d3f94 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +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 xfce autotools gettext gtk-doc + +SRC_URI += " \ + file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-configure.ac-remove-optional-gtk3-support.patch \ +" +SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9" +SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43" + +EXTRA_OECONF += "--with-vendor-info=${DISTRO}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" +FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \ + ${datadir}/glade3/catalogs/*.in" +PACKAGES += "${PN}-glade" +FILES_${PN}-glade = "${libdir}/glade3 \ + ${datadir}/glade3" -- cgit v1.2.3-54-g00ecf