diff options
Diffstat (limited to 'games-board/ace')
| -rw-r--r-- | games-board/ace/Manifest | 8 | ||||
| -rw-r--r-- | games-board/ace/ace-1.4-r1.ebuild | 54 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-CC.patch | 17 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-clang.patch | 15 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-gold.patch | 144 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-libpng15.patch | 29 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-no-xpm.patch | 24 | ||||
| -rw-r--r-- | games-board/ace/metadata.xml | 8 |
8 files changed, 299 insertions, 0 deletions
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest new file mode 100644 index 000000000000..28e3d8d5a6e2 --- /dev/null +++ b/games-board/ace/Manifest @@ -0,0 +1,8 @@ +AUX ace-1.4-CC.patch 662 BLAKE2B abc2e95dc31d2dc4d887dc54d62ca6dec6c6b7d0f1b857be549b3a9d70944a213b3c0cfa90467c724c2274774f663297855912dca0f608faab2a014186f79087 SHA512 5ff66c1ff2dc913cc7ba7fe4fecd890819789299a2ced5a12058d6616cf892d8dadf76185c9d8d60f54f148e361c892d18e8cc1c6646ffab61257208d7b43a08 +AUX ace-1.4-clang.patch 340 BLAKE2B 2387de1b53557adcd4d70004fe41038d36b8c37945fdd60d73ef9b2756e95f6c30851bac425ae2c6aebc3edbca9b863fb17da36ec85906fd35611a90a35abf03 SHA512 df2f335d7d4e6e0e349c8724678a2cf8592e9435cc184bbdd906cb9b099b01c7b4e9ab8e2f4af257b4dde695649def75a2612df62fd2101411561c17cbca2d0f +AUX ace-1.4-gold.patch 3339 BLAKE2B 904aa238a703730ac9d188025d6ecaddd79e3683d43ec231b11e28c33094d45ccc6346f322418bde5d7aa22e56056680666cf835adf748bccef5bbad24f43c84 SHA512 907a2c6378bf9bc6aeba0c0945ef4e1a60a2403c491d6a54faaf6c90561375787afb3fba15faf05d28e04eb9478ece1357b9f0e91c2f9b4cef33909f59b70d37 +AUX ace-1.4-libpng15.patch 853 BLAKE2B ffbcda5c4d25fd404291f0b2d3e98e53f50108b6b6ef7ea135949087402e656b21a21da82cf3def5f12fc75e7a412becd46f4363aa604a184ddb0c20562ab84c SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013 +AUX ace-1.4-no-xpm.patch 571 BLAKE2B 009d9c7efc8b26e25905f4562c019b7cab1bd0b9df853b256042dbeb869b8be0252fba6275331772dc080f43066fe8b3fffc797a7962c9bf5e665605ef2a2f9a SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5 +DIST ace-1.4.tar.gz 530490 BLAKE2B 62d32bcada9a945d0a409757ca24c8c5c032e905528d56a51b95f82844c6c8057d39763016fa05015877f23313d842effeaaa362507bb049816d7cf6bdf01a1a SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc +EBUILD ace-1.4-r1.ebuild 968 BLAKE2B ba98eff8fea59d109ef6b2f71b20c03df8e7129f71e06ee66c22a5a2a047eb1488b4ab2af539b44dde5a5896e26befad27af9cb5121800e1c226b1d866227102 SHA512 0199ed734756903d0c3279a87b8386346aed6b30b5ab02f5667b6e388e7074efb9d0638777d0cb95f00c7fac7d6f2cdc9ea978cc6c54b15975c29defa689b8f9 +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-board/ace/ace-1.4-r1.ebuild b/games-board/ace/ace-1.4-r1.ebuild new file mode 100644 index 000000000000..66185f9eb84a --- /dev/null +++ b/games-board/ace/ace-1.4-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils + +DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games" +HOMEPAGE="http://www.delorie.com/store/ace/" +SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + media-libs/libpng:0 + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-no-xpm.patch + "${FILESDIR}"/${P}-libpng15.patch + "${FILESDIR}"/${P}-gold.patch + "${FILESDIR}"/${P}-CC.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --program-prefix=ace- +} + +src_install() { + default + + dodoc docs/* + newicon docs/as.gif ${PN}.gif + cd "${D}/usr/bin" || die + local p + for p in * + do + make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif + done +} 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 <hasufell@gentoo.org> +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 <hasufell@gentoo.org> +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 <hasufell@gentoo.org> +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 <X11/Xutil.h> + #include <X11/keysym.h> + #include <X11/Xatom.h> +-#include <X11/xpm.h> + + #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; + diff --git a/games-board/ace/metadata.xml b/games-board/ace/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-board/ace/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> +</maintainer> +</pkgmetadata> |