summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD41
-rw-r--r--[-rwxr-xr-x]ace14_fixes.patch10
3 files changed, 42 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a94b90274b1..a4f71f9c19c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
pkgbase = ace-of-penguins
pkgdesc = A set of Unix/X solitaire games.
pkgver = 1.4
- pkgrel = 3
- url = http://www.delorie.com/store/ace/
+ pkgrel = 4
+ url = https://www.delorie.com/store/ace/
arch = i686
arch = x86_64
+ arch = aarch64
license = GPL
depends = libx11
depends = libxpm
depends = libpng
depends = zlib
optdepends = xorg-fonts-100dpi: help support
- source = http://www.delorie.com/store/ace/ace-1.4.tar.gz
+ source = https://www.delorie.com/store/ace/ace-1.4.tar.gz
source = ace14_fixes.patch
source = canfield.desktop
source = freecell.desktop
@@ -27,7 +28,7 @@ pkgbase = ace-of-penguins
source = taipei-editor.desktop
source = thornq.desktop
md5sums = b80169fa59d69758bb9686f31a84ad2b
- md5sums = 371587c1841ba7fe8c41940b71079edc
+ md5sums = 0175e6cb3e51b71e4ad242aaf9d97086
md5sums = 10589ed7a16e62f128daf627aed08800
md5sums = 05f94f8737b2b5993c3d7b4acaea94a0
md5sums = 1cea6b83041c42061145776507aea602
@@ -43,4 +44,3 @@ pkgbase = ace-of-penguins
md5sums = d0a6754557f06c0b49fba303705379c5
pkgname = ace-of-penguins
-
diff --git a/PKGBUILD b/PKGBUILD
index 5a9db05c3e4b..39ed4a757226 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,36 @@
-# Maintainer: Steven Honeyman <stevenhoneyman at gmail com>
+# Maintainer: kleintux <reg-archlinux AT klein DOT tuxli DOT ch>
+# COntributor: Steven Honeyman <stevenhoneyman at gmail com>
# Contributor: Antonio Bonifati
# Contributor: renato
+# Contributor: Spiros Georgaras <sng@hellug.gr>
pkgname=ace-of-penguins
_pkgname=ace
pkgver=1.4
-pkgrel=3
+pkgrel=4
pkgdesc="A set of Unix/X solitaire games."
-arch=('i686' 'x86_64')
-url="http://www.delorie.com/store/ace/"
+arch=('i686' 'x86_64' 'aarch64')
+url="https://www.delorie.com/store/ace/"
license=('GPL')
depends=('libx11' 'libxpm' 'libpng' 'zlib')
optdepends=('xorg-fonts-100dpi: help support')
-source=(http://www.delorie.com/store/ace/$_pkgname-$pkgver.tar.gz
- ace14_fixes.patch canfield.desktop freecell.desktop golf.desktop
- mastermind.desktop merlin.desktop minesweeper.desktop pegged.desktop
- penguins.desktop solitaire.desktop spider.desktop taipei.desktop
- taipei-editor.desktop thornq.desktop)
+source=("https://www.delorie.com/store/ace/$_pkgname-$pkgver.tar.gz"
+ "ace14_fixes.patch"
+ "canfield.desktop"
+ "freecell.desktop"
+ "golf.desktop"
+ "mastermind.desktop"
+ "merlin.desktop"
+ "minesweeper.desktop"
+ "pegged.desktop"
+ "penguins.desktop"
+ "solitaire.desktop"
+ "spider.desktop"
+ "taipei.desktop"
+ "taipei-editor.desktop"
+ "thornq.desktop"
+)
md5sums=('b80169fa59d69758bb9686f31a84ad2b'
- '371587c1841ba7fe8c41940b71079edc'
+ '0175e6cb3e51b71e4ad242aaf9d97086'
'10589ed7a16e62f128daf627aed08800'
'05f94f8737b2b5993c3d7b4acaea94a0'
'1cea6b83041c42061145776507aea602'
@@ -33,16 +46,16 @@ md5sums=('b80169fa59d69758bb9686f31a84ad2b'
'd0a6754557f06c0b49fba303705379c5')
build() {
- cd "$srcdir/$_pkgname-$pkgver"
- patch -p1 -i "$srcdir"/ace14_fixes.patch
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}"/ace14_fixes.patch
LDFLAGS="$LDFLAGS -lpng -lz -lm" ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$_pkgname-$pkgver"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="$pkgdir/" install-strip
- for G in "$srcdir"/*.desktop; do
+ for G in "${srcdir}"/*.desktop; do
install -Dm644 $G "${pkgdir}"/usr/share/applications/$(basename $G)
done
}
diff --git a/ace14_fixes.patch b/ace14_fixes.patch
index df1137dc9f93..74f87a5bbcf5 100755..100644
--- a/ace14_fixes.patch
+++ b/ace14_fixes.patch
@@ -55,3 +55,13 @@
BUILD_CC = @BUILD_CC@
AR = @AR@
+--- ace-1.4/lib/xwin.c 2020-10-07 02:07:59.000000000 +0300
++++ ace14/lib/xwin.c 2020-10-07 02:15:05.941784967 +0300
+@@ -55,7 +55,6 @@
+ { "-visual", OPTION_INTEGER, &visual_id },
+ { 0, 0, 0 }
+ };
+-OptionDesc *xwin_options = xwin_options_list;
+
+ Display *display=0;
+ int screen=0;