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

Commit:

---

Hash: 4fb9449699ceed0bf3f7c6a5d190726efd28f93b

Message: Update to new git repo with adjustments for submodules.

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 00654b8..8a88ba8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,8 +2,8 @@ generated-by = makedeb
 pkgname = xivlauncher-git
 pkgbase = xivlauncher-git
 pkgdesc = Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)
-pkgrel = 2
-pkgver = 1.0.1.0.r1.29a26b3
+pkgrel = 1
+pkgver = 1.0.2.0.r1.ad6b701
 url = https://github.com/goatcorp/FFXIVQuickLauncher/
 arch = amd64
 conflicts = xivlauncher
@@ -31,15 +31,13 @@ depends = xdg-utils
 license = GPL
 optdepends = steam
 options = !strip
-provides = xivlauncher=1.0.1.0.r1.29a26b3
-source = FFXIVQuickLauncher::git+https://github.com/goatcorp/FFXIVQuickLauncher.git
-source = https://raw.githubusercontent.com/goatcorp/FFXIVQuickLauncher/master/src/XIVLauncher.Core/Resources/logo.png
+provides = xivlauncher=1.0.2.0.r1.ad6b701
+source = XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git
 source = XIVLauncher.desktop
 source = openssl_fix.cnf
 source = xivlauncher-core
 sha512sums = SKIP
-sha512sums = 4f16ba269ecd60c16a125db5e986d0bdabd69ac51d03ccb01a7203ddd04dea9d40147ee412bbfc37921ca83ff70a966258ae729bcada95ce1582b43160686694
-sha512sums = d94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389
+sha512sums = c06130b67efff8aa53760cb9c8bd764d4307624ec42c52d58cce388863e64788821f6f836857f200452e75de3b5311466074c70b81ad6d70ab60b286ddfda2e8
 sha512sums = c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0
 sha512sums = dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a
 makedepends_x86_64 = dotnet-sdk-6.0
diff --git a/PKGBUILD b/PKGBUILD
index 754146c..b7cedf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: XIVLauncher Linux Maintainers <franz@goat.place>
 pkgname=xivlauncher-git
-pkgver=1.0.1.0.r1.29a26b3
-pkgrel=2
+pkgver=1.0.2.0.r1.ad6b701
+pkgrel=1
 #epoch=2
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
 arch=('amd64')
@@ -36,28 +36,29 @@ options=('!strip')
 provides=("xivlauncher=${pkgver}")
 conflicts=("xivlauncher")
 source=(
-    "FFXIVQuickLauncher::git+https://github.com/goatcorp/FFXIVQuickLauncher.git"
-    "https://raw.githubusercontent.com/goatcorp/FFXIVQuickLauncher/master/src/XIVLauncher.Core/Resources/logo.png"
+    "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git"
     "XIVLauncher.desktop"
     "openssl_fix.cnf"
     "xivlauncher-core"
 )
 sha512sums=(
     'SKIP'
-    '4f16ba269ecd60c16a125db5e986d0bdabd69ac51d03ccb01a7203ddd04dea9d40147ee412bbfc37921ca83ff70a966258ae729bcada95ce1582b43160686694'
-    'd94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389'
+    'c06130b67efff8aa53760cb9c8bd764d4307624ec42c52d58cce388863e64788821f6f836857f200452e75de3b5311466074c70b81ad6d70ab60b286ddfda2e8'
     'c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0'
     'dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a'
 )
 
 pkgver() {
-    cd "${srcdir}/FFXIVQuickLauncher"
+    cd "${srcdir}/XIVLauncher.Core"
     printf "%s.r%s.%s" "$(sed -n 's:.*<Version>\(.*\)</Version>.*:\1:p' src/XIVLauncher.Core/XIVLauncher.Core.csproj)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    #git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
     mkdir -p "${srcdir}/build"
-    cd "${srcdir}/FFXIVQuickLauncher/src/XIVLauncher.Core/"
+    cd "${srcdir}/XIVLauncher.Core"
+    git submodule update --init --recursive
+    cd "${srcdir}/XIVLauncher.Core/src/XIVLauncher.Core/"
     dotnet publish -r linux-x64 --sc -o "${srcdir}/build" --configuration Release
 }
 
@@ -65,10 +66,10 @@ 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}/logo.png" "${pkgdir}/usr/share/pixmaps/xivlauncher.png"
+    install -D -m644 "${srcdir}/XIVLauncher.Core/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"
+    ln -s "/opt/XIVLauncher/XIVLauncher.Core" "${pkgdir}/usr/bin/XIVLauncher.Core"
     install -D -m755  "${srcdir}/xivlauncher-core" "${pkgdir}/usr/bin/xivlauncher-core"
 }
 
diff --git a/XIVLauncher.desktop b/XIVLauncher.desktop
index 26e3c82..469c185 100644
--- a/XIVLauncher.desktop
+++ b/XIVLauncher.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=XIVLauncher.Core
-Comment=Custom launcher for Final Fantasy XIV Online
+Name=XIVLauncher
+Comment=Custom launcher for the most critically acclaimed MMO
 Exec=xivlauncher-core
 Icon=xivlauncher
 Terminal=false
 Type=Application
-Categories=Application;Game;
+Categories=Game;
 StartupWMClass=XIVLauncher.Core