diff options
Diffstat (limited to 'games-board/ace')
-rw-r--r-- | games-board/ace/Manifest | 11 | ||||
-rw-r--r-- | games-board/ace/ace-1.4-r1.ebuild | 54 | ||||
-rw-r--r-- | games-board/ace/ace-1.4.ebuild | 48 | ||||
-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 |
9 files changed, 350 insertions, 0 deletions
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest new file mode 100644 index 000000000000..2079986bc2d5 --- /dev/null +++ b/games-board/ace/Manifest @@ -0,0 +1,11 @@ +AUX ace-1.4-CC.patch 662 SHA256 0d544e0045c0de02602f3956a9a2e64501821836acfdd67eedd7ee324161ccde SHA512 5ff66c1ff2dc913cc7ba7fe4fecd890819789299a2ced5a12058d6616cf892d8dadf76185c9d8d60f54f148e361c892d18e8cc1c6646ffab61257208d7b43a08 WHIRLPOOL d9bc1464a4d8340db8b32cf708a1e9ebba1363f0bdbd57b306c3330f54e5fe4d5ef0a2097b65cec1e82c6550b58a5a76f13a9fae447bdc719a87744afa04d9c5 +AUX ace-1.4-clang.patch 340 SHA256 aa0e848e7df466cfdf7ddb136eff45c770a505d810537163049098a3849d754b SHA512 df2f335d7d4e6e0e349c8724678a2cf8592e9435cc184bbdd906cb9b099b01c7b4e9ab8e2f4af257b4dde695649def75a2612df62fd2101411561c17cbca2d0f WHIRLPOOL 7e341f3b1f7d4d657f108d2cd87ac956a136f6c5fbd863cf1b4014ae91959e81b4d8f5e39692896a684323ba3fcf7b715a2723d04ef47fea5ec9c0eefcd7e866 +AUX ace-1.4-gold.patch 3339 SHA256 ddff1c4cd233c6704f45739a90ce0c8010e4c6121f38146898ab27cfba6c9e81 SHA512 907a2c6378bf9bc6aeba0c0945ef4e1a60a2403c491d6a54faaf6c90561375787afb3fba15faf05d28e04eb9478ece1357b9f0e91c2f9b4cef33909f59b70d37 WHIRLPOOL f6043aade60f977427e75dc90b5b25f94502b545c52cfd5e961eca2c55ca0ec0e1e83b4f2b0e942f6d74c94853297ba1e1f096d2b32bf84f33286c012eb1860d +AUX ace-1.4-libpng15.patch 853 SHA256 3067e17b50bf7dad79d5ac847eba137aaf7ba408a85f2ffafb015ccdbcf19498 SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013 WHIRLPOOL b3606170ae2bdb73a3ab385327281076acb6f15230d0839fa6ff5af99aee54f0b91e5ef15e508a533c46b5f376ba7a748cf8448ed20e73bc57a6505baccc8254 +AUX ace-1.4-no-xpm.patch 571 SHA256 92023aab639f4e018683e6669344562d60d3a3453dc6015084435437577082cc SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5 WHIRLPOOL 6aa6798ddb606c86b54575557a02a941b816d10ca93e19bf321006d062d8e80b63c189f091cbdac9ae02b585b6c5bfa15980a1ba1ce0545af97f14bf41ab90a6 +DIST ace-1.4.tar.gz 530490 SHA256 1fee3b0533921a42873c0623f33d873a067b1eec58f2c70c01449146e79a4cce SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc WHIRLPOOL a6a4209f8a75943673f5c46eb093fcd4f8d7f4109f4286831fad9adac63a153065872e6cfbc397375b9e1bb4e51431a317339e2b29b7488f63746c77fd40ac2a +EBUILD ace-1.4-r1.ebuild 965 SHA256 071c858a6a307951fb8071cb707d09f0139bf34a488b227cdc1515cc0cf3a421 SHA512 b3dc70ab8bac7e37030a37a524ec80c9b4b467dd69e160a4e5303554f1c73c52d0ac5e486bb353922af52fafebf52fb3a04e3b53029369b79a1756f1adca5dbe WHIRLPOOL 922d9dcb24d1fda833aad301a5513cc33c222fafeb23481d0e6ab796f3984fd8ffa7265bd4bfd4cc9bad55b7a93348363f8409a3845f9c9519ab043beead34a1 +EBUILD ace-1.4.ebuild 965 SHA256 69f4e807dba823dc38e950d50284156e0778d82c6902962dd65cba617c6586b4 SHA512 b23dc9427be8c725608a88d8d4b041bde2b77a288394cf795b14aa97aab3ec60afee9b2991433a965c8381fa7c6dabe75d8ecf960a7b4525e767193a3325b573 WHIRLPOOL 01e96ed1e357fada8fff066b8ddf1cf6b5c336f34aacb5f120c4ccd58df9b4d17006aa1efede5b9b8563a6f61f730ae6e3a0b4edbc2caff59c9a121fc8652860 +MISC ChangeLog 2886 SHA256 c03f6eed4c5f64192ad1b430245fec576ab0b14be219b53bb00f515245e4cc4a SHA512 85c7a211bc499f67f86614308e9717922d7d7886f5de1d55c8e8968f368a945abed7aeea296b3ad595ca75a7bde53e0bce1368d71e6c5b768229ea2bcd0fabf5 WHIRLPOOL 2fb5965af95dec20d1ceeb0d24068e8b0a602d21d1c4354317558b3046e6cd61dde9976d8613b985ecd070206d63ce7acf661a06a87f88f1efc8552d38b3c9e6 +MISC ChangeLog-2015 4329 SHA256 b08ff3777ed27518cbdfcb1a501cb8bdfb62a4bcdfebef2a320fa65f8f7a80bd SHA512 2607add1228ddd4af2ca55dfd62b146f0552571564334322f5a19e839f82f0819425a50995a91f0a40d9f240bf47ab4df6962bc73be4c914acae78fac1ff2fbf WHIRLPOOL 1dbccec0b93a09851d67d61e1f06afff839152083371cc5ab9a3ef9e083b6cccade5fd9dc9f1bcc6cfa22d18a55eac896a8a61ccec11926f149938cc38b6c59f +MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088 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..dbe79e29977d --- /dev/null +++ b/games-board/ace/ace-1.4-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 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-proto/xproto" + +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/ace-1.4.ebuild b/games-board/ace/ace-1.4.ebuild new file mode 100644 index 000000000000..608aa0ebcb57 --- /dev/null +++ b/games-board/ace/ace-1.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils games + +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="x11-libs/libX11 + media-libs/libpng:0" +DEPEND="${RDEPEND} + x11-proto/xproto" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-no-xpm.patch \ + "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-gold.patch \ + "${FILESDIR}"/${P}-CC.patch \ + "${FILESDIR}"/${P}-clang.patch + eautoreconf +} + +src_configure() { + egamesconf \ + --disable-static \ + --program-prefix=ace- +} + +src_install() { + default + dohtml docs/* + newicon docs/as.gif ${PN}.gif + cd "${D}${GAMES_BINDIR}" || die + local p + for p in * + do + make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif + done + prepgamesdirs +} 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> |