[arch-commits] Commit in file-roller/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, April 6, 2021 @ 20:29:33
  Author: heftig
Revision: 411668

3.38.0-2

Added:
  file-roller/trunk/0001-data-Install-D-Bus-service-file-to-correct-location.patch
Modified:
  file-roller/trunk/PKGBUILD

----------------------------------------------------------------+
 0001-data-Install-D-Bus-service-file-to-correct-location.patch |   35 ++++++++++
 PKGBUILD                                                       |    9 +-
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0001-data-Install-D-Bus-service-file-to-correct-location.patch
===================================================================
--- 0001-data-Install-D-Bus-service-file-to-correct-location.patch	                        (rev 0)
+++ 0001-data-Install-D-Bus-service-file-to-correct-location.patch	2021-04-06 20:29:33 UTC (rev 411668)
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 6 Apr 2021 20:26:11 +0000
+Subject: [PATCH] data: Install D-Bus service file to correct location
+
+dbus-broker was complaining:
+
+> Service file
+> `/usr/share//dbus-1/services/org.gnome.FileRoller.ArchiveManager1.service`
+> is not named after the D-Bus name `org.gnome.ArchiveManager1`.
+---
+ data/meson.build                                              | 4 ++--
+ ...nager1.service.in => org.gnome.ArchiveManager1.service.in} | 0
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename data/{org.gnome.FileRoller.ArchiveManager1.service.in => org.gnome.ArchiveManager1.service.in} (100%)
+
+diff --git a/data/meson.build b/data/meson.build
+index c0eaeac2..7c1588e5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -41,8 +41,8 @@ configure_file(
+ )
+ 
+ configure_file(
+-  input : 'org.gnome.FileRoller.ArchiveManager1.service.in',
+-  output : 'org.gnome.FileRoller.ArchiveManager1.service',
++  input : 'org.gnome.ArchiveManager1.service.in',
++  output : 'org.gnome.ArchiveManager1.service',
+   configuration : service_data,
+   install : true,
+   install_dir : join_paths(datadir, 'dbus-1/services')
+diff --git a/data/org.gnome.FileRoller.ArchiveManager1.service.in b/data/org.gnome.ArchiveManager1.service.in
+similarity index 100%
+rename from data/org.gnome.FileRoller.ArchiveManager1.service.in
+rename to data/org.gnome.ArchiveManager1.service.in

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-06 20:23:37 UTC (rev 411667)
+++ PKGBUILD	2021-04-06 20:29:33 UTC (rev 411668)
@@ -3,7 +3,7 @@
 
 pkgname=file-roller
 pkgver=3.38.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Create and modify archives"
 url="https://wiki.gnome.org/Apps/FileRoller"
 arch=(x86_64)
@@ -17,8 +17,10 @@
             'squashfs-tools: squashfs image support')
 groups=(gnome)
 _commit=25f9db9770ff5f68aeaffce2e329ef39ae47729d  # tags/3.38.0^0
-source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit"
+        0001-data-Install-D-Bus-service-file-to-correct-location.patch)
+sha256sums=('SKIP'
+            'c82c4e7b78c110f7cfb0d28815df63a0e295225014d0d06cca60cb0dc5c0bb47')
 
 pkgver() {
   cd $pkgname
@@ -27,6 +29,7 @@
 
 prepare() {
   cd $pkgname
+  git apply -3 ../0001-data-Install-D-Bus-service-file-to-correct-location.patch
 }
 
 build() {