diff options
author | priponne | 2017-05-02 14:21:29 +0100 |
---|---|---|
committer | priponne | 2017-05-02 14:21:29 +0100 |
commit | 4dd628f4765ef7abf6d78ce48cf35d8c69930649 (patch) | |
tree | fb3e174368bd89deec0cdb49f8b3b449535c5167 | |
parent | b6c929f5879b9753f575aa8fe644ce665f1ff75a (diff) | |
download | aur-4dd628f4765ef7abf6d78ce48cf35d8c69930649.tar.gz |
Updated to 3.24.1
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | PKGBUILD | 52 | ||||
-rw-r--r-- | tmp-as-temp.patch | 36 |
3 files changed, 56 insertions, 51 deletions
@@ -1,21 +1,18 @@ pkgbase = file-roller-tmp pkgdesc = The file-roller with an additional patch to put temporary files in /tmp instead of ~/.cache (and thus to reduce the amount of writes to SSDs). - pkgver = 3.16.4 + pkgver = 3.24.1 pkgrel = 1 - url = http://www.gnome.org - install = file-roller.install arch = i686 arch = x86_64 groups = gnome-extra license = GPL makedepends = intltool - makedepends = pkg-config - makedepends = libnautilus-extension makedepends = itstool makedepends = docbook-xsl - depends = desktop-file-utils + makedepends = gnome-common + makedepends = git + makedepends = libnautilus-extension depends = gtk3 - depends = hicolor-icon-theme depends = dconf depends = libarchive depends = file @@ -27,14 +24,12 @@ pkgbase = file-roller-tmp optdepends = unrar: better RAR archive support optdepends = unace: ACE archive support optdepends = lrzip: lrzip archive support - optdepends = cdrkit: ISO image support provides = file-roller conflicts = file-roller - options = !emptydirs - source = http://ftp.gnome.org/pub/gnome/sources/file-roller/3.16/file-roller-3.16.4.tar.xz + source = git+https://git.gnome.org/browse/file-roller#commit=e6ef6fa43a6d5d6e1509f122a206870adc113563 source = tmp-as-temp.patch - sha256sums = 5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185 - sha256sums = 9556742b38c06f131f7d56eb72522e38402a85ec99904be73ccae228f5b9572f + sha256sums = SKIP + sha256sums = 753c6ee41772677b115f4178fe6384c21d8aa5d489a6074f659d5305736acf57 pkgname = file-roller-tmp @@ -2,45 +2,49 @@ # Maintainer: Kresimir Pripuzic <kpripuzic@gmail.com> pkgname=file-roller-tmp -pkgver=3.16.4 +pkgver=3.24.1 pkgrel=1 pkgdesc="The file-roller with an additional patch to put temporary files in /tmp instead of ~/.cache (and thus to reduce the amount of writes to SSDs)." -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'zip' 'unzip') -makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') +arch=(i686 x86_64) +license=(GPL) +depends=(gtk3 dconf libarchive file json-glib libnotify zip unzip) +makedepends=(intltool itstool docbook-xsl gnome-common git libnautilus-extension) 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') + 'lrzip: lrzip archive support') +groups=(gnome-extra) provides=('file-roller') conflicts=('file-roller') -options=('!emptydirs') -install=file-roller.install -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname:0:11}/${pkgver:0:4}/${pkgname:0:11}-$pkgver.tar.xz - tmp-as-temp.patch) -sha256sums=('5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185' - '9556742b38c06f131f7d56eb72522e38402a85ec99904be73ccae228f5b9572f') +_commit=e6ef6fa43a6d5d6e1509f122a206870adc113563 # tags/3.24.1^0 +source=("git+https://git.gnome.org/browse/file-roller#commit=$_commit" + tmp-as-temp.patch) +sha256sums=('SKIP' + '753c6ee41772677b115f4178fe6384c21d8aa5d489a6074f659d5305736acf57') + +pkgver() { + cd ${pkgname:0:11} + git describe --tags | sed 's/-/+/g' +} prepare() { - cd ${pkgname:0:11}-$pkgver - patch -Np1 -i ../tmp-as-temp.patch + cd ${pkgname:0:11} + NOCONFIGURE=1 ./autogen.sh + + #patch + cd $srcdir/${pkgname:0:11} + patch -Np0 -i ../tmp-as-temp.patch } build() { - cd ${pkgname:0:11}-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/file-roller \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile + cd ${pkgname:0:11} + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static --disable-schemas-compile + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } package() { - cd ${pkgname:0:11}-$pkgver + cd ${pkgname:0:11} make DESTDIR="$pkgdir" install } diff --git a/tmp-as-temp.patch b/tmp-as-temp.patch index ca592404b401..e2e788a5b737 100644 --- a/tmp-as-temp.patch +++ b/tmp-as-temp.patch @@ -1,11 +1,10 @@ -diff --git a/src/file-utils.c b/src/file-utils.c -index 62a240e..35f23d9 100644 ---- a/src/file-utils.c -+++ b/src/file-utils.c -@@ -52,26 +52,6 @@ - /* path */ +--- src/file-utils.c 2017-05-02 14:13:27.327758724 +0200 ++++ src/file-utils.c 2017-05-02 14:26:07.501244763 +0200 +@@ -51,27 +51,6 @@ + /* path */ +- -static const char *try_folder[] = { "cache", "~", "tmp", NULL }; - - @@ -29,10 +28,11 @@ index 62a240e..35f23d9 100644 char * _g_path_get_temp_work_dir (const char *parent_folder) { -@@ -82,24 +62,7 @@ _g_path_get_temp_work_dir (const char *parent_folder) +@@ -81,28 +60,7 @@ + char *template; char *result = NULL; - if (parent_folder == NULL) { +- if (parent_folder == NULL) { - /* find the folder with more free space. */ - - for (i = 0; try_folder[i] != NULL; i++) { @@ -51,13 +51,16 @@ index 62a240e..35f23d9 100644 - best_folder = g_strdup (folder); - } - } -+ best_folder = g_strdup (g_get_tmp_dir ()); - } - else - best_folder = g_strdup (parent_folder); -@@ -576,15 +539,13 @@ _g_file_is_temp_work_dir (GFile *file) - if (path[0] != '/') +- } +- else +- best_folder = g_strdup (parent_folder); ++ best_folder = g_strdup (g_get_tmp_dir ()); + + if (best_folder == NULL) + return NULL; +@@ -578,17 +536,15 @@ return FALSE; + } - for (i = 0; try_folder[i] != NULL; i++) { - const char *folder; @@ -75,5 +78,8 @@ index 62a240e..35f23d9 100644 + if (strncmp (path + strlen (folder), "/.fr-", 5) == 0) { + result = TRUE; } - } +- } ++ } + + g_free (path); |