[arch-commits] Commit in gnome-games/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Apr 25 18:38:25 UTC 2022
Date: Monday, April 25, 2022 @ 18:38:24
Author: arojas
Revision: 1190035
archrelease: copy trunk to community-x86_64
Added:
gnome-games/repos/community-x86_64/PKGBUILD
(from rev 1190034, gnome-games/trunk/PKGBUILD)
gnome-games/repos/community-x86_64/meson-0.60.patch
(from rev 1190034, gnome-games/trunk/meson-0.60.patch)
gnome-games/repos/community-x86_64/tracker3.patch
(from rev 1190034, gnome-games/trunk/tracker3.patch)
Deleted:
gnome-games/repos/community-x86_64/PKGBUILD
gnome-games/repos/community-x86_64/tracker3.patch
------------------+
PKGBUILD | 119 +++++++++++--------
meson-0.60.patch | 20 +++
tracker3.patch | 322 ++++++++++++++++++++++++++---------------------------
3 files changed, 252 insertions(+), 209 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 18:38:11 UTC (rev 1190034)
+++ PKGBUILD 2022-04-25 18:38:24 UTC (rev 1190035)
@@ -1,48 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Tom Richards <tom at tomrichards.net>
-
-pkgname=gnome-games
-pkgver=40.0
-pkgrel=2
-pkgdesc='Simple game launcher for GNOME'
-arch=('x86_64')
-url='https://wiki.gnome.org/Apps/Games'
-license=('GPL3')
-groups=('gnome-extra')
-depends=('grilo' 'libarchive' 'libhandy' 'libmanette' 'retro-gtk' 'tracker3')
-makedepends=('appstream-glib' 'meson' 'vala')
-optdepends=('libretro-blastem: Support for Sega Genesis (Mega Drive) games'
- 'libretro-citra: Support for Nintendo 3DS games'
- 'libretro-flycast: Support for Dreamcast games'
- 'libretro-gambatte: Support for Game Boy and Game Boy Color games'
- 'libretro-mgba: Support for Game Boy Advance games'
- 'libretro-nestopia: Support for Nintendo Entertainment System and Famicom Disk System games'
- 'libretro-parallel-n64: Support for Nintendo 64 games'
- 'libretro-picodrive: Support for Sega Master System, Sega 32X, Sega CD (Mega-CD), Sega Genesis (Mega Drive) and Sega Pico games')
-source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
- 'tracker3.patch')
-sha256sums=('32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f'
- '6eaa476f7de1b17848ea64ce99b583a431c3cce6b48d49f034ac2d611a1bdb27')
-
-prepare() {
- cd $pkgname-$pkgver
- # Port to Tracker 3
- patch -Np1 -i ../tracker3.patch
-}
-
-build() {
- arch-meson $pkgname-$pkgver build
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-
- # Install *.libretro files
- install -dm755 "$pkgdir/usr/lib/libretro/"
- install -Dm644 $pkgname-$pkgver/flatpak/libretro-cores/*.libretro "$pkgdir/usr/lib/libretro/"
-}
Copied: gnome-games/repos/community-x86_64/PKGBUILD (from rev 1190034, gnome-games/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 18:38:24 UTC (rev 1190035)
@@ -0,0 +1,71 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Tom Richards <tom at tomrichards.net>
+
+pkgname=gnome-games
+pkgver=40.0
+pkgrel=3
+pkgdesc='Simple game launcher for GNOME'
+arch=('x86_64')
+url='https://wiki.gnome.org/Apps/Games'
+license=('GPL3')
+groups=('gnome-extra')
+depends=('grilo' 'libarchive' 'libhandy' 'libmanette' 'retro-gtk' 'tracker3')
+makedepends=('appstream-glib' 'meson' 'vala')
+optdepends=('libretro-beetle-pce-fast: Support for TurboGrafx-16 and TurboGrafx-CD games'
+ 'libretro-beetle-psx: Support for PlayStation games'
+ 'libretro-blastem: Support for Sega Genesis games'
+ 'libretro-citra: Support for Nintendo 3DS games'
+ 'libretro-flycast: Support for Dreamcast games'
+ 'libretro-gambatte: Support for Game Boy and Game Boy Color games'
+ 'libretro-mgba: Support for Game Boy Advance games'
+ 'libretro-nestopia: Support for Nintendo Entertainment System and Famicom Disk System games'
+ 'libretro-parallel-n64: Support for Nintendo 64 games'
+ 'libretro-picodrive: Support for Master System, Genesis 32X, Sega CD, Sega CD 32X, Sega Genesis and Sega Pico games')
+# 'libretro-beetle-ngp: Support for Neo Geo Pocket and Neo Geo Pocket Color games'
+# 'libretro-beetle-vb: Support for Virtual Boy games'
+# 'libretro-beetle-wswan: Support for WonderSwan and WonderSwan Color games'
+# 'libretro-bsnes-mercury-balanced: Support for Super Nintendo Entertainment System games'
+# 'libretro-desmume2015: Support for Nintendo DS games'
+# 'libretro-gearsystem: Support for Game Gear, Master System and SG-1000 games'
+# 'libretro-handy: Support for Atari Lynx games'
+# 'libretro-prosystem: Support for Atari 7800 games'
+# 'libretro-stella2014: Support for Atari 2600 games'
+source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+ 'tracker3.patch'
+ 'meson-0.60.patch')
+sha256sums=('32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f'
+ '6eaa476f7de1b17848ea64ce99b583a431c3cce6b48d49f034ac2d611a1bdb27'
+ 'dc55d441d90c70f1767ec84390b95364a599397ce3af98d4d1b4f5368a4eb89c')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # Port to Tracker 3
+ patch -Np1 -i ../tracker3.patch
+
+ # Fix build with meson 0.60 (Alpine)
+ patch -p1 -i ../meson-0.60.patch
+
+ # Replace pcsx_rearmed with mednafen_psx
+ mv flatpak/libretro-cores/{pcsx_rearmed,mednafen_psx}.libretro
+ sed -i 's/^Name=.*/Name=Beetle PSX/
+ s/^Module=.*/Module=mednafen_psx_libretro.so/
+ s/^Authors=.*/Authors=Mednafen Team;/' \
+ flatpak/libretro-cores/mednafen_psx.libretro
+}
+
+build() {
+ arch-meson $pkgname-$pkgver build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+
+ # Install *.libretro files
+ install -dm755 "$pkgdir/usr/lib/libretro/"
+ install -Dm644 $pkgname-$pkgver/flatpak/libretro-cores/*.libretro "$pkgdir/usr/lib/libretro/"
+}
Copied: gnome-games/repos/community-x86_64/meson-0.60.patch (from rev 1190034, gnome-games/trunk/meson-0.60.patch)
===================================================================
--- meson-0.60.patch (rev 0)
+++ meson-0.60.patch 2022-04-25 18:38:24 UTC (rev 1190035)
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+ type: 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@
+
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: configure_file(
+ input: files('org.gnome.Games.appdata.xml.in.in'),
+ output: 'org.gnome.Games.appdata.xml.in',
Deleted: tracker3.patch
===================================================================
--- tracker3.patch 2022-04-25 18:38:11 UTC (rev 1190034)
+++ tracker3.patch 2022-04-25 18:38:24 UTC (rev 1190035)
@@ -1,161 +0,0 @@
-From ba6f2e8461093eeaebd485910f69c61265131adf Mon Sep 17 00:00:00 2001
-From: Jean Felder <jean.felder at gmail.com>
-Date: Fri, 4 Sep 2020 23:11:35 +0200
-Subject: [PATCH 1/3] application: Remove an empty line at the end of file
-
----
- src/ui/application.vala | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/ui/application.vala b/src/ui/application.vala
-index ab738c4b..d65b7ae1 100644
---- a/src/ui/application.vala
-+++ b/src/ui/application.vala
-@@ -579,4 +579,3 @@ public class Games.Application : Gtk.Application {
- return GLib.Application.get_default () as Application;
- }
- }
--
---
-GitLab
-
-
-From d38e93160a8e16776bb1fdc46f547365d3f2c9ee Mon Sep 17 00:00:00 2001
-From: Jean Felder <jean.felder at gmail.com>
-Date: Sat, 30 May 2020 18:48:06 +0200
-Subject: [PATCH 2/3] Port to tracker3
-
-With tracker3, tracker-miner-fs dumps data in different graphs. Games
-only needs to access data stored in the tracker:Software graph.
-
-'tracker_sparql_connection_get' has been replaced by
-'tracker_sparql_connection_bus_new'.
----
- meson.build | 2 +-
- plugins/desktop/src/desktop-plugin.vala | 2 +-
- src/tracker/mime-type-tracker-uri-query.vala | 2 +-
- src/ui/application.vala | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a46681b9..fbab320c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -45,7 +45,7 @@ retro_gtk_dep = dependency ('retro-gtk-1', version: '>=' + retro_gtk_min_version
- rsvg_dep = dependency ('librsvg-2.0')
- soup_dep = dependency ('libsoup-2.4')
- sqlite_dep = dependency ('sqlite3')
--tracker_sparql_dep = dependency ('tracker-sparql-2.0')
-+tracker_sparql_dep = dependency ('tracker-sparql-3.0')
- xml_dep = dependency ('libxml-2.0')
-
- srcdir = join_paths (meson.source_root (), 'src')
-diff --git a/plugins/desktop/src/desktop-plugin.vala b/plugins/desktop/src/desktop-plugin.vala
-index 93f824c8..1c9da904 100644
---- a/plugins/desktop/src/desktop-plugin.vala
-+++ b/plugins/desktop/src/desktop-plugin.vala
-@@ -19,7 +19,7 @@ private class Games.DesktopPlugin : Object, Plugin {
- public UriSource[] get_uri_sources () {
- var query = new DesktopTrackerUriQuery ();
- try {
-- var connection = Tracker.Sparql.Connection. at get ();
-+ var connection = Tracker.Sparql.Connection. at bus_new ("org.freedesktop.Tracker3.Miner.Files", null, null);
- var uri_source = new TrackerUriSource (connection);
- uri_source.add_query (query);
-
-diff --git a/src/tracker/mime-type-tracker-uri-query.vala b/src/tracker/mime-type-tracker-uri-query.vala
-index d536899a..bf7b889a 100644
---- a/src/tracker/mime-type-tracker-uri-query.vala
-+++ b/src/tracker/mime-type-tracker-uri-query.vala
-@@ -8,6 +8,6 @@ public class Games.MimeTypeTrackerUriQuery : Object, TrackerUriQuery {
- }
-
- public string get_query () {
-- return @"SELECT DISTINCT nie:url(?urn) WHERE { ?urn nie:mimeType \"$mime_type\" . }";
-+ return @"SELECT DISTINCT nie:isStoredAs(?urn) { GRAPH tracker:Software { ?urn nie:mimeType \"$mime_type\" . } }";
- }
- }
-diff --git a/src/ui/application.vala b/src/ui/application.vala
-index d65b7ae1..80cf4f46 100644
---- a/src/ui/application.vala
-+++ b/src/ui/application.vala
-@@ -2,7 +2,7 @@
-
- public class Games.Application : Gtk.Application {
- const string HELP_URI = "https://wiki.gnome.org/Apps/Games/Documentation";
-- const string TEST_QUERY = "SELECT nie:url(?f) WHERE { ?f fts:match 'test query to check tracker' }";
-+ const string TEST_QUERY = "SELECT nie:isStoredAs(?f) WHERE { GRAPH tracker:Software { ?f fts:match 'test query to check tracker' } }";
-
- private static bool? is_flatpak;
-
-@@ -345,7 +345,7 @@ public class Games.Application : Gtk.Application {
-
- TrackerUriSource tracker_uri_source = null;
- try {
-- var connection = Tracker.Sparql.Connection. at get ();
-+ var connection = Tracker.Sparql.Connection. at bus_new ("org.freedesktop.Tracker3.Miner.Files", null, null);
- connection.query (TEST_QUERY);
- tracker_uri_source = new TrackerUriSource (connection);
- }
---
-GitLab
-
-
-From 4550d24a05b6ea9d9f95f44faf0696e91f7a0211 Mon Sep 17 00:00:00 2001
-From: Jean Felder <jean.felder at gmail.com>
-Date: Fri, 4 Sep 2020 23:03:12 +0200
-Subject: [PATCH 3/3] flatpak: Port to tracker3
-
-The add-policy permission allows to use the portal from Tracker
-3. Games only needs the tracker:Software graph.
-TRACKER_BACKEND can be removed. It does not do anything for Tracker 3.
----
- flatpak/org.gnome.Games.json | 25 +------------------------
- 1 file changed, 1 insertion(+), 24 deletions(-)
-
-diff --git a/flatpak/org.gnome.Games.json b/flatpak/org.gnome.Games.json
-index bddd58ba..3b68761c 100644
---- a/flatpak/org.gnome.Games.json
-+++ b/flatpak/org.gnome.Games.json
-@@ -15,8 +15,7 @@
- "--socket=wayland",
- "--device=dri",
- "--socket=pulseaudio",
-- "--talk-name=org.freedesktop.Tracker1",
-- "--env=TRACKER_SPARQL_BACKEND=bus",
-+ "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Software",
- "--share=network",
- "--device=all",
- "--talk-name=org.freedesktop.Flatpak",
-@@ -76,28 +75,6 @@
- "mkdir -p /app/lib/libretro/extra.d"
- ]
- },
-- {
-- "name" : "tracker",
-- "buildsystem" : "meson",
-- "config-opts" : [
-- "-Ddocs=false",
-- "-Dfts=false",
-- "-Dfunctional_tests=false",
-- "-Djournal=false",
-- "-Dnetwork_manager=disabled",
-- "-Dstemmer=disabled",
-- "-Dbash_completion=no",
-- "-Ddbus_services=/app/share/dbus-1/services",
-- "-Dsystemd_user_services=no"
-- ],
-- "sources" : [
-- {
-- "type" : "git",
-- "url" : "https://gitlab.gnome.org/GNOME/tracker.git",
-- "branch" : "tracker-2.3"
-- }
-- ]
-- },
- {
- "name" : "grilo",
- "buildsystem" : "meson",
---
-GitLab
-
Copied: gnome-games/repos/community-x86_64/tracker3.patch (from rev 1190034, gnome-games/trunk/tracker3.patch)
===================================================================
--- tracker3.patch (rev 0)
+++ tracker3.patch 2022-04-25 18:38:24 UTC (rev 1190035)
@@ -0,0 +1,161 @@
+From ba6f2e8461093eeaebd485910f69c61265131adf Mon Sep 17 00:00:00 2001
+From: Jean Felder <jean.felder at gmail.com>
+Date: Fri, 4 Sep 2020 23:11:35 +0200
+Subject: [PATCH 1/3] application: Remove an empty line at the end of file
+
+---
+ src/ui/application.vala | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/ui/application.vala b/src/ui/application.vala
+index ab738c4b..d65b7ae1 100644
+--- a/src/ui/application.vala
++++ b/src/ui/application.vala
+@@ -579,4 +579,3 @@ public class Games.Application : Gtk.Application {
+ return GLib.Application.get_default () as Application;
+ }
+ }
+-
+--
+GitLab
+
+
+From d38e93160a8e16776bb1fdc46f547365d3f2c9ee Mon Sep 17 00:00:00 2001
+From: Jean Felder <jean.felder at gmail.com>
+Date: Sat, 30 May 2020 18:48:06 +0200
+Subject: [PATCH 2/3] Port to tracker3
+
+With tracker3, tracker-miner-fs dumps data in different graphs. Games
+only needs to access data stored in the tracker:Software graph.
+
+'tracker_sparql_connection_get' has been replaced by
+'tracker_sparql_connection_bus_new'.
+---
+ meson.build | 2 +-
+ plugins/desktop/src/desktop-plugin.vala | 2 +-
+ src/tracker/mime-type-tracker-uri-query.vala | 2 +-
+ src/ui/application.vala | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a46681b9..fbab320c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -45,7 +45,7 @@ retro_gtk_dep = dependency ('retro-gtk-1', version: '>=' + retro_gtk_min_version
+ rsvg_dep = dependency ('librsvg-2.0')
+ soup_dep = dependency ('libsoup-2.4')
+ sqlite_dep = dependency ('sqlite3')
+-tracker_sparql_dep = dependency ('tracker-sparql-2.0')
++tracker_sparql_dep = dependency ('tracker-sparql-3.0')
+ xml_dep = dependency ('libxml-2.0')
+
+ srcdir = join_paths (meson.source_root (), 'src')
+diff --git a/plugins/desktop/src/desktop-plugin.vala b/plugins/desktop/src/desktop-plugin.vala
+index 93f824c8..1c9da904 100644
+--- a/plugins/desktop/src/desktop-plugin.vala
++++ b/plugins/desktop/src/desktop-plugin.vala
+@@ -19,7 +19,7 @@ private class Games.DesktopPlugin : Object, Plugin {
+ public UriSource[] get_uri_sources () {
+ var query = new DesktopTrackerUriQuery ();
+ try {
+- var connection = Tracker.Sparql.Connection. at get ();
++ var connection = Tracker.Sparql.Connection. at bus_new ("org.freedesktop.Tracker3.Miner.Files", null, null);
+ var uri_source = new TrackerUriSource (connection);
+ uri_source.add_query (query);
+
+diff --git a/src/tracker/mime-type-tracker-uri-query.vala b/src/tracker/mime-type-tracker-uri-query.vala
+index d536899a..bf7b889a 100644
+--- a/src/tracker/mime-type-tracker-uri-query.vala
++++ b/src/tracker/mime-type-tracker-uri-query.vala
+@@ -8,6 +8,6 @@ public class Games.MimeTypeTrackerUriQuery : Object, TrackerUriQuery {
+ }
+
+ public string get_query () {
+- return @"SELECT DISTINCT nie:url(?urn) WHERE { ?urn nie:mimeType \"$mime_type\" . }";
++ return @"SELECT DISTINCT nie:isStoredAs(?urn) { GRAPH tracker:Software { ?urn nie:mimeType \"$mime_type\" . } }";
+ }
+ }
+diff --git a/src/ui/application.vala b/src/ui/application.vala
+index d65b7ae1..80cf4f46 100644
+--- a/src/ui/application.vala
++++ b/src/ui/application.vala
+@@ -2,7 +2,7 @@
+
+ public class Games.Application : Gtk.Application {
+ const string HELP_URI = "https://wiki.gnome.org/Apps/Games/Documentation";
+- const string TEST_QUERY = "SELECT nie:url(?f) WHERE { ?f fts:match 'test query to check tracker' }";
++ const string TEST_QUERY = "SELECT nie:isStoredAs(?f) WHERE { GRAPH tracker:Software { ?f fts:match 'test query to check tracker' } }";
+
+ private static bool? is_flatpak;
+
+@@ -345,7 +345,7 @@ public class Games.Application : Gtk.Application {
+
+ TrackerUriSource tracker_uri_source = null;
+ try {
+- var connection = Tracker.Sparql.Connection. at get ();
++ var connection = Tracker.Sparql.Connection. at bus_new ("org.freedesktop.Tracker3.Miner.Files", null, null);
+ connection.query (TEST_QUERY);
+ tracker_uri_source = new TrackerUriSource (connection);
+ }
+--
+GitLab
+
+
+From 4550d24a05b6ea9d9f95f44faf0696e91f7a0211 Mon Sep 17 00:00:00 2001
+From: Jean Felder <jean.felder at gmail.com>
+Date: Fri, 4 Sep 2020 23:03:12 +0200
+Subject: [PATCH 3/3] flatpak: Port to tracker3
+
+The add-policy permission allows to use the portal from Tracker
+3. Games only needs the tracker:Software graph.
+TRACKER_BACKEND can be removed. It does not do anything for Tracker 3.
+---
+ flatpak/org.gnome.Games.json | 25 +------------------------
+ 1 file changed, 1 insertion(+), 24 deletions(-)
+
+diff --git a/flatpak/org.gnome.Games.json b/flatpak/org.gnome.Games.json
+index bddd58ba..3b68761c 100644
+--- a/flatpak/org.gnome.Games.json
++++ b/flatpak/org.gnome.Games.json
+@@ -15,8 +15,7 @@
+ "--socket=wayland",
+ "--device=dri",
+ "--socket=pulseaudio",
+- "--talk-name=org.freedesktop.Tracker1",
+- "--env=TRACKER_SPARQL_BACKEND=bus",
++ "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Software",
+ "--share=network",
+ "--device=all",
+ "--talk-name=org.freedesktop.Flatpak",
+@@ -76,28 +75,6 @@
+ "mkdir -p /app/lib/libretro/extra.d"
+ ]
+ },
+- {
+- "name" : "tracker",
+- "buildsystem" : "meson",
+- "config-opts" : [
+- "-Ddocs=false",
+- "-Dfts=false",
+- "-Dfunctional_tests=false",
+- "-Djournal=false",
+- "-Dnetwork_manager=disabled",
+- "-Dstemmer=disabled",
+- "-Dbash_completion=no",
+- "-Ddbus_services=/app/share/dbus-1/services",
+- "-Dsystemd_user_services=no"
+- ],
+- "sources" : [
+- {
+- "type" : "git",
+- "url" : "https://gitlab.gnome.org/GNOME/tracker.git",
+- "branch" : "tracker-2.3"
+- }
+- ]
+- },
+ {
+ "name" : "grilo",
+ "buildsystem" : "meson",
+--
+GitLab
+
More information about the arch-commits
mailing list