From 15c2388f33d3297ff33314023d1b01a50e7dcc97 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 26 Dec 2011 02:01:58 +0000 Subject: xfwm4: update to 4.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build tested incremental & from empty build dir * run tested on overo Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- .../xfwm4/xfwm4/relative-symlinks-docs.patch | 33 -------------------- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb | 35 ---------------------- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb | 31 +++++++++++++++++++ 3 files changed, 31 insertions(+), 68 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch deleted file mode 100644 index 67433ee209..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 09d0d36450e25554785bf7f730e4ba0e31982be6 Mon Sep 17 00:00:00 2001 -From: Andreas Mueller -Date: Thu, 21 Jul 2011 19:52:28 +0200 -Subject: [PATCH] docs: On installation create relative paths in symlinks to - images - - -Signed-off-by: Andreas Mueller ---- - -Upstream-Status: accepted - -http://git.xfce.org/xfce/xfwm4/commit/?h=xfce-4.8&id=08b6d60056d7ca9884a46d6b92e77c9fc68ce8c5 - - 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 b21962f..88e234b 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/xfwm4/xfwm4_4.8.2.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb deleted file mode 100644 index c1ad221d5f..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb +++ /dev/null @@ -1,35 +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" - -inherit xfce update-alternatives - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://relative-symlinks-docs.patch \ -" -SRC_URI[md5sum] = "41b730d5abf39a69fc3b221728ddaa75" -SRC_URI[sha256sum] = "6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747" - -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_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY = "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 new file mode 100644 index 0000000000..e2dc4abf9b --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb @@ -0,0 +1,31 @@ +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] = "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_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY = "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