This is an automated email from the git hooks/post-receive script. gewo pushed a commit to branch master in repository amide.
commit 53f426719042ca77784569afcab84cb25580ce64 Author: Gert Wollny <[email protected]> Date: Fri Jan 12 10:42:54 2018 +0100 d/rules, d/p: Disable use of gconf and gnome-vfs, Closes: #868383 --- .../amide-1.0.6-disable-gconf-and-gnome-vfs.patch | 106 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 + 3 files changed, 109 insertions(+) diff --git a/debian/patches/amide-1.0.6-disable-gconf-and-gnome-vfs.patch b/debian/patches/amide-1.0.6-disable-gconf-and-gnome-vfs.patch new file mode 100644 index 0000000..6614147 --- /dev/null +++ b/debian/patches/amide-1.0.6-disable-gconf-and-gnome-vfs.patch @@ -0,0 +1,106 @@ +Author: Gert Wollny <[email protected]> +Description: Make it possible to disable gconf and gnome-vfs + The functionality is then provided by the methods that was + already implemented or Mac OSX, namely using a ini-style file + for the configuration and directly spawning a process for help + display. +Debian-Bug: https://bugs.debian.org/868383 +Forwarded-Upstream: Yes +Last-Updated: 2018-01-12 + +--- a/configure.ac ++++ b/configure.ac +@@ -1,4 +1,4 @@ +-dnl =============================================================================== ++gdnl =============================================================================== + dnl Configure script for AMIDE + dnl =============================================================================== + AC_PREREQ(2.59) +@@ -340,22 +340,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) +--- a/src/amide_gconf.c ++++ b/src/amide_gconf.c +@@ -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 ----------------- */ + +--- a/src/amide_gnome.c ++++ b/src/amide_gnome.c +@@ -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; + diff --git a/debian/patches/series b/debian/patches/series index 3777176..ba59ac6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ ffmpeg_2.9.patch gsl_2x.patch libc_2.23.patch remove-autdated-gnome-macros.patch +amide-1.0.6-disable-gconf-and-gnome-vfs.patch diff --git a/debian/rules b/debian/rules index 4edad0a..f547ede 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ override_dh_auto_configure: --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --localstatedir=/var/lib/amide \ + --disable-gconf \ + --disable-gnome-vfs \ LDFLAGS="-Wl,-z,defs -Wl,--as-needed $(LDFLAGS)" # To create the docs this option would be needed but it causes build problems -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/amide.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
