From a2417b3b98bd6200e211c333a7044ccdb08dc515 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 18 May 2012 15:29:56 +0200 Subject: xfce.bbclass: change SRC_URI calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * grabbed from oe-core gnomebase.bbclass * old calculation did not work for version numbers with multiple digits (4.10) Signed-off-by: Andreas Müller --- meta-xfce/classes/xfce.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-xfce/classes/xfce.bbclass b/meta-xfce/classes/xfce.bbclass index 2350c2703f..f4ef55643b 100644 --- a/meta-xfce/classes/xfce.bbclass +++ b/meta-xfce/classes/xfce.bbclass @@ -1,5 +1,10 @@ +def xfce_verdir(v): + import re + m = re.match("^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + HOMEPAGE = "http://www.xfce.org" -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" inherit autotools gettext gtk-icon-cache pkgconfig -- cgit v1.2.3-54-g00ecf From de13615ac22934b1dd5a928b418e26e820aaf741 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 18 May 2012 15:35:41 +0200 Subject: xfce4-dev-tools: update to 4.10.0 and oe-stylize a bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb | 21 +++++++++++++++++++++ .../xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb | 22 ---------------------- 2 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb new file mode 100644 index 0000000000..1955fccb0e --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Xfce4 development tools" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "glib-2.0" + +inherit autotools + +BBCLASSEXTEND = "native" + +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "372b74f432e7e02d946c2ea9d3de2805" +SRC_URI[sha256sum] = "f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8" + +do_install_append() { + install -d ${D}${datadir}/aclocal + install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/ +} + +FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb deleted file mode 100644 index ce21bf0e9b..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Xfce4 development tools" -HOMEPAGE = "http://www.xfce.org" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -PR = "r2" - -BBCLASSEXTEND = "native" - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/aclocal - install -m 644 m4macros/*.m4 ${D}${datadir}/aclocal/ -} - -FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" - -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "9591299c49d92d00ba47974c42a735fa" -SRC_URI[sha256sum] = "7a1457e9dc839cb121a48e5c53c483ce02a3a5dbaf09376794a13bafe4194815" -- cgit v1.2.3-54-g00ecf From f54e102a0c37df34e5acd6bbb38e6c8ee62d4705 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 18 May 2012 15:38:06 +0200 Subject: libxfce4util: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb | 10 ++++++++++ meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb | 14 -------------- 2 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb new file mode 100644 index 0000000000..546ee32526 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce + +SRC_URI[md5sum] = "2e8defcd40cbf6afedde531b27314511" +SRC_URI[sha256sum] = "0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb deleted file mode 100644 index a9819fbe85..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" - -PR = "r0" - -inherit xfce - -EXTRA_OECONF += "--with-broken-putenv=yes" - -SRC_URI[md5sum] = "3376a77637a4292a863027d595548ee2" -SRC_URI[sha256sum] = "05a149841575cb961588742c8c9795c6f0d09f27d59546dd8a933b010d2ac816" -- cgit v1.2.3-54-g00ecf From cf58e9f9c2763d6717c7e1b22ea9be98543b6a93 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 15:19:11 +0200 Subject: libxfce4ui: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 13 +++++++++++++ meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb | 15 --------------- 2 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb new file mode 100644 index 0000000000..32505de666 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf" + +inherit xfce + +SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" + +SRC_URI[md5sum] = "6df1ce474a3d4885aee31cda9dbc9192" +SRC_URI[sha256sum] = "a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2" + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb deleted file mode 100644 index e2bc81ea1e..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf" -PR = "r1" - -inherit xfce - -SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" - -FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor" - -SRC_URI[md5sum] = "30bd432dd0f19305e846a122d4c7c6fe" -SRC_URI[sha256sum] = "39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956" -- cgit v1.2.3-54-g00ecf From e6f73c8740beb90f70b96009f2ab2b5114c8f2a5 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 18 May 2012 15:52:04 +0200 Subject: garcon: update to 0.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb | 12 ------------ meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb create mode 100644 meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb deleted file mode 100644 index 2e88b972b3..0000000000 --- a/meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION="Xfce Menu Library" -SECTION = "x11/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" -DEPENDS = "glib-2.0 xfce4-dev-tools-native libxfce4util" - -inherit xfce - -FILES_${PN} += " ${datadir}/desktop-directories" - -SRC_URI[md5sum] = "e53514e79c4da2631dd74994452d3c96" -SRC_URI[sha256sum] = "c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316" diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb new file mode 100644 index 0000000000..a384889cc0 --- /dev/null +++ b/meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION="Xfce Menu Library" +SECTION = "x11/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" +DEPENDS = "glib-2.0 xfce4-dev-tools-native libxfce4util" + +inherit xfce + +SRC_URI[md5sum] = "301e7b8015060dd30407b68dd8c4bdb7" +SRC_URI[sha256sum] = "02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c" + +FILES_${PN} += "${datadir}/desktop-directories" -- cgit v1.2.3-54-g00ecf From 7b4be7fba8c953d62a91d1daa2ccf0b443b328ce Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 17:18:03 +0200 Subject: exo: update to 0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-xfce/exo/exo/exo-no-tests-0.6.patch | 12 - .../recipes-xfce/exo/exo/exo-no-tests-0.8.patch | 31 ++ .../exo/exo/fix-qa-desktop-type-error.patch | 531 --------------------- meta-xfce/recipes-xfce/exo/exo_0.6.2.bb | 35 -- meta-xfce/recipes-xfce/exo/exo_0.8.0.bb | 32 ++ 5 files changed, 63 insertions(+), 578 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch create mode 100644 meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo_0.6.2.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.8.0.bb diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch deleted file mode 100644 index cab41a87d2..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.am.old 2011-01-16 16:38:21.000000000 +0100 -+++ b/Makefile.am 2011-03-24 22:14:26.000000000 +0100 -@@ -15,8 +15,7 @@ - icons \ - pixmaps \ - po \ -- $(PYTHON_SUBDIR) \ -- tests -+ $(PYTHON_SUBDIR) - - AUTOMAKE_OPTIONS = \ - 1.8 \ diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch new file mode 100644 index 0000000000..ac8bca5f3f --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -0,0 +1,31 @@ +From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 18 May 2012 21:13:00 +0200 +Subject: [PATCH] Do not run tests at build time +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Upstream-Status: Not-Applicable + +Signed-off-by: Andreas Müller +--- + Makefile.am | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0ab3853..3e72391 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,8 +8,7 @@ SUBDIRS = \ + docs \ + icons \ + pixmaps \ +- po \ +- tests ++ po + + AUTOMAKE_OPTIONS = \ + 1.9 \ +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch b/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch deleted file mode 100644 index e4ba75ed78..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch +++ /dev/null @@ -1,531 +0,0 @@ ---- a/exo-helper/exo-helper.c.old 2011-01-16 16:38:21.000000000 +0100 -+++ b/exo-helper/exo-helper.c 2011-03-07 12:31:49.000000000 +0100 -@@ -172,7 +172,7 @@ - helper->startup_notify = xfce_rc_read_bool_entry (rc, "StartupNotify", FALSE); - - /* verify the type of the desktop file */ -- str = xfce_rc_read_entry_untranslated (rc, "Type", NULL); -+ str = xfce_rc_read_entry_untranslated (rc, "X-XFCE-Type", NULL); - if (G_UNLIKELY (!exo_str_is_equal (str, "X-XFCE-Helper"))) - goto failed; - -@@ -897,7 +897,8 @@ - xfce_rc_write_bool_entry (rc, "NoDisplay", TRUE); - xfce_rc_write_entry (rc, "Version", "1.0"); - xfce_rc_write_entry (rc, "Encoding", "UTF-8"); -- xfce_rc_write_entry (rc, "Type", "X-XFCE-Helper"); -+ xfce_rc_write_entry (rc, "Type", "Application"); -+ xfce_rc_write_entry (rc, "X-XFCE-Type", "X-XFCE-Helper"); - xfce_rc_write_entry (rc, "X-XFCE-Category", category_string); - - /* check if the command includes a parameter */ ---- a/exo-helper/helpers/aterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/aterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=aterm --Type=X-XFCE-Helper -+Type=Application - _Name=aterm - StartupNotify=false - X-XFCE-Binaries=aterm; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -e %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/balsa.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/balsa.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=gnome-balsa2 --Type=X-XFCE-Helper -+Type=Application - _Name=Balsa - StartupNotify=false - X-XFCE-Binaries=balsa; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 balsa %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/debian-sensible-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/debian-sensible-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=debian --Type=X-XFCE-Helper -+Type=Application - _Name=Debian Sensible Browser - StartupNotify=false - X-XFCE-Binaries=sensible-browser; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=debian --Type=X-XFCE-Helper -+Type=Application - _Name=Debian X Terminal Emulator - StartupNotify=false - X-XFCE-Binaries=x-terminal-emulator; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -e %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/encompass.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/encompass.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=encompass --Type=X-XFCE-Helper -+Type=Application - _Name=Encompass - StartupNotify=true - X-XFCE-Binaries=encompass; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/epiphany.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/epiphany.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=web-browser --Type=X-XFCE-Helper -+Type=Application - _Name=Epiphany Web Browser - StartupNotify=true - X-XFCE-Binaries=epiphany; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/eterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/eterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=Eterm --Type=X-XFCE-Helper -+Type=Application - _Name=Enlightened Terminal Emulator - StartupNotify=false - X-XFCE-Binaries=Eterm; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B --exec "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/evolution.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/evolution.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=evolution --Type=X-XFCE-Helper -+Type=Application - _Name=Novell Evolution - StartupNotify=false - X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 evolution %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/firefox.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/firefox.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=firefox --Type=X-XFCE-Helper -+Type=Application - _Name=Mozilla Firefox - StartupNotify=false - X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B; - X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/galeon.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/galeon.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=galeon --Type=X-XFCE-Helper -+Type=Application - _Name=Galeon Web Browser - StartupNotify=true - X-XFCE-Binaries=galeon; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/gnome-terminal.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/gnome-terminal.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=gnome-terminal --Type=X-XFCE-Helper -+Type=Application - _Name=GNOME Terminal - StartupNotify=true - X-XFCE-Binaries=gnome-terminal;gnometerminal; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -x %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/icedove.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/icedove.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=icedove --Type=X-XFCE-Helper -+Type=Application - _Name=Icedove - StartupNotify=false - X-XFCE-Binaries=icedove; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/kmail.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/kmail.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=kmail --Type=X-XFCE-Helper -+Type=Application - _Name=KMail - StartupNotify=true - X-XFCE-Binaries=kmail; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail-1 kmail %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/konqueror.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/konqueror.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=konqueror --Type=X-XFCE-Helper -+Type=Application - _Name=Konqueror Web Browser - StartupNotify=true - X-XFCE-Binaries=konqueror; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/links.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/links.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=links --Type=X-XFCE-Helper -+Type=Application - _Name=Links Text Browser - StartupNotify=false - X-XFCE-Binaries=links;links-current; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=exo-open --launch TerminalEmulator %B; - X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/lynx.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/lynx.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=aterm --Type=X-XFCE-Helper -+Type=Application - _Name=Lynx Text Browser - StartupNotify=false - X-XFCE-Binaries=lynx;lynx-current; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=exo-open --launch TerminalEmulator %B; - X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/midori.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/midori.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -2,10 +2,11 @@ - [Desktop Entry] - Version=1.0 - Icon=midori --Type=X-XFCE-Helper -+Type=Application - _Name=Midori - StartupNotify=true - X-XFCE-Binaries=midori; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/mozilla-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/mozilla-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=mozilla --Type=X-XFCE-Helper -+Type=Application - _Name=Mozilla Browser - StartupNotify=false - X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B; - X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/mozilla-mailer.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=mozilla --Type=X-XFCE-Helper -+Type=Application - _Name=Mozilla Mail - StartupNotify=false - X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B -mail; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/mutt.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/mutt.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=mutt --Type=X-XFCE-Helper -+Type=Application - _Name=Mutt - StartupNotify=false - X-XFCE-Binaries=mutt; - X-XFCE-Category=MailReader - X-XFCE-Commands=exo-open --launch TerminalEmulator %B; - X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail-1 mutt %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/nautilus.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/nautilus.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -2,10 +2,11 @@ - [Desktop Entry] - Version=1.0 - Icon=nautilus --Type=X-XFCE-Helper -+Type=Application - _Name=Nautilus - StartupNotify=true - X-XFCE-Binaries=nautilus; - X-XFCE-Category=FileManager - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/netscape-navigator.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/netscape-navigator.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=mozilla --Type=X-XFCE-Helper -+Type=Application - _Name=Netscape Navigator - StartupNotify=false - X-XFCE-Binaries=netscape; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B; - X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/nxterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/nxterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=nxterm --Type=X-XFCE-Helper -+Type=Application - _Name=NXterm - StartupNotify=false - X-XFCE-Binaries=nxterm; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -e %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/opera-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/opera-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=opera --Type=X-XFCE-Helper -+Type=Application - _Name=Opera Browser - StartupNotify=false - X-XFCE-Binaries=opera; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/opera-mailer.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/opera-mailer.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=opera --Type=X-XFCE-Helper -+Type=Application - _Name=Opera Mail - StartupNotify=false - X-XFCE-Binaries=opera; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -remote "openURL(mailto:%s)";%B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/pcmanfm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/pcmanfm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -2,10 +2,11 @@ - [Desktop Entry] - Version=1.0 - Icon=pcmanfm --Type=X-XFCE-Helper -+Type=Application - _Name=PCMan File Manager - StartupNotify=true - X-XFCE-Binaries=pcmanfm; - X-XFCE-Category=FileManager - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/sylpheed-claws.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=claws-mail --Type=X-XFCE-Helper -+Type=Application - _Name=Claws Mail - StartupNotify=true - X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/sylpheed.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/sylpheed.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=sylpheed --Type=X-XFCE-Helper -+Type=Application - _Name=Sylpheed - StartupNotify=true - X-XFCE-Binaries=sylpheed; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/Terminal.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/Terminal.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=Terminal --Type=X-XFCE-Helper -+Type=Application - _Name=Xfce Terminal - StartupNotify=true - X-XFCE-Binaries=Terminal;xterminal;xfce4-terminal; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -x %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/Thunar.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/Thunar.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -2,10 +2,11 @@ - [Desktop Entry] - Version=1.0 - Icon=Thunar --Type=X-XFCE-Helper -+Type=Application - _Name=Thunar - StartupNotify=true - X-XFCE-Binaries=Thunar; - X-XFCE-Category=FileManager - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B "%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/thunderbird.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/thunderbird.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=thunderbird --Type=X-XFCE-Helper -+Type=Application - _Name=Mozilla Thunderbird - StartupNotify=false - X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird; - X-XFCE-Category=MailReader - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s"; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/urxvt.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/urxvt.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=rxvt --Type=X-XFCE-Helper -+Type=Application - _Name=RXVT Unicode - StartupNotify=false - X-XFCE-Binaries=urxvt; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -e %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/w3m.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/w3m.desktop.in.in 2011-03-07 12:08:30.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=w3m --Type=X-XFCE-Helper -+Type=Application - _Name=W3M Text Browser - StartupNotify=false - X-XFCE-Binaries=w3m; - X-XFCE-Category=WebBrowser - X-XFCE-Commands=exo-open --launch TerminalEmulator %B; - X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s; -+X-XFCE-Type=X-XFCE-Helper ---- a/exo-helper/helpers/xterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100 -+++ b/exo-helper/helpers/xterm.desktop.in.in 2011-03-07 12:08:31.000000000 +0100 -@@ -1,10 +1,11 @@ - [Desktop Entry] - Version=1.0 - Icon=xterm --Type=X-XFCE-Helper -+Type=Application - _Name=X Terminal - StartupNotify=false - X-XFCE-Binaries=xterm; - X-XFCE-Category=TerminalEmulator - X-XFCE-Commands=%B; - X-XFCE-CommandsWithParameter=%B -e %s; -+X-XFCE-Type=X-XFCE-Helper diff --git a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb deleted file mode 100644 index ad8dc59f6f..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="Application library for the Xfce desktop environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxfce4util virtual/libx11 perl-native cairo" - -PR = "r1" - -inherit xfce pythonnative - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://exo-no-tests-0.6.patch \ - file://configure.patch \ - file://gnome-mount \ - file://fix-qa-desktop-type-error.patch \ -" - -# see http://wiki.xfce.org/gnomemount-replacement -do_install_append () { - install -m 755 -d ${D}${bindir}/exo-mount-wrapper - install -m 755 ${WORKDIR}//gnome-mount ${D}${bindir}/exo-mount-wrapper -} - -# Note: python bindings did not work in oe-dev and are about to be moved to -# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES_${PN} += "${datadir}/xfce4/ \ - ${libdir}/xfce4/exo-1 \ - " - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ - " - -SRC_URI[md5sum] = "e25333df350abc30999cd16fe96ab690" -SRC_URI[sha256sum] = "f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39" diff --git a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb b/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb new file mode 100644 index 0000000000..af9103f6c8 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb @@ -0,0 +1,32 @@ +DESCRIPTION="Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 perl-native cairo" + +inherit xfce pythonnative + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ + file://configure.patch \ + file://gnome-mount \ +" + +SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259" +SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0" + +# see http://wiki.xfce.org/gnomemount-replacement +do_install_append () { + install -m 755 -d ${D}${bindir}/exo-mount-wrapper + install -m 755 ${WORKDIR}//gnome-mount ${D}${bindir}/exo-mount-wrapper +} + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES_${PN} += "${datadir}/xfce4/ \ + ${libdir}/xfce4/exo-1 \ + " + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ + " -- cgit v1.2.3-54-g00ecf From de308174dee16720dc17e59fcc16281762dcf3d9 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 17:22:10 +0200 Subject: xfce-utils: remove since they are not needed anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Functionality has been moved in xfce4-session, libxfce4ui, xfce4-appfinder or is removed [1]. [1] http://xfce.org/download/changelogs/4.10pre1 Signed-off-by: Andreas Müller --- .../packagegroups/packagegroup-xfce-base.bb | 3 +-- .../recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 41e1d4a5a9..d091e92e5a 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -2,7 +2,7 @@ DESCRIPTION = "All packages required for a base installation of XFCE" SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r3" +PR = "r4" inherit packagegroup @@ -20,7 +20,6 @@ RDEPENDS_${PN} = " \ \ gtk-xfce-engine \ \ - xfce-utils \ xfce4-panel-plugin-actions \ xfce4-panel-plugin-applicationsmenu \ xfce4-panel-plugin-clock \ diff --git a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb deleted file mode 100644 index e4b8686252..0000000000 --- a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Xfce4 Utilities" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui" - -inherit xfce - -# usually we do not migrate (requires perl on target) -EXTRA_OECONF += "--disable-xfconf-migration" - -FILES_${PN} += " \ - ${libdir}/xfce4/xfconf-migration \ - ${datadir}/dbus-1/* \ - ${datadir}/xsessions/xfce.desktop \ -" -RDEPENDS_${PN} = "xrdb openssh-misc" - -SRC_URI[md5sum] = "03b5fba5f63f4f1a31cc7d3728f3c87e" -SRC_URI[sha256sum] = "035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926" -- cgit v1.2.3-54-g00ecf From 38c74312030dc56758d2b83c63ce74c2b2b59834 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 18 May 2012 22:30:59 +0200 Subject: xfconf: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb | 13 +++++++++++++ meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb | 15 --------------- 2 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb new file mode 100644 index 0000000000..5dceb0902a --- /dev/null +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce configuration daemon and utilities" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +DEPENDS = "dbus-glib libxfce4util perl-native" + +inherit xfce + +SRC_URI[md5sum] = "4ed48150a03fb5f42b455494307b7f28" +SRC_URI[sha256sum] = "175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576" + +FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ + ${datadir}/dbus-1/services/org.xfce.Xfconf.service" diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb deleted file mode 100644 index 65efffd908..0000000000 --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Xfce configuration daemon and utilities" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "dbus-glib libxfce4util perl-native" - -PR = "r0" - -inherit xfce - -FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ - ${datadir}/dbus-1/services/org.xfce.Xfconf.service" - -SRC_URI[md5sum] = "0f11ed1ec7789c5c4c3fcc7cdb3c2940" -SRC_URI[sha256sum] = "e071d55982238f997a691ff4bb08ef39e4c86bae31cf69b6666bc0cdadd1b85d" -- cgit v1.2.3-54-g00ecf From db799a93e277a973481a6ed4cadafdc9d3985c40 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 17:44:54 +0200 Subject: xfce4-session: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-xfwm4-when-closing-session-with-multiple.patch | 169 --------------------- ...ultiple-interactive-session-save-bug-5379.patch | 152 ++++++++++++++++++ .../xfce4-session/xfce4-session_4.10.0.bb | 26 ++++ .../xfce4-session/xfce4-session_4.8.3.bb | 28 ---- 4 files changed, 178 insertions(+), 197 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch deleted file mode 100644 index 50bade87f7..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 64c0acb072057023870881f9fbac29ce08d357db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 5 Sep 2012 20:14:09 +0200 -Subject: [PATCH] Don't loose xfwm4 when closing session with multiple windows - waiting for user input -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When closing a session with more than one window open and waiting for unsaved -data to be closed, at the next session xfwm4 was not started properly. - -The bug(fix) could be reproduced by - -* opening gedit -* entering some text -* opening terminal -* closing session (no YNC-dialog / wait ~1min to close session) -* reopen session - -Bugreport with this patch is found at [1] further discussion at [2]. - -Upstream-Status: Pending - -[1] https://bugzilla.xfce.org/show_bug.cgi?id=5379 -[2] http://mail.xfce.org/pipermail/xfce/2012-August/031174.html - -Signed-off-by: Andreas Müller ---- - xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++----------------- - 1 files changed, 47 insertions(+), 34 deletions(-) - -diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c -index 3078d6a..3cc4c89 100644 ---- a/xfce4-session/xfsm-manager.c -+++ b/xfce4-session/xfsm-manager.c -@@ -96,6 +96,7 @@ struct _XfsmManager - - XfsmManagerState state; - XfsmShutdownType shutdown_type; -+ gboolean save_session; - - gboolean session_chooser; - gchar *session_name; -@@ -225,6 +226,7 @@ xfsm_manager_init (XfsmManager *manager) - manager->session_chooser = FALSE; - manager->failsafe_mode = TRUE; - manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; -+ manager->save_session = TRUE; - - manager->pending_properties = g_queue_new (); - manager->starting_properties = g_queue_new (); -@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *manager, - XfsmClient *cl = lp->data; - if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) - { -- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); -+ /* a client is already interacting, so new client has to wait */ -+ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); -+ xfsm_manager_cancel_client_save_timeout(manager, client); - return; - } - } -@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, - } - #endif - -- if (!shutdown || shutdown_save) -+ /* don't save the session if shutting down without save */ -+ manager->save_session = !shutdown || shutdown_save; -+ -+ if (save_type == SmSaveBoth && !manager->save_session) - { -- xfsm_manager_set_state (manager, -- shutdown -- ? XFSM_MANAGER_SHUTDOWN -- : XFSM_MANAGER_CHECKPOINT); -+ /* saving the session, so clients should -+ * (prompt to) save the user data only */ -+ save_type = SmSaveGlobal; -+ } - -- /* handle legacy applications first! */ -- xfsm_legacy_perform_session_save (); -+ xfsm_manager_set_state (manager, -+ shutdown -+ ? XFSM_MANAGER_SHUTDOWN -+ : XFSM_MANAGER_CHECKPOINT); - -- for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -- lp; -- lp = lp->next) -- { -- XfsmClient *client = lp->data; -- XfsmProperties *properties = xfsm_client_get_properties (client); -- const gchar *program; -+ /* handle legacy applications first! */ -+ if (manager->save_session) -+ xfsm_legacy_perform_session_save (); - -- /* xterm's session management is broken, so we won't -- * send a SAVE YOURSELF to xterms */ -- program = xfsm_properties_get_string (properties, SmProgram); -- if (program != NULL && strcasecmp (program, "xterm") == 0) -- continue; -+ for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -+ lp; -+ lp = lp->next) -+ { -+ XfsmClient *client = lp->data; -+ XfsmProperties *properties = xfsm_client_get_properties (client); -+ const gchar *program; - -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -- { -- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -- interact_style, fast); -- } -+ /* xterm's session management is broken, so we won't -+ * send a SAVE YOURSELF to xterms */ -+ program = xfsm_properties_get_string (properties, SmProgram); -+ if (program != NULL && strcasecmp (program, "xterm") == 0) -+ continue; - -- xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -- xfsm_manager_start_client_save_timeout (manager, client); -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ { -+ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -+ interact_style, fast); - } -- } -- else -- { -- /* shutdown session without saving */ -- xfsm_manager_perform_shutdown (manager); -+ -+ xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -+ xfsm_manager_start_client_save_timeout (manager, client); - } - } - -@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager, - XfsmClient *client, - gboolean success) - { -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in -+ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone -+ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */ -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && -+ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL && -+ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT) - { - xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " - "in save mode. Prepare to be nuked!\n", -@@ -1539,7 +1551,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager) - xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); - - /* all clients done, store session data */ -- xfsm_manager_store_session (manager); -+ if (manager->save_session) -+ xfsm_manager_store_session (manager); - - if (manager->state == XFSM_MANAGER_CHECKPOINT) - { --- -1.7.6.5 - diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch new file mode 100644 index 0000000000..38949a5d73 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch @@ -0,0 +1,152 @@ +From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001 +From: Dimitar Zhekov +Date: Thu, 30 Aug 2012 22:52:14 +0200 +Subject: [PATCH] Handle multiple interactive session save (bug #5379). + +Additionnaly, we now use SmSaveGlobal on log out / shutdown without +session save which avoids data loss. Previously clients would not save +anything on log out without session save. + +Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com). +--- +Upstream-status: applied + xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++----------------- + 1 files changed, 47 insertions(+), 34 deletions(-) + +diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c +index bf6a446..35811c5 100644 +--- a/xfce4-session/xfsm-manager.c ++++ b/xfce4-session/xfsm-manager.c +@@ -98,6 +98,7 @@ struct _XfsmManager + + XfsmShutdownType shutdown_type; + XfsmShutdown *shutdown_helper; ++ gboolean save_session; + + gboolean session_chooser; + gchar *session_name; +@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager) + manager->failsafe_mode = TRUE; + manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; + manager->shutdown_helper = xfsm_shutdown_get (); ++ manager->save_session = TRUE; + + manager->pending_properties = g_queue_new (); + manager->starting_properties = g_queue_new (); +@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager, + XfsmClient *cl = lp->data; + if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) + { +- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); ++ /* a client is already interacting, so new client has to wait */ ++ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); ++ xfsm_manager_cancel_client_save_timeout(manager, client); + return; + } + } +@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, + } + } + +- if (!shutdown || shutdown_save) ++ /* don't save the session if shutting down without save */ ++ manager->save_session = !shutdown || shutdown_save; ++ ++ if (save_type == SmSaveBoth && !manager->save_session) + { +- xfsm_manager_set_state (manager, +- shutdown +- ? XFSM_MANAGER_SHUTDOWN +- : XFSM_MANAGER_CHECKPOINT); ++ /* saving the session, so clients should ++ * (prompt to) save the user data only */ ++ save_type = SmSaveGlobal; ++ } + +- /* handle legacy applications first! */ +- xfsm_legacy_perform_session_save (); ++ xfsm_manager_set_state (manager, ++ shutdown ++ ? XFSM_MANAGER_SHUTDOWN ++ : XFSM_MANAGER_CHECKPOINT); + +- for (lp = g_queue_peek_nth_link (manager->running_clients, 0); +- lp; +- lp = lp->next) +- { +- XfsmClient *client = lp->data; +- XfsmProperties *properties = xfsm_client_get_properties (client); +- const gchar *program; ++ /* handle legacy applications first! */ ++ if (manager->save_session) ++ xfsm_legacy_perform_session_save (); + +- /* xterm's session management is broken, so we won't +- * send a SAVE YOURSELF to xterms */ +- program = xfsm_properties_get_string (properties, SmProgram); +- if (program != NULL && strcasecmp (program, "xterm") == 0) +- continue; ++ for (lp = g_queue_peek_nth_link (manager->running_clients, 0); ++ lp; ++ lp = lp->next) ++ { ++ XfsmClient *client = lp->data; ++ XfsmProperties *properties = xfsm_client_get_properties (client); ++ const gchar *program; + +- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) +- { +- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, +- interact_style, fast); +- } ++ /* xterm's session management is broken, so we won't ++ * send a SAVE YOURSELF to xterms */ ++ program = xfsm_properties_get_string (properties, SmProgram); ++ if (program != NULL && strcasecmp (program, "xterm") == 0) ++ continue; + +- xfsm_client_set_state (client, XFSM_CLIENT_SAVING); +- xfsm_manager_start_client_save_timeout (manager, client); ++ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) ++ { ++ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, ++ interact_style, fast); + } +- } +- else +- { +- /* shutdown session without saving */ +- xfsm_manager_perform_shutdown (manager); ++ ++ xfsm_client_set_state (client, XFSM_CLIENT_SAVING); ++ xfsm_manager_start_client_save_timeout (manager, client); + } + } + +@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager, + XfsmClient *client, + gboolean success) + { +- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) ++ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in ++ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone ++ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */ ++ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && ++ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL && ++ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT) + { + xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " + "in save mode. Prepare to be nuked!\n", +@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager) + xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); + + /* all clients done, store session data */ +- xfsm_manager_store_session (manager); ++ if (manager->save_session) ++ xfsm_manager_store_session (manager); + + if (manager->state == XFSM_MANAGER_CHECKPOINT) + { +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb new file mode 100644 index 0000000000..4df9894951 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf gnome-keyring" +RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" + +inherit xfce + +SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230" +SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce" +SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch" + +# protect from frightening message that xfce might not work correctly +pkg_postinst_${PN} () { + echo 127.0.0.1 ${MACHINE} >> /etc/hosts +} + +FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ + ${libdir}/xfce4/session/*-*-* \ + ${datadir}/xsessions \ + ${datadir}/themes/Default/balou/*" + +FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" + +FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a" diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb deleted file mode 100644 index 4b9b32eb78..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf xfce4-panel gconf gnome-keyring" -RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit" -PR = "r2" - -inherit xfce - -SRC_URI += "file://0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch" - -# protect from frightening message that xfce might not work correctly -pkg_postinst_${PN} () { - echo 127.0.0.1 ${MACHINE} >> /etc/hosts -} - -FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ - ${libdir}/xfce4/session/*-*-* \ - ${datadir}/xfce4/*/* \ - ${datadir}/themes/Default/balou/*" - -FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" - -FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a" - -SRC_URI[md5sum] = "461cc38bbd37cab881adbdf943f9a402" -SRC_URI[sha256sum] = "f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338" -- cgit v1.2.3-54-g00ecf From 63753685fe0ca4c3f7998ac5490d059a1a0a5481 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 23:55:58 +0200 Subject: xfce4-settings: update to 4.10.0 and set default themes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...settingsd-use-gnome-as-default-icon-theme.patch | 29 -------------------- ...ttings.xml-remove-trouble-causing-comment.patch | 31 +++++++++++++++++++++ .../0002-xsettings.xml-Set-default-themes.patch | 32 ++++++++++++++++++++++ .../xfce4-settings/xfce4-settings_4.10.0.bb | 16 +++++++++++ .../xfce4-settings/xfce4-settings_4.8.3.bb | 14 ---------- 5 files changed, 79 insertions(+), 43 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch deleted file mode 100644 index d428848293..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 576e7881bdc84390cc51210ee37e5bdd87a170fc Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Sat, 15 Oct 2011 16:43:09 +0200 -Subject: [PATCH] xfsettingsd: use 'gnome' as default icon theme - -Signed-off-by: Koen Kooi ---- - -Upstream-status: unacceptable (config) - - xfsettingsd/xsettings.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index 049b4ed..d8c6a85 100644 ---- a/xfsettingsd/xsettings.xml -+++ b/xfsettingsd/xsettings.xml -@@ -3,7 +3,7 @@ - - - -- -+ - - - --- -1.6.6.1 - diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch new file mode 100644 index 0000000000..a76fad2aac --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch @@ -0,0 +1,31 @@ +From a84a7a6537544cdf56e1d4cad47a4cf002964039 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 20 May 2012 15:20:08 +0200 +Subject: [PATCH 1/2] xsettings.xml: remove trouble causing comment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Upstream-status: Pending + + +Signed-off-by: Andreas Müller +--- + xfsettingsd/xsettings.xml | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml +index 8f9e2eb..49a4c1e 100644 +--- a/xfsettingsd/xsettings.xml ++++ b/xfsettingsd/xsettings.xml +@@ -1,8 +1,3 @@ +- +- + + + +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch new file mode 100644 index 0000000000..498f8d00d5 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch @@ -0,0 +1,32 @@ +From 071a390ba09a8a412f73d295be81a805804a1f24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 20 May 2012 15:22:09 +0200 +Subject: [PATCH 2/2] xsettings.xml: Set default themes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Upstram status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + xfsettingsd/xsettings.xml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml +index 49a4c1e..5ec94e9 100644 +--- a/xfsettingsd/xsettings.xml ++++ b/xfsettingsd/xsettings.xml +@@ -1,8 +1,8 @@ + + + +- +- ++ ++ + + + +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb new file mode 100644 index 0000000000..fb9083dfb7 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier" + +inherit xfce + +SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \ + file://0002-xsettings.xml-Set-default-themes.patch" +SRC_URI[md5sum] = "cc4dd9179ead9046c056431f01a12000" +SRC_URI[sha256sum] = "0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e" + +FILES_${PN} += "${libdir}/xfce4" + +RRECOMMENDS_${PN} += "gnome-icon-theme" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb deleted file mode 100644 index c3dd8fdd51..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Xfce4 settings" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier" - -inherit xfce - -SRC_URI += "file://0001-xfsettingsd-use-gnome-as-default-icon-theme.patch" - -SRC_URI[md5sum] = "4669298cc8a4abf0e5a410016b575030" -SRC_URI[sha256sum] = "d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e" - -RRECOMMENDS_${PN} += "gnome-icon-theme" -- cgit v1.2.3-54-g00ecf From 030e44b085cdba356afbf7567f8bfc5cc20f988e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 22:35:22 +0200 Subject: xfwm4: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb | 28 +++++++++++++++++++++++++ meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb | 31 ---------------------------- 2 files changed, 28 insertions(+), 31 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb new file mode 100644 index 0000000000..049ac6fb64 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION="Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" + +inherit xfce update-alternatives + +SRC_URI[md5sum] = "333e5e25a85411c304e9b4474bf00537" +SRC_URI[sha256sum] = "492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c" + +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) +} + +PACKAGES_DYNAMIC += "xfwm4-theme-*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ + " +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" + diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb deleted file mode 100644 index 304ff66165..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" -PR = "r1" - -inherit xfce update-alternatives - -SRC_URI[md5sum] = "66cb65797cea8a62563f69b833c7888b" -SRC_URI[sha256sum] = "0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e" - -EXTRA_OECONF += " --enable-startup-notification" - -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) -} - -PACKAGES_DYNAMIC += "xfwm4-theme-*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ - " -FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" - -- cgit v1.2.3-54-g00ecf From a8b886f6efbcb4f4422ffaa56721d7d43101c20b Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 23:26:13 +0200 Subject: packagegreoup-xfce-extended: only RDEPEND on themes shipped by xfwm4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index ebe2dc7bb3..fcc716ae59 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -3,7 +3,7 @@ SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r4" +PR = "r5" inherit packagegroup @@ -21,11 +21,6 @@ RRECOMMENDS_${PN} = " \ xfwm4-theme-daloa \ xfwm4-theme-kokodi \ xfwm4-theme-moheli \ - xfwm4-theme-sassandra \ - xfwm4-theme-stoneage \ - xfwm4-theme-therapy \ - xfwm4-theme-tyrex \ - xfwm4-theme-wallis \ \ xfce4-cpufreq-plugin \ xfce4-cpugraph-plugin \ -- cgit v1.2.3-54-g00ecf From 1f619ccf440278b5ed0838dd961f6f805a0dd9b6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 22:38:47 +0200 Subject: packagegroup-xfce-base: no need to RDEPEND xfwm4-theme-default - xfwm4 does already MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index d091e92e5a..e42ea3c327 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -12,7 +12,6 @@ RCONFLICTS_${PN} += "task-xfce-base" RDEPENDS_${PN} = " \ xfwm4 \ - xfwm4-theme-default \ xfce4-session \ xfconf \ xfdesktop \ -- cgit v1.2.3-54-g00ecf From ab5135c573c176518bd34cc31b380f148a42a924 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 17:49:29 +0200 Subject: xfwm4-themes: initial add 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb diff --git a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb new file mode 100644 index 0000000000..c018cb5285 --- /dev/null +++ b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Additional (old) themes for Xfwm4" +SECTION = "x11/wm" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit xfce + +SRC_URI = "http://archive.xfce.org/src/art/${PN}/${@'${PV}'[0:4]}/${PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "eaa58362053a3549c8be0b32efd3c54f" +SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575" + +# using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by +# multiple providers. So we use xfwm4-old-theme here. +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-old-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "xfwm4-old-theme-*" -- cgit v1.2.3-54-g00ecf From 5f9676112ac39c983c554ef49a235a3d63db6557 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 22:54:22 +0200 Subject: xfce4-panel: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb | 29 +++++++++++++++++++ .../recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb | 33 ---------------------- 2 files changed, 29 insertions(+), 33 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb new file mode 100644 index 0000000000..5d034258e6 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Xfce4 Panel" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" +DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck" + +inherit xfce + +SRC_URI[md5sum] = "cf7351a4b952dbe3fc5ff509c68def33" +SRC_URI[sha256sum] = "3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9" + +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-*" + +FILES_${PN} += "${libdir}/xfce4/panel/migrate \ + ${libdir}/xfce4/panel/wrapper" + +FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ + " diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb deleted file mode 100644 index b59fde0a1e..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Xfce4 Panel" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck" - -PR = "r3" - -inherit xfce - -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*']) -} -do_install_append () { - find "${D}/${libdir}/xfce4/panel/plugins" -name '*.a' -exec rm -f {} + -} - -PACKAGES_DYNAMIC = "${PN}-plugin-*" - -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ - ${libdir}/xfce4/panel/wrapper" - -FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ - " -SRC_URI[md5sum] = "9d7bf0503d5867c4044cef04bb5845b1" -SRC_URI[sha256sum] = "66f1266a1242ee5ecada995a4a584dd9802aa24456759b40b0c29227c39bed03" -- cgit v1.2.3-54-g00ecf From f7170dc6c40f8b109014876014be1addbef2abf2 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 01:22:37 +0200 Subject: thunar: update to 1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb | 28 --------------------------- meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb | 24 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb create mode 100644 meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb deleted file mode 100644 index 86fcc791ea..0000000000 --- a/meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "File manager for the Xfce Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify" - -PR = "r1" - -inherit xfce - -# SRC_URI must follow inherited one -SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" - -S = "${WORKDIR}/Thunar-${PV}/" - -FILES_${PN} += "${libdir}/thunarx-2/* \ - ${libdir}/xfce4/panel/plugins/* \ - ${libdir}/Thunar/[Tt]hunar* \ - ${datadir}/dbus-1 \ - ${datadir}/Thunar \ - ${datadir}/xfce4/panel-plugins/*" - -FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \ - ${libdir}/xfce4/panel/plugins/.debug/ \ - ${libdir}/Thunar/.debug/" - -SRC_URI[md5sum] = "0a2c36cdd3cb3a2ab52cbf6055415b85" -SRC_URI[sha256sum] = "e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb new file mode 100644 index 0000000000..39b1254504 --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify" + +inherit xfce + +SRC_URI[md5sum] = "737ad2c36ed36b10fef82e860b9e990a" +SRC_URI[sha256sum] = "2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba" +SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" + +S = "${WORKDIR}/Thunar-${PV}/" + +FILES_${PN} += "${libdir}/thunarx-2/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${datadir}/dbus-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel-plugins/*" + +FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \ + ${libdir}/xfce4/panel/plugins/.debug/ \ + ${libdir}/Thunar/.debug/" -- cgit v1.2.3-54-g00ecf From 1b34cf3d932e843b85a1e43e9f38fd306f3748e0 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 01:40:31 +0200 Subject: xfdesktop update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../xfdesktop/relative-symlinks-docs.patch | 31 ---------------------- .../recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb | 12 +++++++++ .../recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb | 19 ------------- 3 files changed, 12 insertions(+), 50 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch create mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch deleted file mode 100644 index 751d7a6381..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5039e7834fff94f8393963ea8dbad81fa95ef810 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 16 Sep 2011 21:09:05 +0200 -Subject: [PATCH] docs: On installation create relative paths in symlinks to - images -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -Signed-off-by: Andreas Müller ---- - doc/manual/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am -index 646821d..cbf79e1 100644 ---- a/doc/manual/Makefile.am -+++ b/doc/manual/Makefile.am -@@ -20,7 +20,7 @@ install-data-local: - done; \ - if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \ - echo "--- Creating symlink to C images for $$lang"; \ -- ln -sf $(docdir)/html/C/images $(DESTDIR)$(docdir)/html/$$lang/images; \ -+ ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \ - fi \ - fi \ - done; --- -1.7.4.4 - diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb new file mode 100644 index 0000000000..c9cd92427d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Xfce4 Desktop Manager" +SECTION = "x11/base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" + +inherit xfce + +SRC_URI[md5sum] = "d5f6fb9fdde3ddff5804b2a251892936" +SRC_URI[sha256sum] = "897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b" + +FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb deleted file mode 100644 index 2866280f63..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Xfce4 Desktop Manager" -SECTION = "x11/base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" - -PR = "r0" - -inherit xfce - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://relative-symlinks-docs.patch \ -" - -FILES_${PN} += "${datadir}/xfce4/backdrops" - -SRC_URI[md5sum] = "617c667c469698e8c974e38412cb484c" -SRC_URI[sha256sum] = "e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424" -- cgit v1.2.3-54-g00ecf From f0008e423a0add64ed6d09fcf1e81effffdf7b35 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 01:49:42 +0200 Subject: xfce4-appfinder: update to 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb | 10 ++++++++++ .../recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb delete mode 100644 meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb new file mode 100644 index 0000000000..25c2515a1b --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION="Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS="glib-2.0 gtk+ libxfce4util libxfce4ui garcon dbus-glib xfconf" + +inherit xfce + +SRC_URI[md5sum] = "799f70a9ad67b450da67810a5107e623" +SRC_URI[sha256sum] = "042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439" diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb deleted file mode 100644 index 9187041096..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION="Xfce4 Application Finder" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS="gtk+ libxfce4util libxfce4ui garcon xfconf" - -PR = "r0" - -inherit xfce - -SRC_URI[md5sum] = "fb4797ef91b90d111b989e98c3e000e0" -SRC_URI[sha256sum] = "fd74184355e45f8a16cc3cdd32b012b6787a453deb3a8b96af90494c7a8ac77f" -- cgit v1.2.3-54-g00ecf From d98356c1efcc46c63d4ef5ffb847ccf887ff18f8 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 02:00:53 +0200 Subject: tumbler: update to 0.1.25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb | 32 ------------------------ meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb | 32 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb create mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb deleted file mode 100644 index cd95a03837..0000000000 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "dbus-glib freetype gdk-pixbuf poppler" - -inherit xfce - -INSANE_SKIP_${PN} = "dev-so" - -do_install_append() { - # correct tumbler-cache-plugin.so link (see plugins/xdg-cache/Makefile.am) - ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so -} - -FILES_${PN} += "${datadir}/dbus-1/services \ - ${libdir}/tumbler-1/tumblerd \ - ${libdir}/tumbler-1/plugins/*.so \ - ${libdir}/tumbler-1/plugins/cache/*.so \ - " - -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ - ${libdir}/tumbler-1/plugins/cache/*.la" -FILES_${PN}-staticdev += "${libdir}/tumbler-1/plugins/*.a \ - ${libdir}/tumbler-1/plugins/cache/*.a" -FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ - ${libdir}/tumbler-1/plugins/.debug \ - ${libdir}/tumbler-1/plugins/cache/.debug \ -" - -SRC_URI[md5sum] = "c6cf6821f5d884cbf2c26f45f2fecc74" -SRC_URI[sha256sum] = "b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb new file mode 100644 index 0000000000..3c2c2b371e --- /dev/null +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb @@ -0,0 +1,32 @@ +DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "dbus-glib freetype gdk-pixbuf poppler" + +inherit xfce + +SRC_URI[md5sum] = "d4edc15c172714c7a3eaf3c719b8faf6" +SRC_URI[sha256sum] = "02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546" + +INSANE_SKIP_${PN} = "dev-so" + +do_install_append() { + # correct tumbler-cache-plugin.so link (see plugins/xdg-cache/Makefile.am) + ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + +FILES_${PN} += "${datadir}/dbus-1/services \ + ${libdir}/tumbler-1/tumblerd \ + ${libdir}/tumbler-1/plugins/*.so \ + ${libdir}/tumbler-1/plugins/cache/*.so \ + " + +FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ + ${libdir}/tumbler-1/plugins/cache/*.la" +FILES_${PN}-staticdev += "${libdir}/tumbler-1/plugins/*.a \ + ${libdir}/tumbler-1/plugins/cache/*.a" +FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ + ${libdir}/tumbler-1/plugins/.debug \ + ${libdir}/tumbler-1/plugins/cache/.debug \ +" -- cgit v1.2.3-54-g00ecf From 7f72ed5f36d06019785e9750437a9543cd69af9e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 12:25:46 +0200 Subject: thunar-volman: update to 0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb | 13 ------------- meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb create mode 100644 meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb deleted file mode 100644 index c7cc0edf89..0000000000 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Automatic management of removable drives and media for thunar" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gtk+ libxfce4ui libxfce4util xfconf libnotify udev" -PR = "r1" - -inherit xfce - -SRC_URI[md5sum] = "2f166662dd100d5195da238af417f305" -SRC_URI[sha256sum] = "b1afd2b3b285cfcf07c11caa3d37fa5ff1fc06f7dc68fcca07f9a0d70daa694f" - -RDEPENDS_${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb new file mode 100644 index 0000000000..44448205bc --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Automatic management of removable drives and media for thunar" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo glib-2.0 gtk+ libxfce4ui libxfce4util xfconf libnotify udev" + +inherit xfce + +SRC_URI[md5sum] = "250af757ea629c7c27f554d17119080c" +SRC_URI[sha256sum] = "ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb" + +RDEPENDS_${PN} = "eject" -- cgit v1.2.3-54-g00ecf From 250d23eed05cf3b036be2971c4f3f512c17e33e2 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 Sep 2012 23:38:15 +0200 Subject: gtk-xfce-engine: update to 3.0.1 and restructure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-a-graduent-pattern-at-each-draw-bug-8521.patch | 30 ---------------------- .../gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb | 18 ------------- .../gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb | 23 +++++++++++++++++ 3 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch delete mode 100644 meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb create mode 100644 meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch b/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch deleted file mode 100644 index 89fddb301a..0000000000 --- a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 868e3fcbb14b836b6f5f1cc73314aebe8453a939 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 29 Aug 2012 19:59:24 +0200 -Subject: [PATCH] Don't leak a graduent pattern at each draw (bug #8521) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport [1] -[1] http://git.xfce.org/xfce/gtk-xfce-engine/commit/?id=964d4a05896bcb6dfbeec34dccb77e4f381363f1 - -Signed-off-by: Andreas Müller ---- - src/gradient_draw.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/gradient_draw.c b/src/gradient_draw.c -index 02deb88..37af559 100644 ---- a/src/gradient_draw.c -+++ b/src/gradient_draw.c -@@ -278,4 +278,6 @@ void gradient_draw_shaded(cairo_t *cr, gint x, gint y, gint width, gint height, - cairo_fill (cr); - - cairo_restore(cr); -+ -+ cairo_pattern_destroy(gradient); - } --- -1.7.6.5 - diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb deleted file mode 100644 index 71310b35e5..0000000000 --- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "XFCE theme for GTK" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+ xfce4-dev-tools-native" - -PR = "r1" - -inherit xfce - -SRC_URI += "file://0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch" -SRC_URI[md5sum] = "e2bc76ab5093ff8472e728e6d6ad5da2" -SRC_URI[sha256sum] = "55604002526c800539f2a8a79e7df3bf23717f45e4bfab31c154c8d01caf3af7" - -FILES_${PN} += "${libdir}/gtk-2.0/*/engines \ - ${datadir}/themes/" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" -FILES_${PN}-staticdev += "${libdir}/gtk-2.0/*/engines/*.a" diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb new file mode 100644 index 0000000000..3ccd2e6281 --- /dev/null +++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "XFCE theme for GTK" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ gtk+3 xfce4-dev-tools-native" + +inherit xfce + +SRC_URI[md5sum] = "174e774d0debb052ec457640275f065d" +SRC_URI[sha256sum] = "eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d" + +PACKAGES += "${PN}-themes gtk3-xfce-engine" +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so" +FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so" +FILES_${PN}-themes += "${datadir}/themes" + +FILES_${PN}-dbg += "${libdir}/gtk-3.0/*/theming-engines/.debug \ + ${libdir}/gtk-2.0/*/engines/.debug" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la \ + ${libdir}/gtk-3.0/*/theming-engines/*.la" + +RDEPENDS_${PN} += "${PN}-themes" +RDEPENDS_gtk3-xfce-engine += "${PN}-themes" -- cgit v1.2.3-54-g00ecf From 184434931bd4ac692fa27bf2af1908e77a7707c3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 00:04:35 +0200 Subject: ristretto: update to 0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LIC_FILES_CHKSUM: Free Software Foundation address changed Signed-off-by: Andreas Müller --- meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb | 14 -------------- meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb create mode 100644 meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb deleted file mode 100644 index fec5c46b66..0000000000 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Tiny image-viewer" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r1" -DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo" - -inherit xfce-app - -RRECOMMENDS_${PN} += "tumbler" - -SRC_URI[md5sum] = "3bfdf129926236a45c58d7afdbb703b7" -SRC_URI[sha256sum] = "96dc519c2e930955f97027d7b9bb7542b01a6ad0ca53a16f9af58f7c851eb8f2" diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb new file mode 100644 index 0000000000..959dcadf7e --- /dev/null +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Tiny image-viewer" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" +DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo" + +inherit xfce-app + +RRECOMMENDS_${PN} += "tumbler" + +SRC_URI[md5sum] = "6b8c9a5d7ed319e4c84a9fefaa18792c" +SRC_URI[sha256sum] = "2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79" -- cgit v1.2.3-54-g00ecf From dc4df6b3cb5ab7883e328f38ddbf455bd5e9ee85 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 00:10:56 +0200 Subject: xfce4-wavelan-plugin: update to 0.5.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb | 9 --------- .../recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb create mode 100644 meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb deleted file mode 100644 index 95acd621e0..0000000000 --- a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.10.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Panel plugin displaying stats from a wireless lan interface" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BenediktMeurer FlorianRivoal" -LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "a4cd20ef471123936e762a139f1025e1" -SRC_URI[sha256sum] = "c5b2535b9c90d3fbf6a5f94d096fbc9cb5ce85e2c5d67df933f6fe74ae6f761d" diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb new file mode 100644 index 0000000000..b241cbafd2 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.11.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Panel plugin displaying stats from a wireless lan interface" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" +LICENSE = "BenediktMeurer FlorianRivoal" +LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "50514bb286f1ed6761a1b36832bb7fe3" +SRC_URI[sha256sum] = "fe06c7ffc29c2d4ca7bc452b3356825354e276565de9b0a2d087ab55471755ae" -- cgit v1.2.3-54-g00ecf From 343f63335438edde126df540a274b939d38dcfc5 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 00:41:32 +0200 Subject: xfce4-screenshooter: update to 1.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../files/0001-Fix-panel-plugin-build.patch | 43 ++++++++++++++++++++++ .../xfce4-screenshooter_1.8.0.bb | 16 -------- .../xfce4-screenshooter_1.8.1.bb | 15 ++++++++ 3 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch delete mode 100644 meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb create mode 100644 meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch new file mode 100644 index 0000000000..c30f9cb18d --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch @@ -0,0 +1,43 @@ +From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001 +From: Samuli Suominen +Date: Sat, 5 May 2012 17:13:45 +0200 +Subject: [PATCH] Fix panel plugin build. + +- Don't use a versioned library. +- Build as a module. +- Only export needed symbols. +--- +Upstream-status: applied + Makefile.am | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 45100fd..d0c0adb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS = \ + @SOUP_CFLAGS@ + + panel_plugin_libscreenshooterplugin_la_LDFLAGS = \ ++ -avoid-version \ ++ -module \ ++ -no-undefined \ ++ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ ++ $(PLATFORM_LDFLAGS) ++ ++panel_plugin_libscreenshooterplugin_la_LIBADD = \ + @EXO_LIBS@ \ + @LIBXFCE4PANEL_LIBS@ \ + @GTHREAD_LIBS@ \ + @SOUP_LIBS@ \ +- @LIBXFCE4UI_LIBS@ +- +-panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la ++ @LIBXFCE4UI_LIBS@ \ ++ lib/libscreenshooter.la + + panel_plugin_libscreenshooterplugin_la_SOURCES = \ + panel-plugin/screenshooter-plugin.c +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb deleted file mode 100644 index 2362b8abf8..0000000000 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -PR = "r0" - -inherit xfce-app - -FILES_${PN} += "${datadir}/xfce4/panel-plugins/*" -FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug" - -SRC_URI[md5sum] = "b51ab5725418e7258273c4a6402adb02" -SRC_URI[sha256sum] = "68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e" diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb new file mode 100644 index 0000000000..b05c29873b --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Application to take screenshots" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" + +inherit xfce-app + +SRC_URI += "file://0001-Fix-panel-plugin-build.patch" +SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f" +SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492" + +FILES_${PN} += "${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins" -- cgit v1.2.3-54-g00ecf From 80f5a3b233b336b876681c858578da4a53a8bb88 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 00:50:37 +0200 Subject: xfce4-netload-plugin: update to 1.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb | 9 --------- .../recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb deleted file mode 100644 index 5dba77adcd..0000000000 --- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Panel plugin displaying current load of the network interfaces" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "19bee8171e7d681cb79539417f0b5917" -SRC_URI[sha256sum] = "8a33dfed24a7bbd8eaf333524f94eb24e7d3a14ffccb181e5cab1d1b05ae3bf7" diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb new file mode 100644 index 0000000000..faf623dd04 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Panel plugin displaying current load of the network interfaces" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "05180d60ed347029dc125368c1d4406e" +SRC_URI[sha256sum] = "c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845" -- cgit v1.2.3-54-g00ecf From 4f087d93fa5d46370727040fadb24bbbbe4fb3df Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 00:54:14 +0200 Subject: xfce4-diskperf-plugin: update to 2.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../diskperf/xfce4-diskperf-plugin_2.5.3.bb | 9 --------- .../diskperf/xfce4-diskperf-plugin_2.5.4.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb create mode 100644 meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb deleted file mode 100644 index e80d0bd023..0000000000 --- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Panel plugin displaying instant disk/partition performance" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "RogerSeguin" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "ba880f763e273787d0c8365eebc4feab" -SRC_URI[sha256sum] = "418a250fe8d48f1fd87658206a8e6762032d35dc1b2e98e27d309a35f873f9b6" diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb new file mode 100644 index 0000000000..6946931a0d --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "RogerSeguin" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "2db453fc3ea2e4fe073ec313a25b0961" +SRC_URI[sha256sum] = "aab6b9c4e2f78620920efac6874c4edf426f05b63b94cfda0da8c99a91110a0b" -- cgit v1.2.3-54-g00ecf From c135b8de4dd4e065b58330f00f3b3709007bdb58 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:23:24 +0200 Subject: xfce4-places-plugin: update to 1.4.0 --- .../recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb | 9 --------- .../recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb deleted file mode 100644 index 5310586d4a..0000000000 --- a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.3.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "d075fffccf44bcf09a1bfcd4e0cd38a2" -SRC_URI[sha256sum] = "0266e6bb9905b6af25f80cbb364d2710b6b95100382d2d540edf9f8408e09936" diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb new file mode 100644 index 0000000000..1f6c231ce2 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "cdb5c966c7a93ca29f2ce50223782133" +SRC_URI[sha256sum] = "d2a451a35096ecb8b6ca96ab0af3ebca3f163a7c8dc08627518940a633cce5e5" -- cgit v1.2.3-54-g00ecf From fd3a1e257b1a715d8982783ae4b887c6d4f79f17 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:41:45 +0200 Subject: xfce4-cpugraph-plugin: update to 1.0.5 --- .../cpugraph/xfce4-cpugraph-plugin_1.0.2.bb | 9 --------- .../cpugraph/xfce4-cpugraph-plugin_1.0.5.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb create mode 100644 meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb deleted file mode 100644 index e3bea63fe4..0000000000 --- a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "93d7658d989ebf110875bc2deb76d7b3" -SRC_URI[sha256sum] = "b535a9c3d105c0d1597fa4071fe140912bb483c4401c84ad178531fc85de0577" diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb new file mode 100644 index 0000000000..e32cbfb161 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "f0ebfabb273adf69361b37a3fa4b7912" +SRC_URI[sha256sum] = "85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7" -- cgit v1.2.3-54-g00ecf From 025cb1aa1abcf923ee69b9138eb83e492ab9db5d Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:42:22 +0200 Subject: xfce4-systemload-plugin: update to 1.1.1 --- .../systemload/xfce4-systemload-plugin_1.1.0.bb | 11 ----------- .../systemload/xfce4-systemload-plugin_1.1.1.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb deleted file mode 100644 index 367599e21a..0000000000 --- a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" - -inherit xfce-panel-plugin - -DEPENDS += "upower" - -SRC_URI[md5sum] = "130ad7befddd8705ca09a98e9cee5c3e" -SRC_URI[sha256sum] = "bc4ca8a7f66acb598d3f11bf0ee1fa650b869b3483176d708905d4ce9b1889f3" diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb new file mode 100644 index 0000000000..53f6c4a3c1 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" + +inherit xfce-panel-plugin + +DEPENDS += "upower" + +SRC_URI[md5sum] = "22d48c0883f9d598bce24e81d93e692e" +SRC_URI[sha256sum] = "1ac13efbe9e576c9effd5e0675574a57c8fd44cfee60d6e319eb4d03c1c8d9ae" -- cgit v1.2.3-54-g00ecf From fd55c8cfd074d201d84c1de7389f43ddd3126e7c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:50:28 +0200 Subject: xfce4-fsguard-plugin: initial add 1.0.1 --- .../recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb diff --git a/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb new file mode 100644 index 0000000000..1446115212 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.1.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin?&#recet_releases" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "9c179371475e2837004cc208026e30c1" +SRC_URI[sha256sum] = "fffb7ee09769ec0b991b8752b848578e6434a675a939c5588f0728c2ef33aab7" -- cgit v1.2.3-54-g00ecf From 973ea4f0dbbeb9df146e4e4529376476f25f56b3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 18 Sep 2012 01:26:51 +0200 Subject: xfce4-battery-plugin: initial add 1.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb new file mode 100644 index 0000000000..97ffd521a5 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" +SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" -- cgit v1.2.3-54-g00ecf From d9a540397a661af6701c353988f87c920503eab4 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:53:35 +0200 Subject: packagegroup-xfce-extended: add xfce4-fsguard-plugin and xfce4-battery-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index fcc716ae59..ea4bd1ef2d 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -3,7 +3,7 @@ SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r5" +PR = "r6" inherit packagegroup @@ -37,6 +37,8 @@ RRECOMMENDS_${PN} = " \ xfce4-time-out-plugin \ xfce4-embed-plugin \ xfce4-weather-plugin \ + xfce4-fsguard-plugin \ + xfce4-battery-plugin \ \ xfce4-appfinder \ xfce4-screenshooter \ -- cgit v1.2.3-54-g00ecf From a93ef9eb4f9bea888e2b7aff3aaf6bce38bc72ac Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 19 May 2012 18:24:02 +0200 Subject: midori: update to 0.4.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-connectivity/midori/midori_0.4.5.bb | 45 ---------------------- .../recipes-connectivity/midori/midori_0.4.6.bb | 45 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/midori/midori_0.4.5.bb create mode 100644 meta-oe/recipes-connectivity/midori/midori_0.4.6.bb diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb deleted file mode 100644 index 7d68720629..0000000000 --- a/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "Midori is a lightweight web browser." -HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native libnotify" - -PR = "r1" - -SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ - " -SRC_URI[midori.md5sum] = "14288197a1e2251b7c0803e1448daa0e" -SRC_URI[midori.sha256sum] = "7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84" - -inherit gtk-icon-cache pkgconfig - -do_configure() { - sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure \ - --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --disable-hildon \ - --disable-gtk3 \ -} - -PARALLEL_MAKE = "" -LDFLAGS_append = " -ljavascriptcoregtk-1.0 " -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb new file mode 100644 index 0000000000..8b1a98204f --- /dev/null +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.6.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Midori is a lightweight web browser." +HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native libnotify" + +PR = "r1" + +SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ + " +SRC_URI[midori.md5sum] = "3c3f0030611d9126ab90be48d44cab57" +SRC_URI[midori.sha256sum] = "910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea" + +inherit gtk-icon-cache pkgconfig + +do_configure() { + sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + --disable-hildon \ + --disable-gtk3 \ +} + +PARALLEL_MAKE = "" +LDFLAGS_append = " -ljavascriptcoregtk-1.0 " +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake DESTDIR=${D} install +} + +RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" + +FILES_${PN}-dev += "${datadir}/vala/vapi" -- cgit v1.2.3-54-g00ecf From 1eed7a33047a907924b5710fa11ef049e494dfd5 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 29 May 2012 00:42:08 +0200 Subject: libmpd: initial add 11.8.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb diff --git a/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb b/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb new file mode 100644 index 0000000000..b58a4fac87 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Music Player Daemon library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://sourceforge.net/projects/musicpd" +DEPENDS = "glib-2.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "5ae3d87467d52aef3345407adb0a2488" +SRC_URI[sha256sum] = "fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83" + +inherit autotools -- cgit v1.2.3-54-g00ecf From 242c9725021059fd72fed0e37306f070f6e0709c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 5 Jun 2012 16:44:12 +0200 Subject: mpd: Initial add 0.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-multimedia/musicpd/mpd/mpd.conf.in | 420 +++++++++++++++++++++ .../recipes-multimedia/musicpd/mpd_0.17.1.bb | 44 +++ .../recipes-multimedia/musicpd/mpd_0.17.1.bbappend | 14 + 3 files changed, 478 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb create mode 100644 meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in b/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in new file mode 100644 index 0000000000..f9f92c98bd --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in @@ -0,0 +1,420 @@ +# An example configuration file for MPD +# See the mpd.conf man page for a more detailed description of each parameter. + + +# Files and directories ####################################################### +# +# This setting controls the top directory which MPD will search to discover the +# available audio files and add them to the daemon's online database. This +# setting defaults to the XDG directory, otherwise the music directory will be +# be disabled and audio files will only be accepted over ipc socket (using +# file:// protocol) or streaming files over an accepted protocol. +# +music_directory "%music_directory%" +# +# This setting sets the MPD internal playlist directory. The purpose of this +# directory is storage for playlists created by MPD. The server will use +# playlist files not created by the server but only if they are in the MPD +# format. This setting defaults to playlist saving being disabled. +# +playlist_directory "%playlist_directory%" +# +# This setting sets the location of the MPD database. This file is used to +# load the database at server start up and store the database while the +# server is not up. This setting defaults to disabled which will allow +# MPD to accept files over ipc socket (using file:// protocol) or streaming +# files over an accepted protocol. +# +db_file "%db_file%" +# +# These settings are the locations for the daemon log files for the daemon. +# These logs are great for troubleshooting, depending on your log_level +# settings. +# +# The special value "syslog" makes MPD use the local syslog daemon. This +# setting defaults to logging to syslog, otherwise logging is disabled. +# +log_file "%log_file%" +# +# This setting sets the location of the file which stores the process ID +# for use of mpd --kill and some init scripts. This setting is disabled by +# default and the pid file will not be stored. +# +#pid_file "/var/run/mpd/mpd.pid" +# +# This setting sets the location of the file which contains information about +# most variables to get MPD back into the same general shape it was in before +# it was brought down. This setting is disabled by default and the server +# state will be reset on server start up. +# +state_file "%state_file%" +# +# The location of the sticker database. This is a database which +# manages dynamic information attached to songs. +# +#sticker_file "~/.mpd/sticker.sql" +# +############################################################################### + + +# General music daemon options ################################################ +# +# This setting specifies the user that MPD will run as. MPD should never run as +# root and you may use this setting to make MPD change its user ID after +# initialization. This setting is disabled by default and MPD is run as the +# current user. +# +user "mpd" +# +# This setting specifies the group that MPD will run as. If not specified +# primary group of user specified with "user" setting will be used (if set). +# This is useful if MPD needs to be a member of group such as "audio" to +# have permission to use sound card. +# +group "audio" +# +# This setting sets the address for the daemon to listen on. Careful attention +# should be paid if this is assigned to anything other then the default, any. +# This setting can deny access to control of the daemon. +# +# For network +bind_to_address "any" +# +# And for Unix Socket +#bind_to_address "~/.mpd/socket" +# +# This setting is the TCP port that is desired for the daemon to get assigned +# to. +# +#port "6600" +# +# This setting controls the type of information which is logged. Available +# setting arguments are "default", "secure" or "verbose". The "verbose" setting +# argument is recommended for troubleshooting, though can quickly stretch +# available resources on limited hardware storage. +# +#log_level "default" +# +# If you have a problem with your MP3s ending abruptly it is recommended that +# you set this argument to "no" to attempt to fix the problem. If this solves +# the problem, it is highly recommended to fix the MP3 files with vbrfix +# (available from ), at which +# point gapless MP3 playback can be enabled. +# +#gapless_mp3_playback "yes" +# +# This setting enables MPD to create playlists in a format usable by other +# music players. +# +#save_absolute_paths_in_playlists "no" +# +# This setting defines a list of tag types that will be extracted during the +# audio file discovery process. Optionally, 'comment' can be added to this +# list. +# +#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" +# +# This setting enables automatic update of MPD's database when files in +# music_directory are changed. +# +#auto_update "yes" +# +# Limit the depth of the directories being watched, 0 means only watch +# the music directory itself. There is no limit by default. +# +#auto_update_depth "3" +# +############################################################################### + + +# Symbolic link behavior ###################################################### +# +# If this setting is set to "yes", MPD will discover audio files by following +# symbolic links outside of the configured music_directory. +# +#follow_outside_symlinks "yes" +# +# If this setting is set to "yes", MPD will discover audio files by following +# symbolic links inside of the configured music_directory. +# +#follow_inside_symlinks "yes" +# +############################################################################### + + +# Zeroconf / Avahi Service Discovery ########################################## +# +# If this setting is set to "yes", service information will be published with +# Zeroconf / Avahi. +# +#zeroconf_enabled "yes" +# +# The argument to this setting will be the Zeroconf / Avahi unique name for +# this MPD server on the network. +# +#zeroconf_name "Music Player" +# +############################################################################### + + +# Permissions ################################################################# +# +# If this setting is set, MPD will require password authorization. The password +# can setting can be specified multiple times for different password profiles. +# +#password "password@read,add,control,admin" +# +# This setting specifies the permissions a user has who has not yet logged in. +# +#default_permissions "read,add,control,admin" +# +############################################################################### + + +# Input ####################################################################### +# + +input { + plugin "curl" +# proxy "proxy.isp.com:8080" +# proxy_user "user" +# proxy_password "password" +} + +# +############################################################################### + +# Audio Output ################################################################ +# +# MPD supports various audio output types, as well as playing through multiple +# audio outputs at the same time, through multiple audio_output settings +# blocks. Setting this block is optional, though the server will only attempt +# autodetection for one sound card. +# +# See for examples of +# other audio outputs. +# +# board specific examples ##################################################### +# (feel free to add futher) +# +# gumstix overo (tested with TOBI expansion board) +#audio_output { +# type "alsa" +# name "overo" +# mixer_control "Headset" +# mixer_index "0" +#} +# +# general examples ############################################################ +# +# An example of an ALSA output: +# +#audio_output { +# type "alsa" +# name "My ALSA Device" +## device "hw:0,0" # optional +## format "44100:16:2" # optional +## mixer_type "hardware" # optional +## mixer_device "default" # optional +## mixer_control "PCM" # optional +## mixer_index "0" # optional +#} +# +# An example of an OSS output: +# +#audio_output { +# type "oss" +# name "My OSS Device" +## device "/dev/dsp" # optional +## format "44100:16:2" # optional +## mixer_type "hardware" # optional +## mixer_device "/dev/mixer" # optional +## mixer_control "PCM" # optional +#} +# +# An example of a shout output (for streaming to Icecast): +# +#audio_output { +# type "shout" +# encoding "ogg" # optional +# name "My Shout Stream" +# host "localhost" +# port "8000" +# mount "/mpd.ogg" +# password "hackme" +# quality "5.0" +# bitrate "128" +# format "44100:16:1" +## protocol "icecast2" # optional +## user "source" # optional +## description "My Stream Description" # optional +## genre "jazz" # optional +## public "no" # optional +## timeout "2" # optional +## mixer_type "software" # optional +#} +# +# An example of a recorder output: +# +#audio_output { +# type "recorder" +# name "My recorder" +# encoder "vorbis" # optional, vorbis or lame +# path "/var/lib/mpd/recorder/mpd.ogg" +## quality "5.0" # do not define if bitrate is defined +# bitrate "128" # do not define if quality is defined +# format "44100:16:1" +#} +# +# An example of a httpd output (built-in HTTP streaming server): +# +#audio_output { +# type "httpd" +# name "My HTTP Stream" +# encoder "vorbis" # optional, vorbis or lame +# port "8000" +# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6 +## quality "5.0" # do not define if bitrate is defined +# bitrate "128" # do not define if quality is defined +# format "44100:16:1" +# max_clients "0" # optional 0=no limit +#} +# +# An example of a pulseaudio output (streaming to a remote pulseaudio server) +# +#audio_output { +# type "pulse" +# name "My Pulse Output" +## server "remote_server" # optional +## sink "remote_server_sink" # optional +#} +# +## Example "pipe" output: +# +#audio_output { +# type "pipe" +# name "my pipe" +# command "aplay -f cd 2>/dev/null" +## Or if you're want to use AudioCompress +# command "AudioCompress -m | aplay -f cd 2>/dev/null" +## Or to send raw PCM stream through PCM: +# command "nc example.org 8765" +# format "44100:16:2" +#} +# +## An example of a null output (for no audio output): +# +#audio_output { +# type "null" +# name "My Null Output" +# mixer_type "none" # optional +#} +# +# This setting will change all decoded audio to be converted to the specified +# format before being passed to the audio outputs. By default, this setting is +# disabled. +# +#audio_output_format "44100:16:2" +# +# If MPD has been compiled with libsamplerate support, this setting specifies +# the sample rate converter to use. Possible values can be found in the +# mpd.conf man page or the libsamplerate documentation. By default, this is +# setting is disabled. +# +#samplerate_converter "Fastest Sinc Interpolator" +# +############################################################################### + + +# Normalization automatic volume adjustments ################################## +# +# This setting specifies the type of ReplayGain to use. This setting can have +# the argument "off", "album" or "track". See +# for more details. This setting is off by default. +# +#replaygain "album" +# +# This setting sets the pre-amp used for files that have ReplayGain tags. By +# default this setting is disabled. +# +#replaygain_preamp "0" +# +# This setting enables on-the-fly normalization volume adjustment. This will +# result in the volume of all playing audio to be adjusted so the output has +# equal "loudness". This setting is disabled by default. +# +#volume_normalization "no" +# +############################################################################### + + +# MPD Internal Buffering ###################################################### +# +# This setting adjusts the size of internal decoded audio buffering. Changing +# this may have undesired effects. Don't change this if you don't know what you +# are doing. +# +#audio_buffer_size "2048" +# +# This setting controls the percentage of the buffer which is filled before +# beginning to play. Increasing this reduces the chance of audio file skipping, +# at the cost of increased time prior to audio playback. +# +#buffer_before_play "10%" +# +############################################################################### + + +# Resource Limitations ######################################################## +# +# These settings are various limitations to prevent MPD from using too many +# resources. Generally, these settings should be minimized to prevent security +# risks, depending on the operating resources. +# +#connection_timeout "60" +#max_connections "10" +#max_playlist_length "16384" +#max_command_list_size "2048" +#max_output_buffer_size "8192" +# +############################################################################### + + +# Character Encoding ########################################################## +# +# If file or directory names do not display correctly for your locale then you +# may need to modify this setting. +# +#filesystem_charset "UTF-8" +# +# This setting controls the encoding that ID3v1 tags should be converted from. +# +#id3v1_encoding "ISO-8859-1" +# +############################################################################### + + +# SIDPlay decoder ############################################################# +# +# songlength_database: +# Location of your songlengths file, as distributed with the HVSC. +# The sidplay plugin checks this for matching MD5 fingerprints. +# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq +# +# default_songlength: +# This is the default playing time in seconds for songs not in the +# songlength database, or in case you're not using a database. +# A value of 0 means play indefinitely. +# +# filter: +# Turns the SID filter emulation on or off. +# +#decoder { +# plugin "sidplay" +# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt" +# default_songlength "120" +# filter "true" +#} +# +############################################################################### + diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb new file mode 100644 index 0000000000..b3b82c4cb8 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://sourceforge.net/projects/musicpd" + +DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ + file://mpd.conf.in \ +" + +SRC_URI[md5sum] = "da3f3d6617a877192db4c6f53504cd38" +SRC_URI[sha256sum] = "b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8" + +inherit autotools useradd + +EXTRA_OECONF = "enable_bzip2=yes" + +do_install_append() { + install -d ${D}/${localstatedir}/lib/mpd/music + chmod 775 ${D}/${localstatedir}/lib/mpd/music + install -d ${D}/${localstatedir}/lib/mpd/playlists + chown -R mpd ${D}/${localstatedir}/lib/mpd + chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend new file mode 100644 index 0000000000..eee4cdd3ac --- /dev/null +++ b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend @@ -0,0 +1,14 @@ +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +EXTRA_OECONF += "--with-systemdsystemunitdir=${systemd_unitdir}/system" + +do_install_append() { + sed -i \ + 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ + ${D}/${systemd_unitdir}/system/mpd.service +} + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "mpd.service" -- cgit v1.2.3-54-g00ecf From 1e675f5d55269644ccfc2849d66249d14f937060 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 18 Mar 2012 20:40:52 +0000 Subject: xfce4-mpc-plugin: initial add 0.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb diff --git a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb new file mode 100644 index 0000000000..a4a4c3e51a --- /dev/null +++ b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.4.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Simple client plugin for Music Player Daemon" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" +SECTION = "x11/application" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" + +inherit xfce-panel-plugin + +DEPENDS += "libmpd" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +SRC_URI[md5sum] = "1c126ca71d6db1ac6a0cc6720554e7bd" +SRC_URI[sha256sum] = "4f0ce6146aa2680a4c1ca7bad1be30187a8a179e8c4355a8fe13d1fc38dac5c5" -- cgit v1.2.3-54-g00ecf From 1690f4c17d593d28211cfce2fac176fa33437dc8 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 18 Mar 2012 20:40:51 +0000 Subject: xfmpc: initial add 0.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb new file mode 100644 index 0000000000..1f31be953b --- /dev/null +++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Music Player Daemon (MPD) client written in GTK+" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" + +# for now we recommend our own mpd-server +RRECOMMENDS_${PN} = "mpd" + +inherit xfce-app + +SRC_URI[md5sum] = "e4e198850c2467c47783969ac9c16ec0" +SRC_URI[sha256sum] = "ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862" -- cgit v1.2.3-54-g00ecf From ef640e8c4084df55923d2743078062878e33d730 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 16:41:26 +0200 Subject: packagegroup-xfce-multimedia: initial add --- .../packagegroups/packagegroup-xfce-multimedia.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb diff --git a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb new file mode 100644 index 0000000000..b86957273b --- /dev/null +++ b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "All packages multimedia packages available for XFCE" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + xfmpc \ + xfce4-mpc-plugin \ +" -- cgit v1.2.3-54-g00ecf From 9b6ec8e06ae8d618b2b31dd7e752efe35d44e327 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 17:24:22 +0200 Subject: README: add some layer dependency hints --- meta-xfce/README | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-xfce/README b/meta-xfce/README index fa2bab0492..88f2332d30 100644 --- a/meta-xfce/README +++ b/meta-xfce/README @@ -7,6 +7,12 @@ revision: HEAD URI: git://git.openembedded.org/meta-openembedded branch: master revision: HEAD +meta-xfce depends on meta-oe and meta-multimedia in this repository. + +To avoid dependencies on meta-multimedia you need to mask recipes by adding +this to local.conf: + +BBMASK = "meta-xfce/recipes-multimedia" Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' -- cgit v1.2.3-54-g00ecf