summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2009-07-26 20:52:01 +0000
committerRyan Hill <rhill@gentoo.org>2009-07-26 20:52:01 +0000
commitcdd01fb2f9a43d4e0e762bfb5ce69fb6cdde9740 (patch)
treeb413976eb43d563665559403060be01e4c66bad7 /x11-wm/selectwm
parentFixed homepage, closes bug 279138. (diff)
downloadhistorical-cdd01fb2f9a43d4e0e762bfb5ce69fb6cdde9740.tar.gz
historical-cdd01fb2f9a43d4e0e762bfb5ce69fb6cdde9740.tar.bz2
historical-cdd01fb2f9a43d4e0e762bfb5ce69fb6cdde9740.zip
Fix building with glibc-2.10 (bug #273994).
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/selectwm')
-rw-r--r--x11-wm/selectwm/ChangeLog8
-rw-r--r--x11-wm/selectwm/Manifest13
-rw-r--r--x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch21
-rw-r--r--x11-wm/selectwm/selectwm-0.4.1.ebuild5
4 files changed, 37 insertions, 10 deletions
diff --git a/x11-wm/selectwm/ChangeLog b/x11-wm/selectwm/ChangeLog
index 97bcfaf52e2d..5260d93436f5 100644
--- a/x11-wm/selectwm/ChangeLog
+++ b/x11-wm/selectwm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/selectwm
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.21 2008/07/19 09:54:33 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.22 2009/07/26 20:52:01 dirtyepic Exp $
+
+ 26 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> selectwm-0.4.1.ebuild,
+ +files/selectwm-0.4.1-glibc-2.10.patch:
+ Fix building with glibc-2.10 (bug #273994).
19 Jul 2008; Alexis Ballier <aballier@gentoo.org> selectwm-0.4.1.ebuild:
keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index e834c51e4e90..7fdbbb5d4965 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 RMD160 2c5d5cc65f63bc91680cab64e2a48b4d165b5a0b SHA1 788f2dd02af53ae0db464e2ab3d4ae3c776edd5b SHA256 aef7b2dcf51b9fba19bf70b18537889fa08b600e23602764cf5542ffcaa3c5e0
+AUX selectwm-0.4.1-glibc-2.10.patch 677 RMD160 cce084071e44e37ff11d732c3426437a428cc1fa SHA1 a3cd8eaaf9b251b2b7f419e80849fdb662461aca SHA256 104aed065fe00c6ebfd1fb025f13da2366beabc053ab1e0780c276db9ac9d10f
DIST selectwm-0.4.1.tar.bz2 151454 RMD160 a324ade84ee85bc3fc60e2fbe273fefebc284043 SHA1 90969d27dd50ed3b860d556cc202c54bff6d567e SHA256 5ba49d5303f6613b829c88098b29b78e3d555d3a69a5c88a73aa4deaf82729a4
-EBUILD selectwm-0.4.1.ebuild 839 RMD160 b8fb60774d35e8c8a7bc3a4ba7168686fdb9d4a2 SHA1 41bb4eaeff30c8d129948c998ce3a06a965499cf SHA256 cb550c01e158c891c1013a57ea0674e13afc3a505b59e5528e8f4e38469d7736
-MISC ChangeLog 2261 RMD160 4d7ffe09fe6abf83def61d8b332e1f86ee6db392 SHA1 5a1199f01d4f842a845f5e50b0d85f56f887adbd SHA256 b9ea51159dd008eece1380a19eaafd3ada0333d80a1e6e6e8f9dfe096704aec8
+EBUILD selectwm-0.4.1.ebuild 885 RMD160 28981809006c246f9e5138f6fde84fcf98a49eb4 SHA1 eb0de214c417c74ba1ddd429af162345069ef955 SHA256 881a43a501e85a7b3933a03e414ba6ee2f058da2c1d4a97cb16fe9ffe5c008f8
+MISC ChangeLog 2422 RMD160 62aa37935c6e9bd82ab20d5c0eb0b39022f1382c SHA1 5fe282727dafb3c05f1ba44767844b2ec26c8cb8 SHA256 b273f715f60bda8891c3f13618213e639e6288c951e69b6632785fe5575c0d3e
MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkiBueAACgkQvFcC4BYPU0qvRACeJgtTA0/at7ZOoFyvHaXeMVAQ
-Y2EAoIadxL96u03a8h75sPNt6Q9D7A5r
-=AGhx
+iEYEARECAAYFAkpswhUACgkQiqiDRvmkBmJQ7QCfVv+Penyqhgdrpv2x+bQVM+yl
+zkkAoNJkrRoVwWUNqcLIpI7KTe8kEVIj
+=xgzw
-----END PGP SIGNATURE-----
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch
new file mode 100644
index 000000000000..4353d5e36662
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -Naurp selectwm-0.4.1-orig/src/options.c selectwm-0.4.1/src/options.c
+--- selectwm-0.4.1-orig/src/options.c 2009-07-26 14:46:44.092880624 -0600
++++ selectwm-0.4.1/src/options.c 2009-07-26 14:46:11.484940363 -0600
+@@ -32,7 +32,7 @@
+ #include "miscui.h"
+ #include "modify.h"
+
+-static GString *getline (FILE *fichier) {
++static GString *selectwm_getline (FILE *fichier) {
+ GString *temp;
+ gchar buf[128];
+
+@@ -64,7 +64,7 @@ static gint read_config_file (config *se
+ }
+ buf = g_string_new ("");
+ while (!feof (config)) {
+- buf = getline (config);
++ buf = selectwm_getline (config);
+
+ if (buf->len > 0 && buf->str[0] != '#') {
+ if (g_strrstr (buf->str, ":")) {
diff --git a/x11-wm/selectwm/selectwm-0.4.1.ebuild b/x11-wm/selectwm/selectwm-0.4.1.ebuild
index 91bc2e845b20..82165fa4ab5d 100644
--- a/x11-wm/selectwm/selectwm-0.4.1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.9 2008/07/19 09:54:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.10 2009/07/26 20:52:01 dirtyepic Exp $
inherit eutils
@@ -22,6 +22,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-enable-deprecated-gtk.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
}
src_compile() {