Sebastian: 1 testing/ace-of-penguins: new aport 15 files changed, 261 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/3825/mbox | git am -3Learn more about email & git
Signed-off-by: Sebastian <sebastian@sebsite.pw> --- testing/ace-of-penguins/APKBUILD | 68 +++++++++++++++++ testing/ace-of-penguins/ace.patch | 76 +++++++++++++++++++ testing/ace-of-penguins/canfield.desktop | 9 +++ testing/ace-of-penguins/freecell.desktop | 9 +++ testing/ace-of-penguins/golf.desktop | 9 +++ testing/ace-of-penguins/mastermind.desktop | 9 +++ testing/ace-of-penguins/merlin.desktop | 9 +++ testing/ace-of-penguins/minesweeper.desktop | 9 +++ testing/ace-of-penguins/pegged.desktop | 9 +++ testing/ace-of-penguins/penguins.desktop | 9 +++ testing/ace-of-penguins/solitaire.desktop | 9 +++ testing/ace-of-penguins/spider.desktop | 9 +++ testing/ace-of-penguins/taipei-editor.desktop | 9 +++ testing/ace-of-penguins/taipei.desktop | 9 +++ testing/ace-of-penguins/thornq.desktop | 9 +++ 15 files changed, 261 insertions(+) create mode 100644 testing/ace-of-penguins/APKBUILD create mode 100644 testing/ace-of-penguins/ace.patch create mode 100644 testing/ace-of-penguins/canfield.desktop create mode 100644 testing/ace-of-penguins/freecell.desktop create mode 100644 testing/ace-of-penguins/golf.desktop create mode 100644 testing/ace-of-penguins/mastermind.desktop create mode 100644 testing/ace-of-penguins/merlin.desktop create mode 100644 testing/ace-of-penguins/minesweeper.desktop create mode 100644 testing/ace-of-penguins/pegged.desktop create mode 100644 testing/ace-of-penguins/penguins.desktop create mode 100644 testing/ace-of-penguins/solitaire.desktop create mode 100644 testing/ace-of-penguins/spider.desktop create mode 100644 testing/ace-of-penguins/taipei-editor.desktop create mode 100644 testing/ace-of-penguins/taipei.desktop create mode 100644 testing/ace-of-penguins/thornq.desktop diff --git a/testing/ace-of-penguins/APKBUILD b/testing/ace-of-penguins/APKBUILD new file mode 100644 index 00000000..c06a5b4e --- /dev/null +++ b/testing/ace-of-penguins/APKBUILD @@ -0,0 +1,68 @@ +# 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"
these are probably traced (look at abuild output) and can hence be removed -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28705#note_214874
+makedepends="libpng-dev libx11-dev libxpm-dev make zlib-dev" +subpackages="$pkgname-doc" +# .desktop files were taken from ace-of-penguins AUR files, with slight +# modifications. +# https://aur.archlinux.org/packages/ace-of-penguins +source=" + https://www.delorie.com/store/ace/ace-$pkgver.tar.gz + ace.patch + canfield.desktop + freecell.desktop + golf.desktop + mastermind.desktop + merlin.desktop + minesweeper.desktop + pegged.desktop + penguins.desktop + solitaire.desktop + spider.desktop + taipei-editor.desktop + taipei.desktop + thornq.desktop +"
```suggestion:-16+0 source="https://www.delorie.com/store/ace/ace-$pkgver.tar.gz ace.patch canfield.desktop freecell.desktop golf.desktop mastermind.desktop merlin.desktop minesweeper.desktop pegged.desktop penguins.desktop solitaire.desktop spider.desktop taipei-editor.desktop taipei.desktop thornq.desktop " ``` -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28705#note_214870
+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 -m644 docs/*.* "$pkgdir"/usr/share/doc/ace-of-penguins/ + mkdir -p "$pkgdir"/usr/share/applications/ + install -m644 ../../*.desktop "$pkgdir"/usr/share/applications/
```suggestion:-3+0 install -Dm644 docs/*.* -t "$pkgdir"/usr/share/doc/ace-of-penguins/ install -Dm644 "$srcdir"/*.desktop -t "$pkgdir"/usr/share/applications/ ``` -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28705#note_214871
+} + +sha512sums=" +cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc ace-1.4.tar.gz +6846662deda4c21a89ecaf55afe1580f82f67122f236618a94dcd584cd3a5a76d0429c9bd4ac808e29d04ae78ab9cf9417e274585f87af46a0a769af4917f509 ace.patch +4ba6813cb57d2ed41ee8a582b4cc3026a9f69d4c78ee5a012cdcb3284efee0b3efb04917ad2bd9fb4846b7007cce4bfef7e5e9bd8e91c229b4ed31d077f4f10b canfield.desktop +3f0b3a55af0df885d23fcd73764e0548b7f7d0e25eb881ee1e24d108dd51a234e4140d37a6c616bc39dc2eb70aeeb0f370a1c0ef0ec3314ffb4a07ab89e0b005 freecell.desktop +d76332b739d938ed29ad30f41baaddff6efa70e674aa7354f60b342f828d470212bebacb2a02f6921b8740a616b97b97002455eb153555d7350ffab3ea7b670a golf.desktop +24adc08aa52625c25d6315160f45ce3ded0b733238c09aff1764c39f5e95229bff7da70757318048c703faf120a273127bc965ae462bb0b47460f5cf1a4607da mastermind.desktop +d235d731fc8d3e43537a0e16d61c62f032cb78ce341279af36c4bdd7e7f7101d12ffd04d767ecd51cc6b6e993b46694b09abebb45631cd16a175013f65dc6329 merlin.desktop +8015901cd23d17b19daa62cc2f2f9d377b9af37d5099b651e9ff0f07af07262b65ac81cb84a6d672f429a2bf0e69ab11f7376e90fcafe11dd977b58901152cf4 minesweeper.desktop +70f86cb3919c6f5627fcd86fef5812bdeb5370cc0eab47530912ef4c1a300865b204b5091ce1fc0bd51b857996a9fff795c1847c8d48daa8f80ddabd6a7c5521 pegged.desktop +a224aed5a4ffb26f84d892285559767da203542e8610d06a39562bb491458ffacba834191f7970cb5d868f302bfd242a3db8dcb4659c368081cf81e45179bd92 penguins.desktop +d51a8657471729a7fabd85a88aa90b6cb2598a078c9880bb945ada923eaa9340ba82a22d2f8a477fd84201a9282d1667c24d043989d8fd24a3d04a75c89e3ef2 solitaire.desktop +8a9fa45b275acccb78a52db218d424abc71af2f3aa1ae5f8a197a5685a48ed08a90b57225f563ae430211ebadb5f63217650fc2b5cff5a7b4e6abdb9757f6202 spider.desktop +8c5c81bd806b3a453c2480bf6a3cc83f532c99c9ee439a906ee1eccaf908380d83441ad538179ca9c9fa9f3fd6d5c0de1a97a09794ec5df470e6a1f8baf3c181 taipei-editor.desktop +7930c8af3def8f0d1ff9f8e0a2fcdc8d953eeb2699c4bf5dde794e862ddf616a9d86b202f1e7b9a8507b7e898721a62b3edafa59d9c27d0d4ce73fc89fcbb0f3 taipei.desktop +b8a84c7aa1fca593a604e936e9500939a92a3278252ebf86ad3d1b168ead4ec9e6319f37c81e74d8d577b4bae647ce2238dafb57550ca8d7fea66fc5d5aa5c7d thornq.desktop +" 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); + diff --git a/testing/ace-of-penguins/canfield.desktop b/testing/ace-of-penguins/canfield.desktop new file mode 100644 index 00000000..d302a7a7 --- /dev/null +++ b/testing/ace-of-penguins/canfield.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Canfield +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/canfield +Terminal=false +Categories=Game;BoardGame; diff --git a/testing/ace-of-penguins/freecell.desktop b/testing/ace-of-penguins/freecell.desktop new file mode 100644 index 00000000..c698869b --- /dev/null +++ b/testing/ace-of-penguins/freecell.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Freecell +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/freecell +Terminal=false +Categories=Game;CardGame; diff --git a/testing/ace-of-penguins/golf.desktop b/testing/ace-of-penguins/golf.desktop new file mode 100644 index 00000000..d4ea7c02 --- /dev/null +++ b/testing/ace-of-penguins/golf.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Golf +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/golf +Terminal=false +Categories=Game;CardGame; diff --git a/testing/ace-of-penguins/mastermind.desktop b/testing/ace-of-penguins/mastermind.desktop new file mode 100644 index 00000000..494f3a3c --- /dev/null +++ b/testing/ace-of-penguins/mastermind.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Mastermind +GenericName= +Comment=Guess a secret combination of colors +Icon= +Exec=/usr/bin/mastermind +Terminal=false +Categories=Game;LogicGame; diff --git a/testing/ace-of-penguins/merlin.desktop b/testing/ace-of-penguins/merlin.desktop new file mode 100644 index 00000000..1cf45b40 --- /dev/null +++ b/testing/ace-of-penguins/merlin.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Merlin +GenericName= +Comment=Classical puzzle +Icon= +Exec=/usr/bin/merlin +Terminal=false +Categories=Game;LogicGame; diff --git a/testing/ace-of-penguins/minesweeper.desktop b/testing/ace-of-penguins/minesweeper.desktop new file mode 100644 index 00000000..55c2f752 --- /dev/null +++ b/testing/ace-of-penguins/minesweeper.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Minesweeper +GenericName= +Comment=Find all hidden mines in a minefield +Icon= +Exec=/usr/bin/minesweeper +Terminal=false +Categories=Game;LogicGame; diff --git a/testing/ace-of-penguins/pegged.desktop b/testing/ace-of-penguins/pegged.desktop new file mode 100644 index 00000000..d04338a2 --- /dev/null +++ b/testing/ace-of-penguins/pegged.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Pegged +GenericName= +Comment=Classical board game +Icon= +Exec=/usr/bin/pegged +Terminal=false +Categories=Game;LogicGame; diff --git a/testing/ace-of-penguins/penguins.desktop b/testing/ace-of-penguins/penguins.desktop new file mode 100644 index 00000000..5435826c --- /dev/null +++ b/testing/ace-of-penguins/penguins.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Penguins +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/penguins +Terminal=false +Categories=Game;CardGame; diff --git a/testing/ace-of-penguins/solitaire.desktop b/testing/ace-of-penguins/solitaire.desktop new file mode 100644 index 00000000..ace3939c --- /dev/null +++ b/testing/ace-of-penguins/solitaire.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Solitaire +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/solitaire +Terminal=false +Categories=Game;CardGame; diff --git a/testing/ace-of-penguins/spider.desktop b/testing/ace-of-penguins/spider.desktop new file mode 100644 index 00000000..b4bd4e58 --- /dev/null +++ b/testing/ace-of-penguins/spider.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Spider +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/spider +Terminal=false +Categories=Game;BoardGame; diff --git a/testing/ace-of-penguins/taipei-editor.desktop b/testing/ace-of-penguins/taipei-editor.desktop new file mode 100644 index 00000000..7de2984a --- /dev/null +++ b/testing/ace-of-penguins/taipei-editor.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Taipei Editor +GenericName= +Comment=Editor for your own Taipei levels +Icon= +Exec=/usr/bin/taipedit +Terminal=false +Categories=Game;BoardGame; diff --git a/testing/ace-of-penguins/taipei.desktop b/testing/ace-of-penguins/taipei.desktop new file mode 100644 index 00000000..e862d4d5 --- /dev/null +++ b/testing/ace-of-penguins/taipei.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Taipei +GenericName= +Comment=Asian puzzle: remove pairs of equal stones +Icon= +Exec=/usr/bin/taipei +Terminal=false +Categories=Game;BoardGame; diff --git a/testing/ace-of-penguins/thornq.desktop b/testing/ace-of-penguins/thornq.desktop new file mode 100644 index 00000000..4d83f3af --- /dev/null +++ b/testing/ace-of-penguins/thornq.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Thornq +GenericName= +Comment=Solitary card game +Icon= +Exec=/usr/bin/thornq +Terminal=false +Categories=Game;CardGame; -- 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/28705#note_207668