feat: upstream version 1.1.1

Centzilius · Nov 12, 2024 · 94d7cd8 · 94d7cd8
1 parent 671860f
commit 94d7cd8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/xivlauncher-git.yml b/.github/workflows/xivlauncher-git.yml
@@ -68,7 +68,7 @@ jobs:
         run: mv PKGBUILD-git PKGBUILD
       - name: Copy files
         run: |
-          rsync -ahvP $GITHUB_WORKSPACE/{PKGBUILD,XIVLauncher.desktop,xivlauncher-core,openssl_fix.cnf} /tmp/aur/
+          rsync -ahvP $GITHUB_WORKSPACE/{PKGBUILD,XIVLauncher.desktop,xivlauncher-core} /tmp/aur/
       - name: Generate .SRCINFO
         run: |
           chown -R builder:builder /tmp/aur/

diff --git a/.github/workflows/xivlauncher.yml b/.github/workflows/xivlauncher.yml
@@ -64,7 +64,7 @@ jobs:
           git clone ssh://[email protected]/xivlauncher.git aur
       - name: Copy files
         run: |
-          rsync -ahvP $GITHUB_WORKSPACE/{PKGBUILD,XIVLauncher.desktop,xivlauncher-core,openssl_fix.cnf} /tmp/aur/
+          rsync -ahvP $GITHUB_WORKSPACE/{PKGBUILD,XIVLauncher.desktop,xivlauncher-core} /tmp/aur/
       - name: Generate .SRCINFO
         run: |
           chown -R builder:builder /tmp/aur/

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Vincent Post <[email protected]>
 pkgname=xivlauncher
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 epoch=1
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
@@ -34,14 +34,12 @@ options=('!strip' '!debug')
 source=(
     "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git#tag=${pkgver}"
     "XIVLauncher.desktop"
-    "openssl_fix.cnf"
     "xivlauncher-core"
 )
 sha512sums=(
     'SKIP'
     'd94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389'
-    'c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0'
-    'dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a'
+    '1b4584216828fac294d9955924a89bba716bcb6f1ec582e50f3169e1501eb3d637cb89f921d887d8aba20eb4a4166915e9812aad634bcfd10ab97324164aaec5'
 )
 
 prepare() {

diff --git a/PKGBUILD-git b/PKGBUILD-git
@@ -1,7 +1,7 @@
 # Maintainer: Vincent Post <[email protected]>
 pkgname=xivlauncher-git
-pkgver=1.1.0.r6.g71a9b7b
-pkgrel=6
+pkgver=1.1.1.r3.g980f3b9
+pkgrel=7
 epoch=1
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
 arch=('x86_64')
@@ -36,14 +36,12 @@ conflicts=("xivlauncher")
 source=(
     "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git"
     "XIVLauncher.desktop"
-    "openssl_fix.cnf"
     "xivlauncher-core"
 )
 sha512sums=(
     'SKIP'
     'd94f652f9571598799fcd9bf87cb7d2e54ca924bc100b73024e81efd0fe9fc12d494f7adc500ff34ed1e53c59f94e1d6f3c5ae29a1c33133cc30988197e46389'
-    'c702d45b607a54716ae3f1c9b0aa548b3226da76b0ae4b8a88e49d16e5117a7ff5164e7dd5b6a2799a16a18d53b2de55a26a87888054c25152df5c4824b38fe0'
-    'dad16da8e1d2bc772f7e1be1f59fd799c596fa88fb77a7e58a94baf10a1ca2f0ad7e79ad3baa8ba24e35dd0bc748884c74371c447816b1ea61098f58a130313a'
+    '1b4584216828fac294d9955924a89bba716bcb6f1ec582e50f3169e1501eb3d637cb89f921d887d8aba20eb4a4166915e9812aad634bcfd10ab97324164aaec5'
 )
 
 prepare() {

diff --git a/openssl_fix.cnf b/openssl_fix.cnf
diff --git a/xivlauncher-core b/xivlauncher-core
@@ -1,2 +1,2 @@
 #!/bin/sh
-OPENSSL_CONF=/opt/XIVLauncher/openssl_fix.cnf exec /opt/XIVLauncher/XIVLauncher.Core
+exec /opt/XIVLauncher/XIVLauncher.Core