summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSefa Eyeoglu2022-11-01 11:30:39 +0100
committerSefa Eyeoglu2022-11-01 11:30:39 +0100
commit60b2dd781f750524ee335876f9fed8313f1195fe (patch)
tree2512fef8332ff67706959947e2181958a93b6a29
parent999e1228c66d00ee71ea3572ef289f12b02f7506 (diff)
downloadaur-60b2dd781f750524ee335876f9fed8313f1195fe.tar.gz
upgpkg: prismlauncher-git 5.0.r140.g04b39294-1
remove unneceesary conflicts Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e7c12d05164..ba81cf610476 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = prismlauncher-git
pkgdesc = Minecraft launcher with ability to manage multiple instances.
- pkgver = 5.0.r71.g7f441f5b
+ pkgver = 5.0.r140.g04b39294
pkgrel = 1
url = https://prismlauncher.org
arch = i686
@@ -30,7 +30,6 @@ pkgbase = prismlauncher-git
optdepends = xorg-xrandr: for older minecraft versions
provides = prismlauncher
conflicts = prismlauncher
- conflicts = prismlauncher-qt5
options = debug
source = git+https://github.com/PrismLauncher/PrismLauncher.git
source = git+https://github.com/PrismLauncher/libnbtplusplus.git
diff --git a/PKGBUILD b/PKGBUILD
index 6a5fc62f0047..e78068e51b05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgname=prismlauncher
pkgname=${_pkgname}-git
-pkgver=5.0.r71.g7f441f5b
+pkgver=5.0.r140.g04b39294
pkgrel=1
pkgdesc="Minecraft launcher with ability to manage multiple instances."
arch=('i686' 'x86_64' 'aarch64')
@@ -15,7 +15,7 @@ url="https://prismlauncher.org"
license=('GPL3')
depends=('java-runtime' 'libgl' 'qt6-base' 'qt6-5compat' 'qt6-svg' 'qt6-imageformats' 'zlib' 'hicolor-icon-theme' 'quazip-qt6')
provides=('prismlauncher')
-conflicts=('prismlauncher' 'prismlauncher-qt5')
+conflicts=('prismlauncher')
makedepends=('cmake' 'extra-cmake-modules' 'git' 'java-environment' 'scdoc' 'tomlplusplus' 'ghc-filesystem' 'gamemode')
optdepends=('glfw: to use system GLFW libraries'
'openal: to use system OpenAL libraries'