From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-board/ace/files/ace-1.4-CC.patch | 17 ++++ games-board/ace/files/ace-1.4-clang.patch | 15 +++ games-board/ace/files/ace-1.4-gold.patch | 144 +++++++++++++++++++++++++++ games-board/ace/files/ace-1.4-libpng15.patch | 29 ++++++ games-board/ace/files/ace-1.4-no-xpm.patch | 24 +++++ 5 files changed, 229 insertions(+) create mode 100644 games-board/ace/files/ace-1.4-CC.patch create mode 100644 games-board/ace/files/ace-1.4-clang.patch create mode 100644 games-board/ace/files/ace-1.4-gold.patch create mode 100644 games-board/ace/files/ace-1.4-libpng15.patch create mode 100644 games-board/ace/files/ace-1.4-no-xpm.patch (limited to 'games-board/ace/files') diff --git a/games-board/ace/files/ace-1.4-CC.patch b/games-board/ace/files/ace-1.4-CC.patch new file mode 100644 index 000000000000..ec9045d25765 --- /dev/null +++ b/games-board/ace/files/ace-1.4-CC.patch @@ -0,0 +1,17 @@ +From: Julian Ospald +Date: Fri Jan 4 17:19:04 UTC 2013 +Subject: build system + + +--- ace-1.4/lib/Makefile.am ++++ ace-1.4/lib/Makefile.am +@@ -25,7 +25,7 @@ + ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c + + make-imglib : make-imglib.c +- $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz + + text2c : text2c.c +- $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz diff --git a/games-board/ace/files/ace-1.4-clang.patch b/games-board/ace/files/ace-1.4-clang.patch new file mode 100644 index 000000000000..b021efe517de --- /dev/null +++ b/games-board/ace/files/ace-1.4-clang.patch @@ -0,0 +1,15 @@ +From: Julian Ospald +Date: Fri Jan 4 17:41:20 UTC 2013 +Subject: fix build with clang + +--- ace-1.4/lib/make-imglib.c ++++ ace-1.4/lib/make-imglib.c +@@ -202,7 +202,7 @@ + char *rv; + if (string) { + next = string; +- return; ++ return 0; + } + while (*next && !isgraph(*next)) next++; + if (!*next) return 0; diff --git a/games-board/ace/files/ace-1.4-gold.patch b/games-board/ace/files/ace-1.4-gold.patch new file mode 100644 index 000000000000..0c51527a8b3d --- /dev/null +++ b/games-board/ace/files/ace-1.4-gold.patch @@ -0,0 +1,144 @@ +From: Julian Ospald +Date: Tue Sep 25 13:18:57 UTC 2012 +Subject: build system + +fix gold linker compilation +https://bugs.gentoo.org/show_bug.cgi?id=435826 + +--- a/configure.in ++++ b/configure.in +@@ -44,6 +44,9 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET ++AC_PATH_PROG([PKGCONFIG], [pkg-config]) ++AS_IF([test "x$PKGCONFIG" = "x"], ++ [AC_MSG_ERROR([pkg-config not found!])]) + + AC_CHECK_PROGS(BUILD_CC,gcc cc ${CC},gcc) + AC_CHECK_PROG(AR,${AR:-ar},${AR:-ar},ar) +@@ -55,6 +58,10 @@ + dnl doesn't work if gd isn't where the compiler can find it + dnl AC_CHECK_LIB(gd, gdImageCreateFromGif) + ++PKG_CHECK_MODULES([X], [x11]) ++PKG_CHECK_MODULES([Z], [zlib]) ++PKG_CHECK_MODULES([PNG], [libpng]) ++ + dnl Checks for header files. + + AC_PATH_XTRA +@@ -69,57 +76,6 @@ + AC_FUNC_UTIME_NULL + AC_CHECK_FUNCS(gettimeofday mkdir strdup strstr) + +-opt_gd= +-AC_ARG_WITH(z,[ --with-z=DIR location of the ZLIB library],opt_z=$withval) +-AC_ARG_WITH(png,[ --with-png=DIR location of the PNG library],opt_png=$withval) +- +-case "$with_z" in +- yes|no) AC_MSG_ERROR([ +-*** Directory must be specified for --with-z]) +- ;; +- "") +- Z_CFLAGS= +- Z_LIBS=-lz +- ;; +- *) +- if test -f $with_z/include/z.h +- then +- Z_CFLAGS=-I$with_z/include +- else +- Z_CFLAGS=-I$with_z +- fi +- if test -f $with_z/lib/libz.a +- then +- Z_LIBS=$with_z/lib/libz.a +- else +- Z_LIBS=$with_z/libz.a +- fi +- ;; +-esac +- +-case "$with_png" in +- yes|no) AC_MSG_ERROR([ +-*** Directory must be specified for --with-png]) +- ;; +- "") +- PNG_CFLAGS= +- PNG_LIBS= +- ;; +- *) +- if test -f $with_png/lib/png.h +- then +- PNG_CFLAGS=-I$with_png/lib +- else +- PNG_CFLAGS=-I$with_png/include/X11 +- fi +- if test -f $with_png/lib/libPng.a +- then +- PNG_LIBS="-L$with_png/lib" +- else +- PNG_LIBS="-L$with_png" +- fi +- ;; +-esac + + AC_SUBST(Z_CFLAGS) + AC_SUBST(Z_LIBS) +@@ -127,6 +83,9 @@ + AC_SUBST(PNG_CFLAGS) + AC_SUBST(PNG_LIBS) + ++AC_SUBST(X_LIBS) ++AC_SUBST(X_CFLAGS) ++ + AC_SUBST(PDA) + + AC_OUTPUT(Makefile lib/Makefile games/Makefile tests/Makefile) +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -5,18 +5,19 @@ + + CLEANFILES = images.c images.d + +-INCLUDES = $(X_CFLAGS) @PDA@ +-AM_LDFLAGS = $(X_LIBS) ++INCLUDES = $(X_CFLAGS) $(PNG_CFLAGS) $(Z_CFLAGS) @PDA@ + + BUILD_CC = @BUILD_CC@ + AR = @AR@ + STRIP = @STRIP@ + +-libcards_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) ++libcards_la_LDFLAGS = -version-info 1:0:0 + + libcards_la_SOURCES = table.c help.c stack.c imagelib.c xwin.c \ + images.c table_rn.c funcs.c + ++libcards_la_LIBADD = $(X_LIBS) $(PNG_LIBS) $(Z_LIBS) ++ + # table_ai.c table_ck.c table_dc.c table_dg.c \ + #table_dp.c table_in.c table_ky.c table_rd.c table_rs.c + +--- a/games/Makefile.am ++++ b/games/Makefile.am +@@ -30,8 +30,7 @@ + + STRIP = @STRIP@ + +-INCLUDES = -I$(srcdir)/../lib $(X_CFLAGS) @PDA@ +-AM_LDFLAGS = $(X_LIBS) ++INCLUDES = -I$(srcdir)/../lib @PDA@ + + canfield_SOURCES = canfield.c canfield-img.c + freecell_SOURCES = freecell.c freecell-help.c freecell-img.c +@@ -52,7 +51,7 @@ + solitaire-help.c solitaire-img.c spider-help.c spider-img.c \ + taipedit-help.c taipedit-img.c taipei-help.c taipei-img.c + +-LDADD = ../lib/libcards.la -lpng -lz -lX11 -lm ++LDADD = ../lib/libcards.la -lm + + EXTRA_DIST = $(wildcard *.png) $(wildcard *.tp) + diff --git a/games-board/ace/files/ace-1.4-libpng15.patch b/games-board/ace/files/ace-1.4-libpng15.patch new file mode 100644 index 000000000000..23da6949318e --- /dev/null +++ b/games-board/ace/files/ace-1.4-libpng15.patch @@ -0,0 +1,29 @@ +--- a/lib/make-imglib.c ++++ b/lib/make-imglib.c +@@ -86,7 +86,7 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + fclose (f); + continue; + } +--- a/lib/xwin.c ++++ b/lib/xwin.c +@@ -824,13 +824,13 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + fprintf(stderr, "Invalid PNG image!\n"); + return; + } + + file_bytes = src->file_data; +- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader); ++ png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader); + + png_read_info (png_ptr, info_ptr); + diff --git a/games-board/ace/files/ace-1.4-no-xpm.patch b/games-board/ace/files/ace-1.4-no-xpm.patch new file mode 100644 index 000000000000..a8762fb00a38 --- /dev/null +++ b/games-board/ace/files/ace-1.4-no-xpm.patch @@ -0,0 +1,24 @@ +--- a/lib/table.c 2008-01-15 15:05:27.000000000 -0500 ++++ b/lib/table.c 2010-09-29 17:34:40.925310980 -0400 +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + + #define CD printf("%d: %d %d %d %d\n", __LINE__, ex, ey, ew, eh) + #undef CD +@@ -165,13 +164,6 @@ + xwin_create (width, height); + } + +-typedef struct PicRec { +- Pixmap pixmap; +- Pixmap mask; +- char **xpm_data; +- int image_table_index; +-} PicRec; +- + int get_picture_default_width = CARD_WIDTH; + int get_picture_default_height = CARD_HEIGHT; + -- cgit v1.2.3