Add Debian patches to fix building with glib-2.32 (bug #428314, thanks to Diego Elio Pettenò) and with gcc-4.7.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 90 insertions, 4 deletions

diff --git a/gnome-extra/assogiate/ChangeLog b/gnome-extra/assogiate/ChangeLog
index 5131e49fe65f..87611bd2ea3f 100644
--- a/gnome-extra/assogiate/ChangeLog
+++ b/gnome-extra/assogiate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/assogiate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/ChangeLog,v 1.10 2012/05/05 06:25:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/ChangeLog,v 1.11 2012/08/11 20:01:06 tetromino Exp $
+
+  11 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  assogiate-0.2.1.ebuild, +files/assogiate-0.2.1-gcc-4.7.patch,
+  +files/assogiate-0.2.1-glib-2.32.patch:
+  Add Debian patches to fix building with glib-2.32 (bug #428314, thanks to
+  Diego Elio Pettenò) and with gcc-4.7.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> assogiate-0.2.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnome-extra/assogiate/assogiate-0.2.1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
index c4820ebb8054..a2376194e25b 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1.ebuild
+++ b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild,v 1.8 2012/05/05 06:25:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild,v 1.9 2012/08/11 20:01:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -29,11 +29,17 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix desktop file
 	epatch "${FILESDIR}/${P}-desktop.patch"
 
 	# Fix compilation, bug #374911
 	epatch "${FILESDIR}/${P}-typedialog.patch"
+
+	# Fix building with glib-2.32, bug #417765
+	epatch "${FILESDIR}/${P}-glib-2.32.patch"
+
+	# Fix building with gcc-4.7
+	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
+
+	gnome2_src_prepare
 }
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
new file mode 100644
index 000000000000..33d13bd067d5
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
@@ -0,0 +1,17 @@
+Description: Fix ftbfs with gcc-4.7
+Author: Vincent Legout <vlegout@debian.org>
+Last-Update: 2012-04-04
+Bug-Debian: http://bugs.debian.org/667104
+
+Index: assogiate/libassogiate/mime-package.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-package.cc	2012-03-25 10:47:26.524889975 +0200
++++ assogiate/libassogiate/mime-package.cc	2012-04-04 18:54:11.675024484 +0200
+@@ -31,6 +31,7 @@
+ #include <libxml/tree.h>
+ #include <libxml++/parsers/domparser.h>
+ #include <libgnomevfsmm/init.h>
++#include <unistd.h>
+ 
+ /******************************************************************************/
+ /* Globals                                                                    */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
new file mode 100644
index 000000000000..0bcecc31e5ab
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
@@ -0,0 +1,57 @@
+Description: Include glib.h instead of individual headers
+Author: Vincent Legout <vlegout@debian.org>
+Bug-Debian: http://bugs.debian.org/665507
+
+Index: assogiate/libassogiate/mime-database.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-database.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-database.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-database.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/miscutils.h>
+ 
+ /******************************************************************************/
+Index: assogiate/libassogiate/mime-type.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-type.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-type.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-type.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <gtkmm/icontheme.h>
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+Index: assogiate/libassogiate/misc/extras.cc
+===================================================================
+--- assogiate.orig/libassogiate/misc/extras.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/misc/extras.cc	2012-03-25 10:47:00.092890549 +0200
+@@ -24,7 +24,7 @@
+ 
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+ 
+ /******************************************************************************/
+Index: assogiate/src/main.cc
+===================================================================
+--- assogiate.orig/src/main.cc	2012-03-25 10:43:34.396895145 +0200
++++ assogiate/src/main.cc	2012-03-25 10:47:07.628890386 +0200
+@@ -28,8 +28,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>