diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | PKGBUILD | 45 | ||||
| -rw-r--r-- | nemo-seahorse-gnupg.patch | 13 |
3 files changed, 39 insertions, 55 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Sep 15 17:34:24 UTC 2018 +# Sat Dec 15 16:18:10 UTC 2018 pkgbase = nemo-extensions-git pkgdesc = Various extensions for Nemo - pkgver = 3.8.0+26+g2750b80 + pkgver = 4.0.0+10+gd8c20fa pkgrel = 1 url = https://github.com/linuxmint/nemo-extensions arch = i686 @@ -24,10 +24,8 @@ pkgbase = nemo-extensions-git depends = nemo options = !emptydirs source = nemo-extensions-git::git+https://github.com/linuxmint/nemo-extensions - source = nemo-seahorse-gnupg.patch source = dropbox-remove-python-deps.patch sha256sums = SKIP - sha256sums = ba6ae77a7d6727088e49aae2dc2c89c77c44f1ea19ee48956481d673d97caa36 sha256sums = ac695b3d847368606f5a551db198942dcc0422c20dadf5f6524c2d41ad54a499 pkgname = nemo-fileroller-git @@ -35,7 +33,7 @@ pkgname = nemo-fileroller-git license = GPL2 depends = nemo depends = file-roller - provides = nemo-fileroller=3.8.0+26+g2750b80 + provides = nemo-fileroller=4.0.0 conflicts = nemo-fileroller pkgname = nemo-engrampa-git @@ -43,7 +41,7 @@ pkgname = nemo-engrampa-git license = GPL2 depends = nemo depends = engrampa - provides = nemo-engrampa=3.8.0+26+g2750b80 + provides = nemo-engrampa=4.0.0 conflicts = nemo-engrampa pkgname = nemo-image-converter-git @@ -51,7 +49,7 @@ pkgname = nemo-image-converter-git license = GPL2 depends = nemo depends = imagemagick - provides = nemo-image-converter=3.8.0+26+g2750b80 + provides = nemo-image-converter=4.0.0 conflicts = nemo-image-converter pkgname = nemo-preview-git @@ -64,7 +62,7 @@ pkgname = nemo-preview-git depends = libmusicbrainz5 depends = gtksourceview3 depends = xreader - provides = nemo-preview=3.8.0+26+g2750b80 + provides = nemo-preview=4.0.0 conflicts = nemo-preview pkgname = nemo-python-git @@ -72,7 +70,7 @@ pkgname = nemo-python-git license = GPL2 depends = nemo depends = python-gobject - provides = nemo-python=3.9.0 + provides = nemo-python=4.0.0 conflicts = nemo-python pkgname = nemo-seahorse-git @@ -81,7 +79,7 @@ pkgname = nemo-seahorse-git depends = nemo depends = libcryptui depends = libgnome-keyring - provides = nemo-seahorse=3.8.0+26+g2750b80 + provides = nemo-seahorse=4.0.0 conflicts = nemo-seahorse pkgname = nemo-share-git @@ -89,7 +87,7 @@ pkgname = nemo-share-git license = GPL2 depends = nemo depends = samba - provides = nemo-share=3.8.0+26+g2750b80 + provides = nemo-share=4.0.0 conflicts = nemo-share pkgname = nemo-terminal-git @@ -98,7 +96,7 @@ pkgname = nemo-terminal-git license = GPL3 depends = nemo-python>=3.9.0 depends = vte3 - provides = nemo-terminal=3.9.0 + provides = nemo-terminal=4.0.0 conflicts = nemo-terminal pkgname = nemo-audio-tab-git @@ -107,7 +105,7 @@ pkgname = nemo-audio-tab-git license = GPL2 depends = nemo-python>=3.9.0 depends = python-mutagen - provides = nemo-audio-tab=3.9.0 + provides = nemo-audio-tab=4.0.0 conflicts = nemo-audio-tab pkgname = nemo-compare-git @@ -122,7 +120,7 @@ pkgname = nemo-compare-git optdepends = fldiff: Additional comparison options (preferred diff, three-way, multi-compare) optdepends = diffuse: Alternate comparison backend optdepends = kdiff3: Alternate comparison backend - provides = nemo-compare=3.9.0 + provides = nemo-compare=4.0.0 conflicts = nemo-compare pkgname = nemo-dropbox-git @@ -131,7 +129,7 @@ pkgname = nemo-dropbox-git license = GPL3 depends = nemo depends = dropbox - provides = nemo-dropbox=3.8.0+26+g2750b80 + provides = nemo-dropbox=4.0.0 conflicts = nemo-dropbox pkgname = nemo-emblems-git @@ -139,7 +137,7 @@ pkgname = nemo-emblems-git arch = any license = GPL3 depends = nemo-python>=3.9.0 - provides = nemo-emblems=3.9.0 + provides = nemo-emblems=4.0.0 conflicts = nemo-emblems pkgname = nemo-media-columns-git @@ -152,7 +150,7 @@ pkgname = nemo-media-columns-git depends = python-pymediainfo depends = python-pillow depends = python-pypdf2 - provides = nemo-media-columns=3.9.0 + provides = nemo-media-columns=4.0.0 conflicts = nemo-media-columns pkgname = nemo-pastebin-git @@ -162,12 +160,12 @@ pkgname = nemo-pastebin-git depends = pastebinit depends = nemo-python>=3.9.0 optdepends = libnofify - provides = nemo-pastebin=3.9.0 + provides = nemo-pastebin=4.0.0 conflicts = nemo-pastebin pkgname = nemo-repairer-git pkgdesc = Nemo extension for filename encoding repair license = GPL2 - provides = nemo-repairer=3.8.0+26+g2750b80 + provides = nemo-repairer=4.0.0 conflicts = nemo-repairer @@ -22,8 +22,8 @@ pkgname=() for _p in "${_pkgname[@]}" ; do pkgname+=(${_p}-git) done -pkgver=3.8.0+26+g2750b80 -_pyextver=3.9.0 +_pkgver=4.0.0 +pkgver=4.0.0+10+gd8c20fa pkgrel=1 pkgdesc="Various extensions for Nemo" arch=('i686' 'x86_64') @@ -36,15 +36,17 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'git' 'meson') makedepends+=("${_preview_deps[@]}" "${_python_deps[@]}" "${_seahorse_deps[@]}") options=('!emptydirs') source=("${pkgbase}::git+https://github.com/linuxmint/nemo-extensions" - 'nemo-seahorse-gnupg.patch' 'dropbox-remove-python-deps.patch') sha256sums=('SKIP' - 'ba6ae77a7d6727088e49aae2dc2c89c77c44f1ea19ee48956481d673d97caa36' 'ac695b3d847368606f5a551db198942dcc0422c20dadf5f6524c2d41ad54a499') +_release_commit='cdb9295e31d70924e5f7de2367b596f8e191a7cd' pkgver() { cd "${srcdir}/${pkgbase}" - git describe | sed 's/-/+/g' + printf "%s+%s+%s" \ + "${_pkgver}" \ + "$( bc <<< "`git rev-list HEAD --count` - `git rev-list ${_release_commit} --count`" )" \ + "$( git describe --long | sed 's:.*-::' )" } prepare() { @@ -54,9 +56,6 @@ prepare() { # annoying to people who actually set $C(XX)?FLAGS. This drops the unneeded dependency on gnome-common sed -i '/^GNOME_/d' nemo-image-converter/configure.ac - # Support GnuPG 2.2 - patch -p1 -i ../nemo-seahorse-gnupg.patch - # nemo-engrampa patches [ -d nemo-engrampa ] && rm -fr nemo-engrampa cp -r nemo-fileroller nemo-engrampa @@ -123,7 +122,7 @@ package_nemo-fileroller-git() { pkgdesc="File archiver extension for Nemo" license=('GPL2') depends+=('file-roller') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -134,7 +133,7 @@ package_nemo-engrampa-git() { pkgdesc="File archiver extension for Nemo using engrampa" license=('GPL2') depends+=('engrampa') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -145,7 +144,7 @@ package_nemo-image-converter-git() { pkgdesc="Nemo extension to rotate/resize image files" license=('GPL2') depends+=('imagemagick') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -156,7 +155,7 @@ package_nemo-preview-git() { pkgdesc="Quick file previewer for Nemo" license=('GPL2') depends+=("${_preview_deps[@]}") - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -167,7 +166,7 @@ package_nemo-python-git() { pkgdesc="Python binding for Nemo components" license=('GPL2') depends+=("${_python_deps[@]}") - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}"/build @@ -178,7 +177,7 @@ package_nemo-seahorse-git() { pkgdesc="PGP encryption and signing extension for Nemo" license=('GPL2') depends+=("${_seahorse_deps[@]}") - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -189,7 +188,7 @@ package_nemo-share-git() { pkgdesc="Samba extension for Nemo" license=('GPL2') depends+=('samba') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -201,7 +200,7 @@ package_nemo-terminal-git() { arch=('any') license=('GPL3') depends=('nemo-python>=3.9.0' 'vte3') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -214,7 +213,7 @@ package_nemo-media-columns-git() { arch=('any') license=('GPL2') depends=('nemo-python>=3.9.0' 'python-mutagen' 'exiv2' 'python-pymediainfo' 'python-pillow' 'python-pypdf2') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -228,7 +227,7 @@ package_nemo-pastebin-git() { license=('GPL2') depends=('pastebinit' 'nemo-python>=3.9.0') optdepends=('libnofify') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -241,7 +240,7 @@ package_nemo-audio-tab-git() { license=('GPL2') arch=('any') depends=('nemo-python>=3.9.0' 'python-mutagen') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -253,7 +252,7 @@ package_nemo-dropbox-git() { pkgdesc="Dropbox for Linux - Nemo extension" license=('custom:CC-BY-ND-3' 'GPL3') depends+=('dropbox') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -272,7 +271,7 @@ package_nemo-compare-git() { 'fldiff: Additional comparison options (preferred diff, three-way, multi-compare)' 'diffuse: Alternate comparison backend' 'kdiff3: Alternate comparison backend') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -285,7 +284,7 @@ package_nemo-emblems-git() { arch=('any') license=('GPL3') depends=('nemo-python>=3.9.0') - provides=("${pkgname/-git/}=${_pyextver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" @@ -296,7 +295,7 @@ package_nemo-emblems-git() { package_nemo-repairer-git() { pkgdesc="Nemo extension for filename encoding repair" license=('GPL2') - provides=("${pkgname/-git/}=${pkgver}") + provides=("${pkgname/-git/}=${_pkgver}") conflicts=("${pkgname/-git}") cd "${srcdir}/${pkgbase}/${pkgname/-git/}" diff --git a/nemo-seahorse-gnupg.patch b/nemo-seahorse-gnupg.patch deleted file mode 100644 index bfec82446dff..000000000000 --- a/nemo-seahorse-gnupg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/nemo-extensions-3.6.0/nemo-seahorse/configure.ac.orig b/nemo-extensions-3.6.0/nemo-seahorse/configure.ac -index acea698..9aa06c2 100644 ---- a/nemo-seahorse/configure.ac.orig -+++ b/nemo-seahorse/configure.ac -@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0 2.1" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - ok="no" - if test "$GNUPG" != "no"; then |