Fix glib-mkenums command-line in Makefile.am (bug 279832)

Package-Manager: portage-2.2_rc36/cvs/Linux i686

4 files changed, 83 insertions, 12 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index dbf9738ad8c7..c4d7a373274e 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.219 2009/08/08 23:34:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.220 2009/08/09 18:58:10 ford_prefect Exp $
+
+*libwnck-2.26.2-r2 (09 Aug 2009)
+
+  09 Aug 2009; Arun Raghavan <ford_prefect@gentoo.org>
+  +libwnck-2.26.2-r2.ebuild, +files/libwnck-2.26.2-fix-glib-mkenums.diff:
+  Fix glib-mkenums command-line in Makefile.am (bug 279832)
 
   08 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
   libwnck-2.26.2-r1.ebuild:
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 77890065c68f..e971295ab52c 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libwnck-2.26.2-automagic.patch 2148 RMD160 5705d787895196d4da79ec2999f805cbbb6da112 SHA1 36235c2506dd0a74aaebafd10889798c6fb926b2 SHA256 72c9de2cc8e9c83f3af6b399e21bf6a63fa2f1b7b3178deed2a7132bb8154b21
+AUX libwnck-2.26.2-fix-glib-mkenums.diff 963 RMD160 2f3ac675e50434ec93e11d094f698dc4e393d840 SHA1 2cff7390c622abee5dc2d92a0b05572fb1af23b7 SHA256 3d12522b1fb5c08e1a8e60fadc8d2e4dbfb027abb6a89748c7081a05128fcca0
 DIST libwnck-2.20.3.tar.bz2 637507 RMD160 d7b198f5194ff442d2840cc05a73d23b3d819df2 SHA1 21a710e5ac221b73ce40616867ac2fba3a105647 SHA256 d5fc1d8b0202ad169052dcd50b283ed4fb30a4a7da9bbf0be462d2879535dd6a
 DIST libwnck-2.24.2.tar.bz2 693227 RMD160 47f8c3c7eaf3d0c4dccce32f8504022a228c582e SHA1 5293b1667bd1bc3f66eac2aa35f5ff0b34eed893 SHA256 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2
 DIST libwnck-2.26.2.tar.bz2 684354 RMD160 5554e934419012400dfb293c7d906293028298cc SHA1 b941006e5edf2877f863c541d52485cd141f96da SHA256 fc38a8ef185828e6a9205f2489bd563d8f303655ba533ad6f640e2de8018983c
 EBUILD libwnck-2.20.3.ebuild 690 RMD160 138dadc4388a92d508e428bed1b4489c5d65608a SHA1 1e3f4427647353f57dec1e4b90be33692f9f70f2 SHA256 0b59c51b98b060151fed4ce02f81d1c489ceab264ac4ecbc84baa957b1c8fba9
 EBUILD libwnck-2.24.2.ebuild 773 RMD160 dfb092cfd5a53c00f3c514ac0b25e4d4ab5cbc33 SHA1 2f43be427334ae1ceb0ecccf3be6737d6e3e662d SHA256 48d9d9e5ed7c4942bc8696ef842e14ef8ff4ed0da6ba89863d8f6be903bd5f0f
 EBUILD libwnck-2.26.2-r1.ebuild 1222 RMD160 d5ab1491768160cea00aeab873c3ddd440f30e00 SHA1 dbd15eecc9b9569af7f8cc3991f00b1aca3466ba SHA256 1edec9b72026e50f0f30aa2f10a27c11bc562272d6cf8d784914a66f41de7028
+EBUILD libwnck-2.26.2-r2.ebuild 1415 RMD160 c9b33fadea86e4f2500ae371920145600c116bc7 SHA1 c3acb01f17b975b4415a41483c37b442fe022590 SHA256 16340b88d18e35ef2a8eafc01d89461c9fd361c310da517c11c4ab4ebc7042d8
 EBUILD libwnck-2.26.2.ebuild 785 RMD160 71aaabf2e4cae185f1da005c1cdab4668198c796 SHA1 8353ad2b7d59d172c6ec8f5fc79485d03cdfa77a SHA256 5a5f16da1a85293ffa566bbd46fd4c98459d8c46deeaf9cc8c1eb16e9cf2b9ea
-MISC ChangeLog 26155 RMD160 82b6af3d22ab0bdc6f64997c0faf94ec7a847bc4 SHA1 3b2f745059487b2bf13d1b33e3f4950302eee497 SHA256 8fcfd5c867d2512bc693487bf4e712efa6b971287ae3183db29bd3addada03a8
+MISC ChangeLog 26388 RMD160 065c415b2d45c6ea45af2401e6b9f5d229c2cdfa SHA1 8141a53e26421d7403024596ba611dff61176579 SHA256 8fea94f8609de73461cf466e53a74196a74db1d7ffef7a6074c133baf1cbfde7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp+C5sACgkQ1fmVwcYIWAY3cgCgsoMtn//pEVda+88Qzi8IK747
-8G4AnRIVGrEEuR5+c2wez45jJUB1x39w
-=H4gy
------END PGP SIGNATURE-----
diff --git a/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff b/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff
new file mode 100644
index 000000000000..1f412a7d58cc
--- /dev/null
+++ b/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff
@@ -0,0 +1,20 @@
+diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
+index 9b6e8a8..1d3c0d8 100644
+--- a/libwnck/Makefile.am
++++ b/libwnck/Makefile.am
+@@ -129,13 +129,13 @@ wnck-enum-types.c: $(wnck_headers) wnck-enum-types.h
+ 	$(AM_V_GEN)glib-mkenums \
+ 		--fhead "#include <libwnck/libwnck.h>\n" \
+ 		--fprod "\n/* enumerations from \"@filename@\" */" \
+-		--vhead "static const GEnumValue _@enum_name@_values[] = {" \
++		--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+ 		--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+ 		--vtail "  { 0, NULL, NULL }\n};\n\n" \
+ 		--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
+ 		--vtail "  static GType type = 0;\n\n" \
+ 		--vtail "  if (!type)\n" \
+-		--vtail "    type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
++		--vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
+ 		--vtail "  return type;\n}\n\n" \
+ 		$(wnck_headers) > $@
+ 
diff --git a/x11-libs/libwnck/libwnck-2.26.2-r2.ebuild b/x11-libs/libwnck/libwnck-2.26.2-r2.ebuild
new file mode 100644
index 000000000000..7906496dd2b2
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-2.26.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.26.2-r2.ebuild,v 1.1 2009/08/09 18:58:10 ford_prefect Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc startup-notification"
+
+RDEPEND=">=x11-libs/gtk+-2.11.3
+	>=dev-libs/glib-2.16.0
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	dev-util/gtk-doc-am
+	gnome-base/gnome-common
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable startup-notification)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix automagic startup-notification, bug #278464
+	epatch "${FILESDIR}"/${P}-automagic.patch
+
+	# Fix glib-mkenum auto generation (bug #279832)
+	epatch "${FILESDIR}"/${P}-fix-glib-mkenums.diff
+	# required to force regeneration of wnck-enum-types.h
+	rm libwnck/wnck-enum-types.h
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	AT_M4DIR="m4" eautoreconf
+}