avoide gnomish deps

3 files changed, 123 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 531a7296db1c..78946ac9a614 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amide
 	pkgdesc = Medical imaging data examiner
 	pkgver = 1.0.6
-	pkgrel = 4
+	pkgrel = 5
 	url = http://amide.sourceforge.net/
 	arch = x86_64
 	license = GPL
@@ -9,13 +9,14 @@ pkgbase = amide
 	makedepends = intltool
 	depends = dcmtk
 	depends = ffmpeg
-	depends = gnome-vfs
 	depends = gsl
 	depends = libgnomecanvas
 	depends = volpack
 	depends = xmedcon
 	source = https://web.stanford.edu/~loening/files/amide-1.0.6-2.fc25.src.rpm
+	source = amide_nognome.patch
 	sha512sums = 2d6f9d7cfa7921ba95fd0a887504d4ec135d0e93d94ffdf256b5fc94f3df1766006e0f13ca24c1cc7904c636182db96b7e7c29ac2529554c351458217406053d
+	sha512sums = 34af3c04ff094fe942f02ff8603617f969415e1c4ebc1ef16fba0bcb6d4070285c5027a4212ec49d07e343ca141010507c284dd30b4884545e324411b116d37c
 
 pkgname = amide
 
diff --git a/PKGBUILD b/PKGBUILD
index 471282912699..e3eb3f4e4e17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,30 @@
 # Contributor: Jonas Witschel <diabonas@archlinux.org>
 pkgname=amide  
 pkgver=1.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc='Medical imaging data examiner'
 arch=('x86_64')
 url='http://amide.sourceforge.net/'
 license=('GPL')
-depends=('dcmtk' 'ffmpeg' 'gnome-vfs' 'gsl' 'libgnomecanvas' 'volpack' 'xmedcon')
+depends=('dcmtk' 'ffmpeg' 'gsl' 'libgnomecanvas' 'volpack' 'xmedcon')
 makedepends=('gnome-doc-utils' 'intltool')
-source=('https://web.stanford.edu/~loening/files/amide-1.0.6-2.fc25.src.rpm')
-sha512sums=('2d6f9d7cfa7921ba95fd0a887504d4ec135d0e93d94ffdf256b5fc94f3df1766006e0f13ca24c1cc7904c636182db96b7e7c29ac2529554c351458217406053d')
+source=('https://web.stanford.edu/~loening/files/amide-1.0.6-2.fc25.src.rpm' amide_nognome.patch)
+sha512sums=('2d6f9d7cfa7921ba95fd0a887504d4ec135d0e93d94ffdf256b5fc94f3df1766006e0f13ca24c1cc7904c636182db96b7e7c29ac2529554c351458217406053d'
+            '34af3c04ff094fe942f02ff8603617f969415e1c4ebc1ef16fba0bcb6d4070285c5027a4212ec49d07e343ca141010507c284dd30b4884545e324411b116d37c')
 
 prepare() {
   bsdtar --extract --file "$pkgname-$pkgver.tgz"
+  cd "$pkgname-$pkgver"
+  patch -Np2 < "$srcdir"/amide_nognome.patch
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  CFLAGS+=" -fcommon" ./configure --prefix=/usr 
+  autoreconf -fi
+  CFLAGS+=" -fcommon" ./configure \
+	 --prefix=/usr \
+	 --disable-gconf \
+	 --disable-gnome-vfs
   make --jobs=1
 }
 
