fix build for various plugins

3 files changed, 40 insertions, 123 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1eb805a48dd..208dc1d6a14f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Dec 15 16:18:10 UTC 2018
 pkgbase = nemo-extensions-git
 	pkgdesc = Various extensions for Nemo
-	pkgver = 4.0.0+10+gd8c20fa
+	pkgver = 5.6.0+9+g818dba9
 	pkgrel = 1
 	url = https://github.com/linuxmint/nemo-extensions
 	arch = i686
@@ -24,16 +22,14 @@ pkgbase = nemo-extensions-git
 	depends = nemo
 	options = !emptydirs
 	source = nemo-extensions-git::git+https://github.com/linuxmint/nemo-extensions
-	source = dropbox-remove-python-deps.patch
 	sha256sums = SKIP
-	sha256sums = ac695b3d847368606f5a551db198942dcc0422c20dadf5f6524c2d41ad54a499
 
 pkgname = nemo-fileroller-git
 	pkgdesc = File archiver extension for Nemo
 	license = GPL2
 	depends = nemo
 	depends = file-roller
-	provides = nemo-fileroller=4.0.0
+	provides = nemo-fileroller=5.6.0
 	conflicts = nemo-fileroller
 
 pkgname = nemo-engrampa-git
@@ -41,7 +37,7 @@ pkgname = nemo-engrampa-git
 	license = GPL2
 	depends = nemo
 	depends = engrampa
-	provides = nemo-engrampa=4.0.0
+	provides = nemo-engrampa=5.6.0
 	conflicts = nemo-engrampa
 
 pkgname = nemo-image-converter-git
@@ -49,7 +45,7 @@ pkgname = nemo-image-converter-git
 	license = GPL2
 	depends = nemo
 	depends = imagemagick
-	provides = nemo-image-converter=4.0.0
+	provides = nemo-image-converter=5.6.0
 	conflicts = nemo-image-converter
 
 pkgname = nemo-preview-git
@@ -62,7 +58,7 @@ pkgname = nemo-preview-git
 	depends = libmusicbrainz5
 	depends = gtksourceview3
 	depends = xreader
-	provides = nemo-preview=4.0.0
+	provides = nemo-preview=5.6.0
 	conflicts = nemo-preview
 
 pkgname = nemo-python-git
@@ -70,7 +66,7 @@ pkgname = nemo-python-git
 	license = GPL2
 	depends = nemo
 	depends = python-gobject
-	provides = nemo-python=4.0.0
+	provides = nemo-python=5.6.0
 	conflicts = nemo-python
 
 pkgname = nemo-seahorse-git
@@ -79,7 +75,7 @@ pkgname = nemo-seahorse-git
 	depends = nemo
 	depends = libcryptui
 	depends = libgnome-keyring
-	provides = nemo-seahorse=4.0.0
+	provides = nemo-seahorse=5.6.0
 	conflicts = nemo-seahorse
 
 pkgname = nemo-share-git
@@ -87,7 +83,7 @@ pkgname = nemo-share-git
 	license = GPL2
 	depends = nemo
 	depends = samba
-	provides = nemo-share=4.0.0
+	provides = nemo-share=5.6.0
 	conflicts = nemo-share
 
 pkgname = nemo-terminal-git
@@ -96,7 +92,7 @@ pkgname = nemo-terminal-git
 	license = GPL3
 	depends = nemo-python>=3.9.0
 	depends = vte3
-	provides = nemo-terminal=4.0.0
+	provides = nemo-terminal=5.6.0
 	conflicts = nemo-terminal
 
 pkgname = nemo-audio-tab-git
@@ -105,7 +101,7 @@ pkgname = nemo-audio-tab-git
 	license = GPL2
 	depends = nemo-python>=3.9.0
 	depends = python-mutagen
-	provides = nemo-audio-tab=4.0.0
+	provides = nemo-audio-tab=5.6.0
 	conflicts = nemo-audio-tab
 
 pkgname = nemo-compare-git
