update to version 3.24.1

2 files changed, 22 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ebbda16a311..c70f609aba86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = file-roller-ja
 	pkgdesc = the file-roller with an additional patch to use unzip-iconv for unzip archive file cp932 charset.
-	pkgver = 3.22.2
-	pkgrel = 3
+	pkgver = 3.24.1
+	pkgrel = 1
 	url = http://www.gnome.org
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = file-roller-ja
 	makedepends = libnautilus-extension
 	makedepends = itstool
 	makedepends = docbook-xsl
+	makedepends = gnome-common
 	depends = desktop-file-utils
 	depends = gtk3
 	depends = dconf
@@ -29,11 +30,11 @@ pkgbase = file-roller-ja
 	provides = file-roller
 	conflicts = file-roller
 	options = !emptydirs
-	source = http://ftp.gnome.org/pub/gnome/sources/file-roller/3.22/file-roller-3.22.2.tar.xz
+	source = git+https://git.gnome.org/browse/file-roller#commit=e6ef6fa43a6d5d6e1509f122a206870adc113563
 	source = fc-init.patch
 	source = Z99-zip-cp932.sh
-	sha256sums = 27158cdcc366f82100312b1e0a02ad1f3aa7a6c32d4eba68fc5a2a8829685df9
-	sha256sums = 27df085f1d6c8fad4bceb503267e767e7c43ad920f3cf9e91ee03e7f751addaf
+	sha256sums = SKIP
+	sha256sums = 2b8c0be032bab317cf8b95d5b6970e450acb18a246d5fdedf272f5e7941a1263
 	sha256sums = 47d0e369be6f8df7fbdc56b794eccccf877fe3d8a6dfcc4fccb00649f77b54bc
 
 pkgname = file-roller-ja
diff --git a/PKGBUILD b/PKGBUILD
index 0941d821f356..0f74fef0efe4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Akira Wakana <jalen.cn@gmail.com>
 
 pkgname=file-roller-ja
-pkgver=3.22.2
-pkgrel=3
+_pkgname=file-roller
+pkgver=3.24.1
+pkgrel=1
 provides=('file-roller')
 conflicts=('file-roller')
 pkgdesc="the file-roller with an additional patch to use unzip-iconv for unzip archive file cp932 charset."
@@ -10,30 +11,36 @@ _pkgname=file-roller
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'zip' 'unzip-iconv')
-makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
+makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'gnome-common')
 optdepends=('p7zip: 7z, arj, exe and encrypted zip files support'
             'unrar: better RAR archive support'
             'unace: ACE archive support'
             'lrzip: lrzip archive support'
             'cdrkit: ISO image support')
 groups=('gnome-extra')
+_commit=e6ef6fa43a6d5d6e1509f122a206870adc113563
 options=('!emptydirs')
 url="http://www.gnome.org"
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz"
+source=("git+https://git.gnome.org/browse/file-roller#commit=$_commit"
         'fc-init.patch'
         'Z99-zip-cp932.sh')
-sha256sums=('27158cdcc366f82100312b1e0a02ad1f3aa7a6c32d4eba68fc5a2a8829685df9'
+sha256sums=('SKIP'
             '2b8c0be032bab317cf8b95d5b6970e450acb18a246d5fdedf272f5e7941a1263'
             '47d0e369be6f8df7fbdc56b794eccccf877fe3d8a6dfcc4fccb00649f77b54bc')
 
+pkgver() {
+  cd $_pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd $_pkgname
+  NOCONFIGURE=1 ./autogen.sh
   patch src/fr-init.c < ../../fc-init.patch
 }
 
 build() {
-  cd $_pkgname-$pkgver
-
+  cd $_pkgname
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
    --libexecdir=/usr/lib/$_pkgname --disable-static --disable-schemas-compile
 
@@ -43,7 +50,7 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $_pkgname
   make DESTDIR="$pkgdir" install
   install -Dm644 ../../Z99-zip-cp932.sh "${pkgdir}/etc/profile.d/Z99-zip-cp932.sh"
 }