summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD37
-rw-r--r--freedoko-git-archlinux.patch41
3 files changed, 62 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8e4b59a50b0..063e2287cdb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freedoko-git
- pkgdesc = Free version of the german card game Doppelkopf - git version
- pkgver = 0.7.16.r224.gd9be3801
+ pkgdesc = Free implementation of the card game Doppelkopf (git version)
+ pkgver = 0.7.16.r246.gea34e6f2
pkgrel = 1
url = http://free-doko.sourceforge.net/en/FreeDoko.html
arch = i686
@@ -13,12 +13,20 @@ pkgbase = freedoko-git
makedepends = dos2unix
depends = gtkmm3
depends = freealut
- provides = freedoko
- conflicts = freedoko
source = git+https://gitlab.com/dknof/FreeDoko.git
source = freedoko-git-archlinux.patch
sha256sums = SKIP
- sha256sums = be7c58874cfcf882a7a56dafc1b77ecd1cc37b038572608ba61182f42431bed7
+ sha256sums = 4d98598cc9b503583d3521342e94959ff73a5f13398326728bfa0004acf8a0f6
pkgname = freedoko-git
+ optdepends = freedoko-docs-git: HTML manual
+ provides = freedoko
+ conflicts = freedoko
+
+pkgname = freedoko-docs-git
+ pkgdesc = HTML manual for FreeDoko (git version)
+ arch = any
+ depends =
+ provides = freedoko-docs
+ conflicts = freedoko-docs
diff --git a/PKGBUILD b/PKGBUILD
index 62ddf975a66b..5dc624f067a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,21 @@
# Maintainer: Michael Straube <straubem@gmx.de>
# Contributor: Robert Knauer <robert@privatdemail.net>
-pkgname=freedoko-git
-pkgver=0.7.16.r224.gd9be3801
+pkgbase=freedoko-git
+pkgname=('freedoko-git' 'freedoko-docs-git')
+pkgver=0.7.16.r246.gea34e6f2
pkgrel=1
-pkgdesc="Free version of the german card game Doppelkopf - git version"
+pkgdesc="Free implementation of the card game Doppelkopf (git version)"
arch=('i686' 'x86_64')
url="http://free-doko.sourceforge.net/en/FreeDoko.html"
license=('GPL')
#depends=('gtkmm3' 'gnet' 'freealut')
depends=('gtkmm3' 'freealut') # network currently disabled upstream
makedepends=('git' 'asciidoc' 'texlive-latexextra' 'w3m' 'dos2unix')
-conflicts=('freedoko')
-provides=('freedoko')
source=("git+https://gitlab.com/dknof/FreeDoko.git"
"freedoko-git-archlinux.patch")
sha256sums=('SKIP'
- 'be7c58874cfcf882a7a56dafc1b77ecd1cc37b038572608ba61182f42431bed7')
+ '4d98598cc9b503583d3521342e94959ff73a5f13398326728bfa0004acf8a0f6')
pkgver() {
cd FreeDoko
@@ -26,8 +25,8 @@ pkgver() {
prepare() {
cd FreeDoko
- # patch Makefiles
patch -p1 -i ../freedoko-git-archlinux.patch
+ find manual -type f -exec chmod 644 {} \;
}
build() {
@@ -37,17 +36,27 @@ build() {
make documentation
}
-package() {
+package_freedoko-git() {
+ optdepends=('freedoko-docs-git: HTML manual')
+ conflicts=('freedoko')
+ provides=('freedoko')
+
cd FreeDoko
make DESTDIR="$pkgdir" install
+ install -Dm644 bin/FreeDoko.desktop "$pkgdir"/usr/share/applications/freedoko.desktop
+ rm "$pkgdir"/usr/share/doc/freedoko/{de/Windows.txt,de/SuSE,en/Windows,hpux*}
+}
- install -Dm644 bin/FreeDoko.desktop \
- "$pkgdir"/usr/share/applications/freedoko.desktop
+package_freedoko-docs-git() {
+ pkgdesc="HTML manual for FreeDoko (git version)"
+ arch=('any')
+ depends=()
+ conflicts=('freedoko-docs')
+ provides=('freedoko-docs')
- tar -c --exclude={*.sh,Makefile} manual |
- tar -x -C "$pkgdir"/usr/share/doc/freedoko
+ cd FreeDoko
- find "$pkgdir"/usr/share/doc/freedoko/manual -type f -exec chmod 644 {} \;
- rm "$pkgdir"/usr/share/doc/freedoko/{de/Windows.txt,de/SuSE,en/Windows,hpux*}
+ install -d "$pkgdir"/usr/share/doc/freedoko
+ tar -c --exclude={*.sh,Makefile} manual | tar -x -C "$pkgdir"/usr/share/doc/freedoko
}
diff --git a/freedoko-git-archlinux.patch b/freedoko-git-archlinux.patch
index 07f9f770829c..6aae8c4acfa7 100644
--- a/freedoko-git-archlinux.patch
+++ b/freedoko-git-archlinux.patch
@@ -1,6 +1,6 @@
-diff -ru --no-dereference FreeDoko-orig/Makefile FreeDoko/Makefile
---- FreeDoko-orig/Makefile 2017-07-13 16:49:07.085302628 +0200
-+++ FreeDoko/Makefile 2017-07-13 16:51:38.287585354 +0200
+diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
+--- FreeDoko-orig/Makefile 2017-08-24 17:40:29.768795447 +0200
++++ FreeDoko/Makefile 2017-08-24 17:41:13.635388245 +0200
@@ -78,8 +78,12 @@
.PHONY: compile
compile:
@@ -58,9 +58,9 @@ diff -ru --no-dereference FreeDoko-orig/Makefile FreeDoko/Makefile
.PHONY: uninstall
uninstall :
-diff -ru --no-dereference FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
---- FreeDoko-orig/Makefile.install.directories 2017-07-13 16:49:07.085302628 +0200
-+++ FreeDoko/Makefile.install.directories 2017-07-13 16:50:26.458118481 +0200
+diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
+--- FreeDoko-orig/Makefile.install.directories 2017-08-24 17:40:29.768795447 +0200
++++ FreeDoko/Makefile.install.directories 2017-08-24 17:41:13.642054898 +0200
@@ -4,14 +4,14 @@
# the different directories for the files
@@ -107,9 +107,9 @@ diff -ru --no-dereference FreeDoko-orig/Makefile.install.directories FreeDoko/Ma
# release
-diff -ru --no-dereference FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop
---- FreeDoko-orig/bin/FreeDoko.desktop 2017-07-13 16:49:07.085302628 +0200
-+++ FreeDoko/bin/FreeDoko.desktop 2017-07-13 16:49:19.431888615 +0200
+diff -ru --no-dereference -x .git FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop
+--- FreeDoko-orig/bin/FreeDoko.desktop 2017-08-24 17:40:29.772128776 +0200
++++ FreeDoko/bin/FreeDoko.desktop 2017-08-24 17:41:13.642054898 +0200
@@ -6,7 +6,7 @@
Comment=game of Doppelkopf
Comment[de]=Doppelkopf-Spiel
@@ -119,9 +119,9 @@ diff -ru --no-dereference FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDo
Path=
Icon=FreeDoko
Categories=Application;Game;CardGame;
-diff -ru --no-dereference FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
---- FreeDoko-orig/data/Makefile 2017-07-13 16:49:07.781964743 +0200
-+++ FreeDoko/data/Makefile 2017-07-13 16:49:49.281693559 +0200
+diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
+--- FreeDoko-orig/data/Makefile 2017-08-24 17:40:32.352125362 +0200
++++ FreeDoko/data/Makefile 2017-08-24 17:41:13.642054898 +0200
@@ -32,8 +32,7 @@
for d in cardsets iconsets backgrounds sounds; do \
$(MAKE) -C $$d install; \
@@ -132,9 +132,9 @@ diff -ru --no-dereference FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
endif
ifeq ($(SHELLTYPE), sh)
-diff -ru --no-dereference FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
---- FreeDoko-orig/doc/Makefile 2017-07-13 16:49:08.661958992 +0200
-+++ FreeDoko/doc/Makefile 2017-07-13 16:50:05.354921861 +0200
+diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
+--- FreeDoko-orig/doc/Makefile 2017-08-24 17:40:35.312121299 +0200
++++ FreeDoko/doc/Makefile 2017-08-24 17:41:13.642054898 +0200
@@ -34,8 +34,7 @@
fi
cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
@@ -145,3 +145,14 @@ diff -ru --no-dereference FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc
endif
+diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile
+--- FreeDoko-orig/src/Makefile 2017-08-24 17:40:38.752116381 +0200
++++ FreeDoko/src/Makefile 2017-08-24 17:48:59.716407508 +0200
+@@ -232,6 +232,7 @@
+ $(INCLUDE_ALL) \
+ $(LIBS_ALL) \
+ $(CXXFLAGS) \
++ $(LDFLAGS) \
+ -o $@
+ @echo "$(PROGRAM) compiled successfully"
+