diff options
author | Kai Kang <kai.kang@windriver.com> | 2021-01-18 15:19:58 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-01-18 14:35:52 -0800 |
commit | a28e613673d72743feaee89b6156a73893f4488a (patch) | |
tree | 0d047ec03811eeac7d42e6cdd1be86f9a591e043 /meta-xfce | |
parent | 6312f419ddc8100a57bb9f19fe0b826e656598e9 (diff) | |
download | meta-openembedded-a28e613673d72743feaee89b6156a73893f4488a.tar.gz |
xfce4-panel-profiles: update remove-bashisms.patch for centos 7
Command install is from package coreutils. And there is coreutils 8.22
on centos 7 which doesn't support options -D and -t to be used together.
So create/remove the directories and files one by one.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch | 50 |
1 files changed, 35 insertions, 15 deletions
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 index 62d53a99c..9738f1a8c 100644 --- 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 | |||
@@ -8,29 +8,49 @@ https://gitlab.xfce.org/apps/xfce4-panel-profiles | |||
8 | 8 | ||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
10 | --- | 10 | --- |
11 | Makefile.in.in | 9 ++++----- | 11 | Makefile.in.in | 15 ++++++++++++---- |
12 | 1 file changed, 4 insertions(+), 5 deletions(-) | 12 | 1 file changed, 11 insertions(+), 4 deletions(-) |
13 | 13 | ||
14 | diff --git a/Makefile.in.in b/Makefile.in.in | 14 | diff --git a/Makefile.in.in b/Makefile.in.in |
15 | index 73338f4..28a6c7b 100644 | 15 | index 73338f4..e08b218 100644 |
16 | --- a/Makefile.in.in | 16 | --- a/Makefile.in.in |
17 | +++ b/Makefile.in.in | 17 | +++ b/Makefile.in.in |
18 | @@ -74,11 +74,10 @@ install: all xfce4-panel-profiles.1 | 18 | @@ -73,8 +73,11 @@ install: all xfce4-panel-profiles.1 |
19 | |||
19 | install -d $(DESTDIR)/$(MANDIR)/man1 | 20 | install -d $(DESTDIR)/$(MANDIR)/man1 |
20 | install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 | 21 | install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 |
21 | 22 | - | |
22 | - install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps | 23 | - install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps |
23 | - install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps | 24 | + |
24 | - install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps | 25 | + install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps |
25 | - install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps | 26 | + install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps |
26 | - install data/icons/scalable/org.xfce.PanelProfiles.svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps | 27 | + install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps |
27 | + install -D data/icons/128x128/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps | 28 | + install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps |
28 | + install -D data/icons/48x48/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps | 29 | install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps |
29 | + install -D data/icons/16x16/org.xfce.PanelProfiles.png -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps | 30 | install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps |
30 | + install -D data/icons/scalable/org.xfce.PanelProfiles.svg -t $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps | 31 | install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps |
32 | @@ -86,7 +89,9 @@ uninstall: | ||
33 | rm -rf $(DESTDIR)/$(DOCDIR) | ||
34 | # FIXME: Uninstall locales | ||
35 | rm -f $(DESTDIR)/$(PREFIX)/bin/$(APPNAME) | ||
36 | - rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16}/apps/org.xfce.PanelProfiles.png | ||
37 | + rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps | ||
38 | + rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps | ||
39 | + rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps | ||
40 | rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/org.xfce.PanelProfiles.svg | ||
31 | 41 | ||
32 | uninstall: | 42 | distcheck: all |
33 | rm -f $(DESTDIR)/$(PREFIX)/share/applications/org.xfce.PanelProfiles.desktop | 43 | @@ -106,7 +112,9 @@ clean: |
44 | rm -f bin/$(APPNAME) | ||
45 | rm -f data/metainfo/org.xfce.PanelProfiles.appdata.xml | ||
46 | rm -f data/layouts/*.tar.bz2 | ||
47 | - rm -f data/icons/{128x128,48x48,16x16}/org.xfce.panelprofiles.png | ||
48 | + rm -f data/icons/128x128/org.xfce.panelprofiles.png | ||
49 | + rm -f data/icons/48x48/org.xfce.panelprofiles.png | ||
50 | + rm -f data/icons/16x16/org.xfce.panelprofiles.png | ||
51 | rm -f data/icons/scalable/org.xfce.panelprofiles.svg | ||
52 | rm -f org.xfce.PanelProfiles.desktop | ||
53 | rm -f Makefile.in | ||
34 | -- | 54 | -- |
35 | 2.25.1 | 55 | 2.25.1 |
36 | 56 | ||