[gentoo-commits] gentoo-x86 commit in gnome-extra/assogiate: ChangeLog assogiate-0.2.1.ebuild

["Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>]

tetromino    12/08/11 20:01:06

  Modified:             ChangeLog assogiate-0.2.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.11                 gnome-extra/assogiate/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	5 May 2012 06:25:16 -0000	1.10
+++ ChangeLog	11 Aug 2012 20:01:06 -0000	1.11
@@ -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



1.9                  gnome-extra/assogiate/assogiate-0.2.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild?r1=1.8&r2=1.9

Index: assogiate-0.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- assogiate-0.2.1.ebuild	5 May 2012 06:25:16 -0000	1.8
+++ assogiate-0.2.1.ebuild	11 Aug 2012 20:01:06 -0000	1.9
@@ -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 @@
 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
 }