@@ -120,7 +116,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=4.0.0
+	provides = nemo-compare=5.6.0
 	conflicts = nemo-compare
 
 pkgname = nemo-dropbox-git
@@ -129,7 +125,7 @@ pkgname = nemo-dropbox-git
 	license = GPL3
 	depends = nemo
 	depends = dropbox
-	provides = nemo-dropbox=4.0.0
+	provides = nemo-dropbox=5.6.0
 	conflicts = nemo-dropbox
 
 pkgname = nemo-emblems-git
@@ -137,7 +133,7 @@ pkgname = nemo-emblems-git
 	arch = any
 	license = GPL3
 	depends = nemo-python>=3.9.0
-	provides = nemo-emblems=4.0.0
+	provides = nemo-emblems=5.6.0
 	conflicts = nemo-emblems
 
 pkgname = nemo-media-columns-git
@@ -150,7 +146,7 @@ pkgname = nemo-media-columns-git
 	depends = python-pymediainfo
 	depends = python-pillow
 	depends = python-pypdf2
-	provides = nemo-media-columns=4.0.0
+	provides = nemo-media-columns=5.6.0
 	conflicts = nemo-media-columns
 
 pkgname = nemo-pastebin-git
@@ -160,12 +156,11 @@ pkgname = nemo-pastebin-git
 	depends = pastebinit
 	depends = nemo-python>=3.9.0
 	optdepends = libnofify
-	provides = nemo-pastebin=4.0.0
+	provides = nemo-pastebin=5.6.0
 	conflicts = nemo-pastebin
 
 pkgname = nemo-repairer-git
 	pkgdesc = Nemo extension for filename encoding repair
 	license = GPL2
-	provides = nemo-repairer=4.0.0
+	provides = nemo-repairer=5.6.0
 	conflicts = nemo-repairer
-
diff --git a/PKGBUILD b/PKGBUILD
index 30053931f493..7daf84bc21de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,8 @@ pkgname=()
 for _p in "${_pkgname[@]}" ; do 
 	pkgname+=(${_p}-git)
 done
-_pkgver=4.0.0
-pkgver=4.0.0+10+gd8c20fa
+_pkgver=5.6.0
+pkgver=5.6.0+9+g818dba9
 pkgrel=1
 pkgdesc="Various extensions for Nemo"
 arch=('i686' 'x86_64')
@@ -35,11 +35,9 @@ _seahorse_deps=('libcryptui' 'libgnome-keyring')
 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"