diff --git a/amide_nognome.patch b/amide_nognome.patch
new file mode 100644
index 000000000000..4abb155db626
--- /dev/null
+++ b/amide_nognome.patch
@@ -0,0 +1,108 @@
+diff -r 7b8fc8a59fd2 -r 6940419eb16f amide-current/configure.ac
+--- a/amide-current/configure.ac	Tue Jan 24 01:21:11 2017 -0800
++++ b/amide-current/configure.ac	Fri Jan 12 10:02:49 2018 +0100
+@@ -1,4 +1,4 @@
+-dnl ===============================================================================
++gdnl ===============================================================================
+ dnl              Configure script for AMIDE
+ dnl ===============================================================================
+ AC_PREREQ(2.59)
+@@ -346,7 +346,7 @@
+ dnl Let people compile without jpeg2000 library
+ AC_ARG_ENABLE(
+ 	libopenjp2, 
+-	[ --enable-libopenjp2	Compile in jpeg2000 support [default=yes]], 
++	[  --enable-libopenjp2	Compile in jpeg2000 support [default=yes]], 
+ 	enable_libopenjp2="$enableval", 
+ 	enable_libopenjp2=yes)
+ 
+@@ -375,22 +375,46 @@
+ 
+ ## add in gconf if not on win32 or macos x 
+ ## gconf stuff is encapsulated in amide_gconf.c
++
++
++
+ if (test $native_win32 = no) && (test $enable_native_gtk_osx = no); then
+-   PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GCONF,[
++   AC_ARG_ENABLE(
++	gconf, 
++	[  --enable-gconf  Compile in gconf support [default=yes]], 
++	enable_gconf="$enableval", 
++	enable_gconf=yes)
++
++   if test "x$enable_gconf" = "xyes" ; then  
++	PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GCONF,[
+ 		gconf-2.0	>= 2.14.0
+-   ])
+-   AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GCONF_LIBS"
+-   AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GCONF_CFLAGS"
++   	], [AC_DEFINE(AMIDE_USE_GCONF, 1, Use gconf for storing configutation)
++            AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GCONF_LIBS"
++   	    AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GCONF_CFLAGS"
++   	])
++   	
++   else 
++        echo "Don't use gconf"
++   fi	
+ fi
+ 
+ ## add in gnome-vfs if not on win32 or gtk-osx
+ ## gnome-vfs is only used by amide_gnome.c and only on unix
+ if (test $native_win32 = no) && (test $enable_native_gtk_osx = no); then
+-   PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GVFS,[
++   AC_ARG_ENABLE(gnome-vfs, 
++	[  --enable-gnome-vfs  Compile in gnome-vfs support [default=yes]], 
++	enable_gnome_vfs="$enableval", 
++	enable_gnome_vfs=yes)
++    if test "x$enable_gnome_vfs" = "xyes"; then 
++       PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GVFS,[
+ 		gnome-vfs-2.0   >= 2.16.0
+-   ])
+-   AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GVFS_LIBS"
+-   AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GVFS_CFLAGS"
++       ], [AC_DEFINE(AMIDE_USE_GNOME_VFS, 1, Use gnome-vfs for spawning help process)
++          AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GVFS_LIBS"
++          AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GVFS_CFLAGS"
++       ])
++    else 
++        echo "Don't use gnome-vfs"
++    fi
+ fi
+  
+ AC_SUBST(AMIDE_GTK_LIBS)
+diff -r 7b8fc8a59fd2 -r 6940419eb16f amide-current/src/amide_gconf.c
+--- a/amide-current/src/amide_gconf.c	Tue Jan 24 01:21:11 2017 -0800
++++ b/amide-current/src/amide_gconf.c	Fri Jan 12 10:02:49 2018 +0100
+@@ -449,9 +449,7 @@
+   return return_val;
+ }
+ 
+-
+-
+-#elif defined(AMIDE_NATIVE_GTK_OSX)
++#elif defined(AMIDE_NATIVE_GTK_OSX) || !defined(AMIDE_USE_GCONF)
+ 
+ /* --------------------- flatfile version ----------------- */
+ 
+diff -r 7b8fc8a59fd2 -r 6940419eb16f amide-current/src/amide_gnome.c
+--- a/amide-current/src/amide_gnome.c	Tue Jan 24 01:21:11 2017 -0800
++++ b/amide-current/src/amide_gnome.c	Fri Jan 12 10:02:49 2018 +0100
+@@ -36,7 +36,7 @@
+ #include "amitk_common.h"
+ #include "amide_gnome.h"
+ 
+-#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX)
++#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX) && defined(AMIDE_USE_GNOME_VFS)
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <libgnomevfs/gnome-vfs-uri.h>
+ //#else
+@@ -66,7 +66,7 @@
+ 
+ 
+ static gboolean amide_gnome_url_show_with_env (const char  *url,  char       **envp, GError     **error) {
+-#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX)
++#if !defined(G_OS_WIN32) && !defined(AMIDE_NATIVE_GTK_OSX) && defined(AMIDE_USE_GNOME_VFS)
+ 	GnomeVFSResult result;
+ 	GnomeVFSURI *vfs_uri;
+