[arch-commits] Commit in rygel/repos/extra-x86_64 (4 files)
Date: Sunday, January 9, 2022 @ 10:34:23 Author: heftig Revision: 434005 archrelease: copy trunk to extra-x86_64 Added: rygel/repos/extra-x86_64/PKGBUILD (from rev 434004, rygel/trunk/PKGBUILD) Deleted: rygel/repos/extra-x86_64/0001-tracker3-Don-t-create-connection-in-static-construct.patch rygel/repos/extra-x86_64/0002-tracker3-Correct-graph-name-for-video-items.patch rygel/repos/extra-x86_64/PKGBUILD -+ 0001-tracker3-Don-t-create-connection-in-static-construct.patch | 40 --- 0002-tracker3-Correct-graph-name-for-video-items.patch | 22 -- PKGBUILD| 106 -- 3 files changed, 51 insertions(+), 117 deletions(-) Deleted: 0001-tracker3-Don-t-create-connection-in-static-construct.patch === --- 0001-tracker3-Don-t-create-connection-in-static-construct.patch 2022-01-09 10:34:11 UTC (rev 434004) +++ 0001-tracker3-Don-t-create-connection-in-static-construct.patch 2022-01-09 10:34:23 UTC (rev 434005) @@ -1,40 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 13 Oct 2021 17:33:05 + -Subject: [PATCH] tracker3: Don't create connection in static constructor - -bus_new will wait for work in the GDBus thread to be completed. However, -further type initialization in the GDBus thread will block on the GType -class_init_rec_mutex we're already holding and we end up in a deadlock. - .../tracker3/rygel-tracker-root-container.vala | 16 - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/plugins/tracker3/rygel-tracker-root-container.vala b/src/plugins/tracker3/rygel-tracker-root-container.vala -index c5d3b25a55d6..c7f722a81ce8 100644 a/src/plugins/tracker3/rygel-tracker-root-container.vala -+++ b/src/plugins/tracker3/rygel-tracker-root-container.vala -@@ -34,15 +34,15 @@ public class Rygel.Tracker.RootContainer : Rygel.SimpleContainer { - - public static Sparql.Connection connection; - --static construct { --try { --RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null); --} catch (Error err) { --error ("Failed to connect to tracker: %s", err.message); --} --} -- - public RootContainer (string title) { -+if (RootContainer.connection == null) { -+try { -+RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null); -+} catch (Error err) { -+error ("Failed to connect to tracker: %s", err.message); -+} -+} -+ - base.root (title); - - if (this.get_bool_config_without_error ("share-music")) { Deleted: 0002-tracker3-Correct-graph-name-for-video-items.patch === --- 0002-tracker3-Correct-graph-name-for-video-items.patch 2022-01-09 10:34:11 UTC (rev 434004) +++ 0002-tracker3-Correct-graph-name-for-video-items.patch 2022-01-09 10:34:23 UTC (rev 434005) @@ -1,22 +0,0 @@ -From Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 13 Oct 2021 17:55:24 + -Subject: [PATCH] tracker3: Correct graph name for video items - - src/plugins/tracker3/rygel-tracker-video-item-factory.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala -index bed04c711eaf..7a765cf772bd 100644 a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala -+++ b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala -@@ -42,7 +42,7 @@ public class Rygel.Tracker.VideoItemFactory : ItemFactory { - private const string CATEGORY = "nmm:Video"; - private const string CATEGORY_IRI = "http://www.tracker-project.org/; + - "temp/nmm#Video"; --private const string GRAPH = "tracker:Videos"; -+private const string GRAPH = "tracker:Video"; - - public VideoItemFactory () { - var upload_folder = Environment.get_user_special_dir Deleted: PKGBUILD === --- PKGBUILD2022-01-09 10:34:11 UTC (rev 434004) +++ PKGBUILD2022-01-09 10:34:23 UTC (rev 434005) @@ -1,55 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Balló György - -pkgname=rygel -pkgver=0.40.2 -pkgrel=3 -epoch=1 -pkgdesc="UPnP AV MediaServer and MediaRenderer" -url="https://wiki.gnome.org/Projects/Rygel; -arch=(x86_64) -license=(LGPL) -depends=(gupnp gupnp-av gupnp-dlna libgee gtk3 libunistring tracker3 - libmediaart gst-editing-services) -makedepends=(vala gobject-introspection git meson)
[arch-commits] Commit in rygel/repos/extra-x86_64 (4 files)
Date: Wednesday, October 13, 2021 @ 18:06:46 Author: heftig Revision: 425863 archrelease: copy trunk to extra-x86_64 Added: rygel/repos/extra-x86_64/0001-tracker3-Don-t-create-connection-in-static-construct.patch (from rev 425862, rygel/trunk/0001-tracker3-Don-t-create-connection-in-static-construct.patch) rygel/repos/extra-x86_64/0002-tracker3-Correct-graph-name-for-video-items.patch (from rev 425862, rygel/trunk/0002-tracker3-Correct-graph-name-for-video-items.patch) rygel/repos/extra-x86_64/PKGBUILD (from rev 425862, rygel/trunk/PKGBUILD) Deleted: rygel/repos/extra-x86_64/PKGBUILD -+ 0001-tracker3-Don-t-create-connection-in-static-construct.patch | 40 +++ 0002-tracker3-Correct-graph-name-for-video-items.patch | 22 ++ PKGBUILD| 103 +- 3 files changed, 117 insertions(+), 48 deletions(-) Copied: rygel/repos/extra-x86_64/0001-tracker3-Don-t-create-connection-in-static-construct.patch (from rev 425862, rygel/trunk/0001-tracker3-Don-t-create-connection-in-static-construct.patch) === --- 0001-tracker3-Don-t-create-connection-in-static-construct.patch (rev 0) +++ 0001-tracker3-Don-t-create-connection-in-static-construct.patch 2021-10-13 18:06:46 UTC (rev 425863) @@ -0,0 +1,40 @@ +From Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Wed, 13 Oct 2021 17:33:05 + +Subject: [PATCH] tracker3: Don't create connection in static constructor + +bus_new will wait for work in the GDBus thread to be completed. However, +further type initialization in the GDBus thread will block on the GType +class_init_rec_mutex we're already holding and we end up in a deadlock. +--- + .../tracker3/rygel-tracker-root-container.vala | 16 + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/plugins/tracker3/rygel-tracker-root-container.vala b/src/plugins/tracker3/rygel-tracker-root-container.vala +index c5d3b25a55d6..c7f722a81ce8 100644 +--- a/src/plugins/tracker3/rygel-tracker-root-container.vala b/src/plugins/tracker3/rygel-tracker-root-container.vala +@@ -34,15 +34,15 @@ public class Rygel.Tracker.RootContainer : Rygel.SimpleContainer { + + public static Sparql.Connection connection; + +-static construct { +-try { +-RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null); +-} catch (Error err) { +-error ("Failed to connect to tracker: %s", err.message); +-} +-} +- + public RootContainer (string title) { ++if (RootContainer.connection == null) { ++try { ++RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null); ++} catch (Error err) { ++error ("Failed to connect to tracker: %s", err.message); ++} ++} ++ + base.root (title); + + if (this.get_bool_config_without_error ("share-music")) { Copied: rygel/repos/extra-x86_64/0002-tracker3-Correct-graph-name-for-video-items.patch (from rev 425862, rygel/trunk/0002-tracker3-Correct-graph-name-for-video-items.patch) === --- 0002-tracker3-Correct-graph-name-for-video-items.patch (rev 0) +++ 0002-tracker3-Correct-graph-name-for-video-items.patch 2021-10-13 18:06:46 UTC (rev 425863) @@ -0,0 +1,22 @@ +From Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Wed, 13 Oct 2021 17:55:24 + +Subject: [PATCH] tracker3: Correct graph name for video items + +--- + src/plugins/tracker3/rygel-tracker-video-item-factory.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala +index bed04c711eaf..7a765cf772bd 100644 +--- a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala +@@ -42,7 +42,7 @@ public class Rygel.Tracker.VideoItemFactory : ItemFactory { + private const string CATEGORY = "nmm:Video"; + private const string CATEGORY_IRI = "http://www.tracker-project.org/; + + "temp/nmm#Video"; +-private const string GRAPH = "tracker:Videos"; ++private const string GRAPH = "tracker:Video"; + + public VideoItemFactory () { + var upload_folder = Environment.get_user_special_dir Deleted: PKGBUILD === --- PKGBUILD2021-10-13 18:06:38 UTC (rev 425862) +++ PKGBUILD2021-10-13 18:06:46 UTC (rev 425863) @@ -1,48 +0,0 @@