From: Grazvydas Ignotas Date: Sat, 29 Dec 2012 17:28:59 +0000 (+0200) Subject: Revert "xfce4: Updated to new version (fixes xfwm4-doubleclick-bug)" X-Git-Tag: sz_154~31 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a270bdc893c0a2a6163ecb5a28c32e105262492;p=openembedded.git Revert "xfce4: Updated to new version (fixes xfwm4-doubleclick-bug)" This reverts commit 843e414db1cc07bb7093173bd66361454d973a3c. --- diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb deleted file mode 100644 index 663944a954..0000000000 --- a/recipes/xfce-base/libxfce4menu_4.6.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION="a freedesktop.org compliant menu library for Xfce4" -HOMEPAGE="http://www.xfce.org/projects/libraries" -DEPENDS = "gettext pkgconfig libxfce4util intltool" -RDEPENDS_${PN} = "gtk+ libxfce4util" - -LICENSE="LGPL-2 FDL-1.1" -PR = "r0" - -inherit xfce46 - -SRC_URI[md5sum] = "ff10cacb76803ee37159e3a43345f0d1" -SRC_URI[sha256sum] = "62352be57318d6f241c4f6e4b6f9303d0b80246ea8f6e4753a962360a9965162" diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb deleted file mode 100644 index d35c44d668..0000000000 --- a/recipes/xfce-base/thunar_1.0.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "File manager for the Xfce Desktop Environment" -HOMEPAGE="http://thunar.xfce.org" -DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin" -RDEPENDS_${PN} = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin" -RRECOMMENDS_${PN} = "shared-mime-info" -SECTION = "x11" -PR = "r0" - -inherit xfce46 - -XFCE_VERSION = "4.6.2" - -SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Thunar-${PV}.tar.bz2" - -S = "${WORKDIR}/Thunar-${PV}/" - -EXTRA_OECONF += "--disable-dependency-tracking --enable-dbus" - -FILES_${PN} += "${libdir}/thunarx-1/*.so \ - ${libdir}/thunarx-1/*.la \ - ${datadir}/dbus-1 \ - ${datadir}/thumbnailers \ - ${datadir}/Thunar \ - ${datadir}/xfce4" -FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/" - -SRC_URI[md5sum] = "c91073202d373a1f9951a1240083c36d" -SRC_URI[sha256sum] = "75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03" diff --git a/recipes/xfce-base/xfce-terminal_0.4.5.bb b/recipes/xfce-base/xfce-terminal_0.4.5.bb deleted file mode 100644 index 2d5f94e4c3..0000000000 --- a/recipes/xfce-base/xfce-terminal_0.4.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Terminal emulator for the Xfce desktop environment" -DEPENDS = "exo vte dbus-glib gtk+" -RDEPENDS_${PN} += "gnome-pty-helper" -PR = "r0" - -inherit xfce46 - -SRC_URI = "http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-${PV}.tar.bz2 \ -" - -S = "${WORKDIR}/Terminal-${PV}" - -FILES_${PN} += "${datadir}/Terminal" - -SRC_URI[md5sum] = "3c707628e2e97c6d9566cd74d400036a" -SRC_URI[sha256sum] = "92fddcbc1422076672d8ec61832793d4ceea2fc0db7d724a6acde0ec2bac8893" diff --git a/recipes/xfce-base/xfce-utils_4.6.2.bb b/recipes/xfce-base/xfce-utils_4.6.2.bb deleted file mode 100644 index 08048c4285..0000000000 --- a/recipes/xfce-base/xfce-utils_4.6.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Xfce4 Utilities" -DEPENDS = "virtual/libx11 libxfcegui4" -SECTION = "x11" -PR = "r0" - -inherit xfce46 - -FILES_${PN} += " \ - ${bindir}/* \ - ${datadir}/dbus-1/* \ - ${datadir}/xfce4/AUTHORS \ - ${datadir}/xfce4/BSD \ - ${datadir}/xfce4/COPYING \ - ${datadir}/xfce4/GPL \ - ${datadir}/xfce4/INFO* \ - ${datadir}/xfce4/LGPL \ - ${datadir}/xfce4/AUTHORS.html \ - ${datadir}/xfce4/BSD.html \ - ${datadir}/xfce4/COPYING.html \ - ${datadir}/xfce4/GPL.html \ - ${datadir}/xfce4/INFO.html \ - ${datadir}/xfce4/LGPL.html \ - ${datadir}/xsessions/xfce.desktop \ -" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml - -SRC_URI[md5sum] = "5d23407700d7e8c9751e17a5bc955109" -SRC_URI[sha256sum] = "54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a" diff --git a/recipes/xfce-base/xfce4-appfinder_4.6.2.bb b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb deleted file mode 100644 index a73383d104..0000000000 --- a/recipes/xfce-base/xfce4-appfinder_4.6.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -# xfce4-appfinder build file - -DESCRIPTION="Xfce4 Application Finder" -DEPENDS="libxfcegui4 libxfce4menu thunar" -SECTION = "x11" -PR = "r0" - -inherit xfce46 - -SRC_URI[md5sum] = "7752e43578b821e35010bcd3762da166" -SRC_URI[sha256sum] = "a1bf35b838922a7f81f588c727a6ef2f56b1bed0c46f7c36b209ac336f7e492a" diff --git a/recipes/xfce-base/xfce4-panel_4.6.4.bb b/recipes/xfce-base/xfce4-panel_4.6.4.bb deleted file mode 100644 index fe402b8690..0000000000 --- a/recipes/xfce-base/xfce4-panel_4.6.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -# xfce4-panel OE build file - -DESCRIPTION = "Xfce4 Panel" -DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck" -SECTION = "x11" -PR = "r0" - -inherit xfce46 - -SRC_URI[md5sum] = "82f10a42aefca4cc26a6633e7478cc65" -SRC_URI[sha256sum] = "cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7" - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -python populate_packages_prepend() { - plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) - plugin_name = bb.data.expand('${PN}-plugin-%s', d) - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, - '${PN} plugin for %s', extra_depends='', prepend=True, - aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', - '${sysconfdir}/xdg/xfce/panel/%s-*', - '${datadir}/icons/hicolor/48x48/apps/*-%s.png', - '${bindir}/*%s*']) -} - -PACKAGES_DYNAMIC = "${PN}-plugin-*" diff --git a/recipes/xfce-base/xfce4-session-4.6.2/0001-no_tips_on_startup.patch b/recipes/xfce-base/xfce4-session-4.6.2/0001-no_tips_on_startup.patch deleted file mode 100644 index 39f0b4a454..0000000000 --- a/recipes/xfce-base/xfce4-session-4.6.2/0001-no_tips_on_startup.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: xfce4-session-4.5.99.1/xfce4-tips/xfce4-tips-autostart.desktop.in -=================================================================== ---- xfce4-session-4.5.99.1.orig/xfce4-tips/xfce4-tips-autostart.desktop.in 2009-02-15 17:06:23.000000000 -0600 -+++ xfce4-session-4.5.99.1/xfce4-tips/xfce4-tips-autostart.desktop.in 2009-02-15 17:06:32.000000000 -0600 -@@ -7,4 +7,4 @@ - Terminal=false - Type=Application - OnlyShowIn=XFCE; --Hidden=false -+Hidden=true diff --git a/recipes/xfce-base/xfce4-session_4.6.2.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb deleted file mode 100644 index e700f7ace2..0000000000 --- a/recipes/xfce-base/xfce4-session_4.6.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment" -DEPENDS = "libxfcegui4 libxfce4util dbus iceauth xfce-utils" -SECTION = "x11" - -PR = "r0" - -inherit xfce46 - -RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11" - -SRC_URI += "file://0001-no_tips_on_startup.patch;patch=1" - -FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so" -FILES_${PN} += "${datadir}/xfce4/tips/*" -FILES_${PN} += "${datadir}/themes/Default/balou/*" - -FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.so" -FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.a" - -FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.la" -FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.a" - -SRC_URI[md5sum] = "9d9890130e45e0e9476591ed9ba2c9d5" -SRC_URI[sha256sum] = "725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8" diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb deleted file mode 100644 index 3db4c917d8..0000000000 --- a/recipes/xfce-base/xfconf_4.6.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Xfce configuration daemon and utilities" -HOMEPAGE = "http://www.xfce.org" -SECTION = "x11/wm" -LICENSE = "GPL-2" - -DEPENDS = "libxfce4util" -RDEPENDS_${PN} = "libxfce4util" - -PR = "r0" - -inherit xfce46 - -FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service" - -SRC_URI[md5sum] = "5ff93c15077c6dbbcd38c437bc1ab2ef" -SRC_URI[sha256sum] = "7b2635abc33ae6a76145238ed27557bc1ff91b1a5ee0757962f798a66d56f478" diff --git a/recipes/xfce-base/xfdesktop_4.6.2.bb b/recipes/xfce-base/xfdesktop_4.6.2.bb deleted file mode 100644 index c3a3bca232..0000000000 --- a/recipes/xfce-base/xfdesktop_4.6.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Xfce4 Desktop Manager" -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 exo libxfcegui4 xfce4-panel thunar gtk+" -RDEPENDS_${PN} = "libxfcegui4 libxml2 xfce4-panel thunar exo gtk+" -PR = "r0" - -inherit xfce46 - -do_configure() { - oe_runconf -} - -FILES_xfdesktop-backdrops = "${datadir}/xfce4/backdrops/*" -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ - ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ - ${datadir}/xfce4/panel-plugins/*.desktop" -FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug" - -SRC_URI[md5sum] = "e800ea9fee7a5c5eaf2ae96e23a83e3a" -SRC_URI[sha256sum] = "cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb" diff --git a/recipes/xfce-base/xfwm4_4.6.2.bb b/recipes/xfce-base/xfwm4_4.6.2.bb deleted file mode 100644 index 3ea7f5281f..0000000000 --- a/recipes/xfce-base/xfwm4_4.6.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -# xfwm4 OE build file - -DESCRIPTION="Xfce4 Window Manager" -SECTION = "x11/wm" -PR = "r0" - -inherit xfce46 update-alternatives - -FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" - -DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4" -RDEPENDS_${PN} = "xfwm4-theme-default" - -EXTRA_OECONF += " --enable-startup-notification" - -PACKAGES_DYNAMIC += "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY = "30" - -FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" - -SRC_URI[md5sum] = "3e6c0c54b028b6ea60e865e55ecdf3f8" -SRC_URI[sha256sum] = "212819ee03c24635f79d50930284c422469e22489952d0b286e6fe5af2155828"