aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-08-08 23:38:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:21:01 +0200
commit42c990172d31e95ffad3933ea004c5740a7adb9f (patch)
tree6368155e4e0ebe8c49ee57695d1d022545a38fe9
parent5cd959eb6acd886a5d6dfc75927d2021019602a5 (diff)
downloadmeta-openembedded-contrib-42c990172d31e95ffad3933ea004c5740a7adb9f.tar.gz
meta-openembedded-contrib-42c990172d31e95ffad3933ea004c5740a7adb9f.tar.bz2
meta-openembedded-contrib-42c990172d31e95ffad3933ea004c5740a7adb9f.zip
xfce4-screenshooter: update 1.8.2 -> 1.9.1
0001-Makefile.am-create-ouput-directory-for-desktop-file.patch was applied upstream Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Makefile.am-create-ouput-directory-for-desktop-file.patch29
-rw-r--r--meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb (renamed from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb)6
2 files changed, 2 insertions, 33 deletions
diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Makefile.am-create-ouput-directory-for-desktop-file.patch b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Makefile.am-create-ouput-directory-for-desktop-file.patch
deleted file mode 100644
index 62bffef1f3..0000000000
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Makefile.am-create-ouput-directory-for-desktop-file.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c85bf7cc5c1e1780d215f6fe233e3ed4597c72ed Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 21 Sep 2015 06:54:28 +0000
-Subject: [PATCH] Makefile.am: create ouput directory for desktop file
-
-Upstream-Status: Submitted [1]
-
-[1]: http://bug-attachment.xfce.org/attachment.cgi?id=6460
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index a22fc20..2ef0e54 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -122,6 +122,7 @@ app_desktop_DATA = $(app_desktop_in_files:.desktop.in=.desktop)
-
- src/xfce4-screenshooter.desktop.in: src/xfce4-screenshooter.desktop.in.in
- $(AM_V_GEN) ( \
-+ $(MKDIR_P) $(dir $@); \
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/applications^" \
- $< > $@ \
- )
---
-2.0.1
-
diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb
index d1cb68410e..06dea64b38 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb
@@ -7,10 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-
inherit xfce-app
-SRC_URI += "file://0001-Makefile.am-create-ouput-directory-for-desktop-file.patch"
-
-SRC_URI[md5sum] = "3a32ecc5566453a58f6a4ddd70649444"
-SRC_URI[sha256sum] = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69"
+SRC_URI[md5sum] = "75e1501418f904769e4fd25eff6a3946"
+SRC_URI[sha256sum] = "e62b31d9cf06a7414a26400c2ebe7a2ae7c2b22aa60f997f25145ea9ebe6e0db"
do_compile_prepend() {
mkdir -p lib