diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-xfce/recipes-xfce')
15 files changed, 91 insertions, 42 deletions
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch index ef27e423b..89cc1f387 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch @@ -1,6 +1,20 @@ ---- a/configure.ac 2007-12-02 10:37:06.000000000 -0200 -+++ b/configure.ac 2008-06-05 17:21:42.000000000 -0300 -@@ -127,22 +127,24 @@ +From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 +From: Andreas Mueller <schnitzeltony@gmx.de> +Date: Mon, 1 Aug 2011 17:16:29 +0200 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +--- + configure.ac | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0de5ceb..3f92d1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,22 +143,24 @@ AC_FUNC_MMAP() dnl *************************************** dnl *** Check for strftime() extensions *** dnl *************************************** diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch index ac8bca5f3..348e147cf 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -1,22 +1,24 @@ -From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 +From 9231a2d5b9c5406f33aef3ab4de2dbec9b08ed13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 18 May 2012 21:13:00 +0200 Subject: [PATCH] Do not run tests at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Not-Applicable + +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- - Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 0ab3853..3e72391 100644 +index 226e79d..62ad18d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -8,8 +8,7 @@ SUBDIRS = \ +@@ -9,8 +9,7 @@ SUBDIRS = \ docs \ icons \ pixmaps \ @@ -24,8 +26,5 @@ index 0ab3853..3e72391 100644 - tests + po - AUTOMAKE_OPTIONS = \ - 1.9 \ --- -1.7.4.4 - + distclean-local: + rm -rf *.cache *~ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 99318d5aa..076477581 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -10,9 +10,10 @@ exo-csource creates c-header files from glade resource output files. When building xfce-packages from git instead of tarball this exo-csource-native is required. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- Makefile.am | 10 +--------- configure.ac | 22 ---------------------- @@ -40,7 +41,7 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index ba5395d..2605067 100644 +index 3f92d1b..0d4cc38 100644 --- a/configure.ac +++ b/configure.ac @@ -116,15 +116,6 @@ AC_PROG_CC() @@ -65,9 +66,9 @@ index ba5395d..2605067 100644 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) --XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) +-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) @@ -80,5 +81,5 @@ index ba5395d..2605067 100644 dnl ************************* dnl *** Check for gtk-doc *** -- -2.9.4 +2.14.3 diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb index d5508c0a5..d256b5769 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb @@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "2e560edfa8ddf77e21c4787a6f600171" -SRC_URI[sha256sum] = "8e8629f33783eba1ce6d092a42c28217458a0cc3d1ad7474097b9187054955c1" +SRC_URI[md5sum] = "724afcca224f5fb22b510926d2740e52" +SRC_URI[sha256sum] = "64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f" PACKAGES =+ "exo-csource" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch new file mode 100644 index 000000000..fb8910204 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch @@ -0,0 +1,23 @@ +Description: Fix FTBFS with glib 2.54 + glib-mkenums now expects input files to be UTF-8, + fix the encoding of libgnomeui/gnome-scores.h +Author: Adrian Bunk <bunk@debian.org> + +ported from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870738 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h +=================================================================== +--- gtk-xfce-engine-3.2.0.orig/gtk-3.0/xfce_style_types.h ++++ gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h +@@ -19,7 +19,7 @@ + * + * Portions based Thinice port by + * Tim Gerla <timg@rrv.net>, +- * Tomas Ögren <stric@ing.umu.se, ++ * Tomas Ögren <stric@ing.umu.se>, + * Richard Hult <rhult@codefactory.se> + * Portions based on Smooth theme by + * Andrew Johnson <ajgenius@ajgenius.us> diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb index ae7f99f5a..ef4f4bfa8 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb @@ -8,6 +8,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://glib-2.54-ftbfs.patch" + SRC_URI[md5sum] = "363d6c16a48a00e26d45c45c2e1fd739" SRC_URI[sha256sum] = "875c9c3bda96faf050a2224649cc42129ffb662c4de33add8c0fd1fb860b47ed" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index b8c917883..6d107b1b6 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) @@ -17,8 +18,8 @@ diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-priv index 723a10d..e6502f3 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -66,4 +66,8 @@ - <property name="<Control>F12" type="string" value="workspace_12_key"/> +@@ -75,4 +75,8 @@ + <property name="<Primary>F12" type="string" value="workspace_12_key"/> </property> </property> + <property name="providers" type="array"> diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index cc231b4bd..b73c9ee16 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PR = "r10" -inherit packagegroup +inherit packagegroup distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # mandatory RDEPENDS_${PN} = " \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb index 8f1b23e36..170e25070 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb @@ -9,8 +9,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "1bdf3c4a57ff886c512341f24b5e0e88" -SRC_URI[sha256sum] = "fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086" +SRC_URI[md5sum] = "8fea2af69c3acbb273fd1a177d3d8e47" +SRC_URI[sha256sum] = "e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d" S = "${WORKDIR}/Thunar-${PV}/" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb index 1f5419ad1..7e0c555a4 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb @@ -6,8 +6,8 @@ DEPENDS = "dbus-glib dbus-glib-native freetype gdk-pixbuf poppler curl xfce4-dev inherit xfce gtk-doc -SRC_URI[md5sum] = "0067054e6f1f90a13f90faadfca1e89e" -SRC_URI[sha256sum] = "d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173" +SRC_URI[md5sum] = "dd5f9bae6a2470eb5fff0dc9edd3ea09" +SRC_URI[sha256sum] = "4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac" SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" INSANE_SKIP_${PN} = "dev-so" @@ -15,6 +15,12 @@ INSANE_SKIP_${PN} = "dev-so" PACKAGECONFIG ??= "" PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" +do_install_append() { + # Makefile seems to race on creation of symlink. So ensure creation here + # until fixed properly + ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + FILES_${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.12.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb index 175a82707..7e7391167 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.12.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb @@ -2,13 +2,13 @@ DESCRIPTION="Xfce4 Application Finder" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS="glib-2.0 gtk+ libxfce4util libxfce4ui garcon dbus-glib xfconf" +DEPENDS="glib-2.0 gtk+3 libxfce4util libxfce4ui garcon dbus-glib xfconf" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "0b238b30686388c507c119b12664f1a1" -SRC_URI[sha256sum] = "2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567" +SRC_URI[md5sum] = "6b6cf080c891f7945953f8084a901552" +SRC_URI[sha256sum] = "c0eb3b29eba3cfa9175ed35174e83a21faa2a2423ddb79501fe8846cc430e3ae" FILES_${PN} += "${datadir}/appdata" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb index 80332cebe..9cc9a4bbc 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb @@ -4,12 +4,12 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck" -inherit xfce gtk-doc distro_features_check +inherit xfce gtk-doc distro_features_check gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "0b943f2e72a3693dddb1af559826cb62" -SRC_URI[sha256sum] = "93d58b80cca9c9eb58adb281bc75404df7cf6cae89f7f98bb9f38690009aa2e8" +SRC_URI[md5sum] = "803c9aabc2925dc97f96de125c52ba2e" +SRC_URI[sha256sum] = "42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9" SRC_URI += " \ file://0001-clock-time-make-change-of-system-s-timezone-change-t.patch \ file://0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ @@ -39,5 +39,6 @@ FILES_${PN}-gtk3 = " \ ${libdir}/libxfce4panel-2.0${SOLIBS} \ ${libdir}/xfce4/panel/wrapper-2.0 \ " -FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ +FILES_${PN}-dbg += " \ + ${libdir}/xfce4/panel/plugins/.debug \ " diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb index 08d00df72..ed117b0a6 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "2e2e24a1a22912d6a561ba6155887503" -SRC_URI[sha256sum] = "bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b" +SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430" +SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b" EXTRA_OECONF = " \ --enable-network-manager \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index 771da2c66..bf9bd3102 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -13,12 +13,12 @@ REQUIRED_DISTRO_FEATURES = "x11" # + minor bugfixes - sent mainline but no response # + option to hide mousepointer for a specific (touch) input device - sent mainline but no response SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.0-1 \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.3 \ file://0001-xsettings.xml-Set-default-themes.patch \ " -SRCREV = "c6683cb2cff489c16c2c7b5eab4017bb461f07f1" +SRCREV = "b701ac8b66b83c17469dd5009da51eeb59eba442" S = "${WORKDIR}/git" -PV = "4.12.0+git${SRCPV}" +PV = "4.12.3+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb index daecf828e..d9cbe7196 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb @@ -8,8 +8,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "cb34f4f333d7d122f1688d2f155202c8" -SRC_URI[sha256sum] = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac" +SRC_URI[md5sum] = "7571889368be72df185ce2d470f37198" +SRC_URI[sha256sum] = "098a35510562907e1431d5adbfa8307484a235c1dec6a43e2d58d2ac4241f1cb" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" |