Click here to go back to the commit logs for xivlauncher.

Commit:

---

Hash: 39627198abcbacab539ce6ad857c0247e1f79db4

Message: Make several adjustments to source acquisition because of a github tagging issue

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 584fbab..a495856 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ generated-by = makedeb
 pkgname = xivlauncher
 pkgbase = xivlauncher
 pkgdesc = Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)
-pkgrel = 6
+pkgrel = 7
 pkgver = 1.0.3
 url = https://github.com/goatcorp/FFXIVQuickLauncher/
 arch = amd64
@@ -31,11 +31,11 @@ license = GPL
 optdepends = steam
 options = !strip
 provides = xivlauncher=1.0.3
-source = XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git
+source = XIVLauncher.Core.zip::https://github.com/goatcorp/XIVLauncher.Core/archive/refs/tags/1.0.3.zip
 source = XIVLauncher.desktop
 source = openssl_fix.cnf
 source = xivlauncher-core
-sha512sums = SKIP
+sha512sums = e4b8007123c70862de63ddbdd1ee2a7524da54ec872f0ef0fecc9384a0da94294a6ae72c3d7300b93f3801f8ed9770fc1cc8a92dc6952894b2413faca0f8b0c1
 sha512sums = c06130b67efff8aa53760cb9c8bd764d4307624ec42c52d58cce388863e64788821f6f836857f200452e75de3b5311466074c70b81ad6d70ab60b286ddfda2e8
 sha512sums = c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0
 sha512sums = dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a
diff --git a/PKGBUILD b/PKGBUILD
index 15c06d5..5dc278e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=xivlauncher
 pkgver=1.0.3
 _pkgver=c2e02fd2b48876b4a00ba278c240f8a6361d3455
-pkgrel=6
+pkgrel=7
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
 arch=('amd64')
 url='https://github.com/goatcorp/FFXIVQuickLauncher/'
@@ -36,51 +36,38 @@ extensions=()
 provides=("xivlauncher=${pkgver}")
 conflicts=("xivlauncher-git")
 source=(
-    "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git"
+    "XIVLauncher.Core.zip::https://github.com/goatcorp/XIVLauncher.Core/archive/refs/tags/1.0.3.zip"
     "XIVLauncher.desktop"
     "openssl_fix.cnf"
     "xivlauncher-core"
 )
 sha512sums=(
-    'SKIP'
+    'e4b8007123c70862de63ddbdd1ee2a7524da54ec872f0ef0fecc9384a0da94294a6ae72c3d7300b93f3801f8ed9770fc1cc8a92dc6952894b2413faca0f8b0c1'
     'c06130b67efff8aa53760cb9c8bd764d4307624ec42c52d58cce388863e64788821f6f836857f200452e75de3b5311466074c70b81ad6d70ab60b286ddfda2e8'
     'c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0'
     'dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a'
 )
 prepare() {
-    pwd
-    cd XIVLauncher.Core
-    pwd
-    git remote add origin https://github.com/goatcorp/XIVLauncher.Core.git
-    git fetch --all
-    git checkout tags/${pkgver}
-    git submodule update --init --recursive
+#    pwd
+    cd XIVLauncher.Core-${pkgver}
+#    pwd
+    cd lib
+#    pwd
+    rmdir FFXIVQuickLauncher
+    git clone https://github.com/goatcorp/FFXIVQuickLauncher.git 
 }
 build() {
     mkdir -p "${srcdir}/build"
-#    cd "${srcdir}/XIVLauncher.Core"
-#    if [ -d ".git" ]
-#    then
-#        echo "why. Something is making git weird."
-#        git init
-#        git add --all
-#        git commit -am "re-init"
-#        git remote add origin https://github.com/goatcorp/XIVLauncher.Core.git
-#    else
-#        echo "git is OK"
-#    fi
-#    git checkout ${_pkgver}
-#    git submodule update --init --recursive
-    cd "${srcdir}/XIVLauncher.Core/src/XIVLauncher.Core/"
+    cd "${srcdir}/XIVLauncher.Core-${pkgver}/src/XIVLauncher.Core/"
     #echo "Building XIVLauncher ${pkgver}-${_pkgver:0:7}"
-    dotnet publish -r linux-x64 --sc -o "${srcdir}/build" --configuration Release # -p:BuildHash=${_pkgver:0:7}
+    dotnet publish -r linux-x64 --sc -o "${srcdir}/build" --configuration Release -p:BuildHash=${_pkgver:0:7}
 }
 
 package() {
     install -d "${pkgdir}/usr/bin/"
     install -d "${pkgdir}/opt/XIVLauncher/"
     install -D -m644 "${srcdir}/XIVLauncher.desktop" "${pkgdir}/usr/share/applications/XIVLauncher.desktop"
-    install -D -m644 "${srcdir}/XIVLauncher.Core/misc/linux_distrib/512.png" "${pkgdir}/usr/share/pixmaps/xivlauncher.png"
+    install -D -m644 "${srcdir}/XIVLauncher.Core-${pkgver}/misc/linux_distrib/512.png" "${pkgdir}/usr/share/pixmaps/xivlauncher.png"
     install -D -m644 "${srcdir}/openssl_fix.cnf" "${pkgdir}/opt/XIVLauncher/openssl_fix.cnf"
     cp -r "${srcdir}/build/." "${pkgdir}/opt/XIVLauncher/"
     ln -s ../../opt/XIVLauncher/XIVLauncher.Core "${pkgdir}/usr/bin/XIVLauncher.Core"