* xfce 4.6.2 recipes
@ 2010-06-16 12:33 Andreas Mueller
2010-06-16 12:42 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Andreas Mueller @ 2010-06-16 12:33 UTC (permalink / raw)
To: openembedded-devel
Below you find new recipes for xfce 4.6.2. My gumstix overo works well with
them - I discovered no fallout up to now.
I am sure that this is not the correct place to post patches. Checked OE page
but did not find hints and asked this in my last post (). So please what is
the correct place/procedure for RFC/PATCHES?
diff --git a/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
new file mode 100644
index 0000000..a667f11
--- /dev/null
+++ b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
@@ -0,0 +1,79 @@
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index 791a536..4b130c3 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #endif
+
++#include <langinfo.h>
++
+ #include <libhal-storage.h>
+
+ #include <exo-hal/exo-hal.h>
+@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR,
G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+
+
+ /**
++ * exo_mount_hal_iocharset:
++ *
++ * Determines the preferred iocharset for filesystems
++ * that support it.
++ *
++ * Return value: iocharset string or %NULL if none.
++ **/
++static const gchar*
++exo_mount_hal_iocharset ()
++{
++ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
++ if (cs != NULL)
++ return cs;
++
++ const char* codeset = nl_langinfo (CODESET);
++ if (codeset && !strcmp (codeset, "UTF-8"))
++ return "utf8";
++
++ return NULL;
++}
++
++
++
++/**
+ * exo_mount_hal_device_mount:
+ * @device : an #ExoMountHalDevice.
+ * @error : return location for errors or %NULL.
+@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+ /* however this one is FreeBSD specific */
+ options[n++] = g_strdup ("longnames");
+ }
++ else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
++ {
++ const gchar* iocharset = exo_mount_hal_iocharset();
++ if (iocharset != NULL)
++ options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
++ }
+ }
+ }
+
+diff --git a/exo-mount/main.c b/exo-mount/main.c
+index 80eae1d..f442019 100644
+--- a/exo-mount/main.c
++++ b/exo-mount/main.c
+@@ -39,6 +39,8 @@
+ #include <string.h>
+ #endif
+
++#include <locale.h>
++
+ #include <glib/gstdio.h>
+
+ #include <exo-hal/exo-hal.h>
+@@ -97,6 +99,8 @@ main (int argc, char **argv)
+ /* initialize the i18n support */
+ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
++ setlocale(LC_CTYPE, "");
++
+ /* initialize GTK+ */
+ if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries,
GETTEXT_PACKAGE, &err))
+ {
diff --git a/recipes/xfce-base/exo_0.3.107.bb
b/recipes/xfce-base/exo_0.3.107.bb
new file mode 100644
index 0000000..30079d8
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -0,0 +1,29 @@
+DESCRIPTION="XFCE extensions and framework library with session management
support"
+DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
+SECTION = "x11"
+PR = "r0"
+
+inherit xfce46 python-dir
+
+XFCE_VERSION = "4.6.2"
+
+SRC_URI += " \
+ file://exo-0.3.107-iocharset.patch \
+ file://exo-no-tests.patch \
+ file://configure.patch \
+"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':
\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+ ${PYTHON_SITEPACKAGES_DIR}/* \
+ ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+"
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
+
+SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
+SRC_URI[sha256sum]
= "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb
b/recipes/xfce-base/libxfce4menu_4.6.2.bb
new file mode 100644
index 0000000..663944a
--- /dev/null
+++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
@@ -0,0 +1,12 @@
+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/libxfce4util_4.6.2.bb
b/recipes/xfce-base/libxfce4util_4.6.2.bb
new file mode 100644
index 0000000..67aba2e
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
@@ -0,0 +1,18 @@
+# libxfce4util OE build file
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools "
+PR = "r0"
+
+inherit xfce46
+
+EXTRA_OECONF
+= "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
+
+SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
+SRC_URI[sha256sum]
= "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb
b/recipes/xfce-base/libxfcegui4_4.6.4.bb
new file mode 100644
index 0000000..f3e43b5
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
@@ -0,0 +1,17 @@
+# libxfcegui4 OE build file
+
+DESCRIPTION = "Xfce Widget library and X Window System interaction"
+DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh
libxml2 gtk+ libglade"
+RDEPENDS_${PN} = "xfconf startup-notification "
+
+SECTION = "x11/libs"
+PR = "r0"
+
+inherit xfce46
+
+LEAD_SONAME = "libxfcegui4.so.4"
+
+FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so
${datadir}/xfce4/mime ${datadir}/icons/hicolor"
+
+SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
+SRC_URI[sha256sum]
= "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb
b/recipes/xfce-base/thunar_1.0.2.bb
new file mode 100644
index 0000000..d35c44d
--- /dev/null
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..2d5f94e
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..c9a1deb
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..27fa550
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
@@ -0,0 +1,11 @@
+# xfce4-appfinder build file
+
+DESCRIPTION="XFCE 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
new file mode 100644
index 0000000..fe402b8
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -0,0 +1,30 @@
+# 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.bb
b/recipes/xfce-base/xfce4-session_4.6.2.bb
new file mode 100644
index 0000000..843b86c
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
@@ -0,0 +1,22 @@
+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"
+
+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/xfce4-settings_4.6.5.bb
b/recipes/xfce-base/xfce4-settings_4.6.5.bb
new file mode 100644
index 0000000..65e4869
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo
libxfce4util libxfcegui4"
+
+PR = "r0"
+
+inherit xfce46
+
+SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
+SRC_URI[sha256sum]
= "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
+
+RDEPENDS_${PN} = "xfconf exo"
+
diff --git a/recipes/xfce-base/xfconf_4.6.2.bb
b/recipes/xfce-base/xfconf_4.6.2.bb
new file mode 100644
index 0000000..3db4c91
--- /dev/null
+++ b/recipes/xfce-base/xfconf_4.6.2.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..ede1b94
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..8d489a6
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -0,0 +1,31 @@
+# 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-16 12:33 xfce 4.6.2 recipes Andreas Mueller
@ 2010-06-16 12:42 ` Martin Jansa
2010-06-16 12:51 ` Andreas Mueller
0 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2010-06-16 12:42 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 16, 2010 at 02:33:54PM +0200, Andreas Mueller wrote:
> Below you find new recipes for xfce 4.6.2. My gumstix overo works well with
> them - I discovered no fallout up to now.
>
> I am sure that this is not the correct place to post patches. Checked OE page
> but did not find hints and asked this in my last post (). So please what is
> the correct place/procedure for RFC/PATCHES?
This is right place as this states:
http://wiki.openembedded.net/index.php/Getting_started#Adding_Packages
But your e-mail client wrapped every line > 80chars, so please resend
with "git send-email" command, or at least setup your e-mail client to
not wrap longer lines.
Regards,
--
Jansa 'JaMa' Martin jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-16 12:42 ` Martin Jansa
@ 2010-06-16 12:51 ` Andreas Mueller
2010-06-16 13:31 ` Jens Seidel
0 siblings, 1 reply; 12+ messages in thread
From: Andreas Mueller @ 2010-06-16 12:51 UTC (permalink / raw)
To: openembedded-devel
Oops...
diff --git a/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
new file mode 100644
index 0000000..a667f11
--- /dev/null
+++ b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
@@ -0,0 +1,79 @@
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index 791a536..4b130c3 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #endif
+
++#include <langinfo.h>
++
+ #include <libhal-storage.h>
+
+ #include <exo-hal/exo-hal.h>
+@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+
+
+ /**
++ * exo_mount_hal_iocharset:
++ *
++ * Determines the preferred iocharset for filesystems
++ * that support it.
++ *
++ * Return value: iocharset string or %NULL if none.
++ **/
++static const gchar*
++exo_mount_hal_iocharset ()
++{
++ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
++ if (cs != NULL)
++ return cs;
++
++ const char* codeset = nl_langinfo (CODESET);
++ if (codeset && !strcmp (codeset, "UTF-8"))
++ return "utf8";
++
++ return NULL;
++}
++
++
++
++/**
+ * exo_mount_hal_device_mount:
+ * @device : an #ExoMountHalDevice.
+ * @error : return location for errors or %NULL.
+@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+ /* however this one is FreeBSD specific */
+ options[n++] = g_strdup ("longnames");
+ }
++ else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
++ {
++ const gchar* iocharset = exo_mount_hal_iocharset();
++ if (iocharset != NULL)
++ options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
++ }
+ }
+ }
+
+diff --git a/exo-mount/main.c b/exo-mount/main.c
+index 80eae1d..f442019 100644
+--- a/exo-mount/main.c
++++ b/exo-mount/main.c
+@@ -39,6 +39,8 @@
+ #include <string.h>
+ #endif
+
++#include <locale.h>
++
+ #include <glib/gstdio.h>
+
+ #include <exo-hal/exo-hal.h>
+@@ -97,6 +99,8 @@ main (int argc, char **argv)
+ /* initialize the i18n support */
+ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
++ setlocale(LC_CTYPE, "");
++
+ /* initialize GTK+ */
+ if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
+ {
diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
new file mode 100644
index 0000000..30079d8
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -0,0 +1,29 @@
+DESCRIPTION="XFCE extensions and framework library with session management support"
+DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
+SECTION = "x11"
+PR = "r0"
+
+inherit xfce46 python-dir
+
+XFCE_VERSION = "4.6.2"
+
+SRC_URI += " \
+ file://exo-0.3.107-iocharset.patch \
+ file://exo-no-tests.patch \
+ file://configure.patch \
+"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+ ${PYTHON_SITEPACKAGES_DIR}/* \
+ ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+"
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
+
+SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
+SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb
new file mode 100644
index 0000000..663944a
--- /dev/null
+++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
@@ -0,0 +1,12 @@
+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/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
new file mode 100644
index 0000000..67aba2e
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
@@ -0,0 +1,18 @@
+# libxfce4util OE build file
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools "
+PR = "r0"
+
+inherit xfce46
+
+EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
+
+SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
+SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
new file mode 100644
index 0000000..f3e43b5
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
@@ -0,0 +1,17 @@
+# libxfcegui4 OE build file
+
+DESCRIPTION = "Xfce Widget library and X Window System interaction"
+DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
+RDEPENDS_${PN} = "xfconf startup-notification "
+
+SECTION = "x11/libs"
+PR = "r0"
+
+inherit xfce46
+
+LEAD_SONAME = "libxfcegui4.so.4"
+
+FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
+
+SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
+SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
new file mode 100644
index 0000000..d35c44d
--- /dev/null
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..2d5f94e
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..c9a1deb
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..27fa550
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
@@ -0,0 +1,11 @@
+# xfce4-appfinder build file
+
+DESCRIPTION="XFCE 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
new file mode 100644
index 0000000..fe402b8
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -0,0 +1,30 @@
+# 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.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
new file mode 100644
index 0000000..843b86c
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
@@ -0,0 +1,22 @@
+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"
+
+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/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
new file mode 100644
index 0000000..65e4869
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
+
+PR = "r0"
+
+inherit xfce46
+
+SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
+SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
+
+RDEPENDS_${PN} = "xfconf exo"
+
diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb
new file mode 100644
index 0000000..3db4c91
--- /dev/null
+++ b/recipes/xfce-base/xfconf_4.6.2.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..ede1b94
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..8d489a6
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -0,0 +1,31 @@
+# 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-16 12:51 ` Andreas Mueller
@ 2010-06-16 13:31 ` Jens Seidel
2010-06-17 12:58 ` Andreas Mueller
0 siblings, 1 reply; 12+ messages in thread
From: Jens Seidel @ 2010-06-16 13:31 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 16, 2010 at 02:51:26PM +0200, Andreas Mueller wrote:
> diff --git a/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
> new file mode 100644
> index 0000000..a667f11
> --- /dev/null
> +++ b/recipes/xfce-base/exo-0.3.107/exo-0.3.107-iocharset.patch
> @@ -0,0 +1,79 @@
> +diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
> +index 791a536..4b130c3 100644
> +--- a/exo-mount/exo-mount-hal.c
> ++++ b/exo-mount/exo-mount-hal.c
> +@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
> +
> +
> + /**
> ++ * exo_mount_hal_iocharset:
> ++ *
> ++ * Determines the preferred iocharset for filesystems
> ++ * that support it.
> ++ *
> ++ * Return value: iocharset string or %NULL if none.
> ++ **/
> ++static const gchar*
> ++exo_mount_hal_iocharset ()
> ++{
> ++ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
> ++ if (cs != NULL)
> ++ return cs;
> ++
> ++ const char* codeset = nl_langinfo (CODESET);
> ++ if (codeset && !strcmp (codeset, "UTF-8"))
> ++ return "utf8";
> ++
> ++ return NULL;
Should this be
return codeset;
? Otherwise how to specify an encoding such as ISO-8859-1?
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
> @@ -0,0 +1,30 @@
> +DESCRIPTION="XFCE4 Utilities"
XFCE4 or Xfce4?
Compare also other DESCRIPTIONS!
> +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
> @@ -0,0 +1,22 @@
> +DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment"
two spaces
Jens
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-16 13:31 ` Jens Seidel
@ 2010-06-17 12:58 ` Andreas Mueller
2010-06-17 13:32 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Andreas Mueller @ 2010-06-17 12:58 UTC (permalink / raw)
To: openembedded-devel
On Wednesday 16 June 2010 03:31:53 pm Jens Seidel wrote:
> Should this be
> return codeset;
> ? Otherwise how to specify an encoding such as ISO-8859-1?
As far as I understand http://bugzilla.xfce.org/show_bug.cgi?id=4294 , http://git.xfce.org/xfce/exo/plain/NEWS?h=xfce-4.6 and http://sisyphus.ru/srpm/Sisyphus/exo/patches/4 the related error
was already fixed in exo-0.3.103. So I removed this patch (either from
> XFCE4 or Xfce4?
>
> Compare also other DESCRIPTIONS!
>
see below
>
> two spaces
>
see below
And here we go again:
diff --git a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
deleted file mode 100644
index a667f11..0000000
--- a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
-index 791a536..4b130c3 100644
---- a/exo-mount/exo-mount-hal.c
-+++ b/exo-mount/exo-mount-hal.c
-@@ -34,6 +34,8 @@
- #include <unistd.h>
- #endif
-
-+#include <langinfo.h>
-+
- #include <libhal-storage.h>
-
- #include <exo-hal/exo-hal.h>
-@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
-
-
- /**
-+ * exo_mount_hal_iocharset:
-+ *
-+ * Determines the preferred iocharset for filesystems
-+ * that support it.
-+ *
-+ * Return value: iocharset string or %NULL if none.
-+ **/
-+static const gchar*
-+exo_mount_hal_iocharset ()
-+{
-+ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
-+ if (cs != NULL)
-+ return cs;
-+
-+ const char* codeset = nl_langinfo (CODESET);
-+ if (codeset && !strcmp (codeset, "UTF-8"))
-+ return "utf8";
-+
-+ return NULL;
-+}
-+
-+
-+
-+/**
- * exo_mount_hal_device_mount:
- * @device : an #ExoMountHalDevice.
- * @error : return location for errors or %NULL.
-@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
- /* however this one is FreeBSD specific */
- options[n++] = g_strdup ("longnames");
- }
-+ else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
-+ {
-+ const gchar* iocharset = exo_mount_hal_iocharset();
-+ if (iocharset != NULL)
-+ options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
-+ }
- }
- }
-
-diff --git a/exo-mount/main.c b/exo-mount/main.c
-index 80eae1d..f442019 100644
---- a/exo-mount/main.c
-+++ b/exo-mount/main.c
-@@ -39,6 +39,8 @@
- #include <string.h>
- #endif
-
-+#include <locale.h>
-+
- #include <glib/gstdio.h>
-
- #include <exo-hal/exo-hal.h>
-@@ -97,6 +99,8 @@ main (int argc, char **argv)
- /* initialize the i18n support */
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-+ setlocale(LC_CTYPE, "");
-+
- /* initialize GTK+ */
- if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
- {
diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
index eedbe10..aa3a89a 100644
--- a/recipes/xfce-base/exo_0.3.105.bb
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -1,14 +1,13 @@
-DESCRIPTION="XFCE extensions and framework library with session management support"
+DESCRIPTION="Xfce extensions and framework library with session management support"
DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
SECTION = "x11"
-PR = "r2"
+PR = "r3"
inherit xfce46 python-dir
XFCE_VERSION = "4.6.1"
SRC_URI += " \
- file://exo-0.3.105-iocharset.patch \
file://exo-no-tests.patch \
file://configure.patch \
"
diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
new file mode 100644
index 0000000..41c2a58
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -0,0 +1,28 @@
+DESCRIPTION="Xfce extensions and framework library with session management support"
+DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46 python-dir
+
+XFCE_VERSION = "4.6.2"
+
+SRC_URI += " \
+ file://exo-no-tests.patch \
+ file://configure.patch \
+"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+ ${PYTHON_SITEPACKAGES_DIR}/* \
+ ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+"
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
+
+SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
+SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb
new file mode 100644
index 0000000..663944a
--- /dev/null
+++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
@@ -0,0 +1,12 @@
+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/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
new file mode 100644
index 0000000..67aba2e
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
@@ -0,0 +1,18 @@
+# libxfce4util OE build file
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools "
+PR = "r0"
+
+inherit xfce46
+
+EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
+
+SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
+SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
new file mode 100644
index 0000000..255f482
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
@@ -0,0 +1,17 @@
+# libxfcegui4 OE build file
+
+DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
+DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
+RDEPENDS_${PN} = "xfconf startup-notification "
+
+SECTION = "x11/libs"
+PR = "r0"
+
+inherit xfce46
+
+LEAD_SONAME = "libxfcegui4.so.4"
+
+FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
+
+SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
+SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
new file mode 100644
index 0000000..d35c44d
--- /dev/null
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..2d5f94e
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..08048c4
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..a73383d
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 0000000..fe402b8
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -0,0 +1,30 @@
+# 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.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
new file mode 100644
index 0000000..c85bb8c
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
@@ -0,0 +1,22 @@
+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"
+
+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/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
new file mode 100644
index 0000000..65e4869
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
+
+PR = "r0"
+
+inherit xfce46
+
+SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
+SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
+
+RDEPENDS_${PN} = "xfconf exo"
+
diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb
new file mode 100644
index 0000000..3db4c91
--- /dev/null
+++ b/recipes/xfce-base/xfconf_4.6.2.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..c3a3bca
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..3ea7f52
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -0,0 +1,31 @@
+# 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-17 12:58 ` Andreas Mueller
@ 2010-06-17 13:32 ` Koen Kooi
2010-06-17 22:55 ` Andreas Mueller
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2010-06-17 13:32 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
As the wiki someone linked you to should have pointed out, please send
git format-patch formated patches that include author, commit message
and sign-off(s)
On 17-06-10 14:58, Andreas Mueller wrote:
> On Wednesday 16 June 2010 03:31:53 pm Jens Seidel wrote:
>> Should this be
>> return codeset;
>> ? Otherwise how to specify an encoding such as ISO-8859-1?
>
> As far as I understand http://bugzilla.xfce.org/show_bug.cgi?id=4294 , http://git.xfce.org/xfce/exo/plain/NEWS?h=xfce-4.6 and http://sisyphus.ru/srpm/Sisyphus/exo/patches/4 the related error
> was already fixed in exo-0.3.103. So I removed this patch (either from
>
>> XFCE4 or Xfce4?
>>
>> Compare also other DESCRIPTIONS!
>>
> see below
>
>>
>> two spaces
>>
> see below
>
>
> And here we go again:
>
> diff --git a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
> deleted file mode 100644
> index a667f11..0000000
> --- a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
> +++ /dev/null
> @@ -1,79 +0,0 @@
> -diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
> -index 791a536..4b130c3 100644
> ---- a/exo-mount/exo-mount-hal.c
> -+++ b/exo-mount/exo-mount-hal.c
> -@@ -34,6 +34,8 @@
> - #include <unistd.h>
> - #endif
> -
> -+#include <langinfo.h>
> -+
> - #include <libhal-storage.h>
> -
> - #include <exo-hal/exo-hal.h>
> -@@ -616,6 +618,30 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
> -
> -
> - /**
> -+ * exo_mount_hal_iocharset:
> -+ *
> -+ * Determines the preferred iocharset for filesystems
> -+ * that support it.
> -+ *
> -+ * Return value: iocharset string or %NULL if none.
> -+ **/
> -+static const gchar*
> -+exo_mount_hal_iocharset ()
> -+{
> -+ const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
> -+ if (cs != NULL)
> -+ return cs;
> -+
> -+ const char* codeset = nl_langinfo (CODESET);
> -+ if (codeset && !strcmp (codeset, "UTF-8"))
> -+ return "utf8";
> -+
> -+ return NULL;
> -+}
> -+
> -+
> -+
> -+/**
> - * exo_mount_hal_device_mount:
> - * @device : an #ExoMountHalDevice.
> - * @error : return location for errors or %NULL.
> -@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
> - /* however this one is FreeBSD specific */
> - options[n++] = g_strdup ("longnames");
> - }
> -+ else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
> -+ {
> -+ const gchar* iocharset = exo_mount_hal_iocharset();
> -+ if (iocharset != NULL)
> -+ options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
> -+ }
> - }
> - }
> -
> -diff --git a/exo-mount/main.c b/exo-mount/main.c
> -index 80eae1d..f442019 100644
> ---- a/exo-mount/main.c
> -+++ b/exo-mount/main.c
> -@@ -39,6 +39,8 @@
> - #include <string.h>
> - #endif
> -
> -+#include <locale.h>
> -+
> - #include <glib/gstdio.h>
> -
> - #include <exo-hal/exo-hal.h>
> -@@ -97,6 +99,8 @@ main (int argc, char **argv)
> - /* initialize the i18n support */
> - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
> -
> -+ setlocale(LC_CTYPE, "");
> -+
> - /* initialize GTK+ */
> - if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
> - {
> diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
> index eedbe10..aa3a89a 100644
> --- a/recipes/xfce-base/exo_0.3.105.bb
> +++ b/recipes/xfce-base/exo_0.3.105.bb
> @@ -1,14 +1,13 @@
> -DESCRIPTION="XFCE extensions and framework library with session management support"
> +DESCRIPTION="Xfce extensions and framework library with session management support"
> DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
> SECTION = "x11"
> -PR = "r2"
> +PR = "r3"
>
> inherit xfce46 python-dir
>
> XFCE_VERSION = "4.6.1"
>
> SRC_URI += " \
> - file://exo-0.3.105-iocharset.patch \
> file://exo-no-tests.patch \
> file://configure.patch \
> "
> diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
> new file mode 100644
> index 0000000..41c2a58
> --- /dev/null
> +++ b/recipes/xfce-base/exo_0.3.107.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION="Xfce extensions and framework library with session management support"
> +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
> +SECTION = "x11"
> +PR = "r1"
> +
> +inherit xfce46 python-dir
> +
> +XFCE_VERSION = "4.6.2"
> +
> +SRC_URI += " \
> + file://exo-no-tests.patch \
> + file://configure.patch \
> +"
> +
> +# Note: Python checking is broken
> +do_configure_prepend() {
> + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
> +}
> +
> +FILES_${PN} += "${datadir}/xfce4/ \
> + ${PYTHON_SITEPACKAGES_DIR}/* \
> + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
> +"
> +
> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
> +
> +SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
> +SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
> diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb
> new file mode 100644
> index 0000000..663944a
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
> @@ -0,0 +1,12 @@
> +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/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
> new file mode 100644
> index 0000000..67aba2e
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
> @@ -0,0 +1,18 @@
> +# libxfce4util OE build file
> +
> +DESCRIPTION = "Basic utility library for Xfce4"
> +SECTION = "x11/libs"
> +LICENSE = "GPL"
> +DEPENDS = "glib-2.0 xfce4-dev-tools "
> +PR = "r0"
> +
> +inherit xfce46
> +
> +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
> +
> +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
> +
> +FILES_${PN}-dev += " ${datadir}/xfce4/m4"
> +
> +SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
> +SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
> diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
> new file mode 100644
> index 0000000..255f482
> --- /dev/null
> +++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
> @@ -0,0 +1,17 @@
> +# libxfcegui4 OE build file
> +
> +DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
> +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
> +RDEPENDS_${PN} = "xfconf startup-notification "
> +
> +SECTION = "x11/libs"
> +PR = "r0"
> +
> +inherit xfce46
> +
> +LEAD_SONAME = "libxfcegui4.so.4"
> +
> +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
> +
> +SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
> +SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
> diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
> new file mode 100644
> index 0000000..d35c44d
> --- /dev/null
> +++ b/recipes/xfce-base/thunar_1.0.2.bb
> @@ -0,0 +1,28 @@
> +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
> new file mode 100644
> index 0000000..2d5f94e
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..08048c4
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
> @@ -0,0 +1,30 @@
> +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
> new file mode 100644
> index 0000000..a73383d
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
> @@ -0,0 +1,11 @@
> +# 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
> new file mode 100644
> index 0000000..fe402b8
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
> @@ -0,0 +1,30 @@
> +# 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.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
> new file mode 100644
> index 0000000..c85bb8c
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
> @@ -0,0 +1,22 @@
> +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"
> +
> +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/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
> new file mode 100644
> index 0000000..65e4869
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
> @@ -0,0 +1,16 @@
> +DESCRIPTION = "Xfce4 settings"
> +HOMEPAGE = "http://www.xfce.org"
> +SECTION = "x11/wm"
> +LICENSE = "GPL-2"
> +
> +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
> +
> +PR = "r0"
> +
> +inherit xfce46
> +
> +SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
> +SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
> +
> +RDEPENDS_${PN} = "xfconf exo"
> +
> diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb
> new file mode 100644
> index 0000000..3db4c91
> --- /dev/null
> +++ b/recipes/xfce-base/xfconf_4.6.2.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..c3a3bca
> --- /dev/null
> +++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
> @@ -0,0 +1,21 @@
> +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
> new file mode 100644
> index 0000000..3ea7f52
> --- /dev/null
> +++ b/recipes/xfce-base/xfwm4_4.6.2.bb
> @@ -0,0 +1,31 @@
> +# 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"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMGiPxMkyGM64RGpERAgjmAJ9LegUB64Pt5FmHMhOnPnAIMA25RgCdGztx
3XUA1S0KSCCOh0NFbab8aOM=
=Ewu4
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-17 13:32 ` Koen Kooi
@ 2010-06-17 22:55 ` Andreas Mueller
2010-06-18 10:12 ` Koen Kooi
2010-06-18 18:37 ` John Willis
0 siblings, 2 replies; 12+ messages in thread
From: Andreas Mueller @ 2010-06-17 22:55 UTC (permalink / raw)
To: openembedded-devel
From ef9f072f440a245dc6dcd9ab5ca8b82d7b1e243b Mon Sep 17 00:00:00 2001
From: Andreas Mueller <schnitzeltony@gmx.de>
Date: Fri, 18 Jun 2010 00:26:42 +0200
Subject: [PATCH] Bump xfce recipes to version 4.6.2
Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
---
recipes/xfce-base/exo_0.3.107.bb | 28 +++++++++++++++++++++++++
| 12 ++++++++++
recipes/xfce-base/libxfce4util_4.6.2.bb | 18 ++++++++++++++++
recipes/xfce-base/libxfcegui4_4.6.4.bb | 17 +++++++++++++++
recipes/xfce-base/thunar_1.0.2.bb | 28 +++++++++++++++++++++++++
recipes/xfce-base/xfce-terminal_0.4.5.bb | 16 ++++++++++++++
recipes/xfce-base/xfce-utils_4.6.2.bb | 30 +++++++++++++++++++++++++++
recipes/xfce-base/xfce4-appfinder_4.6.2.bb | 11 ++++++++++
recipes/xfce-base/xfce4-panel_4.6.4.bb | 30 +++++++++++++++++++++++++++
recipes/xfce-base/xfce4-session_4.6.2.bb | 22 +++++++++++++++++++
recipes/xfce-base/xfce4-settings_4.6.5.bb | 16 ++++++++++++++
recipes/xfce-base/xfconf_4.6.2.bb | 16 ++++++++++++++
recipes/xfce-base/xfdesktop_4.6.2.bb | 21 +++++++++++++++++++
recipes/xfce-base/xfwm4_4.6.2.bb | 31 ++++++++++++++++++++++++++++
14 files changed, 296 insertions(+), 0 deletions(-)
create mode 100644 recipes/xfce-base/exo_0.3.107.bb
create mode 100644 recipes/xfce-base/libxfce4menu_4.6.2.bb
create mode 100644 recipes/xfce-base/libxfce4util_4.6.2.bb
create mode 100644 recipes/xfce-base/libxfcegui4_4.6.4.bb
create mode 100644 recipes/xfce-base/thunar_1.0.2.bb
create mode 100644 recipes/xfce-base/xfce-terminal_0.4.5.bb
create mode 100644 recipes/xfce-base/xfce-utils_4.6.2.bb
create mode 100644 recipes/xfce-base/xfce4-appfinder_4.6.2.bb
create mode 100644 recipes/xfce-base/xfce4-panel_4.6.4.bb
create mode 100644 recipes/xfce-base/xfce4-session_4.6.2.bb
create mode 100644 recipes/xfce-base/xfce4-settings_4.6.5.bb
create mode 100644 recipes/xfce-base/xfconf_4.6.2.bb
create mode 100644 recipes/xfce-base/xfdesktop_4.6.2.bb
create mode 100644 recipes/xfce-base/xfwm4_4.6.2.bb
diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
new file mode 100644
index 0000000..41c2a58
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -0,0 +1,28 @@
+DESCRIPTION="Xfce extensions and framework library with session management support"
+DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46 python-dir
+
+XFCE_VERSION = "4.6.2"
+
+SRC_URI += " \
+ file://exo-no-tests.patch \
+ file://configure.patch \
+"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+ ${PYTHON_SITEPACKAGES_DIR}/* \
+ ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+"
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
+
+SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
+SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
--git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb
new file mode 100644
index 0000000..663944a
--- /dev/null
+++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
@@ -0,0 +1,12 @@
+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/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
new file mode 100644
index 0000000..67aba2e
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
@@ -0,0 +1,18 @@
+# libxfce4util OE build file
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools "
+PR = "r0"
+
+inherit xfce46
+
+EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
+
+SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
+SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
new file mode 100644
index 0000000..255f482
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
@@ -0,0 +1,17 @@
+# libxfcegui4 OE build file
+
+DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
+DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
+RDEPENDS_${PN} = "xfconf startup-notification "
+
+SECTION = "x11/libs"
+PR = "r0"
+
+inherit xfce46
+
+LEAD_SONAME = "libxfcegui4.so.4"
+
+FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
+
+SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
+SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
new file mode 100644
index 0000000..d35c44d
--- /dev/null
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..2d5f94e
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..08048c4
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..a73383d
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 0000000..fe402b8
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -0,0 +1,30 @@
+# 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.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
new file mode 100644
index 0000000..c85bb8c
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
@@ -0,0 +1,22 @@
+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"
+
+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/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
new file mode 100644
index 0000000..65e4869
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
+
+PR = "r0"
+
+inherit xfce46
+
+SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
+SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
+
+RDEPENDS_${PN} = "xfconf exo"
+
diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb
new file mode 100644
index 0000000..3db4c91
--- /dev/null
+++ b/recipes/xfce-base/xfconf_4.6.2.bb
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..c3a3bca
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..3ea7f52
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -0,0 +1,31 @@
+# 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"
--
1.5.3.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-17 22:55 ` Andreas Mueller
@ 2010-06-18 10:12 ` Koen Kooi
2010-06-18 18:37 ` John Willis
1 sibling, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2010-06-18 10:12 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 18-06-10 00:55, Andreas Mueller wrote:
> From ef9f072f440a245dc6dcd9ab5ca8b82d7b1e243b Mon Sep 17 00:00:00 2001
> From: Andreas Mueller <schnitzeltony@gmx.de>
> Date: Fri, 18 Jun 2010 00:26:42 +0200
> Subject: [PATCH] Bump xfce recipes to version 4.6.2
These look good to me:
Acked-by: Koen Kooi <koen@openembedded.org>
>
>
> Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
> ---
> recipes/xfce-base/exo_0.3.107.bb | 28 +++++++++++++++++++++++++
> recipes/xfce-base/libxfce4menu_4.6.2.bb | 12 ++++++++++
> recipes/xfce-base/libxfce4util_4.6.2.bb | 18 ++++++++++++++++
> recipes/xfce-base/libxfcegui4_4.6.4.bb | 17 +++++++++++++++
> recipes/xfce-base/thunar_1.0.2.bb | 28 +++++++++++++++++++++++++
> recipes/xfce-base/xfce-terminal_0.4.5.bb | 16 ++++++++++++++
> recipes/xfce-base/xfce-utils_4.6.2.bb | 30 +++++++++++++++++++++++++++
> recipes/xfce-base/xfce4-appfinder_4.6.2.bb | 11 ++++++++++
> recipes/xfce-base/xfce4-panel_4.6.4.bb | 30 +++++++++++++++++++++++++++
> recipes/xfce-base/xfce4-session_4.6.2.bb | 22 +++++++++++++++++++
> recipes/xfce-base/xfce4-settings_4.6.5.bb | 16 ++++++++++++++
> recipes/xfce-base/xfconf_4.6.2.bb | 16 ++++++++++++++
> recipes/xfce-base/xfdesktop_4.6.2.bb | 21 +++++++++++++++++++
> recipes/xfce-base/xfwm4_4.6.2.bb | 31 ++++++++++++++++++++++++++++
> 14 files changed, 296 insertions(+), 0 deletions(-)
> create mode 100644 recipes/xfce-base/exo_0.3.107.bb
> create mode 100644 recipes/xfce-base/libxfce4menu_4.6.2.bb
> create mode 100644 recipes/xfce-base/libxfce4util_4.6.2.bb
> create mode 100644 recipes/xfce-base/libxfcegui4_4.6.4.bb
> create mode 100644 recipes/xfce-base/thunar_1.0.2.bb
> create mode 100644 recipes/xfce-base/xfce-terminal_0.4.5.bb
> create mode 100644 recipes/xfce-base/xfce-utils_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-appfinder_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-panel_4.6.4.bb
> create mode 100644 recipes/xfce-base/xfce4-session_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-settings_4.6.5.bb
> create mode 100644 recipes/xfce-base/xfconf_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfdesktop_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfwm4_4.6.2.bb
>
> diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
> new file mode 100644
> index 0000000..41c2a58
> --- /dev/null
> +++ b/recipes/xfce-base/exo_0.3.107.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION="Xfce extensions and framework library with session management support"
> +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
> +SECTION = "x11"
> +PR = "r1"
> +
> +inherit xfce46 python-dir
> +
> +XFCE_VERSION = "4.6.2"
> +
> +SRC_URI += " \
> + file://exo-no-tests.patch \
> + file://configure.patch \
> +"
> +
> +# Note: Python checking is broken
> +do_configure_prepend() {
> + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
> +}
> +
> +FILES_${PN} += "${datadir}/xfce4/ \
> + ${PYTHON_SITEPACKAGES_DIR}/* \
> + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
> +"
> +
> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
> +
> +SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
> +SRC_URI[sha256sum] = "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
> diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-base/libxfce4menu_4.6.2.bb
> new file mode 100644
> index 0000000..663944a
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
> @@ -0,0 +1,12 @@
> +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/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
> new file mode 100644
> index 0000000..67aba2e
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
> @@ -0,0 +1,18 @@
> +# libxfce4util OE build file
> +
> +DESCRIPTION = "Basic utility library for Xfce4"
> +SECTION = "x11/libs"
> +LICENSE = "GPL"
> +DEPENDS = "glib-2.0 xfce4-dev-tools "
> +PR = "r0"
> +
> +inherit xfce46
> +
> +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
> +
> +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
> +
> +FILES_${PN}-dev += " ${datadir}/xfce4/m4"
> +
> +SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
> +SRC_URI[sha256sum] = "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
> diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
> new file mode 100644
> index 0000000..255f482
> --- /dev/null
> +++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
> @@ -0,0 +1,17 @@
> +# libxfcegui4 OE build file
> +
> +DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
> +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
> +RDEPENDS_${PN} = "xfconf startup-notification "
> +
> +SECTION = "x11/libs"
> +PR = "r0"
> +
> +inherit xfce46
> +
> +LEAD_SONAME = "libxfcegui4.so.4"
> +
> +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
> +
> +SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
> +SRC_URI[sha256sum] = "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
> diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
> new file mode 100644
> index 0000000..d35c44d
> --- /dev/null
> +++ b/recipes/xfce-base/thunar_1.0.2.bb
> @@ -0,0 +1,28 @@
> +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
> new file mode 100644
> index 0000000..2d5f94e
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..08048c4
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
> @@ -0,0 +1,30 @@
> +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
> new file mode 100644
> index 0000000..a73383d
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
> @@ -0,0 +1,11 @@
> +# 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
> new file mode 100644
> index 0000000..fe402b8
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
> @@ -0,0 +1,30 @@
> +# 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.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
> new file mode 100644
> index 0000000..c85bb8c
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
> @@ -0,0 +1,22 @@
> +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"
> +
> +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/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
> new file mode 100644
> index 0000000..65e4869
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
> @@ -0,0 +1,16 @@
> +DESCRIPTION = "Xfce4 settings"
> +HOMEPAGE = "http://www.xfce.org"
> +SECTION = "x11/wm"
> +LICENSE = "GPL-2"
> +
> +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
> +
> +PR = "r0"
> +
> +inherit xfce46
> +
> +SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
> +SRC_URI[sha256sum] = "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
> +
> +RDEPENDS_${PN} = "xfconf exo"
> +
> diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-base/xfconf_4.6.2.bb
> new file mode 100644
> index 0000000..3db4c91
> --- /dev/null
> +++ b/recipes/xfce-base/xfconf_4.6.2.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..c3a3bca
> --- /dev/null
> +++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
> @@ -0,0 +1,21 @@
> +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
> new file mode 100644
> index 0000000..3ea7f52
> --- /dev/null
> +++ b/recipes/xfce-base/xfwm4_4.6.2.bb
> @@ -0,0 +1,31 @@
> +# 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"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMG0aJMkyGM64RGpERAm2PAJ44/H81iic7tEJr8CX6+wKLZCcPFwCgiq/p
yBiNDS2yTFfIt+M/XEhvm9A=
=PQQB
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-17 22:55 ` Andreas Mueller
2010-06-18 10:12 ` Koen Kooi
@ 2010-06-18 18:37 ` John Willis
2010-06-18 18:54 ` Khem Raj
2010-06-19 14:03 ` Andreas Mueller
1 sibling, 2 replies; 12+ messages in thread
From: John Willis @ 2010-06-18 18:37 UTC (permalink / raw)
To: openembedded-devel
For what it's worth these look fine to me, and it saves me finishing off the
4.6.2 patch I had in my TODO ;).
Thanks for this.
Acked-by: John Willis <john.willis@distant-earth.com>
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
> Behalf Of Andreas Mueller
> Sent: 17 June 2010 11:55 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] xfce 4.6.2 recipes
>
> From ef9f072f440a245dc6dcd9ab5ca8b82d7b1e243b Mon Sep 17 00:00:00
> 2001
> From: Andreas Mueller <schnitzeltony@gmx.de>
> Date: Fri, 18 Jun 2010 00:26:42 +0200
> Subject: [PATCH] Bump xfce recipes to version 4.6.2
>
>
> Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
> ---
> recipes/xfce-base/exo_0.3.107.bb | 28
> +++++++++++++++++++++++++
> recipes/xfce-base/libxfce4menu_4.6.2.bb | 12 ++++++++++
> recipes/xfce-base/libxfce4util_4.6.2.bb | 18 ++++++++++++++++
> recipes/xfce-base/libxfcegui4_4.6.4.bb | 17 +++++++++++++++
> recipes/xfce-base/thunar_1.0.2.bb | 28
> +++++++++++++++++++++++++
> recipes/xfce-base/xfce-terminal_0.4.5.bb | 16 ++++++++++++++
> recipes/xfce-base/xfce-utils_4.6.2.bb | 30
> +++++++++++++++++++++++++++
> recipes/xfce-base/xfce4-appfinder_4.6.2.bb | 11 ++++++++++
> recipes/xfce-base/xfce4-panel_4.6.4.bb | 30
> +++++++++++++++++++++++++++
> recipes/xfce-base/xfce4-session_4.6.2.bb | 22 +++++++++++++++++++
> recipes/xfce-base/xfce4-settings_4.6.5.bb | 16 ++++++++++++++
> recipes/xfce-base/xfconf_4.6.2.bb | 16 ++++++++++++++
> recipes/xfce-base/xfdesktop_4.6.2.bb | 21 +++++++++++++++++++
> recipes/xfce-base/xfwm4_4.6.2.bb | 31
> ++++++++++++++++++++++++++++
> 14 files changed, 296 insertions(+), 0 deletions(-) create mode 100644
> recipes/xfce-base/exo_0.3.107.bb create mode 100644 recipes/xfce-
> base/libxfce4menu_4.6.2.bb
> create mode 100644 recipes/xfce-base/libxfce4util_4.6.2.bb
> create mode 100644 recipes/xfce-base/libxfcegui4_4.6.4.bb
> create mode 100644 recipes/xfce-base/thunar_1.0.2.bb create mode
> 100644 recipes/xfce-base/xfce-terminal_0.4.5.bb
> create mode 100644 recipes/xfce-base/xfce-utils_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-appfinder_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-panel_4.6.4.bb
> create mode 100644 recipes/xfce-base/xfce4-session_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfce4-settings_4.6.5.bb
> create mode 100644 recipes/xfce-base/xfconf_4.6.2.bb create mode 100644
> recipes/xfce-base/xfdesktop_4.6.2.bb
> create mode 100644 recipes/xfce-base/xfwm4_4.6.2.bb
>
> diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-
> base/exo_0.3.107.bb
> new file mode 100644
> index 0000000..41c2a58
> --- /dev/null
> +++ b/recipes/xfce-base/exo_0.3.107.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION="Xfce extensions and framework library with session
> management support"
> +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
> +SECTION = "x11"
> +PR = "r1"
> +
> +inherit xfce46 python-dir
> +
> +XFCE_VERSION = "4.6.2"
> +
> +SRC_URI += " \
> + file://exo-no-tests.patch \
> + file://configure.patch \
> +"
> +
> +# Note: Python checking is broken
> +do_configure_prepend() {
> + sed -i -e s:'`$PKG_CONFIG --variable=defsdir
> +pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in }
> +
> +FILES_${PN} += "${datadir}/xfce4/ \
> + ${PYTHON_SITEPACKAGES_DIR}/* \
> + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \ "
> +
> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
> +
> +SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
> +SRC_URI[sha256sum] =
> "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
> diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-
> base/libxfce4menu_4.6.2.bb
> new file mode 100644
> index 0000000..663944a
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
> @@ -0,0 +1,12 @@
> +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/libxfce4util_4.6.2.bb b/recipes/xfce-
> base/libxfce4util_4.6.2.bb
> new file mode 100644
> index 0000000..67aba2e
> --- /dev/null
> +++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
> @@ -0,0 +1,18 @@
> +# libxfce4util OE build file
> +
> +DESCRIPTION = "Basic utility library for Xfce4"
> +SECTION = "x11/libs"
> +LICENSE = "GPL"
> +DEPENDS = "glib-2.0 xfce4-dev-tools "
> +PR = "r0"
> +
> +inherit xfce46
> +
> +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-
> broken-putenv=yes"
> +
> +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
> +
> +FILES_${PN}-dev += " ${datadir}/xfce4/m4"
> +
> +SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
> +SRC_URI[sha256sum] =
> "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
> diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-
> base/libxfcegui4_4.6.4.bb
> new file mode 100644
> index 0000000..255f482
> --- /dev/null
> +++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
> @@ -0,0 +1,17 @@
> +# libxfcegui4 OE build file
> +
> +DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
> +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf
dbh
> libxml2 gtk+ libglade"
> +RDEPENDS_${PN} = "xfconf startup-notification "
> +
> +SECTION = "x11/libs"
> +PR = "r0"
> +
> +inherit xfce46
> +
> +LEAD_SONAME = "libxfcegui4.so.4"
> +
> +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so
> ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
> +
> +SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
> +SRC_URI[sha256sum] =
> "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
> diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-
> base/thunar_1.0.2.bb
> new file mode 100644
> index 0000000..d35c44d
> --- /dev/null
> +++ b/recipes/xfce-base/thunar_1.0.2.bb
> @@ -0,0 +1,28 @@
> +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
> new file mode 100644
> index 0000000..2d5f94e
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..08048c4
> --- /dev/null
> +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
> @@ -0,0 +1,30 @@
> +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
> new file mode 100644
> index 0000000..a73383d
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
> @@ -0,0 +1,11 @@
> +# 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
> new file mode 100644
> index 0000000..fe402b8
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
> @@ -0,0 +1,30 @@
> +# 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.bb b/recipes/xfce-
> base/xfce4-session_4.6.2.bb
> new file mode 100644
> index 0000000..c85bb8c
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
> @@ -0,0 +1,22 @@
> +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"
> +
> +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/xfce4-settings_4.6.5.bb b/recipes/xfce-
> base/xfce4-settings_4.6.5.bb
> new file mode 100644
> index 0000000..65e4869
> --- /dev/null
> +++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
> @@ -0,0 +1,16 @@
> +DESCRIPTION = "Xfce4 settings"
> +HOMEPAGE = "http://www.xfce.org"
> +SECTION = "x11/wm"
> +LICENSE = "GPL-2"
> +
> +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo
> libxfce4util libxfcegui4"
> +
> +PR = "r0"
> +
> +inherit xfce46
> +
> +SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
> +SRC_URI[sha256sum] =
> "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
> +
> +RDEPENDS_${PN} = "xfconf exo"
> +
> diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-
> base/xfconf_4.6.2.bb
> new file mode 100644
> index 0000000..3db4c91
> --- /dev/null
> +++ b/recipes/xfce-base/xfconf_4.6.2.bb
> @@ -0,0 +1,16 @@
> +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
> new file mode 100644
> index 0000000..c3a3bca
> --- /dev/null
> +++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
> @@ -0,0 +1,21 @@
> +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
> new file mode 100644
> index 0000000..3ea7f52
> --- /dev/null
> +++ b/recipes/xfce-base/xfwm4_4.6.2.bb
> @@ -0,0 +1,31 @@
> +# 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"
> --
> 1.5.3.4
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-18 18:37 ` John Willis
@ 2010-06-18 18:54 ` Khem Raj
2010-06-18 22:29 ` Andreas Mueller
2010-06-19 14:03 ` Andreas Mueller
1 sibling, 1 reply; 12+ messages in thread
From: Khem Raj @ 2010-06-18 18:54 UTC (permalink / raw)
To: openembedded-devel
On Fri, Jun 18, 2010 at 11:37 AM, John Willis
<John.Willis@distant-earth.com> wrote:
> For what it's worth these look fine to me, and it saves me finishing off the
> 4.6.2 patch I had in my TODO ;).
>
> Thanks for this.
hmmm I think I pushed first version of your patch accidentally. Can
you rebase the new patch on top of what got pushed.
Thx
-Khem
>
> Acked-by: John Willis <john.willis@distant-earth.com>
>
>> -----Original Message-----
>> From: openembedded-devel-bounces@lists.openembedded.org
>> [mailto:openembedded-devel-bounces@lists.openembedded.org] On
>> Behalf Of Andreas Mueller
>> Sent: 17 June 2010 11:55 PM
>> To: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe] xfce 4.6.2 recipes
>>
>> From ef9f072f440a245dc6dcd9ab5ca8b82d7b1e243b Mon Sep 17 00:00:00
>> 2001
>> From: Andreas Mueller <schnitzeltony@gmx.de>
>> Date: Fri, 18 Jun 2010 00:26:42 +0200
>> Subject: [PATCH] Bump xfce recipes to version 4.6.2
>>
>>
>> Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
>> ---
>> recipes/xfce-base/exo_0.3.107.bb | 28
>> +++++++++++++++++++++++++
>> recipes/xfce-base/libxfce4menu_4.6.2.bb | 12 ++++++++++
>> recipes/xfce-base/libxfce4util_4.6.2.bb | 18 ++++++++++++++++
>> recipes/xfce-base/libxfcegui4_4.6.4.bb | 17 +++++++++++++++
>> recipes/xfce-base/thunar_1.0.2.bb | 28
>> +++++++++++++++++++++++++
>> recipes/xfce-base/xfce-terminal_0.4.5.bb | 16 ++++++++++++++
>> recipes/xfce-base/xfce-utils_4.6.2.bb | 30
>> +++++++++++++++++++++++++++
>> recipes/xfce-base/xfce4-appfinder_4.6.2.bb | 11 ++++++++++
>> recipes/xfce-base/xfce4-panel_4.6.4.bb | 30
>> +++++++++++++++++++++++++++
>> recipes/xfce-base/xfce4-session_4.6.2.bb | 22 +++++++++++++++++++
>> recipes/xfce-base/xfce4-settings_4.6.5.bb | 16 ++++++++++++++
>> recipes/xfce-base/xfconf_4.6.2.bb | 16 ++++++++++++++
>> recipes/xfce-base/xfdesktop_4.6.2.bb | 21 +++++++++++++++++++
>> recipes/xfce-base/xfwm4_4.6.2.bb | 31
>> ++++++++++++++++++++++++++++
>> 14 files changed, 296 insertions(+), 0 deletions(-) create mode 100644
>> recipes/xfce-base/exo_0.3.107.bb create mode 100644 recipes/xfce-
>> base/libxfce4menu_4.6.2.bb
>> create mode 100644 recipes/xfce-base/libxfce4util_4.6.2.bb
>> create mode 100644 recipes/xfce-base/libxfcegui4_4.6.4.bb
>> create mode 100644 recipes/xfce-base/thunar_1.0.2.bb create mode
>> 100644 recipes/xfce-base/xfce-terminal_0.4.5.bb
>> create mode 100644 recipes/xfce-base/xfce-utils_4.6.2.bb
>> create mode 100644 recipes/xfce-base/xfce4-appfinder_4.6.2.bb
>> create mode 100644 recipes/xfce-base/xfce4-panel_4.6.4.bb
>> create mode 100644 recipes/xfce-base/xfce4-session_4.6.2.bb
>> create mode 100644 recipes/xfce-base/xfce4-settings_4.6.5.bb
>> create mode 100644 recipes/xfce-base/xfconf_4.6.2.bb create mode 100644
>> recipes/xfce-base/xfdesktop_4.6.2.bb
>> create mode 100644 recipes/xfce-base/xfwm4_4.6.2.bb
>>
>> diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-
>> base/exo_0.3.107.bb
>> new file mode 100644
>> index 0000000..41c2a58
>> --- /dev/null
>> +++ b/recipes/xfce-base/exo_0.3.107.bb
>> @@ -0,0 +1,28 @@
>> +DESCRIPTION="Xfce extensions and framework library with session
>> management support"
>> +DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
>> +SECTION = "x11"
>> +PR = "r1"
>> +
>> +inherit xfce46 python-dir
>> +
>> +XFCE_VERSION = "4.6.2"
>> +
>> +SRC_URI += " \
>> + file://exo-no-tests.patch \
>> + file://configure.patch \
>> +"
>> +
>> +# Note: Python checking is broken
>> +do_configure_prepend() {
>> + sed -i -e s:'`$PKG_CONFIG --variable=defsdir
>> +pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in }
>> +
>> +FILES_${PN} += "${datadir}/xfce4/ \
>> + ${PYTHON_SITEPACKAGES_DIR}/* \
>> + ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \ "
>> +
>> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
>> +
>> +SRC_URI[md5sum] = "3a92cca0c99ee940db4410891c9e8498"
>> +SRC_URI[sha256sum] =
>> "0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3"
>> diff --git a/recipes/xfce-base/libxfce4menu_4.6.2.bb b/recipes/xfce-
>> base/libxfce4menu_4.6.2.bb
>> new file mode 100644
>> index 0000000..663944a
>> --- /dev/null
>> +++ b/recipes/xfce-base/libxfce4menu_4.6.2.bb
>> @@ -0,0 +1,12 @@
>> +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/libxfce4util_4.6.2.bb b/recipes/xfce-
>> base/libxfce4util_4.6.2.bb
>> new file mode 100644
>> index 0000000..67aba2e
>> --- /dev/null
>> +++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
>> @@ -0,0 +1,18 @@
>> +# libxfce4util OE build file
>> +
>> +DESCRIPTION = "Basic utility library for Xfce4"
>> +SECTION = "x11/libs"
>> +LICENSE = "GPL"
>> +DEPENDS = "glib-2.0 xfce4-dev-tools "
>> +PR = "r0"
>> +
>> +inherit xfce46
>> +
>> +EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-
>> broken-putenv=yes"
>> +
>> +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
>> +
>> +FILES_${PN}-dev += " ${datadir}/xfce4/m4"
>> +
>> +SRC_URI[md5sum] = "9c3129d827d480f0906c575e7a13f1e9"
>> +SRC_URI[sha256sum] =
>> "ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83"
>> diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-
>> base/libxfcegui4_4.6.4.bb
>> new file mode 100644
>> index 0000000..255f482
>> --- /dev/null
>> +++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
>> @@ -0,0 +1,17 @@
>> +# libxfcegui4 OE build file
>> +
>> +DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
>> +DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf
> dbh
>> libxml2 gtk+ libglade"
>> +RDEPENDS_${PN} = "xfconf startup-notification "
>> +
>> +SECTION = "x11/libs"
>> +PR = "r0"
>> +
>> +inherit xfce46
>> +
>> +LEAD_SONAME = "libxfcegui4.so.4"
>> +
>> +FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so
>> ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
>> +
>> +SRC_URI[md5sum] = "88de59b222cb9977f93a4c61011c1e1f"
>> +SRC_URI[sha256sum] =
>> "c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421"
>> diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-
>> base/thunar_1.0.2.bb
>> new file mode 100644
>> index 0000000..d35c44d
>> --- /dev/null
>> +++ b/recipes/xfce-base/thunar_1.0.2.bb
>> @@ -0,0 +1,28 @@
>> +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
>> new file mode 100644
>> index 0000000..2d5f94e
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce-terminal_0.4.5.bb
>> @@ -0,0 +1,16 @@
>> +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
>> new file mode 100644
>> index 0000000..08048c4
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
>> @@ -0,0 +1,30 @@
>> +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
>> new file mode 100644
>> index 0000000..a73383d
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce4-appfinder_4.6.2.bb
>> @@ -0,0 +1,11 @@
>> +# 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
>> new file mode 100644
>> index 0000000..fe402b8
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
>> @@ -0,0 +1,30 @@
>> +# 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.bb b/recipes/xfce-
>> base/xfce4-session_4.6.2.bb
>> new file mode 100644
>> index 0000000..c85bb8c
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
>> @@ -0,0 +1,22 @@
>> +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"
>> +
>> +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/xfce4-settings_4.6.5.bb b/recipes/xfce-
>> base/xfce4-settings_4.6.5.bb
>> new file mode 100644
>> index 0000000..65e4869
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
>> @@ -0,0 +1,16 @@
>> +DESCRIPTION = "Xfce4 settings"
>> +HOMEPAGE = "http://www.xfce.org"
>> +SECTION = "x11/wm"
>> +LICENSE = "GPL-2"
>> +
>> +DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo
>> libxfce4util libxfcegui4"
>> +
>> +PR = "r0"
>> +
>> +inherit xfce46
>> +
>> +SRC_URI[md5sum] = "f988cb732913b5fbc115ad7105d2231e"
>> +SRC_URI[sha256sum] =
>> "1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b"
>> +
>> +RDEPENDS_${PN} = "xfconf exo"
>> +
>> diff --git a/recipes/xfce-base/xfconf_4.6.2.bb b/recipes/xfce-
>> base/xfconf_4.6.2.bb
>> new file mode 100644
>> index 0000000..3db4c91
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfconf_4.6.2.bb
>> @@ -0,0 +1,16 @@
>> +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
>> new file mode 100644
>> index 0000000..c3a3bca
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
>> @@ -0,0 +1,21 @@
>> +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
>> new file mode 100644
>> index 0000000..3ea7f52
>> --- /dev/null
>> +++ b/recipes/xfce-base/xfwm4_4.6.2.bb
>> @@ -0,0 +1,31 @@
>> +# 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"
>> --
>> 1.5.3.4
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-18 18:54 ` Khem Raj
@ 2010-06-18 22:29 ` Andreas Mueller
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Mueller @ 2010-06-18 22:29 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
On Friday 18 June 2010 08:54:13 pm Khem Raj wrote:
> On Fri, Jun 18, 2010 at 11:37 AM, John Willis
>
> hmmm I think I pushed first version of your patch accidentally. Can
> you rebase the new patch on top of what got pushed.
>
> Thx
> -Khem
My newbe spamming causes confusion - I promise to send better quality & less retries next time...
Khem:
To check what you have checked in I did:
git-pull
git-checkout -b checkpatch 7565ef3e4a53f715f16bdf6237061bcb9d6da33b (creating a local branch 'checkpatch' right before my patch and check it out)
git-apply <last-patch-send-and-acked>
git-add .
git-commit -a -m "Foo"
git-diff org.openembedded.dev recipes/xfce-base/ > Diff
I attach 'Diff'. As far as I can see the only lines added are caused by space / tab replacement.
I think you committed the correct contents.
[-- Attachment #2: Diff --]
[-- Type: text/x-diff, Size: 7274 bytes --]
diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
index 41c2a58..ccc20c4 100644
--- a/recipes/xfce-base/exo_0.3.107.bb
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -8,18 +8,18 @@ inherit xfce46 python-dir
XFCE_VERSION = "4.6.2"
SRC_URI += " \
- file://exo-no-tests.patch \
- file://configure.patch \
+ Â Â file://exo-no-tests.patch \
+ Â Â file://configure.patch \
"
# Note: Python checking is broken
do_configure_prepend() {
- sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+Â Â Â Â Â Â Â sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
}
FILES_${PN} += "${datadir}/xfce4/ \
- ${PYTHON_SITEPACKAGES_DIR}/* \
- ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+ Â Â Â Â Â Â Â Â ${PYTHON_SITEPACKAGES_DIR}/* \
+ Â Â Â Â Â Â Â Â ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
"
FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug/*"
diff --git a/recipes/xfce-base/thunar_1.0.2.bb b/recipes/xfce-base/thunar_1.0.2.bb
index d35c44d..69626da 100644
--- a/recipes/xfce-base/thunar_1.0.2.bb
+++ b/recipes/xfce-base/thunar_1.0.2.bb
@@ -17,11 +17,11 @@ 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"
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ${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"
diff --git a/recipes/xfce-base/xfce-utils_4.6.2.bb b/recipes/xfce-base/xfce-utils_4.6.2.bb
index 08048c4..e0245b7 100644
--- a/recipes/xfce-base/xfce-utils_4.6.2.bb
+++ b/recipes/xfce-base/xfce-utils_4.6.2.bb
@@ -6,25 +6,25 @@ 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 \
+ Â Â Â Â ${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
+# 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-panel_4.6.4.bb b/recipes/xfce-base/xfce4-panel_4.6.4.bb
index fe402b8..fbbb17d 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.4.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.4.bb
@@ -13,18 +13,18 @@ SRC_URI[sha256sum] = "cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a
EXTRA_OECONF += " --enable-startup-notification"
do_install() {
- oe_runmake DESTDIR=${D} 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*'])
+Â Â Â Â Â Â Â 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/xfdesktop_4.6.2.bb b/recipes/xfce-base/xfdesktop_4.6.2.bb
index c3a3bca..e476956 100644
--- a/recipes/xfce-base/xfdesktop_4.6.2.bb
+++ b/recipes/xfce-base/xfdesktop_4.6.2.bb
@@ -8,13 +8,13 @@ PR = "r0"
inherit xfce46
do_configure() {
- oe_runconf
+ Â 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"
+ Â Â Â Â Â Â Â Â ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+ Â Â Â Â Â Â Â Â ${datadir}/xfce4/panel-plugins/*.desktop"
FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug"
SRC_URI[md5sum] = "e800ea9fee7a5c5eaf2ae96e23a83e3a"
diff --git a/recipes/xfce-base/xfwm4_4.6.2.bb b/recipes/xfce-base/xfwm4_4.6.2.bb
index 3ea7f52..313097a 100644
--- a/recipes/xfce-base/xfwm4_4.6.2.bb
+++ b/recipes/xfce-base/xfwm4_4.6.2.bb
@@ -16,8 +16,8 @@ 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)
+Â Â Â Â Â Â Â 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: xfce 4.6.2 recipes
2010-06-18 18:37 ` John Willis
2010-06-18 18:54 ` Khem Raj
@ 2010-06-19 14:03 ` Andreas Mueller
1 sibling, 0 replies; 12+ messages in thread
From: Andreas Mueller @ 2010-06-19 14:03 UTC (permalink / raw)
To: openembedded-devel
On Friday 18 June 2010 08:37:06 pm John Willis wrote:
> For what it's worth these look fine to me, and it saves me finishing off the
> 4.6.2 patch I had in my TODO ;).
>
> Thanks for this.
John: Would you like to take look on 'Fixes install error in xfwm4-themes_4.6.0' (xfwm4 causes themes to build and they fail on installation)?
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-06-19 14:10 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-16 12:33 xfce 4.6.2 recipes Andreas Mueller
2010-06-16 12:42 ` Martin Jansa
2010-06-16 12:51 ` Andreas Mueller
2010-06-16 13:31 ` Jens Seidel
2010-06-17 12:58 ` Andreas Mueller
2010-06-17 13:32 ` Koen Kooi
2010-06-17 22:55 ` Andreas Mueller
2010-06-18 10:12 ` Koen Kooi
2010-06-18 18:37 ` John Willis
2010-06-18 18:54 ` Khem Raj
2010-06-18 22:29 ` Andreas Mueller
2010-06-19 14:03 ` Andreas Mueller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.