diff options
author | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-02-03 17:28:06 +0100 |
---|---|---|
committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-02-03 17:28:06 +0100 |
commit | 01bd5053ba9903e328973ba68a1488fc0587c1e1 (patch) | |
tree | 2a57f4d27ce47ed6f4a55a6b591e5e8edf7aa664 /x11-libs/xview | |
parent | Revert "Revert "sci-chemistry/ccpn numpy USE flag removed"" (diff) | |
download | sci-01bd5053ba9903e328973ba68a1488fc0587c1e1.tar.gz sci-01bd5053ba9903e328973ba68a1488fc0587c1e1.tar.bz2 sci-01bd5053ba9903e328973ba68a1488fc0587c1e1.zip |
x11-libs/xview bump and sci-chemistry/nmrpipe
Diffstat (limited to 'x11-libs/xview')
-rw-r--r-- | x11-libs/xview/ChangeLog | 133 | ||||
-rw-r--r-- | x11-libs/xview/Manifest | 8 | ||||
-rw-r--r-- | x11-libs/xview/files/CAN-2005-0076.patch | 29 | ||||
-rw-r--r-- | x11-libs/xview/files/lseek.diff | 26 | ||||
-rw-r--r-- | x11-libs/xview/files/lseek2.diff | 22 | ||||
-rw-r--r-- | x11-libs/xview/metadata.xml | 10 | ||||
-rw-r--r-- | x11-libs/xview/xview-3.2-r6.ebuild | 105 |
7 files changed, 333 insertions, 0 deletions
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog new file mode 100644 index 000000000..84009e26e --- /dev/null +++ b/x11-libs/xview/ChangeLog @@ -0,0 +1,133 @@ +# ChangeLog for x11-libs/xview +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 03 Feb 2009; justin Lecher (jlec) <jlec@j-schmitz.net> + xview-3.2-r6.ebuild, -xview-3.2-r7.ebuild, xview-3.2-r8.ebuild: + included fix from bug 245409 Thanks to pva + added to sci overlay + + 03 Nov 2008; justin Lecher <justin@j-schmitz.net> + +files/CAN-2005-0076.patch, +files/lseek.diff, +metadata.xml, + +xview-3.2-r6.ebuild: + Taken over + + 18 Jun 2008; Jeremy Olexa <darkside@gentoo.org> xview-3.2-r6.ebuild: + Add missing dep x11-misc/xbitmaps to xview. bug #227587 + + 21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml: + Fix up metadata.xml. If there's no maintainer for the package, the metadata + also needs to contain m-needed@g.o. + + 12 Sep 2007; Raúl Porcel <armin76@gentoo.org> -xview-3.2-r5.ebuild, + xview-3.2-r6.ebuild: + x86 stable wrt #192290 and remove old + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xview-3.2-r5.ebuild: + Drop virtual/x11 references. + + 01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: + Once again, with passion. + + 01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: + Regenerate digest to compensate Attic/ value in CVS header expansion. + + 01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +xview-3.2-r6.ebuild: + Revision bump to fix building when /usr/X11R6 is missing, see bug #149712 + and the long list of dupes. + + 29 Sep 2006; Olivier Fisette <ribosome@gentoo.org> xview-3.2-r5.ebuild: + Added missing dependency on imake. + + 01 Aug 2006; Olivier Fisette <ribosome@gentoo.org> -xview-3.2.ebuild, + -xview-3.2-r1.ebuild, -xview-3.2-r3.ebuild, -xview-3.2-r4.ebuild, + xview-3.2-r5.ebuild, -xview-3.2-r6.ebuild: + Backported fix for bug #67924 to the stable tree. Removed stale versions. + +*xview-3.2-r6 (01 Aug 2006) + + 01 Aug 2006; Olivier Fisette <ribosome@gentoo.org> +xview-3.2-r6.ebuild: + Added dependencies on Lucida Bright and Sun Cursor fonts. (Fixes bug + #67924.) These fonts are no longer provided by virtual/x11. + + 16 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; xview-3.2.ebuild, + xview-3.2-r1.ebuild, xview-3.2-r3.ebuild, xview-3.2-r5.ebuild: + Fix for gcc 4.1. (#120910) Look for imake in the right place, fix by Octavio + Ruiz. No rev bump, since both result in compilation failures. Port remaining + ebuilds to modular X. + +*xview-3.2-r5 (19 Feb 2006) + + 19 Feb 2006; Olivier Fisette <ribosome@gentoo.org> +files/lseek.diff, + +xview-3.2-r5.ebuild: + Fixed conflicting type declarations for lseek in libxview. + + 25 Jan 2006; Patrick McLean <chutzpah@gentoo.org> xview-3.2-r4.ebuild: + Fix dependencies for modular X. + + 25 Jan 2006; Patrick McLean <chutzpah@gentoo.org> xview-3.2.ebuild, + xview-3.2-r1.ebuild, xview-3.2-r3.ebuild, xview-3.2-r4.ebuild: + Mask on amd64 due to bug #108261. + + 14 Dec 2005; Joshua Jackson <tsunam@gentoo.org> xview-3.2-r4.ebuild: + Stable on x86; bug #115452 + +*xview-3.2-r4 (14 Aug 2005) + + 14 Aug 2005; Olivier Fisette <ribosome@gentoo.org> +xview-3.2-r4.ebuild: + Fixed bug #88001: xview no longer builds its own versions of msgfmt and + xgettext. + + 28 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> xview-3.2.ebuild, + xview-3.2-r1.ebuild, xview-3.2-r3.ebuild: + Removed from hppa (#78118). + + 01 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xview-3.2.ebuild, + xview-3.2-r1.ebuild, xview-3.2-r3.ebuild: + Mask alpha due to bug 78118. + + 17 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; + +files/CAN-2005-0076.patch, -xview-3.2-r2.ebuild: + Removed -r2 that did not work with xorg. Added -r3 that does not use the + debian patches and has a new HOMEPAGE and seems to be supported there. This + version from the new home still needed the CAN-2005-0076 patch. This was + tested with xorg 6.8.0-r4 and 6.8.2 on x86. + +*xview-3.2-r2 (17 Feb 2005) + + 17 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +xview-3.2-r2.ebuild: + Adding -r2 with debian patch to solve security problem reported in bug #78118. + + 16 Jan 2005; Guy Martin <gmsoft@gentoo.org> xview-3.2-r1.ebuild: + Stable on hppa. + + 28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 16 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> xview-3.2-r1.ebuild: + Stable on alpha. + + 18 Nov 2004; <pyrania@gentoo.org> xview-3.2-r1.ebuild: + Marked stable on x86. + +*xview-3.2-r1 (02 Oct 2004) + + 02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +xview-3.2-r1.ebuild: + Bump patches, new ebuild provided by genstef in #gentoo-bugs. + + 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xview-3.2.ebuild: + Stable on alpha. + + 30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml, xview-3.2.ebuild: + Added metadata.xml + + 30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> xview-3.2.ebuild: + Marking stable on hppa. + + 14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> xview-3.2.ebuild: + don't assign to PN; tidy + +*xview-3.2 (02 AUG 2003) + + 02 AUG 2003; Maarten Thibaut <murphy@gentoo.org> xview-3.2.ebuild : + Initial import. diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest new file mode 100644 index 000000000..92ddecd89 --- /dev/null +++ b/x11-libs/xview/Manifest @@ -0,0 +1,8 @@ +AUX CAN-2005-0076.patch 984 RMD160 46d0ff56c23b414bf566c27720aedfbaf7b0d8a7 SHA1 e64c6efe18525d3519dbb5453cd4211ac0b7b9b4 SHA256 f94cc69cc3156bf5c80b3fe920f2b505e3daac0cf598def8b0b763abc2d06813 +AUX lseek.diff 897 RMD160 c70b0ed6d846369a7dc1a1f4093186b6f51de64a SHA1 ddecf2527aa1b555b484e3da48fe6c03c7899b7b SHA256 4a0eb56dfadd48f839d2621804763d3dd550f978ac94500660f5cd45877da578 +AUX lseek2.diff 815 RMD160 008b5a039b5014b581d0699a3241142d2a019c1c SHA1 a1b6899ec1e77ce5888a3be6af49bb5b93bb1ce0 SHA256 077e3516cae73d8649b477250cf7f70c7c8f21ba36515f837a8a737d8501ead3 +DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e SHA1 f06eb2412e4d61dffaee7db436527d7933a50931 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba +DIST xview-3.2p1.4-19c.tar.gz 3350088 RMD160 6e0e90a737df7de8d30dbbd647527d599f13e8dd SHA1 1a2023945edef33ea4251fcb3b9e69bcf35a531c SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 +EBUILD xview-3.2-r6.ebuild 3630 RMD160 354aba1eefb98be96218800e60861a92a31e87d6 SHA1 b147c1fba7ab2d318af0fa574f968e944f774f3a SHA256 cd2b1eb82c556997fdbdd92baebef56118393b5ad6274434b2553e25cfe7493b +MISC ChangeLog 5022 RMD160 3fbdbd059b25f0eae2cebd5a9bedccec6d5a12ec SHA1 a157b30526742c77d9605399d65c01a910c489ea SHA256 e9123b0ae8a53056c7e862e1945c047d83e68a0ecb506414c679c4f7ebcd27f7 +MISC metadata.xml 273 RMD160 77dd0acbd8530bfceee840dfeccd1f4228e0460b SHA1 7c6794b74e4f357c0cd501266226eda09417d6ee SHA256 ed6f9e4b8aa59f68498bb75bf3be63a6de60feda167e4ceb12c7cb81bf8aac09 diff --git a/x11-libs/xview/files/CAN-2005-0076.patch b/x11-libs/xview/files/CAN-2005-0076.patch new file mode 100644 index 000000000..53952e100 --- /dev/null +++ b/x11-libs/xview/files/CAN-2005-0076.patch @@ -0,0 +1,29 @@ +--- lib/libxview/base/xv_parse.c~ 2005-01-15 17:11:54.000000000 +0100 ++++ lib/libxview/base/xv_parse.c 2005-01-15 17:20:23.000000000 +0100 +@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv) + if (argc <= slot->num_args) { + char dummy[128]; + +- (void) sprintf(dummy, ++ (void) snprintf(dummy, sizeof(dummy), + XV_MSG("%s: missing argument after %s"), + app_name, + argv[0]); +@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv) + if (defaults_lookup(argv[1], known_scales) == -1) { + char dummy[1024]; + +- (void) sprintf(dummy, ++ (void) snprintf(dummy, sizeof(dummy), + XV_MSG("%s: unknown scale \"%s\" used with %s option"), + app_name, argv[1], argv[0]); + xv_error(XV_NULL, +@@ -611,7 +611,7 @@ NegArg: + { + char dummy[128]; + +- (void) sprintf(dummy, ++ (void) snprintf(dummy, sizeof(dummy), + XV_MSG("%s: can't have negative argument %s after %s"), + app_name, argv[bad_arg], argv[0]); + xv_error(XV_NULL, diff --git a/x11-libs/xview/files/lseek.diff b/x11-libs/xview/files/lseek.diff new file mode 100644 index 000000000..6a9ea51e6 --- /dev/null +++ b/x11-libs/xview/files/lseek.diff @@ -0,0 +1,26 @@ +--- lib/libxview/textsw/es_file.c.old 2006-02-18 23:26:14.000000000 -0500 ++++ lib/libxview/textsw/es_file.c 2006-02-18 23:26:37.000000000 -0500 +@@ -119,9 +119,7 @@ + extern int errno, sys_nerr; + extern char *sys_errlist[]; + #endif +-#ifndef __CYGWIN__ +-extern long lseek(); +-#endif ++extern off_t lseek(); + + static void update_read_buf(); /* update the read buf if overlaps write buf */ + static Es_status es_file_commit(); +--- lib/libxview/sel/sel_agent.c.old 2006-02-18 23:17:33.000000000 -0500 ++++ lib/libxview/sel/sel_agent.c 2006-02-18 23:18:23.000000000 -0500 +@@ -314,9 +314,7 @@ + struct stat stat_buf; + int count, size; + char *destp; +-#ifndef __CYGWIN__ +- extern long lseek(); +-#endif ++ extern off_t lseek(); + if (fstat(fd, &stat_buf) != 0) { + perror(XV_MSG("Agent couldn't reply about a file")); + return SELN_FAILED; diff --git a/x11-libs/xview/files/lseek2.diff b/x11-libs/xview/files/lseek2.diff new file mode 100644 index 000000000..7f8715f78 --- /dev/null +++ b/x11-libs/xview/files/lseek2.diff @@ -0,0 +1,22 @@ +--- lib/libxview/textsw/es_file.c 1997-04-28 14:45:37.000000000 +0200 ++++ lib/libxview/textsw/es_file.c.new 2009-02-03 09:51:34.000000000 +0100 +@@ -114,7 +114,7 @@ + + extern int errno, sys_nerr; + extern char *sys_errlist[]; +-extern long lseek(); ++extern off_t lseek(); + + static void update_read_buf(); /* update the read buf if overlaps write buf */ + static Es_status es_file_commit(); +--- lib/libxview/sel/sel_agent.c 1997-06-19 22:45:57.000000000 +0200 ++++ lib/libxview/sel/sel_agent.c.new 2009-02-03 09:53:34.000000000 +0100 +@@ -309,7 +309,7 @@ + struct stat stat_buf; + int count, size; + char *destp; +- extern long lseek(); ++ extern off_t lseek(); + + if (fstat(fd, &stat_buf) != 0) { + perror(XV_MSG("Agent couldn't reply about a file")); diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml new file mode 100644 index 000000000..9b727ece3 --- /dev/null +++ b/x11-libs/xview/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>maintainer-wanted</herd> + <maintainer> + <email>jlec@j-schmitz.net</email> + <name>Justin Lecher (jlec)</name> + </maintainer> +</pkgmetadata> + diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild new file mode 100644 index 000000000..0d3849589 --- /dev/null +++ b/x11-libs/xview/xview-3.2-r6.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $ + +inherit eutils toolchain-funcs + +MY_PN="${P}p1.4-19c" +GCC_PATCHVER="0.1" + +DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations" +HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/" +LICENSE="XVIEW" +# We use the xview tarball available from the X organization, but xfree86 appears +# to be up and available more often so we use that (it's their primary mirror). +SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/src/${MY_PN}.tar.gz + mirror://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2" + # mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz + +SLOT="0" +IUSE="" +KEYWORDS="-alpha -amd64 ~ppc ~sparc ~x86" + +RDEPEND="x11-libs/libXpm + x11-proto/xextproto + media-fonts/font-bh-75dpi + media-fonts/font-sun-misc + x11-misc/xbitmaps" + +DEPEND="${RDEPEND} + app-text/rman + x11-misc/gccmakedep + x11-misc/imake" + +S=${WORKDIR}/${MY_PN} + +src_unpack() { + unpack ${A} + cd "${S}" + # This is our compound patch derived from debian. We use it because: + # * xview is a contribution made by Sun Microsystems (?) to the X community, + # but fixes for it don't appear to be around other than in the other free + # distributions. + # * It does little harm, only some defaults are changed which we can redefine + # anyway. + # + # SRC_PATCH="${PN}_3.2p1.4-16woody2.diff" + epatch "${FILESDIR}"/lseek.diff + epatch "${DISTDIR}"/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2 + + # Do not build xgettext and msgfmt since they are provided by the gettext + # package. Using the programs provided by xview breaks many packages + # including vim, grep and binutils. + sed -e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \ + -i util/Imakefile || die "gettext sed failed" + + # (#120910) Look for imake in the right place + sed -i -e 's:\/X11::' imake || die "imake sed failed" + + sed -i -e 's:/usr/X11R6:/usr:' "${S}/config/XView.cf" "${S}/Build-XView.bash" + + # Nasty hacks to force CC and CFLAGS + sed -e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \ + -e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-XView.bash + sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj + sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf + sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile +} + +src_compile() { + export OPENWINHOME="/usr" + export X11DIR="/usr" + + # This is crazy and I know it, but wait till you read the code in + # Build-XView.bash. + bash Build-XView.bash libs \ + || die "building libs failed" + bash Build-XView.bash clients \ + || die "building clients failed" + bash Build-XView.bash contrib \ + || die "building contrib failed" + bash Build-XView.bash olvwm \ + || die "building olvwm failed" +} + +src_install() { + export OPENWINHOME="/usr" + export X11DIR="/usr" + export DESTDIR="${D}" + + bash Build-XView.bash instlibs \ + || die "installing libs failed" + bash Build-XView.bash instclients \ + || die "installing clients failed" + bash Build-XView.bash instcontrib \ + || die "installing contrib failed" + bash Build-XView.bash instolvwm \ + || die "installing olvwm failed" + cd "${D}"/usr + + # The rest of the docs is already installed + cd "${S}"/doc + dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt \ + dnd_api.txt whats_new.ps + rm -rf "${D}"/usr/X11R6/share/doc/xview && rm -rf "${D}"/usr/X11R6/share/doc +} |