Fix bug 106132.
authorKrzysztof Pawlik <nelchael@gentoo.org>
Tue, 27 Sep 2005 20:41:42 +0000 (20:41 +0000)
committerKrzysztof Pawlik <nelchael@gentoo.org>
Tue, 27 Sep 2005 20:41:42 +0000 (20:41 +0000)
Package-Manager: portage-2.0.52-r1

x11-misc/xplore/ChangeLog
x11-misc/xplore/Manifest
x11-misc/xplore/files/xplore-1.2a-strerror.patch [new file with mode: 0644]
x11-misc/xplore/xplore-1.2a.ebuild

index 6137f1735ddb00fe0d44fb793a02ee8a0aec4543..49f952883db5a3d772a7a7bf4a6260d800b236f3 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xplore
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.5 2004/06/24 22:43:34 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.6 2005/09/27 20:41:42 nelchael Exp $
+
+  27 Sep 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xplore-1.2a-strerror.patch, xplore-1.2a.ebuild:
+  Fix bug 106132.
 
   11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> xplore-1.2a.ebuild:
   Ebuild fixups.
index 45e9c3e5e448cd4c66e3880df65c649298801f89..ab1dd7ed9b2fd02acab9818b1084f5bdf3145ea8 100644 (file)
@@ -1,8 +1,9 @@
-MD5 e1d3185b9b8c0c3d7b126667846fb338 xplore-1.2a.ebuild 1150
+MD5 19696fb128e442fab57548639bc5a6ba xplore-1.2a.ebuild 1237
 MD5 e64a602d10df64a786000a7d1e2f86d2 xplore-1.1-r1.ebuild 1139
-MD5 7c80125bfe42b649493e091c4cbaf50b ChangeLog 1703
+MD5 22ed79f6a2cbd75fdc59b6aae5112233 ChangeLog 1832
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 c3740ae4dcaa74dfe0ef30a2f9605435 xplore-1.1e.ebuild 1150
 MD5 d81a9d6cffc3f9e5bbfd3c30fc5befb0 files/digest-xplore-1.1-r1 63
+MD5 bb06198110311b73c51873cb2c72632d files/xplore-1.2a-strerror.patch 643
 MD5 443aaa2db2102227b3880e7a74d7cd23 files/digest-xplore-1.1e 64
 MD5 8e9d553f8c4cf7c2f33d108428abd8e7 files/digest-xplore-1.2a 64
diff --git a/x11-misc/xplore/files/xplore-1.2a-strerror.patch b/x11-misc/xplore/files/xplore-1.2a-strerror.patch
new file mode 100644 (file)
index 0000000..bb93893
--- /dev/null
@@ -0,0 +1,20 @@
+diff -urp xplore-1.2a/error.c xplore-1.2a.strerror/error.c
+--- xplore-1.2a/error.c        2002-05-01 09:59:23 -0500
++++ xplore-1.2a.strerror/error.c       2005-09-06 06:14:53 -0500
+@@ -65,14 +65,12 @@ void xplerr2(int err, String s1, String 
+     pxplerr(msg);
+ }
+ 
+-extern const char *const sys_errlist[];
+-
+ static void psyserr(String s)
+ {
+   if (errno) {
+     String msg = (String) alloca(strlen(errmsg[ERR_SYS])+strlen(s)+
+-                               strlen(sys_errlist[errno]));
+-    sprintf(msg, errmsg[ERR_SYS], s, sys_errlist[errno]);
++                               strlen(strerror(errno)));
++    sprintf(msg, errmsg[ERR_SYS], s, strerror(errno));
+     pxplerr(msg);
+   } else
+     pxplerr(s);
index f17c202586e1d55b427e25b6c40f426ad2c640ba..8ffdd2734e8031d88ec67426e40a756fd3b905a8 100644 (file)
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.5 2004/06/24 22:43:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.6 2005/09/27 20:41:42 nelchael Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -16,6 +18,11 @@ KEYWORDS="x86"
 DEPEND="virtual/x11
        x11-libs/openmotif"
 
+src_unpack() {
+       unpack ${A}
+       epatch ${FILESDIR}/${P}-strerror.patch
+}
+
 src_compile() {
        #Fix Xplore.tmpl so installation is to /usr instead of /usr/X11R6
        #Note: LIBDIR is used to point to X11 tree.