summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark2021-01-21 11:18:53 +0100
committerMartin T. H. Sandsmark2021-01-21 11:18:53 +0100
commit43e114e3d02ed055e91888099dfe993acadccdf6 (patch)
tree6cbec4029e47c919bb182bcd5b01930468b6f847
parentb166f256247cfff9075c354ec1879e842e1fab7b (diff)
downloadaur-43e114e3d02ed055e91888099dfe993acadccdf6.tar.gz
fix java dependency, mark plasma-workspace as conflicting
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5eb68cd3c4..d866a5bc52b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = kde2-kdelibs-git
pkgdesc = Historical copy of the libs module of KDE 2, adapted to compile on modern systems
- pkgver = 2.2.2.r23932.3d11ab03a
+ pkgver = 2.2.2.r23941.b87a75db2
pkgrel = 1
url = https://github.com/sandsmark/kdelibs
arch = i686
@@ -15,9 +15,10 @@ pkgbase = kde2-kdelibs-git
depends = python
depends = libtool
depends = hicolor-icon-theme
- optdepends = java: Java support
+ optdepends = java-runtime: Java support
provides = kde2-kdelibs
conflicts = kde2-kdelibs
+ conflicts = plasma-workspace
options = libtool
source = git+https://github.com/sandsmark/kdelibs.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d16066a89b2..49f6e761080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_module=libs
pkgname=kde2-kde${_module}-git
-pkgver=2.2.2.r23932.3d11ab03a
+pkgver=2.2.2.r23941.b87a75db2
pkgrel=1
pkgdesc="Historical copy of the $_module module of KDE 2, adapted to compile on modern systems"
arch=(i686 x86_64)
@@ -10,10 +10,10 @@ url="https://github.com/sandsmark/kde${_module}"
license=("GPL2")
groups=(kde2)
depends=(qt2 audiofile libxslt python libtool hicolor-icon-theme)
-optdepends=('java: Java support')
+optdepends=('java-runtime: Java support')
makedepends=(cmake git)
provides=(kde2-kde${_module})
-conflicts=(kde2-kde${_module})
+conflicts=(kde2-kde${_module} plasma-workspace)
options+=(libtool)
# Mirror