Sebastian: 1 testing/ace-of-penguins: new aport 2 files changed, 111 insertions(+), 0 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3822/mbox | git am -3Learn more about email & git
Signed-off-by: Sebastian <sebastian@sebsite.pw> --- testing/ace-of-penguins/APKBUILD | 35 ++++++++++++++ testing/ace-of-penguins/ace.patch | 76 +++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 testing/ace-of-penguins/APKBUILD create mode 100644 testing/ace-of-penguins/ace.patch diff --git a/testing/ace-of-penguins/APKBUILD b/testing/ace-of-penguins/APKBUILD new file mode 100644 index 00000000..fbc20f02 --- /dev/null +++ b/testing/ace-of-penguins/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Sebastian Hudak <sebastian@sebsite.pw> +# Maintainer: Sebastian Hudak <sebastian@sebsite.pw> +pkgname=ace-of-penguins +pkgver=1.4 +pkgrel=0 +pkgdesc="Collection of one-player games for X" +url="https://www.delorie.com/store/ace/" +arch="all" +license="GPL-2.0-or-later" +depends="libpng libx11 libxpm zlib" +makedepends="libpng-dev libx11-dev libxpm-dev make zlib-dev" +subpackages="$pkgname-doc" +source="https://www.delorie.com/store/ace/ace-$pkgver.tar.gz + ace.patch" +builddir="$srcdir/ace-$pkgver" + +build() { + ./configure --prefix=/usr + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir"/usr/share/doc/ace-of-penguins/ + install -Dm644 docs/*.* "$pkgdir"/usr/share/doc/ace-of-penguins/ +} + +sha512sums=" +cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc ace-1.4.tar.gz +6846662deda4c21a89ecaf55afe1580f82f67122f236618a94dcd584cd3a5a76d0429c9bd4ac808e29d04ae78ab9cf9417e274585f87af46a0a769af4917f509 ace.patch +" diff --git a/testing/ace-of-penguins/ace.patch b/testing/ace-of-penguins/ace.patch new file mode 100644 index 00000000..3728795c --- /dev/null +++ b/testing/ace-of-penguins/ace.patch @@ -0,0 +1,76 @@ +Some patches have been taken from the ace-of-penguins AUR package. +https://aur.archlinux.org/cgit/aur.git/tree/ace14_fixes.patch?h=ace-of-penguins + +diff -Naur ace-1.4/config.guess ace-1.4-alpine/config.guess +--- ace-1.4/config.guess 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/config.guess 2021-12-19 21:36:35.650013257 +0000 +@@ -882,6 +882,9 @@ + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; ++ aarch64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +@@ -950,7 +953,7 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- ppc64:Linux:*:*) ++ ppc64*:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) +diff -Naur ace-1.4/lib/Makefile.am ace-1.4-alpine/lib/Makefile.am +--- ace-1.4/lib/Makefile.am 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/Makefile.am 2021-12-19 21:36:12.876679139 +0000 +@@ -6,7 +6,7 @@ + CLEANFILES = images.c images.d + + INCLUDES = $(X_CFLAGS) @PDA@ +-AM_LDFLAGS = $(X_LIBS) ++AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm + + BUILD_CC = @BUILD_CC@ + AR = @AR@ +diff -Naur ace-1.4/lib/make-imglib.c ace-1.4-alpine/lib/make-imglib.c +--- ace-1.4/lib/make-imglib.c 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/make-imglib.c 2021-12-19 21:36:12.876679139 +0000 +@@ -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; + } +diff -Naur ace-1.4/lib/xwin.c ace-1.4-alpine/lib/xwin.c +--- ace-1.4/lib/xwin.c 2012-03-24 18:00:49.000000000 +0000 ++++ ace-1.4-alpine/lib/xwin.c 2021-12-19 21:36:12.876679139 +0000 +@@ -55,7 +55,6 @@ + { "-visual", OPTION_INTEGER, &visual_id }, + { 0, 0, 0 } + }; +-OptionDesc *xwin_options = xwin_options_list; + + Display *display=0; + int screen=0; +@@ -841,13 +840,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, &file_bytes, (png_rw_ptr)png_reader); + + png_read_info (png_ptr, info_ptr); + -- 2.34.1
Sorry to bother you @mailinglist-bot, but we've detected that this merge request hasn't seen any recent activity. If you need help or want to discuss your approach with developers you can ping `@team/mentors`. You can also ask on IRC on `#alpine-devel` on irc.oftc.net. If no further activity occurs in this MR, Alpine developers may close it in the future. Thanks for your contribution. -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28667#note_207462