Patchwork [meta-xfce/-oe/-multimedia,18/40] xfdesktop update to 4.10.0

login
register
mail settings
Submitter Andreas Müller
Date Sept. 18, 2012, 2:12 p.m.
Message ID <1347977601-28665-19-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/36773/
State Accepted
Commit 1b34cf3d932e843b85a1e43e9f38fd306f3748e0
Headers show

Comments

Andreas Müller - Sept. 18, 2012, 2:12 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../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

Patch

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 751d7a6..0000000
--- 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?= <schnitzeltony@gmx.de>
-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 <schnitzeltony@gmx.de>
----
- 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 0000000..c9cd924
--- /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 2866280..0000000
--- 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"