joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 10:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1884 from rderooy/master

Browse Source 
Move appdata.xml to metainfo.xml as the former is deprecated
This commit is contained in:
Wengier
2020-09-27 18:59:38 -04:00
committed by GitHub
parent 48a67398d7 a4066d2464
commit ed44f6121c
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -80,7 +80,7 @@ install: src/dosbox-x
mkdir -p $(DESTDIR)$(prefix)/share/applications mkdir -p $(DESTDIR)$(prefix)/share/applications
install -m 644 contrib/linux/dosbox-x.desktop $(DESTDIR)$(prefix)/share/applications install -m 644 contrib/linux/dosbox-x.desktop $(DESTDIR)$(prefix)/share/applications
mkdir -p $(DESTDIR)$(prefix)/share/metainfo mkdir -p $(DESTDIR)$(prefix)/share/metainfo
install -m 644 contrib/linux/dosbox-x.appdata.xml $(DESTDIR)$(prefix)/share/metainfo install -m 644 contrib/linux/dosbox-x.metainfo.xml $(DESTDIR)$(prefix)/share/metainfo
-test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
install_strip: src/dosbox-x install install_strip: src/dosbox-x install
@@ -94,5 +94,5 @@ uninstall:
rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/dosbox-x.png rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/dosbox-x.png
rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg
rm -f $(DESTDIR)$(prefix)/share/applications/dosbox-x.desktop rm -f $(DESTDIR)$(prefix)/share/applications/dosbox-x.desktop
rm -f $(DESTDIR)$(prefix)/share/metainfo/dosbox-x.appdata.xml rm -f $(DESTDIR)$(prefix)/share/metainfo/dosbox-x.metainfo.xml

2
configure.ac
View File

@@ -1090,7 +1090,7 @@ src/platform/Makefile
include/Makefile include/Makefile
contrib/macos/dosbox-x.plist contrib/macos/dosbox-x.plist
contrib/linux/dosbox-x.spec contrib/linux/dosbox-x.spec
contrib/linux/dosbox-x.appdata.xml contrib/linux/dosbox-x.metainfo.xml
make-rpm.sh make-rpm.sh
]) ])
AC_OUTPUT AC_OUTPUT

8
contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
View File

@@ -76,7 +76,7 @@ modules:
- type: file - type: file
path: ../icons/dosbox-x.svg path: ../icons/dosbox-x.svg
- type: file - type: file
path: dosbox-x.appdata.xml path: dosbox-x.metainfo.xml
- type: file - type: file
path: dosbox-x.desktop path: dosbox-x.desktop
buildsystem: simple buildsystem: simple
@@ -87,9 +87,9 @@ modules:
- install -D src/dosbox-x /app/bin/dosbox-x-sdl2 - install -D src/dosbox-x /app/bin/dosbox-x-sdl2
# - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission # - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission
- install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg - install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
- install -Dm644 dosbox-x.appdata.xml /app/share/metainfo/${FLATPAK_ID}.appdata.xml - install -Dm644 dosbox-x.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
- sed -i 's/<id>com.dosbox_x.DOSBox-X</<id>com.dosbox_x.DOSBox-X-sdl2</' /app/share/metainfo/${FLATPAK_ID}.appdata.xml - sed -i 's/<id>com.dosbox_x.DOSBox-X</<id>com.dosbox_x.DOSBox-X-sdl2</' /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
- sed -i 's/<name>DOSBox-X</<name>DOSBox-X SDL2</' /app/share/metainfo/${FLATPAK_ID}.appdata.xml - sed -i 's/<name>DOSBox-X</<name>DOSBox-X SDL2</' /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
- install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop - install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop
- sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X-sdl2/ /app/share/applications/${FLATPAK_ID}.desktop - sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X-sdl2/ /app/share/applications/${FLATPAK_ID}.desktop
- sed -i 's/Name=.*/Name=DOSBox-X SDL2/' /app/share/applications/${FLATPAK_ID}.desktop - sed -i 's/Name=.*/Name=DOSBox-X SDL2/' /app/share/applications/${FLATPAK_ID}.desktop

4
contrib/linux/com.dosbox_x.DOSBox-X.yaml
View File

