Fix build errors (bug #374911 by Diego Elio Pettenò) and desktop files with debian patches.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

5 files changed, 73 insertions, 19 deletions

diff --git a/gnome-extra/assogiate/ChangeLog b/gnome-extra/assogiate/ChangeLog
index 34866595bd1b..2c95addfbbd3 100644
--- a/gnome-extra/assogiate/ChangeLog
+++ b/gnome-extra/assogiate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/assogiate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/ChangeLog,v 1.8 2011/03/29 06:02:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/ChangeLog,v 1.9 2011/07/12 11:26:09 pacho Exp $
+
+  12 Jul 2011; Pacho Ramos <pacho@gentoo.org> assogiate-0.2.1.ebuild,
+  +files/assogiate-0.2.1-desktop.patch,
+  +files/assogiate-0.2.1-typedialog.patch:
+  Fix build errors (bug #374911 by Diego Elio Pettenò) and desktop files with
+  debian patches.
 
   29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   assogiate-0.2.1.ebuild:
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
index 1a8120b6e0c4..3e66e19a54a2 100644
--- a/gnome-extra/assogiate/Manifest
+++ b/gnome-extra/assogiate/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX assogiate-0.2.1-desktop.patch 678 RMD160 2520a0e8bcdf5742959b09168199da07664c0516 SHA1 cf24e0dd754bbea1a3d215b3621533d24f24bcff SHA256 baf39f7ade229633521927691d5f4017737667aabc3660868fd7437d499b4562
+AUX assogiate-0.2.1-typedialog.patch 1037 RMD160 f12525e2674e2948f8265dc163fe1b7c5cfdfa27 SHA1 777a0806c9c5c95a4e3f7ac4a6bf2237a6001f7a SHA256 0bbecd8431ae2266ccc2472e40cc29bfc36c6951aa551b8b38fda32b9c681832
 DIST assogiate-0.2.1.tar.bz2 369446 RMD160 4c2d9d1c50e58678d598b7582aa118e4059e2654 SHA1 89c23847d6efd96194b2a35723eb811e7226de03 SHA256 e5655af3a148f3446908ede69d47e005b2eadacbfe4e3d1a2b61d467ecac45ca
-EBUILD assogiate-0.2.1.ebuild 751 RMD160 fea0cd440d5ca29b89480ac199cd0de9e0717317 SHA1 33c650c56a2547048f4be06247f220e6fa37ea14 SHA256 e4553f11524556df870321eed527e7f12a3a5b0a02a1faf019cbba8824443ed3
-MISC ChangeLog 1146 RMD160 c4cfdb37e620b7b6f3711882f78bfcc9d90226b0 SHA1 6b32164c3eb87a35b060e811b412f6c2c86d2f8c SHA256 cd8fc96618418a24145aeca48dd1c07aabece7e6123057253e59c949e48a9a5d
+EBUILD assogiate-0.2.1.ebuild 951 RMD160 51b48b68feb8fca4803ac88d670c680f87eaf94b SHA1 09c9674cb779223b72499fe1c16a2f4ca1c0cae3 SHA256 a9c30d328abb98a4a07d972a8d103a1e41b6b86ef33f307ab8b55c2f059e1e97
+MISC ChangeLog 1394 RMD160 3e2fc63a5a005b5c7559fe9611d2305d6dd6d3a0 SHA1 feeebb8f57f22f1627c8417f631ffb540f57f8d0 SHA256 a54f969880a3e63879a0c0f5510f4deb2731b29b71064b81f2084bd580745902
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXX+AAoJEO/kOhxWD91kbx4P/1NYZQrlVLgVsXzLadCidlQH
-zez0lC14f5cf/G2fI5m6uWC2aMjOmsNL1Qk7Getb9nNRzDKE/F5p27y+0vlp50Hw
-bkXVam1DbJ7C5dPYAluP5G1cup5n96nrXzns159SRxhObt5oxdCUAld0v+lNqLEl
-YsNaCPKwa7G4O/JF7LhupD2eLAJRCKP6AhDzAZvPOqgrr+D+9n18XjICM73+OZpp
-m1AZyn3q3cQ4VuOTG/7AVapFe2U038TYAsgq2If4UbdJRGHZKri2DxJlsYcJ4LvZ
-92cbtwr9yPQL+gOdhI2dZoacECRV4NCx1WnB4DCfSLRqzl0ct2qb0uatoeYQe/kT
-FKMnA6yZjc/c9dHhAT86IXhoimiJdVvR+j81PveqvV1YJEL8ZUD9B70cJgRsWagV
-aFkkUu2aWcCE1ma1U2d3Jk+/ZpgXP8/pxeBbh4RueQY8NKay0Oo9HU/fIS11HQp8
-S3ZClSIYTV92AObtf+ahBNKD9SPUYm+yA1URqP1o+MPSc1VvgbokP8ynPNqx4vJ0
-zOTi5MY6hSiAAG8IB4FhHKadjdY5jVxo+dy7hrj5UibLRcjjRIPIwnEAtRFKEBVR
-p29xW7i8W0kghaFnA29L+JfcuZAjTqI4trXW8gACXA90TX9C3qT3RA7T87B+Tk5e
-+SiAznqx6EsQ5wi67GyV
-=Z+Iw
+iEYEARECAAYFAk4cL1cACgkQCaWpQKGI+9TQ2ACfRUTMy4JEyzqxYXtv7IxZ7VUI
+/acAnjaRYcm1kWv6/72n3qZebjP8fPpI
+=BjEx
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/assogiate/assogiate-0.2.1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
index 96c211bea46d..32a627f8fd1d 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1.ebuild
+++ b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 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.6 2011/03/29 06:02:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/assogiate/assogiate-0.2.1.ebuild,v 1.7 2011/07/12 11:26:09 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
 HOMEPAGE="http://www.kdau.com/projects/assogiate"
@@ -26,3 +27,13 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 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"
+}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
new file mode 100644
index 000000000000..3944938611de
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
@@ -0,0 +1,19 @@
+Description: Update assogiate desktop file
+Author: Vincent Legout <vincent@legout.info>
+
+Index: assogiate/data/assogiate.desktop.in
+===================================================================
+--- assogiate.orig/data/assogiate.desktop.in	2011-05-02 20:46:29.322670186 +0200
++++ assogiate/data/assogiate.desktop.in	2011-05-02 20:46:47.835433235 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=File Types Editor
+ _Comment=Modify the detection and display of file types
+ Exec=assogiate
+ Icon=assogiate
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;System;FileTools;
++Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
++OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
new file mode 100644
index 000000000000..188c69be7cad
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
@@ -0,0 +1,26 @@
+Description: Fix ftbfs
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/624924
+
+Index: assogiate/src/type-dialog.cc
+===================================================================
+--- assogiate.orig/src/type-dialog.cc	2011-05-09 16:51:09.951622099 +0200
++++ assogiate/src/type-dialog.cc	2011-05-09 16:51:53.293459257 +0200
+@@ -144,7 +144,7 @@
+ 	general_upper->pack_start(*Gtk::manage(general_info), true, true);
+ 
+ 	if (renameable) {
+-		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
++		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
+ 		cb->signal_changed().connect
+ 			(sigc::mem_fun(*this, &TypeDialog::on_category_changed));
+ 		m_category_widget = cb;
+@@ -622,7 +622,7 @@
+ 	} else {
+ 		AddItemDialog adder(this, _("Add File Contents Rule"));
+ 
+-		Gtk::ComboBox type(MagicTypesStore::get());
++		Gtk::ComboBox type(MagicTypesStore::get(), false);
+ 		type.pack_start(MagicTypesColumns::get().name);
+ 		adder.add_item(_("_Type:"), type, true);
+