summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergej Pupykin2021-07-29 23:27:15 +0300
committerSergej Pupykin2021-07-29 23:27:15 +0300
commit4c7f60e0f38e3e9d77f154d309ca8b9e81d391f6 (patch)
tree4539321445d5fb7bce9634d19ed5a7c1fb4bffa9
parent9ef5ed7cedc6466d7b3793c99a7807033351a952 (diff)
downloadaur-4c7f60e0f38e3e9d77f154d309ca8b9e81d391f6.tar.gz
upd
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD15
-rw-r--r--fheroes2.desktop7
3 files changed, 7 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a046097b49ba..58a66bef9409 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = fheroes2-git
pkgdesc = Free implementation of Heroes of the Might and Magic II engine
- pkgver = r1756.f00d0d75
+ pkgver = r1763.92ad831d
pkgrel = 1
url = https://github.com/ihhub/fheroes2
install = fheroes2.install
@@ -14,13 +14,8 @@ pkgbase = fheroes2-git
depends = sdl2
depends = sdl2_image
depends = sdl2_mixer
- depends = sdl2_net
- depends = sdl2_ttf
- depends = tinyxml
conflicts = fheroes2-svn
source = fheroes2::git+https://github.com/ihhub/fheroes2.git
- source = fheroes2.desktop
md5sums = SKIP
- md5sums = 8e8e2b9097d886d9115f4541e943fa9e
pkgname = fheroes2-git
diff --git a/PKGBUILD b/PKGBUILD
index 043c9d1d094c..90a82b106e6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=fheroes2-git
-pkgver=r1756.f00d0d75
+pkgver=r1763.92ad831d
pkgver() {
cd "$srcdir/${pkgname%-git}"
# printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
@@ -10,29 +10,26 @@ pkgdesc="Free implementation of Heroes of the Might and Magic II engine"
arch=('i686' 'x86_64' 'armv7h')
url="https://github.com/ihhub/fheroes2"
license=('GPL')
-depends=('sdl2' 'sdl2_image' 'sdl2_mixer' 'sdl2_net' 'sdl2_ttf' 'tinyxml')
+depends=('sdl2' 'sdl2_image' 'sdl2_mixer')
makedepends=('gettext' 'git' 'cmake')
conflicts=('fheroes2-svn')
-source=(fheroes2::git+https://github.com/ihhub/fheroes2.git
- fheroes2.desktop)
+source=(fheroes2::git+https://github.com/ihhub/fheroes2.git)
install=fheroes2.install
-md5sums=('SKIP'
- '8e8e2b9097d886d9115f4541e943fa9e')
+md5sums=('SKIP')
build() {
cd "$srcdir/fheroes2"
mkdir -p build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+# make -C ../files/lang
make
}
package() {
cd "$srcdir/fheroes2/build"
make install DESTDIR="$pkgdir"
-# mv "$pkgdir"/usr/bin/fheroes2 "$pkgdir"/usr/bin/fheroes2-bin
-# install -Dm755 "$srcdir/fheroes2.sh" "$pkgdir/usr/bin/fheroes2"
- install -Dm644 "$srcdir/fheroes2.desktop" "$pkgdir/usr/share/applications/fheroes2.desktop"
+ install -Dm644 "$srcdir/fheroes2/script/packaging/common/fheroes2.desktop" "$pkgdir/usr/share/applications/fheroes2.desktop"
install -dm755 "$pkgdir/usr/share/fheroes2/data" "$pkgdir/usr/share/fheroes2/maps"
}
diff --git a/fheroes2.desktop b/fheroes2.desktop
deleted file mode 100644
index c8dcea9a0765..000000000000
--- a/fheroes2.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Exec=fheroes2
-;Icon=fheroes2
-Type=Application
-Terminal=false
-Name=Free Heroes 2
-Categories=Application;Game