summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Kiziridis2020-04-22 00:02:29 +0300
committerDimitris Kiziridis2020-04-22 00:02:29 +0300
commit1268e7ee2b4a9a3eec789404958d6c39312ca8f0 (patch)
treee6f33d806cead44543d04695288ff6ba0e43f17f
parent041962fdbe241dd42f2fe5035ad3be319a9d6813 (diff)
downloadaur-1268e7ee2b4a9a3eec789404958d6c39312ca8f0.tar.gz
remove javafx conflict
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b02422e7a6e0..e58459a9e6ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = gluon-scene-builder11
license = BSD
makedepends = gendesk
depends = java-environment=11
- conflicts = javafx-scenebuilder
+ conflicts = gluon-scene-builder8
source = https://download2.gluonhq.com/scenebuilder/11.0.0/install/linux/scenebuilder-11.0.0-1.x86_64.rpm
sha256sums = a1766a84e2b87de6229878f5b94fc3a3e2646776725525776da5db310234d955
diff --git a/PKGBUILD b/PKGBUILD
index 8cb10446b884..ccaf09ce581c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ license=('BSD')
conflicts=('gluon-scene-builder8')
depends=('java-environment=11')
makedepends=('gendesk')
-conflicts=('javafx-scenebuilder')
source=("https://download2.gluonhq.com/scenebuilder/${pkgver}/install/linux/scenebuilder-${pkgver}-1.x86_64.rpm")
sha256sums=('a1766a84e2b87de6229878f5b94fc3a3e2646776725525776da5db310234d955')