summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-05-23 04:51:54 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-05-23 04:51:54 +0000
commitb7a281ce36208ff9ba1e2ea1333dc0dd76c270a2 (patch)
treeb0c05d781a6da1022673cbb8f63a1a08e17d8cc8 /dev-libs/zziplib/files
parentStable for HPPA (bug #266986). (diff)
downloadhistorical-b7a281ce36208ff9ba1e2ea1333dc0dd76c270a2.tar.gz
historical-b7a281ce36208ff9ba1e2ea1333dc0dd76c270a2.tar.bz2
historical-b7a281ce36208ff9ba1e2ea1333dc0dd76c270a2.zip
version bump; clean old
Package-Manager: portage-2.1.6.11/cvs/Linux i686
Diffstat (limited to 'dev-libs/zziplib/files')
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch14
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.52-python.patch15
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch33
3 files changed, 62 insertions, 0 deletions
diff --git a/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch
new file mode 100644
index 000000000000..410a2c746c95
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch
@@ -0,0 +1,14 @@
+this test isnt even run automatically and the dependencies are all broken,
+so just disable it and be done
+
+--- SDL/Makefile.in
++++ SDL/Makefile.in
+@@ -38,7 +38,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-check_PROGRAMS = zzcatsdl$(EXEEXT)
++check_PROGRAMS =
+ subdir = SDL
+ DIST_COMMON = $(pkgconfig_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
diff --git a/dev-libs/zziplib/files/zziplib-0.13.52-python.patch b/dev-libs/zziplib/files/zziplib-0.13.52-python.patch
new file mode 100644
index 000000000000..f1cfae16a195
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-python.patch
@@ -0,0 +1,15 @@
+Make it find correct Python version bug
+
+http://bugs.gentoo.org/174189
+
+--- configure
++++ configure
+@@ -21037,7 +21037,7 @@
+ done
+ test -n "$PERL" || PERL="echo no perl found for"
+
+-for ac_prog in python2.2 python2.3 python
++for ac_prog in python
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch b/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch
new file mode 100644
index 000000000000..87ee790465a4
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch
@@ -0,0 +1,33 @@
+This patch for zziplib (0.13.50) fixes a bus error on Linux/SPARC.
+
+Since SPARC machines are big endian and zip files are stored in little endian,
+zziplib needs to do byte swapping. On GNU/Linux this is usually done using
+glibc's bswap_{16,32,64} functions but in this case calling one of these
+functions triggers a bus error. This patch completes upstreams work to
+implement ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED for machines which required aligned
+access.
+After applying the patch zziplib needs to be compiled with
+-DZZIP_HAVE_ALIGNED_ACCESS_REQUIRED
+
+To reproduce it run (in the src dir):
+ cd Linux_*_sparc64.d && ./bins/zzcat test/test/README
+or
+ make check
+
+Problem found by: Ferris McCormick <fmccor@gentoo.org>
+Patch written by: Friedrich Oslage <bluebird@gentoo.org>
+ with advice from: Mike Frysinger <vapier@gentoo.org>
+
+http://bugs.gentoo.org/239472
+
+--- zzip/fetch.c
++++ zzip/fetch.c
+@@ -17,7 +17,7 @@
+ #include <zzip/fetch.h>
+
+ #if defined ZZIP_WORDS_BIGENDIAN && \
+- defined bswap_16 && defined bswap_32 && defined bswap_64
++ defined bswap_16 && defined bswap_32 && defined bswap_64 && !defined(ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED)
+ # define __ZZIP_GET16(__p) bswap_16(*(uint16_t*)(__p))
+ # define __ZZIP_GET32(__p) bswap_32(*(uint32_t*)(__p))
+ # define __ZZIP_SET16(__p,__x) (*(uint16_t*)(__p) = bswap_16((uint16_t)(__x)))