summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/analitza/APKBUILD4
-rw-r--r--user/ark/APKBUILD4
-rw-r--r--user/artikulate/APKBUILD4
-rw-r--r--user/baloo-widgets/APKBUILD9
-rw-r--r--user/baloo-widgets/frameworks.patch11
-rw-r--r--user/blinken/APKBUILD4
-rw-r--r--user/bomber/APKBUILD4
-rw-r--r--user/bovo/APKBUILD4
-rw-r--r--user/cantor/APKBUILD4
-rw-r--r--user/checkbashisms/APKBUILD6
-rw-r--r--user/cifs-utils/APKBUILD9
-rw-r--r--user/clang/0001-Add-support-for-Ad-lie-Linux.patch46
-rw-r--r--user/clang/APKBUILD10
-rw-r--r--user/cups-filters/APKBUILD7
-rw-r--r--user/dolphin/APKBUILD9
-rw-r--r--user/dolphin/frameworks.patch11
-rw-r--r--user/dragonplayer/APKBUILD4
-rw-r--r--user/ethtool/APKBUILD7
-rw-r--r--user/ffmpegthumbs/APKBUILD4
-rw-r--r--user/fuse/APKBUILD8
-rw-r--r--user/fuse3/APKBUILD6
-rw-r--r--user/granatier/APKBUILD4
-rw-r--r--user/gwenview/APKBUILD4
-rw-r--r--user/http-parser/APKBUILD7
-rw-r--r--user/i3lock/APKBUILD8
-rw-r--r--user/juk/APKBUILD4
-rw-r--r--user/kalgebra/APKBUILD4
-rw-r--r--user/kalzium/APKBUILD4
-rw-r--r--user/kanagram/APKBUILD4
-rw-r--r--user/kapman/APKBUILD4
-rw-r--r--user/kate/APKBUILD4
-rw-r--r--user/katomic/APKBUILD4
-rw-r--r--user/kblackbox/APKBUILD4
-rw-r--r--user/kblocks/APKBUILD4
-rw-r--r--user/kbounce/APKBUILD4
-rw-r--r--user/kbreakout/APKBUILD4
-rw-r--r--user/kbruch/APKBUILD4
-rw-r--r--user/kcachegrind/APKBUILD4
-rw-r--r--user/kcalc/APKBUILD4
-rw-r--r--user/kcharselect/APKBUILD4
-rw-r--r--user/kcolorchooser/APKBUILD4
-rw-r--r--user/kconfigwidgets/APKBUILD9
-rw-r--r--user/kconfigwidgets/languagename.patch716
-rw-r--r--user/kde-education/APKBUILD2
-rw-r--r--user/kde-games/APKBUILD2
-rw-r--r--user/kde-graphics/APKBUILD2
-rw-r--r--user/kde-multimedia/APKBUILD2
-rw-r--r--user/kde-system/APKBUILD2
-rw-r--r--user/kde-utilities/APKBUILD2
-rw-r--r--user/kdegraphics-thumbnailers/APKBUILD4
-rw-r--r--user/kdenlive/APKBUILD11
-rw-r--r--user/kdf/APKBUILD4
-rw-r--r--user/kdiamond/APKBUILD4
-rw-r--r--user/keepassxc/APKBUILD12
-rw-r--r--user/kfilemetadata/APKBUILD11
-rw-r--r--user/kfilemetadata/add-formatting-fn.patch479
-rw-r--r--user/kfind/APKBUILD4
-rw-r--r--user/kfloppy/APKBUILD4
-rw-r--r--user/kfourinline/APKBUILD4
-rw-r--r--user/kgeography/APKBUILD4
-rw-r--r--user/kget/APKBUILD4
-rw-r--r--user/kgoldrunner/APKBUILD4
-rw-r--r--user/kgpg/APKBUILD4
-rw-r--r--user/khangman/APKBUILD4
-rw-r--r--user/khelpcenter/APKBUILD4
-rw-r--r--user/kig/APKBUILD4
-rw-r--r--user/kigo/APKBUILD4
-rw-r--r--user/killbots/APKBUILD4
-rw-r--r--user/kio-extras/APKBUILD6
-rw-r--r--user/kiriki/APKBUILD4
-rw-r--r--user/kiten/APKBUILD4
-rw-r--r--user/kjumpingcube/APKBUILD4
-rw-r--r--user/kleopatra/APKBUILD9
-rw-r--r--user/kleopatra/qt5.9.patch76
-rw-r--r--user/klettres/APKBUILD4
-rw-r--r--user/klickety/APKBUILD4
-rw-r--r--user/klines/APKBUILD4
-rw-r--r--user/kmag/APKBUILD4
-rw-r--r--user/kmahjongg/APKBUILD4
-rw-r--r--user/kmime/APKBUILD12
-rw-r--r--user/kmime/egregious-versions.patch24
-rw-r--r--user/kmines/APKBUILD4
-rw-r--r--user/kmix/APKBUILD4
-rw-r--r--user/kmousetool/APKBUILD4
-rw-r--r--user/kmplot/APKBUILD4
-rw-r--r--user/knavalbattle/APKBUILD4
-rw-r--r--user/knetwalk/APKBUILD4
-rw-r--r--user/kolf/APKBUILD4
-rw-r--r--user/kollision/APKBUILD4
-rw-r--r--user/kolourpaint/APKBUILD4
-rw-r--r--user/konquest/APKBUILD4
-rw-r--r--user/konsole/APKBUILD9
-rw-r--r--user/konsole/cursor.patch87
-rw-r--r--user/kpat/APKBUILD4
-rw-r--r--user/kpimtextedit/APKBUILD9
-rw-r--r--user/kpimtextedit/qt5.9.patch49
-rw-r--r--user/krdc/APKBUILD4
-rw-r--r--user/kreversi/APKBUILD4
-rw-r--r--user/krfb/APKBUILD4
-rw-r--r--user/kruler/APKBUILD4
-rw-r--r--user/kshisen/APKBUILD4
-rw-r--r--user/ksirk/APKBUILD4
-rw-r--r--user/ksnakeduel/APKBUILD4
-rw-r--r--user/kspaceduel/APKBUILD4
-rw-r--r--user/ksquares/APKBUILD4
-rw-r--r--user/ksudoku/APKBUILD4
-rw-r--r--user/ksystemlog/APKBUILD4
-rw-r--r--user/kteatime/APKBUILD4
-rw-r--r--user/ktimer/APKBUILD4
-rw-r--r--user/ktouch/APKBUILD4
-rw-r--r--user/ktuberling/APKBUILD9
-rw-r--r--user/ktuberling/frameworks.patch11
-rw-r--r--user/kturtle/APKBUILD4
-rw-r--r--user/kubrick/APKBUILD4
-rw-r--r--user/kwalletmanager/APKBUILD4
-rw-r--r--user/kwave/APKBUILD4
-rw-r--r--user/kwordquiz/APKBUILD4
-rw-r--r--user/libkdcraw/APKBUILD4
-rw-r--r--user/libkdegames/APKBUILD4
-rw-r--r--user/libkeduvocdocument/APKBUILD4
-rw-r--r--user/libkexiv2/APKBUILD4
-rw-r--r--user/libkipi/APKBUILD4
-rw-r--r--user/libkleo/APKBUILD9
-rw-r--r--user/libkleo/egregious-versions.patch22
-rw-r--r--user/libkmahjongg/APKBUILD4
-rw-r--r--user/libksane/APKBUILD9
-rw-r--r--user/libksane/frameworks.patch11
-rw-r--r--user/libpsl/APKBUILD4
-rw-r--r--user/libzip/APKBUILD9
-rw-r--r--user/llvm7/ppc32-calling-convention.patch69
-rw-r--r--user/llvm8/APKBUILD (renamed from user/llvm7/APKBUILD)19
-rw-r--r--user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch (renamed from user/llvm7/disable-FileSystemTest.CreateDir-perms-assert.patch)0
-rw-r--r--user/llvm8/disable-dlclose-test.patch (renamed from user/llvm7/disable-dlclose-test.patch)0
-rw-r--r--user/llvm8/even-more-secure-plt.patch (renamed from user/llvm7/even-more-secure-plt.patch)0
-rw-r--r--user/llvm8/llvm-fix-build-with-musl-libc.patch (renamed from user/llvm7/llvm-fix-build-with-musl-libc.patch)0
-rw-r--r--user/llvm8/more-secure-plt.patch (renamed from user/llvm7/more-secure-plt.patch)4
-rw-r--r--user/llvm8/musl-ppc64-elfv2.patch (renamed from user/llvm7/musl-ppc64-elfv2.patch)0
-rw-r--r--user/llvm8/python3-test.patch (renamed from user/llvm7/python3-test.patch)0
-rw-r--r--user/lskat/APKBUILD4
-rw-r--r--user/marble/APKBUILD4
-rw-r--r--user/mesa/APKBUILD6
-rw-r--r--user/meson/APKBUILD4
-rw-r--r--user/minuet/APKBUILD4
-rw-r--r--user/mutt/APKBUILD8
-rw-r--r--user/nfs-utils/APKBUILD4
-rw-r--r--user/nfs-utils/freeaddrinfo-properly.patch126
-rw-r--r--user/okular/0001-Ensure-compatibility-with-Qt.patch36
-rw-r--r--user/okular/APKBUILD9
-rw-r--r--user/palapeli/APKBUILD4
-rw-r--r--user/perl-inline-c/APKBUILD4
-rw-r--r--user/php7/APKBUILD6
-rw-r--r--user/physlock/APKBUILD12
-rw-r--r--user/physlock/makefile.patch14
-rw-r--r--user/physlock/utmps.patch30
-rw-r--r--user/qt-creator/APKBUILD8
-rw-r--r--user/rocs/APKBUILD4
-rw-r--r--user/rttr/APKBUILD46
-rw-r--r--user/rttr/arm64.patch22
-rw-r--r--user/rttr/dlclose-doesnt-work.patch94
-rw-r--r--user/rttr/install-doc.patch11
-rw-r--r--user/rttr/permissions.patch36
-rw-r--r--user/rust/0050-LLVM-8.0-compatibility.patch310
-rw-r--r--user/rust/APKBUILD6
-rw-r--r--user/spectacle/APKBUILD9
-rw-r--r--user/spectacle/qt5.9.patch23
-rw-r--r--user/sshfs/APKBUILD6
-rw-r--r--user/step/APKBUILD4
-rw-r--r--user/talloc/APKBUILD13
-rw-r--r--user/talloc/waf-location.patch10
-rw-r--r--user/terminus-font/75-yes-terminus.conf17
-rw-r--r--user/terminus-font/APKBUILD16
-rw-r--r--user/tlp/APKBUILD18
-rw-r--r--user/umbrello/APKBUILD4
-rw-r--r--user/xhost/APKBUILD8
-rw-r--r--user/xmlsec/APKBUILD13
-rw-r--r--user/youtube-dl/APKBUILD6
-rw-r--r--user/z3/APKBUILD40
177 files changed, 2610 insertions, 594 deletions
diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD
index 4dfd623df..657eebdec 100644
--- a/user/analitza/APKBUILD
+++ b/user/analitza/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=analitza
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Mathematical object library"
url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d20ac4ce1a9ed5737d6e29f92f86c081cbdded829055d4d077832bdeadd00afa736ee4c6c99a8d7de242d6d8b5165368f6ca05cc9c623a9533b2cf3deedb33a9 analitza-18.12.3.tar.xz"
+sha512sums="c8436f74b1ee9d0a5e6384e48e4aa693485636e05fc9d60b217bdcaf4cacb5c29ceaa3d7f53f3d281fe5088340af5736a485d5dc0b6db8f5cfc0889d5e8ab55d analitza-19.04.0.tar.xz"
diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD
index 1c2cd87e4..50918822d 100644
--- a/user/ark/APKBUILD
+++ b/user/ark/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ark
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Graphical file compression/decompression utility with support for multiple formats"
url="https://utils.kde.org/projects/ark/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0dc232b004134c048bb516aa43e478545b4052fba9321a6166a3bb4e05638288802f578cea51340c8416257f10e1bcbd55740a8945ae5f95cee6864f107d633f ark-18.12.3.tar.xz"
+sha512sums="7bcc2a98706644fc0a30bd04f40becea240c245f8fd8af941f893f4a1fe11c8e8f5ce6a9303f8172fed30db953110ce7cb7c4e50132f0392cd92ae9d02390bb5 ark-19.04.0.tar.xz"
diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index f68438764..c175aea77 100644
--- a/user/artikulate/APKBUILD
+++ b/user/artikulate/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=artikulate
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Pronunciation trainer for languages"
url="https://www.kde.org/applications/education/artikulate/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cab931686929a73a3fea25a6718818514a0216b096431f972cfc494e7df754a701a8d4c61874d6914bf8331c0b944b2053a5003bf7bf01901bf2fe79cdf7eba8 artikulate-18.12.3.tar.xz"
+sha512sums="99ece4a46b52180a37b8812788a5caa2c43a4e20eaeba73f115622b14e7bc64bb39a8d44f794fa342628c3739c9fcda9e81de60f326e1778c7e4f5e3b8196faf artikulate-19.04.0.tar.xz"
diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD
index f30e3c168..fbeae9677 100644
--- a/user/baloo-widgets/APKBUILD
+++ b/user/baloo-widgets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=baloo-widgets
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Widgets that utilise the Baloo desktop indexing engine"
url="https://www.KDE.org/"
@@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev baloo-dev kio-dev"
makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev
kfilemetadata-dev ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz
+ frameworks.patch
+ "
build() {
cd "$builddir"
@@ -41,4 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="40b62fd9fb204ba60f0f5d8550e33506907de11b8cc6a222071402ed4eef83d3171df6eef1be31c501dfc4b7271a05f79def095aec6d83c705dcbc52760966dc baloo-widgets-18.12.3.tar.xz"
+sha512sums="031f36224fdc10c09d48b4d8c426c716516e8dc51e23bf91535eb904c4ae71f22aa3fe0774ecc120de9f3636cb76b949836d4e54ee96fa3e8225bf8e2a903195 baloo-widgets-19.04.0.tar.xz
+b8de7699919edb1ecc64aa733b8a937fc0c1b06e3e03fc5f2ea1d78ca190a0bdbf4b6011c57de464ad657103981aa337f3a04953da3a02b6c161f47eda5d7372 frameworks.patch"
diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch
new file mode 100644
index 000000000..002445bde
--- /dev/null
+++ b/user/baloo-widgets/frameworks.patch
@@ -0,0 +1,11 @@
+--- baloo-widgets-19.04.0/CMakeLists.txt.old 2019-04-12 00:13:39.000000000 +0000
++++ baloo-widgets-19.04.0/CMakeLists.txt 2019-04-19 07:30:31.523838076 +0000
+@@ -8,7 +8,7 @@
+ project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION})
+
+ set(QT_MIN_VERSION "5.8.0")
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD
index 5c4f4e35a..ba105ab30 100644
--- a/user/blinken/APKBUILD
+++ b/user/blinken/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=blinken
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Memory enhancement game"
url="https://www.kde.org/applications/education/blinken/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="605d4015b122419c512f614bf2b27c23f5219dc2ef48a7cf86beb0aa0333872058b0cdb04c98799bd4780909cbfc9544e13ace22b809457bd362b3c4555c1d89 blinken-18.12.3.tar.xz"
+sha512sums="0463141b16b118eae60c02a8f31fe5493050cf79e731fde154dc9ad1c5b7efe35d21719092ac130192171dfc5b91d033a89ad0adf98e0db87eba945fa3ba242a blinken-19.04.0.tar.xz"
diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD
index b5e6658e0..777e11fc5 100644
--- a/user/bomber/APKBUILD
+++ b/user/bomber/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bomber
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Arcade bombing game"
url="https://www.kde.org/applications/games/bomber/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7292e5449e4a6444730f771aeb7ab9c2290fda12c213edfae190593f30cae5c4b2d6b0622d9fceaebb474f38cb12396961326af34435e26c1feda64e5153a881 bomber-18.12.3.tar.xz"
+sha512sums="8a29636e66683fb353b798b5804eafef192bf73d23beb8364db3d7f5f241d5350fa1402d3f0e7d27e9dddff777627bdfb98c6a866f0d2248768eed4490ae223f bomber-19.04.0.tar.xz"
diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD
index 8e747d9ef..fa0a6b435 100644
--- a/user/bovo/APKBUILD
+++ b/user/bovo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bovo
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Gomoku or Connect Five game"
url="https://www.kde.org/applications/games/bovo/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="077221d1a510e587fe8d90cb8f026dee78fcd88f831c26ad098c62db0bd2788bac30864247762f5221c7b3b3a55f772aa33e861fe0e9f91aacb3cd03f07a8fdd bovo-18.12.3.tar.xz"
+sha512sums="4389e25fae039a4158474edf875d967710cec3f072142f40458c668a95cdb9aaba6ec9da3a7257a8ba8852736ca541fd7bf7f703ee3c32f9a308cabb4d7873cf bovo-19.04.0.tar.xz"
diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD
index dbebd6089..b0a6eb763 100644
--- a/user/cantor/APKBUILD
+++ b/user/cantor/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cantor
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE worksheet interface for popular mathematical applications"
url="https://edu.kde.org/cantor/"
@@ -45,4 +45,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf cantor-18.12.3.tar.xz"
+sha512sums="affed3d29e6af9a98ea60400c8ab3d8835d60f47f960d1453c6173ebe2eab0146b625269d66380e2ffd4c5a1bf7326b56750a0d4acb2aeed1627be8c6d0818e2 cantor-19.04.0.tar.xz"
diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD
index 09f3359c8..a916e2915 100644
--- a/user/checkbashisms/APKBUILD
+++ b/user/checkbashisms/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=checkbashisms
-pkgver=2.18.6
+pkgver=2.19.4
pkgrel=0
pkgdesc="Check shell scripts for POSIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
@@ -20,12 +20,10 @@ prepare() {
}
check() {
- cd "$builddir"
./test/test_checkbashisms
}
package() {
- cd "$builddir"
install -Dm755 "scripts/$pkgname.pl" "$pkgdir/usr/bin/$pkgname"
install -Dm644 "scripts/$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1"
}
@@ -40,4 +38,4 @@ bashcomp() {
"$subpkgdir/usr/share/bash-completion/completions/$pkgname"
}
-sha512sums="6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014 devscripts_2.18.6.tar.xz"
+sha512sums="43d9484dbbff6f48cf8e2cbcf50a5ee752796db881ec6ca2d1b038c938d7d3fe6d45d0f88d5f62a7bf5889366618fa85c8c0089869e6d6a39f6a87e8f1b5c97c devscripts_2.19.4.tar.xz"
diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD
index f5987a037..436e0d909 100644
--- a/user/cifs-utils/APKBUILD
+++ b/user/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cifs-utils
-pkgver=6.8
+pkgver=6.9
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -17,7 +17,6 @@ source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2
xattr_size_max.patch"
build() {
- cd "$builddir"
# --enable-cifsidmap and --enable-cifsacl require libwbclient (samba)
autoreconf -i
@@ -35,19 +34,15 @@ build() {
}
check() {
- cd "$builddir"
-
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
# Allow unprivileged mount
chmod u+s "$pkgdir"/sbin/mount.cifs
}
-sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 cifs-utils-6.8.tar.bz2
+sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a cifs-utils-6.9.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
diff --git a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch
index f12adf513..6fdb58542 100644
--- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch
+++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch
@@ -24,8 +24,8 @@ index 7b34a09256..7a3774a4f1 100644
AlpineLinux,
ArchLinux,
DebianLenny,
-@@ -118,6 +119,10 @@ public:
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic;
+@@ -120,6 +121,10 @@ public:
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuDisco;
}
+ bool IsAdelieLinux() const {
@@ -39,7 +39,7 @@ diff --git a/lib/Driver/Distro.cpp b/lib/Driver/Distro.cpp
index 2c4d44faf8..7ef35ab379 100644
--- a/lib/Driver/Distro.cpp
+++ b/lib/Driver/Distro.cpp
-@@ -130,6 +130,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) {
+@@ -132,6 +132,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) {
if (VFS.exists("/etc/exherbo-release"))
return Distro::Exherbo;
@@ -49,30 +49,34 @@ index 2c4d44faf8..7ef35ab379 100644
if (VFS.exists("/etc/alpine-release"))
return Distro::AlpineLinux;
-diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
-index 2a87cb077c..85bcd8ed47 100644
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -234,7 +234,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+--
+2.18.0
+
+--- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000
++++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-04-23 23:49:37.786181838 +0000
+@@ -236,13 +236,13 @@
+
+ Distro Distro(D.getVFS());
+
+- if (Distro.IsAlpineLinux() || Triple.isAndroid()) {
++ if (Distro.IsAdelieLinux() || Distro.IsAlpineLinux() || Triple.isAndroid()) {
+ ExtraOpts.push_back("-z");
ExtraOpts.push_back("now");
}
-- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) {
-+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
-+ Distro.IsAdelieLinux()) {
+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
+- Triple.isAndroid()) {
++ Distro.IsAdelieLinux() || Triple.isAndroid()) {
ExtraOpts.push_back("-z");
ExtraOpts.push_back("relro");
}
-@@ -268,7 +269,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
- // Hexagon linker/loader does not support .gnu.hash
- if (!IsMips && !IsAndroid && !IsHexagon) {
+@@ -285,7 +285,8 @@
+ if (!IsMips && !IsHexagon) {
if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
-- (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick))
-+ Distro.IsAdelieLinux() ||
-+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick))
+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
+- (IsAndroid && !Triple.isAndroidVersionLT(23)))
++ (IsAndroid && !Triple.isAndroidVersionLT(23)) ||
++ Distro.IsAdelieLinux())
ExtraOpts.push_back("--hash-style=gnu");
- if (Distro.IsDebian() || Distro.IsOpenSUSE() || Distro == Distro::UbuntuLucid ||
---
-2.18.0
-
+ if (Distro.IsDebian() || Distro.IsOpenSUSE() ||
diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD
index a56e16368..78db7102c 100644
--- a/user/clang/APKBUILD
+++ b/user/clang/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=7.0.1
+pkgver=8.0.0
pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
@@ -12,7 +12,8 @@ url="https://llvm.org/"
license="NCSA"
depends_dev="$pkgname=$pkgver-r$pkgrel"
makedepends="cmake isl-dev libedit-dev libexecinfo-dev libxml2-dev libxml2-utils
- llvm-dev>=$_llvmver llvm-static>=$_llvmver llvm-test-utils>=$_llvmver"
+ llvm-dev>=$_llvmver llvm-static>=$_llvmver llvm-test-utils>=$_llvmver
+ z3 z3-dev"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-analyzer::noarch"
source="https://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz
@@ -27,6 +28,7 @@ build() {
mkdir -p "$builddir"/build
cd "$builddir"/build
+ CMAKE_PREFIX_PATH=/usr/lib/llvm$_llvmver/lib/cmake \
cmake .. -Wno-dev \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -103,8 +105,8 @@ analyzer() {
mv usr/share/scan-* "$subpkgdir"/usr/share/
}
-sha512sums="df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194 cfe-7.0.1.src.tar.xz
-44aa152d50822a9e1a223b9e07e150ffa830c55deb4c4ca29e6218a0103eb263a00b41fd1ca84390e65fa08005901a0a0f88cf529bff8764220e99d06adef5fc 0001-Add-support-for-Ad-lie-Linux.patch
+sha512sums="98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 cfe-8.0.0.src.tar.xz
+c3218a1622f53bb6bef65f844e32e1b048a1ed7d5aa444a7592f9b8e8543d41438a0ac032674adb2c1bf0ef8c6fbd6880c34f8c8e778a8fd31bb542968a3547e 0001-Add-support-for-Ad-lie-Linux.patch
9485fe4fd6182df543735ed8f4ce618693d0faeafa86d3f9574a6c7abf50978e2d56e0a94be3ed94d515cc937c388d66ceff1bbc9bb120d371b6d3e95340da00 0008-Fix-ClangConfig-cmake-LLVM-path.patch
8a596e7369b5791e7e9c3278320aa5bac30d91f27d9a0df335ea862c359623869353d12145c3b64730f721600522f3acc5abe706428091482e0209e4ff308175 use-llvm-lit.patch
9dad6dfb0097f79939b743dbe7ed20274c463d9c41f061a957841c60070247a4760b676465652e2e844fc75aab9a5b7f9f4dd7632f2ff5dd5b0a335fcbd29312 secure-plt.patch"
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 98205aecb..7ebfd4e0d 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cups-filters
-pkgver=1.21.6
+pkgver=1.22.5
pkgrel=0
pkgdesc="OpenPrinting CUPS filters and backends"
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +36,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
# the pdf.utf-8 symlink isn't quite good enough
cd "$pkgdir"/usr/share/cups/charsets && \
@@ -62,4 +59,4 @@ libs() {
mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a cups-filters-1.21.6.tar.xz"
+sha512sums="ed33e6d6f090c00f0f0d1d012d3b394bfaa1f81feeb5b0b7ead1dffa2399f0165ce916a99c3bf28aca7f279bffba5b6575feff700130cabfcd46eb4c904d5c59 cups-filters-1.22.5.tar.xz"
diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index 2a7ec1437..1ef7a8908 100644
--- a/user/dolphin/APKBUILD
+++ b/user/dolphin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dolphin
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Lightweight desktop file manager"
url="https://www.kde.org/applications/system/dolphin/"
@@ -16,7 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev
baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev
baloo-widgets-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz
+ frameworks.patch
+ "
build() {
cd "$builddir"
@@ -44,4 +46,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="369592af52053550eb482fecfbb54fda3d65db75b0bcf000f88c32d4e709e056f8f5399427674b3aac0bcea438fe8fa24bdbb08109373e0c44e495d9c772da1f dolphin-18.12.3.tar.xz"
+sha512sums="6a70c2f4cb76c6d088aeb9e74963cf9da514cf66abc2f8607ea9f191888f0f0b2440c3f4e9585028a45a07b5334ed40f555d85ea0e22e31e42bd0e655e2420d7 dolphin-19.04.0.tar.xz
+4ec4b440f5ed52439152fb6132448e674f8e357413ef1eae339cfefb602a82909bceba85f5f517b51a985e3101d6be42b25bee6a4dd338a190d995deef57c708 frameworks.patch"
diff --git a/user/dolphin/frameworks.patch b/user/dolphin/frameworks.patch
new file mode 100644
index 000000000..3fc7130bb
--- /dev/null
+++ b/user/dolphin/frameworks.patch
@@ -0,0 +1,11 @@
+--- dolphin-19.04.0/CMakeLists.txt.old 2019-04-12 00:02:11.000000000 +0000
++++ dolphin-19.04.0/CMakeLists.txt 2019-04-18 20:17:53.396872289 +0000
+@@ -8,7 +8,7 @@
+ project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
+
+ set(QT_MIN_VERSION "5.8.0")
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+
+ # ECM setup
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD
index 59c394962..bb93d1c7d 100644
--- a/user/dragonplayer/APKBUILD
+++ b/user/dragonplayer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dragonplayer
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Multimedia player with a focus on simplicity"
url="https://www.kde.org/applications/multimedia/dragonplayer/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1173ca6bc1fa65161e35add94f08681de211000b571456edb41015d72f9e4a0ae2e5b1d323dcd3e599f35f54e24ce7714771e89d53c8c9a135a1641cf91e862a dragon-18.12.3.tar.xz"
+sha512sums="0783ba20c4e65c4b5db942f2d63f7ea0a42cc4cc4d42f3f0d60ad9e5029cb970515f307516174a05776baed719dcb98beffe0a8c952a5e7e1d39218ec31c4ebe dragon-19.04.0.tar.xz"
diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD
index 8d4823e3d..e24ad4d76 100644
--- a/user/ethtool/APKBUILD
+++ b/user/ethtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=ethtool
-pkgver=4.18
+pkgver=5.0
pkgrel=0
pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,13 +23,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="e77f9967be4634955640d9dccbc539455d333bcbad61326617dffea32cfd13a72a7dda4087caf6fff41b49c9ce476435cc1310e131705d0ad402685e10b4fb0e ethtool-4.18.tar.xz"
+sha512sums="9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6 ethtool-5.0.tar.xz"
diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD
index 74d46e589..e36f4621a 100644
--- a/user/ffmpegthumbs/APKBUILD
+++ b/user/ffmpegthumbs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ffmpegthumbs
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE video thumbnail system using FFmpeg"
url="https://www.KDE.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="50d15d72b4181bea11895d8fc79a898d11c21c2f5c8b5d37e046f2d03f8b4b09047d3558c763c272e6e854693797b1f7f4a093981bdaefa2f405ec5d4f66dec0 ffmpegthumbs-18.12.3.tar.xz"
+sha512sums="7e5865eaf55952aefe05418e9ca0a00afdde82ded06e08e0d1b95279939a2304efb2c320a0b9959fa558fe44ee02a922ab10caf821d489da982b7cc6ac5c4b6d ffmpegthumbs-19.04.0.tar.xz"
diff --git a/user/fuse/APKBUILD b/user/fuse/APKBUILD
index 92840ed41..690b69d51 100644
--- a/user/fuse/APKBUILD
+++ b/user/fuse/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=fuse
-pkgver=2.9.8
-pkgrel=2
+pkgver=2.9.9
+pkgrel=0
pkgdesc="Linux Filesystem in Userspace (legacy version)"
url="https://github.com/libfuse/libfuse"
arch="all"
@@ -20,7 +20,6 @@ source="https://github.com/libfuse/libfuse/releases/download/$pkgname-$pkgver/$p
# - CVE-2018-10906
build() {
- cd "$builddir"
UDEV_RULES_PATH='/lib/udev/rules.d' ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -36,10 +35,9 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
}
-sha512sums="0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad fuse-2.9.8.tar.gz
+sha512sums="3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 fuse-2.9.9.tar.gz
5672ceb35acabb4bd97b6efc30614f22def62882fe198e2a8598a074d45b6b5337c082a5e09b5e399b6e5212dc1fbde9071c2a5051534c32091444c350b9c657 fix-realpath.patch"
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index dc049071d..31ef0032c 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.2.6
+pkgver=3.5.0
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -25,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver"
# - CVE-2018-10906
build() {
- cd "$builddir"
meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -42,7 +41,6 @@ check() {
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
@@ -72,6 +70,6 @@ openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8 fuse-3.2.6.tar.xz
+sha512sums="953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27 fuse-3.5.0.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD
index f2504c535..132b8bad0 100644
--- a/user/granatier/APKBUILD
+++ b/user/granatier/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=granatier
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Clone of the classic Bomberman game"
url="https://www.kde.org/applications/games/granatier/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="af4a4201cede2d01a848b6d6c889f6019eb9298373f4e3c4faa2d9d514a8127a5b910bb701ecaada7559a91c887cca1a895c2e18cdd47c02b2569d781f5574c3 granatier-18.12.3.tar.xz"
+sha512sums="e5f7de6eb6fdac6cbf174ab1e4b52e3e748fb83a76458ae136041ed20f0a82218026b0adf8266b855bf57756962cf16938d5a38c3a5a4c1d4747b861588082f6 granatier-19.04.0.tar.xz"
diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD
index a190e69d8..3bf7c09aa 100644
--- a/user/gwenview/APKBUILD
+++ b/user/gwenview/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gwenview
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Fast and easy image viewer by KDE"
url="https://www.kde.org/applications/graphics/gwenview/"
@@ -43,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51 gwenview-18.12.3.tar.xz"
+sha512sums="bacc6e5e1702b7653c31164d57440944ecab13331b02babd6a45a3e4637b5f13cc8347d2073cf99be1811d61f666529495afac0131307696c504dc9f82dbb9e4 gwenview-19.04.0.tar.xz"
diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD
index fd3fb7da4..8dace78cd 100644
--- a/user/http-parser/APKBUILD
+++ b/user/http-parser/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=http-parser
-pkgver=2.9.1
+pkgver=2.9.2
pkgrel=0
pkgdesc="Library for parsing HTTP messages in C"
url=" "
@@ -14,18 +14,15 @@ subpackages="$pkgname-dev"
source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
make
}
check() {
- cd "$builddir"
true # tested as part of build.
}
package() {
- cd "$builddir"
make PREFIX=/usr DESTDIR="$pkgdir" install
}
-sha512sums="110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052 http-parser-2.9.1.tar.gz"
+sha512sums="fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023 http-parser-2.9.2.tar.gz"
diff --git a/user/i3lock/APKBUILD b/user/i3lock/APKBUILD
index 8080867c7..7d04a82af 100644
--- a/user/i3lock/APKBUILD
+++ b/user/i3lock/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=i3lock
-pkgver=2.11
+pkgver=2.11.1
pkgrel=0
pkgdesc="Simple X11 screen locker"
url="https://i3wm.org/i3lock/"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
source="$url/$pkgname-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
# At present, this has no functional difference.
# But when we start developing our PAM stack into something more
@@ -24,8 +23,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,8 +35,7 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c00741a66fdb5477a4b7e993d173f98fe95f0254fa74c50f83ddf8078a477d26a9fab126fbe31b509df2dbd35ed5ec64b95475621b8babf6f6c0f6db38160c8a i3lock-2.11.tar.bz2"
+sha512sums="8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c i3lock-2.11.1.tar.bz2"
diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD
index 44206a02c..e318b6f49 100644
--- a/user/juk/APKBUILD
+++ b/user/juk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=juk
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE Jukebox"
url="https://juk.kde.org/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d509892380dfc1be029debdfa6d924c996a92772cf4fd3c9bf3bfa943621d0f62a13c204867b86210f1a1a6c4895d02c8dd922176f87129dad8ce61a45b8496e juk-18.12.3.tar.xz"
+sha512sums="449e20ac1237b0f4da162c71df45ad06b38b38d160525c8b68970b6957e8643f28311d31adab85a2a853234205cd73dba7f621750113aac1d8cdc80de5f84611 juk-19.04.0.tar.xz"
diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD
index f89a60f69..4344269e1 100644
--- a/user/kalgebra/APKBUILD
+++ b/user/kalgebra/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kalgebra
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Graph calculator and plotter"
url="https://www.kde.org/applications/education/kalgebra/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e2c4dad9fc7c7ef0af2b4f6173376db9e68df7df92094efccfd9e6d4edd1bc376352d00717d29351613bbdd52a8cdb45113ae243d4092aa2f8199a010e3f336f kalgebra-18.12.3.tar.xz"
+sha512sums="b313493803a39a090c28b860f64a891a6afde90027a761861a298d878283ff764ecad626c31c42af7ba58682299cb8df5ae86c4fdb2316c4ff4b0e7ad1054337 kalgebra-19.04.0.tar.xz"
diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD
index 64f1a21b1..5e52f32cc 100644
--- a/user/kalzium/APKBUILD
+++ b/user/kalzium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kalzium
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Periodic table of elements (PSE) with calculators"
url="https://www.kde.org/applications/education/kalzium/"
@@ -43,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a03c477fc535784ed6d8007373bc172a01fb72148282858cdb4d2560daa2c31bd3daf068e5ecaa28564888573cb14997840d26bbd922a1fe0c1cf3e77e17f711 kalzium-18.12.3.tar.xz"
+sha512sums="6bbd18df09680b0eaf80aeff683aa40219e7b6bea9f60de4364e0f3abc3d894164cbac09b37e42479b1f08fcb2acd9ad3ed9b8a5eaa2cad5b861b837b7605625 kalzium-19.04.0.tar.xz"
diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD
index c0c734773..8795bad4b 100644
--- a/user/kanagram/APKBUILD
+++ b/user/kanagram/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kanagram
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Letter order (anagram) game"
url="https://www.kde.org/applications/education/kanagram/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="75e9465a6621f04f32a7ac2868fd1a8b9133c0957d75608a960919252613b01fd27369fc17543ac08bff333351719986d69738773696be1f69cd330a1aa303a7 kanagram-18.12.3.tar.xz"
+sha512sums="4b4593cd68836c4fcb14b1d0f1d7ff226daf56305ab9523bb0f3fd3f246f56df97e3cdaf83795ed18acafa8e3ca5688d787928cdd6e6726ddadd3f75693bb301 kanagram-19.04.0.tar.xz"
diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD
index ef2120b43..c2172bfe9 100644
--- a/user/kapman/APKBUILD
+++ b/user/kapman/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kapman
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Pac-Man clone"
url="https://www.kde.org/applications/games/kapman/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="512743caa897c4e2e4d3f78bc5e85a500b3bc5c810dc8ea8a28508e81a02ef230fe7dda8b9abf01b8e15c90e8172a80655951473414fda959bb1eb079bf0f210 kapman-18.12.3.tar.xz"
+sha512sums="0d4219f868eae03e082d7fef9a84fa59951b52bbc1cbfdf4cdcbc1716e448e56723669fb2415319d8f07cf3cfb0429f144960b99e5268e010772cd0af230af32 kapman-19.04.0.tar.xz"
diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD
index 0fd90e6f3..f141e07ec 100644
--- a/user/kate/APKBUILD
+++ b/user/kate/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kate
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more"
url="https://kate-editor.org/"
@@ -92,4 +92,4 @@ kwrite_lang() {
done
}
-sha512sums="2f067628d29b7f807e13d2faa2c6727a8028e273c61b4923d6a6eaeb4d74dbf0f0e83edf492821b228ccbe99a985cf712cfd75b9d6ea8d16af9b1ff7ec8ac00d kate-18.12.3.tar.xz"
+sha512sums="4dc3cd8ee18ba994f7000b647644d7735659de52de66b3adc65d5f2283056961a7d4d3228d66f4de52b80e4c012a243ed5c95fe00066e6ad5eb8a4569f2d22d9 kate-19.04.0.tar.xz"
diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD
index a96cb5759..de64024dc 100644
--- a/user/katomic/APKBUILD
+++ b/user/katomic/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=katomic
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Fun, educational game involving molecular geometry"
url="https://games.kde.org/game.php?game=katomic"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d47313b345c4b4dbe95dacf61a8435239da38a4acd4491ae7910f4fb70c8d2d5cdc85f5932bf86871c3af1da6fa99fdc703bd75b92ffdb6a9780a09a6e3c3055 katomic-18.12.3.tar.xz"
+sha512sums="cc71f51db90edccd1876d1ba7f5c64ede5a68b602fcf315f90535746161fb00175149933a47b6471fd2dc0fb37091577bb86d548c4cf22cf8e07e9916f96f384 katomic-19.04.0.tar.xz"
diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD
index 38b727182..76ecbaed5 100644
--- a/user/kblackbox/APKBUILD
+++ b/user/kblackbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kblackbox
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Hide-and-seek logic game"
url="https://www.kde.org/applications/games/kblackbox/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="888d5c00b3f05b4d26c8f898b85d73210ad01260c20f049f9da29fac9f7bc83e1ca9940ca489119313b976ec764b89dbd5acac3fa1f78c6a28205b1c3fc858e5 kblackbox-18.12.3.tar.xz"
+sha512sums="4433b75658496dc661916a472ec9d4da02d59927e12f5fffa78bd22af8b60d51d127ffdc39cc2ee77998112562df1f99856e321097885c55befed9c09bc0ffd7 kblackbox-19.04.0.tar.xz"
diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD
index 4ec273c96..7b4624c91 100644
--- a/user/kblocks/APKBUILD
+++ b/user/kblocks/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kblocks
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Falling blocks game"
url="https://www.kde.org/applications/games/kblocks/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="bdefc1f640bbff779e2681a66733d1ba783239984849a4c6c8af9584155388723ad82abe1577989475ee6d91e8c51e39a565e443b55429da12299fdea33422fb kblocks-18.12.3.tar.xz"
+sha512sums="727104bdf7624f58ea18fe24915f4bda8dd6497349dbcefd7beb3ef83a923b02e477bfff5a4c2615e67e53df5c0300a83f731d72e8eb7458376ab7755a4806a4 kblocks-19.04.0.tar.xz"
diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD
index c2c4fc9c3..d0391ac3e 100644
--- a/user/kbounce/APKBUILD
+++ b/user/kbounce/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbounce
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Puzzle/arcade game to build walls"
url="https://games.kde.org/game.php?game=kbounce"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b41a63edcf4d4f36b756929df55ddc17b5d345ad58cca8df251226de0ce43503f19726e9ffc5491374919f83d4767b3b753fb248958396e82163f7ab96e83536 kbounce-18.12.3.tar.xz"
+sha512sums="8763fda324fa8a464273b1281490599db952c3a413dba9a47564e0aa43f241b4770d705d60af0c1dee42e88d30b2ae608eaa4800242d09ed70648e0202502782 kbounce-19.04.0.tar.xz"
diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD
index 6f1392c57..a53f997ed 100644
--- a/user/kbreakout/APKBUILD
+++ b/user/kbreakout/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbreakout
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Break-Out like game with a ball and paddle"
url="https://games.kde.org/game.php?game=kbreakout"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5e0e2763ab4e8a5ce8eab78bbfd8e267e5efdf8151fd0e66d6cfdb174aed402a4ce5c02b3fcf2614c07f5726ff34fe6d636c238c4711302fc148c19af8f901d3 kbreakout-18.12.3.tar.xz"
+sha512sums="a737eeb426f4a042ae2fde1f59824a966037f53021887eb25ea9727e1cace31cd0c8ae649c42a1d10f060bbcd30c0f71cf49960e7ff09284c34de854c96e34e8 kbreakout-19.04.0.tar.xz"
diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD
index 0d841c20a..0515b1969 100644
--- a/user/kbruch/APKBUILD
+++ b/user/kbruch/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbruch
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Practice calculating percentages and fractions"
url="https://www.kde.org/applications/education/kbruch/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="91375dcebf526b861103573a293a722aa1ce960bedfd2b3ac1ddc606395b84e1c65e1f7532b24789e1c5dc60f0a05e6c73eb26094bfc3810a8898c1ba10c7b56 kbruch-18.12.3.tar.xz"
+sha512sums="cd7e3cf6ff9f3a3bf88370cb0b562cc212c255259129f94ff5a1b7fac3df18a7fa0831914430a42772b4f51cd2d022fb91df5278939a33e752daa63e7b5de7cd kbruch-19.04.0.tar.xz"
diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD
index b61847991..cc72cdf0f 100644
--- a/user/kcachegrind/APKBUILD
+++ b/user/kcachegrind/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcachegrind
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Profile data visualisation tool and call graph viewer"
url="https://kcachegrind.github.io/html/Home.html"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c22a442fad73921e098c66cefbffc999990b2082ad400dce195efea77bbfc6f2741f24ca0ee38d5eac7664663081d28cccf33f5c6e8c6e1fadaf67c9dc7e65bc kcachegrind-18.12.3.tar.xz"
+sha512sums="ed0f1115f8d3cd4a8acc9c87a0d78e1d4ec2f3bb6701a8a00a759549f8a3d59912e1e4a0fa1c943a04957d5bc7ff6f4bc1dae492aece2e1027d56ec248c28643 kcachegrind-19.04.0.tar.xz"
diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD
index 0433fd73b..6166baa25 100644
--- a/user/kcalc/APKBUILD
+++ b/user/kcalc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcalc
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Calculator with many mathematical, scientific, and logic functions"
url="https://utils.kde.org/projects/kcalc/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="be4d7fd59f3ce6c63426a4aad4a388e4123397ab06c44441213754ec6e935217859c5960cfaf76ed0537400f51c35a74a6413a6c2bbe3466d045ea6ccd7ea45f kcalc-18.12.3.tar.xz"
+sha512sums="ff33b7d7055ed957fa3092fdb3f85069eb10c5594a6e952d96bd7a3eb9480d4e4a1234c1ef8b0a0e3ab2bed4e56f4970954d60ccd30b1ddbea6904f1ab65132c kcalc-19.04.0.tar.xz"
diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD
index dcaab53ea..bb475c212 100644
--- a/user/kcharselect/APKBUILD
+++ b/user/kcharselect/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcharselect
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Tool to select special characters from all installed fonts"
url="https://utils.kde.org/projects/kcharselect/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eea89de5285ffb1afa744e7482423721026dd1c8ad0ce32720f2c8fecf105505e94b035f12b19d69e518fc27656257fbd5d1e3e578a5b1047f4d361bb4d77e7f kcharselect-18.12.3.tar.xz"
+sha512sums="44f22ee2a0f9a1b0fb5b277fda467ec05612ca51b874ab233cde46e6acd6c3bcef3f3e48f0e648e7687c23ce6975d43b160d7274d86c176ab1a018ad05d21d90 kcharselect-19.04.0.tar.xz"
diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD
index 136d2a814..703731ea1 100644
--- a/user/kcolorchooser/APKBUILD
+++ b/user/kcolorchooser/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcolorchooser
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple application to choose a colour from the screen"
url="https://www.kde.org/applications/graphics/kcolorchooser/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="27e6cc50cdb04f502746a17cf463751173f8f8e057ae1d3d31ae6cb5b10e29123649da755a65f9f7d505d99f585f47905de7a5d3b4f914c7fc84b41d58b7be6a kcolorchooser-18.12.3.tar.xz"
+sha512sums="e78923102c7d1b737de03108ffd74324cd5e653cd760c11b9f34bb41daccb2867f4bd64d8a2cc80363ddd359a79d2c5e93991fa943d8fb651b6a40c0c991b82d kcolorchooser-19.04.0.tar.xz"
diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD
index e492802ff..558358620 100644
--- a/user/kconfigwidgets/APKBUILD
+++ b/user/kconfigwidgets/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kconfigwidgets
pkgver=5.54.0
-pkgrel=0
+pkgrel=1
pkgdesc="Framework providing widgets for software configuration"
url="https://www.kde.org/"
arch="all"
@@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev kauth-dev kcodecs-dev kconfig-dev kguiaddons-dev
ki18n-dev kwidgetsaddons-dev kdoctools-dev"
makedepends="$depends_dev cmake extra-cmake-modules doxygen qt5-qttools-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz
+ languagename.patch
+ "
build() {
cd "$builddir"
@@ -42,4 +44,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz"
+sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz
+3b1abbd9b5cef4400a8a962cef4f8a3614f49700fdf9df25e709a8105d9e59429102aa94b8a47fa35e7dcb9d39ba5bbfd8485743fa6f64155bef3aa1afb4bb9e languagename.patch"
diff --git a/user/kconfigwidgets/languagename.patch b/user/kconfigwidgets/languagename.patch
new file mode 100644
index 000000000..d3eb89f54
--- /dev/null
+++ b/user/kconfigwidgets/languagename.patch
@@ -0,0 +1,716 @@
+From 91077def022a999ce46c91347f1167626266f460 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 7 Jan 2019 11:42:28 +0100
+Subject: Add KLanguageName
+
+Summary: KLanguageName is a helper namespace that returns the name of a given language code.
+
+Reviewers: apol
+
+Reviewed By: apol
+
+Subscribers: hein, kde-frameworks-devel, sitter, markg, apol
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D10446
+---
+ autotests/CMakeLists.txt | 27 ++++++
+ .../kf5_entry_data.cmake/locale/ca/kf5_entry.cmake | 98 ++++++++++++++++++++++
+ .../kf5_entry_data.cmake/locale/de/kf5_entry.cmake | 98 ++++++++++++++++++++++
+ .../locale/en_US/kf5_entry.cmake | 44 ++++++++++
+ autotests/kf5_entry_data.cmake/locale/es/.keep | 0
+ .../kf5_entry_data.cmake/locale/fr/kf5_entry.cmake | 2 +
+ .../kf5_entry_data.cmake/locale/pt/kf5_entry.cmake | 98 ++++++++++++++++++++++
+ autotests/klanguagenametest.cpp | 92 ++++++++++++++++++++
+ src/CMakeLists.txt | 2 +
+ src/klanguagename.cpp | 67 +++++++++++++++
+ src/klanguagename.h | 63 ++++++++++++++
+ 11 files changed, 591 insertions(+)
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/es/.keep
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake
+ create mode 100644 autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake
+ create mode 100644 autotests/klanguagenametest.cpp
+ create mode 100644 src/klanguagename.cpp
+ create mode 100644 src/klanguagename.h
+
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index 1917ecb..37caaf9 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -9,5 +9,32 @@ set(kconfigdialog_unittest_SRCS kconfigdialog_unittest.cpp)
+ kconfig_add_kcfg_files(kconfigdialog_unittest_SRCS GENERATE_MOC signaltest.kcfgc)
+ ecm_add_test(${kconfigdialog_unittest_SRCS} TEST_NAME "kconfigdialog_unittest" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets)
+
++set(lang_entries
++ ca
++ de
++ en_US
++ es # must not have file!
++ fr
++ pt
++)
++
++# scripty would mangle all *.desktop files, since that'd have potential of
++# breaking the test we'll need to bypass scripty by not having our files called
++# .desktop!
++# Do note that we pop these into CMAKE_LIBRARY_OUTPUT_DIRECTORY so QFINDTESTDATA
++# is able to find the fixtures in the bin dir as KDECMakeSettings sets a special
++# output dir.
++foreach(lang ${lang_entries})
++ set(src_dir "${CMAKE_CURRENT_SOURCE_DIR}/kf5_entry_data.cmake/locale/${lang}")
++ set(src_file "${src_dir}/kf5_entry.cmake")
++ set(bin_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf5_entry_data/locale/${lang}")
++ set(bin_file "${bin_dir}/kf5_entry.desktop")
++ file(MAKE_DIRECTORY ${bin_dir})
++ if(EXISTS ${src_file}) # not all languages have entries
++ configure_file(${src_file} ${bin_file} COPYONLY)
++ endif()
++endforeach()
++
++ecm_add_test(klanguagenametest.cpp LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets)
+
+ ecm_add_test(krecentfilesactiontest.cpp TEST_NAME "krecentfilesaction_test" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets)
+diff --git a/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake
+new file mode 100644
+index 0000000..a81564c
+--- /dev/null
++++ b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake
+@@ -0,0 +1,98 @@
++[KCM Locale]
++Name=Catalan
++Name[af]=Katelaans
++Name[ar]=الكاتالانيّة
++Name[as]=কাটালান
++Name[be]=Каталонская
++Name[be@latin]=Katalanskaja
++Name[bg]=Каталонски
++Name[bn]=ক্যাটালান
++Name[bn_IN]=ক্যাটালান
++Name[br]=Katalaneg
++Name[bs]=katalonski
++Name[ca]=Català
++Name[ca@valencia]=Català
++Name[cs]=Katalánský
++Name[csb]=Katalońsczi
++Name[cy]=Catalaneg
++Name[da]=Catalansk
++Name[de]=Katalanisch
++Name[el]=Καταλανικά
++Name[en_GB]=Catalan
++Name[eo]=Kataluna
++Name[es]=Catalán
++Name[et]=Katalaani
++Name[eu]=Katalaniera
++Name[fa]=کاتالان
++Name[fi]=Katalaani
++Name[fr]=Catalan
++Name[fy]=Katalaansk
++Name[ga]=Catalóinis
++Name[gd]=Catalanais
++Name[gl]=Catalán
++Name[gu]=કેટેલાન
++Name[he]=קטלונית
++Name[hi]=केटेलन
++Name[hne]=केटेलन
++Name[hr]=Katalonski
++Name[hsb]=Katalansce
++Name[hu]=Katalán
++Name[ia]=Catalan
++Name[id]=Catalan
++Name[is]=Katalónska
++Name[it]=Catalano
++Name[ja]=カタロニア語
++Name[kk]=Каталанша
++Name[km]=កាតាឡាន
++Name[kn]=ಕ್ಯಾಟಲಾನ್
++Name[ko]=카탈루냐어
++Name[ku]=Katalan
++Name[lb]=Katalanesch
++Name[lt]=Katalonų
++Name[lv]=Kataloņu
++Name[mai]=केटालान
++Name[mk]=Каталонски
++Name[ml]=കറ്റാലന്‍
++Name[mr]=केटेलन
++Name[ms]=Catalan
++Name[nb]=Katalansk
++Name[nds]=Katalaansch
++Name[ne]=कातालान
++Name[nl]=Catalaans
++Name[nn]=Katalansk
++Name[oc]=Catalan
++Name[or]=କେଟାଲାନ
++Name[pa]=ਕਾਟਾਲਾਨ
++Name[pl]=Kataloński
++Name[ps]=کېټېلېن
++Name[pt]=Catalão
++Name[pt_BR]=Catalão
++Name[ro]=Catalană
++Name[ru]=Каталонский
++Name[se]=Katalánagiella
++Name[si]=කැටලන්
++Name[sk]=Katalánčina
++Name[sl]=Katalonščina
++Name[sq]=Katalanisht
++Name[sr]=каталонски
++Name[sr@ijekavian]=каталонски
++Name[sr@ijekavianlatin]=katalonski
++Name[sr@latin]=katalonski
++Name[sv]=Katalanska
++Name[ta]=கெடலான்
++Name[te]=కెటలన్
++Name[tg]=Каталанӣ
++Name[th]=ภาษาคาตาลัน
++Name[tr]=Katalanca
++Name[tt]=Каталон
++Name[ug]=كاتالانچە
++Name[uk]=Каталанська
++Name[uz]=Katalancha
++Name[uz@cyrillic]=Каталанча
++Name[vi]=Catalan
++Name[wa]=Catalan
++Name[xh]=Catalan
++Name[x-test]=xxCatalanxx
++Name[zh_CN]=加泰罗尼亚语
++Name[zh_HK]=加泰隆尼亞語
++Name[zh_TW]=加泰羅尼亞語
+diff --git a/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake
+new file mode 100644
+index 0000000..e8146cb
+--- /dev/null
++++ b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake
+@@ -0,0 +1,98 @@
++[KCM Locale]
++Name=German
++Name[af]=Duits
++Name[ar]=الألمانيّة
++Name[as]=জাৰ্মান
++Name[be]=Нямецкая
++Name[be@latin]=Niamieckaja
++Name[bg]=Немски
++Name[bn]=জার্মান
++Name[bn_IN]=জার্মান
++Name[br]=Alamaneg
++Name[bs]=njemački
++Name[ca]=Alemany
++Name[ca@valencia]=Alemany
++Name[cs]=Německý
++Name[csb]=Miemiecczi
++Name[cy]=Almaeneg
++Name[da]=Tysk
++Name[de]=Deutsch
++Name[el]=Γερμανικά
++Name[en_GB]=German
++Name[eo]=Germana
++Name[es]=Alemán
++Name[et]=Saksa
++Name[eu]=Alemana
++Name[fa]=آلمانی
++Name[fi]=Saksa
++Name[fr]=Allemand
++Name[fy]=Dútsk
++Name[ga]=Gearmáinis
++Name[gd]=Gearmailtis
++Name[gl]=Alemán
++Name[gu]=જર્મન
++Name[he]=גרמנית
++Name[hi]=जर्मन
++Name[hne]=जर्मन
++Name[hr]=Njemački
++Name[hsb]=Němsce
++Name[hu]=Német
++Name[ia]=Germano
++Name[id]=Jerman
++Name[is]=Þýska
++Name[it]=Tedesco
++Name[ja]=ドイツ語
++Name[kk]=Немісше
++Name[km]=អាល្លឺម៉ង់
++Name[kn]=ಜರ್ಮನ್
++Name[ko]=독일어
++Name[ku]=Almanî
++Name[lb]=Däitsch
++Name[lt]=Vokiečių
++Name[lv]=Vācu
++Name[mai]=जर्मन
++Name[mk]=Германски
++Name[ml]=ജര്‍മ്മന്‍
++Name[mr]=जर्मन
++Name[ms]=Jerman
++Name[nb]=Tysk
++Name[nds]=Hoochdüütsch
++Name[ne]=जर्मनी
++Name[nl]=Duits
++Name[nn]=Tysk
++Name[oc]=Aleman
++Name[or]=ଜର୍ମାନ
++Name[pa]=ਜਰਮਨ
++Name[pl]=Niemiecki
++Name[ps]=جرمني
++Name[pt]=Alemão
++Name[pt_BR]=Alemão
++Name[ro]=Germană
++Name[ru]=Немецкий
++Name[se]=Duiskkagiella
++Name[si]=ජර්මානු
++Name[sk]=Nemčina
++Name[sl]=Nemščina
++Name[sq]=Gjermanisht
++Name[sr]=немачки
++Name[sr@ijekavian]=њемачки
++Name[sr@ijekavianlatin]=njemački
++Name[sr@latin]=nemački
++Name[sv]=Tyska
++Name[ta]=ஜெர்மன்
++Name[te]=జెర్మన్
++Name[tg]=Олмонӣ
++Name[th]=ภาษาเยอรมัน
++Name[tr]=Almanca
++Name[tt]=Алман
++Name[ug]=گېرمانچە
++Name[uk]=Німецька
++Name[uz]=Olmoncha
++Name[uz@cyrillic]=Олмонча
++Name[vi]=Đức
++Name[wa]=Almand
++Name[xh]=German
++Name[x-test]=xxGermanxx
++Name[zh_CN]=德语
++Name[zh_HK]=德語
++Name[zh_TW]=德語
+diff --git a/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake
+new file mode 100644
+index 0000000..6033ad4
+--- /dev/null
++++ b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake
+@@ -0,0 +1,44 @@
++[KCM Locale]
++Name=US English
++Name[ar]=الإنجليزية الأمريكية
++Name[bs]=Američki engleski
++Name[ca]=Anglès US
++Name[ca@valencia]=Anglés US
++Name[cs]=US Angličtina
++Name[da]=US Engelsk
++Name[de]=US-Englisch
++Name[el]=US English
++Name[en_GB]=US English
++Name[es]=Inglés de EE. UU.
++Name[et]=USA inglise
++Name[eu]=AEBtako ingelesa
++Name[fi]=Amerikanenglanti
++Name[fr]=Anglais (États-Unis)
++Name[gd]=Beurla (SA)
++Name[gl]=Inglés americano
++Name[he]=אנגלית ארה"ב
++Name[hu]=Angol (amerikai)
++Name[ia]=Anglese de S.U.A.
++Name[id]=Inggris US
++Name[it]=Inglese US
++Name[ko]=미국 영어
++Name[lt]=JAV anglų
++Name[nb]=Engelsk (USA)
++Name[nl]=VS Engels
++Name[nn]=Engelsk (USA)
++Name[pl]=Angielski amerykański
++Name[pt]=Inglês dos EUA
++Name[pt_BR]=Inglês dos EUA
++Name[ru]=Английский (США)
++Name[sk]=Americká angličtina
++Name[sl]=ameriško angleško
++Name[sr]=амерички енглески
++Name[sr@ijekavian]=амерички енглески
++Name[sr@ijekavianlatin]=američki engleski
++Name[sr@latin]=američki engleski
++Name[sv]=Amerikansk engelska
++Name[tr]=ABD İngilizcesi
++Name[uk]=Англійська (США)
++Name[x-test]=xxUS Englishxx
++Name[zh_CN]=美国英语
++Name[zh_TW]=美式英文
+diff --git a/autotests/kf5_entry_data.cmake/locale/es/.keep b/autotests/kf5_entry_data.cmake/locale/es/.keep
+new file mode 100644
+index 0000000..e69de29
+diff --git a/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake
+new file mode 100644
+index 0000000..4f248b9
+--- /dev/null
++++ b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake
+@@ -0,0 +1,2 @@
++[KCM Locale]
++Name=French
+diff --git a/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake
+new file mode 100644
+index 0000000..6e555d0
+--- /dev/null
++++ b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake
+@@ -0,0 +1,98 @@
++[KCM Locale]
++Name=Portuguese
++Name[af]=Portugese
++Name[ar]=البرتغاليّة
++Name[as]=প'ৰ্টুগিছ্‌
++Name[be]=Партугальская
++Name[be@latin]=Partuhalskaja
++Name[bg]=Португалски
++Name[bn]=পর্তুগীজ
++Name[bn_IN]=পোর্তুগিজ
++Name[br]=Portugaleg
++Name[bs]=portugalski
++Name[ca]=Portuguès
++Name[ca@valencia]=Portugués
++Name[cs]=Portugalský
++Name[csb]=Pòrtugalsczi
++Name[cy]=Portiwgaleg
++Name[da]=Portugisisk
++Name[de]=Portugiesisch
++Name[el]=Πορτογαλικά
++Name[en_GB]=Portuguese
++Name[eo]=Portugala
++Name[es]=Portugués
++Name[et]=Portugali
++Name[eu]=Portugesa
++Name[fa]=پرتغالی
++Name[fi]=Portugali
++Name[fr]=Portugais
++Name[fy]=Portugeesk
++Name[ga]=Portaingéilis
++Name[gd]=Portagailis
++Name[gl]=Portugués
++Name[gu]=પોર્ટુગીઝ
++Name[he]=פורטוגזית
++Name[hi]=पुर्तगाली
++Name[hne]=पुर्तगाली
++Name[hr]=Portugalski
++Name[hsb]=Portugalsce
++Name[hu]=Portugál
++Name[ia]=Portugese
++Name[id]=Portugis
++Name[is]=Portúgalska
++Name[it]=Portoghese
++Name[ja]=ポルトガル語
++Name[kk]=Португалша
++Name[km]=ព័រទុយហ្គាល់
++Name[kn]=ಪೋರ್ಚುಗೀಸ್
++Name[ko]=포르투갈어
++Name[ku]=Portûgalî
++Name[lb]=Portugisesch
++Name[lt]=Portugalų
++Name[lv]=Portugāļu
++Name[mai]=पुर्तगाली
++Name[mk]=Португалски
++Name[ml]=പോര്‍ച്ചുഗീസ്
++Name[mr]=पोर्तुगीज
++Name[ms]=Portugis
++Name[nb]=Portugisisk
++Name[nds]=Portugeesch
++Name[ne]=पोर्तुगाली
++Name[nl]=Portugees
++Name[nn]=Portugisisk
++Name[oc]=Portugués
++Name[or]=ପର୍ତ୍ତୁଗିଜ
++Name[pa]=ਪੁਰਤਗਾਲੀ
++Name[pl]=Portugalski
++Name[ps]=پورټګيز
++Name[pt]=Português
++Name[pt_BR]=Português
++Name[ro]=Portugheză
++Name[ru]=Португальский
++Name[se]=Portugálagiella
++Name[si]=පෘතුගීසි
++Name[sk]=Portugalčina
++Name[sl]=Portugalščina
++Name[sq]=Portugalisht
++Name[sr]=португалски
++Name[sr@ijekavian]=португалски
++Name[sr@ijekavianlatin]=portugalski
++Name[sr@latin]=portugalski
++Name[sv]=Portugisiska
++Name[ta]=போர்த்துக்கீசிய
++Name[te]=పొర్ట్యుగీస్
++Name[tg]=Португалӣ
++Name[th]=ภาษาโปรตุเกส
++Name[tr]=Portekizce
++Name[tt]=Португал
++Name[ug]=پورتۇگالچە
++Name[uk]=Португальська
++Name[uz]=Portugalcha
++Name[uz@cyrillic]=Португалча
++Name[vi]=Bồ Đào Nha
++Name[wa]=Portuguès
++Name[xh]=Portuguese
++Name[x-test]=xxPortuguesexx
++Name[zh_CN]=葡萄牙语
++Name[zh_HK]=葡萄牙語
++Name[zh_TW]=葡萄牙語
+diff --git a/autotests/klanguagenametest.cpp b/autotests/klanguagenametest.cpp
+new file mode 100644
+index 0000000..bb2b3d9
+--- /dev/null
++++ b/autotests/klanguagenametest.cpp
+@@ -0,0 +1,96 @@
++/*
++ Copyright (c) 2018 Harald Sitter <sitter@kde.org>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) version 3, or any
++ later version accepted by the membership of KDE e.V. (or its
++ successor approved by the membership of KDE e.V.), which shall
++ act as a proxy defined in Section 6 of version 3 of the license.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with this library. If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#include <QObject>
++#include <QtTest>
++
++#include "klanguagename.h"
++
++static void setEnvironment()
++{
++ qputenv("LANG", "C.UTF-8");
++ qputenv("LANGUAGE", "en");
++ qputenv("XDG_DATA_DIRS", qUtf8Printable(QFINDTESTDATA("kf5_entry_data")));
++ // There is a distinct chance of the envionrment setup being to late and
++ // causing flakey results based on the execution env.
++ // Make sure we definitely default to english.
++ QLocale::setDefault(QLocale::English);
++
++ // NOTE
++ // - fr has no translations
++ // - es has no kf5_entry at all
++ // - other languages under testing are complete
++}
++
++class KLanguageNameTest : public QObject
++{
++ Q_OBJECT
++
++private Q_SLOTS:
++ void testNameForCode()
++ {
++ // This is somewhat wrong, it should not say US.
++ QCOMPARE(KLanguageName::nameForCode("en"), QString("US English"));
++
++ QCOMPARE(KLanguageName::nameForCode("de"), QString("German"));
++ QCOMPARE(KLanguageName::nameForCode("pt"), QString("Portuguese"));
++ QCOMPARE(KLanguageName::nameForCode("ca"), QString("Catalan"));
++ }
++
++ void testNameForCodeInLocale()
++ {
++ // This is somewhat wrong, it should not say US.
++ QCOMPARE(KLanguageName::nameForCodeInLocale("en", "de"), QString("US-Englisch"));
++
++ QCOMPARE(KLanguageName::nameForCodeInLocale("de", "de"), QString("Deutsch"));
++ QCOMPARE(KLanguageName::nameForCodeInLocale("pt", "de"), QString("Portugiesisch"));
++ QCOMPARE(KLanguageName::nameForCodeInLocale("ca", "de"), QString("Katalanisch"));
++ }
++
++ void testNoTranslation()
++ {
++ // This has an entry file but no translation => QLocale.
++ QCOMPARE(KLanguageName::nameForCode("fr"), QString("French"));
++ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "de"), QString("French"));
++ // When in the same language, use the native name.
++ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "fr"), QString("français"));
++ }
++
++ void testNoEntry()
++ {
++ // This has no entry file => QLocale.
++ QCOMPARE(KLanguageName::nameForCode("es"), QString("Spanish"));
++ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "de"), QString("Spanish"));
++ // When in the same language, use the native name.
++ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "es"), QString("español de España"));
++ }
++
++ void testNoString()
++ {
++ // Qt doesn't have za support, we have no test fixture, so no string.
++ QCOMPARE(KLanguageName::nameForCode("za"), QString());
++ }
++};
++
++Q_COREAPP_STARTUP_FUNCTION(setEnvironment)
++
++QTEST_GUILESS_MAIN(KLanguageNameTest)
++
++#include "klanguagenametest.moc"
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a35cf3c..09fe50b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -8,6 +8,7 @@ set(kconfigwidgets_SRCS
+ kcmodule.cpp
+ khelpclient.cpp
+ klanguagebutton.cpp
++ klanguagename.cpp
+ kpastetextaction.cpp
+ krecentfilesaction.cpp
+ kstandardaction.cpp
+@@ -52,6 +53,7 @@ ecm_generate_headers(KConfigWidgets_HEADERS
+ KCModule
+ KHelpClient
+ KLanguageButton
++ KLanguageName
+ KPasteTextAction
+ KRecentFilesAction
+ KViewStateMaintainer
+diff --git a/src/klanguagename.cpp b/src/klanguagename.cpp
+new file mode 100644
+index 0000000..6e1a519
+--- /dev/null
++++ b/src/klanguagename.cpp
+@@ -0,0 +1,67 @@
++/*
++ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org>
++ * (c) 2007 David Jarvie <software@astrojar.org.uk>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#include "klanguagename.h"
++#include "kconfigwidgets_debug.h"
++
++#include <kconfig.h>
++#include <kconfiggroup.h>
++
++QString KLanguageName::nameForCode(const QString &code)
++{
++ const QStringList parts = QLocale().name().split(QChar('_'));
++ return nameForCodeInLocale(code, parts.at(0));
++}
++
++QString KLanguageName::nameForCodeInLocale(const QString &code, const QString &outputCode)
++{
++ const QString realCode = code == QStringLiteral("en") ? QStringLiteral("en_US") : code;
++ const QString realOutputCode = outputCode == QStringLiteral("en") ? QStringLiteral("en_US") : outputCode;
++
++ const QString entryFile =
++ QStandardPaths::locate(QStandardPaths::GenericDataLocation,
++ QStringLiteral("locale") + QLatin1Char('/') + realCode + QStringLiteral("/kf5_entry.desktop"));
++ if (!entryFile.isEmpty()) {
++ KConfig entry(entryFile, KConfig::SimpleConfig);
++ entry.setLocale(realOutputCode);
++ const KConfigGroup group(&entry, "KCM Locale");
++ const QString name = group.readEntry("Name");
++
++ // KConfig doesn't have a way to say it didn't find the entry in
++ // realOutputCode and returned the english version so we check for the
++ // english version, if it's equal to the "non-english" version we'll use
++ // otherwise we defer to QLocale.
++ entry.setLocale("en_US");
++ const QString englishName = group.readEntry("Name");
++ if (name != englishName || realOutputCode == QStringLiteral("en_US")) {
++ return name;
++ }
++ }
++
++ const QLocale locale(realCode);
++ if (locale != QLocale::c()) {
++ if (realCode == realOutputCode) {
++ return locale.nativeLanguageName();
++ }
++ return QLocale::languageToString(locale.language());
++ }
++
++ return QString();
++}
+diff --git a/src/klanguagename.h b/src/klanguagename.h
+new file mode 100644
+index 0000000..51dc6dd
+--- /dev/null
++++ b/src/klanguagename.h
+@@ -0,0 +1,63 @@
++/*
++ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org>
++ * (c) 2001 Martijn Klingens <klingens@kde.org>
++ * (c) 2007 David Jarvie <software@astrojar.org.uk>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef KLANGUAGENAME_H
++#define KLANGUAGENAME_H
++
++#include "kconfigwidgets_export.h"
++
++class QString;
++
++/**
++ * @class KLanguageName klanguagename.h KLanguageName
++ *
++ * KLanguageName is a helper namespace that returns the name of a given language code.
++ *
++ * @since 5.55
++ *
++ */
++namespace KLanguageName
++{
++ /**
++ * Returns the name of the given language code in the current locale.
++ *
++ * If it can't be found in the current locale it returns the name in English.
++ *
++ * It it can't be found in English either it returns an empty QString.
++ *
++ * @param code code (ISO 639-1) of the language whose name is wanted.
++ */
++ KCONFIGWIDGETS_EXPORT QString nameForCode(const QString &code);
++
++ /**
++ * Returns the name of the given language code in the other given locale code.
++ *
++ * If it can't be found in the given locale it returns the name in English.
++ *
++ * It it can't be found in English either it returns an empty QString.
++ *
++ * @param code code (ISO 639-1) of the language whose name is wanted.
++ * @param outputLocale code (ISO 639-1) of the language in which we want the name in.
++ */
++ KCONFIGWIDGETS_EXPORT QString nameForCodeInLocale(const QString &code, const QString &outputLocale);
++}
++
++#endif
+--
+cgit v1.1
+
diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
index af3f78ab5..c0b27cc8c 100644
--- a/user/kde-education/APKBUILD
+++ b/user/kde-education/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-education
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Educational software from the KDE Software Collection"
url="https://www.kde.org/applications/education/"
diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD
index 221120015..af1dbc524 100644
--- a/user/kde-games/APKBUILD
+++ b/user/kde-games/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-games
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="The KDE games collection"
url="https://www.kde.org/applications/games/"
diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD
index 95112536d..ce02896ba 100644
--- a/user/kde-graphics/APKBUILD
+++ b/user/kde-graphics/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-graphics
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Graphics software from the KDE Software Collection"
url="https://www.kde.org/applications/graphics/"
diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD
index bb36aeb40..b0243b827 100644
--- a/user/kde-multimedia/APKBUILD
+++ b/user/kde-multimedia/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-multimedia
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Multimedia software from the KDE Software Collection"
url="https://www.kde.org/applications/multimedia/"
diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD
index 2507670a3..0cdea4ab0 100644
--- a/user/kde-system/APKBUILD
+++ b/user/kde-system/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-system
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="System utiltiies from the KDE Software Collection"
url="https://www.kde.org/applications/system/"
diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD
index 24e00fd7d..4664b2b9c 100644
--- a/user/kde-utilities/APKBUILD
+++ b/user/kde-utilities/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-utilities
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Desktop utiltiies from the KDE Software Collection"
url="https://www.kde.org/applications/utilities/"
diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD
index f3504d35f..492eb3313 100644
--- a/user/kdegraphics-thumbnailers/APKBUILD
+++ b/user/kdegraphics-thumbnailers/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdegraphics-thumbnailers
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE thumbnailing sofware"
url="https://www.KDE.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4e353f782d0f5acb3a6755f2868585b37c7527c5678b06f964ab78e902bcef97adfe882171690a029f3fca8c1b1805f0b89ee8fa71140b5ef8344d042bb6e109 kdegraphics-thumbnailers-18.12.3.tar.xz"
+sha512sums="a41e9bab2ced645855aefcba5a8c9b73b9405941ca5059edcf830c96eca2cd9eb167ce4c6f9cf53e378e6b784d6bcbe6a7065d6f1b3deebcc4e660c9452aa4e5 kdegraphics-thumbnailers-19.04.0.tar.xz"
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
index ecdcfc4a3..25c92d9ad 100644
--- a/user/kdenlive/APKBUILD
+++ b/user/kdenlive/APKBUILD
@@ -1,11 +1,15 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdenlive
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Libre video editor"
url="https://kdenlive.org/"
arch="all"
+options="!check" # keyframetest.cpp seems to be broken:
+ # it claims the KeyframeModel cannot be constructed,
+ # and then abort(3)s with an assertion in QAbstractItemModel
+ # I believe the fakeit/Mock code is subtly broken somewhere.
license="GPL-2.0-only"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
@@ -13,7 +17,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev
kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev
knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev
- kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev"
+ kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev
+ kdeclarative-dev qt5-qtmultimedia-dev rttr-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz"
@@ -43,4 +48,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9a05a48d7b2b958cc34fc1fd673af519861a0275f28d5b6774280e1b5eff009fa90a920d888466b70d2b07aecb3129892b6762d75d93106051c51c7a440fbfdc kdenlive-18.12.3.tar.xz"
+sha512sums="4b3d203fcbcc83130f68f27d960b2d0b77b312edbb8654fa2df4d44d66ac0273389463f153012e72da09988559168e86b5b0a9a13ad0857969a561c76e5ac5e0 kdenlive-19.04.0.tar.xz"
diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD
index c9555acb1..93c075bb6 100644
--- a/user/kdf/APKBUILD
+++ b/user/kdf/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdf
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="View disk usage information"
url="https://utils.kde.org/projects/kdf/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6e604d18715dd5b743d63fe01528bfd347528f140638eed1900ae76a88911b2a2aea359e2603a17e82e7990a63c47789eb3b5839affb3a449547d9c89352444e kdf-18.12.3.tar.xz"
+sha512sums="fbb72fa7d4ed54975e823b86ff9167bd43fc2211b558199a606debe8a53ac6c486ad9b68c3a46e75c7ea0efcd6045af58a456376e9d34ad20b189a536e8584a8 kdf-19.04.0.tar.xz"
diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD
index fc791cbeb..e5e79f1c4 100644
--- a/user/kdiamond/APKBUILD
+++ b/user/kdiamond/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdiamond
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Three-in-a-row game"
url="https://games.kde.org/game.php?game=kdiamond"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8e11aa4af8fc3c856ab9a45def63491d0c5f14c5d33c93c19be73281873b3b84c20839733e92a9f146c288d908104dae776e8983ce1ee6560042d4c4633d9e78 kdiamond-18.12.3.tar.xz"
+sha512sums="2e49c9776c2f44cea9c91926efe4f2e0c77c8fcc0c34ff93cd9fdc99f48d9b38b198fe8f8d705b1bd0a0d936b7391387b1f1ed324b9f7d823d35bff4d5412619 kdiamond-19.04.0.tar.xz"
diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD
index 14d9235fc..67159dc98 100644
--- a/user/keepassxc/APKBUILD
+++ b/user/keepassxc/APKBUILD
@@ -1,22 +1,22 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=keepassxc
-pkgver=2.3.4
+pkgver=2.4.1
pkgrel=0
pkgdesc="A community revival of the KeePassX password manager"
url="https://keepassxc.org"
arch="all"
license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LGPL-2.1-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND CC0-1.0 AND Public-Domain AND LGPL-2.1+ AND LGPL-3.0+"
depends="hicolor-icon-theme"
-makedepends="cmake xz qt5-qtbase-dev qt5-qttools-dev libgcrypt-dev
- zlib-dev libxi-dev libxtst-dev qt5-qtx11extras-dev argon2-dev"
+makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev
+ libxi-dev libxtst-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev
+ qt5-qtx11extras-dev xz zlib-dev"
subpackages="$pkgname-doc"
source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
prepare() {
- cd "$builddir"
- mkdir build
default_prepare
+ mkdir build
}
build() {
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 keepassxc-2.3.4-src.tar.xz"
+sha512sums="4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502 keepassxc-2.4.1-src.tar.xz"
diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD
index 744378ad7..2dea1fd5f 100644
--- a/user/kfilemetadata/APKBUILD
+++ b/user/kfilemetadata/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfilemetadata
pkgver=5.54.0
-pkgrel=0
+pkgrel=1
pkgdesc="File metadata extraction framework"
url="https://www.kde.org/"
arch="all"
@@ -11,9 +11,11 @@ depends="catdoc"
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz
qt5-qtmultimedia-dev qt5-qttools-dev exiv2-dev karchive-dev ki18n-dev
- poppler-qt5-dev taglib-dev"
+ poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz
+ add-formatting-fn.patch
+ "
build() {
cd "$builddir"
@@ -42,4 +44,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz"
+sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz
+f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch"
diff --git a/user/kfilemetadata/add-formatting-fn.patch b/user/kfilemetadata/add-formatting-fn.patch
new file mode 100644
index 000000000..5c3a1db91
--- /dev/null
+++ b/user/kfilemetadata/add-formatting-fn.patch
@@ -0,0 +1,479 @@
+From 4bedfd6609c6efe5dc327d305feac8985d4658e3 Mon Sep 17 00:00:00 2001
+From: Alexander Stippich <a.stippich@gmx.net>
+Date: Sat, 9 Feb 2019 17:41:46 +0100
+Subject: Add string formatting function to property info
+
+Summary:
+Adds the ability to format the metadata value
+for displaying purposes individually for each
+property. Currently, users of KFileMetaData
+must implement their own custom formatting
+functions.
+All custom formatting functions from
+Baloo-Widgets and Dolphin are copied into
+KFileMetaData. This can be extended later.
+
+This adds a dependency on KCoreAddons to
+KFileMetaData.
+
+FEATURE: 398581
+
+Test Plan: tests pass
+
+Reviewers: broulik, bruns, mgallien, #frameworks
+
+Reviewed By: bruns
+
+Subscribers: ngraham, kde-frameworks-devel, #baloo
+
+Tags: #frameworks, #baloo
+
+Differential Revision: https://phabricator.kde.org/D17245
+---
+ CMakeLists.txt | 5 +++
+ autotests/propertyinfotest.cpp | 29 ++++++++++++++
+ autotests/propertyinfotest.h | 1 +
+ src/CMakeLists.txt | 2 +
+ src/formatstrings.cpp | 86 ++++++++++++++++++++++++++++++++++++++++++
+ src/formatstrings_p.h | 50 ++++++++++++++++++++++++
+ src/propertyinfo.cpp | 27 +++++++++++++
+ src/propertyinfo.h | 7 ++++
+ 8 files changed, 207 insertions(+)
+ create mode 100644 src/formatstrings.cpp
+ create mode 100644 src/formatstrings_p.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa481a9..7ef0a40 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,11 @@ set_package_properties(KF5Archive PROPERTIES DESCRIPTION "KDE Frameworks 5: Arch
+ URL "https://download.kde.org/stable/frameworks/" TYPE OPTIONAL
+ PURPOSE "Archive is needed to build ODF and OOXML 2007 extractors")
+
++find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS CoreAddons)
++set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDE Frameworks 5: Core Addons Framework"
++ URL "https://download.kde.org/stable/frameworks/" TYPE REQUIRED
++ PURPOSE "Needed for the formatting of properties for display purposes")
++
+ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n)
+
+ find_package(Poppler 0.12.1 COMPONENTS Qt5)
+diff --git a/autotests/propertyinfotest.cpp b/autotests/propertyinfotest.cpp
+index ae8b1b8..e203dcd 100644
+--- a/autotests/propertyinfotest.cpp
++++ b/autotests/propertyinfotest.cpp
+@@ -45,4 +45,33 @@ void PropertyInfoTest::testNameIdMapping()
+ }
+ }
+
++void PropertyInfoTest::testFormatAsDisplayString()
++{
++ auto emptyProperty = PropertyInfo::fromName(QStringLiteral("no valid property name"));
++ QCOMPARE(emptyProperty.formatAsDisplayString(QVariant("empty")), QStringLiteral("empty"));
++
++ PropertyInfo year(Property::DiscNumber);
++ QCOMPARE(year.formatAsDisplayString(QVariant(2018)), QStringLiteral("2018"));
++
++ QStringList artistList = {"Artist1", "Artist2"};
++ PropertyInfo artist(Property::Artist);
++ QCOMPARE(artist.formatAsDisplayString(QVariant(artistList)), QStringLiteral("Artist1, Artist2"));
++
++ QStringList authorList = {"Author1"};
++ PropertyInfo author(Property::Author);
++ QCOMPARE(artist.formatAsDisplayString(QVariant(authorList)), QStringLiteral("Author1"));
++
++ PropertyInfo duration(Property::Duration);
++ QCOMPARE(duration.formatAsDisplayString(QVariant(1800)), QStringLiteral("0:30:00"));
++
++ PropertyInfo sampleRate(Property::SampleRate);
++ QCOMPARE(sampleRate.formatAsDisplayString(QVariant(44100)), QString(QLocale().toString(44.1) + QStringLiteral(" kHz")));
++
++ PropertyInfo bitRate(Property::BitRate);
++ QCOMPARE(bitRate.formatAsDisplayString(QVariant(128000)), QStringLiteral("128 kB/s"));
++
++ PropertyInfo orientation(Property::ImageOrientation);
++ QCOMPARE(orientation.formatAsDisplayString(QVariant(5)), QStringLiteral("Transposed"));
++}
++
+ QTEST_GUILESS_MAIN(PropertyInfoTest)
+diff --git a/autotests/propertyinfotest.h b/autotests/propertyinfotest.h
+index 677ade1..15e6a10 100644
+--- a/autotests/propertyinfotest.h
++++ b/autotests/propertyinfotest.h
+@@ -30,6 +30,7 @@ class PropertyInfoTest : public QObject
+ Q_OBJECT
+ private Q_SLOTS:
+ void testNameIdMapping();
++ void testFormatAsDisplayString();
+ };
+
+ }
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 52fa8e5..c3cbe8c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -13,6 +13,7 @@ set(KF5FileMetaData_SRCS
+ writerplugin.cpp
+ writercollection.cpp
+ externalwriter.cpp
++ formatstrings.cpp
+ )
+ ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
+
+@@ -34,6 +35,7 @@ target_link_libraries(KF5FileMetaData
+ Qt5::Core
+ PRIVATE
+ KF5::I18n
++ KF5::CoreAddons
+ )
+
+ if(TAGLIB_FOUND)
+diff --git a/src/formatstrings.cpp b/src/formatstrings.cpp
+new file mode 100644
+index 0000000..b0bfdf8
+--- /dev/null
++++ b/src/formatstrings.cpp
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include "formatstrings_p.h"
++
++#include <QDateTime>
++#include <KLocalizedString>
++
++using namespace KFileMetaData;
++
++QString FormatStrings::toStringFunction(const QVariant& value)
++{
++ return value.toString();
++}
++
++QString FormatStrings::joinStringListFunction(const QVariant& value)
++{
++ return value.toStringList().join(i18nc("Separation between multiple entries in a list", ", "));
++}
++
++QString FormatStrings::formatDate(const QVariant& value)
++{
++ KFormat form;
++ QDateTime dt;
++ if (value.type() == QVariant::DateTime) {
++ dt = value.toDateTime();
++ } else {
++ dt = QDateTime::fromString(value.toString(), Qt::ISODate);
++ }
++ if (dt.isValid()) {
++ return form.formatRelativeDateTime(dt, QLocale::LongFormat);
++ }
++ return QString();
++}
++
++QString FormatStrings::formatDuration(const QVariant& value)
++{
++ KFormat form;
++ return form.formatDuration(value.toInt() * 1000);
++}
++
++QString FormatStrings::formatBitRate(const QVariant& value)
++{
++ KFormat form;
++ return i18nc("@label bitrate (per second)", "%1/s", form.formatByteSize(value.toInt(), 0, KFormat::MetricBinaryDialect));
++}
++
++QString FormatStrings::formatSampleRate(const QVariant& value)
++{
++ return i18nc("@label samplerate in kilohertz", "%1 kHz", QLocale().toString(value.toDouble() / 1000));
++}
++
++QString FormatStrings::formatOrientationValue(const QVariant& value)
++{
++ QString string;
++ switch (value.toInt()) {
++ case 1: string = i18nc("Description of image orientation", "Unchanged"); break;
++ case 2: string = i18nc("Description of image orientation", "Horizontally flipped"); break;
++ case 3: string = i18nc("Description of image orientation", "180° rotated"); break;
++ case 4: string = i18nc("Description of image orientation", "Vertically flipped"); break;
++ case 5: string = i18nc("Description of image orientation", "Transposed"); break;
++ case 6: string = i18nc("Description of image orientation, counter clock-wise rotated", "90° rotated CCW "); break;
++ case 7: string = i18nc("Description of image orientation", "Transversed"); break;
++ case 8: string = i18nc("Description of image orientation, counter clock-wise rotated", "270° rotated CCW"); break;
++ default:
++ break;
++ }
++ return string;
++}
++
+diff --git a/src/formatstrings_p.h b/src/formatstrings_p.h
+new file mode 100644
+index 0000000..125c31e
+--- /dev/null
++++ b/src/formatstrings_p.h
+@@ -0,0 +1,50 @@
++/*
++ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef KFILEMETADATA_FORMATSTRINGS_P_H
++#define KFILEMETADATA_FORMATSTRINGS_P_H
++
++#include <QString>
++#include <QVariant>
++#include <KFormat>
++
++namespace KFileMetaData {
++
++class Q_DECL_HIDDEN FormatStrings
++{
++public:
++ static QString toStringFunction(const QVariant& value);
++
++ static QString joinStringListFunction(const QVariant& value);
++
++ static QString formatDate(const QVariant& value);
++
++ static QString formatDuration(const QVariant& value);
++
++ static QString formatBitRate(const QVariant& value);
++
++ static QString formatSampleRate(const QVariant& value);
++
++ static QString formatOrientationValue(const QVariant& value);
++
++};
++
++}
++
++#endif
+diff --git a/src/propertyinfo.cpp b/src/propertyinfo.cpp
+index 5439a58..56fc596 100644
+--- a/src/propertyinfo.cpp
++++ b/src/propertyinfo.cpp
+@@ -24,6 +24,8 @@
+
+ #include <KLocalizedString>
+
++#include "formatstrings_p.h"
++
+ using namespace KFileMetaData;
+
+ class Q_DECL_HIDDEN PropertyInfo::Private
+@@ -34,6 +36,7 @@ public:
+ QString displayName;
+ QVariant::Type valueType;
+ bool shouldBeIndexed;
++ QString (*formatAsString)(const QVariant& value) = nullptr;
+ };
+
+ PropertyInfo::PropertyInfo(Property::Property property)
+@@ -41,6 +44,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ {
+ d->prop = property;
+ d->shouldBeIndexed = true;
++ d->formatAsString = &FormatStrings::toStringFunction;
+
+ switch (property) {
+ case Property::Album:
+@@ -53,12 +57,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("albumArtist");
+ d->displayName = i18nc("@label", "Album Artist");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::Artist:
+ d->name = QStringLiteral("artist");
+ d->displayName = i18nc("@label", "Artist");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::AspectRatio:
+@@ -71,12 +77,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("author");
+ d->displayName = i18nc("@label", "Author");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::BitRate:
+ d->name = QStringLiteral("bitRate");
+ d->displayName = i18nc("@label", "Bitrate");
+ d->valueType = QVariant::Int;
++ d->formatAsString = &FormatStrings::formatBitRate;
+ break;
+
+ case Property::Channels:
+@@ -117,12 +125,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("creationDate");
+ d->displayName = i18nc("@label", "Creation Date");
+ d->valueType = QVariant::String;
++ d->formatAsString = &FormatStrings::formatDate;
+ break;
+
+ case Property::Duration:
+ d->name = QStringLiteral("duration");
+ d->displayName = i18nc("@label", "Duration");
+ d->valueType = QVariant::Int;
++ d->formatAsString = &FormatStrings::formatDuration;
+ break;
+
+ case Property::Empty:
+@@ -147,6 +157,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("genre");
+ d->displayName = i18nc("@label music genre", "Genre");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ d->shouldBeIndexed = false;
+ break;
+
+@@ -160,6 +171,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("imageDateTime");
+ d->displayName = i18nc("@label EXIF", "Image Date Time");
+ d->valueType = QVariant::DateTime;
++ d->formatAsString = &FormatStrings::formatDate;
+ break;
+
+ case Property::ImageMake:
+@@ -180,12 +192,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("imageOrientation");
+ d->displayName = i18nc("@label EXIF", "Image Orientation");
+ d->valueType = QVariant::Int;
++ d->formatAsString = &FormatStrings::formatOrientationValue;
+ break;
+
+ case Property::Keywords:
+ d->name = QStringLiteral("keywords");
+ d->displayName = i18nc("@label", "Keywords");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ d->shouldBeIndexed = false;
+ break;
+
+@@ -206,6 +220,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("lyricist");
+ d->displayName = i18nc("@label", "Lyricist");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ d->shouldBeIndexed = false;
+ break;
+
+@@ -225,6 +240,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("photoDateTimeOriginal");
+ d->displayName = i18nc("@label EXIF", "Photo Original Date Time");
+ d->valueType = QVariant::DateTime;
++ d->formatAsString = &FormatStrings::formatDate;
+ break;
+
+ case Property::PhotoExposureBiasValue:
+@@ -345,6 +361,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("sampleRate");
+ d->displayName = i18nc("@label", "Sample Rate");
+ d->valueType = QVariant::Int;
++ d->formatAsString = &FormatStrings::formatSampleRate;
+ break;
+
+ case Property::Subject:
+@@ -382,6 +399,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("performer");
+ d->displayName = i18nc("@label", "Performer");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::Ensemble:
+@@ -394,12 +412,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->name = QStringLiteral("arranger");
+ d->displayName = i18nc("@label", "Arranger");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::Conductor:
+ d->name = QStringLiteral("conductor");
+ d->displayName = i18nc("@label", "Conductor");
+ d->valueType = QVariant::StringList;
++ d->formatAsString = &FormatStrings::joinStringListFunction;
+ break;
+
+ case Property::Compilation:
+@@ -503,6 +523,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->displayName = i18nc("@label translations last update", "Last Update");
+ d->valueType = QVariant::String;
+ d->shouldBeIndexed = false;
++ d->formatAsString = &FormatStrings::formatDate;
+ break;
+
+ case Property::TranslationTemplateDate:
+@@ -510,6 +531,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
+ d->displayName = i18nc("@label date of template creation8", "Template Creation");
+ d->valueType = QVariant::String;
+ d->shouldBeIndexed = false;
++ d->formatAsString = &FormatStrings::formatDate;
+ break;
+
+ case Property::OriginUrl:
+@@ -600,6 +622,11 @@ bool PropertyInfo::shouldBeIndexed() const
+ return d->shouldBeIndexed;
+ }
+
++QString PropertyInfo::formatAsDisplayString(const QVariant &value) const
++{
++ return (d->formatAsString)(value);
++}
++
+ PropertyInfo PropertyInfo::fromName(const QString& name)
+ {
+ static QHash<QString, Property::Property> propertyHash = {
+diff --git a/src/propertyinfo.h b/src/propertyinfo.h
+index c1767c4..3c426e8 100644
+--- a/src/propertyinfo.h
++++ b/src/propertyinfo.h
+@@ -85,6 +85,13 @@ public:
+ */
+ static PropertyInfo fromName(const QString& name);
+
++ /**
++ * Returns the value of the property as a QString with added formatting,
++ * added units if needed, and translated enums.
++ * @since 5.56
++ */
++ QString formatAsDisplayString(const QVariant& value) const;
++
+ private:
+ class Private;
+ Private* d;
+--
+cgit v1.1
+
diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD
index 3666f7291..9431d96e7 100644
--- a/user/kfind/APKBUILD
+++ b/user/kfind/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfind
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Standalone search utility for KDE"
url="https://www.kde.org/applications/utilities/kfind/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ecd2b1819800461becaf241b624d7c387fc81dd4069ebb82a044b188e8753a3b1054adfb254ade1fd327186c8ff8bf76d35b0c83caaf51ff7d36a55c98a23f2f kfind-18.12.3.tar.xz"
+sha512sums="12d3c5cb09f883cf0f5c17e315380a7359dc3aabe1018ab66b24bb06a1199c9864404585d336f0dde3b5dd00f467c5f7571b61dc6350dcadc9b9dfbf0da4f6d7 kfind-19.04.0.tar.xz"
diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD
index 734332657..9142d0441 100644
--- a/user/kfloppy/APKBUILD
+++ b/user/kfloppy/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfloppy
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Utility for formatting floppy diskettes"
url="https://utils.kde.org/projects/kfloppy/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8abe9a4fcdd9e01ea60a8145126fa30ce3d4624904c57575596ea0620499b47edcab6fa5facafc6250312383fca7e9b254e65d5fa12587c9926c71eb54070e3b kfloppy-18.12.3.tar.xz"
+sha512sums="70ce945aa3bc7fa34b326a2167aa80195b5e3ecb3d5b488ddcfe29a3cf59290dedcbf3b2e74b368ef67a416bdfc7a5ba680f390683352b3f8e4b7c6f90cfceb5 kfloppy-19.04.0.tar.xz"
diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD
index ceb7e7890..7dea7948c 100644
--- a/user/kfourinline/APKBUILD
+++ b/user/kfourinline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfourinline
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Two player board game based on Connect Four"
url="https://games.kde.org/game.php?game=kfourinline"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="69c75f82432862af0600d26072b58436de1073f97bae385d24f4c806e46f06e9a18a0549084050a4698fbcd7358e4789555f7b52e89875f2fa29db42b3e570ff kfourinline-18.12.3.tar.xz"
+sha512sums="79f519af67b7f76e20ad1feeb65acbd32c7f3ae6035b073489a88ce882a0e6d73233ad23ef2b5da1e961efb94505f01025107f1f6aea3879db91abe7878a0212 kfourinline-19.04.0.tar.xz"
diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD
index 9ab97cae9..04753d405 100644
--- a/user/kgeography/APKBUILD
+++ b/user/kgeography/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgeography
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Geography learning tool and trainer"
url="https://www.kde.org/applications/education/kgeography/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="34d727d2b28984c0a39be5b9e5320c91279f5020d830703a91073265103f9273375b75b4bdc6c1c5b068f0712b049c35ef0a24f945840f8bc770f27fc5419d44 kgeography-18.12.3.tar.xz"
+sha512sums="e94f674b761123bbdec8ba4412dcdd0bec6b59c0ced54eddc4eb45dacd23e5f47d5b38d0fd88ea1aad2d13c9bf35347b38025034b769773d7b4970639a81466e kgeography-19.04.0.tar.xz"
diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD
index 9ba3eff2a..c7dcd8aa8 100644
--- a/user/kget/APKBUILD
+++ b/user/kget/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kget
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Versatile download manager"
url="https://www.kde.org/applications/internet/kget/"
@@ -43,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5e3680d3ac5e8e23ac8132133c66a4826035e89ddc74fb2b7cd6a0670f5682e750f839ac91e86fe4a78cd5c45a95b38793532e247b717b5c1a63200ed5405335 kget-18.12.3.tar.xz"
+sha512sums="80f0f9ff280b9523883b9602965769268256174e10d6a4a956dab32b6a68d8b34931c34e3f65ecb0571f06b45302f8b56667d307095b5df884496f862d75dbb3 kget-19.04.0.tar.xz"
diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD
index 8eb4d412b..10f6eef3d 100644
--- a/user/kgoldrunner/APKBUILD
+++ b/user/kgoldrunner/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgoldrunner
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around"
url="https://games.kde.org/game.php?game=kgoldrunner"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eb3b0a384557da0a7aa8ee264c00c55f62353d0377e1ef1137ca6bee7d0959dbe51f5fcc5d4946a9e8626020076f06794f1de30d4ac0aaaa0e57d3e3e8a1dc80 kgoldrunner-18.12.3.tar.xz"
+sha512sums="13e8d0e1c4617be4ffcdbf2e4b26b2cdef07cb1394feab707f7cba873ab1b83a7fd8bacd96d0fd624fa1305bae56f8fb028f2e9e40a4b02b34f1997bd3e99a52 kgoldrunner-19.04.0.tar.xz"
diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD
index 2f8a53c0b..a3548febb 100644
--- a/user/kgpg/APKBUILD
+++ b/user/kgpg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgpg
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple interface for GnuPG, a powerful encryption utility"
url="https://utils.kde.org/projects/kgpg/"
@@ -43,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f510dd4e4b717a00c8128767cea99b2725e10d8493cbb8a2a70ee0acbf53424edfb5d95052dff833988b3217b525d721c681a236ba7b7c87259f453a7956e881 kgpg-18.12.3.tar.xz"
+sha512sums="480fcdd77f6b2f22184848a093b711eaf9c3e1414c3740118312aa763a226441ad4bab3c1280f785e6108e548bfd39228713f36ef3b0e6a49dfc9a3dd9d00921 kgpg-19.04.0.tar.xz"
diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD
index 73c9481d1..8932af8b3 100644
--- a/user/khangman/APKBUILD
+++ b/user/khangman/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=khangman
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Hangman word game"
url="https://www.kde.org/applications/education/khangman/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fc9008ff7e79e02b185c4180403a1741a62dabbb10b87b01f5b55d4ba04c7681e27a291dc6c8b83cd87066be624539f8e3097cfca755f74727ca5cd64ffb4bd5 khangman-18.12.3.tar.xz"
+sha512sums="25fe701765143acb98448988f31f8de6c2ec23eee1e101423c79f4c01e47852d8a3601fad3e4e4cca8d6995fbf9d952c9feeed4f85115157382f21f1fb25b2d4 khangman-19.04.0.tar.xz"
diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD
index efeca02f0..62f910832 100644
--- a/user/khelpcenter/APKBUILD
+++ b/user/khelpcenter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=khelpcenter
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Graphical documentation viewer"
url="https://www.kde.org/applications/system/khelpcenter/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="728b335076dbaf63bf8ce8fbc55f5d4efe01663998b30ae40d252903c1090c29d5cfd58e9036242ec9b0206c34d7b397a0739e7ef9962d6dfb0ecaff9ea45df3 khelpcenter-18.12.3.tar.xz"
+sha512sums="75947d5e2e13fd8d9a1f3b1dd6bf0c63e0e695de7a09be07bfff1f40c6a3a475eccde2e3ee53b7b29bcf01cd2b8f409fc6294f65a617f1b0cafad999c2636984 khelpcenter-19.04.0.tar.xz"
diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD
index eb5400644..0b38d05be 100644
--- a/user/kig/APKBUILD
+++ b/user/kig/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kig
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Interactive geometry learning and exploration tool"
url=" https://www.kde.org/applications/education/kig/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fa540b7f57b4878dfe44e0d8a6ee5f84ec524ab79867e545c912a715e0e0c2d9b35d12575d751944b5049f12c28ed838460cabef37d73c3f56591f1028bb2479 kig-18.12.3.tar.xz"
+sha512sums="8b4ce8ad095ac7a0bac603adb77bf9fdd7312027579889d20228d4df751d8cd982a04b41b8ede75509e3e731601e2bbdc8d9416461cf70b122b9f926431c35c9 kig-19.04.0.tar.xz"
diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD
index 288499c0c..80d183091 100644
--- a/user/kigo/APKBUILD
+++ b/user/kigo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kigo
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Go or Igo game for KDE"
url="https://www.kde.org/applications/games/kigo/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d949b549589185fa0bd24b5d4bc245283e8fd6e823c51b0becb76d15d74c67dc35e8a46e99cfcce4dd69bc2baca20234488e64e4f7bc1e02aa95092e9907b3fa kigo-18.12.3.tar.xz"
+sha512sums="725312eac361a1d15ad0f4ae68d63d526bf33700858dab72229c55c4ab6e79d4b2efae7a2271c2db0b21a8bc8a7099307592e72b232099ca3ecaa104a4b3eb4a kigo-19.04.0.tar.xz"
diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD
index 286dcb45f..93b0349c3 100644
--- a/user/killbots/APKBUILD
+++ b/user/killbots/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=killbots
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple game of evading killer robots"
url="https://www.kde.org/applications/games/killbots/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6f9fe391776da188489f42cbc2d0563a36f1a1ec88791cbbf7f4364cc0e5eb3b0eb028ea69a7a7444829e467026c459801c4c02dccbcdb624c2a45e1d56b6e3c killbots-18.12.3.tar.xz"
+sha512sums="84d28d41e910b8bad8742db74983622c2caaa59579a09ef85000f71f35b2a69cf47e0e28b1c362681d38caee4f33b41f32678706fba0e286e3182d8c54e12e62 killbots-19.04.0.tar.xz"
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD
index 0cd186244..737947149 100644
--- a/user/kio-extras/APKBUILD
+++ b/user/kio-extras/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio-extras
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KIO plugins for various data tasks"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev
kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev
kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev
kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev
- taglib-dev libmtp-dev gperf khtml-dev"
+ taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-dev"
makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz"
@@ -44,4 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a13c349a27b7ffd665b9a3812d70228ab40ac48c50ded7774ed954ce30a6454d1a9c5a27769ddae8f333db0c87943eab18380da413274b69802d9569f6e48d66 kio-extras-18.12.3.tar.xz"
+sha512sums="7323620620910f05c1b05c52058b021175541849bb503929ad389ecf358d01c72531a92822f41f2b95bf752d7624d2f30a87e2b4557f55e1107ff71ca89d9885 kio-extras-19.04.0.tar.xz"
diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD
index af95bc989..2f2e893f6 100644
--- a/user/kiriki/APKBUILD
+++ b/user/kiriki/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kiriki
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Yahtzee-like dice game for one or more players"
url="https://games.kde.org/game.php?game=kiriki"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8b2257ce1c80d34dedf19747ac49f6c040b6512e0271488a173990fd3ff9858e7c29f86a0dc468a2bc244b3cff1e881da1465ba29682a4288d097f74ab1f6f29 kiriki-18.12.3.tar.xz"
+sha512sums="a4b9068d605c41ccd1ecb3c2fe8dde85ae5f6df31279b88ba74b8b27df1e83117fcded97ea9a35287caeab7076195191109409d7f1bbe1f26bc19b292ec3a4af kiriki-19.04.0.tar.xz"
diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD
index 3e8ecabab..6698e3fd8 100644
--- a/user/kiten/APKBUILD
+++ b/user/kiten/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kiten
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Japanese reference and study tool"
url="https://www.kde.org/applications/education/kiten/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="75effa8a23924cb5369fb63b09e974e2d0600b28d92757170d5ca452f5be3eedf874aa7ef7f3a60a953176ddf29beae0945ca31e0550be85b77c50eee748b4cc kiten-18.12.3.tar.xz"
+sha512sums="ea68b0de0a47ff598f61c4a109a4839c66daf87e72506d505926fb237f442a0a0646abfcee9161b073889afc0084710326e0b2643541959147369ca758c2a079 kiten-19.04.0.tar.xz"
diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD
index e1dcf4d3a..109e5fbc4 100644
--- a/user/kjumpingcube/APKBUILD
+++ b/user/kjumpingcube/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kjumpingcube
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Dice-driven tactical game"
url="https://games.kde.org/game.php?game=kjumpingcube"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8606ca6020dcd8f6d49ed6120899c0e705505575d26fd9e9c89b4d5e8306a597e51ef2761c1176859e0c22545b1abe2cf470e1aab4d19170ec2c7657c8019cb2 kjumpingcube-18.12.3.tar.xz"
+sha512sums="559cef9c6645621431201b48367cc7cef262a62c325ca1db733781caf21b320bb36ee5483e4d0194dcbc960ae157a3641be3eb19628d2cd9471b642601494010 kjumpingcube-19.04.0.tar.xz"
diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD
index 4dcabff8f..b8a46881b 100644
--- a/user/kleopatra/APKBUILD
+++ b/user/kleopatra/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kleopatra
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Certificate manager and cryptography GUI"
url="https://www.kde.org/applications/utilities/kleopatra/"
@@ -12,7 +12,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev
libassuan-dev kitemmodels-dev kmime-dev knotifications-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz
+ qt5.9.patch
+ "
build() {
cd "$builddir"
@@ -40,4 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="707fcf4ed9bc2c4d7d45f5911ce1760b49b567865d5f5d315a0af12cb0856e39230c348efbcc449a1e4403f7fb3a0f0ebb654573e0d2bb511d8ff8909f932e6e kleopatra-18.12.3.tar.xz"
+sha512sums="c0751d81740b6c590dc1a7e370f99fa09d616b2b9282a862242b2b5235690a4bc36044d08125fbe789ac5470f1aca1525c87752ec40e76c229d37b0eea9cf428 kleopatra-19.04.0.tar.xz
+27f03d36e0fdf8f05f59bd3269abc9c60f7f368821a2d6545dd369b046fac4bcb5f9c59a2f50a9d6b3f58d97e767d3596517ed7ed2d72847b68276d60723eb4f qt5.9.patch"
diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch
new file mode 100644
index 000000000..afda4936c
--- /dev/null
+++ b/user/kleopatra/qt5.9.patch
@@ -0,0 +1,76 @@
+From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001
+Date: Mon, 17 Dec 2018 08:12:46 +0100
+Subject: Revert "Remove QT_CHECK"
+
+---
+ src/commands/certifycertificatecommand.cpp | 4 ++++
+ src/commands/importcertificatescommand.cpp | 4 ++++
+ src/dialogs/certificateselectiondialog.cpp | 4 ++++
+ 3 files changed, 12 additions(+)
+
+diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp
+index 524b5a6..5577f2f 100644
+--- a/src/commands/certifycertificatecommand.cpp
++++ b/src/commands/certifycertificatecommand.cpp
+@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart()
+ cmd->setParentWidget(d->parentWidgetOrView());
+ cmd->setProtocol(GpgME::OpenPGP);
+ loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection);
++#else
++ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
++#endif
+ loop.exec();
+ } else {
+ Q_EMIT(canceled());
+diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp
+index 49294b6..89542cc 100644
+--- a/src/commands/importcertificatescommand.cpp
++++ b/src/commands/importcertificatescommand.cpp
+@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import &
+ auto cmd = new Commands::CertifyCertificateCommand(key);
+ cmd->setParentWidget(parentWidgetOrView());
+ loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection);
++#else
++ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
++#endif
+ loop.exec();
+ }
+ return true;
+diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp
+index 003872e..020310d 100644
+--- a/src/dialogs/certificateselectiondialog.cpp
++++ b/src/dialogs/certificateselectiondialog.cpp
+@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i
+ QItemSelectionModel *const sm = view->selectionModel();
+ Q_ASSERT(sm);
+ sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection);
++#else
++ QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection);
++#endif
+ }
+
+ void CertificateSelectionDialog::accept()
+--
+cgit v1.1
+
+--- kleopatra-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:10.000000000 +0000
++++ kleopatra-19.04.0/CMakeLists.txt 2019-04-19 06:34:58.511578506 +0000
+@@ -11,10 +11,10 @@
+ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
+
+ # Standalone build. Find / include everything necessary.
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+ set(KMIME_VERSION "5.11.0")
+ set(LIBKLEO_VERSION "5.11.0")
+-set(QT_REQUIRED_VERSION "5.10.0")
++set(QT_REQUIRED_VERSION "5.9.0")
+ set(GPGME_REQUIRED_VERSION "1.8.0")
+
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD
index a41eac3a3..bedd33d30 100644
--- a/user/klettres/APKBUILD
+++ b/user/klettres/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klettres
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Learn alphabets for multiple languages"
url="https://www.kde.org/applications/education/klettres/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="878308007ebd889a9924094bdf3e5d24ce6a04405f9311e8b197faa44e93a57730911ee084ee26ba1a5ac2c515b4227e614057410e9d9c0927fca63a805db09a klettres-18.12.3.tar.xz"
+sha512sums="6e9f3e5a60ffe2e5e0939e83c3b58aba2b99ca89c01e73f59c8c19c82a740e663c1761bac635e1492ed0ed5e29a3d8423531fa678e8a0fa04e2df4849629ea71 klettres-19.04.0.tar.xz"
diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD
index 526f95d75..0c6dbd5c9 100644
--- a/user/klickety/APKBUILD
+++ b/user/klickety/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klickety
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Fun, simple colour matching game"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7238c2b7ea0e605bbe9675593f95cdf6ac2b427d9d7aa3999fa05ad3f4604968dbfacad016b0770cf82e1dabb1e572cc3e6d16a4b34bb8f1e400371a6fe0a0e5 klickety-18.12.3.tar.xz"
+sha512sums="a8fa007ec3a02e3a4157e8d96a0334489a7321c49769c3d85b7b45ccfd1c9cb39fc42b547b1fc8512cae0fce936a90ee622ed453edd81d31ba36ade1908bdee8 klickety-19.04.0.tar.xz"
diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD
index 4b9af8538..08fd79e73 100644
--- a/user/klines/APKBUILD
+++ b/user/klines/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klines
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple yet addictive single-player game"
url="https://games.kde.org/game.php?game=klines"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3dacd2ede7f5303ec49b2c226b1e3521176cd37af539a1796939f43faf8e3dbc00f2d5278bf46c0e4e1cd8d4d1fb23b15f90a164cc4c55547bba8255b8506990 klines-18.12.3.tar.xz"
+sha512sums="689c28049f11ae14a9a3703cb266bfdf3f19e62d1f32be54e8edf582a30d793b73dbd8cb51da3bdaa27e4902c552cbaa9df2fd6124e025ab39f1ab8a86fec24b klines-19.04.0.tar.xz"
diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD
index 5f103bd45..299f366d2 100644
--- a/user/kmag/APKBUILD
+++ b/user/kmag/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmag
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Screen magnification utility"
url="https://www.kde.org/applications/utilities/kmag/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7339513c36e20e8d7182c916428564bdd43f140430df0f053d0b6891c217608b6cf1f9adc15e0e11f689b2f26d4238b9f66d2b1c64cc2d0b0620f3a34509205e kmag-18.12.3.tar.xz"
+sha512sums="07c13bf724945d9c5fb68a8f78ea88b6aecd64d217bb46708b1352378aefc9d76ddc4f51c5e3e66c0000a4b7c867ef5d3620ad4a063f9bcc6172d474c7f6a0da kmag-19.04.0.tar.xz"
diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD
index 0a5f8cf41..598ac8e47 100644
--- a/user/kmahjongg/APKBUILD
+++ b/user/kmahjongg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmahjongg
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Mah Jongg desktop game"
url="https://games.kde.org/game.php?game=kmahjongg"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ee096ee9a890ecef53dde06d9a618fd70e0cafd59b0b6199d8bb0f0716733187c5f8a2bf9cbe43d2157ed502a3efdb06698a6fe3e6485199af8d71c9b8eb8252 kmahjongg-18.12.3.tar.xz"
+sha512sums="ace4e0a279605fae0f22dcf1bdeadfca5d507910afb44b5df482d79b19680f0928fdc56bf87e0b6914f080fddddee930296475b08fc45adde957d080ca78698b kmahjongg-19.04.0.tar.xz"
diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD
index d28c6b378..d637d87b3 100644
--- a/user/kmime/APKBUILD
+++ b/user/kmime/APKBUILD
@@ -1,19 +1,20 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmime
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE support library for MIME"
url="https://www.kde.org/"
arch="all"
-options="!check" # wtf
license="LGPL-2.1+"
depends=""
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 kcodecs-dev
ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz
+ egregious-versions.patch
+ "
build() {
cd "$builddir"
@@ -34,7 +35,7 @@ build() {
check() {
cd "$builddir"
# https://bugs.kde.org/show_bug.cgi?id=385479
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E dateformattertest
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(headertest|messagetest|dateformattertest)'
}
package() {
@@ -42,4 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ed02fa15ef1d437f6c13a8bed4092c62fbbd55595156bd9766a8b980665c18a2a7ab2c841cc7657710480f2e98d275e8d377ccbba32081ef14e2a2aa5db5fb2d kmime-18.12.3.tar.xz"
+sha512sums="6bbc75d77d777edc084c8e1a81e198ed0a3959f1d4d332e442f298ced5a1d4d03613b6c397e9e0a96d81b0693b3e8dbfd0f011c54db0f053c207f16a16926c4e kmime-19.04.0.tar.xz
+b5f04ab4f7ed60bde1eeb50141c5b51a4f285d7b125d834559419d56039c1d540a8d44f508801ae9ac2c6d91c3841d4e64c3856e2c5bfa33eb64175dc9b5c608 egregious-versions.patch"
diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch
new file mode 100644
index 000000000..af0411338
--- /dev/null
+++ b/user/kmime/egregious-versions.patch
@@ -0,0 +1,24 @@
+There is absolutely NO REQUIREMENT on these newer versions by KMime.
+
+This is only done to keep in sync with the rest of KDE PIM.
+
+--- kmime-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:19.000000000 +0000
++++ kmime-19.04.0/CMakeLists.txt 2019-04-19 06:18:49.665558623 +0000
+@@ -4,7 +4,7 @@
+ project(KMime VERSION ${PIM_VERSION})
+
+ # ECM setup
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
+@@ -22,7 +22,7 @@
+
+
+ set(KMIME_LIB_VERSION ${PIM_VERSION})
+-set(QT_REQUIRED_VERSION "5.10.0")
++set(QT_REQUIRED_VERSION "5.9.0")
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
+
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD
index 1a0ffcec3..01b636dde 100644
--- a/user/kmines/APKBUILD
+++ b/user/kmines/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmines
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Classic Minesweeper game"
url="https://games.kde.org/game.php?game=kmines"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="60c5a271f50a94ea018a325bee733a8541169e956208147fc640d7be5afc74a90518aca5a3946c1a49b66fb11acfd1b1b7cc44d5311671c6eaa425092ac2a30a kmines-18.12.3.tar.xz"
+sha512sums="e528ae607e709866ed6671ebf7766f187ce0fb1aea42d9b9544070993248a87a3cc78e6add1234ac23fc4aad83cb7ff591fe486eb2e0d577520dc9d367e7d0a7 kmines-19.04.0.tar.xz"
diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD
index aef50e86e..b2796db44 100644
--- a/user/kmix/APKBUILD
+++ b/user/kmix/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmix
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE sound mixer"
url="https://www.kde.org/applications/multimedia/kmix/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2b99863aee801e8e0ce5100599b2ba6646ccae38c4f25a00b58ed71a48b36874df33b9f147b601135a3c6ccce16dfb4a7329814d92bab03a5a750d4abbf681cc kmix-18.12.3.tar.xz"
+sha512sums="d2437c946de2f90abfd4f16f20ed1956358e38384d32d021272d7ff92dc47bd80a742cdca4a9ff60cfa1d155a551183eaf13dbb4568dc1691462d53e7c65415c kmix-19.04.0.tar.xz"
diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD
index 01f1229b9..cc2339b09 100644
--- a/user/kmousetool/APKBUILD
+++ b/user/kmousetool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmousetool
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Tool to assist with clicking the mouse button"
url="https://userbase.kde.org/KMouseTool"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c6cb2a60b9bb545335a648f28435eed12c2cefde930587afad2c35d815aa785cd4496be6745a0bcff6ffbe4940f79f12ebc949b3ddbd2701b157b98ea135243e kmousetool-18.12.3.tar.xz"
+sha512sums="798c5504a64287738e9b39a55abb350b3136a0d02619d4ccea1a5a44b91a50e4a05b4999e800c58d6e6be6f0fda8ac22f0ac13c49908a75817dc0b4431804aa3 kmousetool-19.04.0.tar.xz"
diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD
index 3116bf623..2b9cf1228 100644
--- a/user/kmplot/APKBUILD
+++ b/user/kmplot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmplot
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Mathematical function plotter"
url="https://www.kde.org/applications/education/kmplot/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6fa203f4cd192e114ccf7f87df3d1f1f0e806a0bb4027a31eb0fc16a239fba841b643ea7b4b8f4d72a43efe9605e22bd0b47d7fbb9232b5305c60cd2e4ccadb9 kmplot-18.12.3.tar.xz"
+sha512sums="25511a256eb68f00580ba015cdcde30c024965b2f86980e4faad9b273d9084baa77184c400980923cfe613467058466e4cfe3c3aab086a5cfbc8b4845b4cfa81 kmplot-19.04.0.tar.xz"
diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD
index e3f922ce3..48ad1c93b 100644
--- a/user/knavalbattle/APKBUILD
+++ b/user/knavalbattle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knavalbattle
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Ship sinking game from KDE"
url="https://www.kde.org/applications/games/knavalbattle/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="49660ae9a472f06d98a95db38b697d4aa37acf0ca4aa14510f4a2256106e3a9e2c8162c1f65b8f36ed2978f25da6263c2c82666458c0e344af87da881d571811 knavalbattle-18.12.3.tar.xz"
+sha512sums="1aeb990aee87535143217742e7b29821f6f79b1916bdfcad9e6a7cfe68be0f6ee936699c29cf8ac826edd168fe3c9e52b48617e07f8fd82568fb36203be1ea63 knavalbattle-19.04.0.tar.xz"
diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD
index 91f59ffd1..b1003d32d 100644
--- a/user/knetwalk/APKBUILD
+++ b/user/knetwalk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knetwalk
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Build up a computer network by placing the wires correctly"
url="https://www.kde.org/applications/games/knetwalk/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="36fd21b7a5e37f131fbba4bd13391c21e3abec3a2128c49badb3a44641d8ffe0d999df6a40f472125d42e9bfac02815b2ade0a4eb4eebda64c95035c6e24d9b2 knetwalk-18.12.3.tar.xz"
+sha512sums="729e7c41c1c9abbc8217c777b5660634831b3ec778e897f0ba90dd11450c18f6dda4fc4290756d46f826c7d94f6987adbe6b0ba65cea8419d8c8dfabf70883df knetwalk-19.04.0.tar.xz"
diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD
index fcf84a6c9..5386291a8 100644
--- a/user/kolf/APKBUILD
+++ b/user/kolf/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kolf
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="2D miniature golf game from KDE"
url="https://www.kde.org/applications/games/kolf/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="321e5eb368f3e9c64a941d0b32abd56e8e0eb9f49a74ce07c1382ab3625e0ddb843f7b6808856e6c64a7026f8203c009a7ce285efb28b3c85c51f15c118c5480 kolf-18.12.3.tar.xz"
+sha512sums="d1a521a026b396228178ef69a76fb754d6ec8eca33af65445d25e7539e10f3ccc017887b4adb89734739438e21571a3135c2891013e0e2b1e01ab76816874409 kolf-19.04.0.tar.xz"
diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD
index a01e020f8..8471c8684 100644
--- a/user/kollision/APKBUILD
+++ b/user/kollision/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kollision
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple ball dodging game"
url="https://games.kde.org/game.php?game=kollision"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eec43613ab81ebbabe3f6e2ea59f861c7c22772105ec1a15bb1fac5a1eb8086627a00ae1987c77d757b0ea8f14c2544dbcec69f669e6f8ae6866e483e29ec3e4 kollision-18.12.3.tar.xz"
+sha512sums="95ef13a9d128a9b23bd6f48d60a794957e33e360c194d67f9874aeeb290df291130911fa148f2eb445de9fd8510f6a4755ad2072e825465389e7c11238b7f921 kollision-19.04.0.tar.xz"
diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD
index 11845e7ed..e54cb11b4 100644
--- a/user/kolourpaint/APKBUILD
+++ b/user/kolourpaint/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kolourpaint
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple painting program for KDE"
url="http://kolourpaint.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ac294aa80ffebdc6440474c15c5450fdcf15d735e6d920e2af99c92cbaa5f8930330a268faea5fb7859d1128c7479049ceb672715d7a4dbfdfb7e3b72157af13 kolourpaint-18.12.3.tar.xz"
+sha512sums="e0bc3084c1f39196c10344e4a941e55783fde14a4832aa65e59e32d09e33d96cfe9904e6c24adb75d3297eaedf387ec8f77c6edcdd93de4664c26be33e514931 kolourpaint-19.04.0.tar.xz"
diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD
index cf7b6b3be..cfd9c780f 100644
--- a/user/konquest/APKBUILD
+++ b/user/konquest/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=konquest
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Galactic strategy game"
url="https://games.kde.org/game.php?game=konquest"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c61520a69a2dcd38c66cce521cf25060b31047b77e6f587389a486b4e7438e140f149cb488fb2500feb195d54035a828f9d38ef4d70d8b36003c6c6b3d33169e konquest-18.12.3.tar.xz"
+sha512sums="d6634679188e1960278fc82aa94206ea12a644d1f907b69459ab116a745149e9298c561c69b156a0d9ee655770a2b91a3f84f365526580fbeead43d83cc4e0c7 konquest-19.04.0.tar.xz"
diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD
index 551c18148..bf4cc3c05 100644
--- a/user/konsole/APKBUILD
+++ b/user/konsole/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=konsole
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Terminal emulator for Qt/KDE"
url="https://konsole.kde.org/"
@@ -16,9 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev
kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev python3
kwindowsystem-dev kxmlgui-dev kdbusaddons-dev knewstuff-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz
- cursor.patch
- "
+source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz"
build() {
cd "$builddir"
@@ -46,5 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9fecd316a9bc7adaca9a3fac38a57d293286b6328e88d96ac1cf8967fcb67ef8e9a5b085e185c4373599eafd0eaa18f0d73df70df16b98a1badd9efb689e1f7c konsole-18.12.3.tar.xz
-66dcb31dd63f7a300b64058e8f9e56aa122c407d3a4a85c2323e7abf2e8eb4a3e1dd83de9445dac4938f9395b612eac5ceb9626bf895b532cfd19f63e0fbb2d7 cursor.patch"
+sha512sums="15ebe4031f362663343ede3ccffc13172ea9f6a5ed34deb9c6ddb81524c10c872ef14ed5941e3ed3b7e340dc19f92e2ec579291ef40eede97ec5ef85b21d4d0e konsole-19.04.0.tar.xz"
diff --git a/user/konsole/cursor.patch b/user/konsole/cursor.patch
deleted file mode 100644
index 621a4f36b..000000000
--- a/user/konsole/cursor.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9af659c73e3203e1d5ef3873fa6c0144258b9673 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Mon, 4 Mar 2019 09:59:45 -0500
-Subject: Fix ibeam and underline cursor rendering
-
-Summary:
-Since anti-aliasing was enabled in the painter, coordinates need to
-be shifted half a pixel so that they align with the pixel grid,
-otherwise the result gets "blurred" due to the anti-aliasing.
-And as parts of the blurred shape leak outside the cursor rectangle,
-this also leaves artifacts when the cursor moves or blinks as these
-parts are not cleared.
-
-This is basically the same as commit
-e7085310d6d594823d0ed491fa8bdbd99dec4932 for the
-standard block cursor.
-
-BUG: 402589
-
-Test Plan:
-- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced"
-profile settings
-
-The cursors are a single line again now, before they were blurred by
-anti-aliasing.
-
-Screenshots:
-Before:
-{F6656366}
-{F6656370}
-
-After:
-{F6656371}
-{F6656373}
-
-Also, there are no more artifacts when the cursor is moved or
-cursor blinking is enabled.
-
-Reviewers: #konsole, hindenburg
-
-Reviewed By: #konsole, hindenburg
-
-Subscribers: hindenburg, konsole-devel
-
-Tags: #konsole
-
-Differential Revision: https://phabricator.kde.org/D19513
-
-(cherry picked from commit eccfb1f62bbf67ebffee11e241bd05757b826ff1)
----
- src/TerminalDisplay.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 64c831c..7c8137d 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -958,16 +958,18 @@ void TerminalDisplay::drawCursor(QPainter& painter,
- }
- }
- } else if (_cursorShape == Enum::UnderlineCursor) {
-- painter.drawLine(cursorRect.left(),
-- cursorRect.bottom(),
-- cursorRect.right(),
-- cursorRect.bottom());
-+ QLineF line(cursorRect.left() + 0.5,
-+ cursorRect.bottom() - 0.5,
-+ cursorRect.right() - 0.5,
-+ cursorRect.bottom() - 0.5);
-+ painter.drawLine(line);
-
- } else if (_cursorShape == Enum::IBeamCursor) {
-- painter.drawLine(cursorRect.left(),
-- cursorRect.top(),
-- cursorRect.left(),
-- cursorRect.bottom());
-+ QLineF line(cursorRect.left() + 0.5,
-+ cursorRect.top() + 0.5,
-+ cursorRect.left() + 0.5,
-+ cursorRect.bottom() - 0.5);
-+ painter.drawLine(line);
- }
- }
-
---
-cgit v1.1
-
diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD
index f893118b1..5c5e3b9c5 100644
--- a/user/kpat/APKBUILD
+++ b/user/kpat/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpat
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Collection of card games for KDE"
url="https://games.kde.org/game.php?game=kpat"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4fcd9860ac7e1d1069bd1f1e46943fe1695c0e7080b91c9b320fefd0bac4a782b95f9b20440a1a1409a2ea9f131050ea121e0f4ff935db471044cf9320b5bc96 kpat-18.12.3.tar.xz"
+sha512sums="63b59448d209dbf06f6d62bd261f57e63f9f46875a5e81b42715d9abc4c27309f115e9eb7877f147e8af571e7660a99d929da1e90f29dd83034daf8012ce6318 kpat-19.04.0.tar.xz"
diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD
index ed683d6b7..ca7ae9c47 100644
--- a/user/kpimtextedit/APKBUILD
+++ b/user/kpimtextedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpimtextedit
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Text editor for Personal Information Managers (PIMs)"
url="https://pim.kde.org/"
@@ -16,7 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev
kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev
qt5-qtspeech-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz
+ qt5.9.patch
+ "
build() {
cd "$builddir"
@@ -44,4 +46,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c3f4d3143a56cad623a5fb514c2234e4f00c07f395e72648ed3429a88631e3c752ea55d321fe55584f1846d3f97fabf3796ce3883cba06238f00e735028853bb kpimtextedit-18.12.3.tar.xz"
+sha512sums="dabddde9d7ee98927c10234ca9e6540c55417eabf930c66afaa8c88d5ab289bbadb20e2c0cf6334aa199a780bc6e54d1afa0ac981606c0b5316f992c06b67cb2 kpimtextedit-19.04.0.tar.xz
+13f90299735e145142f969ffb6462b71c1cd85d5503c3902af924388042396526ff8b943229462e0ff7e5030393e5312dd67b8dfc66efec81f4f05ac15f86091 qt5.9.patch"
diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch
new file mode 100644
index 000000000..50c29e0e0
--- /dev/null
+++ b/user/kpimtextedit/qt5.9.patch
@@ -0,0 +1,49 @@
+From 6961b54d1c814f2e7aafd7db8256f82688f014a3 Mon Sep 17 00:00:00 2001
+Date: Mon, 17 Dec 2018 07:23:52 +0100
+Subject: Revert "Remove QT_CHECK"
+
+---
+ .../plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
+index 8ce0fe9..c07699c 100644
+--- a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
++++ b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
+@@ -144,9 +144,13 @@ void PlainTextSyntaxSpellCheckingHighlighter::highlightBlock(const QString &text
+
+ const auto nextBlock = currentBlock().next();
+ if (nextBlock.isValid()) {
++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ QMetaObject::invokeMethod(this, [this, nextBlock] {
+ rehighlightBlock(nextBlock);
+ }, Qt::QueuedConnection);
++#else
++ QMetaObject::invokeMethod(this, "rehighlightBlock", Qt::QueuedConnection, Q_ARG(QTextBlock, nextBlock));
++#endif
+ }
+ }
+
+--
+cgit v1.1
+
+--- kpimtextedit-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:22.000000000 +0000
++++ kpimtextedit-19.04.0/CMakeLists.txt 2019-04-19 06:21:56.055556133 +0000
+@@ -4,7 +4,7 @@
+ project(KPimTextEdit VERSION ${PIM_VERSION})
+
+ # ECM setup
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+@@ -36,7 +36,7 @@
+ SOVERSION 5
+ )
+
+-set(QT_REQUIRED_VERSION "5.10.0")
++set(QT_REQUIRED_VERSION "5.9.0")
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets)
+ find_package(Grantlee5 "5.1" CONFIG REQUIRED)
+ set_package_properties(Grantlee5 PROPERTIES
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index 950ac7ed8..63fa2077b 100644
--- a/user/krdc/APKBUILD
+++ b/user/krdc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krdc
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="View and control remote desktops (RDP and VNC)"
url="https://www.kde.org/applications/internet/krdc/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eeb48eb968e1cb54a76d82dff1eec001b880456d2cd52f33dea6be6e3fb08186e25af89ee9a89e077e91ce0a0ebaa522bc453d5137e384018489ffc1f8382927 krdc-18.12.3.tar.xz"
+sha512sums="2f612c15d187ef3e872aecff47096c977d5b4a62884840fd83b3eb54d60f50c96d5ab7c7d77375220a28c24bf5f36757a49f2c090430bd3f4e5e26d281660bbe krdc-19.04.0.tar.xz"
diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD
index 870c1d082..80ce3b2e5 100644
--- a/user/kreversi/APKBUILD
+++ b/user/kreversi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kreversi
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Reversi game"
url="https://games.kde.org/game.php?game=kreversi"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fb3fd6a6e855701196cdd34d0e4611ce9e23cb51c2b461defc2c93e523dcd422bb02d5bb1b47fc376071de41bc6909b614b1e0389fc8e0210fffc7472f144deb kreversi-18.12.3.tar.xz"
+sha512sums="97708bcaa24e08ee1ec8f7b014c1ab9a472e10e73e0b55a83c0f34df04cdd9ca3ad2533d2e343afc90507096adcc295cf01d5ff481dea05de0d7bab12e56a08d kreversi-19.04.0.tar.xz"
diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD
index c9b009993..1c49601d0 100644
--- a/user/krfb/APKBUILD
+++ b/user/krfb/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krfb
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Share your screen with others for remote watching or assistance"
url="https://www.kde.org/applications/system/krfb/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e195d7cfe2f6c3c17b203da1bb0c1cb0709d4192a05b32bf817666183ce7889afc7b64afb54187f795f493ed88531a2de14bac3d7dbe6aacb7618220380fa518 krfb-18.12.3.tar.xz"
+sha512sums="328e557e353e9db0081e84ca179bfbedae697d5d28922dc8ae18b812105fb3ef048dd7a6d0e55c0ba46344ae9e16795564e7203ab08947ea85297b7935d062f4 krfb-19.04.0.tar.xz"
diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD
index 025afb5c9..cc0cab917 100644
--- a/user/kruler/APKBUILD
+++ b/user/kruler/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kruler
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Screen ruler"
url="https://www.kde.org/applications/graphics/kruler/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="26c214cd2dd246a76e1133120d5932c4945ae7ffb98f15c60a577471a3bb35295d14a77a953d60facaf659fcfa47da019a39dedfe3267465f65649a4ef66ef6e kruler-18.12.3.tar.xz"
+sha512sums="c1917ef45236df739a5b12cbcf593973e4fe87aa86a20207a9d0e47c3aaa11186521fbd9492195e7653321abc025fcb59948cb4d9c5bb9e858a7c5e70dd38c50 kruler-19.04.0.tar.xz"
diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD
index 9b83f59d6..7580172fc 100644
--- a/user/kshisen/APKBUILD
+++ b/user/kshisen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kshisen
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Mixture of Solitaire and Mah Jongg"
url="https://games.kde.org/game.php?game=kshisen"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d920cd913714f7e93df0133e8caec5dc2649c3d4dfd0f157fb189efa694632b3027053cbcdcc187cbd4d04b1ebd7526544f5857f80b5a933f4c73911531a5640 kshisen-18.12.3.tar.xz"
+sha512sums="35494b4ba69b3f2958212f321c77fd3fea9c8cac1e3e740ab70711489b2d65fbe3f2d08b1893a5286a3647678721eda8f2d333613fd6ad58815d5bd340f16f16 kshisen-19.04.0.tar.xz"
diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD
index 8f6313b33..55ee782b9 100644
--- a/user/ksirk/APKBUILD
+++ b/user/ksirk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksirk
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Strategy game from KDE"
url="https://www.kde.org/applications/games/ksirk/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="60e1267490b9c97f77e0313d19336f798564eb2a35b1c78907b5591d33360abdbc10a6fc46aa3a0956e8004c7dddaa0f91772535ee04678e3f8bb9a29de1a518 ksirk-18.12.3.tar.xz"
+sha512sums="84624e20f53b1de3b8aaf84a8df54a4c83a04618d2df3ab6b34cb8953962958ae7a8c9f9c54a7d99188220c5167bbc7ad699629f9576ecdba5872cc5b7663b61 ksirk-19.04.0.tar.xz"
diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD
index 589411c06..94751c1fb 100644
--- a/user/ksnakeduel/APKBUILD
+++ b/user/ksnakeduel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksnakeduel
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Tron-like game"
url="https://www.kde.org/applications/games/ksnakeduel/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8efc73f83ac68e2ccf27d019979509d343aada8fa73d27bbac4f428ecc0238bc9740863995c93f36980aceafa9f3a193ed2c114a90e4436e3ec470cecc50b625 ksnakeduel-18.12.3.tar.xz"
+sha512sums="5b24913b0255e7d1c0c09d00acb523d2ae5c91b1396fed555f111548c71669477f8778386782f951c4ec6d6f01f0ec113b8f13e32e633791fb95bdf46777f089 ksnakeduel-19.04.0.tar.xz"
diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD
index 67102b293..84204a6f2 100644
--- a/user/kspaceduel/APKBUILD
+++ b/user/kspaceduel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kspaceduel
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Space arcade game from KDE"
url="https://www.kde.org/applications/games/kspaceduel/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d646f969ada6ea721ae02c177904f0c392732979dcab3e20a332a7b058c2284c4109c286a0a165620378f92cde864cf7685c852fcf366cbec8cae551640a0081 kspaceduel-18.12.3.tar.xz"
+sha512sums="5574dbeabf17abbb0e1f232a6f6e7f9f16106f88b8bc79af8b0ba4a323625d1fa70460faa0f2efe0046df76b6ffceac1d723a492a72cfbebde051dde1a7a8187 kspaceduel-19.04.0.tar.xz"
diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD
index 4f8de77f3..cb9d4ac0e 100644
--- a/user/ksquares/APKBUILD
+++ b/user/ksquares/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksquares
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Fun and exciting game of Dots and Boxes"
url="https://games.kde.org/game.php?game=ksquares"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3075a4724bc8cf3d25d94a725818db31f75b4d1ef54e00faff9cab84ffdac7585dc79af7fff0e667a1f679602f22c0ba2dffca10b9e980dcc2850558e1f982bd ksquares-18.12.3.tar.xz"
+sha512sums="20b93e06b64062a3efe5985fbebd637a4f06ba1319ea0cc91c61a217966529fd74dfb47e7f2e441c888e872bfd8fecc809cd7838175fd0967db44adca5fa78ce ksquares-19.04.0.tar.xz"
diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD
index 3515bc53b..52cb1c2f3 100644
--- a/user/ksudoku/APKBUILD
+++ b/user/ksudoku/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksudoku
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Desktop Sudoku (symbol placement / logic) game"
url="https://games.kde.org/game.php?game=ksudoku"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6e773fc6bb9224a5c39142abcc85a93ef1ce8aedd9242fb60b1157027a277d6e235998d8a7d6ac7ecd3d89a1bdacc8e612d5b0c11ec9fcc52c3ea14445384d80 ksudoku-18.12.3.tar.xz"
+sha512sums="e07db466b1955efd897fea530796582ccf0ec9d42b637cbeb9da16951b1c0c861f0b23d7717b8d61da433affbf6bb9bc6904922cd94f3b852bf46e0212b459aa ksudoku-19.04.0.tar.xz"
diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD
index 9506209b6..293943d95 100644
--- a/user/ksystemlog/APKBUILD
+++ b/user/ksystemlog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksystemlog
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Friendly, powerful system log viewer tool"
url="https://www.kde.org/applications/system/ksystemlog/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4808d8981e5d7d5d75be11c3b00c25e4962ea2b8a5e600f50aff2ca8e74d9af924859329224c92001a91e9fa697fae29a21c2ed1209cada641c732773b2bad0b ksystemlog-18.12.3.tar.xz"
+sha512sums="7989b15d3cc0b10a170954e382f64fe6acffea7d6adcabd5728c284b502ce5f0c77d78f0df647ce9497c953897d479dc7a1c03f955535b012d08af0d425cd16b ksystemlog-19.04.0.tar.xz"
diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD
index 89988296c..28c99e648 100644
--- a/user/kteatime/APKBUILD
+++ b/user/kteatime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kteatime
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Steep responsibly"
url="https://www.kde.org/applications/games/kteatime/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0c2280828005c85c12a8616c288416537cee2fe6053571c3ee369ccd7903ca66625b95304217a5a6518ac0602b1cde9d0e654032ad32b12f082d80535cca4e55 kteatime-18.12.3.tar.xz"
+sha512sums="8aa9a1df61a383339d19a33d77c4cbd0475d81cf8f991258212784b6c11b9e7b3858c699831c81ce922753dd7e79053c1305252892a80f3c396049b246e8edd6 kteatime-19.04.0.tar.xz"
diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD
index 366d60c4c..fce931054 100644
--- a/user/ktimer/APKBUILD
+++ b/user/ktimer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktimer
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Tool to execute programs after some time"
url="https://www.kde.org/applications/utilities/ktimer/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e61752d02d650d32d1988e7b8f394017dd6a7130f222bda55a747039ce5cb593976ee99f4cdde1731e55e86f8b2ecfa967efea6198a1de6d240ce11fd48488fe ktimer-18.12.3.tar.xz"
+sha512sums="3e6221f99d4d1dfcbf23835160ce6a4a22b3f8f9981e2ac94df338ca3f3c6eccfee69f53c4f022f4f728ff110e43b0863ad3751bb06304fb7b2f07a83d9a56c5 ktimer-19.04.0.tar.xz"
diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD
index a978ce469..fa96b4eda 100644
--- a/user/ktouch/APKBUILD
+++ b/user/ktouch/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktouch
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Touch typing tutor"
url="https://www.kde.org/applications/education/ktouch/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1973b7d9e8ba61b4bfe9b23e53597ffe8eb4d00f4a57a3e2861a41b2b6c8bcf8204ad59d8d42d696e07a7d8c2b9cf7d3b4dbba8924fd2a9470d5b7524034a6cd ktouch-18.12.3.tar.xz"
+sha512sums="c2fd7a42efd5556edb26bec59158929998513be8c68d84c1f5db8ba91a6cc5b52aa639f5200ac159aa60714cf39a44386c33e5b113e331b1c86eed4dcde74319 ktouch-19.04.0.tar.xz"
diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD
index 6bfead6d6..40557e308 100644
--- a/user/ktuberling/APKBUILD
+++ b/user/ktuberling/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktuberling
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Simple constructor game"
url="https://games.kde.org/game.php?game=ktuberling"
@@ -13,7 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kdbusaddons-dev kdelibs4support-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev qt5-qtmultimedia-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz
+ frameworks.patch
+ "
build() {
cd "$builddir"
@@ -41,4 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3f496c2d48c726274fa01c8116eeb50d06b9ef39ce7004b10b40316382ee082d26dbe3da8e43c9c7c77a719e6a10bff0f130d3c99fb9f9156d95216c428189fb ktuberling-18.12.3.tar.xz"
+sha512sums="69665dcda82f6ace6d46679529669db57fbafb41ef22a96c746813925622603f4cba2930cb951e80f99f731e966b29e274602c119df468c96f5590722a862947 ktuberling-19.04.0.tar.xz
+a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch"
diff --git a/user/ktuberling/frameworks.patch b/user/ktuberling/frameworks.patch
new file mode 100644
index 000000000..7f03b5874
--- /dev/null
+++ b/user/ktuberling/frameworks.patch
@@ -0,0 +1,11 @@
+--- ktuberling-19.04.0/CMakeLists.txt.old 2019-04-12 00:10:28.000000000 +0000
++++ ktuberling-19.04.0/CMakeLists.txt 2019-04-18 21:18:28.795796335 +0000
+@@ -2,7 +2,7 @@
+
+ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
+ set (QT_MIN_VERSION "5.3.0")
+-set (KF5_MIN_VERSION "5.55.0")
++set (KF5_MIN_VERSION "5.54.0")
+
+ find_package(ECM 1.7.0 REQUIRED CONFIG)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD
index e02479a1d..d6cec1873 100644
--- a/user/kturtle/APKBUILD
+++ b/user/kturtle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kturtle
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Educational programming environment"
url="https://www.kde.org/applications/education/kturtle/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3244d1c691f2d7c0625cb35b426dc40d7fc112e741af0dda6abdbfba53a36eed199c3cd9b7f60c078b232f903572a112958988cc677fa989dbd51ce3c8bb85f0 kturtle-18.12.3.tar.xz"
+sha512sums="b2679f60185e4a37eb332d66bb632eaf054f34bde958beeaed245bea90790ba318d945f260516c1162ac5cbf303e00f3ef20c662803bc9ffef7cdfb501217aee kturtle-19.04.0.tar.xz"
diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD
index 485a62692..f4d9a2517 100644
--- a/user/kubrick/APKBUILD
+++ b/user/kubrick/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kubrick
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="3D cube puzzle solving game"
url="https://www.kde.org/applications/games/kubrick/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4761c56bbaac06fa4f5f1e398c06ebe859672f333542185b2a15fac753aa8279a3bb62dbb8cfd972adaaab1903cb56b157fd39e468d3ba8b33f2fbc746517c67 kubrick-18.12.3.tar.xz"
+sha512sums="c921a830fc63055a8318bf0eabdd6ebd4ec98310dee3cbd0cad2b16a83827b7a30ce905a6d9a725f77d68b5cecc02a09b6396996854cb36bf14a61dc32e62a9d kubrick-19.04.0.tar.xz"
diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD
index ef0a0403a..ef9600ca3 100644
--- a/user/kwalletmanager/APKBUILD
+++ b/user/kwalletmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwalletmanager
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Manage KDE wallets"
url="https://www.kde.org/applications/system/kwalletmanager/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="26be37f0e273c3532ce6056047ac47c65f0c46f56e79bf4473a62c59772685ea4f842d46864d3fbb44638b0c3105ffe233f0451b6ddc53dbb7327631d46b9d4a kwalletmanager-18.12.3.tar.xz"
+sha512sums="61d2d4a8ffa9647ab2636f417450b549384be4bc4ffa2d70eedce9a2eada3bd2647c2fd8a4ea57666a9c314f304a0cfda0dbbe7440a05aaff03b0199d9c3b87e kwalletmanager-19.04.0.tar.xz"
diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD
index dc6934195..5f1a1e865 100644
--- a/user/kwave/APKBUILD
+++ b/user/kwave/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwave
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Sound editor built for KDE"
url="http://kwave.sourceforge.net/"
@@ -46,5 +46,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="bffafe6b63cdad5e674a02d9b57e5e658260c2d933ae148e155afc598045a67143f21aad4c52e1437b6f47181b47ee9896e3219700cc8e0aa1c8408fdf797adb kwave-18.12.3.tar.xz
+sha512sums="e77b1505eafcf86c017e77e5fa6b35bb4f254defb1b4c94abff2cb54a42e7aea730c84997118cf717855047a07dc6073f52837e31688ddf0016b3bf7033bda0c kwave-19.04.0.tar.xz
43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch"
diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD
index 3fb34c0f3..130a17337 100644
--- a/user/kwordquiz/APKBUILD
+++ b/user/kwordquiz/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwordquiz
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Flash card trainer for KDE"
url="https://www.kde.org/applications/education/kwordquiz/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e4e122317bc2935bf6f23d353b91002607b80b7320e6b976924d03b8c3ef42fecb3236b2af2f01ee4c859854507ed8a51a4e3b991b047ad955e82ddd726e27a7 kwordquiz-18.12.3.tar.xz"
+sha512sums="e23f59dcbc3c8625070a48c217bacb44bd1c79a58c97549972410aa394e064c18b60d3b46d71347f9194a94df0982226b1a305d18f2fdc19e0c20470144683e9 kwordquiz-19.04.0.tar.xz"
diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD
index 099fb8c0a..8d8799687 100644
--- a/user/libkdcraw/APKBUILD
+++ b/user/libkdcraw/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkdcraw
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="RAW image file format support for KDE"
url="https://www.KDE.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ecd6f8a013e160221644d84b6ed1befc9b45da23ed90bd98eb857bd4c5bb0172c6c7bc0eec5c688d8fa212c67f869c4fbf317a4cbd4abf3762e18c62d0c0d440 libkdcraw-18.12.3.tar.xz"
+sha512sums="3361d987e1cec7cdb0c2bde2b356ff39f359e2ec79a37a2ed5ee7a43cb5acf01be04c3e121b121cdc45832d421abfc7ac39157fa8372d5f4dbf899c981b219a7 libkdcraw-19.04.0.tar.xz"
diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD
index 769fdda19..f3baf39f9 100644
--- a/user/libkdegames/APKBUILD
+++ b/user/libkdegames/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkdegames
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Library for common routines shared between KDE games"
url="https://www.kde.org/applications/games/"
@@ -58,4 +58,4 @@ carddecks() {
mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/
}
-sha512sums="12a9cdec2ab2defd337695c3f6d44664d5c187b34e4eed3ab9497f4fd3a8d1450e296699504464572265cc68d4ff5916a4ba86400024b0044335b25a09969c3e libkdegames-18.12.3.tar.xz"
+sha512sums="6c28d3f00902102680072d99a2f4b5bc8fd216d0463530036bd3fcd6e83102341509acc37594d6b833b5a50b5d66f110c5c7b741711817c1aa7ffdc0919bdf46 libkdegames-19.04.0.tar.xz"
diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD
index cb7f858cf..2fe09274b 100644
--- a/user/libkeduvocdocument/APKBUILD
+++ b/user/libkeduvocdocument/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkeduvocdocument
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Library for manipulating KVTML files"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e19a6fceab68e4056cbe7ec1625c3849fe824bec6a809ddfb68d4b0dede377f869e4c4019e2ff03ebb0eaf29b2042e9af69cf798802e29c5aa43bbc235492055 libkeduvocdocument-18.12.3.tar.xz"
+sha512sums="0e05faa01f98bf96b8ae3e69ba402ef127d7559c5fa0cb98d12ae859b0e5a3334af58fecce78f2da3a8d4f191871b62bd5db23a934b0564330d8f3bc27795475 libkeduvocdocument-19.04.0.tar.xz"
diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD
index 463ef365d..da699412c 100644
--- a/user/libkexiv2/APKBUILD
+++ b/user/libkexiv2/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkexiv2
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE integration with Exiv2 EXIF data library"
url="https://www.KDE.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ce2bab29a1059e4be498472b2713e813c8eb5ace4cd928eeff3c6e50a656afda651a57a3877d9388163096e575c897f4f84eee914db101cb8dcd1eb614242898 libkexiv2-18.12.3.tar.xz"
+sha512sums="70eeaa1d117b5d6fd93df894662e751913dc002b2ceacde9b854183d98c85766e111360c721efc0a225939f30eacdbd45dafd71e61349f947155fbe6c7b48dd1 libkexiv2-19.04.0.tar.xz"
diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD
index f8fc34da0..ed380db9b 100644
--- a/user/libkipi/APKBUILD
+++ b/user/libkipi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkipi
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE Image Plugin Interface library"
url="https://www.digikam.org/"
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="85597e17c40c959416d81804a3d01ac7acc2fdb9706db82e28aab1e302511238e4861dae7cd23a08f2900df7d3ba8e506ade689f89d5e8949e6cc8378492430c libkipi-18.12.3.tar.xz"
+sha512sums="8628306cbe885dfa04ec7374d56fc08df21c95df2ef1d14bf257ab36433b6e57696bd9109413b129d5520193e801f29bede7a82ac8a33a03f3130625c96a6e4a libkipi-19.04.0.tar.xz"
diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index 841a3d944..48ec55e10 100644
--- a/user/libkleo/APKBUILD
+++ b/user/libkleo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkleo
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE encryption library"
url="https://www.kde.org/"
@@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg
makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev
kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz
+ egregious-versions.patch
+ "
build() {
cd "$builddir"
@@ -41,4 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="de7348f2d8aae0d250613fcb7f0fb92e9c9aa979d1457e95e4a3908fddb69ea59f1d70311f24c4affce61c64b638dc95901c80b9d6a4ae019dfb115012a9b348 libkleo-18.12.3.tar.xz"
+sha512sums="5b96c7427afc36ccb46532de57adc5678e52f917f6caeabfaa34a736f0b5cdb1cafa9b69a7988df1cd6da33021bf8ab3fa85cdd76eb2ce491a409f0ab9e12ae3 libkleo-19.04.0.tar.xz
+b9d8baa5212effbcc377c947c51cda1c0ce51a2eee2dae02d430a87cd88f21b1bc4ac19d689a39350fd04ffd057aaee138347d4c4561e9835253ccc5387c5565 egregious-versions.patch"
diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch
new file mode 100644
index 000000000..440c7bf4f
--- /dev/null
+++ b/user/libkleo/egregious-versions.patch
@@ -0,0 +1,22 @@
+libKleo uses no new APIs.
+
+--- libkleo-19.04.0/CMakeLists.txt.old 2019-04-12 00:16:32.000000000 +0000
++++ libkleo-19.04.0/CMakeLists.txt 2019-04-19 06:31:09.576149789 +0000
+@@ -3,7 +3,7 @@
+
+ project(libkleo VERSION ${PIM_VERSION})
+
+-set(KF5_MIN_VERSION "5.56.0")
++set(KF5_MIN_VERSION "5.54.0")
+
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+@@ -24,7 +24,7 @@
+
+
+ set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
+-set(QT_REQUIRED_VERSION "5.10.0")
++set(QT_REQUIRED_VERSION "5.9.0")
+ set(KDEPIMTEXTEDIT_VERSION "5.11.0")
+
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD
index 44b2e9067..872a277a1 100644
--- a/user/libkmahjongg/APKBUILD
+++ b/user/libkmahjongg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkmahjongg
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Library with Mah Jongg logic"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c4e2b36be5a3ca0987503593136cbfcccef3cc9db914132b6fe121b5979d786d78f6ffefb0567f4e0ec1e3a52b4c1a3eab474d6286fda0b13b24188e32a3d869 libkmahjongg-18.12.3.tar.xz"
+sha512sums="99a5a6a8de7c069687ba2371a1d0375603bc78c90c9947c3a2503c31f34c1edd781567cac3b23e8b1081eb4189bbc1fafe9a4136933998136dd06b4993e40991 libkmahjongg-19.04.0.tar.xz"
diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD
index 7a2b13670..22983f2df 100644
--- a/user/libksane/APKBUILD
+++ b/user/libksane/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libksane
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="KDE scanning library"
url="https://www.kde.org"
@@ -12,7 +12,9 @@ depends_dev="sane-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev
ktextwidgets-dev kwallet-dev kwidgetsaddons-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz
+ frameworks.patch
+ "
build() {
cd "$builddir"
@@ -40,4 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="af14a341275d70a0b3af3c93270bbadecfcd2cce4df0ab077aaa967f8bec8fce292b7fcb190f8b3b43d05bf5fea70f4cae7716df1d62b5950cbbe7d9e3ce3e49 libksane-18.12.3.tar.xz"
+sha512sums="29be4c8bd7568e116ae84b3eb9911740c9cbf7508e3c0e150f552a5f5f4cc07791c6f9a0373f00cfbe5e0421cc45936445adf9cd277c6ad1b22cf067e6058a2e libksane-19.04.0.tar.xz
+60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch"
diff --git a/user/libksane/frameworks.patch b/user/libksane/frameworks.patch
new file mode 100644
index 000000000..f44ad09db
--- /dev/null
+++ b/user/libksane/frameworks.patch
@@ -0,0 +1,11 @@
+--- libksane-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:29.000000000 +0000
++++ libksane-19.04.0/CMakeLists.txt 2019-04-18 22:42:00.675733179 +0000
+@@ -26,7 +26,7 @@
+ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+
+-set(KF5_VERSION "5.55.0")
++set(KF5_VERSION "5.54.0")
+
+ ecm_setup_version(
+ ${KF5_VERSION}
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 9f4e97f9e..38ba69198 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=libpsl
-pkgver=0.20.2
+pkgver=0.21.0
pkgrel=0
pkgdesc="C library for examining the Public Suffix List"
url="https://rockdaboot.github.io/libpsl"
@@ -34,5 +34,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe libpsl-0.20.2.tar.gz
+sha512sums="165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d libpsl-0.21.0.tar.gz
00c9c09bac334efcd7ae6240b740ac88453425cc380cc23b443a0579f4ccabf86eafdb90f5f05027cc55ee20f6c1d4388939792a55cd95705d5e6919d40b30e5 use-python3.patch"
diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD
index 32f0a956c..9c1836e60 100644
--- a/user/libzip/APKBUILD
+++ b/user/libzip/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=libzip
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.5.2
+pkgrel=0
pkgdesc="C library for manipulating ZIP archives"
url="https://libzip.org/"
arch="all"
@@ -19,7 +19,6 @@ source="https://libzip.org/download/$pkgname-$pkgver.tar.xz"
# - CVE-2017-14107
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -31,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" -j1 install
}
@@ -46,4 +43,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d libzip-1.5.1.tar.xz"
+sha512sums="1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 libzip-1.5.2.tar.xz"
diff --git a/user/llvm7/ppc32-calling-convention.patch b/user/llvm7/ppc32-calling-convention.patch
deleted file mode 100644
index 2e6d66427..000000000
--- a/user/llvm7/ppc32-calling-convention.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-===================================================================
---- trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -3511,9 +3511,14 @@
- // Argument stored in memory.
- assert(VA.isMemLoc());
-
-+ // Get the extended size of the argument type in stack
- unsigned ArgSize = VA.getLocVT().getStoreSize();
-- int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(),
-- isImmutable);
-+ // Get the actual size of the argument type
-+ unsigned ObjSize = VA.getValVT().getStoreSize();
-+ unsigned ArgOffset = VA.getLocMemOffset();
-+ // Stack objects in PPC32 are right justified.
-+ ArgOffset += ArgSize - ObjSize;
-+ int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable);
-
- // Create load nodes to retrieve arguments from the stack.
- SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
-@@ -5468,10 +5473,15 @@
- Arg = PtrOff;
- }
-
-- if (VA.isRegLoc()) {
-- if (Arg.getValueType() == MVT::i1)
-- Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg);
-+ // When useCRBits() is true, there can be i1 arguments.
-+ // It is because getRegisterType(MVT::i1) => MVT::i1,
-+ // and for other integer types getRegisterType() => MVT::i32.
-+ // Extend i1 and ensure callee will get i32.
-+ if (Arg.getValueType() == MVT::i1)
-+ Arg = DAG.getNode(Flags.isSExt() ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND,
-+ dl, MVT::i32, Arg);
-
-+ if (VA.isRegLoc()) {
- seenFloatArg |= VA.getLocVT().isFloatingPoint();
- // Put argument in a physical register.
- RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
-Index: trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-===================================================================
---- trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-+++ trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-@@ -0,0 +1,24 @@
-+; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s
-+target triple = "powerpc-unknown-linux-gnu"
-+
-+define void @check_callee(
-+ i32, i32, i32, i32,
-+ i32, i32, i32, i32,
-+ i1 zeroext %s1
-+) {
-+ call void @check_caller(
-+ i32 9, i32 9, i32 9, i32 9,
-+ i32 9, i32 9, i32 9, i32 9,
-+ i1 zeroext %s1)
-+ ret void
-+}
-+
-+; CHECK-LABEL: @check_callee
-+; CHECK: lbz {{[0-9]+}}, 27(1)
-+; CHECK: stw {{[0-9]+}}, 8(1)
-+
-+declare void @check_caller(
-+ i32, i32, i32, i32,
-+ i32, i32, i32, i32,
-+ i1 zeroext
-+)
diff --git a/user/llvm7/APKBUILD b/user/llvm8/APKBUILD
index d4b78cef0..de4969ac7 100644
--- a/user/llvm7/APKBUILD
+++ b/user/llvm8/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
_pkgname=llvm
-pkgver=7.0.1
+pkgver=8.0.0
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
pkgrel=0
@@ -24,7 +24,6 @@ source="https://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz
musl-ppc64-elfv2.patch
more-secure-plt.patch
even-more-secure-plt.patch
- ppc32-calling-convention.patch
python3-test.patch
"
builddir="$srcdir/$_pkgname-$pkgver.src"
@@ -102,7 +101,7 @@ build() {
-DLLVM_HOST_TRIPLE="$CHOST" \
-DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_LINK_LLVM_DYLIB=ON \
- -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;SystemZ;AMDGPU;NVPTX;Mips;BPF' \
+ -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Mips;PowerPC;Sparc;SystemZ;WebAssembly;X86' \
"$builddir"
make llvm-tblgen
@@ -114,6 +113,9 @@ build() {
check() {
cd "$builddir"/build
+ # appears to be an issue on musl and glibc, but only fails on musl:
+ # https://github.com/NixOS/nixpkgs/blob/bb7e9e46/pkgs/development/compilers/llvm/8/llvm.nix#L74
+ rm "$builddir"/test/CodeGen/AArch64/wineh4.mir
# FIXME: Few tests fail on s390x, ignore it for now. See build log
# https://gist.github.com/jirutka/6edc951ad5b8002cf1780546cf661edc
case "$CARCH" in
@@ -161,11 +163,7 @@ package() {
rmdir include
ln -s ../../include/$pkgname include
- # Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/
- # and symlink it back.
- _mv lib/cmake/llvm/* "$pkgdir"/usr/lib/cmake/$pkgname/
- rmdir lib/cmake/llvm
- ln -s ../../../cmake/$pkgname lib/cmake/llvm
+ ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm
}
static() {
@@ -241,12 +239,11 @@ _mv() {
mv $@
}
-sha512sums="ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df llvm-7.0.1.src.tar.xz
+sha512sums="1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f llvm-8.0.0.src.tar.xz
f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch
49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch
caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200 disable-dlclose-test.patch
e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch
-dcd34b81c2f2843cd05b2e3b88e268045a2ec6ed8677630fc8904f38b2131cbc0ba37dde461e28b1c301d5e95b634b2e225797f8a5585c0cabc69e3b7e78de85 more-secure-plt.patch
+957516510439be661ad04e061e9616da8a271a5621603238cde5b4782bd2465367eaaa5ade628d163c8d9e70b8b0495687669f4648bd031ac6e5a1582d2e75a4 more-secure-plt.patch
deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch
-c3f596a1578a07ce0ee40c4e2576fe05ca6ca0c1b4f94b1f74c55cb09603afe7c846db9294fe28d83ca48633086bad422218e6d06e0d92173143fb298e06fb38 ppc32-calling-convention.patch
53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch"
diff --git a/user/llvm7/disable-FileSystemTest.CreateDir-perms-assert.patch b/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch
index e73ce9b6f..e73ce9b6f 100644
--- a/user/llvm7/disable-FileSystemTest.CreateDir-perms-assert.patch
+++ b/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch
diff --git a/user/llvm7/disable-dlclose-test.patch b/user/llvm8/disable-dlclose-test.patch
index b70cd4d4d..b70cd4d4d 100644
--- a/user/llvm7/disable-dlclose-test.patch
+++ b/user/llvm8/disable-dlclose-test.patch
diff --git a/user/llvm7/even-more-secure-plt.patch b/user/llvm8/even-more-secure-plt.patch
index 112e111b8..112e111b8 100644
--- a/user/llvm7/even-more-secure-plt.patch
+++ b/user/llvm8/even-more-secure-plt.patch
diff --git a/user/llvm7/llvm-fix-build-with-musl-libc.patch b/user/llvm8/llvm-fix-build-with-musl-libc.patch
index 6ee91ea44..6ee91ea44 100644
--- a/user/llvm7/llvm-fix-build-with-musl-libc.patch
+++ b/user/llvm8/llvm-fix-build-with-musl-libc.patch
diff --git a/user/llvm7/more-secure-plt.patch b/user/llvm8/more-secure-plt.patch
index 1a32eea4f..6728e2765 100644
--- a/user/llvm7/more-secure-plt.patch
+++ b/user/llvm8/more-secure-plt.patch
@@ -16,13 +16,13 @@ index c583fba8cab..6a9eedf89c5 100644
--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -222,6 +222,10 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
- if (TT.getArch() == Triple::ppc64 || TT.getArch() == Triple::ppc64le)
+ if (TT.getArch() == Triple::ppc64)
return Reloc::PIC_;
+ // musl needs SecurePlt, which depends on PIC.
+ if (TT.getEnvironment() == Triple::Musl)
+ return Reloc::PIC_;
+
- // 32-bit is static by default.
+ // Rest are static by default.
return Reloc::Static;
}
diff --git a/user/llvm7/musl-ppc64-elfv2.patch b/user/llvm8/musl-ppc64-elfv2.patch
index 016be5dad..016be5dad 100644
--- a/user/llvm7/musl-ppc64-elfv2.patch
+++ b/user/llvm8/musl-ppc64-elfv2.patch
diff --git a/user/llvm7/python3-test.patch b/user/llvm8/python3-test.patch
index 746313317..746313317 100644
--- a/user/llvm7/python3-test.patch
+++ b/user/llvm8/python3-test.patch
diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD
index 8c20e285e..5ef16ae2f 100644
--- a/user/lskat/APKBUILD
+++ b/user/lskat/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lskat
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Lieutenant Skat is an interactive two-player card game"
url="https://games.kde.org/game.php?game=lskat"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6fadb424397fa3780af818323eda2c7025f4e611e33a78ed93aad661a5bd1d0df2d71af6da9c6598278aee137e60a9ca7591e5fadbd0cc25af2eb2ebffaa7ded lskat-18.12.3.tar.xz"
+sha512sums="8c8a4e991fa696643bbb6c4427128b3ca465f479025b18bd8bcc3d34111d8f0bde3c0c155ebe4f39b3af75b134c17b644186d4b599d7a3e66b04af656caa2019 lskat-19.04.0.tar.xz"
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
index 00df90902..efddac983 100644
--- a/user/marble/APKBUILD
+++ b/user/marble/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=marble
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Free, open-source map and virtual globe"
url="https://marble.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="af6147a288021a3056892bae8d9c83b6ecfc581c7237d3fa04a579e4461779a5dacb0e22b21f0e8af5032f75d827a56d197369c85193f0188140ac361777a851 marble-18.12.3.tar.xz"
+sha512sums="82004878225848df197f41ea022e2c1c971a1480b7a6ae05088488ba28495e4e4e7f11c6fd14ccb7ebbbe68ba8ae1daf1d16f57e8f9e7ca22f3d3feb9290adbe marble-19.04.0.tar.xz"
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index d9b27c865..4b8dc8d5a 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mesa
-pkgver=18.3.4
+pkgver=18.3.6
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
@@ -16,7 +16,7 @@ subpackages="$pkgname-dev
$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
"
-_llvmver=7
+_llvmver=8
depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev
xorgproto-dev"
makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev
@@ -230,7 +230,7 @@ _dri() {
esac
}
-sha512sums="e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99 mesa-18.3.4.tar.xz
+sha512sums="3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487 mesa-18.3.6.tar.xz
9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch
c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch
245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch
diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD
index 709062f23..25dae2457 100644
--- a/user/meson/APKBUILD
+++ b/user/meson/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=meson
-pkgver=0.50.0
+pkgver=0.50.1
pkgrel=0
pkgdesc="Fast, user-friendly build system"
url="http://mesonbuild.com/"
@@ -27,4 +27,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="93ed7dbb1e3f7687834560686b9bf1c34d1098b1a542d3a6f6f91e36316202705e3a45fa4280237e3896a02177b42a6362e1afe4fbe29adf0b857c5c368f6f5f meson-0.50.0.tar.gz"
+sha512sums="1e3dda7684e999b408a34b4b594f0b7d22494328dc0e98ec794625f16d821f2ef96303ffc761a52249e3919b52befe9fc02577dbd52e50f4b16e6c0f79ba2fca meson-0.50.1.tar.gz"
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
index d6dd2837f..d961d6995 100644
--- a/user/minuet/APKBUILD
+++ b/user/minuet/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=minuet
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Music education software"
url="https://minuet.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="559c62c62aceadb10f2f501cddd9094e0ce2a5520d3c872fe5a76f6c3827828c6aca7850ce8c27b1c9126446887b87e7f39f65b861214733e4578816c6981660 minuet-18.12.3.tar.xz"
+sha512sums="11f6b2806ade05b288a6a637fa6ad3bafacdcd61e70d8653c87170440b645c50e366e2892b8a72516cdfe378d9bb9fddf4789f77a9e6664ab47cbe12a6df3a2f minuet-19.04.0.tar.xz"
diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD
index cb717ec1b..e13de2e06 100644
--- a/user/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
@@ -3,10 +3,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=mutt
-pkgver=1.10.1
+pkgver=1.11.4
pkgrel=0
pkgdesc="Small but very powerful text-mode email client"
-url="http://www.mutt.org"
+url="http://www.mutt.org" # No HTTPS
arch="all"
options="suid !check" # No test suite.
license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
ISPELL=/usr/bin/hunspell \
./configure \
--build=$CBUILD \
@@ -42,7 +41,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/etc/*.dist \
@@ -58,4 +56,4 @@ package() {
"$pkgdir"/etc/Muttrc.gpg.dist
}
-sha512sums="13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 mutt-1.10.1.tar.gz"
+sha512sums="18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb mutt-1.11.4.tar.gz"
diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 5c2c06c70..6ca30bbad 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nfs-utils
pkgver=2.3.3
-pkgrel=0
+pkgrel=1
pkgdesc="NFS file sharing client and server"
url="http://nfs.sourceforge.net/"
arch="all"
@@ -13,6 +13,7 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev
rpcsvc-proto sqlite-dev util-linux-dev"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz
+ freeaddrinfo-properly.patch
nfs-utils-1.1.4-mtab-sym.patch
posixish.patch
undef-def.patch
@@ -63,6 +64,7 @@ package() {
}
sha512sums="5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716 nfs-utils-2.3.3.tar.xz
+7e1472989374cf8a8dbd4944bbd5deaa5520f12ea3627709be037fb78febec531b373c6e05004f27046d1e3842f5cc7ce024f4db65cf656864bda85db529b451 freeaddrinfo-properly.patch
1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch
f0b87ff4229d96a46e3f0c17f87dcd3ce5c51651ee036d935c1481b421cd7e5b6a048a082b4f8115a969fe6e85cc871df7658bf5d80c480095b69f29fd6b085d posixish.patch
2e54efa2cac0522f549e8bed45147676d10b299b5060eda305da8767feb55d37627259196d89c295e8d5f4fbbb7c9e791a53dddd579187600f1717968049aa6a undef-def.patch
diff --git a/user/nfs-utils/freeaddrinfo-properly.patch b/user/nfs-utils/freeaddrinfo-properly.patch
new file mode 100644
index 000000000..7ddcde004
--- /dev/null
+++ b/user/nfs-utils/freeaddrinfo-properly.patch
@@ -0,0 +1,126 @@
+diff -Naur nfs-utils-2.3.3-orig/support/export/client.c nfs-utils-2.3.3/support/export/client.c
+--- nfs-utils-2.3.3-orig/support/export/client.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/support/export/client.c 2019-04-21 02:48:45.676838188 -0500
+@@ -309,7 +309,8 @@
+ init_addrlist(clp, ai);
+
+ out:
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ return clp;
+ }
+
+diff -Naur nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c nfs-utils-2.3.3/tests/nsm_client/nsm_client.c
+--- nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/tests/nsm_client/nsm_client.c 2019-04-21 02:35:53.139552780 -0500
+@@ -243,7 +243,8 @@
+ printf("RPC client creation failed\n");
+ }
+ out:
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ return client;
+ }
+
+diff -Naur nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c nfs-utils-2.3.3/utils/exportfs/exportfs.c
+--- nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/utils/exportfs/exportfs.c 2019-04-21 02:40:07.432327005 -0500
+@@ -282,7 +282,8 @@
+ validate_export(exp);
+
+ out:
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ }
+
+ static int exportfs_generic(char *arg, char *options, int verbose)
+@@ -395,7 +396,8 @@
+ if (!success)
+ xlog(L_ERROR, "Could not find '%s:%s' to unexport.", hname, path);
+
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ }
+
+ static int unexportfs_generic(char *arg, int verbose)
+@@ -639,8 +641,10 @@
+ }
+
+ out:
+- freeaddrinfo(results1);
+- freeaddrinfo(results2);
++ if (results1 != NULL)
++ freeaddrinfo(results1);
++ if (results2 != NULL)
++ freeaddrinfo(results2);
+ return result;
+ }
+
+diff -Naur nfs-utils-2.3.3-orig/utils/mount/stropts.c nfs-utils-2.3.3/utils/mount/stropts.c
+--- nfs-utils-2.3.3-orig/utils/mount/stropts.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/utils/mount/stropts.c 2019-04-21 02:43:18.451874403 -0500
+@@ -1263,7 +1263,8 @@
+ } else
+ nfs_error(_("%s: internal option parsing error"), progname);
+
+- freeaddrinfo(mi.address);
++ if (mi.address != NULL)
++ freeaddrinfo(mi.address);
+ free(mi.hostname);
+ return retval;
+ }
+diff -Naur nfs-utils-2.3.3-orig/utils/mountd/cache.c nfs-utils-2.3.3/utils/mountd/cache.c
+--- nfs-utils-2.3.3-orig/utils/mountd/cache.c 2019-04-21 02:33:43.603417171 -0500
++++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-04-21 02:45:11.289792765 -0500
+@@ -834,7 +834,8 @@
+ out:
+ if (found_path)
+ free(found_path);
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ free(dom);
+ xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
+ }
+@@ -1355,7 +1356,7 @@
+ xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
+ if (dom) free(dom);
+ if (path) free(path);
+- freeaddrinfo(ai);
++ if (ai) freeaddrinfo(ai);
+ }
+
+
+diff -Naur nfs-utils-2.3.3-orig/utils/mountd/mountd.c nfs-utils-2.3.3/utils/mountd/mountd.c
+--- nfs-utils-2.3.3-orig/utils/mountd/mountd.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/utils/mountd/mountd.c 2019-04-21 02:45:41.796526387 -0500
+@@ -581,7 +581,8 @@
+ freeaddrinfo(ai);
+ continue;
+ }
+- freeaddrinfo(ai);
++ if (ai != NULL)
++ freeaddrinfo(ai);
+ }
+ cp = &(c->gr_next);
+ }
+diff -Naur nfs-utils-2.3.3-orig/utils/statd/hostname.c nfs-utils-2.3.3/utils/statd/hostname.c
+--- nfs-utils-2.3.3-orig/utils/statd/hostname.c 2018-09-06 13:09:08.000000000 -0500
++++ nfs-utils-2.3.3/utils/statd/hostname.c 2019-04-21 02:41:39.712446505 -0500
+@@ -308,8 +308,10 @@
+ }
+
+ out:
+- freeaddrinfo(results2);
+- freeaddrinfo(results1);
++ if (results2 != NULL)
++ freeaddrinfo(results2);
++ if (results1 != NULL)
++ freeaddrinfo(results1);
+
+ xlog(D_CALL, "%s: hostnames %s and %s %s", __func__,
+ hostname1, hostname2,
diff --git a/user/okular/0001-Ensure-compatibility-with-Qt.patch b/user/okular/0001-Ensure-compatibility-with-Qt.patch
new file mode 100644
index 000000000..dfd2daa75
--- /dev/null
+++ b/user/okular/0001-Ensure-compatibility-with-Qt.patch
@@ -0,0 +1,36 @@
+From 00f76c2df98c44722b05f7c350cf6b3241c2128f Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Thu, 18 Apr 2019 18:17:32 -0500
+Subject: [PATCH] Ensure compatibility with Qt <5.10
+
+Qt::AA_CompressTabletEvents was added in Qt 5.10. Use preprocessor check
+to avoid build failures on 5.9 LTS or 5.8 (the minimum version).
+---
+ shell/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/main.cpp b/shell/main.cpp
+index 17b58c610..dbdebf1a4 100644
+--- a/shell/main.cpp
++++ b/shell/main.cpp
+@@ -19,6 +19,7 @@
+ #include <QTextStream>
+ #include <kwindowsystem.h>
+ #include <QApplication>
++#include <QtGlobal>
+ #include <KAboutData>
+ #include <KCrash>
+ #include <KMessageBox>
+@@ -31,7 +32,9 @@
+ int main(int argc, char** argv)
+ {
+ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
++#if QT_VERSION >= 0x051000
+ QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents);
++#endif
+
+ QApplication app(argc, argv);
+ KLocalizedString::setApplicationDomain("okular");
+--
+2.21.0
+
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index ed7175568..7a8fa0fa6 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=okular
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Universal document reader developed by KDE"
url="https://okular.kde.org/"
@@ -16,7 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev
libspectre-dev ebook-tools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz
+ 0001-Ensure-compatibility-with-Qt.patch
+ "
build() {
cd "$builddir"
@@ -45,4 +47,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cbbf20657b6d0c5837d1400fb5be17410672e2489372f62f247b380bd38c0f3ef412d179b683a92d592a906855a648e997c6db5898e29365dcefdf7a8192bf11 okular-18.12.3.tar.xz"
+sha512sums="8a28f0cafb9b4ae8f5b3720958ccf511b9c40bbbe9b725fac11e103b1ebbb4a8a7cf84917cbe355bae7bd279584902e14907eafed2c5145b3c83d80d0a5ae25f okular-19.04.0.tar.xz
+cdaae2b04abaa4663e6a9f1e95dc3659c756ad1f159dc85bad52b6d55b37aef9aa7e52e773687f6295b248f6df0518e59d9da45d5819354f9eea407037a6959c 0001-Ensure-compatibility-with-Qt.patch"
diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD
index 5a4ec3dc4..fd7b7388f 100644
--- a/user/palapeli/APKBUILD
+++ b/user/palapeli/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=palapeli
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Jigsaw puzzle game by KDE"
url="https://www.kde.org/applications/games/palapeli/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="69c7e16ca54e39ec1f32f04db54161dcdd88f85089759ef6871707b10aa3f52edfa59d99ab98e3e115ab0c3471af54148d64b9cc2b3939e5c12fd33c3dcd8678 palapeli-18.12.3.tar.xz"
+sha512sums="af4427ae453a7dcc9163d785dc04b926393f25dfc95ade924ffe5be95be45ee7c8eb0b58ebe4795c7c66241e633999f4bd887f7553f35881f9c5d5b178b23b87 palapeli-19.04.0.tar.xz"
diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD
index 50d298bb0..f5065e0c5 100644
--- a/user/perl-inline-c/APKBUILD
+++ b/user/perl-inline-c/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Dan Theisen <djt@hxx.in>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-inline-c
-pkgver=0.78
+pkgver=0.80
pkgrel=0
pkgdesc="C Language Support for Inline"
url="https://metacpan.org/pod/Inline::C"
@@ -32,4 +32,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="368e68dfb9f1700534d9b391090e340172e3adde5fe15576f883e9341047fec35cea8660751883b27e128ad91dda363d513547368097a989457d669bbbdc8ce4 Inline-C-0.78.tar.gz"
+sha512sums="f68eb9478374ef13a6eb0be6c5adc12ba9c052834ef45db6acc0c794ac295d5b47ffda57dd4d0b15345be96aa21ccaab8bf7e2be0ac0bc4cef73be782a346cf0 Inline-C-0.80.tar.gz"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 187646dd3..8da8caab5 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -36,7 +36,7 @@
pkgname=php7
_pkgname=php
-pkgver=7.2.16
+pkgver=7.2.17
pkgrel=0
_apiver=20170718
pkgdesc="The PHP7 language runtime engine"
@@ -82,7 +82,7 @@ makedepends="autoconf
subpackages="$pkgname-dev $pkgname-doc $pkgname-apache $pkgname-phpdbg
$pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
$pkgname-pear::noarch $pkgname-dbg"
-source="http://php.net/distributions/$_pkgname-$pkgver.tar.bz2
+source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2
$_pkgname-fpm.initd
$_pkgname-fpm.logrotate
$_pkgname-module.conf
@@ -526,7 +526,7 @@ _mv() {
mv $@
}
-sha512sums="f97545905a3ec4bc1ce431e306bffb2d7b6357164ea035a6899ea1589d8df4e6617af3924fa1abcb5da428ad691967504c3f94187d4cae6f2ef285e963d07e3d php-7.2.16.tar.bz2
+sha512sums="6d14311cb3699eec7a8eacfb82e0a00e8f5dcfb31474dd32071c1c3261ddf52157a43a1ead4762da01283b0f5ccbbae8dfbbad2fb59e0900a1769e9f318e5830 php-7.2.17.tar.bz2
23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd
01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate
a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf
diff --git a/user/physlock/APKBUILD b/user/physlock/APKBUILD
index a2c4e471f..f9a5f9574 100644
--- a/user/physlock/APKBUILD
+++ b/user/physlock/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=physlock
-pkgver=11
+pkgver=13
pkgrel=0
pkgdesc="Lightweight Linux console-locking tool"
url="https://github.com/muennich/physlock"
@@ -12,17 +12,17 @@ depends=""
makedepends="linux-headers linux-pam-dev utmps-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz
- utmps.patch"
+ utmps.patch
+ makefile.patch"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make PREFIX="/usr" DESTDIR="$pkgdir" install
}
-sha512sums="d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938 physlock-11.tar.gz
-d461b462dedfb7505f506ce1050d5140b8729f50a383157157e4f65465f63174cc11dc0a46cc1eed57cec0293006c5ec6cc6e96af9acab009ab3c9fe5e2381d5 utmps.patch"
+sha512sums="85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c physlock-13.tar.gz
+69367872c48985db31f2d84b038089da71e48ca79db0b0089f4a94f0cd853409bf9253fd5ee0b0729c01d9252072be1998141fad675baee97e93af1100ce71e6 utmps.patch
+54119c1059231f15ab5ea5543583e12f7e3f9907e9c71b3ec76b10ee5df64a0303d6caf88be9c768d7b679cfcaf0a374c924a3232f221329bc54d22b31c771ce makefile.patch"
diff --git a/user/physlock/makefile.patch b/user/physlock/makefile.patch
new file mode 100644
index 000000000..9cae82168
--- /dev/null
+++ b/user/physlock/makefile.patch
@@ -0,0 +1,14 @@
+--- physlock-13/Makefile 2019-01-28 18:46:20.000000000 +0000
++++ physlock-13/Makefile 2019-04-18 07:17:28.779909174 +0000
+@@ -7,9 +7,9 @@
+ MANPREFIX = $(PREFIX)/share/man
+
+ # enable user detection using libsystemd
+-HAVE_SYSTEMD = 1
++HAVE_SYSTEMD = 0
+
+-cflags = -Wall -pedantic $(CFLAGS)
++cflags = -D_GNU_SOURCE -Wall -pedantic $(CFLAGS)
+ cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=500
+
+ lib_systemd_0 =
diff --git a/user/physlock/utmps.patch b/user/physlock/utmps.patch
index efae166a9..f3ba5e575 100644
--- a/user/physlock/utmps.patch
+++ b/user/physlock/utmps.patch
@@ -1,31 +1,23 @@
---- physlock-11/auth.c 2017-07-13 07:23:52.000000000 +0000
-+++ physlock-11/auth.c 2018-09-21 21:21:36.240024566 +0000
-@@ -16,13 +16,14 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-+#define _GNU_SOURCE
- #include <paths.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
+--- physlock-13/session.c 2019-01-28 18:46:20.000000000 +0000
++++ physlock-13/session.c 2019-04-18 07:11:54.749911535 +0000
+@@ -6,7 +7,7 @@
#include <pwd.h>
#include <unistd.h>
+ #include <errno.h>
-#include <utmp.h>
+#include <utmpx.h>
- #include <errno.h>
- #include <security/pam_misc.h>
-
-@@ -41,12 +42,12 @@ static void get_pam(userinfo_t *uinfo) {
- void get_user(userinfo_t *uinfo, int vt, uid_t owner) {
+ #if HAVE_SYSTEMD
+ #include <systemd/sd-login.h>
+@@ -50,11 +51,11 @@
+ int get_user_utmp(userinfo_t *uinfo, int vt) {
+ int ret = -1;
FILE *uf;
- struct utmp r;
+ struct utmpx r;
- struct passwd *pw;
- char tty[16], name[UT_NAMESIZE+1];
+ char tty[UT_LINESIZE+1], name[UT_NAMESIZE+1];
- uinfo->name = NULL;
+ name[0] = '\0';
- while ((uf = fopen(_PATH_UTMP, "r")) == NULL && errno == EINTR);
+ while ((uf = fopen(UTMPX_FILE, "r")) == NULL && errno == EINTR);
diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD
index 1ef39bd3f..1c6203faf 100644
--- a/user/qt-creator/APKBUILD
+++ b/user/qt-creator/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qt-creator
pkgver=4.8.2
-pkgrel=0
+pkgrel=1
pkgdesc="Cross-platform multi-language programming IDE"
url="https://doc.qt.io/qtcreator/index.html"
arch="all"
@@ -10,7 +10,7 @@ options="!check" # No test suite.
license="LGPL-2.0 WITH Qt-LGPL-exception-1.1"
depends="qt5-qtquickcontrols"
makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtserialport-dev
- qt5-qtscript-dev qt5-qttools-dev clang-dev llvm7-dev python3
+ qt5-qtscript-dev qt5-qttools-dev clang-dev llvm8-dev python3
libexecinfo-dev"
subpackages="$pkgname-dev"
source="https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.gz"
@@ -21,7 +21,9 @@ build() {
cd "$builddir"
export LLVM_INSTALL_DIR=/usr
qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo"
- make
+ ln -s /usr/bin/python3 "$srcdir"/python
+ PATH="$PATH:$srcdir" make
+ rm "$srcdir"/python
}
package() {
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
index f93856aa6..d58282500 100644
--- a/user/rocs/APKBUILD
+++ b/user/rocs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rocs
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Graph theory IDE"
url="https://www.kde.org/applications/education/rocs/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="66bc803ec316bad8f81849acebdc67c92ab175715404253a6e82cb2ab58738bc161bbbea33b15b3d212d853d2f45acf29348d351d957820b37a9fd943ef5b655 rocs-18.12.3.tar.xz"
+sha512sums="681a51b25be2e8e31e66bf7ea8252ac1d5c12a3ec4d99ba2231dee39a362a6cb94a05c3421ba561d10d9efd100e217d6b20d2f6a3c56dcfdd73472945f7997d9 rocs-19.04.0.tar.xz"
diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD
new file mode 100644
index 000000000..bb9b5e7b0
--- /dev/null
+++ b/user/rttr/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=rttr
+pkgver=0.9.6
+pkgrel=0
+pkgdesc="C++ reflection library"
+url=" "
+arch="all"
+license="MIT"
+depends=""
+makedepends="doxygen graphviz"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-src.tar.gz
+ arm64.patch
+ dlclose-doesnt-work.patch
+ install-doc.patch
+ permissions.patch
+ "
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="7e0d4fa87f83feda0b926d4d0e52aaf0f369f25fe7e23e5ffe86c0bba159e8353cef44eed37611a81e8ccc8d6facb36942f940d0d0b965f873177d7078f91cf4 rttr-0.9.6-src.tar.gz
+559b4d55109b7021082cdd15663075312d80a896325db2b6bba43bf9d3ba17ecc2152aa30617f200be904351c7f8ba188b7e7a6b29a71612b42d48a5a0535aa7 arm64.patch
+76efa45715d2a6459ae3cf5a6189de414775eed11a1f6780de563005765139ae6be86e30ead63b5ef8e9a5e84ba77a4ef2b7a75ded7506c6c8d81a696a887ff3 dlclose-doesnt-work.patch
+825ca43fb35f6139db13f0b01818b49bb1556a1190ac2941c643e4d438c5b458883fa2ffb64d95625125c251632da7b3d8b703141335df8883b6e186f2e6a349 install-doc.patch
+905e4c62093ee3877a8a15a1cbd4bc20499e04916ce869a495cf4ef9f47aa94d56aa5ac861d0ca8b6079f2a3b398f92237dc423e452130f7c40b9a170a8aa625 permissions.patch"
diff --git a/user/rttr/arm64.patch b/user/rttr/arm64.patch
new file mode 100644
index 000000000..012a30b3f
--- /dev/null
+++ b/user/rttr/arm64.patch
@@ -0,0 +1,22 @@
+From fe98842255defe9f0b922f46b2dd1c067088a1f2 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Tue, 2 Apr 2019 09:34:47 +0200
+Subject: [PATCH] Support all LP64 architectures
+
+---
+ src/rttr/detail/base/core_prerequisites.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rttr/detail/base/core_prerequisites.h b/src/rttr/detail/base/core_prerequisites.h
+index f60d91c3..6aa29d77 100644
+--- a/src/rttr/detail/base/core_prerequisites.h
++++ b/src/rttr/detail/base/core_prerequisites.h
+@@ -89,7 +89,7 @@ namespace rttr
+ // Architecture
+ /////////////////////////////////////////////////////////////////////////////////////////
+ #if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) ||\
+- defined(__ia64__) || defined(__s390__) || defined(__s390x__)
++ defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(_LP64) || defined(__LP64__)
+ # define RTTR_ARCH_TYPE RTTR_ARCH_64
+ #else
+ # define RTTR_ARCH_TYPE RTTR_ARCH_32
diff --git a/user/rttr/dlclose-doesnt-work.patch b/user/rttr/dlclose-doesnt-work.patch
new file mode 100644
index 000000000..146f16944
--- /dev/null
+++ b/user/rttr/dlclose-doesnt-work.patch
@@ -0,0 +1,94 @@
+musl doesn't support dlclose, so don't test it.
+
+--- rttr-0.9.6/src/unit_tests/misc/library_test.cpp.old 2018-03-26 21:31:07.000000000 +0000
++++ rttr-0.9.6/src/unit_tests/misc/library_test.cpp 2019-04-19 00:10:52.775313358 +0000
+@@ -71,7 +71,7 @@
+ CHECK(lib.get_types().size() == 0);
+ CHECK(lib.get_global_properties().size() == 0);
+ CHECK(lib.get_global_methods().size() == 0);
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ }
+
+ SECTION("negative test")
+@@ -102,7 +102,7 @@
+ #else
+ #error "Don't know library suffix on this plattform!"
+ #endif
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ CHECK(lib.load() == true);
+ REQUIRE(lib.get_error_string().empty() == true);
+ CHECK(does_plugin_type_exist() == true);
+@@ -110,7 +110,7 @@
+ CHECK(lib.get_error_string().empty() == true);
+ CHECK(lib.unload() == true);
+
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ }
+ }
+
+@@ -122,19 +122,19 @@
+ {
+ library lib(library_name);
+
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ CHECK(lib.load() == true);
+ CHECK(lib.load() == true);
+
+ REQUIRE(lib.get_error_string().empty() == true);
+ CHECK(does_plugin_type_exist() == true);
+
+- CHECK(lib.get_types().size() > 1);
++ //CHECK(lib.get_types().size() > 1);
+ CHECK(lib.get_global_properties().size() == 0);
+ CHECK(lib.get_global_methods().size() == 0);
+
+ CHECK(lib.unload() == true);
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ }
+
+ SECTION("load the same lib from different instance multiple times")
+@@ -142,7 +142,7 @@
+ library lib1(library_name);
+ library lib2(library_name);
+
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+
+ CHECK(lib1.load() == true);
+ CHECK(lib2.load() == true);
+@@ -156,26 +156,26 @@
+
+ CHECK(lib2.unload() == true);
+
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ }
+
+ SECTION("load the same lib multiple times 2xload() and 2xunload()")
+ {
+ library lib(library_name);
+
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+
+ CHECK(lib.load() == true);
+ CHECK(does_plugin_type_exist() == true);
+
+ CHECK(lib.unload() == true);
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+
+ CHECK(lib.load() == true);
+ CHECK(does_plugin_type_exist() == true);
+
+ CHECK(lib.unload() == true);
+- CHECK(does_plugin_type_exist() == false);
++ //CHECK(does_plugin_type_exist() == false);
+ }
+ }
+
diff --git a/user/rttr/install-doc.patch b/user/rttr/install-doc.patch
new file mode 100644
index 000000000..ec33d2440
--- /dev/null
+++ b/user/rttr/install-doc.patch
@@ -0,0 +1,11 @@
+--- rttr-0.9.6/doc/CMakeLists.txt.old 2018-03-26 21:30:36.000000000 +0000
++++ rttr-0.9.6/doc/CMakeLists.txt 2019-04-19 00:14:33.471673713 +0000
+@@ -33,7 +33,7 @@
+ set(DOXYGEN_INPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/rttr \\
+ ${CMAKE_CURRENT_SOURCE_DIR}" )
+ set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc")
+-set(DOXYGEN_DOC_INSTALL_DIR "doc")
++set(DOXYGEN_DOC_INSTALL_DIR "share/doc/rttr")
+ set(DOXYGEN_CONFIG_FILE_IN "DoxyFile.cfg.in")
+ set(DOXYGEN_LAYOUT_FILE_IN "doxygen-customization/layout/DoxygenLayout.xml.in")
+ set(DOXYGEN_EXCLUDE "")
diff --git a/user/rttr/permissions.patch b/user/rttr/permissions.patch
new file mode 100644
index 000000000..f572d9f23
--- /dev/null
+++ b/user/rttr/permissions.patch
@@ -0,0 +1,36 @@
+--- rttr-0.9.6/CMake/config.cmake.old 2018-03-26 21:30:35.000000000 +0000
++++ rttr-0.9.6/CMake/config.cmake 2019-04-19 02:03:32.738933898 +0000
+@@ -172,5 +172,5 @@
+
+ install(FILES "${LICENSE_FILE}" "${README_FILE}"
+ DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}
+- PERMISSIONS OWNER_READ)
++ PERMISSIONS WORLD_READ)
+ endif()
+--- rttr-0.9.6/CMake/utility.cmake.old 2018-03-26 21:30:35.000000000 +0000
++++ rttr-0.9.6/CMake/utility.cmake 2019-04-19 02:03:40.268125422 +0000
+@@ -165,7 +165,7 @@
+ getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME)
+ if (${shouldInstall})
+ if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private
+- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)
++ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS WORLD_READ)
+ endif()
+ endif()
+ endforeach()
+--- rttr-0.9.6/doc/CMakeLists.txt.old 2018-03-26 21:30:36.000000000 +0000
++++ rttr-0.9.6/doc/CMakeLists.txt 2019-04-19 02:04:09.075032169 +0000
+@@ -133,11 +133,11 @@
+ install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}"
+ DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
+ PATTERN "*.*"
+- PERMISSIONS OWNER_READ)
++ PERMISSIONS WORLD_READ)
+
+ install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}"
+ DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
+- PERMISSIONS OWNER_READ)
++ PERMISSIONS WORLD_READ)
+
+ #########################################################################################
+
diff --git a/user/rust/0050-LLVM-8.0-compatibility.patch b/user/rust/0050-LLVM-8.0-compatibility.patch
new file mode 100644
index 000000000..a8bffb2b9
--- /dev/null
+++ b/user/rust/0050-LLVM-8.0-compatibility.patch
@@ -0,0 +1,310 @@
+From 78ff5598497c95a696ca669f88a93d127aa24c8d Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Wed, 16 Jan 2019 09:59:03 -0800
+Subject: [PATCH 08/15] LLVM 8.0 compatibility
+
+Backported from commit df0466d upstream.
+---
+ src/librustc_codegen_llvm/debuginfo/mod.rs | 15 ++--
+ src/librustc_codegen_llvm/llvm/ffi.rs | 22 +++--
+ src/rustllvm/PassWrapper.cpp | 7 +-
+ src/rustllvm/RustWrapper.cpp | 93 ++++++++++++++++++++--
+ src/test/codegen/enum-debug-clike.rs | 5 +-
+ 5 files changed, 123 insertions(+), 19 deletions(-)
+
+diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs
+index 2eab626ae8..7aca63caa4 100644
+--- a/src/librustc_codegen_llvm/debuginfo/mod.rs
++++ b/src/librustc_codegen_llvm/debuginfo/mod.rs
+@@ -12,7 +12,7 @@ use self::source_loc::InternalDebugLocation::{self, UnknownLocation};
+
+ use llvm;
+ use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilder, DISubprogram, DIArray, DIFlags,
+- DILexicalBlock};
++ DISPFlags, DILexicalBlock};
+ use rustc::hir::CodegenFnAttrFlags;
+ use rustc::hir::def_id::{DefId, CrateNum};
+ use rustc::ty::subst::{Substs, UnpackedKind};
+@@ -283,7 +283,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
+ let linkage_name = mangled_name_of_instance(self, instance);
+
+ let scope_line = span_start(self, span).line;
+- let is_local_to_unit = is_node_local_to_unit(self, def_id);
+
+ let function_name = CString::new(name).unwrap();
+ let linkage_name = SmallCStr::new(&linkage_name.as_str());
+@@ -301,6 +300,14 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
+ flags |= DIFlags::FlagNoReturn;
+ }
+
++ let mut spflags = DISPFlags::SPFlagDefinition;
++ if is_node_local_to_unit(self, def_id) {
++ spflags |= DISPFlags::SPFlagLocalToUnit;
++ }
++ if self.sess().opts.optimize != config::OptLevel::No {
++ spflags |= DISPFlags::SPFlagOptimized;
++ }
++
+ let fn_metadata = unsafe {
+ llvm::LLVMRustDIBuilderCreateFunction(
+ DIB(self),
+@@ -310,11 +317,9 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
+ file_metadata,
+ loc.line as c_uint,
+ function_type_metadata,
+- is_local_to_unit,
+- true,
+ scope_line as c_uint,
+ flags,
+- self.sess().opts.optimize != config::OptLevel::No,
++ spflags,
+ llfn,
+ template_parameters,
+ None)
+diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs
+index 11e34f600c..853c1ff004 100644
+--- a/src/librustc_codegen_llvm/llvm/ffi.rs
++++ b/src/librustc_codegen_llvm/llvm/ffi.rs
+@@ -2,7 +2,7 @@ use super::debuginfo::{
+ DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType,
+ DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable,
+ DIGlobalVariableExpression, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator,
+- DINameSpace, DIFlags,
++ DINameSpace, DIFlags, DISPFlags,
+ };
+
+ use libc::{c_uint, c_int, size_t, c_char};
+@@ -591,6 +591,20 @@ pub mod debuginfo {
+ const FlagMainSubprogram = (1 << 21);
+ }
+ }
++
++ // These values **must** match with LLVMRustDISPFlags!!
++ bitflags! {
++ #[repr(C)]
++ #[derive(Default)]
++ pub struct DISPFlags: ::libc::uint32_t {
++ const SPFlagZero = 0;
++ const SPFlagVirtual = 1;
++ const SPFlagPureVirtual = 2;
++ const SPFlagLocalToUnit = (1 << 2);
++ const SPFlagDefinition = (1 << 3);
++ const SPFlagOptimized = (1 << 4);
++ }
++ }
+ }
+
+ extern { pub type ModuleBuffer; }
+@@ -1387,11 +1401,9 @@ extern "C" {
+ File: &'a DIFile,
+ LineNo: c_uint,
+ Ty: &'a DIType,
+- isLocalToUnit: bool,
+- isDefinition: bool,
+ ScopeLine: c_uint,
+ Flags: DIFlags,
+- isOptimized: bool,
++ SPFlags: DISPFlags,
+ Fn: &'a Value,
+ TParam: &'a DIArray,
+ Decl: Option<&'a DIDescriptor>)
+@@ -1529,7 +1541,7 @@ extern "C" {
+ AlignInBits: u32,
+ Elements: &'a DIArray,
+ ClassType: &'a DIType,
+- IsFixed: bool)
++ IsScoped: bool)
+ -> &'a DIType;
+
+ pub fn LLVMRustDIBuilderCreateUnionType(Builder: &DIBuilder<'a>,
+diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
+index df7a81643b..18d277be21 100644
+--- a/src/rustllvm/PassWrapper.cpp
++++ b/src/rustllvm/PassWrapper.cpp
+@@ -789,7 +789,7 @@ struct LLVMRustThinLTOData {
+ StringMap<GVSummaryMapTy> ModuleToDefinedGVSummaries;
+
+ #if LLVM_VERSION_GE(7, 0)
+- LLVMRustThinLTOData() : Index(/* isPerformingAnalysis = */ false) {}
++ LLVMRustThinLTOData() : Index(/* HaveGVs = */ false) {}
+ #endif
+ };
+
+@@ -865,7 +865,12 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
+ auto deadIsPrevailing = [&](GlobalValue::GUID G) {
+ return PrevailingType::Unknown;
+ };
++#if LLVM_VERSION_GE(8, 0)
++ computeDeadSymbolsWithConstProp(Ret->Index, Ret->GUIDPreservedSymbols,
++ deadIsPrevailing, /* ImportEnabled = */ true);
++#else
+ computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols, deadIsPrevailing);
++#endif
+ #else
+ computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols);
+ #endif
+diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
+index 9d3e6f93b0..7905e9f0f2 100644
+--- a/src/rustllvm/RustWrapper.cpp
++++ b/src/rustllvm/RustWrapper.cpp
+@@ -294,7 +294,7 @@ extern "C" void LLVMRustSetHasUnsafeAlgebra(LLVMValueRef V) {
+ extern "C" LLVMValueRef
+ LLVMRustBuildAtomicLoad(LLVMBuilderRef B, LLVMValueRef Source, const char *Name,
+ LLVMAtomicOrdering Order) {
+- LoadInst *LI = new LoadInst(unwrap(Source), 0);
++ LoadInst *LI = new LoadInst(unwrap(Source));
+ LI->setAtomic(fromRust(Order));
+ return wrap(unwrap(B)->Insert(LI, Name));
+ }
+@@ -511,6 +511,71 @@ static DINode::DIFlags fromRust(LLVMRustDIFlags Flags) {
+ return Result;
+ }
+
++// These values **must** match debuginfo::DISPFlags! They also *happen*
++// to match LLVM, but that isn't required as we do giant sets of
++// matching below. The value shouldn't be directly passed to LLVM.
++enum class LLVMRustDISPFlags : uint32_t {
++ SPFlagZero = 0,
++ SPFlagVirtual = 1,
++ SPFlagPureVirtual = 2,
++ SPFlagLocalToUnit = (1 << 2),
++ SPFlagDefinition = (1 << 3),
++ SPFlagOptimized = (1 << 4),
++ // Do not add values that are not supported by the minimum LLVM
++ // version we support! see llvm/include/llvm/IR/DebugInfoFlags.def
++ // (In LLVM < 8, createFunction supported these as separate bool arguments.)
++};
++
++inline LLVMRustDISPFlags operator&(LLVMRustDISPFlags A, LLVMRustDISPFlags B) {
++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) &
++ static_cast<uint32_t>(B));
++}
++
++inline LLVMRustDISPFlags operator|(LLVMRustDISPFlags A, LLVMRustDISPFlags B) {
++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) |
++ static_cast<uint32_t>(B));
++}
++
++inline LLVMRustDISPFlags &operator|=(LLVMRustDISPFlags &A, LLVMRustDISPFlags B) {
++ return A = A | B;
++}
++
++inline bool isSet(LLVMRustDISPFlags F) { return F != LLVMRustDISPFlags::SPFlagZero; }
++
++inline LLVMRustDISPFlags virtuality(LLVMRustDISPFlags F) {
++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(F) & 0x3);
++}
++
++#if LLVM_VERSION_GE(8, 0)
++static DISubprogram::DISPFlags fromRust(LLVMRustDISPFlags SPFlags) {
++ DISubprogram::DISPFlags Result = DISubprogram::DISPFlags::SPFlagZero;
++
++ switch (virtuality(SPFlags)) {
++ case LLVMRustDISPFlags::SPFlagVirtual:
++ Result |= DISubprogram::DISPFlags::SPFlagVirtual;
++ break;
++ case LLVMRustDISPFlags::SPFlagPureVirtual:
++ Result |= DISubprogram::DISPFlags::SPFlagPureVirtual;
++ break;
++ default:
++ // The rest are handled below
++ break;
++ }
++
++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit)) {
++ Result |= DISubprogram::DISPFlags::SPFlagLocalToUnit;
++ }
++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition)) {
++ Result |= DISubprogram::DISPFlags::SPFlagDefinition;
++ }
++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized)) {
++ Result |= DISubprogram::DISPFlags::SPFlagOptimized;
++ }
++
++ return Result;
++}
++#endif
++
+ extern "C" uint32_t LLVMRustDebugMetadataVersion() {
+ return DEBUG_METADATA_VERSION;
+ }
+@@ -575,16 +640,26 @@ LLVMRustDIBuilderCreateSubroutineType(LLVMRustDIBuilderRef Builder,
+ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
+ LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+ const char *LinkageName, LLVMMetadataRef File, unsigned LineNo,
+- LLVMMetadataRef Ty, bool IsLocalToUnit, bool IsDefinition,
+- unsigned ScopeLine, LLVMRustDIFlags Flags, bool IsOptimized,
+- LLVMValueRef Fn, LLVMMetadataRef TParam, LLVMMetadataRef Decl) {
++ LLVMMetadataRef Ty, unsigned ScopeLine, LLVMRustDIFlags Flags,
++ LLVMRustDISPFlags SPFlags, LLVMValueRef Fn, LLVMMetadataRef TParam,
++ LLVMMetadataRef Decl) {
+ DITemplateParameterArray TParams =
+ DITemplateParameterArray(unwrap<MDTuple>(TParam));
++#if LLVM_VERSION_GE(8, 0)
++ DISubprogram *Sub = Builder->createFunction(
++ unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File),
++ LineNo, unwrapDI<DISubroutineType>(Ty), ScopeLine, fromRust(Flags),
++ fromRust(SPFlags), TParams, unwrapDIPtr<DISubprogram>(Decl));
++#else
++ bool IsLocalToUnit = isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit);
++ bool IsDefinition = isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition);
++ bool IsOptimized = isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized);
+ DISubprogram *Sub = Builder->createFunction(
+ unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File),
+ LineNo, unwrapDI<DISubroutineType>(Ty), IsLocalToUnit, IsDefinition,
+ ScopeLine, fromRust(Flags), IsOptimized, TParams,
+ unwrapDIPtr<DISubprogram>(Decl));
++#endif
+ unwrap<Function>(Fn)->setSubprogram(Sub);
+ return wrap(Sub);
+ }
+@@ -773,14 +848,14 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType(
+ LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+ LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
+ uint32_t AlignInBits, LLVMMetadataRef Elements,
+- LLVMMetadataRef ClassTy, bool IsFixed) {
++ LLVMMetadataRef ClassTy, bool IsScoped) {
+ #if LLVM_VERSION_GE(7, 0)
+ return wrap(Builder->createEnumerationType(
+ unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
+ SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)),
+- unwrapDI<DIType>(ClassTy), "", IsFixed));
++ unwrapDI<DIType>(ClassTy), "", IsScoped));
+ #else
+- // Ignore IsFixed on older LLVM.
++ // Ignore IsScoped on older LLVM.
+ return wrap(Builder->createEnumerationType(
+ unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
+ SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)),
+@@ -920,7 +995,11 @@ extern "C" void LLVMRustUnpackOptimizationDiagnostic(
+ if (loc.isValid()) {
+ *Line = loc.getLine();
+ *Column = loc.getColumn();
++#if LLVM_VERSION_GE(8, 0)
++ FilenameOS << loc.getAbsolutePath();
++#else
+ FilenameOS << loc.getFilename();
++#endif
+ }
+
+ RawRustStringOstream MessageOS(MessageOut);
+diff --git a/src/test/codegen/enum-debug-clike.rs b/src/test/codegen/enum-debug-clike.rs
+index 98f07505f7..62cfef5a84 100644
+--- a/src/test/codegen/enum-debug-clike.rs
++++ b/src/test/codegen/enum-debug-clike.rs
+@@ -8,8 +8,11 @@
+
+ // compile-flags: -g -C no-prepopulate-passes
+
++// DIFlagFixedEnum was deprecated in 8.0, renamed to DIFlagEnumClass.
++// We match either for compatibility.
++
+ // CHECK-LABEL: @main
+-// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: DIFlagFixedEnum,{{.*}}
++// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: {{(DIFlagEnumClass|DIFlagFixedEnum)}},{{.*}}
+ // CHECK: {{.*}}DIEnumerator{{.*}}name: "A",{{.*}}value: {{[0-9].*}}
+ // CHECK: {{.*}}DIEnumerator{{.*}}name: "B",{{.*}}value: {{[0-9].*}}
+ // CHECK: {{.*}}DIEnumerator{{.*}}name: "C",{{.*}}value: {{[0-9].*}}
+--
+2.19.2
+
diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD
index 9a37b97c3..e855f770f 100644
--- a/user/rust/APKBUILD
+++ b/user/rust/APKBUILD
@@ -6,7 +6,7 @@ pkgname=rust
pkgver=1.33.0
_bootcargover=0.33.0
_bootver=1.32.0
-_llvmver=7
+_llvmver=8
pkgrel=0
pkgdesc="The Rust Programming Language"
url="https://www.rust-lang.org"
@@ -60,6 +60,7 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
0014-Add-foxkit-target-specs.patch
0030-libc-linkage.patch
0040-rls-atomics.patch
+ 0050-LLVM-8.0-compatibility.patch
"
builddir="$srcdir/rustc-$pkgver-src"
_rlibdir="/usr/lib/rustlib/$CTARGET/lib"
@@ -308,4 +309,5 @@ c32c5d807ec23f5e88f47f83220a117ff3f048cec4731e50d0cae082c971ea03993a6e4f95225046
d9568a3e21b60831b193c4a9554756d0be77d0c63d06d6c3ff1c7fd35822aaa3b2e2cf8acd29fe07eb698ebf48673245e052a6ddfa4d39bb687eea8c4c236e50 0013-Move-debugger-scripts-to-usr-share-rust.patch
f1269241ccddf4594752b97e6856dad98ca987d2491b1bd95f6123352eec52f3acb3f17dae1c2a42be55e25db4a7e0d6bb1fb2b468cc139ad14559e0753a4c87 0014-Add-foxkit-target-specs.patch
7197503a3bf1cdd6cb5ff3350add2682cc64f7d33f7a4b270c53321401e439de5c24ddb2f7c5a76bb3488c8b766237f674fedaa9202c480f53595d7837214f0f 0030-libc-linkage.patch
-41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e 0040-rls-atomics.patch"
+41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e 0040-rls-atomics.patch
+ba39acb52fb65eb203ad08735b5d1c9150e49f9d0abd5e87a849d40c22e5847043521154cbb529fb3cc39005b309cafda5422fbd5a3598dac519db4456f6c571 0050-LLVM-8.0-compatibility.patch"
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD
index d22aff8cb..e00412349 100644
--- a/user/spectacle/APKBUILD
+++ b/user/spectacle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=spectacle
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Application for capturing desktop screenshots"
url="https://www.kde.org/applications/graphics/spectacle/"
@@ -14,7 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev
libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz"
+source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz
+ qt5.9.patch
+ "
build() {
cd "$builddir"
@@ -42,4 +44,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d239106f0d115e98ec0173862e6dee1b6fdab5846e65c47a4bbaa161cb2695503a58bdb369feb707b96121a0d1bb9acddafc5cfa748e3113bbd47d7da49ed50f spectacle-18.12.3.tar.xz"
+sha512sums="c855fcd3cef0846fc11c8f64a2d975dbc8a93a118eb16e17cbfa5ee322ea22104a22652db3547fc53d02061371516fa0caf87557fee4975ac6c08de12db6e1cd spectacle-19.04.0.tar.xz
+781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch"
diff --git a/user/spectacle/qt5.9.patch b/user/spectacle/qt5.9.patch
new file mode 100644
index 000000000..aa830f86b
--- /dev/null
+++ b/user/spectacle/qt5.9.patch
@@ -0,0 +1,23 @@
+--- spectacle-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:23.000000000 +0000
++++ spectacle-19.04.0/CMakeLists.txt 2019-04-18 22:57:10.598054362 +0000
+@@ -11,7 +11,7 @@
+ # Spectacle project
+ project(Spectacle VERSION ${SPECTACLE_VERSION})
+
+-set(QT_MIN_VERSION "5.10.0")
++set(QT_MIN_VERSION "5.9.0")
+ set(KF5_MIN_VERSION "5.53.0")
+ set(PLASMA_MIN_VERSION "5.12.0")
+
+--- spectacle-19.04.0/src/SpectacleCore.cpp.old 2019-04-11 07:37:14.000000000 +0000
++++ spectacle-19.04.0/src/SpectacleCore.cpp 2019-04-18 22:57:46.694193923 +0000
+@@ -165,8 +165,7 @@
+ break;
+ case Actions::StartNewInstance:
+ QProcess newInstance;
+- newInstance.setProgram(QStringLiteral("spectacle"));
+- newInstance.startDetached();
++ newInstance.startDetached(QStringLiteral("spectacle"));
+ break;
+ }
+ }
diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD
index 32fcfbd7c..0bf08fdb1 100644
--- a/user/sshfs/APKBUILD
+++ b/user/sshfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=sshfs
-pkgver=3.5.0
+pkgver=3.5.2
pkgrel=0
pkgdesc="FUSE client based on the SSH File Transfer Protocol"
url="https://github.com/libfuse/sshfs"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
# NOTE: --prefix=/ is intentional. If --prefix=/usr, mount(8) will not be
# able to find mount.fuse.sshfs or mount.sshfs - it only looks in /sbin, not
# /usr/sbin. The omission of the absolute slash in --mandir=usr/share/man is
@@ -38,8 +37,7 @@ check() {
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c sshfs-3.5.0.tar.xz"
+sha512sums="52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272 sshfs-3.5.2.tar.xz"
diff --git a/user/step/APKBUILD b/user/step/APKBUILD
index 1173268c3..56728187e 100644
--- a/user/step/APKBUILD
+++ b/user/step/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=step
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Interactive physics simulation"
url="https://www.kde.org/applications/education/step/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5ac3ab33d48aa4d151ea7152a380aba95eabc7887400d20fe50392a6c18a5017b162208c47d8de6d019e8a462608a2f4da3bacaa64cbc966770971b6a55b1b82 step-18.12.3.tar.xz"
+sha512sums="a4793beaa2d334cc8a03993e575b71d15381af27b2dd284a73ef49f37d1fa1537314402cfd394d11b2256b37224244cc0c361b969bf95b109ee9344e66bd1bab step-19.04.0.tar.xz"
diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD
index 82ba9d682..bf6cb12c8 100644
--- a/user/talloc/APKBUILD
+++ b/user/talloc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=talloc
-pkgver=2.1.15
+pkgver=2.2.0
pkgrel=0
pkgdesc="Memory pool management library"
url="https://talloc.samba.org"
@@ -9,13 +9,11 @@ arch="all"
license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL"
replaces="samba-common"
depends=""
-makedepends="docbook-xsl libxslt python3-dev"
+makedepends="cmd:which docbook-xsl libxslt python3-dev"
subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc"
-source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
- waf-location.patch"
+source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
PYTHON=python3 ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -49,5 +45,4 @@ py3() {
"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
}
-sha512sums="41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40 talloc-2.1.15.tar.gz
-d19553fae679b5db10ab77a86f9fa0525ccba37a3ef30e530cd96245ee5fc94d4570079bbfe0271c32fbc84a3556c4bf86cc1cab6ffb61863cbce3f5a911efec waf-location.patch"
+sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 talloc-2.2.0.tar.gz"
diff --git a/user/talloc/waf-location.patch b/user/talloc/waf-location.patch
deleted file mode 100644
index a5ca47f44..000000000
--- a/user/talloc/waf-location.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- talloc-2.1.15/Makefile 2019-01-14 17:24:45.000000000 -0500
-+++ talloc-2.1.15/Makefile 2019-01-27 22:57:15.919981283 -0500
-@@ -1,6 +1,6 @@
- # simple makefile wrapper to run waf
-
--WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-+WAF_BINARY=$(PYTHON) buildtools/bin/waf
- WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
-
- all:
diff --git a/user/terminus-font/75-yes-terminus.conf b/user/terminus-font/75-yes-terminus.conf
new file mode 100644
index 000000000..84b0a95a0
--- /dev/null
+++ b/user/terminus-font/75-yes-terminus.conf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Accept terminus font -->
+ <selectfont>
+ <acceptfont>
+ <pattern>
+ <patelt name="family"><string>Terminus</string></patelt>
+ </pattern>
+ </acceptfont>
+ </selectfont>
+ <alias>
+ <family>xos4 Terminus</family>
+ <prefer><family>Terminus</family></prefer>
+ <default><family>fixed</family></default>
+ </alias>
+</fontconfig>
diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD
index 10ebdd481..c3fc0fd6f 100644
--- a/user/terminus-font/APKBUILD
+++ b/user/terminus-font/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=terminus-font
-pkgver=4.46
-pkgrel=1
+pkgver=4.47
+pkgrel=0
pkgdesc="Monospace bitmap font (for X11 and console)"
url="http://terminus-font.sourceforge.net/" # No HTTPS
arch="noarch"
@@ -10,10 +10,10 @@ options="!check" # Fonts have no test suite
license="OFL-1.1"
depends=""
makedepends="bdftopcf python3"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+ 75-yes-terminus.conf"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--psfdir=/usr/share/consolefonts \
@@ -22,14 +22,16 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -Dm644 75-yes-terminus.conf \
+ # Use custom fontconfig since the shipped one doesn't provide
+ # a correct alias
+ install -Dm644 "$srcdir"/75-yes-terminus.conf \
"$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
install -d "$pkgdir/etc/fonts/conf.d"
cd "$pkgdir/etc/fonts/conf.d"
ln -s /etc/fonts/conf.avail/75-yes-terminus.conf .
}
-sha512sums="ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58 terminus-font-4.46.tar.gz"
+sha512sums="09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47 terminus-font-4.47.tar.gz
+ac7bdf367bbff1e5735b5bd65fc1bc06b55bcb72aaafeb08c7d8e969aabad863474b1104faa42ead7d838433c80cfc50f05578dad03c8081cd82cfda0af86a83 75-yes-terminus.conf"
diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD
index 54f478361..d1bdefb23 100644
--- a/user/tlp/APKBUILD
+++ b/user/tlp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=tlp
_pkgname=TLP
-pkgver=1.1
+pkgver=1.2.1
pkgrel=0
pkgdesc="Linux Advanced Power Management"
url="https://linrunner.de/en/tlp/tlp.html"
@@ -18,14 +18,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/linrunner/$_pkgname/archive/
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
-
- make DESTDIR="$pkgdir" install-tlp install-man
+ make DESTDIR="$pkgdir" TLP_WITH_SYSTEMD=0 install-tlp install-man
install -Dm755 "$srcdir"/tlp.initd "$pkgdir"/etc/init.d/"$pkgname"
# We don't ship systemd
find "$pkgdir"/usr/share/man/man8 -name '*.service*' -delete
@@ -36,7 +33,7 @@ rdw() {
depends="tlp"
cd "$builddir"
- make DESTDIR="$subpkgdir" install-rdw
+ make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw
}
bashcomp() {
@@ -44,9 +41,12 @@ bashcomp() {
depends=""
install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
+ mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+ mv "$pkgdir"/usr/share/bash-completion/completions/* \
+ "$subpkgdir"/usr/share/bash-completion/completions
+ mv "$pkgbasedir/$pkgname-rdw"/usr/share/bash-completion/completions/* \
+ "$subpkgdir"/usr/share/bash-completion/completions
}
-sha512sums="3400f2b6c249fd2e1bbbc61f23e3450ff90fabb8dd74f2903ce1f0d07e7ce3d1e61b07295736138d4697235dbee9157d3f32a8d296a649c93f73e03e3555af1e tlp-1.1.tar.gz
+sha512sums="c5cf2c9cb4d5e1e0ad693ab73f7971486671dab9b785a4e121b3550f5b096a8b028bd9d116851db6402ab7ccd9b3fe944d138fd35dc17d826482c59257f12c9f tlp-1.2.1.tar.gz
e6de216b2540413812711b3304cdc29c8729d527080cfd747ba382db50166dd21c6c27ff467f9f2a967e92007c7a311b00e88262952c34a22f417578c66cf4e7 tlp.initd"
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index 33b82b783..5c1608ba5 100644
--- a/user/umbrello/APKBUILD
+++ b/user/umbrello/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=umbrello
-pkgver=18.12.3
+pkgver=19.04.0
pkgrel=0
pkgdesc="Software modelling tool and code generator"
url="https://umbrello.kde.org/"
@@ -44,5 +44,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b7ba29b05e5997d9e7ef07c261198bc47910e75668bd619e1f14bb850d5e09fd07948e7d56e2604287384e1c331a882f40b4540c116e9a7b2cfa2078f57b4a90 umbrello-18.12.3.tar.xz
+sha512sums="6a7ca159ec7860823720f46c8b3fdf1170358ca41de79219612bb7d1c5431a4b81508fbd7a38d7ea0913b2b04ea0656024f8a85d217a94c684c135f4254e52fa umbrello-19.04.0.tar.xz
fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch"
diff --git a/user/xhost/APKBUILD b/user/xhost/APKBUILD
index f263a2a79..39be52023 100644
--- a/user/xhost/APKBUILD
+++ b/user/xhost/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=xhost
-pkgver=1.0.7
-pkgrel=1
+pkgver=1.0.8
+pkgrel=0
pkgdesc="Controls host and/or user access to a running X server"
url="https://www.X.Org/"
arch="all"
@@ -14,7 +14,6 @@ makedepends="libx11-dev libxmu-dev libxau-dev util-macros"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,8 +23,7 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7 xhost-1.0.7.tar.bz2"
+sha512sums="55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2"
diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD
index fb55ea436..171427b55 100644
--- a/user/xmlsec/APKBUILD
+++ b/user/xmlsec/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=xmlsec
-pkgver=1.2.27
+pkgver=1.2.28
+_pkgver=1_2_28
pkgrel=0
pkgdesc="C-based XML signature and encryption syntax and processing library"
url="https://github.com/lsh123/$pkgname/"
@@ -12,17 +13,15 @@ checkdepends="nss-tools"
makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev
autoconf automake libtool"
subpackages="$pkgname-nss $pkgname-dev $pkgname-doc"
-source="$url/archive/$pkgname-${pkgver//./_}.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-${pkgver//./_}"
+source="$url/archive/$pkgname-$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgname-$_pkgver"
prepare() {
- cd "$builddir"
default_prepare
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +36,10 @@ build() {
}
check() {
- cd "$builddir"
make -k check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
@@ -56,4 +53,4 @@ nss() {
mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
}
-sha512sums="261528086adc379942861b5950e5b34ffa52a49d0fedcb46bece50c920fd56af4f0472494419bfa5e3cb40abda335b3e9c11466c42273f125b50d204b4604798 xmlsec-1_2_27.tar.gz"
+sha512sums="fb0c775f6455ce5a5579a69bb91d60fe90c023e538c32bdf2a70aa413a53b22ef938349a3ce6b42bb23f8f70b4e00f1b9917f877487bb1507c927ec70c3d95f5 xmlsec-1_2_28.tar.gz"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index af5d02712..d7a2f6888 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=youtube-dl
-pkgver=2018.11.23
+pkgver=2019.04.17
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube and many other sites"
url="https://youtube-dl.org"
@@ -27,12 +27,10 @@ prepare() {
}
check() {
- cd "$builddir"
python3 -m unittest discover
}
package() {
- cd "$builddir"
python3 setup.py install --root="$pkgdir/" --optimize=1
}
@@ -65,4 +63,4 @@ fishcomp() {
"$subpkgdir/usr/share/fish/completions/"
}
-sha512sums="d4d2813657972c37d3493743a44055d7a776aeb5c5a97902e07caa317a3b2db30332507c37b56b3d8554e0bdc2a0ec6a9862977b449b363343a4de2df12bf059 youtube-dl-2018.11.23.tar.gz"
+sha512sums="6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148 youtube-dl-2019.04.17.tar.gz"
diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD
new file mode 100644
index 000000000..2864319ac
--- /dev/null
+++ b/user/z3/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=z3
+pkgver=4.8.4
+pkgrel=0
+pkgdesc="Mathematical theorem prover"
+url=" "
+arch="all"
+license="MIT"
+depends=""
+makedepends="gmp-dev python3-dev cmd:which"
+subpackages="$pkgname-dev py3-$pkgname:py3:noarch"
+source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz"
+builddir="$srcdir/z3-z3-$pkgver"
+
+build() {
+ PYTHON=python3 ./configure \
+ --prefix=/usr \
+ --gmp \
+ --python
+ make -C build
+}
+
+check() {
+ make -C build test-z3
+ build/test-z3 /a
+}
+
+package() {
+ make -C build DESTDIR="$pkgdir" install
+}
+
+py3() {
+ pkgdesc="$pkgdesc (Python bindings)"
+ depends="python3"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+}
+
+sha512sums="4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4 z3-4.8.4.tar.gz"