Lots of modification, thanks to Fabio Lolix

3 files changed, 39 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c0ebccb32eb..29e9e7995b2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = applewin-git
 	pkgdesc = AppleWin Linux port by Audetto - GIT version
-	pkgver = v1.25.0.4.r1962.gb31d1342
-	pkgrel = 2
+	pkgver = 1.25.0.4.r1962.gb31d1342
+	pkgrel = 3
 	url = https://github.com/audetto/AppleWin.git
+	install = applewin.install
 	arch = x86_64
 	license = GPL2
 	makedepends = git
@@ -15,14 +16,14 @@ pkgbase = applewin-git
 	depends = qt5-gamepad
 	depends = qt5-multimedia
 	depends = libyaml
-	source = git+https://github.com/audetto/AppleWin.git
-	source = git+https://github.com/Dax89/QHexView.git#commit=4d06da8
-	source = git+https://github.com/ocornut/imgui.git#commit=17ec4f1
-	source = git+https://github.com/ocornut/imgui_club.git#commit=02e679b
+	conflicts = applewin
+	source = applewin::git+https://github.com/audetto/AppleWin.git
+	source = git+https://github.com/Dax89/QHexView.git
+	source = git+https://github.com/ocornut/imgui.git
+	source = git+https://github.com/ocornut/imgui_club.git
 	source = applewin-sdl2.desktop
 	source = applewin-qt.desktop
 	source = apple-logo.svg
-	source = applewin-git.install
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -30,6 +31,5 @@ pkgbase = applewin-git
 	sha256sums = 0c12ec3a65b8fb832b5931e443686c01e64b1c56882fd564d04b467ba6cb8f1a
 	sha256sums = a1f2f65e1d381436a357455c96ee0fd586021847ba206e595ca416df91085157
 	sha256sums = e3bbf57d2ad105c6211b0853fbb88f1c20d874d0a34b6ae263e2cf8c74e1568d
-	sha256sums = dcd3c07931963c23dd96440ba08d7da61491498977f39541947a37a3f6261ac9
 
 pkgname = applewin-git
diff --git a/PKGBUILD b/PKGBUILD
index d58f38a3bdad..27b197270aa6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,64 @@
 # Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Contributor: Fabio Lolix <fabio.loli at disroot.org>
 
-_pkgname=AppleWin
-_name=applewin
-pkgname="${_name}-git"
-pkgver=v1.25.0.4.r1962.gb31d1342
-pkgrel=2
+# Thanks to Fabio Lolix for the patch.
+
+pkgname=applewin-git
+pkgver=1.25.0.4.r1962.gb31d1342
+pkgrel=3
 pkgdesc="AppleWin Linux port by Audetto - GIT version"
 arch=('x86_64')
 url="https://github.com/audetto/AppleWin.git"
 license=('GPL2')
 depends=('boost-libs' 'minizip'  'libslirp' 'sdl2_image' 'qt5-gamepad' 'qt5-multimedia' 'libyaml')
 makedepends=('git' 'cmake' 'boost')
-source=("git+https://github.com/audetto/AppleWin.git"
-        "git+https://github.com/Dax89/QHexView.git#commit=4d06da8"
-        "git+https://github.com/ocornut/imgui.git#commit=17ec4f1"
-        "git+https://github.com/ocornut/imgui_club.git#commit=02e679b"
+provide=(applewin)
+conflicts=(applewin)
+install=applewin.install
+source=("${pkgname%-git}::git+https://github.com/audetto/AppleWin.git"
+        "git+https://github.com/Dax89/QHexView.git"
+        "git+https://github.com/ocornut/imgui.git"
+        "git+https://github.com/ocornut/imgui_club.git"
         applewin-sdl2.desktop
         applewin-qt.desktop
-        apple-logo.svg
-        applewin-git.install)
+        apple-logo.svg)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             '0c12ec3a65b8fb832b5931e443686c01e64b1c56882fd564d04b467ba6cb8f1a'
             'a1f2f65e1d381436a357455c96ee0fd586021847ba206e595ca416df91085157'
-            'e3bbf57d2ad105c6211b0853fbb88f1c20d874d0a34b6ae263e2cf8c74e1568d'
-            'dcd3c07931963c23dd96440ba08d7da61491498977f39541947a37a3f6261ac9')
+            'e3bbf57d2ad105c6211b0853fbb88f1c20d874d0a34b6ae263e2cf8c74e1568d')
 
 pkgver() {
-  cd ${srcdir}/${_pkgname}
-  #printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}/${pkgname%-git}"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
+  cd "${srcdir}/${pkgname%-git}"
+
+  git submodule init
+  git submodule set-url source/frontends/qt/QHexView "${srcdir}/QHexView"
+  git submodule set-url source/frontends/sdl/imgui/imgui "${srcdir}/imgui"
+  git submodule set-url source/frontends/sdl/imgui/imgui_club "${srcdir}/imgui_club"
+  git submodule update
 
-cd ${srcdir}/${_pkgname}
-#
-# Moving 3rd party repositories
-# Kinda dirty, but I cannot get git submodules to work :(
-#
-# This is a work in progress. Any help appreciated for making everything
-# work with git submodule "magic" :)
-#
-cp -fra ${srcdir}/QHexView/* ${srcdir}/${_pkgname}/source/frontends/qt/QHexView/
-cp -fra ${srcdir}/imgui/* ${srcdir}/${_pkgname}/source/frontends/sdl/imgui/imgui/
-cp -fra ${srcdir}/imgui_club/* ${srcdir}/${_pkgname}/source/frontends/sdl/imgui/imgui_club/
+  mkdir build
 }
 
 build() {
-  cd $srcdir/${_pkgname}
-  mkdir build
-  cd build
+  cd "${srcdir}/${pkgname%-git}/build"
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
   make
 }
 
 package() {
-  cd $srcdir/${_pkgname}
-  cd build
-  make DESTDIR="$pkgdir/" install
-  mkdir $pkgdir/usr/share/applications/
-  cp $srcdir/*.desktop $pkgdir/usr/share/applications/
-  mkdir $pkgdir/usr/share/applewin/common/
-  cp $srcdir/apple-logo.svg $pkgdir/usr/share/applewin/common/
+  cd "${srcdir}/${pkgname%-git}/build"
+  make DESTDIR="${pkgdir}/" install
+
+  install -D "${srcdir}"/*.desktop -t "${pkgdir}"/usr/share/applications/
+  install -D "${srcdir}"/apple-logo.svg -t "${pkgdir}"/usr/share/applewin/common/
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/applewin-git.install b/applewin.install
index 4fa11d7d8bc6..4fa11d7d8bc6 100644
--- a/applewin-git.install
+++ b/applewin.install