summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-05-17 15:13:20 (GMT)
committerCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-06-10 16:05:15 (GMT)
commit4821148054f3a51ecfbf58a502184b34d7c62a62 (patch)
treec15b2f74e540df44acf96b5f4249787e35e56fa0
parentc02e052a1d4e91c06d80d492cabb93889d88036e (diff)
downloadlibproxy-4821148054f3a51ecfbf58a502184b34d7c62a62.tar.gz
libproxy-4821148054f3a51ecfbf58a502184b34d7c62a62.tar.xz
Add patches used in maemo's libproxy0.2
Some of them might be outdated or need fixing
-rw-r--r--debian/patches/0001-configure-check-for-D-Bus.patch39
-rw-r--r--debian/patches/0002-configure-add-AM_PROG_CC_C_O.patch24
-rw-r--r--debian/patches/0003-configure-add-m4-stuff.patch29
-rw-r--r--debian/patches/0004-build-fix-link-flags.patch72
-rw-r--r--debian/patches/0005-px-wpad-fallback.patch77
-rw-r--r--debian/patches/0006-gnome-fix-mode-check.patch33
-rw-r--r--debian/patches/0007-gnome-do-case-insensitive-cmp.patch42
-rw-r--r--debian/patches/0008-gnome-disable-session-detection.patch61
-rw-r--r--debian/patches/0009-configure-remove-x11-xmu-checks.patch33
-rw-r--r--debian/patches/series11
10 files changed, 421 insertions, 0 deletions
diff --git a/debian/patches/0001-configure-check-for-D-Bus.patch b/debian/patches/0001-configure-check-for-D-Bus.patch
new file mode 100644
index 0000000..42a4072
--- /dev/null
+++ b/debian/patches/0001-configure-check-for-D-Bus.patch
@@ -0,0 +1,39 @@
+From 9b22e0f41fbe301592d9e7d0f86b8bb098ad6c76 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 21:40:20 +0200
+Subject: [PATCH] configure: check for D-Bus
+
+---
+ configure.ac | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,8 +34,9 @@ PKG_CHECK_MODULES(mozjs, xulrunner-js, h
+ [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+ [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes,
+ [PKG_CHECK_MODULES(mozjs, seamonkey-js, have_mozjs=yes,have_mozjs=no)])])])
+-PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1,
+- have_networkmanager=yes, have_networkmanager=no)
++PKG_CHECK_MODULES(NetworkManager, NetworkManager,
++ [PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, have_networkmanager=no)],
++ have_networkmanager=no)
+ PKG_CHECK_MODULES(QtCore, QtCore, have_qtcore=yes, have_qtcore=no)
+
+ # Direct
+@@ -124,12 +125,12 @@ AC_ARG_WITH([networkmanager],
+ [test x$have_networkmanager = xyes && with_networkmanager=yes])
+ if test x$with_networkmanager = xyes; then
+ if test x$have_networkmanager = xyes; then
+- NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
+- NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
++ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS"
++ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS"
+ AC_SUBST(NETWORKMANAGER_CFLAGS)
+ AC_SUBST(NETWORKMANAGER_LIBS)
+ else
+- echo "NetworkManager module requires: NetworkManager!"
++ echo "NetworkManager module requires: NetworkManager and DBus!"
+ exit 1
+ fi
+ else
diff --git a/debian/patches/0002-configure-add-AM_PROG_CC_C_O.patch b/debian/patches/0002-configure-add-AM_PROG_CC_C_O.patch
new file mode 100644
index 0000000..a6d085a
--- /dev/null
+++ b/debian/patches/0002-configure-add-AM_PROG_CC_C_O.patch
@@ -0,0 +1,24 @@
+From 520c27a40e1085db43cbb436c5b727b72e863e50 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 21:42:42 +0200
+Subject: [PATCH] configure: add AM_PROG_CC_C_O
+
+---
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a79bf84..da8618e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,6 +6,7 @@ AM_INIT_AUTOMAKE
+ ### Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+--
+1.7.4.rc2
+
diff --git a/debian/patches/0003-configure-add-m4-stuff.patch b/debian/patches/0003-configure-add-m4-stuff.patch
new file mode 100644
index 0000000..59c600f
--- /dev/null
+++ b/debian/patches/0003-configure-add-m4-stuff.patch
@@ -0,0 +1,29 @@
+From a3ea3b713cadb1d9bfefab0d87116dc83dba655b Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 21:45:39 +0200
+Subject: [PATCH] configure: add m4 stuff
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+---
+ Makefile.am | 1 +
+ configure.ac | 1 +
+2 files changed, 2 insertions(+), 0 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,5 @@
+ SUBDIRS = src
++ACLOCAL_AMFLAGS = -I m4
+
+ EXTRA_DIST = libproxy-1.0.pc.in runtestsuite.sh test.d
+ CLEANFILES = mingw32-config.cache
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT([libproxy],[0.3.1],[nathaniel@natemccallum.com])
+ AC_CONFIG_SRCDIR([src/lib/proxy.c])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
diff --git a/debian/patches/0004-build-fix-link-flags.patch b/debian/patches/0004-build-fix-link-flags.patch
new file mode 100644
index 0000000..4ac1e16
--- /dev/null
+++ b/debian/patches/0004-build-fix-link-flags.patch
@@ -0,0 +1,72 @@
+From ceca5583cb50c0d0f7102c8e0d201c14944a7609 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 20:40:43 +0200
+Subject: [PATCH] build: fix link flags
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+
+--- a/src/modules/Makefile.am
++++ b/src/modules/Makefile.am
+@@ -51,14 +51,14 @@ config_file_la_LIBADD = ../
+ # GConf/GNOME Config Module
+ config_gnome_la_SOURCES = config_gnome.c xhasclient.c
+ config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
+-config_gnome_la_LIBADD = ../lib/libproxy.la
+-config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@
++config_gnome_la_LIBADD = ../lib/libproxy.la @GNOME_LIBS@
++config_gnome_la_LDFLAGS = $(AM_LDFLAGS)
+
+ # KDE4 Config Module
+ config_kde4_la_SOURCES = config_kde.cc
+ config_kde4_la_CPPFLAGS = -I$(top_srcdir)/src/lib @KDE4_CFLAGS@
+-config_kde4_la_LIBADD = ../lib/libproxy.la
+-config_kde4_la_LDFLAGS = $(AM_LDFLAGS) @KDE4_LIBS@ -lkdecore
++config_kde4_la_LIBADD = ../lib/libproxy.la @KDE4_LIBS@ -kdecore
++config_kde4_la_LDFLAGS = $(AM_LDFLAGS)
+
+ # Windows Registry Config Module
+ config_w32reg_la_SOURCES = config_w32reg.c
+@@ -83,25 +83,25 @@ ignore_ip_la_LIBADD = ../
+ # WebKit (JavaScriptCore) based PAC runner
+ pacrunner_webkit_la_SOURCES = pacrunner_webkit.c
+ pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L
+-pacrunner_webkit_la_LIBADD = ../lib/libproxy.la
++pacrunner_webkit_la_LIBADD = ../lib/libproxy.la @WEBKIT_LIBS@
+ if MINGW32
+ pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la
+ endif
+-pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@
++pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS)
+ nodist_pacrunner_webkit_la_SOURCES = pacutils.h
+
+ # Mozilla (Spidermonkey) based PAC runner
+ pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c
+ pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L
+-pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la
+-pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@
++pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la @MOZJS_LIBS@
++pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS)
+ nodist_pacrunner_mozjs_la_SOURCES = pacutils.h
+
+ # NetworkManager Module
+ network_networkmanager_la_SOURCES = network_networkmanager.c
+ network_networkmanager_la_CPPFLAGS = -I$(top_srcdir)/src/lib @NETWORKMANAGER_CFLAGS@
+-network_networkmanager_la_LIBADD = ../lib/libproxy.la
+-network_networkmanager_la_LDFLAGS = $(AM_LDFLAGS) @NETWORKMANAGER_LIBS@
++network_networkmanager_la_LIBADD = ../lib/libproxy.la @NETWORKMANAGER_LIBS@
++network_networkmanager_la_LDFLAGS = $(AM_LDFLAGS)
+
+ # DNS WPAD Module
+ wpad_dns_la_SOURCES = wpad_dns.c
+
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -11,7 +11,8 @@ libproxy_la_SOURCES = \
+ url.c url.h
+
+ libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
+-libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
++libproxy_la_LDFLAGS = -no-undefined
++libproxy_la_LIBADD = -lpthread -lm
+
+ include_HEADERS = proxy.h
diff --git a/debian/patches/0005-px-wpad-fallback.patch b/debian/patches/0005-px-wpad-fallback.patch
new file mode 100644
index 0000000..cb3b67d
--- /dev/null
+++ b/debian/patches/0005-px-wpad-fallback.patch
@@ -0,0 +1,77 @@
+From 7508b65b9a45d183cd80f02d1f882e6053b0722a Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 21:41:39 +0200
+Subject: [PATCH] px: wpad fallback
+
+---
+ src/lib/proxy.c | 26 +++++++++++++++++++++++---
+ 1 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/proxy.c b/src/lib/proxy.c
+index 5591c9c..ad7508b 100644
+--- a/src/lib/proxy.c
++++ b/src/lib/proxy.c
+@@ -514,6 +514,8 @@ px_proxy_factory_get_proxies (pxProxyFactory *self, char *url)
+ pxConfig *config = NULL;
+ char **response = px_strsplit("direct://", ";");
+ char *tmp = NULL, *order = NULL, **orderv = NULL;
++ char *wpad_fallback_env = NULL;
++ int do_wpad_fallback = 0; // default to not fall back
+
+ // Verify some basic stuff
+ if (!self) goto do_return;
+@@ -581,9 +583,24 @@ px_proxy_factory_get_proxies (pxProxyFactory *self, char *url)
+ for (int i=0 ; self->configs && self->configs[i] && !config ; i++)
+ config = self->configs[i]->callback(self);
+
++ // check PX_WPAD_FALLBACK env var for an override for the WPAD fall
++ // back mechanism
++ wpad_fallback_env = getenv("PX_WPAD_FALLBACK");
++ if (wpad_fallback_env)
++ {
++ if (strcmp(wpad_fallback_env, "0")) {
++ do_wpad_fallback = 1;
++ }
++ }
++
+ // No plugin returned a valid config, fall back to 'wpad://'
+ if (!config)
+ {
++ if (!do_wpad_fallback)
++ {
++ fprintf(stderr, "*** Unable to locate valid config and WPAD fallback disabled! Falling back to direct...\n");
++ goto do_return;
++ }
+ fprintf(stderr, "*** Unable to locate valid config! Falling back to auto-detection...\n");
+ config = px_malloc0(sizeof(pxConfig));
+ config->url = px_strdup("wpad://");
+@@ -595,20 +612,23 @@ px_proxy_factory_get_proxies (pxProxyFactory *self, char *url)
+ !strncmp(config->url, "socks://", 8) ||
+ !strncmp(config->url, "pac+", 4) ||
+ !strcmp (config->url, "wpad://") ||
+- !strcmp (config->url, "direct://")))
++ !strcmp (config->url, "direct://"))
++ && do_wpad_fallback)
+ {
+ fprintf(stderr, "*** Config plugin returned invalid URL type! Falling back to auto-detection...\n");
+ px_free(config->url);
+ config->url = px_strdup("wpad://");
+ }
+- else if (!strncmp(config->url, "pac+", 4) && !px_url_is_valid(config->url + 4))
++ else if (!strncmp(config->url, "pac+", 4) && !px_url_is_valid(config->url + 4)
++ && do_wpad_fallback)
+ {
+ fprintf(stderr, "*** Config plugin returned malformed URL! Falling back to auto-detection...\n");
+ px_free(config->url);
+ config->url = px_strdup("wpad://");
+ }
+ else if ((!strncmp(config->url, "http://", 7) || !strncmp(config->url, "socks://", 8)) &&
+- !px_url_is_valid(config->url))
++ !px_url_is_valid(config->url) &&
++ do_wpad_fallback)
+ {
+ fprintf(stderr, "*** Config plugin returned malformed URL! Falling back to auto-detection...\n");
+ px_free(config->url);
+--
+1.7.4.rc2
+
diff --git a/debian/patches/0006-gnome-fix-mode-check.patch b/debian/patches/0006-gnome-fix-mode-check.patch
new file mode 100644
index 0000000..4af7018
--- /dev/null
+++ b/debian/patches/0006-gnome-fix-mode-check.patch
@@ -0,0 +1,33 @@
+From 6c82a831e123a6fc328696a2ad233066a9608ce5 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 22:52:43 +0200
+Subject: [PATCH] gnome: fix mode check
+
+If it's not configured it doesn't meant there was an error.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+---
+ src/plugins/gnome.c | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/gnome.c b/src/plugins/gnome.c
+index 0581452..2b3e46a 100644
+--- a/src/plugins/gnome.c
++++ b/src/plugins/gnome.c
+@@ -44,12 +44,10 @@ gconf_config_cb(pxProxyFactory *self)
+
+ // Get the mode
+ char *mode = gconf_client_get_string(client, "/system/proxy/mode", NULL);
+- if (!mode) { g_object_unref(client); return NULL; }
+-
+ char *url = NULL, *ignore = NULL;
+
+ // Mode is direct://
+- if (!strcmp(mode, "none"))
++ if (!mode || !strcmp(mode, "none"))
+ url = px_strdup("direct://");
+
+ // Mode is wpad:// or pac+http://...
+--
+1.7.4.rc2
+
diff --git a/debian/patches/0007-gnome-do-case-insensitive-cmp.patch b/debian/patches/0007-gnome-do-case-insensitive-cmp.patch
new file mode 100644
index 0000000..43b0ab5
--- /dev/null
+++ b/debian/patches/0007-gnome-do-case-insensitive-cmp.patch
@@ -0,0 +1,42 @@
+From b98838dcb61b83beb43809b0fe3690a84928d300 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 22:54:03 +0200
+Subject: [PATCH] gnome: do case insensitive cmp
+
+Apparently we set them in uppercase.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+---
+ src/plugins/gnome.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/gnome.c b/src/plugins/gnome.c
+index 2b3e46a..b226231 100644
+--- a/src/plugins/gnome.c
++++ b/src/plugins/gnome.c
+@@ -47,11 +47,11 @@ gconf_config_cb(pxProxyFactory *self)
+ char *url = NULL, *ignore = NULL;
+
+ // Mode is direct://
+- if (!mode || !strcmp(mode, "none"))
++ if (!mode || !strcasecmp(mode, "none"))
+ url = px_strdup("direct://");
+
+ // Mode is wpad:// or pac+http://...
+- else if (!strcmp(mode, "auto"))
++ else if (!strcasecmp(mode, "auto"))
+ {
+ char *tmp = gconf_client_get_string(client, "/system/proxy/autoconfig_url", NULL);
+ if (px_url_is_valid(tmp))
+@@ -62,7 +62,7 @@ gconf_config_cb(pxProxyFactory *self)
+ }
+
+ // Mode is http://... or socks://...
+- else if (!strcmp(mode, "manual"))
++ else if (!strcasecmp(mode, "manual"))
+ {
+ char *type = px_strdup("http");
+ char *host = gconf_client_get_string(client, "/system/http_proxy/host", NULL);
+--
+1.7.4.rc2
+
diff --git a/debian/patches/0008-gnome-disable-session-detection.patch b/debian/patches/0008-gnome-disable-session-detection.patch
new file mode 100644
index 0000000..0360554
--- /dev/null
+++ b/debian/patches/0008-gnome-disable-session-detection.patch
@@ -0,0 +1,61 @@
+From 77665d05cd05c59549594d1ba9a0f98dd5beb673 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 20:39:38 +0200
+Subject: [PATCH] gnome: disable session detection
+
+We always want to use the gconf entries in Harmattan.
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+---
+ src/plugins/Makefile.am | 2 +-
+ src/plugins/gnome.c | 14 +++-----------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index b05de7d..f875c04 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -37,7 +37,7 @@ file_la_LIBADD = ../lib/libproxy.la
+ file_la_LDFLAGS = -module -avoid-version
+
+ # GConf/GNOME Config Plugin
+-gnome_la_SOURCES = gnome.c xhasclient.c
++gnome_la_SOURCES = gnome.c
+ gnome_la_CFLAGS = -I$(top_srcdir)/src/lib @GNOME_CFLAGS@
+ gnome_la_LIBADD = ../lib/libproxy.la @GNOME_LIBS@
+ gnome_la_LDFLAGS = -module -avoid-version
+diff --git a/src/plugins/gnome.c b/src/plugins/gnome.c
+index b226231..59f5fb9 100644
+--- a/src/plugins/gnome.c
++++ b/src/plugins/gnome.c
+@@ -25,9 +25,6 @@
+
+ #include <gconf/gconf-client.h>
+
+-// From xhasclient.c
+-bool x_has_client(char *prog, ...);
+-
+ pxConfig *
+ gconf_config_cb(pxProxyFactory *self)
+ {
+@@ -120,14 +117,9 @@ gconf_config_cb(pxProxyFactory *self)
+ bool
+ on_proxy_factory_instantiate(pxProxyFactory *self)
+ {
+- // If we are running in GNOME, then make sure this plugin is registered.
+- if (x_has_client("gnome-session", "gnome-panel", NULL))
+- {
+- g_type_init();
+- return px_proxy_factory_config_add(self, "gnome", PX_CONFIG_CATEGORY_SESSION,
+- (pxProxyFactoryPtrCallback) gconf_config_cb);
+- }
+- return false;
++ g_type_init();
++ return px_proxy_factory_config_add(self, "gnome", PX_CONFIG_CATEGORY_SESSION,
++ (pxProxyFactoryPtrCallback) gconf_config_cb);
+ }
+
+ void
+--
+1.7.4.rc2
+
diff --git a/debian/patches/0009-configure-remove-x11-xmu-checks.patch b/debian/patches/0009-configure-remove-x11-xmu-checks.patch
new file mode 100644
index 0000000..af9b780
--- /dev/null
+++ b/debian/patches/0009-configure-remove-x11-xmu-checks.patch
@@ -0,0 +1,33 @@
+From 4a65d5e2cacc6406cf8958e386e9bc6df7610cca Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@nokia.com>
+Date: Wed, 19 Jan 2011 22:20:01 +0200
+Subject: [PATCH] configure: remove x11/xmu checks
+
+Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,20 +66,12 @@ AC_ARG_WITH([gnome],
+ [AS_HELP_STRING([--with-gnome],
+ [build GNOME configuration module @<:@automatic@:>@])],
+ [],
+- [test x$have_x11 = xyes &&
+- test x$have_xmu = xyes &&
+- with_gnome=yes])
++ [with_gnome=yes])
+ if test x$with_gnome = xyes; then
+- if test x$GCONFTOOLBIN != x && \
+- test x$have_x11 = xyes && \
+- test x$have_xmu = xyes; then
+- GNOME_CFLAGS="$x11_CFLAGS $xmu_CFLAGS"
+- GNOME_LIBS="$x11_LIBS $xmu_LIBS"
++ if test x$GCONFTOOLBIN != x; then
+ AC_SUBST(GCONFTOOLBIN)
+- AC_SUBST(GNOME_CFLAGS)
+- AC_SUBST(GNOME_LIBS)
+ else
+- echo "GNOME module requires: x11, xmu and gconftool-2!"
++ echo "GNOME module requires: gconftool-2!"
+ exit 1
+ fi
+ else
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..50535fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,11 @@
+0001-configure-check-for-D-Bus.patch
+# disabled: already in upstream 0002-configure-add-AM_PROG_CC_C_O.patch
+0003-configure-add-m4-stuff.patch
+0004-build-fix-link-flags.patch
+#disabled for now 0005-px-wpad-fallback.patch
+#no gconf, disabling 0006-gnome-fix-mode-check.patch
+#no gconf, disabling 0007-gnome-do-case-insensitive-cmp.patch
+#no gconf, disabling 0008-gnome-disable-session-detection.patch
+last
+0009-configure-remove-x11-xmu-checks.patch
+0010-Update-autotools-files.patch