From ce9150d9a5641a3f84ddece8e1a814c7e1f413b2 Mon Sep 17 00:00:00 2001 From: Muhammad Alfi Syahrin Date: Thu, 25 Jan 2024 15:27:25 +0700 Subject: [PATCH] playonlinux: Housekeeping **Summary** - Install appstream metadata (Part of https://github.com/getsolus/packages/issues/1389) - Added homepage key (Part of https://github.com/getsolus/packages/issues/411) - Use patched upstream desktop file - Use patched upstream Makefile **Test Plan** - Verify metadata with `appstream-builder --packages-dir=. --include-failed -v` - Verify homepage loads relevant information - Make sure app icon switch properly depending on icon theme (Tested on GNOME, Budgie, Plasma) - Install `foobar2000` on Budgie VM **Checklist** - [x] Package was built and tested against unstable --- packages/p/playonlinux/abi_used_libs | 3 + packages/p/playonlinux/abi_used_symbols | 11 ++++ .../files/0001-patch-Makefile.patch | 56 +++++++++++++++++++ .../files/0002-patch-desktop-file.patch | 23 ++++++++ .../p/playonlinux/files/playonlinux.desktop | 10 ---- packages/p/playonlinux/files/series | 2 + packages/p/playonlinux/package.yml | 7 +-- packages/p/playonlinux/pspec_x86_64.xml | 24 ++++---- 8 files changed, 111 insertions(+), 25 deletions(-) create mode 100644 packages/p/playonlinux/abi_used_libs create mode 100644 packages/p/playonlinux/abi_used_symbols create mode 100644 packages/p/playonlinux/files/0001-patch-Makefile.patch create mode 100644 packages/p/playonlinux/files/0002-patch-desktop-file.patch delete mode 100644 packages/p/playonlinux/files/playonlinux.desktop create mode 100644 packages/p/playonlinux/files/series diff --git a/packages/p/playonlinux/abi_used_libs b/packages/p/playonlinux/abi_used_libs new file mode 100644 index 00000000000..000e3cc170e --- /dev/null +++ b/packages/p/playonlinux/abi_used_libs @@ -0,0 +1,3 @@ +libGL.so.1 +libX11.so.6 +libc.so.6 diff --git a/packages/p/playonlinux/abi_used_symbols b/packages/p/playonlinux/abi_used_symbols new file mode 100644 index 00000000000..74e63efcc46 --- /dev/null +++ b/packages/p/playonlinux/abi_used_symbols @@ -0,0 +1,11 @@ +libGL.so.1:glXChooseVisual +libGL.so.1:glXCreateContext +libGL.so.1:glXIsDirect +libX11.so.6:XFree +libX11.so.6:XOpenDisplay +libc.so.6:__libc_start_main +libc.so.6:__stack_chk_fail +libc.so.6:exit +libc.so.6:fwrite +libc.so.6:puts +libc.so.6:stderr diff --git a/packages/p/playonlinux/files/0001-patch-Makefile.patch b/packages/p/playonlinux/files/0001-patch-Makefile.patch new file mode 100644 index 00000000000..3f98c2d95f1 --- /dev/null +++ b/packages/p/playonlinux/files/0001-patch-Makefile.patch @@ -0,0 +1,56 @@ +From d7aabb70b991a8c9e262ad8adbe4bc33fa123f02 Mon Sep 17 00:00:00 2001 +From: Muhammad Alfi Syahrin +Date: Thu, 25 Jan 2024 14:42:35 +0700 +Subject: [PATCH] patch Makefile + +--- + Makefile | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index a8d81b8..f3cfd83 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ DESTDIR ?= # root dir + + sharedir := $(DESTDIR)$(PREFIX)/share + bindir := $(DESTDIR)$(PREFIX)/bin +-execdir := $(DESTDIR)$(PREFIX)/libexec ++execdir := bindir + + + all: build +@@ -58,20 +58,22 @@ build: + install: + install -d $(bindir) + install -d $(execdir) +- install -d $(sharedir)/pixmaps ++ install -d $(sharedir)/icons/hicolor/128x128/apps ++ install -d $(sharedir)/icons/hicolor/32x32/apps ++ install -d $(sharedir)/icons/hicolor/16x16/apps + install -d $(sharedir)/applications +- install -d $(sharedir)/appdata +- install -d $(sharedir)/playonlinux/bin ++ install -d $(sharedir)/metainfo ++ install -d $(sharedir)/playonlinux + install -d $(sharedir)/man/man1 + install -d $(sharedir)/locale + $(GZIP) -c ./doc/playonlinux-pkg.1 > $(sharedir)/man/man1/playonlinux-pkg.1.gz + $(GZIP) -c ./doc/playonlinux.1 > $(sharedir)/man/man1/playonlinux.1.gz + cp ./etc/PlayOnLinux.desktop $(sharedir)/applications/PlayOnLinux.desktop +- cp ./etc/PlayOnLinux.appdata.xml $(sharedir)/appdata/PlayOnLinux.appdata.xml +- cp ./etc/playonlinux.png $(sharedir)/pixmaps/playonlinux.png +- cp ./etc/playonlinux16.png $(sharedir)/pixmaps/playonlinux16.png +- cp ./etc/playonlinux32.png $(sharedir)/pixmaps/playonlinux32.png +- cp ./bin/{playonlinux,playonlinux-pkg} $(bindir)/ ++ cp ./etc/PlayOnLinux.appdata.xml $(sharedir)/metainfo/PlayOnLinux.appdata.xml ++ cp ./etc/playonlinux.png $(sharedir)/icons/hicolor/128x128/apps/playonlinux.png ++ cp ./etc/playonlinux16.png $(sharedir)/icons/hicolor/16x16/apps/playonlinux.png ++ cp ./etc/playonlinux32.png $(sharedir)/icons/hicolor/32x32/apps/playonlinux.png ++ cp -p ./bin/{playonlinux,playonlinux-pkg} $(bindir)/ + cp ./bin/playonlinux-check_dd $(execdir)/ + cp ./{playonlinux*,README.md,TRANSLATORS,CHANGELOG.md,LICENCE} $(sharedir)/playonlinux/ + cp -R ./{bash,etc,lib,plugins,python,resources,tests} $(sharedir)/playonlinux/ +-- +2.43.0 + diff --git a/packages/p/playonlinux/files/0002-patch-desktop-file.patch b/packages/p/playonlinux/files/0002-patch-desktop-file.patch new file mode 100644 index 00000000000..0a4725959c0 --- /dev/null +++ b/packages/p/playonlinux/files/0002-patch-desktop-file.patch @@ -0,0 +1,23 @@ +From 8c91c14e582e494674fdbd9e3e2b1a88c0eab947 Mon Sep 17 00:00:00 2001 +From: Muhammad Alfi Syahrin +Date: Thu, 25 Jan 2024 14:43:19 +0700 +Subject: [PATCH] patch desktop file + +--- + etc/PlayOnLinux.desktop | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/etc/PlayOnLinux.desktop b/etc/PlayOnLinux.desktop +index 490108c..f2ceba1 100644 +--- a/etc/PlayOnLinux.desktop ++++ b/etc/PlayOnLinux.desktop +@@ -5,4 +5,6 @@ Comment=Front-end application for the wine + Type=Application + Exec=playonlinux %F + Icon=playonlinux ++Terminal=false ++StartupWMClass=PlayOnLinux + Categories=Utility;Emulator; +-- +2.43.0 + diff --git a/packages/p/playonlinux/files/playonlinux.desktop b/packages/p/playonlinux/files/playonlinux.desktop deleted file mode 100644 index f1cdd039523..00000000000 --- a/packages/p/playonlinux/files/playonlinux.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PlayOnLinux -Exec=playonlinux %f -Icon=/usr/share/playonlinux/etc/playonlinux.png -Terminal=false -Type=Application -StartupNotify=false -Categories=Game; -StartupWMClass=mainwindow.py diff --git a/packages/p/playonlinux/files/series b/packages/p/playonlinux/files/series new file mode 100644 index 00000000000..77ffbe6e233 --- /dev/null +++ b/packages/p/playonlinux/files/series @@ -0,0 +1,2 @@ +0001-patch-Makefile.patch +0002-patch-desktop-file.patch diff --git a/packages/p/playonlinux/package.yml b/packages/p/playonlinux/package.yml index 4e785805d4e..cecade3714c 100644 --- a/packages/p/playonlinux/package.yml +++ b/packages/p/playonlinux/package.yml @@ -1,8 +1,9 @@ name : playonlinux version : '4.4' -release : 21 +release : 22 source : - https://github.com/PlayOnLinux/POL-POM-4/archive/refs/tags/4.4.tar.gz : a3536243772002d17b9c5fcfd616844134bcfe126ce7b7b24eb971ba1f63365d +homepage : https://www.playonlinux.com/ license : GPL-3.0-or-later component : games summary : PlayOnLinux is a piece of software which allows you to easily install and use numerous games and apps @@ -23,10 +24,8 @@ rundeps : - wine-32bit - wxPython setup : | - cp $pkgfiles/Makefile . + %apply_patches build : | %make install : | %make_install - rm $installdir/usr/share/applications/PlayOnLinux.desktop - install -D -m 00644 $pkgfiles/playonlinux.desktop $installdir/usr/share/applications/playonlinux.desktop diff --git a/packages/p/playonlinux/pspec_x86_64.xml b/packages/p/playonlinux/pspec_x86_64.xml index f286074d6f9..2a38c37c803 100644 --- a/packages/p/playonlinux/pspec_x86_64.xml +++ b/packages/p/playonlinux/pspec_x86_64.xml @@ -1,16 +1,17 @@ playonlinux + https://www.playonlinux.com/ - Silke Hofstra - silke@slxh.eu + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com GPL-3.0-or-later games PlayOnLinux is a piece of software which allows you to easily install and use numerous games and apps PlayOnLinux is a piece of software which allows you to easily install and use numerous games and apps designed to run with Microsoft Windows. - https://getsol.us/sources/README.Solus + https://sources.getsol.us/README.Solus playonlinux @@ -21,7 +22,10 @@ /usr/bin/playonlinux /usr/bin/playonlinux-pkg - /usr/share/applications/playonlinux.desktop + /usr/share/applications/PlayOnLinux.desktop + /usr/share/icons/hicolor/128x128/apps/playonlinux.png + /usr/share/icons/hicolor/16x16/apps/playonlinux.png + /usr/share/icons/hicolor/32x32/apps/playonlinux.png /usr/share/locale/ar/LC_MESSAGES/pol.mo /usr/share/locale/ast/LC_MESSAGES/pol.mo /usr/share/locale/bg/LC_MESSAGES/pol.mo @@ -71,9 +75,7 @@ /usr/share/locale/zh_TW/LC_MESSAGES/pol.mo /usr/share/man/man1/playonlinux-pkg.1.gz /usr/share/man/man1/playonlinux.1.gz - /usr/share/pixmaps/playonlinux.png - /usr/share/pixmaps/playonlinux16.png - /usr/share/pixmaps/playonlinux32.png + /usr/share/metainfo/PlayOnLinux.appdata.xml /usr/share/playonlinux/CHANGELOG.md /usr/share/playonlinux/LICENCE /usr/share/playonlinux/README.md @@ -411,12 +413,12 @@ - - 2023-09-16 + + 2024-01-25 4.4 Packaging update - Silke Hofstra - silke@slxh.eu + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com \ No newline at end of file