aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 15:29:56 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 15:29:56 +0200
commit1aec0b1a2910a326832bccfe6b5151991c21f6b9 (patch)
treea954b8fc64a2ac831bc19c2e3c60519fcb174148 /x11-libs
parentlibjwc update to 6.1.2 and as-needed fix (diff)
downloadsci-1aec0b1a2910a326832bccfe6b5151991c21f6b9.tar.gz
sci-1aec0b1a2910a326832bccfe6b5151991c21f6b9.tar.bz2
sci-1aec0b1a2910a326832bccfe6b5151991c21f6b9.zip
x11-libs/libjwc_cfixed the fix
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libjwc_c/Manifest4
-rw-r--r--x11-libs/libjwc_c/files/612-gentoo.patch20
-rw-r--r--x11-libs/libjwc_c/files/libjwc_c-1.1_p6.1.2.patch244
-rw-r--r--x11-libs/libjwc_c/libjwc_c-1.1-r1.ebuild5
4 files changed, 26 insertions, 247 deletions
diff --git a/x11-libs/libjwc_c/Manifest b/x11-libs/libjwc_c/Manifest
index 50eab9c3a..7eb1ede73 100644
--- a/x11-libs/libjwc_c/Manifest
+++ b/x11-libs/libjwc_c/Manifest
@@ -1,5 +1,5 @@
-AUX libjwc_c-1.1_p6.1.2.patch 7594 RMD160 4cdcec993e911970b68bf615faa4a08abe148f68 SHA1 fef51ef87799875194ad9bd96e278cb0e1cbb344 SHA256 780a6472ead0b76c7dadca5796e7fb3ee17d7536033a2d64278337ca8c15b89a
+AUX 612-gentoo.patch 804 RMD160 69c659d6e251b69740f72b229f24f1aa75ec5364 SHA1 c58d82b1d561fbd681bf9c98d19911e76b76054f SHA256 7772a77657832119f6051cf63185d46533004e4d612a7e089dba8b1ae85a92de
DIST libjwc_c-1.1.tar.gz 253637 RMD160 a7cee4a3509f51720d0061d7134eb7fdbdccdea7 SHA1 5f689410136194d2972994fa2e78468dee6833a9 SHA256 4e3c5406347356ac4549b2b977c8011391926470cc3556e54148070b929d9ea9
-EBUILD libjwc_c-1.1-r1.ebuild 467 RMD160 60fe3249fa6bcbbad86417478f052f91a83002a4 SHA1 0d0b7ab120ca15c33af07f8462e4c29d19c29fe6 SHA256 69de2753b983dc1d33542a2b4f65fd9469335d5adcc8bebbc4c92bb487544e04
+EBUILD libjwc_c-1.1-r1.ebuild 531 RMD160 ed6856ff72975825a02c5710df1d286336d8b8b2 SHA1 6db3212de3de1113035e6fb4956cc6517df2051b SHA256 def84279f6886757876fc235bb19624565392b8754955c90baede6c7e6d34d39
MISC ChangeLog 453 RMD160 a809f9f4991e83cb8fa019548a4b981d339fde0d SHA1 0ea117d7c797bc3b226af92f91eec8a9501d17a9 SHA256 9248d5a01efe40e8c3c65e34a6637870777919f910ab0b011acc75201427ef41
MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/x11-libs/libjwc_c/files/612-gentoo.patch b/x11-libs/libjwc_c/files/612-gentoo.patch
new file mode 100644
index 000000000..af4a691fe
--- /dev/null
+++ b/x11-libs/libjwc_c/files/612-gentoo.patch
@@ -0,0 +1,20 @@
+diff -Nu libjwc_c-1.1/imglib.c libjwc_c/imglib.c
+--- libjwc_c-1.1/imglib.c 1999-08-17 15:58:11.000000000 +0200
++++ libjwc_c/imglib.c 2004-06-03 14:24:05.000000000 +0200
+@@ -4259,7 +4259,7 @@
+ {
+
+ /* Note: In this routine the first local axis is called 'x' and the
+- second logal axi is called 'y' */
++ second local axis is called 'y' */
+
+ int mxcent; /* Current max no. of elements in active
+ spots array */
+@@ -4469,6 +4469,7 @@
+
+ /* skipping condition */
+
++ iymid = (actspots[j].iyend+actspots[j].iybeg)/2;
+ itmp = abs(iymid-actspots[j].iycent);
+ if (abs((actspots[j].iyend+actspots[j].iybeg) -(iel+ibl))>
+ abs((actspots[j].iyend-actspots[j].iybeg) +(iel-ibl))&&
diff --git a/x11-libs/libjwc_c/files/libjwc_c-1.1_p6.1.2.patch b/x11-libs/libjwc_c/files/libjwc_c-1.1_p6.1.2.patch
deleted file mode 100644
index 7580cf41e..000000000
--- a/x11-libs/libjwc_c/files/libjwc_c-1.1_p6.1.2.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/configure.in libjwc_c-1.1/configure.in
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/configure.in 2008-10-27 17:30:56.000000000 +0100
-+++ libjwc_c-1.1/configure.in 1999-10-22 18:41:57.000000000 +0200
-@@ -1,6 +1,3 @@
--dnl Copyright 1996-1999, CLRC Daresbury Laboratory.
--dnl For licence conditions, see the file COPYING in the distribution.
--
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(kdm.c)
-
-@@ -10,8 +7,9 @@
-
- AC_CANONICAL_SYSTEM
-
--AM_INIT_AUTOMAKE([libjwc], 1.1)
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE([libjwc_c], 1.1)
-+
-+dnl AM_MAINTAINER_MODE
-
- case ${with_gcc} in
- "yes" ) CC="gcc" GCC=yes ;;
-@@ -21,20 +19,13 @@
-
- AC_PROG_CC
- if test "$ac_cv_prog_CC" = gcc; then
-- # assume using gcc implies g77 too
- AC_DEFINE(__G77__)
- fi
--AC_PROG_LIBTOOL
-+AC_PROG_RANLIB
- AC_PROG_INSTALL
-
--AC_PATH_X
--
--# Ensure POSIXism is available.
--AC_DEFINE(_POSIX_SOURCE)
--
--AC_CHECK_HEADERS(stdlib.h unistd.h string.h)
--
--AC_CHECK_HEADERS(prl.h unq.h)
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
-
- case "$target" in
- # Define __STDC__=1 to avoid warnings from maths functions. Also get
-@@ -48,12 +39,12 @@
- if test "$CC" = cc; then
- case "$CFLAGS" in
- *-64* ) ;; # assume they meant it
-- *-o32* | *-32* ) ;; # presumably OK
-- *-n32* ) ;;
-- * ) CFLAGS="$CFLAGS -n32"
-+ *-o32* | *-32*) ;; # presumably OK
-+ * ) CFLAGS="$CFLAGS -32"
-+ LDFLAGS="$LDFLAGS -32"
- AC_MSG_WARN([
-
--*** Using compiler flag -n32 for probable compatibility with
-+*** Using compiler flag -o32 for probable compatibility with
- *** the CCP4 library. You should check this, and re-run configure
- *** specifying an appropriate value of CFLAGS if necessary.
- *** See the INSTALL file for how to do so.
-@@ -73,13 +64,6 @@
- esac
-
- dnl Do this _after_ setting compiler flags, specifically for Irix ABI.
--
--ac_cpp="$ac_cpp -I."
--ac_compile="$ac_compile -I."
--
--
- AM_PROG_LIBTOOL
-
--AM_CONDITIONAL(DEBUG, test "$ac_cv_enable_debug" = yes)
--
- AC_OUTPUT(Makefile)
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/dml_systyp.h libjwc_c-1.1/dml_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/dml_systyp.h 2005-01-24 17:33:26.000000000 +0100
-+++ libjwc_c-1.1/dml_systyp.h 1999-09-08 18:28:38.000000000 +0200
-@@ -15,7 +15,7 @@
-
- /* Define Link name mapping type:
-
-- LINKTYP = 1 Sun, Convex fx2800-alliant AIX ...
-+ LINKTYP = 1 Sun, Convex fx2800-alliant ...
-
- xdlf_name called as xdlf_name_
-
-@@ -23,7 +23,7 @@
-
- xdlf_name called as XDLF_NAME
-
-- LINKTYP = 3 Vax, hpux, ...
-+ LINKTYP = 3 Vax, hpux, AIX ...
-
- xdlf_name called as xdlf_name
- */
-@@ -75,8 +75,8 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
--# define LINKTYP 1
-+#if defined(AIX) || defined (_AIX)
-+# define LINKTYP 3
- #endif
-
- #ifdef __G77__
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/fft_1d_systyp.h libjwc_c-1.1/fft_1d_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/fft_1d_systyp.h 2005-01-24 17:33:26.000000000 +0100
-+++ libjwc_c-1.1/fft_1d_systyp.h 1999-09-08 16:18:59.000000000 +0200
-@@ -18,7 +18,7 @@
-
- /* Define Link name mapping type:
-
-- LINKTYP = 1 Sun, Convex fx2800-alliant AIX ...
-+ LINKTYP = 1 Sun, Convex fx2800-alliant ...
-
- xdlf_name called as xdlf_name_
-
-@@ -26,7 +26,7 @@
-
- xdlf_name called as XDLF_NAME
-
-- LINKTYP = 3 Vax, hpux, ...
-+ LINKTYP = 3 Vax, hpux, AIX ...
-
- xdlf_name called as xdlf_name
- */
-@@ -78,8 +78,8 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
--# define LINKTYP 1
-+#if defined(AIX) || defined (_AIX)
-+# define LINKTYP 3
- #endif
-
- #ifdef __G77__
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/imglib.c libjwc_c-1.1/imglib.c
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/imglib.c 2004-06-03 14:24:05.000000000 +0200
-+++ libjwc_c-1.1/imglib.c 1999-08-17 15:58:11.000000000 +0200
-@@ -4259,7 +4259,7 @@
- {
-
- /* Note: In this routine the first local axis is called 'x' and the
-- second local axis is called 'y' */
-+ second logal axi is called 'y' */
-
- int mxcent; /* Current max no. of elements in active
- spots array */
-@@ -4469,7 +4469,6 @@
-
- /* skipping condition */
-
-- iymid = (actspots[j].iyend+actspots[j].iybeg)/2;
- itmp = abs(iymid-actspots[j].iycent);
- if (abs((actspots[j].iyend+actspots[j].iybeg) -(iel+ibl))>
- abs((actspots[j].iyend-actspots[j].iybeg) +(iel-ibl))&&
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/imglib_systyp.h libjwc_c-1.1/imglib_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/imglib_systyp.h 2005-01-24 17:33:26.000000000 +0100
-+++ libjwc_c-1.1/imglib_systyp.h 1999-09-08 18:27:49.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/kdm_systyp.h libjwc_c-1.1/kdm_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/kdm_systyp.h 2005-01-24 17:34:22.000000000 +0100
-+++ libjwc_c-1.1/kdm_systyp.h 1999-09-08 18:29:39.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/lirl_systyp.h libjwc_c-1.1/lirl_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/lirl_systyp.h 2005-01-24 17:43:02.000000000 +0100
-+++ libjwc_c-1.1/lirl_systyp.h 1999-09-08 18:29:55.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/Makefile.am libjwc_c-1.1/Makefile.am
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/Makefile.am 2003-03-07 16:40:14.000000000 +0100
-+++ libjwc_c-1.1/Makefile.am 1999-08-17 13:37:37.000000000 +0200
-@@ -6,7 +6,3 @@
- prl.h prl_systyp.h rdm.h rdm_systyp.h unq.h unq_systyp.h
-
- libjwc_c_la_LDFLAGS = -version-info 1:1:1
--
--if DEBUG
--AM_CFLAGS = -g -DDEBUG
--endif
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/prl_systyp.h libjwc_c-1.1/prl_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/prl_systyp.h 2005-01-24 17:34:23.000000000 +0100
-+++ libjwc_c-1.1/prl_systyp.h 1999-09-08 18:30:24.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/rdm_systyp.h libjwc_c-1.1/rdm_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/rdm_systyp.h 2005-01-24 17:34:23.000000000 +0100
-+++ libjwc_c-1.1/rdm_systyp.h 1999-09-08 18:30:39.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
-diff -Nu ccp4-6.1.2/x-windows/libjwc/libjwc_c/unq_systyp.h libjwc_c-1.1/unq_systyp.h
---- ccp4-6.1.2/x-windows/libjwc/libjwc_c/unq_systyp.h 2005-01-24 17:34:23.000000000 +0100
-+++ libjwc_c-1.1/unq_systyp.h 1999-09-08 18:30:52.000000000 +0200
-@@ -75,7 +75,7 @@
- # define LINKTYP 3
- #endif
-
--#if defined(AIX) || defined (_AIX) || defined (___AIX)
-+#if defined(AIX) || defined (_AIX)
- # define LINKTYP 3
- #endif
-
diff --git a/x11-libs/libjwc_c/libjwc_c-1.1-r1.ebuild b/x11-libs/libjwc_c/libjwc_c-1.1-r1.ebuild
index e9c486304..71033f5c3 100644
--- a/x11-libs/libjwc_c/libjwc_c-1.1-r1.ebuild
+++ b/x11-libs/libjwc_c/libjwc_c-1.1-r1.ebuild
@@ -4,7 +4,9 @@
EAPI="2"
-inherit autotools
+inherit autotools eutils
+
+PATCH="612"
DESCRIPTION="additional c library for ccp4"
HOMEPAGE="http://www.ccp4.ac.uk/main.html"
@@ -16,6 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
+ epatch "${FILESDIR}"/${PATCH}-gentoo.patch
rm missing || die
eautoreconf
}