[meta-xfce] xfce4-panel-profiles: fix do install failure with dash

Submitted by Kang Kai on Jan. 14, 2021, 2:10 a.m. | Patch ID: 179168

Details

Message ID 20210114021010.18900-1-kai.kang@windriver.com
State Accepted
Commit 5c97ce5736921873e689b4b38f0e7a98fa5ed29c
Headers show

Commit Message

Kang Kai Jan. 14, 2021, 2:10 a.m.
From: Kai Kang <kai.kang@windriver.com>

There are bashisms in Makefile and cause do install failure with dash.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../0001-Makefile.in.in-remove-bashisms.patch | 36 +++++++++++++++++++
 .../xfce4-panel-profiles_1.0.12.bb            |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch

Patch hide | download patch | download mbox

diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
new file mode 100644
index 000000000..62d53a99c
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch
@@ -0,0 +1,36 @@ 
+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 | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in.in b/Makefile.in.in
+index 73338f4..28a6c7b 100644
+--- a/Makefile.in.in
++++ b/Makefile.in.in
+@@ -74,11 +74,10 @@ 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 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
+-	install data/icons/scalable/org.xfce.PanelProfiles.svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
++	install -D data/icons/128x128/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps
++	install -D data/icons/48x48/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps
++	install -D data/icons/16x16/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps
++	install -D data/icons/scalable/org.xfce.PanelProfiles.svg -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)/$(PREFIX)/share/applications/org.xfce.PanelProfiles.desktop
+-- 
+2.25.1
+
diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb
index 1fcb7edc0..34162d3cc 100644
--- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb
+++ b/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"
 

Comments

Andreas Müller Jan. 16, 2021, 10:24 p.m.
On Thu, Jan 14, 2021 at 3:10 AM <kai.kang@windriver.com> wrote:
> +Upstream-Status: Pending [No permission to folk repo and create pull request]
see https://gitlab.xfce.org/apps/xfce4-panel-profiles/-/merge_requests/14

Cheers

Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88796): https://lists.openembedded.org/g/openembedded-devel/message/88796
Mute This Topic: https://lists.openembedded.org/mt/79667273/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-