summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD17
-rw-r--r--contracts.patch14
3 files changed, 25 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dbed8c0ba978..bd515e41f00e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = file-roller-pantheon
- pkgdesc = Archive manipulator for Pantheon
- pkgver = 3.40.0
+ pkgdesc = Create and modify archives (with Contractor integration)
+ pkgver = 43.0
pkgrel = 1
url = https://gitlab.gnome.org/GNOME/file-roller/
arch = i686
@@ -12,12 +12,12 @@ pkgbase = file-roller-pantheon
makedepends = libnautilus-extension
makedepends = meson
makedepends = appstream-glib
- depends = gtk3
+ depends = libhandy
depends = dconf
depends = libarchive
depends = file
depends = json-glib
- depends = libnotify
+ depends = libportal-gtk3
depends = zip
depends = unzip
optdepends = p7zip: 7z, arj, exe and encrypted zip files support
@@ -27,9 +27,9 @@ pkgbase = file-roller-pantheon
optdepends = squashfs-tools: squashfs image support
provides = file-roller
conflicts = file-roller
- source = git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=d5cfba5a4e86b2e8118113be410f39fc854b1df7
+ source = git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=6d57d9962efb976aa3036db965f558b96575289c
source = contracts.patch
sha256sums = SKIP
- sha256sums = d559e817b16bee842bf0081fd9832e11439b83c8604a035372893c231cfe15f3
+ sha256sums = d04cd96655a9d6a7686fcdb22ced19680da9964b12f4943bf608fa2486fc01e8
pkgname = file-roller-pantheon
diff --git a/PKGBUILD b/PKGBUILD
index e237ea2af0a4..1ffb7b846f3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
# Contributor: Adria Arrufat <adria DOT arrufat+aur AT protonmail DOT ch>
pkgname=file-roller-pantheon
-pkgver=3.40.0
+pkgver=43.0
pkgrel=1
-pkgdesc="Archive manipulator for Pantheon"
+pkgdesc="Create and modify archives (with Contractor integration)"
url="https://gitlab.gnome.org/GNOME/file-roller/"
arch=('i686' 'x86_64')
license=('GPL')
-depends=(gtk3 dconf libarchive file json-glib libnotify zip unzip)
+depends=(libhandy dconf libarchive file json-glib libportal-gtk3 zip unzip)
makedepends=(yelp-tools git libnautilus-extension meson appstream-glib)
optdepends=('p7zip: 7z, arj, exe and encrypted zip files support'
'unrar: better RAR archive support'
@@ -18,11 +18,16 @@ optdepends=('p7zip: 7z, arj, exe and encrypted zip files support'
groups=(pantheon)
provides=(file-roller)
conflicts=(file-roller)
-_commit=d5cfba5a4e86b2e8118113be410f39fc854b1df7 # tags/3.40.0^0
+_commit=6d57d9962efb976aa3036db965f558b96575289c # tags/43.0^0
source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit"
"contracts.patch")
sha256sums=('SKIP'
- 'd559e817b16bee842bf0081fd9832e11439b83c8604a035372893c231cfe15f3')
+ 'd04cd96655a9d6a7686fcdb22ced19680da9964b12f4943bf608fa2486fc01e8')
+
+pkgver() {
+ cd "file-roller"
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
prepare() {
cd "file-roller"
@@ -39,5 +44,5 @@ check() {
}
package() {
- DESTDIR="$pkgdir" meson install -C build
+ meson install -C build --destdir "$pkgdir"
}
diff --git a/contracts.patch b/contracts.patch
index c27fe20281dd..ebc342a886cb 100644
--- a/contracts.patch
+++ b/contracts.patch
@@ -29,13 +29,15 @@ diff --git a/data/meson.build b/data/meson.build
index e66726ce7..0504bf78a 100644
--- a/data/meson.build
+++ b/data/meson.build
-@@ -1,5 +1,9 @@
+@@ -1,5 +1,11 @@
po_dir = join_paths(meson.source_root(), 'po')
-+install_data('file-roller-compress.contract', 'file-roller-extract-here.contract',
-+ install_dir : join_paths(datadir, 'contractor')
++install_data(
++ 'file-roller-compress.contract',
++ 'file-roller-extract-here.contract',
++ install_dir : join_paths(datadir, 'contractor'),
+)
+
- install_data('org.gnome.FileRoller.gschema.xml',
- install_dir : join_paths(datadir, 'glib-2.0', 'schemas')
- )
+ install_data(
+ 'org.gnome.FileRoller.gschema.xml',
+ install_dir: join_paths(datadir, 'glib-2.0', 'schemas'),