Source: icedove
Version: 8.0-2
Severity: important
Tags: patch

Hi,

GnomeVFS has been deprecated and replaced by GIO.
For proper integration in GNOME 3, GIO support needs to be enabled.

While looking at this, I also found that the package has a build
dependency on libgnomeui-dev which is no longer useful. Also the
--enable-gnomeui configure is gone.

When test-building the package (9.0.1) I noticed that the package also
needed an explicit build-dependency on python, otherwise ./configure
errs out [1]. So I added those.

Please consider applying the attached patch in your next upload.

Thanks,
Michael

[1]
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
if test -z "$PYTHON"; then
    AC_MSG_ERROR([python was not found in \$PATH])
 fi

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- no debconf information
>From 4452c4dfa92b5d3ad906577981c44eebe483982f Mon Sep 17 00:00:00 2001
From: Michael Biebl <[email protected]>
Date: Sun, 5 Feb 2012 09:33:18 +0100
Subject: [PATCH] GNOME 3 integration: Use GIO instead of deprecated GnomeVFS

- Add Build-Depends on libglib2.0-dev.
- Pass --enable-gio to configure.
- Drop Build-Depends on libgnomevfs2-dev.
- Pass --disable-gnomevfs to configure.
- Remove obsolete --enable-gnomeui configure switch
  and Build-Depends on libgnomeui-dev.
---
 debian/control |    5 +++--
 debian/rules   |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index a0a1c7e..37d3478 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,9 @@ Build-Depends: bzip2,
 	autoconf2.13,
 	autotools-dev,
 	libgtk2.0-dev (>= 2.12),
+	libglib2.0-dev,
+	libgconf2-dev,
+	python (>= 2.5),
 	zip,
 	unzip,
 	libjpeg-dev,
@@ -19,8 +22,6 @@ Build-Depends: bzip2,
 	libxt-dev,
 	libxau-dev,
 	libcairo2-dev (>= 1.8.8),
-	libgnomevfs2-dev (>= 1:2.16),
-	libgnomeui-dev (>= 2.16),
 	libhunspell-dev (>= 1.2),
 	libnspr4-dev (>= 4.8.6),
 	libnss3-dev (>= 3.12.8),
diff --git a/debian/rules b/debian/rules
index 162f009..252bc6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ DEB_AUTO_UPDATE_DEBIAN_CONTROL=0
 DEB_MOZ_EXTENSIONS=default
 DEB_DBG_PACKAGES = $(DEB_MOZ_NAME)-dbg
 
-DEB_DH_SHLIBDEPS_ARGS_ALL=-l $(DEB_DESTDIR)usr/lib/$(DEB_MOZ_APPLICATION) -Xlibmozgnome -Xlibnkgnomevfs -Xlibdbusservice
+DEB_DH_SHLIBDEPS_ARGS_ALL=-l $(DEB_DESTDIR)usr/lib/$(DEB_MOZ_APPLICATION) -Xlibmozgnome -Xlibdbusservice
 
 DEB_DH_MAKESHLIBS_ARGS_ALL=-Xlibsystem-pref.so
 
@@ -88,13 +88,13 @@ DEB_CONFIGURE_USER_FLAGS= \
 	--disable-tests \
 	--disable-mochitest \
 	--disable-updater \
+	--disable-gnomevfs \
+	--enable-gio \
 	--enable-pango \
 	--enable-xft \
 	--enable-xinerama \
 	--enable-svg \
 	--enable-svg-renderer=cairo \
-	--enable-gnomevfs \
-	--enable-gnomeui \
 	--enable-canvas \
 	--enable-crypto \
 	--enable-shared-js \
@@ -228,7 +228,7 @@ common-install-arch::
 		sh -c "set -e; cd debian/calendar-timezones/usr/lib/calendar-timezones/; unzip $(CURDIR)/mozilla/dist/xpi-stage/calendar-timezones.xpi"
 
 binary-predeb/$(DEB_MOZ_APPLICATION)::
-	LD_LIBRARY_PATH=$(DEB_DESTDIR)usr/lib/$(DEB_MOZ_APPLICATION) dpkg-shlibdeps -Tdebian/$(DEB_MOZ_APPLICATION).substvars -dDepends -pgnome $(foreach lib,dbusservice mozgnome nkgnomevfs,debian/$(DEB_MOZ_APPLICATION)/usr/lib/$(DEB_MOZ_APPLICATION)/components/lib$(lib).so)
+	LD_LIBRARY_PATH=$(DEB_DESTDIR)usr/lib/$(DEB_MOZ_APPLICATION) dpkg-shlibdeps -Tdebian/$(DEB_MOZ_APPLICATION).substvars -dDepends -pgnome $(foreach lib,dbusservice mozgnome,debian/$(DEB_MOZ_APPLICATION)/usr/lib/$(DEB_MOZ_APPLICATION)/components/lib$(lib).so)
 
 clean::
 	rm -f debian/stamp-autotools-files-moz debian/stamp-icedove-branding
-- 
1.7.9

Reply via email to