summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-xfce/recipes-apps
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-apps')
-rw-r--r--meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb (renamed from meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb)5
-rw-r--r--meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch56
-rw-r--r--meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb1
-rw-r--r--meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb2
4 files changed, 59 insertions, 5 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb
index 01a36e1fcc..f0391cb230 100644
--- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb
+++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb
@@ -7,10 +7,7 @@ inherit xfce-app distutils3 gtk-icon-cache mime-xdg
DEPENDS += "python3-distutils-extra-native"
-B = "${S}"
-
-SRC_URI[md5sum] = "750b65401c9445e185e71c808d7509a4"
-SRC_URI[sha256sum] = "58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839"
+SRC_URI[sha256sum] = "1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47"
FILES_${PN} += "${datadir}/metainfo"
diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
new file mode 100644
index 0000000000..9738f1a8c7
--- /dev/null
+++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
@@ -0,0 +1,56 @@
+Makefile.in.in: remove bashisms
+
+The brace expansion is bash specific and fails with dash.
+
+Upstream-Status: Pending [No permission to folk repo and create pull request]
+
+https://gitlab.xfce.org/apps/xfce4-panel-profiles
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ Makefile.in.in | 15 ++++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in.in b/Makefile.in.in
+index 73338f4..e08b218 100644
+--- a/Makefile.in.in
++++ b/Makefile.in.in
+@@ -73,8 +73,11 @@ install: all xfce4-panel-profiles.1
+
+ install -d $(DESTDIR)/$(MANDIR)/man1
+ install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1
+-
+- install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps
++
++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+ install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
+ install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
+ install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
+@@ -86,7 +89,9 @@ uninstall:
+ rm -rf $(DESTDIR)/$(DOCDIR)
+ # FIXME: Uninstall locales
+ rm -f $(DESTDIR)/$(PREFIX)/bin/$(APPNAME)
+- rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16}/apps/org.xfce.PanelProfiles.png
++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
+ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/org.xfce.PanelProfiles.svg
+
+ distcheck: all
+@@ -106,7 +112,9 @@ clean:
+ rm -f bin/$(APPNAME)
+ rm -f data/metainfo/org.xfce.PanelProfiles.appdata.xml
+ rm -f data/layouts/*.tar.bz2
+- rm -f data/icons/{128x128,48x48,16x16}/org.xfce.panelprofiles.png
++ rm -f data/icons/128x128/org.xfce.panelprofiles.png
++ rm -f data/icons/48x48/org.xfce.panelprofiles.png
++ rm -f data/icons/16x16/org.xfce.panelprofiles.png
+ rm -f data/icons/scalable/org.xfce.panelprofiles.svg
+ rm -f org.xfce.PanelProfiles.desktop
+ rm -f Makefile.in
+--
+2.25.1
+
diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb
index 1fcb7edc03..34162d3cc5 100644
--- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb
+++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb
@@ -11,6 +11,7 @@ DEPENDS += "intltool-native"
SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \
file://not-create-link-to-locale.patch \
+ file://0001-Makefile.in.in-remove-bashisms.patch \
"
SRC_URI[sha256sum] = "246e459d2d2f3f524968440ed7fddb2a891567ebc05f10a800f7f5821b3452a7"
diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb
index 9e2497d43d..dbd7a0b407 100644
--- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb
+++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb
@@ -3,7 +3,7 @@ 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"
+DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11"
inherit xfce-app