summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-07-21 16:30:05 +0000
committerPacho Ramos <pacho@gentoo.org>2012-07-21 16:30:05 +0000
commitdf2b865044237805eed477fd5224fdd7a7d4afa1 (patch)
tree1b1c5d5632c389dd82fc6005f5c0ae29b73d89cf /gpe-base
parentamd64/ppc/ppc64 stable wrt #416725 (diff)
downloadhistorical-df2b865044237805eed477fd5224fdd7a7d4afa1.tar.gz
historical-df2b865044237805eed477fd5224fdd7a7d4afa1.tar.bz2
historical-df2b865044237805eed477fd5224fdd7a7d4afa1.zip
Let it compile against glib-2.32
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'gpe-base')
-rw-r--r--gpe-base/libgpewidget/ChangeLog8
-rw-r--r--gpe-base/libgpewidget/Manifest27
-rw-r--r--gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch12
-rw-r--r--gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild6
4 files changed, 31 insertions, 22 deletions
diff --git a/gpe-base/libgpewidget/ChangeLog b/gpe-base/libgpewidget/ChangeLog
index 21930d67453d..0baceda2b122 100644
--- a/gpe-base/libgpewidget/ChangeLog
+++ b/gpe-base/libgpewidget/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gpe-base/libgpewidget
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/ChangeLog,v 1.11 2012/05/23 13:11:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/ChangeLog,v 1.12 2012/07/21 16:30:05 pacho Exp $
+
+ 21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+ +files/libgpewidget-0.117-glib-single-include.patch,
+ libgpewidget-0.117-r1.ebuild:
+ Let it compile against glib-2.32
23 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
libgpewidget-0.117-r1.ebuild:
@@ -46,4 +51,3 @@
28 Feb 2009; <solar@gentoo.org> +metadata.xml, +libgpewidget-0.117.ebuild:
Initial commit based on code from Rene Wagner
-
diff --git a/gpe-base/libgpewidget/Manifest b/gpe-base/libgpewidget/Manifest
index 1660931b3a1d..60496d8cf52a 100644
--- a/gpe-base/libgpewidget/Manifest
+++ b/gpe-base/libgpewidget/Manifest
@@ -1,25 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX libgpewidget-0.117-linguas.patch 1000 RMD160 9afd0b9948c200444698c8bb1a6fdb6827acb38f SHA1 3cb2224869f936260c8f80bc58092b96ce7f8369 SHA256 aa283f348a31f7f3af27545043edc12f258356fa6218bc74f25fc4199e45df40
-DIST libgpewidget-0.117.tar.bz2 405347 RMD160 d0f206f3e3629b0c6927d6ae06e8a42def3cb58c SHA1 15783ca1f33eaa8d52e99be39692f69d2993aabd SHA256 f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c
-EBUILD libgpewidget-0.117-r1.ebuild 994 RMD160 48bf39da7b70b54a2cf2b580e99e48893fd7016e SHA1 3a362a19bce8fa21a853c031de78f9ec972f4985 SHA256 800745f0793fc920818ddc19295345a1e335b89a756c4ab21822ec535d62ac93
-MISC ChangeLog 1635 RMD160 7c45b7a77a71e3eb509cb191733b0921e2434dc3 SHA1 3e6fa09f563996dc5f947e22a3dead851b36db1e SHA256 cbe3814e2d759eb5bc715889b9748b8c90ec82543dd0fd48378fbd8fe2fbb0a6
-MISC metadata.xml 214 RMD160 bca5b2208a68a7a7a84355f818a615e04dcb3ca8 SHA1 d0f048fbc4c361e89505f6edb1ddda27bbc7d73e SHA256 7b5eab127a5e896980df3a9aa01494e608a8a701ae9c5478255bff89d46410af
+AUX libgpewidget-0.117-glib-single-include.patch 336 SHA256 18a3bc7664b60c70bc4a804fea072fa9e6cfd823c19be3b78bc1446de83fcaba SHA512 56192a2488a17c4375060eaa883c0cfe3f62a2a8cb318cd991ae044f579adcd43621749ba32a30ee43e1f2dd677f5e73eb40223dd5a390cb1d569bad46cf5b1a WHIRLPOOL ff44fa34dfbbd77021cf5c0890434b4938db355f85771acfdda73b30fb1f54ab75e24d3d7848877913f6a57703965bd47f8bb9f5a40de0594bd54608bff9f53d
+AUX libgpewidget-0.117-linguas.patch 1000 SHA256 aa283f348a31f7f3af27545043edc12f258356fa6218bc74f25fc4199e45df40 SHA512 863ee07779828d53654da07ca7cbfcc9d9754582190718327638f3c0130fbb78a428a4ce61b11f6f2c87cb5748cf3019c7c81cc68408e3c417058a217d7073e8 WHIRLPOOL e7dbc3d7b72a1b79a2bae407cb6b2f391f1a44cb8d85348f5a5d34270bfa648227e210a6e461f6a5c12efa722eaedaaee76dea4c51d7d30184c4ede271265dee
+DIST libgpewidget-0.117.tar.bz2 405347 SHA256 f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c SHA512 f2e9ec64ad90ee028fe2fc7358336ee98b78e2ad07fb12fe1ecc3be00dddeb49cfd8204569e808426c0420d59e174cb0b59a53f57ace2637fe3d13012a23217f WHIRLPOOL 49996331bdbdc9255918c189480b74d7cc693c1fa0af8c159420329e7f0fa87a7fa0e82bf6351d0ca6143799b8fbd28c32538f5c8a0cbbd512e7fd2a6da2101d
+EBUILD libgpewidget-0.117-r1.ebuild 1044 SHA256 b2a2133794102ef5d0e659613690ea429856d21f26b573363da9d74c519c337b SHA512 7d04c7328ac577729c12824e61c03caa7d5dcebd678cdc293b1f0a515ff73db85cba448d1692364a6a2679d55a253024ca6e722da60e9d9ebfb456dd12927694 WHIRLPOOL 0f5a466703e4fbba68f424428d750823d38a4851ce4c32a7a1b966f25c2b5fbbc9a0c55054716b7986e0b32218dac508ab9d44ca157758fc698067d6957b8846
+MISC ChangeLog 1798 SHA256 19b933c6541cb488955f47eef04035ebcb5e22bf6163ff8265b687bb3a4421c3 SHA512 aca6eb486238b1e106230d1e49751582b0e3c7dd5c0dec7500a4165cbcf685f3e1a0c10545352cf214d37ff20e078e5bced38baa05f73bfeb8a027471b451f1c WHIRLPOOL 97a2af5af81ae59e922f0e61feb98d1076071b1ed559342a1fee1686af49227b664cf9581f449357076cacaf5388b464377b7dd45bd9fcde28d59c24e250be09
+MISC metadata.xml 214 SHA256 7b5eab127a5e896980df3a9aa01494e608a8a701ae9c5478255bff89d46410af SHA512 3c215c779c0bff57a855a70529d0a8803341bce41fa441617b115c99fb3df537fdb4c01a61cbc33eb1231847bc0929e1e757ca59a85f17f25ef931ed8ff892d0 WHIRLPOOL 844dc69984982eb1729248312da3fa136597f46a93fea2180767f50be700b1011c9feb859e20b7bb1d10be96767a3849ab314f48f12f9ce6a927b87e86029b4d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJPvOInAAoJEF0huFKJUZL5Ks4P/R9Fl9FcQhvnZvaL91aUsk+9
-2Pd4pSa49lbgcFK4fKCHngEHE/+gEKhU61HzPyYHfAOa9/jNR9cPZww4zpZdJ3J/
-Es6ZIMTJApPm1s4F4Wo89ngzE1+oNwbXf3OESX1gb35ak8m+6L0b23NixtBXCfyu
-2wbSjWQywJZ2zVSzEEjO8B44HBzF3DE3CCZjwGqKx8ruadfMP0rQ/NdiVaXIS4x2
-ETsDNyq+NW4Im+sSCQVk3lUti1HGyWSg2AOHpFj4RhacE5cb8GJZuax/pwssLXZi
-BJwBO0R/TSwIIJ65y/vMJuaS4PX/AUoMHpQhpIisSXo3+woWn6CPIKQq5jND+s0x
-Syavja5TlLQQrT6fgm00KgcClz5SX12CqieH2US/I0DWP6KfY+qRQb7Ilao8sy/R
-Jir4iQWQPI6BjZFXGIDosLKSMApBG6zl+pTMd10tXHV44NVmDwXYHbkarJKR1oj0
-gPFLbX27C/5KDBsZC5SmV5nZhDsuAjBcJX8n9PqGTm6ud/bIzcgsA2ei3plzEz3d
-sP1Jb1fSLjxRGtov5pUK0gCmNuDXoykFw6oQmwB7XTJ8BgkMB2fAItbcQ0uCLyaV
-Cv+rNYjGl0Ir1PlWM9cJ1k9djWhfhEJ6obMoLgGixYlzHFGFOHw9ckhO0ME9/lxj
-vAFBVKZk5OAUYNGnwrOr
-=LLvE
+iEYEAREIAAYFAlAK2RIACgkQCaWpQKGI+9RneACePiKorusW7GfLIkf2DJICe2b8
+Tt4An0j1V5K+to+E4zQgRNg968dBfAsN
+=qtJ8
-----END PGP SIGNATURE-----
diff --git a/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch b/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch
new file mode 100644
index 000000000000..cfac0b9b217c
--- /dev/null
+++ b/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch
@@ -0,0 +1,12 @@
+Index: libgpewidget-0.117/gpehelp.c
+===================================================================
+--- libgpewidget-0.117.orig/gpehelp.c
++++ libgpewidget-0.117/gpehelp.c
+@@ -33,7 +33,6 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdk.h>
+ #include <glib.h>
+-#include <glib/gkeyfile.h>
+
+
+ /* helper function definitions*/
diff --git a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
index 01348c734547..5869a09947ff 100644
--- a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
+++ b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.9 2012/05/23 13:11:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.10 2012/07/21 16:30:05 pacho Exp $
-EAPI=2
+EAPI=4
GPE_TARBALL_SUFFIX="bz2"
inherit gpe autotools eutils
@@ -38,6 +38,8 @@ src_prepare() {
# Fix LINGUAS bug #406419
epatch "${FILESDIR}/${P}-linguas.patch"
+ epatch "${FILESDIR}/${P}-glib-single-include.patch"
+
# Fix underlinking, bug #367421
sed -i -e 's/^infoprint_LDADD =/infoprint_LDADD = -lX11/' Makefile.am \
|| die 'Failed to sed Makefile.am'