@@ -76,7 +76,7 @@ modules:
- type: file - type: file
path: ../icons/dosbox-x.svg path: ../icons/dosbox-x.svg
- type: file - type: file
path: dosbox-x.appdata.xml path: dosbox-x.metainfo.xml
- type: file - type: file
path: dosbox-x.desktop path: dosbox-x.desktop
buildsystem: simple buildsystem: simple
@@ -89,6 +89,6 @@ modules:
- install -D src/dosbox-x /app/bin/dosbox-x - install -D src/dosbox-x /app/bin/dosbox-x
# - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission # - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission
- install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg - install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
- install -Dm644 dosbox-x.appdata.xml /app/share/metainfo/${FLATPAK_ID}.appdata.xml - install -Dm644 dosbox-x.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
- install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop - install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop
- sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X/ /app/share/applications/${FLATPAK_ID}.desktop - sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X/ /app/share/applications/${FLATPAK_ID}.desktop

0
contrib/linux/dosbox-x.appdata.xml.in → contrib/linux/dosbox-x.metainfo.xml.in
View File

2
contrib/linux/dosbox-x.spec.in
View File

@@ -14,7 +14,7 @@ Group: Applications/Emulators
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz
Source1: dosbox-x.desktop Source1: dosbox-x.desktop
Source2: dosbox-x.svg Source2: dosbox-x.svg
Source3: dosbox-x.appdata.xml Source3: dosbox-x.metainfo.xml
%description %description
DOSBox-X is a cross-platform DOS emulator based on DOSBox. DOSBox-X is a cross-platform DOS emulator based on DOSBox.

4
make-flatpak-sdl2.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# flatpak build will fail immediately if it cannot find the appdata.xml file # flatpak build will fail immediately if it cannot find the metainfo.xml file
# But we have a dosbox-x.appdata.xml.in file that first needs processing by autotools # But we have a dosbox-x.metainfo.xml.in file that first needs processing by autotools
./autogen.sh ./autogen.sh
./configure ./configure

4
make-flatpak.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# flatpak build will fail immediately if it cannot find the appdata.xml file # flatpak build will fail immediately if it cannot find the metainfo.xml file
# But we have a dosbox-x.appdata.xml.in file that first needs processing by autotools # But we have a dosbox-x.metainfo.xml.in file that first needs processing by autotools
./autogen.sh ./autogen.sh
./configure ./configure

2
make-rpm.sh.in
View File

@@ -26,7 +26,7 @@ tar="../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz"
tar -cvJf "$tar" --exclude=\*.git --exclude=\*.tar.xz --exclude=\*.a --exclude=\*.la --exclude=\*.Po --exclude=\*.o -C .. dosbox-x || exit 1 tar -cvJf "$tar" --exclude=\*.git --exclude=\*.tar.xz --exclude=\*.a --exclude=\*.la --exclude=\*.Po --exclude=\*.o -C .. dosbox-x || exit 1
cp -vf "$tar" ~/rpmbuild/SOURCES/ || exit 1 cp -vf "$tar" ~/rpmbuild/SOURCES/ || exit 1
cp -vf contrib/linux/dosbox-x.desktop ~/rpmbuild/SOURCES/ || exit 1 cp -vf contrib/linux/dosbox-x.desktop ~/rpmbuild/SOURCES/ || exit 1
cp -vf contrib/linux/dosbox-x.appdata.xml ~/rpmbuild/SOURCES/ || exit 1 cp -vf contrib/linux/dosbox-x.metainfo.xml ~/rpmbuild/SOURCES/ || exit 1
cp -vf contrib/icons/dosbox-x.svg ~/rpmbuild/SOURCES/ || exit 1 cp -vf contrib/icons/dosbox-x.svg ~/rpmbuild/SOURCES/ || exit 1
rpmbuild -bb contrib/linux/dosbox-x.spec || exit 1 rpmbuild -bb contrib/linux/dosbox-x.spec || exit 1
rm -v "$tar" || exit 1 rm -v "$tar" || exit 1

2
update-build-timestamp.pl
View File

@@ -26,7 +26,7 @@ close(X);
use strict; use strict;
use warnings; use warnings;
my $file = "contrib/linux/dosbox-x.appdata.xml.in"; my $file = "contrib/linux/dosbox-x.metainfo.xml.in";
open FILE, $file or die "Can't read from $file!\n"; open FILE, $file or die "Can't read from $file!\n";
my @lines; my @lines;