summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-arcade/xbubble/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-arcade/xbubble/files')
-rw-r--r--games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch13
-rw-r--r--games-arcade/xbubble/files/xbubble-0.5.8-locale.patch10
-rw-r--r--games-arcade/xbubble/files/xbubble-0.5.8-png15.patch20
-rw-r--r--games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch11
4 files changed, 54 insertions, 0 deletions
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
new file mode 100644
index 000000000000..ad689e29d739
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308731
+
+--- src/loadpng.c
++++ src/loadpng.c
+@@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha
+ }
+ /* ensure that we opened a PNG file */
+ fread( header, 1, 8, fd );
+- if ( ! png_check_sig( header, 8 ) ) {
++ if ( png_sig_cmp( header, 0, 8 ) ) {
+ fclose(fd);
+ fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file);
+ return NULL;
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
new file mode 100644
index 000000000000..a83d36fbd911
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
@@ -0,0 +1,10 @@
+--- src/gettext.h.orig 2008-10-07 12:01:37.000000000 -0400
++++ src/gettext.h 2008-10-07 12:01:45.000000000 -0400
+@@ -24,6 +24,7 @@
+
+ /* Get declarations of GNU message catalog functions. */
+ # include <libintl.h>
++# include <locale.h>
+
+ #else
+
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
new file mode 100644
index 000000000000..3a0a7d360efb
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
@@ -0,0 +1,20 @@
+--- src/loadpng.c.old 2011-09-14 09:58:40.503566961 +0200
++++ src/loadpng.c 2011-09-14 10:03:39.708531447 +0200
+@@ -73,7 +73,7 @@
+ return NULL;
+ }
+ /* libpng does a longjmp here when it encounters an error */
+- if ( setjmp( png_ptr->jmpbuf ) ) {
++ if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+ png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+ fclose(fd);
+ return NULL;
+@@ -95,7 +95,7 @@
+ png_set_gray_to_rgb(png_ptr);
+
+ /* detect alpha layer */
+- if (( info_ptr->color_type & PNG_COLOR_MASK_ALPHA )||
++ if (( png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA )||
+ ( png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS )))
+ *has_alpha = 1;
+ else
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
new file mode 100644
index 000000000000..c3dfa83cb5e3
--- /dev/null
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
@@ -0,0 +1,11 @@
+the x_libraries variable isnt always defined
+http://bugs.gentoo.org/92688
+
+--- configure
++++ configure
+@@ -4511,3 +4511,5 @@
+ fi
++if test x"$x_libraries" != x; then
+ LIBS="-L$x_libraries $LIBS"
++fi
+