-        'dropbox-remove-python-deps.patch')
-sha256sums=('SKIP'
-            'ac695b3d847368606f5a551db198942dcc0422c20dadf5f6524c2d41ad54a499')
-_release_commit='cdb9295e31d70924e5f7de2367b596f8e191a7cd'
+source=("${pkgbase}::git+https://github.com/linuxmint/nemo-extensions")
+sha256sums=('SKIP')
+_release_commit='374d0353c7bf88d0840eaa4183192f3bcdbb319d'
 
 pkgver() {
     cd "${srcdir}/${pkgbase}"
@@ -52,10 +50,6 @@ pkgver() {
 prepare() {
     cd "${srcdir}/${pkgbase}"
 
-    # Delete deprecated gnome-common macros, even their standard autoconf-archive replacements are
-    # 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
-
 	# nemo-engrampa patches
 	[ -d nemo-engrampa ] && rm -fr nemo-engrampa
 	cp -r nemo-fileroller nemo-engrampa
@@ -69,8 +63,6 @@ prepare() {
         -e 's:File[\ \-]?[rR]oller:Engrampa:g' '{}' \;
     
     # nemo-dropbox patches
-    cd "${srcdir}/${pkgbase}"/nemo-dropbox
-    patch -uNp2 -r- -i "${srcdir}"/dropbox-remove-python-deps.patch
     
     cd "${srcdir}/${pkgbase}"
     for _dir in "${_pkgname[@]}"; do
@@ -125,8 +117,8 @@ package_nemo-fileroller-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-engrampa-git() {
@@ -136,8 +128,8 @@ package_nemo-engrampa-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-image-converter-git() {
@@ -147,8 +139,8 @@ package_nemo-image-converter-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-preview-git() {
@@ -158,8 +150,8 @@ package_nemo-preview-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-python-git() {
@@ -169,8 +161,8 @@ package_nemo-python-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"/build
-    DESTDIR="${pkgdir}" ninja install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-seahorse-git() {
@@ -180,8 +172,8 @@ package_nemo-seahorse-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-share-git() {
@@ -191,8 +183,8 @@ package_nemo-share-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
 
 package_nemo-terminal-git() {
@@ -255,9 +247,10 @@ package_nemo-dropbox-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
     
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
     # install the common license
+	cd ..
     install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
@@ -298,6 +291,6 @@ package_nemo-repairer-git() {
     provides=("${pkgname/-git/}=${_pkgver}")
     conflicts=("${pkgname/-git}")
 
-    cd "${srcdir}/${pkgbase}/${pkgname/-git/}"
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/${pkgbase}/${pkgname/-git/}/build"
+    DESTDIR="${pkgdir}" meson install
 }
diff --git a/dropbox-remove-python-deps.patch b/dropbox-remove-python-deps.patch
deleted file mode 100644
index ec59b18709d7..000000000000
--- a/dropbox-remove-python-deps.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur ./nemo-dropbox.orig/configure.ac ./nemo-dropbox/configure.ac
---- ./nemo-dropbox.orig/configure.ac	2018-09-15 11:57:30.803374532 -0400
-+++ ./nemo-dropbox/configure.ac	2018-09-15 11:58:55.235097728 -0400
-@@ -29,36 +29,6 @@
- PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
- 
--AC_PATH_PROG([PYTHON], [python])
--
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
--AC_SUBST(RST2MAN)
--
--# define module checking macro
--AC_DEFUN([PYTHON_CHECK_MODULE], [
--AC_MSG_CHECKING([for $1])
--
--cat <<EOF | python
--try:
-- import $2
--except:
-- exit(1)
--else:
-- exit(0)
--EOF
--
--if test $? -ne 0; then
--   AC_MSG_RESULT([no])
--   AC_MSG_ERROR([couldn't find $1])
--else
--   AC_MSG_RESULT([yes])
--fi
--])
--
--PYTHON_CHECK_MODULE(pygtk, gtk)
--PYTHON_CHECK_MODULE(gobject, gobject)
--PYTHON_CHECK_MODULE(docutils, docutils)
--
- # Make dependency CFLAGS and LIBS available
- AC_SUBST(NEMO_CFLAGS)
- AC_SUBST(NEMO_LIBS)
-diff -Naur ./nemo-dropbox.orig/data/Makefile.am ./nemo-dropbox/data/Makefile.am
---- ./nemo-dropbox.orig/data/Makefile.am	2018-09-15 11:57:30.803374532 -0400
-+++ ./nemo-dropbox/data/Makefile.am	2018-09-15 12:00:40.723086037 -0400
-@@ -1,6 +1 @@
--applicationdir = $(datadir)/applications
--application_DATA = dropbox.desktop
--
--EXTRA_DIST = $(application_DATA)
--
--SUBDIRS = icons emblems
-+SUBDIRS = emblems
-diff -Naur ./nemo-dropbox.orig/Makefile.am ./nemo-dropbox/Makefile.am
---- ./nemo-dropbox.orig/Makefile.am	2018-09-15 11:57:30.803374532 -0400
-+++ ./nemo-dropbox/Makefile.am	2018-09-15 11:59:55.863941519 -0400
-@@ -1,16 +1,3 @@
- AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
- 
--bin_SCRIPTS = dropbox
--CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
--EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py
--man_MANS = dropbox.1
--
--dropbox: dropbox.in serializeimages.py
--	python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
--	chmod +x dropbox
--
--dropbox.1: dropbox dropbox.txt.in docgen.py
--	python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
--	$(RST2MAN) dropbox.txt > dropbox.1
--
- SUBDIRS = data src