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

[Jan Steffens]

    Date: Sunday, April 11, 2021 @ 17:41:07
  Author: heftig
Revision: 412238

3.38.1-1

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

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

Deleted: 0001-data-Install-D-Bus-service-file-to-correct-location.patch
===================================================================
--- 0001-data-Install-D-Bus-service-file-to-correct-location.patch	2021-04-11 17:40:58 UTC (rev 412237)
+++ 0001-data-Install-D-Bus-service-file-to-correct-location.patch	2021-04-11 17:41:07 UTC (rev 412238)
@@ -1,35 +0,0 @@
-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-11 17:40:58 UTC (rev 412237)
+++ PKGBUILD	2021-04-11 17:41:07 UTC (rev 412238)
@@ -2,8 +2,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=3.38.0
-pkgrel=2
+pkgver=3.38.1
+pkgrel=1
 pkgdesc="Create and modify archives"
 url="https://wiki.gnome.org/Apps/FileRoller"
 arch=(x86_64)
@@ -16,11 +16,9 @@
             'lrzip: lrzip archive support'
             '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"
-        0001-data-Install-D-Bus-service-file-to-correct-location.patch)
-sha256sums=('SKIP'
-            'c82c4e7b78c110f7cfb0d28815df63a0e295225014d0d06cca60cb0dc5c0bb47')
+_commit=12d6c77fb736d70bee4c8f6f5ea7c60adde8473c  # tags/3.38.1^0
+source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -29,7 +27,9 @@
 
 prepare() {
   cd $pkgname
-  git apply -3 ../0001-data-Install-D-Bus-service-file-to-correct-location.patch
+
+  # Install D-Bus service file to correct location
+  git cherry-pick -n 5d48ddc3002fa8257a56eaedee44cdf694e1d861
 }
 
 build() {