diff --git a/community/prismlauncher/0004-disable-ghc-filesystem.patch b/community/prismlauncher/0004-disable-ghc-filesystem.patch new file mode 100644 index 00000000000..69183babc90 --- /dev/null +++ b/community/prismlauncher/0004-disable-ghc-filesystem.patch @@ -0,0 +1,24 @@ +ghc-filesystem is only needed/used for old MacOS systems + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -331,7 +331,7 @@ if(NOT Launcher_FORCE_BUNDLED_LIBS) + find_package(tomlplusplus 3.2.0 QUIET) + + # Find ghc_filesystem +- find_package(ghc_filesystem QUIET) ++ SET(ghc_filesystem_FOUND YES) + + # Find cmark + find_package(cmark QUIET) +--- a/launcher/CMakeLists.txt ++++ b/launcher/CMakeLists.txt +@@ -1241,7 +1241,7 @@ target_link_libraries(Launcher_logic + BuildConfig + Katabasis + Qt${QT_VERSION_MAJOR}::Widgets +- ghcFilesystem::ghc_filesystem ++# ghcFilesystem::ghc_filesystem + ) + + if (UNIX AND NOT CYGWIN AND NOT APPLE) diff --git a/community/prismlauncher/APKBUILD b/community/prismlauncher/APKBUILD index 441781cb093..77e751dce7a 100644 --- a/community/prismlauncher/APKBUILD +++ b/community/prismlauncher/APKBUILD @@ -3,7 +3,8 @@ # Maintainer: Sertonix pkgname=prismlauncher pkgver=8.4 -pkgrel=0 +pkgrel=1 +_libnbtplusplus_commit=23b955121b8217c1c348a9ed2483167a6f3ff4ad pkgdesc="A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once" url="https://prismlauncher.org/" # riscv64, loongarch64: blocked by openjdk @@ -16,23 +17,27 @@ depends=" " makedepends=" cmake + cmark-dev extra-cmake-modules qt6-qtbase-dev qt6-qt5compat-dev qt6-qtimageformats-dev - scdoc openjdk8 quazip-dev samurai + scdoc + tomlplusplus-dev " case "$CARCH" in armv7|armhf) makedepends="$makedepends clang" ;; # fails to build with gcc, see note in build() esac install="$pkgname.post-upgrade" -source="https://github.com/PrismLauncher/PrismLauncher/releases/download/$pkgver/PrismLauncher-$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/PrismLauncher/PrismLauncher/archive/refs/tags/$pkgver.tar.gz + libnbtplusplus-$_libnbtplusplus_commit.tar.gz::https://github.com/PrismLauncher/libnbtplusplus/archive/$_libnbtplusplus_commit.tar.gz 0001-system-jemalloc.patch 0002-native-openal-lwjgl-2.patch 0003-use-system.patch + 0004-disable-ghc-filesystem.patch README.alpine " @@ -40,9 +45,10 @@ subpackages="$pkgname-doc" builddir="$srcdir/PrismLauncher-$pkgver" prepare() { - default_prepare + rmdir libraries/libnbtplusplus + ln -s "$srcdir"/libnbtplusplus-$_libnbtplusplus_commit libraries/libnbtplusplus - rm -rf libraries/quazip + default_prepare } build() { @@ -75,9 +81,11 @@ package() { } sha512sums=" -24307e6f2a34c459153def5ee639c9a37d3ec3e54bf81dc7d7da8263ee58e16f2391101732889d3b00a1b923704aa21756fad4ee288665e45962032b1d9e8de9 PrismLauncher-8.4.tar.gz +bccdff9ffea5f430a0139bfdb5c59ee9dd0498187d4f9833cf753d4760660b0c5e2d2ba59e161acbb05aa6510a88832e56422a4d86572a44341b49b223a6e426 prismlauncher-8.4.tar.gz +ea18c2b4016d078c19337cedc3b2563e2eeaf4dfbb452812bc1d4022544df03c3376219a706e7a7da39144d8d20bde2f8780e382f0abf68191a04c52358af0f8 libnbtplusplus-23b955121b8217c1c348a9ed2483167a6f3ff4ad.tar.gz d0e40b01e9bff51e2454302314b5c316556cdd40928df89446c7ecb531a1a8f3fd02cad9f39641f3bbffad1fd0ae2508bc7386ef19afaccff338a88598481155 0001-system-jemalloc.patch bf8b5a7592b6866e9fd2d32716daea812435eaae472a1dd36047e8ae11bf10be4183910ac274f27c3e5c2133efd75fe5002fc2db7d91af42c85ab67c4725c20c 0002-native-openal-lwjgl-2.patch 87e72332a74476cb4b0f4761c76725a3c8ff60723dc58073387d38040a9b5d5317da70a9cebff1cdad5efd6cdeddc9719882d526f32af4efaef3f9251019de01 0003-use-system.patch +0398fd04e6ff3e11d05d4b504f39f8f5d13f7b396d72fd5d19df850b253ac7e265133169f641185a72fbb54388d5803a66ee0d1d394bbf5bb14e575d262004c2 0004-disable-ghc-filesystem.patch ef1b7c17f39c10b7db73cf03ba25e2b4f683a56fcd7d14cc3bed1d70f574ccaa1021632b01331468f490b42996bbc28972fe98dfc3ea6bcd5f8db6b499fff137 README.alpine "