diff options
Diffstat (limited to 'user')
231 files changed, 2696 insertions, 1330 deletions
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 72e0ac6ab..9afa44db6 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=17.08.1.55 -realpkgver=${pkgver/.55/-55} +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" arch="all" +options="!check" # Tests require X11 license="LGPL-2.1 GPL-2.0 BSD-2" depends="" depends_dev="qt5-qtbase-dev kio-dev kcontacts-dev kmime-dev akonadi-mime-dev @@ -14,9 +14,8 @@ depends_dev="qt5-qtbase-dev kio-dev kcontacts-dev kmime-dev akonadi-mime-dev makedepends="$depends_dev cmake extra-cmake-modules" install="" subpackages="$pkgname-dev" -source="https://distfiles.adelielinux.org/source/akonadi-contacts-$realpkgver.tar.xz - build-without-trunk.patch" -builddir="$srcdir/akonadi-contacts-$realpkgver" +source="http://download.kde.org/stable/applications/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" +builddir="$srcdir/akonadi-contacts-$pkgver" build() { cd "$builddir" @@ -44,5 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37bb7fa73efbbdcc59e5832b4e956eb9051d13de3232eb9bb812e4a8c37d326f99874b2f9e9653c36234d6c2c606fadeca1ab2b030eee1160dd1934b44e7d3b0 akonadi-contacts-17.08.1-55.tar.xz -f47a7c2f2c844d691dc688e953bdbf241f89bcda590fb066102a633babdd850eee53fedb04de8f172410266c29e224ca42ef01f1810ad6a128215e44193bb054 build-without-trunk.patch" +sha512sums="36b8c18d31661857d47bbe1dca3d912f1a3b4969ad03002014d18cd7978857dde100d95b5736799c0e18d2b6564820bcb865258d1848f2965dd3c675bd978729 akonadi-contacts-17.12.2.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 5d785d64f..b381bd39b 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -10,7 +10,8 @@ license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kmime-dev kdbusaddons-dev kio-dev kitemmodels-dev akonadi-dev kconfig-dev kxmlgui-dev" -makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev" +makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev + shared-mime-info" install="" subpackages="$pkgname-dev $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/akonadi-mime-$pkgver.tar.xz" @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="309cbe124f8649cc33f1759eaa6ef76c32b9eeabf7b21b9d8dbe30caab67a4d748a24b8b31f5f3efa12e94bc444cd7aa2a5aabf318eee0c901878da5348c6cda akonadi-mime-17.08.2.tar.xz" +sha512sums="a0bc9110bbc4d51910b17efdc3347c84f409d21bd43bdb2b44552dcaca6bbc16424ea89e95296351a7bec655fe3c0601a960fb8367238eebaf4c7ed7f1ae757f akonadi-mime-17.12.2.tar.xz" diff --git a/user/akonadi-notes/APKBUILD b/user/akonadi-notes/APKBUILD index f122b6688..46ba2f531 100644 --- a/user/akonadi-notes/APKBUILD +++ b/user/akonadi-notes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-notes -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for integrating notes into Akonadi" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8c6aa4d1ea7ca2cc4601197f570aad4377949d70a86ac1a37925a947254e73e9f2d799b6adc52d58f4551dd77abba44a4bd82c6f21bf880d4f59f975ad68b1e akonadi-notes-17.08.2.tar.xz" +sha512sums="8c10178dd8d0de8b9d405a45aff8f70f58a4c66e79355f831c08202665b24e2584f716e32694ade4acfb07cd8707d37c82c3c1feba9fb219a67aec7f01abe4f7 akonadi-notes-17.12.2.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 1971e333b..f29a5993c 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -14,7 +14,7 @@ depends_dev="qt5-qtbase-dev qt5-qttools-dev ki18n-dev kcompletion-dev kio-dev kiconthemes-dev kitemmodels-dev kitemviews-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev kcrash-dev kdesignerplugin-dev" makedepends="$depends_dev cmake extra-cmake-modules sqlite-dev libxml2-dev - libxslt-dev" + libxslt-dev shared-mime-info" install="" subpackages="$pkgname-dev $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/akonadi-$pkgver.tar.xz @@ -51,5 +51,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="892e3616fc0b83ec50b6dada6aa0345eb8c09324e941933f059a20d1f5ba9bc30f90a90798933cb7df3e711bd98a28b21b8f882a136ff7d60cccd4bc552e3846 akonadi-17.08.2.tar.xz +sha512sums="c0004d09cae94b4f8a348c0439830a3ec6e906b04a95e8db7f3d15c6aa159910e764c06e3d92ade20e02c16598378cf2eb3f6e99018f2f47d7505bd0fb968905 akonadi-17.12.2.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 5ab4dfbb4..fa470d168 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="060d4b17d191bb87c99c44452544dea936c5dcc40a8f71f29aaea37a0fd9d526d14510a5a4fb42d8794d9d8b640bf6773369b8647ce017082efa9ba580f4f0bf ark-17.08.2.tar.xz" +sha512sums="8b87bb8e96ed1483503ebd26ce505962cafe96b9294dac9dd548a0659c0ff8795cf1e699c86ec2168f761819906d8958cedbe3858e05d50f7cb41a9d780a78af ark-17.12.2.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index e0453877e..4243f54a6 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9e9fc456bd1e7853140c71fead1ac6205e4f572d1d69d485d95188355e3b2fc775fa85c6d115564bd444f9925526a77da1decf990226ef46302fa5f605d73b09 attica-5.41.0.tar.xz" +sha512sums="1584c7f121c4e5092e1f694d0ebed1ac2b31a3a7ce5ee9330ee00852a470266011d3e076da3174b3f37207aad93dd2070fcee9384e466afe202d8e5175fb81e1 attica-5.43.0.tar.xz" diff --git a/user/audacious-plugins-qt/APKBUILD b/user/audacious-plugins-qt/APKBUILD new file mode 100644 index 000000000..c6e9589a4 --- /dev/null +++ b/user/audacious-plugins-qt/APKBUILD @@ -0,0 +1,77 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=audacious-plugins +pkgver=3.9 +pkgrel=1 +pkgdesc="A playlist-oriented media player with multiple interfaces (plugins)" +url="http://audacious-media-player.org/" +arch="all" +options="!check" # No test suite +license="ISC" +depends="audacious" +install_if="audacious=$pkgver" +makedepends="libmowgli-dev + libguess-dev + dbus-glib-dev + audacious-dev>=${pkgver%.*} + libxml2-dev + + mpg123-dev + + libcdio-dev + libcdio-paranoia-dev + libcddb-dev + + libxcomposite-dev + libsamplerate-dev + libcue-dev + libmms-dev + libsndfile-dev + + libnotify-dev + + libogg-dev + libvorbis-dev + + ffmpeg-dev + + alsa-lib-dev + neon-dev + curl-dev + wavpack-dev + lame-dev + flac-dev + sdl-dev + + automake + autoconf" +subpackages="$pkgname-lang" +source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" + +prepare() { + default_prepare + msg "Rebuilding configure..." + aclocal -I m4 && autoheader && autoconf +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-gtk \ + --enable-qt + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa audacious-plugins-3.9.tar.bz2" diff --git a/user/audacious-qt/APKBUILD b/user/audacious-qt/APKBUILD new file mode 100644 index 000000000..3a5c07723 --- /dev/null +++ b/user/audacious-qt/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=audacious +pkgver=3.9 +pkgrel=1 +pkgdesc="A playlist-oriented media player with multiple interfaces" +url="http://audacious-media-player.org/" +arch="all" +options="!check" # No test suite. +license="ISC" +depends_dev="qt5-qtbase-dev dbus-glib-dev" +makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-dbg" +source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + default_prepare + msg "Rebuilding configure..." + aclocal -I m4 && autoheader && autoconf +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-qt \ + --disable-gtk + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa audacious-3.9.tar.bz2" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 4eab19c68..a2e961dc9 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -58,5 +58,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15f03a62d1525dc7062b4361e883ee4170a1ea36d8bc10846fae0bf73549504bdcb7cff2349b3f0fcbc1da77102b0383d1140c00191823884d719c18771a858a baloo-5.41.0.tar.xz +sha512sums="918d615adc07ee71414eabe15cd18f3cfee264c206cbef32f6807cff2eac701a58ae7eebb087e618e9bc7741ad8409514af8361e216ff68b07b65dd0da0a802a baloo-5.43.0.tar.xz 5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e initialise-variable.patch" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 11d8775b0..f86f18197 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="901b58a067deb3e53ddc43c7330437e4f53d8d68e6091174406cbcbbbcc617653eb10271b3e912f7338e6f9e6737f3ab7151818f1d8250d16059dde4fca30725 bomber-17.08.2.tar.xz" +sha512sums="27563ac622e4b3e2eb796ddc9aa7a90b6971775f2873464466e9c82e5c813afcfb2ea4f37bb7d1eb22c42d3f2300e4d75f6fa96ce262ad072710ddc48a27edc1 bomber-17.12.2.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index cef3f1c74..a14d75396 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="deb03072844467ea622076de2f76245dd8e6eafa8e62941c97608bb4eb5d6b0746a9c034107525fdbfe4d24ac66f12f033a137b7bfb2da043e26128676353a29 bovo-17.08.2.tar.xz" +sha512sums="42b37cf929755e730b30125977ef19858a9f006582eed62d20646b1fe5428c9731aaf840966d67c6e251c1cf279ee852e5bb4d31e58c2e93e92225a55f407ed0 bovo-17.12.2.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 5c6c11653..267795261 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -48,4 +48,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="880d05d0dc69d3ea521a1b7e572a1af249733f05d541e58684e2ef004644444b9d498862a679b3e5279af93e3180df0c0a74922b42dbea54b7a004c1e7dfe4fa breeze-icons-5.41.0.tar.xz" +sha512sums="ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78 breeze-icons-5.43.0.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 4c89cd53e..e0b946fe7 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c2081994de9a3580de4cef13689d9fe8118c826c1f753600066939aaf8978dac100815d9110ee45e09dcf3778128849d96ad10fb6f731c18b79b03bbae33c1e breeze-5.8.7.tar.xz" +sha512sums="2bdc27ca2a1df0234f22ebb1c56723b2ad1345417889b5fc2e66bebef4e2ad1592b78f4391b38a1b2a994f414390789bcbbe213c80f29e1440827bf2bc3d2ead breeze-5.12.2.tar.xz" diff --git a/user/cflow/APKBUILD b/user/cflow/APKBUILD index 9191dc66e..acb41fcc7 100644 --- a/user/cflow/APKBUILD +++ b/user/cflow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cflow pkgver=1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Chart control flow in a C program" url="https://www.gnu.org/software/cflow/" arch="all" @@ -24,6 +24,11 @@ build() { make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" make DESTDIR="$pkgdir" install diff --git a/user/corindon-red/APKBUILD b/user/corindon-red/APKBUILD index ec54bd03a..a43e51e89 100644 --- a/user/corindon-red/APKBUILD +++ b/user/corindon-red/APKBUILD @@ -12,7 +12,7 @@ depends="" makedepends="" install="" subpackages="" -source="https://dl.opendesktop.org/api/files/download/id/1460740699/122445-corindon-red.tar.gz" +source="https://dl.opendesktop.org/api/files/downloadfile/id/1460740699/s/90b6b780028e72203f2a0fba41edf43a/t/1520219138/u//122445-corindon-red.tar.gz" builddir="$srcdir/" build() { diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD new file mode 100644 index 000000000..caa015a9d --- /dev/null +++ b/user/digikam/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=digikam +pkgver=5.8.0 +pkgrel=0 +pkgdesc="Professional photo management and digital camera import" +url="https://www.digikam.org/" +arch="all" +options="!check" # Test suite doesn't support our version of Boost +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev + qt5-qtsvg-dev kconfig-dev kwindowsystem-dev kxmlgui-dev ki18n-dev + karchive-dev kio-dev qt5-qtwebkit-dev kcoreaddons-dev kservice-dev + solid-dev kiconthemes-dev kfilemetadata-dev threadweaver-dev libpng-dev + knotifyconfig-dev knotifications-dev akonadi-contacts-dev kcalcore-dev + libjpeg-turbo-dev tiff-dev zlib-dev boost-dev lcms2-dev expat-dev + exiv2-dev flex bison libxml2-dev libxslt-dev eigen-dev libgphoto2-dev + libksane-dev libkipi-dev glu-dev qt5-qtx11extras-dev jasper-dev + opencv opencv-dev" +# YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/digikam/digikam-$pkgver.tar.xz" +builddir="$srcdir/digikam-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DENABLE_APPSTYLES=ON \ + -DENABLE_MYSQLSUPPORT=OFF \ + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + -DENABLE_OPENCV3=ON \ + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f4b33fce0d5ef1e7032d3bb023b3037327c105fb3dd25f9a84f432e28b3a92c9904bbc33bba2066d766ea02721d5634dc643d7cc0c990ccf2285a0c697278b6c digikam-5.8.0.tar.xz" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index b2149d87f..a52aa23bd 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de77ab439243b13952cb8d11343b0bd575b77c0daae7fc3936e91b0de9aed069593fbf97024ec84c7342d2993cfb4b2c64bf18da82cdf362b38e8623954559a2 dolphin-17.08.2.tar.xz" +sha512sums="3c576d6eeb373790b8b4c6a13b01df606bbfde7b0c08da5965d31e77a1f88a3ccc79387b0546bfc039a1abc65b4bc466b39f7e128e67ecfe0f613c3d51e85d21 dolphin-17.12.2.tar.xz" diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD index c423d4cbe..5eeab3cf1 100644 --- a/user/dracut/APKBUILD +++ b/user/dracut/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dracut pkgver=046 -pkgrel=1 +pkgrel=2 pkgdesc="An event-driven initramfs infrastructure" url="https://dracut.wiki.kernel.org/" arch="all" license="GPL-2.0+" -depends="libarchive-tools" +depends="libarchive-tools musl-utils xz" makedepends="fts-dev kmod-dev" install="" options="!check" # Test suite is for kernel developers only, requires ext3 rootfs -subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch $pkgname-lvm::noarch" source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.xz header-fix.patch " @@ -42,7 +42,7 @@ package() { } bashcomp() { - depends="" + depends="dracut" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" @@ -51,5 +51,11 @@ bashcomp() { "$subpkgdir"/usr/share } +lvm() { + depends="device-mapper dracut lvm2" + pkgdesc="$pkgname - LVM2 module" + mkdir -p "$subpkgdir" +} + sha512sums="75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 dracut-046.tar.xz 988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c header-fix.patch" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 13c89c561..e20322d0d 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="034c67ed56ee4f6002ff2f0bfca2d7eb7877180b5aa5cf5eb3babb6e40c0669eb0728f45832bd8250ff304647f9a6555233bff4fdf6eccc9b14b420f4b1c3924 extra-cmake-modules-5.41.0.tar.xz +sha512sums="fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5 extra-cmake-modules-5.43.0.tar.xz 0af703a9d4696080bc52032d1d341e86fd142bef91f3c1afa9cf180e1cf2ff3bba2ea47fd36b8f52135f056a202c58a08e7c7525f671d6993839865ce6aef0f6 posix.patch" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index 11d0e0fb3..617ec6380 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=featherpad -pkgver=0.6 +pkgver=0.7 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -32,4 +32,4 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="5cf5f46a3e8a09fa81c247b5731f7fa35b7232ac8db789acd974161f4ad5a2ffc992f62a66f9ee0ff6adb66f99f650a173f12c91938132e11efa6ec0feee26e7 FeatherPad-0.6.tar.gz" +sha512sums="67a5fde1dd6e1c2e438342923c90cea7d6173b31b7b3c97106b4fbd5bc1e855ead8e021337fcb0a6d1dafac9980e644132e88fa0e4ca57176c6a64fd77951784 FeatherPad-0.7.tar.gz" diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index b68566ae2..1ea78d33e 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=feh -pkgver=2.23 +pkgver=2.25.1 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://feh.finalrewind.org/" @@ -12,9 +12,7 @@ depends= makedepends="libxt-dev libpng-dev giblib-dev imlib2-dev libjpeg-turbo-dev libxinerama-dev curl-dev libexif-dev" checkdepends="perl-utils perl-test-command" -source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2 - stdout-buff.patch - cflags.patch" +source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -37,6 +35,4 @@ package() { install } -sha512sums="4b75f0053c3a4b1fb51251536896fd48470117ca3d59de1ac5a87f8071f37f886542e7d82730eec4579a1ebf507e4bc8a00fc45cf1364d2445b1aa82c5664ee7 feh-2.23.tar.bz2 -38ead15a58c402181da3e39c09002d9f951b03cfdf5edde19072da313638025dca5fa7dbe466b8f05094d49d44750c467d7fa3832fbaa11ac135c5839e0ecdc1 stdout-buff.patch -577e0420aef6bbf1cc43fe97813fd56a877c45b9cb01f1f86ee41863a8bf12f97b5f62c01b37a6b8fc78f7dd8ab9a372d1b09ba00e3811d0043772f5e16e0707 cflags.patch" +sha512sums="a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e feh-2.25.1.tar.bz2" diff --git a/user/feh/cflags.patch b/user/feh/cflags.patch deleted file mode 100644 index 88f0c05c9..000000000 --- a/user/feh/cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- feh-2.23/config.mk 2017-12-28 18:28:35.000000000 +0000 -+++ feh-2.23/config.mk 2018-01-08 01:19:54.440000000 +0000 -@@ -38,7 +38,7 @@ - CFLAGS += -Wall -Wextra -pedantic - - # Settings for glibc >= 2.19 - may need to be adjusted for other systems --CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -+CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 - - ifeq (${curl},1) - CFLAGS += -DHAVE_LIBCURL diff --git a/user/feh/stdout-buff.patch b/user/feh/stdout-buff.patch deleted file mode 100644 index eaa251a3a..000000000 --- a/user/feh/stdout-buff.patch +++ /dev/null @@ -1,113 +0,0 @@ -On glibc, if output is redirected to a file, output will look like this: - -touch test/ok/gif -touch test/ok/jpg -touch test/ok/png -touch test/ok/pnm -test/ok/gif -test/ok/jpg -test/ok/png -test/ok/pnm - -On musl, if stdout is redirected to a file, output looks like this: - -test/ok/gif -touch test/ok/gif -touch test/ok/jpg -touch test/ok/png -touch test/ok/pnm -test/ok/jpg -test/ok/png -test/ok/pnm - -On glibc and musl, if stdout is interactive, it looks like this: - -test/ok/gif -touch test/ok/gif -test/ok/jpg -touch test/ok/jpg -test/ok/png -touch test/ok/png -test/ok/pnm -touch test/ok/pnm - -Adding two fflush calls makes all behavior look like the last example. - ---- feh-2.22/src/list.c 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/src/list.c 2018-01-03 02:59:08.840000000 +0000 -@@ -92,6 +92,7 @@ - if (opt.verbose) - feh_display_status('.'); - puts(file->filename); -+ fflush(stdout); - feh_action_run(file, opt.actions[0], NULL); - } - else { -@@ -106,6 +107,7 @@ - if (opt.verbose) - feh_display_status('.'); - puts(file->filename); -+ fflush(stdout); - feh_action_run(file, opt.actions[0], NULL); - } - else { ---- feh-2.22/test/nx_action/loadable_action 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/loadable_action 2018-01-03 02:46:48.030000000 +0000 -@@ -1,8 +1,8 @@ --touch test/ok/gif --touch test/ok/jpg --touch test/ok/png --touch test/ok/pnm - test/ok/gif -+touch test/ok/gif - test/ok/jpg -+touch test/ok/jpg - test/ok/png -+touch test/ok/png - test/ok/pnm -+touch test/ok/pnm ---- feh-2.22/test/nx_action/loadable_naction 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/loadable_naction 2018-01-03 02:51:05.340000000 +0000 -@@ -1,8 +1,8 @@ --touch test/ok/gif --touch test/ok/jpg --touch test/ok/png --touch test/ok/pnm - test/ok/gif -+touch test/ok/gif - test/ok/jpg -+touch test/ok/jpg - test/ok/png -+touch test/ok/png - test/ok/pnm -+touch test/ok/pnm ---- feh-2.22/test/nx_action/unloadable_action 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/unloadable_action 2018-01-03 02:51:36.480000000 +0000 -@@ -1,8 +1,8 @@ --rm test/fail/gif --rm test/fail/jpg --rm test/fail/png --rm test/fail/pnm - test/fail/gif -+rm test/fail/gif - test/fail/jpg -+rm test/fail/jpg - test/fail/png -+rm test/fail/png - test/fail/pnm -+rm test/fail/pnm ---- feh-2.22/test/nx_action/unloadable_naction 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/unloadable_naction 2018-01-03 02:51:51.850000000 +0000 -@@ -1,8 +1,8 @@ --rm test/fail/gif --rm test/fail/jpg --rm test/fail/png --rm test/fail/pnm - test/fail/gif -+rm test/fail/gif - test/fail/jpg -+rm test/fail/jpg - test/fail/png -+rm test/fail/png - test/fail/pnm -+rm test/fail/pnm diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index ff9645e9f..78829ff99 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" arch="all" +options="!check" # All tests require X11. license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kconfig-dev kconfigwidgets-dev kiconthemes-dev @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aa0c5b98bbfb287a850145c760d116c6d7d61d0a3ec966ebec27ebe27a82ab65e71e5d3f12702c0bd927ba07d9ad07874cddebc947ed073afe514d73e83ef402 frameworkintegration-5.41.0.tar.xz" +sha512sums="f313fc3c0e16f877312f0c8e64e28c9368ef93fdafde1d6d3fa4f972290643139cdeb6a7376b57596042e4aaae0a87c9c9dad68ae895cb227d709a58ecbe7960 frameworkintegration-5.43.0.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index f044d8c2b..45742a180 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dd8c544cfb270162f02458f4882f8bfccaf11974b0788e40a8235ea503dc8ae960dfb55bce97f01bca7a86d8d9845464aa8bd31aae88d9c78b829210e65f23fa granatier-17.08.2.tar.xz" +sha512sums="0a7747d65918c90d47d83bb3056c3e05a4ecb560c64b37dc4eb52b7e7329ce76ec45e99bbfa102e21f3877d147d8121e97c858bcb4804832187c5e41723a8217 granatier-17.12.2.tar.xz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD new file mode 100644 index 000000000..470387207 --- /dev/null +++ b/user/gwenview/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gwenview +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Fast and easy image viewer by KDE" +url="https://www.kde.org/applications/graphics/gwenview/" +arch="all" +options="!check" # All tests require X11. +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev + kio-dev kactivities-dev kitemmodels-dev ki18n-dev kdoctools-dev + kparts-dev kwindowsystem-dev kiconthemes-dev knotifications-dev + libkipi-dev libjpeg-turbo-dev libpng-dev lcms2-dev zlib-dev exiv2-dev + baloo-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/gwenview-$pkgver.tar.xz" +builddir="$srcdir/gwenview-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d6fca3dc4435f2bcd77ad8428edbee022af88a6a2d959f5b142ab91e0ed2514b51ba34dc214f808bdf44dc0e3c2eb4992f1918499f36b194eca6b78dc5b4b1ea gwenview-17.12.2.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 1989f13e4..57ff98d06 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a6a605d87215677f94a048cfb17081ad32e4d8fa6f791fe29a15eadd4095652fdc9bb69c7315235c8b1abc2cf93c37541c17944045af5be52473bb62c00de89 kactivities-stats-5.41.0.tar.xz" +sha512sums="777b94ff72504904d36e5e9a9a3c85bb3088379aa860c8e6ada4db20c44aa57c9c123ce2638b7126a3c57958f170272494ef99f3d8fedf0e4cb4b23e2a113546 kactivities-stats-5.43.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 254a1e1af..8ad5d5f22 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=1 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="942fe93f27ca1549be881dce8374f32b04cadaf4690a9bb966189a4daeec0768366f465f5fffbd26d48f4102ebd7d7dcc0482ed177d372473b232f07e22960d7 kactivities-5.41.0.tar.xz" +sha512sums="121a3704558bdc8fc4e71519face18593800a549b2cffff1919ccb0255a29d24075523e96ca3bdf7c999b0dca1dd8b30609b3db7e7538c94f550bb7d69f17c19 kactivities-5.43.0.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index 636e217d0..2f13e2b92 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -47,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cba671eaca863e80bb2e92fd0f1fc84121a9670ba8c48a14e13ac874bd830deedb215228c29b4f7e249843591ba12ab1acd81612d462bf26edeebab28eb082d8 kactivitymanagerd-5.8.7.tar.xz" +sha512sums="c8ea26b4948898cd1734bde5a5fe50991c7d61f997fe4539b819e2ef90e3a1c0fb57dec3331106f42616f9ce0485b81bf61a462832a46a35dcbe87050ecc3c08 kactivitymanagerd-5.12.2.tar.xz" diff --git a/user/kalarmcal/APKBUILD b/user/kalarmcal/APKBUILD index 9908653f7..e123a0929 100644 --- a/user/kalarmcal/APKBUILD +++ b/user/kalarmcal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalarmcal -pkgver=17.08.1 +pkgver=17.12.2 pkgrel=0 pkgdesc="Calendar library to integrate with your alarm clock" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dabe0f3c2297c11a24a4e7cb33262e7a1102e0fdb794e1ad1d02b4432889bb5de5c1bb70a17c2992ab9d35e5df4f3c4643a1ede0aaaf1ea420fd3d7eac4a950c kalarmcal-17.08.1.tar.xz" +sha512sums="c3946dde1609e8925c4bcfbfb3403e2e536eb84724dd5007d8d0ef14210c14e7aaadd6349117d55a57d522904b90413052200790d060553058684f0c2f01c5b4 kalarmcal-17.12.2.tar.xz" diff --git a/user/kalarmcal/build-with-kf5-kholidays.patch b/user/kalarmcal/build-with-kf5-kholidays.patch new file mode 100644 index 000000000..0d5bd88f8 --- /dev/null +++ b/user/kalarmcal/build-with-kf5-kholidays.patch @@ -0,0 +1,11 @@ +--- kalarmcal-17.12.2/CMakeLists.txt.old 2018-02-06 00:37:47.000000000 +0000 ++++ kalarmcal-17.12.2/CMakeLists.txt 2018-03-04 22:17:25.340681117 +0000 +@@ -26,7 +26,7 @@ + set(KALARM_LIB_VERSION ${PIM_VERSION}) + + set(CALENDARCORE_LIB_VERSION "5.7.2") +-set(HOLIDAY_LIB_VERSION "5.7.2") ++set(HOLIDAY_LIB_VERSION "5.6.2") + set(IDENTITYMANAGER_LIB_VERSION "5.7.2") + set(AKONADI_LIB_VERSION "5.7.2") + ecm_setup_version(PROJECT VARIABLE_PREFIX KALARMCAL diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 1aa38ba28..49724c3d6 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1930ecb18da0a18fac75e43405993ee6dcd7f5228efa31f2f8f077bc2e10cb3e95acdb178f406cade75eff91a001a44760324eea92882dcf2428e13aca26f439 kapman-17.08.2.tar.xz" +sha512sums="718f4ed82d71be259cc07f0b0001004e28880db6b0cc1a3931f641653a318d289b6b70687ff8a9815baa20181553d8713eb2f800dc462f116fa8ec831dcb964b kapman-17.12.2.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 120186b87..514b03e32 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd28292b0076ef516ee695c057b026c3601386f1f4733f4ddc6ad21e416c27e891ffb2339f31100105834a84dc9adf4cef518d110e84f9f2d56ac92abe440f05 karchive-5.41.0.tar.xz" +sha512sums="228516471fc9e961f68b77d06b55d640606f5adaaa1dcba67d12086d57a3184c87a5d9636085b00bc56007cee1af9863e213bc82317b3c917737de4a3d84c74e karchive-5.43.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index a4abe8a80..4e29ab3ac 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=1 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" arch="all" +options="!check" # All tests require X11. license="LGPL-2.1 LGPL-3.0 GPL-3.0" depends="" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev python3 @@ -93,4 +94,4 @@ kwrite_lang() { done } -sha512sums="9fa3fa7cb2c7b8b542dc2c03073fec83daea4c33c1868b8353519c97db3e63b094ea8f5cff945d7531bf571cdff9108428431afe87468813c370a19355c20dad kate-17.08.2.tar.xz" +sha512sums="cb71a569e4bd04c9ca1aeed81a7261b3838bf78d6bd731e31163f1eb254d81e78b13889d2118483de0d9cae6a92ebbc4e4dec9f3c62e29444ac1c3fd8dc7efe1 kate-17.12.2.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 35ebc08ed..78e0bdac1 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73ceca0600160e5db277473ee0659dff6f0dca7ae46b9c05a1c802d304c04152e5a1038def9ea9f912a1c64962e700612f641c408b3028c25c76c58504eae041 katomic-17.08.2.tar.xz" +sha512sums="4d6129fabab44cb9b5eea083e7ba3c406581c3b382fda417aad3988de8321b5a17f5ea8af6fc2437a5eb04f87311b964551e54547edbfb854fd2e19e0658dafd katomic-17.12.2.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index e517740b3..9c2f7bdbd 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cbdd40ccd9c0cf067cb08b0db252f4cef1ea58a810246e232038caabadd92111e6b8cd3947f1591cd5e69e5ee00f8b9d93fce6ef0c063cb7991e0d88948d6bd6 kauth-5.41.0.tar.xz" +sha512sums="e20f2f911084f48e81f85f4bc0e4559ce87c476a9dcaacba1e1f4db47ac0b0b3cbd01b185fba0817037838b6fae0e80abea1bc0ab72ced23a2c58fb95f9eb681 kauth-5.43.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 6fb07c456..e68351d6e 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f70bc7f132f8b7df1373257d5d50695a68f67706c5be6adb52a675fbd3575e73da33b9e8ca3fe5d40a8f8636e82815a354d82fc3fb4f6ed03b1adfd9aa4985e kblackbox-17.08.2.tar.xz" +sha512sums="fe68f2162233f77a734099a4520d53c9a404900076d474ad93f98b3fe1c818ff7e04b8a51530f887cb0565d8032dc7902f91c112a0f8d7ea55a99d803f91eac0 kblackbox-17.12.2.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index c19e067cb..9aed79891 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="50d8863202f58ce1a7f6dbb7d98569f0590196b2f38c1fa77c694e8826c90fe77111f3d332ffb2d4aaf172b6103b60388613ad9d667a55f91f4bf9fbed9e001a kblocks-17.08.2.tar.xz" +sha512sums="6f36b752a4313f8b8345cb54d18e145cf06dbdc00954adfb54831f93643d94e9da130417433aeccfc537d383d60002fc979b2f3b9dd55b7e43808c4e7a760b7f kblocks-17.12.2.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 7678dc2a4..22cc45551 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" arch="all" +options="!check" # Test requires X11. license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kcodecs-dev @@ -44,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ff852733019099e7badd8647f8b58522877e3e47bb0a0e9edac210ea40590731cc801870e6c0ba2b4cbbc20673d13f39c558ddfd5c8ed05dec5de66ae5baa0f kbookmarks-5.41.0.tar.xz" +sha512sums="5cfd55d94efa69267dd1e61e857fa541cd0c7ae55a02d83e91a9a0a02dfa020cfeb16b0a8cc10228f838c17de5bca95f683f445749263fc0e28bc55e2ac6f2bf kbookmarks-5.43.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index d139360e6..00bec3956 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2066d533816ec9f23bd9685f9eefc840b37b0739f7b1fd95e1432c2ed91325d6526b5b6912d2df1cfaa2817f30950fa04aa5db36ce29fa1d302eacfbad7d5d53 kbounce-17.08.2.tar.xz" +sha512sums="d680381f4c63eee640befbca643948f6671b1601e0d2a700b42f366af9cc242f2446d862f43b1876f3c62653863a54aced101f729314240e66454b7cdaba5436 kbounce-17.12.2.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 52dfc16b6..483cf8285 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2233a5eab165467ef1d3728b47259e61182bcc19ea47d640de5dcf800faf5f487f6807eab91704855125defe10a2536dcf69be6bf16c40fe425b9b44cf60fea kbreakout-17.08.2.tar.xz" +sha512sums="d14a0a0493f5f265578c62a403e7f422efcb322e5de2657d1461c027599b13b43e35ef296b29ddcf0db4147caeee70d8f0cbe44dd4141d37d9fc8fdc19f1f5e2 kbreakout-17.12.2.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 5d84b3b71..30364d146 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5b11fad5060ec4a5f3255b2b404bb70f093caebbd054ce1831fcc35282e4befaf286153ce8ddba6f748d670931474b6c909c52747a96632b337ebb4da6c4b263 kcalc-17.08.2.tar.xz" +sha512sums="902e64eb0bca993b557be9ca2c4807645913fbbfb8cbd3964df18de84d8a90c62fc0a0dedca10c9aa709bfb82d1be0cbd63087d79be92866947af938feb6d631 kcalc-17.12.2.tar.xz" diff --git a/user/kcalcore/APKBUILD b/user/kcalcore/APKBUILD index 84b325876..e8dd3a776 100644 --- a/user/kcalcore/APKBUILD +++ b/user/kcalcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalcore -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -35,7 +35,7 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E RecursOn-RFC2445_RRULETest39.ics + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(RecursOn-RFC2445_RRULETest39.ics|Compat-Mozilla|Compat-Evolution)' } package() { @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f116b4aeee847c96383f2e911e1c90f751cc1c4e93ab2c3be44b7a321337a47006d1d5f0c2621efa96c735f11bea13d1077a0cda8504acf9f51960dbd9df165 kcalcore-17.08.2.tar.xz +sha512sums="ed9195e902cbeff2d48a013cb4c7cade458109696476496a4f8a7a340016c46c9e90d707292d16dde9d80b19290c6d4562297b71f81a5bfdea0eefe76889943c kcalcore-17.12.2.tar.xz d911c2a03b1db1f9f3b19e7087ae5cbee59ced24ded3b43f2d3286651d13e5f531d171cf7dc6c26906116d4b51a79f2801828956fa1f4e7094fa2f53fe2b888f posix-header.patch" diff --git a/user/kcalutils/APKBUILD b/user/kcalutils/APKBUILD index 162970ab7..17683d175 100644 --- a/user/kcalutils/APKBUILD +++ b/user/kcalutils/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalutils -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Utility library for managing a calendar of events" url="https://www.kde.org/" arch="all" +options="!check" # Tests require X11 now license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kcoreaddons-dev kconfig-dev ki18n-dev kcodecs-dev @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ceaba6676f3cdd962e112d8aea65aae7bf8fb45beace07cf1dbfb634716501cfb9e7b69d2fd65960694a4a9702c35400b0b0a5a342871572666501d015cb424 kcalutils-17.08.2.tar.xz" +sha512sums="51f5b1fa076360c6b6ffd30af4a94970905cc14d5c23017ba4a163cdd1e27d762674403d2b78473cdb4c671a8190e0e4f8f5003d687fb873b7e4f5abbd2d3d7a kcalutils-17.12.2.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 6775e9c87..784ec5fe1 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="21d35ee11da98010381c89236a4968be491426f262bda056b6880755d6fe877fb0ec0d205a9b961d9cd3efe8fc2feed9b99c1aefa1746f23f15022b3f3fd98ca kcharselect-17.08.2.tar.xz" +sha512sums="9b4bce1fbabc8b51b8d18a1d9b9a754fed7de3809c7bdc392a875061344ab213cd7c1b06c2e30fafb6bbd4e1e7923bebd5a688ca00c9e00323977f39e4206509 kcharselect-17.12.2.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index c87275e47..749d3868e 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65c12664c93bb2405f9570db8e961149c019f28b50b145bc166ada20bf97548f334c1dfad401b57352fada5cadcfc34aeb3d23db84cbcbba4ab4b3355f3d24f1 kcmutils-5.41.0.tar.xz" +sha512sums="07c668fc50e2890809bac3287a37591abbfb26ff8f4fdb70ae4ebcd141cc54be78f7b3b86f20b68e582b16d6af85b507bae49fb4b7083f1ae61c340dae48115e kcmutils-5.43.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 79a8a4e22..cfda23196 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ad2132ee20012cbddbc5281dbd88e41c0247201d6ff32580068842fbb6acec25b34d80a3f236799f9000ba6c5474858ed16ca1892bec45a54a395bd2d835793 kcodecs-5.41.0.tar.xz" +sha512sums="a6d81395a8b495fa2dded4d7a8331c8b987cf3e8d3b254cc9339863f0ff02c3b972b58f033075dfcc56d1fff21710b000f834de9bf9ce1d3ae1bab1a6bb90d64 kcodecs-5.43.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD new file mode 100644 index 000000000..09e6b565e --- /dev/null +++ b/user/kcolorchooser/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kcolorchooser +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Simple application to choose a colour from the screen" +url="https://www.kde.org/applications/graphics/kcolorchooser/" +arch="all" +license="MIT" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kxmlgui-dev" +install="" +subpackages="$pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/kcolorchooser-$pkgver.tar.xz" +builddir="$srcdir/kcolorchooser-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1b3e75f86d0db24d0d32e831a5a95fec32adfc546b63f8def341f4a8844e21177e68ecda7e6f1d5603013af3ea983fff1a9f44df4d7197ab37c25c792b059792 kcolorchooser-17.12.2.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index 03b15c0f4..671bccb34 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -34,7 +34,8 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # All other tests require X11. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -R ksortablelisttest } package() { @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5301f19fd2d8b18652b5ec1d0484514cbc696e7cbc747f4e71dec66f801c42c80fede9809d917bda89a074b4aa5ebf1e2b6e49541df5cbbce0306e2e79b4aba9 kcompletion-5.41.0.tar.xz" +sha512sums="a9ff9f512a46df6d70580150f702339b408390353b0c665eb60d28f34ec4484d558896d510f82300b8178a402f7b6c8e5d9f587a33c4bb242860855bfce8e158 kcompletion-5.43.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 5873064b4..08ff036ed 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="966f88c7c02390551cdf072159cf7e224719cc7cf20f3bb90acee7fa46a82b80f64a3c4c6bfdcdf779451f2a42e92ec51212cf8442bd360fa2ac30dd1fa3487b kconfig-5.41.0.tar.xz" +sha512sums="446d0b5b1aadc32a73e44cae77959d212a83cc036c288591c82b46734e616ce1124d3df09d4fa031f91c8bb08e452348588831435c44fe64247b341d62eb3279 kconfig-5.43.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index c517d59ec..e523b0df7 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" arch="all" +options="!check" # All tests require X11 license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kauth-dev kcodecs-dev kconfig-dev kguiaddons-dev @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="58e9a86211832694b920680550b7ba61769bacfd56cd6469aa6423504a9a72bf3c0f0beb04bc64cc1a852590db74589195477b57ec1ac55111267046031739ae kconfigwidgets-5.41.0.tar.xz" +sha512sums="57b5b8a76a7973bb04dec739b7ac3da0a8146623849fa8cbfee9eddc7224a5bf0ee933ee95787617217ecf38841355abef24c6d70da378b743401270ca25083d kconfigwidgets-5.43.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 71ac6fef0..b5ce62443 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -34,7 +34,8 @@ build() { check() { cd "$builddir" # addresstest requires the library to already be installed. - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E addresstest + # picturetest requires X11 running. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(address|picture)test" } package() { @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0c87a84b3bc588150d5c46cdce78f516c7e002bdd99527f78d7ca4a51658aa0eed3326d94a4a2add5d12a8d8f432df1c32e8b5aca3de172df7785304c9f879a2 kcontacts-17.08.2.tar.xz" +sha512sums="f6b18421b06d6991c0f99921ccfbe30b8ff79e6912fb1dda2fde06da21600ebcf231549176192ee6ff7f4ca043045a3134389c0b6189c8876a999b4d4d4a2a40 kcontacts-17.12.2.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index 04875c5b0..4873bde13 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" arch="all" +options="!check" # Needs more than 8192 open fds license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev" @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="86d6943c303786e4c7b5ea3e2f5c17dae89152597e305316b5e5977e7a037727579a25fd4d6e6f8c272bcae24af5185b06d87189a0a6a8ab8b8232cd059c030f kcoreaddons-5.41.0.tar.xz" +sha512sums="895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b kcoreaddons-5.43.0.tar.xz" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 402b7f338..5f3cb82fc 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ff21f33d14813aad00a2cc231cb889eb219555ee0302a3575d0ea5e237d7b5d6b9a50c354b289b087ccbce9bd4b5c76e8c94e7bde6a00e8148c63a13e79780ef kcrash-5.41.0.tar.xz" +sha512sums="1733807f55d5914b67d7b009ef8b34d0c54e3e1fb40a373df7651d65dc3180033ec8872c105d243134e7e38ea6fa9992f2d4803d9b2915721a3c0d8c43c7464c kcrash-5.43.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index c7d996df4..87aac1692 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="52323367b827268e0ed8319184d93066663bbe2b44e1f72833107f8c695ab0024a6c9bbff1fcad66add79d341fe22085c07c0c5f4a0032f0bb3bf9208d95732d kdbusaddons-5.41.0.tar.xz" +sha512sums="395fdb0e2387c6eb2dfafc1f84eb86e24d4bc79dc4f3b914fe956f0614ffb40d2cbd66a550b88e8fc19d676de20fccd786737f03291c11624bdb5704da7a8e1b kdbusaddons-5.43.0.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index a85d55916..8b7fcef04 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -11,7 +11,7 @@ options="!check" # MIME types for some reason think .doc == .txt depends="" makedepends="qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kiconthemes-dev kinit-dev ki18n-dev kcmutils-dev kio-dev kwindowsystem-dev kdelibs4support-dev - kdesu-dev qt5-qtx11extras-dev + kactivities-dev kdesu-dev qt5-qtx11extras-dev cmake extra-cmake-modules kdoctools-dev" install="" subpackages="$pkgname-lang $pkgname-doc" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3be34730ba417c80a6acf23c5428a16912270ea7dc0731a2e03670ae8b8350250280973342fc41f933f6f5db9f97947db97164cf4fb40ee0774a339daeb3479d kde-cli-tools-5.8.7.tar.xz" +sha512sums="2dc5be967d7888abda1b28af465754ae1530a3cd8cb919a77dc65d8566f961faa17e0c2d351b20fb3fcd4fd08d06f65bbe169cb20e78735d9ad3d7cc8664003e kde-cli-tools-5.12.2.tar.xz" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 274d93b38..c8c1778f4 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="All the KDE games" url="https://www.kde.org/applications/games/" @@ -16,17 +16,15 @@ depends="kapman katomic kblackbox kblocks kbounce kbreakout kdiamond makedepends="" install="" subpackages="" -source="https://distfiles.adelielinux.org/source/meta/kde-games-$pkgver.tar.xz" -builddir="$srcdir/kde-games-$pkgver" +source="org.adelie-linux.about-games.desktop" build() { - cd "$builddir" + return 0 } package() { - cd "$builddir" - install -D -m644 "$builddir"/org.adelie-linux.about-games.desktop \ - "$pkgdir"/usr/share/applications/org.adelie-linux.about-games.desktop + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ } -sha512sums="55f98ad2a1c539feedcd96961e87f2d5b0d60a0f8eadbdc16a3cbd137cf0a2ca586e179c4c00b50eba3619a30d63d3a265f4e3a6beaf5f37a8847fb6c0caa723 kde-games-17.08.2.tar.xz" +sha512sums="1748420b49e7cf9194b74a17ee71a567c66c3966e6a0cfa8aabb28ab878f95dfb9755ffbade30cdfc3054d21f903f52db7276697e85e0aacc9eec5231f1b21d9 org.adelie-linux.about-games.desktop" diff --git a/user/kde-games/org.adelie-linux.about-games.desktop b/user/kde-games/org.adelie-linux.about-games.desktop new file mode 100644 index 000000000..5e647ce3a --- /dev/null +++ b/user/kde-games/org.adelie-linux.about-games.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Games +Comment=Learn about KDE Games included with Adélie +Icon=dialog-information +Categories=KDE;Game +Exec=xdg-open http://support.adelielinux.org/html/desktop-kde/games.html diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD new file mode 100644 index 000000000..f99a5cb4e --- /dev/null +++ b/user/kde-graphics/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde-graphics +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Graphics software from the KDE Software Collection" +url="https://www.kde.org/applications/graphics/" +arch="noarch" +license="NCSA" +options="!check" # Empty meta package, no point in testing. +### FIXME: add karbon when calligra is packaged +depends="digikam gwenview kcolorchooser kgraphviewer kolourpaint + kphotoalbum krita kruler kxstitch okular skanlite spectacle + symboleditor" +makedepends="" +install="" +subpackages="" +source="org.adelie-linux.about-graphics.desktop" +build() { + return 0 +} + +package() { + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ +} + +sha512sums="03fb3a4894b3d393ad156450880eef22b061b2e7e2e17ab7a2d8498793b7b862c1029583c591e486633a3b37c2ac084c4c314705964ea8f8d1d899aba98da4ca org.adelie-linux.about-graphics.desktop" diff --git a/user/kde-graphics/org.adelie-linux.about-graphics.desktop b/user/kde-graphics/org.adelie-linux.about-graphics.desktop new file mode 100644 index 000000000..503be06cb --- /dev/null +++ b/user/kde-graphics/org.adelie-linux.about-graphics.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Graphics Software +Comment=Learn about KDE graphics software included with Adélie +Icon=dialog-information +Categories=KDE;Graphics +Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/graphics.html diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index c19063453..9acc9b4c1 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=17.08.2 +pkgver=17.12.2 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 6cb1017ff..a74fa3d3a 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" @@ -14,15 +14,15 @@ depends="ark kate kcalc kcharselect kfind kgpg kleopatra kmag kmousetool makedepends="" install="" subpackages="" -source="https://distfiles.adelielinux.org/source/meta/kde-utilities-$pkgver.tar.xz" +source="org.adelie-linux.about-utilities.desktop" + build() { - cd "$builddir" + return 0 } package() { - cd "$builddir" - mkdir -p "$pkgdir"/usr/share/applications - cp -pr *.desktop "$pkgdir"/usr/share/applications/ + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ } -sha512sums="f31378c0e4b61e1e7984650a4b654cb1c1a8c78db1b782ae8245b9efc936e5430917fadf382b9d9c9dbe2fb4ebee0b6737318acd5ed0768044dd4331f86bd188 kde-utilities-17.08.2.tar.xz" +sha512sums="e037aa802389d92b3795b2225c092180a81238a3d5b3118149bae892fec998ee576eceea0d5ae7c5e3ee03451923d4bccd45271d5e4fe7f88f52c4262ff3a595 org.adelie-linux.about-utilities.desktop" diff --git a/user/kde-utilities/org.adelie-linux.about-utilities.desktop b/user/kde-utilities/org.adelie-linux.about-utilities.desktop new file mode 100644 index 000000000..9ca5f1c17 --- /dev/null +++ b/user/kde-utilities/org.adelie-linux.about-utilities.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Utilities +Comment=Learn about KDE Utilities included with Adélie +Icon=dialog-information +Categories=KDE;Utility +Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/utilities.html diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index f7b185cb2..3ba7f1b16 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e52cf32828cc94132b07844707ca3bb12b87457aa4978380e39655206164002b889e5dfb49151a2c6717a7d65d273f259eca7e35147d12b9c46d0755c6cabea2 kdeclarative-5.41.0.tar.xz" +sha512sums="5e9494adee19b40ffefbf006e318ba34302e073e9a22a94db255ebba2cec2e066df380063c7c617af81d0fc3f719753e2c050e6daf792f2f3a9d6c08163b616d kdeclarative-5.43.0.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 9285f2562..3673e4bff 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdecoration -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ef1f7f3eb09872f0ceb0552300493f2701fdb6fb262dec00cad2f06a2ac034a7e278815a90220e94ab366956b0e62157b7c1e0f4fd743a6d5fa7c77931fd54e8 kdecoration-5.8.7.tar.xz" +sha512sums="12440920014d703156665d80a1c43f3bbbd0aea534f2a79d51536609aa5a50b3419015c1455a8b5c591d15aafc5a317c1a4b0a360e62be0fadcec0785788242c kdecoration-5.12.2.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index f09ae3aa2..8c1f874ad 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d904f730ec15c04bd4db0c628c3112da942c46923ceb93faab2c14c049ac7f3f3e9955c5d1a4c16405184662f2170935141ba01f2e76f1f3e9367892fd54d7df kded-5.41.0.tar.xz" +sha512sums="cb62ad4b0be13b103810a0396614da3a6137076041102a6aca5b30c477b5bab472298bdedd869e3476725dd21368075273193afd7027b9dcf1ad84594f6bbb32 kded-5.43.0.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 23085c225..f9ddead19 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecda32a36099bc6b7fcdb56a7608cabb20fd30ea591a47c789b499924c7beda37f9479b8321d5e0a09094cd1274060e9546f4fb089cad70b80991e7f9a6fdc61 kdelibs4support-5.41.0.tar.xz" +sha512sums="bd73459e5334a1158f68d2af2032fa9236bae303c2c45ac9c3b46ffcf46654f9175fae68222a7cfb3398642634aa21fd023f19f0318af633574f448bfab8e467 kdelibs4support-5.43.0.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index ba5682fa1..e48cc41a8 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc981f77b154ce33de111d7cfe7193f35fe58c7e92bb8e72306d67e35ca633ccf3ad9c7c92361f136cf3df618980c0df2bbcd636a7c9e556d08f6c91d0b423c7 kdesignerplugin-5.41.0.tar.xz" +sha512sums="38422393c7a061fada3054fd511bafa3c2d529fe819c86854cbf48db1ea92ec2496fa3df947a985f029d5d3110fae33c89d60b853d59a601f6f172f5b15c0684 kdesignerplugin-5.43.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index 5b93d4d34..7abff9080 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a94f9433906669a64d12c4ebf7e895fbcec6b77e64dad1d810cfe5be2404632352466753d2453dbca930becfeefbc6b1426c72b262fe7189f575fbd8dc05ad57 kdesu-5.41.0.tar.xz" +sha512sums="efed4e7583b2f862115a5a016c647bbe0a6043027a0466d4237f7c3e0c0b2afc8995ea75ae371e0c73a7d550628d3713adf430173ba411d958d807fed35cbd38 kdesu-5.43.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index a87585522..265884b1b 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fddc0b5c156d0ac536237395951eee787b53d6c4fde6b90fd24be2e2f07ec3e27be45a52e6cc4976f68b5a0d61aed42b5701aac24ffb6ede7b3ffad4cf9abe5 kdf-17.08.2.tar.xz" +sha512sums="f7e3fb2a7336ba587295f6dd8b25f48aaf304e4130e05fa13a659c43277b4dfd98d6f3036d4e64d6cb95e44a16ff4888910db629cd982f23750f334438925080 kdf-17.12.2.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index bad366e84..76bab2ecb 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6513bf87f1af519edd3aac5ef93e8e3a762e7f7cf83dab3d66867e1b6fda492f233b88b92cfb7e05a89a7df26295b94dfda7e193742ec7ead873cc2c7ef4e5d kdiamond-17.08.2.tar.xz" +sha512sums="f7e693c519c4d7c0ce2717540de4d456239760f65e6e00b191b76fcf78dd69d2bb0cac271d3676509c883b9580af415306de057a8f379d154da983ead145cde0 kdiamond-17.12.2.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 4568bfc0a..d3330aa75 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f1e0136baaf5dbfe8578654a2a7c71acfb002c38b745a50d4574dd4855b2f470afe44aa88b11c94f5d366ee9d4cd6603abf68d367234f3348cc0a70405708aee kdnssd-5.41.0.tar.xz" +sha512sums="d84714e0d9b247f719b4c8d82c8927a132c98d8261d858fc6cbc2d1be619daa4d64f513d0c71d626e63ed887639689436cc593c8024b07d583103cb2537402b3 kdnssd-5.43.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index f36303ddc..67511f3a9 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8e5519bc6872d2c6da226d95c9d69e17a19b587e48cfb2de881e1bd735a869b2055b25c5121ce024f65237b1c1f886e93da6992e2213b163aa2940ee04eb6866 kdoctools-5.41.0.tar.xz" +sha512sums="af93b4ab7966246b38933eccd02ce2dd02c288e3f582c9b3e14e05aa03293c32ae78c0b3cda6710012faf368de4efab5d06ad3df8e279d1dda967d2860d5e62c kdoctools-5.43.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 11f027f3f..836c16993 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4f21d7fc428dcaeab1f82b40c60125590f5b077729a9b2995abfc153a044dc9d71dcdbc34adf53f5b83a434a421d86022a15df8c6e4a0e03b1d3c095d7718d88 kemoticons-5.41.0.tar.xz" +sha512sums="130011a2158f5d84ba664354900e23eaf8867623eeab0fe018c6b8c60b3fd413d3f5e1ad43a3fe51dbc0153bec3e8c14d88b7f06f82d873c2d7f2237441eb8d8 kemoticons-5.43.0.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 9e81ef284..0a8d0e942 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="79d9322b1b7c21809f287a555b4577eb885248becb7bd7236b40d446c0e5fe154778d9784d3bc06efd8697c485b01a2bfa042aee2911d49b2f31faca0706af15 kfilemetadata-5.41.0.tar.xz" +sha512sums="0e669ae832aeef2a54e6a26df5541d607301e13798082e716f6caf682d4e28d87d7eb0a4487c7f2c8bfee0311a5a3342238dfa806413fccb20d3cfbf6b8733be kfilemetadata-5.43.0.tar.xz" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index d9655339a..74f18c367 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a652bd1fac8fecab9e40a246e7c7f08061848596c93695847d15947d48235602624de13b47735ccba7435d4a6e501e7680d1f094c4d02a181d8445fc91b0845a kfind-17.08.2.tar.xz" +sha512sums="2de77210e6c2e84addc54c99d3b7329c490ae9c8c614281d904a70dcda8905945beaa92e9927c03a71f7bfd72a353f9361ecea8030c2761abbd872c7ebe45636 kfind-17.12.2.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 9cbf16286..14c3f0db2 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c17c305ecb41e6ded4bb4391ddf15390f7cd09d6a91f7279d31adb640b4b88c30814b80a5cd7aaa6c7382cfaf2c8e5ffa74f7ddc13e91ba2e43206a396c2d9f kfloppy-17.08.2.tar.xz" +sha512sums="d95a7072754a4bcc95c2fc8a8c5149759e33717bd29377ebed78cfe40ee3e0f7793d537476d1807f830c11f9af5b5c15e1db6c82540b385bf46a6f4749ca8691 kfloppy-17.12.2.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 88f7c2572..88dcd259d 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="104e8fcb12a97d8876813c37d862cd8f103e2267f229e373066f89132e496fb89ecb1a76df40f232ad8af18dc1583f6d9a1e69c72b96b47f115f29dcfe3e5ec2 kfourinline-17.08.2.tar.xz" +sha512sums="3f7e0b179347bbb2cafb43f02af8a99becd872c35419a432e213afec1f1767b53a07a2abcae193fe868c891cbb464768bf5ade33565b5fba8c6f2c452d234594 kfourinline-17.12.2.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 171c0fa8e..9a1989d39 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" arch="all" +options="!check" # Only test requires X11. license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kcrash-dev @@ -44,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d0a36a9aee6bbf4198f1324e98174750c914caa72c0ee33076875c41e4a41e0cfc9fc1f1d395bba595f1bb397b27597cb1356c3654230e6d1958f8f9ecf0c4a6 kglobalaccel-5.41.0.tar.xz" +sha512sums="1b10d9e5c454b1a4c9fb2553fb1847e30ada2b36050a4fd13637c9a1ba2cff642b19c2934414fc5e104958856c0d0dae4d20b8fdb6f51454125b0e2941fd1d22 kglobalaccel-5.43.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index a883519ee..1a552e025 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8815c6658542ac5191ef7b88a97d4c572b772d5afcf483f03c6c999a037652c2bf56b63a844425629f08bcb4c82d07961129dce37f91dcc6f7beae2468e9edad kgoldrunner-17.08.2.tar.xz" +sha512sums="a68a9b16fe8ae20b3613cd3d8dc872a0a222476cf6e9a4d0bd8b0563604703ef5eb910770499355e8f75fc20a44a3917234f1be88f06dff23a721d0049014ff6 kgoldrunner-17.12.2.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 1c8b27096..77d2d5451 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="http://utils.kde.org/projects/kgpg/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c30db0d037d90e7fc2dbb84fa26b7603a3fb06b84fcf0e682ed4d08948f3d7122c357e57ce11527b44a0e9114de84514726a586928d80426a3dbd67161774093 kgpg-17.08.2.tar.xz" +sha512sums="5f5078b0a72d0837d023e89079f7d0206b5952ea437af2eb9ba76d9c3706c7e77e92ded7ae61a5ec18ff5b4b0dc93425b265200fe0acdec43ddccc1eaca9df44 kgpg-17.12.2.tar.xz" diff --git a/user/kgraphviewer/APKBUILD b/user/kgraphviewer/APKBUILD new file mode 100644 index 000000000..4d7c4fda1 --- /dev/null +++ b/user/kgraphviewer/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kgraphviewer +pkgver=2.4.2 +pkgrel=0 +pkgdesc="Graphviz DOT graph viewer" +url="https://www.kde.org/applications/graphics/kgraphviewer/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kparts-dev + kcoreaddons-dev kdoctools-dev kio-dev kiconthemes-dev graphviz-dev + kwidgetsaddons-dev boost-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kgraphviewer/$pkgver/kgraphviewer-$pkgver.tar.xz" +builddir="$srcdir/kgraphviewer-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2a25f8493881ffa057602e7a141ea610b8db7c43da2db007aea118e2ec7b1f069fbfa6ca80b0e1048c9b20535764679c8d77027337c47a4c18e5240c3058d935 kgraphviewer-2.4.2.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index f715724c3..b0a89eb6d 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0811bbaafad90109cdd18bc188fda7f99c2e2f53a399d823af333a052b6999cae612ecd1cdfd373f3cbc3b79133d10abd28e8c909c2e933883293ed93434f1a0 kguiaddons-5.41.0.tar.xz" +sha512sums="ea560ba016914037ddad6d07da849a1f9b20d241a7d5e21353237e00e960d5ca5005de3bc95db67e0ff1d432b0a52b99e8d7f85a0930ec40ff1fddf932a15e41 kguiaddons-5.43.0.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 865851289..b3b709350 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="634a5d9cbe17469e7a3916d315d028adf64ed6a828787a822e0e6e99607e0321cfce78cc07d57ba069fe48ac5a96a4be1d3e17c4d7741bda38c1032afafe92a1 khelpcenter-17.08.2.tar.xz" +sha512sums="5f2bca81072a21c26853c66b5ae3fd228c92b8c74474797cf45eddbde0d9954b62c6277957698a30538ef28445f83c6e9ca570a8cfe747762486465dea6db6f8 khelpcenter-17.12.2.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index 4683a1dc3..bded7abd0 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=17.08.2 +pkgver=5.43.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev" install="" subpackages="$pkgname-dev $pkgname-lang" -source="http://download.kde.org/stable/applications/$pkgver/src/kholidays-$pkgver.tar.xz" +source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kholidays-$pkgver.tar.xz" builddir="$srcdir/kholidays-$pkgver" build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e46e9ee8886ca6deac3cfd2a8c4cf700484a4f8430edc7b55b98b2ba138bc8fb612135600de62bd1660e52581f755331023305079760462399c427437e520f30 kholidays-17.08.2.tar.xz" +sha512sums="57e82a4ed8d7de87b48b3dda3db915c0944ce2eba87cba6143aa509ffa8fe7f877b796c064d6fccf42d5d6e9dc624cfcd3a34e429c705a6dbf9bf626c09f9b1b kholidays-5.43.0.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 388ceafdc..ede3c5f9d 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" arch="all" +options="!check" # Tests require X11. license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev karchive-dev kcodecs-dev kglobalaccel-dev ki18n-dev @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64210f2b9b17a8abea88c71e78abf2456578292e62350e93f62b8c690344399779fa1e2421d97dd9a6d5306270b071e1d6d7faebf6273ca8118a09b059469d96 khtml-5.41.0.tar.xz" +sha512sums="55d2806c28d5da5999bb3ba03d33ef026c1c3fefcd1a76c6e74ecd2f659a015f55b2fd1fec34efcddf25fb2e921b4c76358d37498fc3429b6bcf6e5e790f7cd8 khtml-5.43.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index b0cc5b6bb..c98f373a7 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9e108cd8f9cc32c3fe1447415b427981baac58c01cd3127fe0df58b8f7b6ebd6716d48e87b99561c220178f3e6de6e557ce935326451e632028cb6253afd8488 ki18n-5.41.0.tar.xz" +sha512sums="14b7f632feed5c71a44259b4f0d9cc11ab72d7f132a59fba597e048efee7a4ff360eb01b95c5b4957ca28ba8ab0e2cf9ed752cd146f6dc19855c6c78c05a7e6e ki18n-5.43.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 737a01d40..a2fb3ea50 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7cf106a044c2ec2b61bc8e8f138d158de707066059926ed1cbac323a58024ee2cd99a79400ab9fba0661e9835f8ce34ea75748de02c38cd7699233850177573e kiconthemes-5.41.0.tar.xz" +sha512sums="742a2c79b37830e319e4d807359e9bd16950889753a46f85ee5b8d5e0b1dc6868aaafc625c3df7717371440a1cf4e6168981ec34dae328aa3eb1aecc7962d759 kiconthemes-5.43.0.tar.xz" diff --git a/user/kidentitymanagement/APKBUILD b/user/kidentitymanagement/APKBUILD index 2ac1f3db8..65b4b2b91 100644 --- a/user/kidentitymanagement/APKBUILD +++ b/user/kidentitymanagement/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidentitymanagement -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for managing user identities" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="317e65c2c4d2e5fb9216fb95efa738f16d3ac4603764747a9275d7eeb51722df07d9f55e12ebea0304f4cd86085dc0b2216c9d6a64530f513383525967d3150f kidentitymanagement-17.08.2.tar.xz" +sha512sums="81a97151b0c7db2b44305b479d5673e42dffd04c5d707f2072db92cc44dc40a412e47000b916fce6be941bc59419f6968debe5ad8173852952378d1b801cbd0e kidentitymanagement-17.12.2.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index 881ec5d3a..070eee861 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7dab05f459592ff4b81f56761cd04845c4c236a1674cdc273aef5604fcf5b649cc3a9ca6092d9222dfafaf2b38d9d783820e632d44228b5e5e26d1337f98f9ec kidletime-5.41.0.tar.xz" +sha512sums="aab85a3143fce87751cd3e9c2b55306f5c4aad1f396dbdea7678605dab4ce47b53b95a42d42667fea937dbd6b20b84c349d00076216753dcb31beab52d05df3d kidletime-5.43.0.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index c88d0741b..b9dbe4e9f 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d0880f53be246553f627eb317072cb81a01b56af1cd35b4d41a55c717c5cb59598bed5c29b8d090fc867297309e742ac7900113b0bd100bb57687cffc80a423 kigo-17.08.2.tar.xz" +sha512sums="d758f72efcc797f9b060b6b01065cce4649a69a5031d358ddae3dc3cfc167d9c10cc2ed577089e1dd23925f9ffe3e4d5c5636184678dd1a70ee0715a0b14eb9d kigo-17.12.2.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index af3c34f42..f0305831a 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="488c4a5660daf7ca48391aa67d2de687e9d78b7ecf4539372e2a55c778ed8c333732253734e6eaa39a54349aa4b26457fed55982b4251d0fe7a1c3253e414b2a killbots-17.08.2.tar.xz" +sha512sums="70ce103e39cc35e872d61afbb73d1f5498c35266d1715d56c595db17c9028eb264d7d4486254c3032812e9608812fbef95f935947f7138fca3ba5bd08a0e7f21 killbots-17.12.2.tar.xz" diff --git a/user/kimap/APKBUILD b/user/kimap/APKBUILD index d1fcb263a..fe83fd937 100644 --- a/user/kimap/APKBUILD +++ b/user/kimap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kimap -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="IMAP framework for KDE" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f776850d3604c5e59cfc46bf55baaea5cd81b5a39c10222508573dc97fed97bf201e7cfc529425cb571eb804b9eeb05d2f859a4e3a9cbf406c8e3b31c3ac44a0 kimap-17.08.2.tar.xz" +sha512sums="e4342382afc3694476608c561871d175aa1c2f9334e66dd7c8460ea8ffd6e016c48777fe7d9039b0d0934e92b5efba6d32acca3cc05fcff6082fc7aa2db38ac1 kimap-17.12.2.tar.xz" diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index 4e9bba38f..b3e1bd295 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinfocenter -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Information about the running computer" url="https://www.kde.org/applications/system/kinfocenter/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37da25c445d8315dac7bb4cf33124cd73de9c84644920238a2ec66d54650b62106cd4022a76a64cd1b59dee3843a9ba58ecd27d979b2394bd1feb2b86875a452 kinfocenter-5.8.7.tar.xz" +sha512sums="7150e3376d515d6e542deeb3834bcdb5a253629755e2a3ccc826db84cfd1ef7477119c318ba5a28a6c3b8800a1aa1b6d95e40b99b669d254bf21beec6109ff9b kinfocenter-5.12.2.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 685917fa3..f576b13cc 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8bba487b3cefba337bc1c5656f7fa0aeb6c0ee1cb18b3e394de29572af4fe5fbf14c833b7ca6e941687899e7828b9571cd76dfc6b64ff2e110ac5f9b6669a02 kinit-5.41.0.tar.xz" +sha512sums="1326c6a3d67d5ff9e483f05506c4c21486377c793fb6e6e8f6657d60f28b69bc03bd45619783a76464971b81997b1f546f18043f133f048c4836c023f2ba54f7 kinit-5.43.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 868fb9e32..8a4892fc8 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -14,7 +14,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev kdnssd-dev kpty-dev kactivities-dev phonon-dev libssh2-dev libtirpc-dev taglib-dev" -makedepends="$depends_dev cmake extra-cmake-modules" +makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcdef6f3079218b283cbfabcad9a7981ba969abcb7cfcc8c4694a1767cceaa5dc81e189dd991ca01d20913a8ce59c31d44a7ac2d1826605d9aac6a99e9a37d9b kio-extras-17.08.2.tar.xz" +sha512sums="5918057745fa201460c8a21e48e669313dce28c40c26ee663e53997af0a5109c6f8396c9ab6939527bf3d315ec29d23aa865290c3fec12896e47dd0526d07fb1 kio-extras-17.12.2.tar.xz" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index da831e364..56bfab7fa 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -16,7 +16,8 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev gettext-dev python3 qt5-qttools-dev doxygen graphviz" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz" +source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz + D11011-msghdr-iovec-struct.patch" builddir="$srcdir/kio-$pkgver" build() { @@ -46,4 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8f7072bf6268bf07c0c1266cdbee58aacdf43721d193aaa7574c683a4339de3d9701977c8bdd604f301d11393b8d2031e0b90e9ccc42a2c5e62050f41bc04216 kio-5.41.0.tar.xz" +sha512sums="23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6 kio-5.43.0.tar.xz +c08360de86780f63703d70f607d90410043c8a8711eab7315e2ac66e2e656fec9f9a6f5d04c031f739a0187c0d34aa35b5942f59f47efb60ad95584f95087979 D11011-msghdr-iovec-struct.patch" diff --git a/user/kio/D11011-msghdr-iovec-struct.patch b/user/kio/D11011-msghdr-iovec-struct.patch new file mode 100644 index 000000000..641bb8629 --- /dev/null +++ b/user/kio/D11011-msghdr-iovec-struct.patch @@ -0,0 +1,23 @@ +diff --git a/src/ioslaves/file/sharefd_p.h b/src/ioslaves/file/sharefd_p.h +--- a/src/ioslaves/file/sharefd_p.h ++++ b/src/ioslaves/file/sharefd_p.h +@@ -74,9 +74,16 @@ + FDMessageHeader() + : io_buf{0} + , cmsg_buf{0} +- , io{io_buf, sizeof io_buf} +- , msg{nullptr, 0, &io, 1, &cmsg_buf, sizeof cmsg_buf, 0} + { ++ memset(&io, 0, sizeof io); ++ io.iov_base = io_buf; ++ io.iov_len = sizeof io_buf; ++ ++ memset(&msg, 0, sizeof msg); ++ msg.msg_iov = &io; ++ msg.msg_iovlen = 1; ++ msg.msg_control = &cmsg_buf; ++ msg.msg_controllen = sizeof cmsg_buf; + } + + msghdr *message() + diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index 73928f9b9..ba4414ff4 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -10,7 +10,7 @@ license="LGPL-2.1" options="!check" # Tests require accelerated X11 desktop. depends="qt5-qtgraphicaleffects" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev - qt5-qtquickcontrols2-dev plasma-framework-dev" + qt5-qtquickcontrols2-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen graphviz" install="" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="987f666822aa2c137c57019aed6e811ddd6406318252cd48e71412ee3e6bcb22cd35042c5e3a0e0da5d12db48e4bf7168199d7c473f100a07913f32b1cd23bd1 kirigami2-5.41.0.tar.xz" +sha512sums="a41a139170853853fd7520912eac273e0cff8b5b798e41fd44cff528d210703b650e86ef9c8e67d8b8f14b89ed63b419e71cebe0e499ed32e9374e9346013c3b kirigami2-5.43.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 50f5d763d..1a6baad85 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6489e862d3d6c76a1718c3c78282b7f257e9b87890a7d275954f918b452103136c8738708ff9a63c3249882e4edbe4bee4ce38ecc79064e749b0176ebcb72e3d kiriki-17.08.2.tar.xz" +sha512sums="6fcc187cf3cf25cf3056d6388094f203f533506ead4a8dbb77298cb34fb881958449131a1a89047ac59739fb17db448a95a54c04e9afdc85b96225256a03d2a3 kiriki-17.12.2.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index fe22417ac..6aad0c792 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="36d3d07c467cbc249f0554dc96866bfa136617893dbf543ac8f821c693ecbe7d79a24dfb5e99527a0c7f13594cfe5847841d1772fccb1f7cafbf734507f6d9e3 kitemmodels-5.41.0.tar.xz" +sha512sums="8bc5d6d43abede2478d1e67516cd89e16c0033ea762c057047e898a4d31542ca4e1d7c2bd6e2d4e5cf1cf2c22113f5d69f7a25d022fcc47fabf51364a26cef8d kitemmodels-5.43.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 69349cd57..e674d25cc 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" arch="all" +options="!check" # Test requires X11 license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev" @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="81e8d1d158e7fc11e3afcf262a0da41f3c9b80a55134c315f7ebf610254d741d999a7ab3cc1eb8d8f63627c2c155282b0727e2ffefedba65f58a254a2e9d862a kitemviews-5.41.0.tar.xz" +sha512sums="e54af77d29d1aad0a1e0d842d82a23397f98bc2c146d74c6f1609af66099b0b7413b7d33ae1749036e90db54b1f2217d534d598ddead00be31934a6973a77a05 kitemviews-5.43.0.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 3ec46c4be..c65660afb 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0760da48a1f1db220b2c845f774195d143bda2cee451953840beb3d787294e39183dac9d06e4498bccb5ba0e15ff20a268b308c362c93cb38c04af7b53a7ccb6 kjobwidgets-5.41.0.tar.xz" +sha512sums="41a8a7c9c81f66eb90c196dc05e6159948c30bc1957fc99c477aa56e25f714665d6b5a1af381ebdd1194e4f2a7a68f8975e48d09d98771d67e899ae542d5f6af kjobwidgets-5.43.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index 57bb732ae..91c5058fe 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8a3bc231f1595704f8ee92ad9680b5d6fc715f304bab311445bb599a2e0cadfaec95f9c04f45a6f2a2be186f51bf54d2de702289a2f02fbf3c1acd93ff06f91b kjs-5.41.0.tar.xz" +sha512sums="44b52dbeed8d23972eefa9f2a68a6a0f15352c54fe5a8a1563d750899740044dd4539c8b5f6f42a196bd8d3216862437b36c6fd9aa65c653691c1f7ce9428772 kjs-5.43.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 060041cf6..596c04a47 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4029c45a86bc1e415d8bf9a2e6df019c6e4988d1c9935f1120966f04f2722627652d0fa856dd5a31aac2b848b71a3aabcb870ada5b24338351956d7cad43147a kjsembed-5.41.0.tar.xz" +sha512sums="54c005f1cdd60a3cedbe636d8abddfe92967ff27ac91086d9e7c0cf9983ef643547c04bde85a5e0558f51c0e68f85900db26ddb627c084396f750da22d30d549 kjsembed-5.43.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 499904819..0ebed81a7 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73c7a9390b70e22c91cc30b4f3df9e03cc8661be7a75ba2e790fc601749714eb2bc04756036338c6c251022135537a7fef430ff68065804be48f6984e78e51df kjumpingcube-17.08.2.tar.xz" +sha512sums="a85b094dc916d01b96a60037173c2e9e298814d575c66408d42de69b20674e65040bb6b4284edb2229b05849776d30e11e197d3d587fb76d7de77c09a3fa3f28 kjumpingcube-17.12.2.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index db309fed2..ced61dddc 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73eb35aef5b340cbe3dca6042069feb1474512b69998db3adcd67ee5564cedbfd01187687d798dd0357039709d77d9e88aca74c762701e2143873a60ee8d49a1 kleopatra-17.08.2.tar.xz" +sha512sums="e487d186b3b857929cbbe9023258273890104395b04394fefc7c7bb1a4391c85ff2f52da196ab13500b6d8ad243e646f62922b6dd7d0bee15c32ce92e66347e5 kleopatra-17.12.2.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index dfc9d9665..29c251ffb 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6fd78ddb0b4b5a1b5b5966c12c5410090332c669e237abbdc7b3aff441dea4388eaff2cb1a150d613cc51ae4c7a3ed2cf60bc1bf6e3adce6536942f54fe19288 klickety-17.08.2.tar.xz" +sha512sums="d96dd76c8495c68ec52dabf328b0100ddf656ecce0463c65dfd899b46c30e69451c8a94bb00e73a53b492e27c6bb69971532baabba8047cdd063fe65ca8fea64 klickety-17.12.2.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 751766ff3..326129ea0 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1061a94299617a67fadced2713197f996f9fde5fbb057a0ffe7aba9392f64d81bc225dabb2f1626f2084f0d9fce1413a0f793304ac0c22057842056713e49e94 klines-17.08.2.tar.xz" +sha512sums="d22b242933f61c2c7c8ade81aeed5126a92398fe9754857adebf03adb7d02d88c642f1ac0dc0a3bea8aa62487314e80bf509645cfd642f97c6b7ec617b5379a0 klines-17.12.2.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 1917b4323..b55934069 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3c938dedfb482edb85e80edd8ca36c5c55e4377a0342fbbcad473d5c418f99c8e67589a999b4f1f7d52993e6a83843b113e0cf52ba54e17742f95f32b9413275 kmag-17.08.2.tar.xz" +sha512sums="c3819d26296e19558b6656c965410e97ff2cbd33b98b1cf8f428df8f7c8827f9d627556a975f246addbe5a1a3e7ebfe8a25195962bd2a218a7f4ebedb5f4793a kmag-17.12.2.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 5936ac6a7..d1a38af60 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0ae7203213d60bff74a61caeb83a3ab544632c386fc746af22e2b26d83e9bc5d1fbd1268e88ec4a0323c265d3834a033bcc11727272f4d95e92c3cbe0db28c52 kmahjongg-17.08.2.tar.xz" +sha512sums="499d1e6eda3094dfbcf1e2535c650341bfc621bc2327a03b66d7539429231f8d6a92fbb360cce49357ad0e7a1bf1c3cdc960f2629a5790ab054a1f595803b41e kmahjongg-17.12.2.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 1e58f9afb..9da29c26e 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e69c6f9c24f4373eadbe2b53d7ac672014c1ee23f38ceac68a4ea230a414b0b37ef07c44746d9faa9bf030fcb60e353836370a0937c0d373ac5fc9ff12bf9b5 kmime-17.08.2.tar.xz" +sha512sums="8687759164779e262ca2923a7fbc60cb37ecc7dd4cf24265ed290829cae4f067d3abbf021f823caeb17483731ee1712652c8cb1c1ce13a3c26b59af00aad2e5d kmime-17.12.2.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 9a71065f8..fb8298b2f 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15514d0a1212088a0d9a0d8601457af0311cd877a0e4ae1fff7348a61b71f79643ef35d123b7fa8cd58c2b30e7506330c4184ba61e0919c10132b91e470be42a kmines-17.08.2.tar.xz" +sha512sums="447bcde5189365346d0fb9d752d42e58a0e1517496b262ac04c22ebc06392d7317b4d7b829b5bf3bc4debe0c3797fe6cad9d575cf92d141965c8d3c519cd5ae7 kmines-17.12.2.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 2d875342a..a52a94160 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c74667d7bf06843f957b3c7a188fcbe39f6d049f2a9d5d86cd9f34212a6c1c4ff4e5865d5bcee7282ecd0e2ffe7aebfc1f5ed0d73cbeb51a70d2ef7e583f3ed kmousetool-17.08.2.tar.xz" +sha512sums="260b5fa3af4720e8dd0d073fe27246f55127759aed264567631d722afc28ad6e256904e782ff4c64e6f79da3f28c896bda1a5ab1ba37e5ee02e620b5e88f905d kmousetool-17.12.2.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 3e3a98c4f..adafa9fee 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97df8d28387302ed91dc6fece315fbabc3b591a9ad8d2a19e15d7a704675946788ece2b374a7f2a814bd9c138cc0c6c6554808ba4a9cbc645909197386993d72 knetwalk-17.08.2.tar.xz" +sha512sums="13f41a215694c3581ccd6ce4a508701dc043824523ee5d17c3011448d2f43209133bc0cb64453b3d9d2b08aaad0b0914a1a41e82f555c9f5f3317606ebb17dfd knetwalk-17.12.2.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index c8d0c26ec..0f1499d75 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -37,7 +37,8 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # kmoretoolstest requires X11. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'kmoretoolstest' } package() { @@ -45,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="52001c0283c445eb0d2ea0d9f4a8f5d4dbdba518ae99d6e97fd12fcc522e422adc9d897b564a8adf45259ded9c674ab021d574ce084d9ed7f5242478ffa32ed8 knewstuff-5.41.0.tar.xz" +sha512sums="27846ef7ff3b1357926ea04df88ecbf9f0810f38077f3ee06dcbb016d4dc76764660fde3f9d40bce1aec381a95700fb5e18844c9895ffefd2237978f282358af knewstuff-5.43.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 9fa972b9c..ea3e7ba47 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=1 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="403adbafd6408bfe8c38afd312ec3b2b4f73d6601a6ea076d309ea7e7e599365cd89dbd5aad2358fb931c1414c22069228dd7991f65dc0adbeda54701f70354d knotifications-5.41.0.tar.xz" +sha512sums="a90296cdcf557bba36185edda0da037e6a8bc069e5d2d7e3c4f7a692d0fcc8345fd28abed374ba25dd97c5e3f6834cd661d102629a1811b9e76285afac105c36 knotifications-5.43.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index e7e412947..541915f0b 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5a14f6bd65272c0742df82526d526a352be02c71608b8812fc584a9c1378f40d5abc681a3ecc881c03ef873d00b355fa4ae5dbd7a0cd2204fcc718fd2c79d94 knotifyconfig-5.41.0.tar.xz" +sha512sums="2939609042d835eb5ea9c8abfbccd732854313e2882b4e0b966b633f43185ac8b4a0c9ab28a2bd4356b3f3a27fe12b1aee3b9a730280acdc952d0bc58bafa243 knotifyconfig-5.43.0.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 629aa18a4..31112dcf7 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4f86d54a13d7e6751629a288447a370c67c4dd5f0af76d976301f40892eff72ae38e7e66834a13c7194d0aff9a84cd9b37e610a333557ca5bd9ec0b33158b62 kollision-17.08.2.tar.xz" +sha512sums="dd2b009858063a10e917ab0a71fc5ef799b91c3565807d525bc5357df18c8e1b89ec63e5975d8c41822451189ea651d0920cecc753577da3453a0e1e9ce8970c kollision-17.12.2.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD new file mode 100644 index 000000000..654a0aa99 --- /dev/null +++ b/user/kolourpaint/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kolourpaint +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Simple painting program for KDE" +url="http://www.kolourpaint.org/" +arch="all" +# yes, there is 2 only *and* 2+ code here. +license="BSD-2-Clause AND LGPL-2.0-only AND LGPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev + libksane-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/kolourpaint-$pkgver.tar.xz" +builddir="$srcdir/kolourpaint-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="47965664a9749fad289f24975eddac726b266351820c2f94a82f714825d53c9bd6c37ff6f2cc30d47f8be759554c8f9682504e9b2acb4e95751b474f443fd527 kolourpaint-17.12.2.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index cd6689534..2eadb80be 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f74cf16d5fd2fbe6b67facb921c6b68d93cb3ff7b6bb00a7a476b6dc181234dbad7094b61bbb1527d258adc565f96ad672acf95dbac5925693fe36e1fcf47d3 konquest-17.08.2.tar.xz" +sha512sums="d57db91847a636c22db9969631ac8ebb06fe1b262cbff1cb25bcf79face3791e3a7ca554c1d6a12af70f7cc1deb5a17c8ed29bfb190da5df17d51da863a4b3d6 konquest-17.12.2.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 9dcb8a4f0..672935863 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39e87e3aa31775b2999d05d719ffb506ff69adc958cb14a29fbe7edf056af179568b73ddb81fbc9bc75eabad50bb5c2fe2b7c025f3bf69f34b83607b7b5c6fe5 konsole-17.08.2.tar.xz" +sha512sums="daffd82608fcbe4ded65cae336d2d6ab6f6a70a665e2b1841cca39b2933e8c615c072bcfe02958be8e8193c05a0c1ad317e6cda554dcb8e3b434a2f4d8d80036 konsole-17.12.2.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index 2de0662f6..39891f0c5 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="953ed21f0ee5003a826ad2aba39c6155fe33cd7a965f0ac1dab77332cd6cf44ce72613325a8ee7fe407e67fc4d01504d4c67f3e12e818ea5f6adf3e15c970de4 kpackage-5.41.0.tar.xz" +sha512sums="bb40407ac358fe2cfb555bd50a653503763412b9ab131cc42873f0ed0fb93ac122f551269848e8926c37722091ab3c5be1bc868eaded92a708e42c34960a375d kpackage-5.43.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 15e0f2519..4ca0ea0f2 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="082971b4d7f017c03440c40ea4579ef3a8c75eac98b95a326255075a71bd98ae12c407c67049bcd46c4f65ba91d754c4f07c4253c7d6bc9269a4b0a80cb915da kparts-5.41.0.tar.xz" +sha512sums="1ce3acf007f402e675e1c943ee43beaaf9cc54017c9b67cf72eed3c4194ef7499e2e8f5fd93fb8569e33b07ed05d41385f50b9f7c5406ce412ffec977e461d3d kparts-5.43.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index dadd829d3..e1013e864 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev kdbusaddons-dev kdoctools-dev kguiaddons-dev kio-dev knewstuff-dev - kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" + kwidgetsaddons-dev kxmlgui-dev libkdegames-dev shared-mime-info" install="" subpackages="$pkgname-doc $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/kpat-$pkgver.tar.xz" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="45ac2ac232956238e5ccb84fb44df3ea0face807b77eb00b6eb6b1cc8687578a2ffdbbbba48648216c499709c744e97a2a94d93376653a1979156aa6a511f0f8 kpat-17.08.2.tar.xz" +sha512sums="605dca9da10b4a419e028f9f7339d685e2fa6399d388502970b23fa51f5385607554c27de3898c20e3e7a098068a1770202097c2b02122b187c76800188db3a6 kpat-17.12.2.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index aa0db7ac1..201337dae 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -47,5 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="11ca56d2ff9e97b7119dc97f75ec32260fdcc32720b54f42e8d3a17d4c17ce6b969bb65b280a5f8773f45ec90c2a75b8f9805f327c64f7fc377e443ad913f897 kpeople-5.41.0.tar.xz +sha512sums="4eceebcf4a155713ee8b40027552c45d7cbcb8ce155394cb5aa57df28f7064486219f766cedc33a0de1e0969920d76b3252100688f546d71dba94064c1e2ff87 kpeople-5.43.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch b/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch new file mode 100644 index 000000000..99e82b80f --- /dev/null +++ b/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch @@ -0,0 +1,116 @@ +From 6aca702d252e108801b99113149fec1e89434167 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Wed, 14 Mar 2018 23:25:31 -0500 +Subject: [PATCH] Process: Don't use stdio identifiers for methods + +`stdout` and `stderr` are already used by POSIX <stdio.h>. This has +already caused problems in the past as the (now removed) comment in +Process.cpp noted with compilation on Mac OS X. + +This also causes a problem compiling on the musl libc, which +specifically uses the preprocessor to avoid redefinition and changing of +stdin, stdout, and stderr. + +This patch changes the names to be stdErr and stdOut, which are +camel-cased like Qt methods typically are, and do not conflict with +identifiers defined in <stdio.h>. +--- + ImageManager/VideoLengthExtractor.cpp | 12 ++++++------ + Utilities/Process.cpp | 12 ++---------- + Utilities/Process.h | 4 ++-- + 3 files changed, 10 insertions(+), 18 deletions(-) + +diff --git a/ImageManager/VideoLengthExtractor.cpp b/ImageManager/VideoLengthExtractor.cpp +index e751655a..9b3e756c 100644 +--- a/ImageManager/VideoLengthExtractor.cpp ++++ b/ImageManager/VideoLengthExtractor.cpp +@@ -72,18 +72,18 @@ void ImageManager::VideoLengthExtractor::extract(const DB::FileName &fileName) + + void ImageManager::VideoLengthExtractor::processEnded() + { +- if ( !m_process->stderr().isEmpty() ) +- qCDebug(ImageManagerLog) << m_process->stderr(); ++ if ( !m_process->stdErr().isEmpty() ) ++ qCDebug(ImageManagerLog) << m_process->stdErr(); + + QString lenStr; + if (MainWindow::FeatureDialog::ffmpegBinary().isEmpty()) + { +- QStringList list = m_process->stdout().split(QChar::fromLatin1('\n')); ++ QStringList list = m_process->stdOut().split(QChar::fromLatin1('\n')); + list = list.filter(STR("ID_LENGTH=")); + if ( list.count() == 0 ) { + qCWarning(ImageManagerLog) << "Unable to find ID_LENGTH in output from MPlayer for file " << m_fileName.absolute() << "\n" + << "Output was:\n" +- << m_process->stdout(); ++ << m_process->stdOut(); + emit unableToDetermineLength(); + return; + } +@@ -99,12 +99,12 @@ void ImageManager::VideoLengthExtractor::processEnded() + + lenStr = regexp.cap(1); + } else { +- QStringList list = m_process->stdout().split(QChar::fromLatin1('\n')); ++ QStringList list = m_process->stdOut().split(QChar::fromLatin1('\n')); + // ffprobe -v 0 just prints one line, except if panicking + if ( list.count() < 1 ) { + qCWarning(ImageManagerLog) << "Unable to parse video length from ffprobe output!" + << "Output was:\n" +- << m_process->stdout(); ++ << m_process->stdOut(); + emit unableToDetermineLength(); + return; + } +diff --git a/Utilities/Process.cpp b/Utilities/Process.cpp +index d31699cc..49be0004 100644 +--- a/Utilities/Process.cpp ++++ b/Utilities/Process.cpp +@@ -17,14 +17,6 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +-// OS/X defines stdout and stderr as macros, which interfere with our code here: +-#if defined(stdout) +-#undef stdout +-#endif +-#if defined(stderr) +-#undef stderr +-#endif +- + #include <QTextStream> + + #include "Process.h" +@@ -41,12 +33,12 @@ Utilities::Process::Process(QObject *parent) : + connect( this, SIGNAL(readyReadStandardOutput()), this, SLOT(readStandardOutput())); + } + +-QString Utilities::Process::stdout() const ++QString Utilities::Process::stdOut() const + { + return m_stdout; + } + +-QString Utilities::Process::stderr() const ++QString Utilities::Process::stdErr() const + { + return m_stderr; + } +diff --git a/Utilities/Process.h b/Utilities/Process.h +index b936e684..6280166d 100644 +--- a/Utilities/Process.h ++++ b/Utilities/Process.h +@@ -30,8 +30,8 @@ class Process : public QProcess + Q_OBJECT + public: + explicit Process(QObject *parent = nullptr); +- QString stdout() const; +- QString stderr() const; ++ QString stdOut() const; ++ QString stdErr() const; + + private slots: + void readStandardError(); +-- +2.15.0 + diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD new file mode 100644 index 000000000..685329cd3 --- /dev/null +++ b/user/kphotoalbum/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kphotoalbum +pkgver=5.3 +pkgrel=0 +pkgdesc="Versatile photo album software by KDE" +url="https://www.kphotoalbum.org/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev karchive-dev + kcompletion-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev + kiconthemes-dev kjobwidgets-dev kio-dev ktextwidgets-dev kxmlgui-dev + kwidgetsaddons-dev libjpeg-turbo-dev exiv2-dev libkipi-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz + 0001-Process-Don-t-use-stdio-identifiers-for-methods.patch" +builddir="$srcdir/kphotoalbum-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f kphotoalbum-5.3.tar.xz +94251fb366bd0250bba3d192a442fc2712941fa2612123849c7abea4c5138d28d12b155c673bbf2713dd43f3abcdc663044783f89206c3c19fad33871879c1c0 0001-Process-Don-t-use-stdio-identifiers-for-methods.patch" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 20474d4c5..1fe51a2d9 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f9dc85759395f270ed509b066fb9f8e5fbdd36e202f7788d3021c916782db7f88dc467b78ff962400fc3bd595974211988f0499dbeb5f032eede4052f2164f8e kpimtextedit-17.08.2.tar.xz" +sha512sums="10c9a7766cf8ed83947f506d7664799601160a2041b8718aa5e124d0c4b400bb1c5da27c2e4ed1f8723697926ff7aa626f14e8bb4bbc47200733e7cf6040dfb4 kpimtextedit-17.12.2.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 8a3a22966..41d8472ae 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3f40de3df24e7d120889524ad9e30d745d34397bac3ffa8fbb132dfe1a8e7bc3b88dc10e9a3e91dd3b852f8bb5c55f4bdea4d8003b9ab41fbb59890dfdb0077 kplotting-5.41.0.tar.xz" +sha512sums="98b06b2f5242e03b4e67bcbb28d3abb695e4fc21ac37de47384fb872045fd64016ebfc276b0bd48e797e5369a747c2da81fd03519e1b6747e48205c53e69c7cb kplotting-5.43.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index 172c14b70..30a1e5e6e 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7a75989459870cde93205731984696fc17964ac8d38d49f8504d7b1f78c645e0918c56133e30de04a72aac2a11d0bafa6c76e94e4dbe59771a09d99662629e6a kpty-5.41.0.tar.xz" +sha512sums="8a09b2c5b864e5c70d181eee387ce1890cdd3b2efd1641a982061a102a677699b4a4376ee9a02e16cd3ddd29185e446b257c54131d8259aa9e2303856907a016 kpty-5.43.0.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index f0f14d26a..66247200b 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7699b9d8131f25e4db6a377af31e5153910c645817601e27a373c96cad86cffd898f70729ab79f723ce4046a1748b7f1f81bb467b10c1ef93a99c60ea607889d kreversi-17.08.2.tar.xz" +sha512sums="e16bf1222acd61f00be68a9e6639243dbd2cea7264a909f79a5a1493790c8bdd9f6ab2fb7ce98339f55f25cdc8f60421671f360a9d867114c4878e0c02b0c506 kreversi-17.12.2.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 15e748b89..7080fbb91 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4aa3f02403c399fd0cca9112c63e90a3c057ed48a8265af91e38f88f8cb8e58a7d78869e8a25c73d500c9700ba51db3ba07edc6054045fa04764c4de3b9db9b0 krfb-17.08.2.tar.xz" +sha512sums="49d5afb3203777908310fb2ea490125827be7f921789c20ebb9cdc492daae34f793b3c0217e8b109aa542ae7c76e0da237d6cdaea1ca928f575d4a5802353f8e krfb-17.12.2.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD new file mode 100644 index 000000000..b25d10d38 --- /dev/null +++ b/user/krita/APKBUILD @@ -0,0 +1,57 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=krita +pkgver=3.3.3 +pkgrel=0 +pkgdesc="Digital painting program by KDE" +url="https://krita.org/" +arch="all" +options="!check" # Tests require X11. +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev + kwidgetsaddons-dev kcompletion-dev kcoreaddons-dev kguiaddons-dev + ki18n-dev kitemmodels-dev kitemviews-dev kwindowsystem-dev kio-dev + qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev + libxcb-dev zlib-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev + fftw-dev eigen-dev exiv2-dev lcms2-dev openexr-dev poppler-qt5-dev + gsl-dev libxi-dev" +install="" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" +builddir="$srcdir/krita-$pkgver/build" + +prepare() { + mkdir "$builddir" + # we CANNOT patch or call default_prepare because of builddir +} + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0 krita-3.3.3.tar.gz" diff --git a/user/kronometer/APKBUILD b/user/kronometer/APKBUILD index 35a333b5a..d9d3b790f 100644 --- a/user/kronometer/APKBUILD +++ b/user/kronometer/APKBUILD @@ -6,6 +6,7 @@ pkgrel=0 pkgdesc="Easy-to-use stopwatch application" url="https://userbase.kde.org/Kronometer" arch="all" +options="!check" # All tests require X11 license="GPL-2.0" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD new file mode 100644 index 000000000..91599aa3d --- /dev/null +++ b/user/kruler/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kruler +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Screen ruler" +url="https://www.kde.org/applications/graphics/kruler/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev + knotifications-dev kwindowsystem-dev kxmlgui-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/kruler-$pkgver.tar.xz" +builddir="$srcdir/kruler-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7d57153d64af46e7a957d3c35089eea8382af4da5ea3e1365a86003f3199732c9ac5d38a3f400817f1b51e8db21b7ceed498ead9a567fec30f9d8a038e5e62ee kruler-17.12.2.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 0670db4c0..a9158dd6f 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="53a24d6e16d70d3682a0311adfce610b78656bc44785f41f621acded778b6885f269e376364ee8ffa1f4d26b2c7d937a41f38367350013871771ede9ab483249 krunner-5.41.0.tar.xz" +sha512sums="c6ec92e0dbb8eb2d583af1d763cea6df1231851367148a94d8eae6aa88c130798cb8f3f2fb65946c55a51253c91e25fee539d7720a1f7125f78d2d5aabf4b05c krunner-5.43.0.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index da64afab3..98ac6e058 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kscreenlocker -pkgver=5.8.7 -pkgrel=3 +pkgver=5.12.2 +pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev install="" subpackages="$pkgname-dev $pkgname-lang" source="http://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz - kscreenlocker-5.8.5-stop-using-getpass.patch kde.pam kde-np.pam" builddir="$srcdir/kscreenlocker-$pkgver" @@ -51,7 +50,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="cee66e85efaafd5629c9e2b1eea1522cff960d7b9922be7b6d5f767c231fcb762cf80585d5528fdb5fc3684881bf2fa4a59da3136a1d23341ceb218da3f69e11 kscreenlocker-5.8.7.tar.xz -44bbf365555668f7ef2f354a06d08b4b83c556f6e78ead028acd727363c287cfecc2e3eb4d0bb137feb2939da0fa21db694af6b10f8a3878d7071ad4e3b8d4e8 kscreenlocker-5.8.5-stop-using-getpass.patch +sha512sums="cb293d69bc56fc3b2cde20b4088277a8d578896429dae2f66a8496ebb8750c23a32d56dcecad047d5a9a9180fa1c3a1a42ad12943fc937a009dcd8be4e7e08c3 kscreenlocker-5.12.2.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch b/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch deleted file mode 100644 index f10789f88..000000000 --- a/user/kscreenlocker/kscreenlocker-5.8.5-stop-using-getpass.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- kscreenlocker-5.8.5/kcheckpass/kcheckpass.c.old 2016-12-27 11:25:36.000000000 +0000 -+++ kscreenlocker-5.8.5/kcheckpass/kcheckpass.c 2017-01-31 04:32:44.858227055 +0000 -@@ -56,6 +56,7 @@ - #include <stdlib.h> - #include <errno.h> - #include <time.h> -+#include <termios.h> - - #include <config-kscreenlocker.h> - #if HAVE_SYS_PRCTL_H -@@ -75,9 +76,41 @@ - static int havetty, sfd = -1, nullpass; - - static char * -+better_getpass (void) -+{ -+ char *password = NULL, *nl; -+ size_t buf_len = 0; -+ ssize_t pass_len; -+ struct termios ti; -+ -+ tcgetattr(STDIN_FILENO, &ti); -+ ti.c_lflag &= ~ECHO; -+ tcsetattr(STDIN_FILENO, TCSANOW, &ti); -+ -+ pass_len = getdelim(&password, &buf_len, '\n', stdin); -+ -+ if (pass_len < 0) { -+ free(password); -+ return NULL; -+ } -+ -+ ti.c_lflag |= ECHO; -+ tcsetattr(STDIN_FILENO, TCSANOW, &ti); -+ -+ /* Do not include the \n at the end */ -+ nl = strchr(password, '\n'); -+ if (nl) { -+ *nl = '\0'; -+ } -+ -+ return password; -+} -+ -+ -+static char * - conv_legacy (ConvRequest what, const char *prompt) - { -- char *p, *p2; -+ char *p2; - int len; - char buf[1024]; - -@@ -99,13 +132,10 @@ - return strdup(buf); - case ConvGetHidden: - if (havetty) { --#ifdef HAVE_GETPASSPHRASE -- p = getpassphrase(prompt ? prompt : "Password: "); --#else -- p = getpass(prompt ? prompt : "Password: "); --#endif -- p2 = strdup(p); -- memset(p, 0, strlen(p)); -+ fputs(prompt ? prompt : "Password: ", stdout); -+ fflush(stdout); -+ p2 = better_getpass(); -+ printf("\n"); - return p2; - } else { - if (prompt) diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index 69b827ef8..84b9b21f7 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4dee46935a3fd136b84edcdd4590531370e5d9c1b6fee31992811ba5f6c601a2da4d8d3bded9ca080c6263e00be80288ec22e814003f436a2439f8238598bb60 kservice-5.41.0.tar.xz" +sha512sums="bb912b7bfdd1473bd1b324dfd4ce93c7b9de69f2036aa7fc849735a797e76617b2d736a8e464d38e4b09fd3f9191336e323325c365c99e987be3df60268651c0 kservice-5.43.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index aeabed87c..b1c437df4 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="20e55211ae7c9be4d1240863e73a61e31d71e6b1f48cfe4fa4475465a517b3a94404990c1298526257b96c383e8574fb2bbc5898e0e099d81ef20ddbabacfb2d kshisen-17.08.2.tar.xz" +sha512sums="9228fedd9de5eafbb1eefdf76b12554a2b1cc190d3bab497357d70fde95b822d4f9034f08361fbaefff419316b185840ffa601fe9931bb0df6c88307b2991a1f kshisen-17.12.2.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index c948298b8..fb197948b 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfae99fe1f89f8e106eed407d7e2087d492c9c3a4ee289306bbc6b8e6216085183d046be2532019c0635a08de70d7b38d5f81f7e57e5d887785a65c2518aabd5 ksnakeduel-17.08.2.tar.xz" +sha512sums="a7aad7d1703cfb095738302490ef2f638520ba0a167ba5c67c77fa05388052b78938b6f1885350a72bdced1352f369eda4ff4635b7615e0e0db7298a24678fc9 ksnakeduel-17.12.2.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 287a104b4..e0f213c23 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d56d0885845cf76be53d40aa0e93830775bf869741b07803edbf6157beb77ca72453f4bf515475b7bc69f289921f1050dbd0e333c804ca312b62d53fa75f2a5a ksquares-17.08.2.tar.xz" +sha512sums="106e8f8b1e05ae2ab3b12d47a671a1d771bf9ba33a3f6dfc88555f37f3d6cec0aa3a5ae14306354821aaa1972d704d82cace20a867bc4b74987b96879d8dc018 ksquares-17.12.2.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 751079d6b..6da1abe8c 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8ebf078fafc238481d5850248d2af87640d33fadf628f9c17b7ba6ed9f59e4a5c4122361acfefc39eeebf9144255deb78ffbb825409bb86071f676e78a465722 ksudoku-17.08.2.tar.xz" +sha512sums="4026c85786abddd92d24fa8716a27974a7fafa7eedeab266ebc8f5c938f2425e5d15e940329e2163f839cf02f5e68ffea94cdefd9d2ced43c708d04f9c9aa939 ksudoku-17.12.2.tar.xz" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 70fa61852..a5f522cee 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksysguard -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -14,9 +14,7 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev cmake extra-cmake-modules kdoctools-dev" install="" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/Attic/plasma/$pkgver/ksysguard-$pkgver.tar.xz - ksysguard-5.5.5-netstat-use-a-real-type.patch - ksysguard-5.6.5-processlist-gnu_source.patch +source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz ksysguard-5.6.5-rindex-header.patch " builddir="$srcdir/ksysguard-$pkgver" @@ -47,7 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="320e02cf94768f9d63e12dfb46ab0728bf64e60636242b9a6f57517b3ca329bfa2d99f4999e2b071a6cd2849d14e807d9a2070cd9d0f51dbdf32fccfec423bb5 ksysguard-5.8.7.tar.xz -078c9d3e13ee0960a8cc68e3ee6ef4f9fc78640fae71d66dd5579f9d031895aec7cf1c2dbc4b03f84edfb9456163dcf6124c6da936f90eef3e664c4267660ab9 ksysguard-5.5.5-netstat-use-a-real-type.patch -818d2d603d7113b163cabbf27f0082bd8b482a8e66a1b8f569f353c84f3d031c742708b2f376f962f1ed360594fb6c6506195d9071d070b5c0ac4816d5e0cad4 ksysguard-5.6.5-processlist-gnu_source.patch +sha512sums="19c4f18845b6e8103630469986f2316e50883ef68014a3221a6772d15a359c64b93dcd4874d4d927fcf8acdf884bc801f2a01f27cb95a176cec1605b50b5b670 ksysguard-5.12.2.tar.xz 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch" diff --git a/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch b/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch deleted file mode 100644 index d3543f3ce..000000000 --- a/user/ksysguard/ksysguard-5.5.5-netstat-use-a-real-type.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ksysguard-5.5.5/ksysguardd/Linux/netstat.old 2016-03-01 14:35:05.000000000 +0100 -+++ ksysguard-5.5.5/ksysguardd/Linux/netstat.c 2016-07-22 03:46:19.016064987 +0100 -@@ -264,10 +264,10 @@ - { - FILE *netstat; - char buffer[1024]; -- uint local_addr, local_port; -- uint remote_addr, remote_port; -+ unsigned int local_addr, local_port; -+ unsigned int remote_addr, remote_port; - int uid; -- uint state; -+ unsigned int state; - SocketInfo *socket_info; - - if (strstr(cmd, "tcp")) { diff --git a/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch b/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch deleted file mode 100644 index e68fc7b2b..000000000 --- a/user/ksysguard/ksysguard-5.6.5-processlist-gnu_source.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ksysguard-5.6.5/ksysguardd/Linux/ProcessList.c.old 2016-06-14 11:09:02.000000000 +0100 -+++ ksysguard-5.6.5/ksysguardd/Linux/ProcessList.c 2016-08-07 03:14:25.158991313 +0100 -@@ -28,7 +28,9 @@ - #include <sys/time.h> - #include <sys/resource.h> - #include <time.h> -+#define _GNU_SOURCE - #include <unistd.h> -+#undef _GNU_SOURCE - #include <sys/ptrace.h> - #include <asm/unistd.h> - diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 95dd393cd..3c62489ad 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" arch="all" +options="!check" # Tests require X11 license="GPL-2.0" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kconfig-dev @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="778f051f15464b4c52206e62914883f4ccc73d2daf3dc1b47f29c773618e23b4e52c2bd99a768250e20c4df278dcfa3c7ef29b1dae9aedd584ade2295d9c3c94 ksystemlog-17.08.2.tar.xz" +sha512sums="d4f6bfe35cde11e2675e32c2b31468c3c848ae065eccaf2b4ded9adb7b03d558d2a555aeb77643a84028865b09027820d0eb7689eede8cc5dfb855c51855ef20 ksystemlog-17.12.2.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index fed7acaa2..835abd38a 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="111efea4a8b9f00887aca1fb91c120388bceb786d734be3295f18ba49aaa5d96d2a77579f19db12594f9d5d37c30fa0d86e82834e4c74cdef693e3d61ab886e0 kteatime-17.08.2.tar.xz" +sha512sums="01de99319c555eba5c394c40532889183de37f962665a8e73ebe36d078185d757ced020e289c769b6062934d1e5a339def690711acf7d476e1f8f981d7048a5d kteatime-17.12.2.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index 837d2795d..402ff51ce 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=1 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8cc6ce4a85669d9fe1062e85a1d170498db6de0cd7256143caf60cb454c31dac7920cea6d12ff6dfb109c579a86c3fb4d33add1b104724cba00a4bc00a1fa7b ktexteditor-5.41.0.tar.xz" +sha512sums="fc2b3b69224e62d1bf240410fa5c3dab04e020f210230474e5e924c7125f626cd2dd30dee449948cb9197adc8f0d6e1886ed85e03312a51d116d86fc13fbf08d ktexteditor-5.43.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index b6baa1d9e..f98817a73 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" arch="all" +options="!check" # All tests require X11. license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev kcompletion-dev kconfigwidgets-dev kiconthemes-dev @@ -44,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0ec6618418bbc1128cb3e12cdbfe85917dafcb265463a69355576f873775b69e6552d1d7db31d5ed3436c8dc72fde1896710b3f47b8ea0ce0612ec15dca4079 ktextwidgets-5.41.0.tar.xz" +sha512sums="650272ba85a1d0177296fd278fa4183ecc6c513b00838745b5e1fefe015b621f1edfad25094ede3de8cf81dec4f66653b3c25ed2bb5a55e4a2ee54b2ef35da6a ktextwidgets-5.43.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 7dc19adee..833cca384 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="931d317be5fd3cbb0d72da2ab63a749abd605d24015c35e50c0783017add3f3b1bc3b1ea5181eb15abd1847d1cf8620e0e8a044a9cd0914bbbcfc6c6adbc34d9 ktimer-17.08.2.tar.xz" +sha512sums="cc0d70be3f68b17705a1aead5a32510ea360283a5f0fc63a39341ed69dc233e4eff59f0a75688d9c845fb1feefa13278dbfe79e7aa96a214f2f15f642f15c27d ktimer-17.12.2.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index ee6131ab1..834b37bc8 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev kdbusaddons-dev kdelibs4support-dev kwidgetsaddons-dev kxmlgui-dev - libkdegames-dev" + libkdegames-dev qt5-qtmultimedia-dev" install="" subpackages="$pkgname-doc $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="18d5073217893610daaf0308407e9d5cd109c4487cfa4c170d83c12ba35feea44b3d7fcd1327da81fbd8ac0e9b8a1c560b7303401a8ce9252118c06327231f08 ktuberling-17.08.2.tar.xz" +sha512sums="f36e0b4ccc1fd849ef38d1b0a9f935c041a426356afc84c3799210f0b0359c25a4ba8c03eec7af5d3e3326aba5be4eebea4718a97bae312d48e2b6c00a0db195 ktuberling-17.12.2.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 6f2afdf4c..7beaf5d85 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3deda90e9298a7b78ff4b14ea923ce04b281ff5390f22a4c68a990398c5e0f8824144eb2dc2f431eadaf88becf3a53e33f90958aeaf150bc8d4125daf28b55ac kubrick-17.08.2.tar.xz" +sha512sums="4b7d74db13102479c43441540291d63523265daec4cfd763781e09ebc96bbeca5f263be8593bfdbf3477d4396f5d4f0edc11b09ab451630d6999f5b28c753792 kubrick-17.12.2.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 9b71bdcfe..399a1a18a 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b21a5ee06a5b9d00a0ef11b3af36a7ab4a8df5adc183cbd5d1e811ad36e9bd5e3f4dd21af3e7d9c281811f617e3e8a863d9bfa1c3e94cb1e23f6ce2ad917f937 kunitconversion-5.41.0.tar.xz" +sha512sums="bcde5bd5208fc5762c90e6b3c152bf4abb264d776dc3256ec246b1d0b9079d10ffcb1679a87ed4c0e39a1caaf092e5b4c3a1a8790adc1faeee148c8707e4aafc kunitconversion-5.43.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 9ff904ab5..e5c057caf 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=1 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74 kwallet-5.41.0.tar.xz +sha512sums="38d129c45b1c2282c1e09a01fc9316b30b0d3f3c53f1b56dba295f732a2aaf5dab7759ca40b46ec80985d773a59a4ecddfc6edbe7fca7beb59c3392dab44e13b kwallet-5.43.0.tar.xz edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index a6c568e66..8cb1eb502 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8db16932932bc0abbdc2bdb17e48c2e6f7407e2f1236c92ae1e700db9e108a51debc3c40ccdc86ba94c523226dc71682c36aa242ddbc9c4c6326c61fec2f5b0 kwalletmanager-17.08.2.tar.xz" +sha512sums="406becb541024715d781df3c1b6cc4d022ed2714683c1ba5f5f6374410332f5f2e04218ca3d13b2adf747b89ed524cdd8ec1697117a4a6943f1649a295611595 kwalletmanager-17.12.2.tar.xz" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index c12cab21e..12dbf0101 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b31a769c1b265ae786eec42ab0a9e1aa29820b2dffed08fb9d5b1fbe224c4a4f2deab461823da88f44ffb0a4f35fbb0b77af2d235d45d3c90f9707f728ff1d37 kwayland-5.41.0.tar.xz" +sha512sums="02204faa2f125f9f902315cf2e7377a9ffdb73b1b66624510d1b77f32b9907c71d7e8ca7f79c8c10a2b9ab8e8eae13f8166ae3e33a34b2789c8f2e79aeb0f5a2 kwayland-5.43.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index c2ff5d4f7..73ee388cf 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a78b95d4fc2574f051c314b3313e36090c233cf997be4d7ce7c528006d0196091cc1c6384c0fa2cef83f07df62a7a0101369d702fda0eb7f6fb1773e6747477 kwidgetsaddons-5.41.0.tar.xz" +sha512sums="ae7664ab700cdb9aa35334005ae58d49db659cea4112fa81a09a37538809910841494bf97f3f982f99e27a376031645c5d0349e4cc77ab2c0fa6ea9484a08140 kwidgetsaddons-5.43.0.tar.xz" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index d684e442f..41ec2ecce 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwin -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -18,13 +18,12 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtscript-dev kcrash-dev kdecoration-dev kscreenlocker-dev wayland-dev mesa-dev libepoxy-dev eudev-dev libdrm-dev libx11-dev libxcb-dev xcb-util-cursor-dev xcb-util-image-dev xcb-util-wm-dev libxkbcommon-dev libinput-dev - freetype-dev fontconfig-dev qt5-qtmultimedia-dev breeze-dev" + freetype-dev fontconfig-dev qt5-qtmultimedia-dev breeze-dev + qt5-qtsensors-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz - kwin-5.8-stop-depending-on-qt5-internals.patch - kwin-5.8-respect-uint.patch" +source="http://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz" builddir="$srcdir/kwin-$pkgver" build() { @@ -53,6 +52,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f1f3b01f85378e663385887add8dd5b2f40076cfc57f7cf638e83e2424fedb576b4b431b14151422ea43c535677131e61b8d9e7fe60e5a5f4ea06520c895bd1e kwin-5.8.7.tar.xz -7186dd317204612ba26f11315238f527949424d08f32dc0dab8c1391d642529433cfd7091dc2a057fe849976dee70eed7aab3c8be55b20b8c0655da57976b48e kwin-5.8-stop-depending-on-qt5-internals.patch -aaefa9951ec1475adf00784b202d0ca9f92a60634a869387432411e8b7928d9f10b46968998a4ada47228834e8c7f6c9bf1c8dd988673b22619e8e1295e086c7 kwin-5.8-respect-uint.patch" +sha512sums="8df904f86c50cc9a578122b88a5c768652c09564f6ae048ae6989a55c0e3e886da2f3080b9601885c27ffa3313a7fcc3389c63e61a7125ceb650a8aaa2af12c4 kwin-5.12.2.tar.xz" diff --git a/user/kwin/kwin-5.8-respect-uint.patch b/user/kwin/kwin-5.8-respect-uint.patch deleted file mode 100644 index 839d84d2e..000000000 --- a/user/kwin/kwin-5.8-respect-uint.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 404f2675f8ca5496a5e528825078b1ce27669cd7 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Mon, 20 Mar 2017 17:01:39 +0100 -Subject: fix compilation on old gcc - -same as https://phabricator.kde.org/D5083, -gcc 4.8.5 (opensuse leap) fails building modeltest with -CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()': -modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)' ---- - kcmkwin/kwincompositing/test/modeltest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcmkwin/kwincompositing/test/modeltest.cpp b/kcmkwin/kwincompositing/test/modeltest.cpp -index d356b26..c077d9b 100644 ---- a/kcmkwin/kwincompositing/test/modeltest.cpp -+++ b/kcmkwin/kwincompositing/test/modeltest.cpp -@@ -453,7 +453,7 @@ void ModelTest::data() - // Check that the alignment is one we know about - QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); - if ( textAlignmentVariant.isValid() ) { -- int alignment = textAlignmentVariant.toInt(); -+ unsigned int alignment = textAlignmentVariant.toUInt(); - QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); - } - --- -cgit v0.11.2 - diff --git a/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch b/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch deleted file mode 100644 index 7b77e9c57..000000000 --- a/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch +++ /dev/null @@ -1,479 +0,0 @@ -From 052fa2e4ee329810f62c29e546254fb45bf8a375 Mon Sep 17 00:00:00 2001 -From: Takahiro Hashimoto <kenya888@gmail.com> -Date: Thu, 27 Oct 2016 09:43:21 +0900 -Subject: [PATCH] [plugins/qpa] support use of modularized qtplatformsupport - from Qt 5.8 - -REVIEW: 129268 ---- - CMakeLists.txt | 9 +- - cmake/modules/FindQt5EventDispatcherSupport.cmake | 122 ++++++++++++++++++++++ - cmake/modules/FindQt5FontDatabaseSupport.cmake | 122 ++++++++++++++++++++++ - cmake/modules/FindQt5ThemeSupport.cmake | 122 ++++++++++++++++++++++ - plugins/qpa/CMakeLists.txt | 15 ++- - plugins/qpa/integration.cpp | 7 ++ - 6 files changed, 394 insertions(+), 3 deletions(-) - create mode 100644 cmake/modules/FindQt5EventDispatcherSupport.cmake - create mode 100644 cmake/modules/FindQt5FontDatabaseSupport.cmake - create mode 100644 cmake/modules/FindQt5ThemeSupport.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d2883fea..bf90ab0f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -241,7 +241,14 @@ set_package_properties(X11_XCB PROPERTIES - TYPE OPTIONAL) - - # dependencies for QPA plugin --find_package(Qt5PlatformSupport REQUIRED) -+if(Qt5Core_VERSION VERSION_LESS "5.8.0") -+ find_package(Qt5PlatformSupport REQUIRED) -+else() -+ find_package(Qt5FontDatabaseSupport REQUIRED) -+ find_package(Qt5ThemeSupport REQUIRED) -+ find_package(Qt5EventDispatcherSupport REQUIRED) -+endif() -+ - find_package(Freetype REQUIRED) - set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine" - URL "http://www.freetype.org" -diff --git a/cmake/modules/FindQt5EventDispatcherSupport.cmake b/cmake/modules/FindQt5EventDispatcherSupport.cmake -new file mode 100644 -index 000000000..948efe0d3 ---- /dev/null -+++ b/cmake/modules/FindQt5EventDispatcherSupport.cmake -@@ -0,0 +1,122 @@ -+#.rst: -+# FindQt5EventDispatcherSupport -+# ------- -+# -+# Try to find Qt5EventDispatcherSupport on a Unix system. -+# -+# This will define the following variables: -+# -+# ``Qt5EventDispatcherSupport_FOUND`` -+# True if (the requested version of) Qt5EventDispatcherSupport is available -+# ``Qt5EventDispatcherSupport_VERSION`` -+# The version of Qt5EventDispatcherSupport -+# ``Qt5EventDispatcherSupport_LIBRARIES`` -+# This can be passed to target_link_libraries() instead of the ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport`` -+# target -+# ``Qt5EventDispatcherSupport_INCLUDE_DIRS`` -+# This should be passed to target_include_directories() if the target is not -+# used for linking -+# ``Qt5EventDispatcherSupport_DEFINITIONS`` -+# This should be passed to target_compile_options() if the target is not -+# used for linking -+# -+# If ``Qt5EventDispatcherSupport_FOUND`` is TRUE, it will also define the following imported target: -+# -+# ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport`` -+# The Qt5EventDispatcherSupport library -+# -+# In general we recommend using the imported target, as it is easier to use. -+# Bear in mind, however, that if the target is in the link interface of an -+# exported library, it must be made available by the package config file. -+ -+#============================================================================= -+# Copyright 2014 Alex Merry <alex.merry@kde.org> -+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org> -+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com> -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+if(CMAKE_VERSION VERSION_LESS 2.8.12) -+ message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5EventDispatcherSupport.cmake") -+endif() -+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) -+ message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5EventDispatcherSupport.cmake") -+endif() -+ -+# Use pkg-config to get the directories and then use these values -+# in the FIND_PATH() and FIND_LIBRARY() calls -+find_package(PkgConfig) -+pkg_check_modules(PKG_Qt5EventDispatcherSupport QUIET Qt5Gui) -+ -+set(Qt5EventDispatcherSupport_DEFINITIONS ${PKG_Qt5EventDispatcherSupport_CFLAGS_OTHER}) -+set(Qt5EventDispatcherSupport_VERSION ${PKG_Qt5EventDispatcherSupport_VERSION}) -+ -+find_path(Qt5EventDispatcherSupport_INCLUDE_DIR -+ NAMES -+ QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h -+ HINTS -+ ${PKG_Qt5EventDispatcherSupport_INCLUDEDIR}/QtEventDispatcherSupport/${PKG_Qt5EventDispatcherSupport_VERSION}/ -+) -+find_library(Qt5EventDispatcherSupport_LIBRARY -+ NAMES -+ Qt5EventDispatcherSupport -+ HINTS -+ ${PKG_Qt5EventDispatcherSupport_LIBRARY_DIRS} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(Qt5EventDispatcherSupport -+ FOUND_VAR -+ Qt5EventDispatcherSupport_FOUND -+ REQUIRED_VARS -+ Qt5EventDispatcherSupport_LIBRARY -+ Qt5EventDispatcherSupport_INCLUDE_DIR -+ VERSION_VAR -+ Qt5EventDispatcherSupport_VERSION -+) -+ -+if(Qt5EventDispatcherSupport_FOUND AND NOT TARGET Qt5EventDispatcherSupport::Qt5EventDispatcherSupport) -+ add_library(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport UNKNOWN IMPORTED) -+ set_target_properties(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport PROPERTIES -+ IMPORTED_LOCATION "${Qt5EventDispatcherSupport_LIBRARY}" -+ INTERFACE_COMPILE_OPTIONS "${Qt5EventDispatcherSupport_DEFINITIONS}" -+ INTERFACE_INCLUDE_DIRECTORIES "${Qt5EventDispatcherSupport_INCLUDE_DIR}" -+ ) -+endif() -+ -+mark_as_advanced(Qt5EventDispatcherSupport_LIBRARY Qt5EventDispatcherSupport_INCLUDE_DIR) -+ -+# compatibility variables -+set(Qt5EventDispatcherSupport_LIBRARIES ${Qt5EventDispatcherSupport_LIBRARY}) -+set(Qt5EventDispatcherSupport_INCLUDE_DIRS ${Qt5EventDispatcherSupport_INCLUDE_DIR}) -+set(Qt5EventDispatcherSupport_VERSION_STRING ${Qt5EventDispatcherSupport_VERSION}) -+ -+ -+include(FeatureSummary) -+set_package_properties(Qt5EventDispatcherSupport PROPERTIES -+ URL "http://www.qt.io" -+ DESCRIPTION "Qt EventDispatcherSupport module." -+) -+ -diff --git a/cmake/modules/FindQt5FontDatabaseSupport.cmake b/cmake/modules/FindQt5FontDatabaseSupport.cmake -new file mode 100644 -index 000000000..d3e66cd30 ---- /dev/null -+++ b/cmake/modules/FindQt5FontDatabaseSupport.cmake -@@ -0,0 +1,122 @@ -+#.rst: -+# FindQt5FontDatabaseSupport -+# ------- -+# -+# Try to find Qt5FontDatabaseSupport on a Unix system. -+# -+# This will define the following variables: -+# -+# ``Qt5FontDatabaseSupport_FOUND`` -+# True if (the requested version of) Qt5FontDatabaseSupport is available -+# ``Qt5FontDatabaseSupport_VERSION`` -+# The version of Qt5FontDatabaseSupport -+# ``Qt5FontDatabaseSupport_LIBRARIES`` -+# This can be passed to target_link_libraries() instead of the ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport`` -+# target -+# ``Qt5FontDatabaseSupport_INCLUDE_DIRS`` -+# This should be passed to target_include_directories() if the target is not -+# used for linking -+# ``Qt5FontDatabaseSupport_DEFINITIONS`` -+# This should be passed to target_compile_options() if the target is not -+# used for linking -+# -+# If ``Qt5FontDatabaseSupport_FOUND`` is TRUE, it will also define the following imported target: -+# -+# ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport`` -+# The Qt5FontDatabaseSupport library -+# -+# In general we recommend using the imported target, as it is easier to use. -+# Bear in mind, however, that if the target is in the link interface of an -+# exported library, it must be made available by the package config file. -+ -+#============================================================================= -+# Copyright 2014 Alex Merry <alex.merry@kde.org> -+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org> -+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com> -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+if(CMAKE_VERSION VERSION_LESS 2.8.12) -+ message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5FontDatabaseSupport.cmake") -+endif() -+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) -+ message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5FontDatabaseSupport.cmake") -+endif() -+ -+# Use pkg-config to get the directories and then use these values -+# in the FIND_PATH() and FIND_LIBRARY() calls -+find_package(PkgConfig) -+pkg_check_modules(PKG_Qt5FontDatabaseSupport QUIET Qt5Gui) -+ -+set(Qt5FontDatabaseSupport_DEFINITIONS ${PKG_Qt5FontDatabaseSupport_CFLAGS_OTHER}) -+set(Qt5FontDatabaseSupport_VERSION ${PKG_Qt5FontDatabaseSupport_VERSION}) -+ -+find_path(Qt5FontDatabaseSupport_INCLUDE_DIR -+ NAMES -+ QtFontDatabaseSupport/private/qfontconfigdatabase_p.h -+ HINTS -+ ${PKG_Qt5FontDatabaseSupport_INCLUDEDIR}/QtFontDatabaseSupport/${PKG_Qt5FontDatabaseSupport_VERSION}/ -+) -+find_library(Qt5FontDatabaseSupport_LIBRARY -+ NAMES -+ Qt5FontDatabaseSupport -+ HINTS -+ ${PKG_Qt5FontDatabaseSupport_LIBRARY_DIRS} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(Qt5FontDatabaseSupport -+ FOUND_VAR -+ Qt5FontDatabaseSupport_FOUND -+ REQUIRED_VARS -+ Qt5FontDatabaseSupport_LIBRARY -+ Qt5FontDatabaseSupport_INCLUDE_DIR -+ VERSION_VAR -+ Qt5FontDatabaseSupport_VERSION -+) -+ -+if(Qt5FontDatabaseSupport_FOUND AND NOT TARGET Qt5FontDatabaseSupport::Qt5FontDatabaseSupport) -+ add_library(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport UNKNOWN IMPORTED) -+ set_target_properties(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport PROPERTIES -+ IMPORTED_LOCATION "${Qt5FontDatabaseSupport_LIBRARY}" -+ INTERFACE_COMPILE_OPTIONS "${Qt5FontDatabaseSupport_DEFINITIONS}" -+ INTERFACE_INCLUDE_DIRECTORIES "${Qt5FontDatabaseSupport_INCLUDE_DIR}" -+ ) -+endif() -+ -+mark_as_advanced(Qt5FontDatabaseSupport_LIBRARY Qt5FontDatabaseSupport_INCLUDE_DIR) -+ -+# compatibility variables -+set(Qt5FontDatabaseSupport_LIBRARIES ${Qt5FontDatabaseSupport_LIBRARY}) -+set(Qt5FontDatabaseSupport_INCLUDE_DIRS ${Qt5FontDatabaseSupport_INCLUDE_DIR}) -+set(Qt5FontDatabaseSupport_VERSION_STRING ${Qt5FontDatabaseSupport_VERSION}) -+ -+ -+include(FeatureSummary) -+set_package_properties(Qt5FontDatabaseSupport PROPERTIES -+ URL "http://www.qt.io" -+ DESCRIPTION "Qt FontDatabaseSupport module." -+) -+ -diff --git a/cmake/modules/FindQt5ThemeSupport.cmake b/cmake/modules/FindQt5ThemeSupport.cmake -new file mode 100644 -index 000000000..5588a7666 ---- /dev/null -+++ b/cmake/modules/FindQt5ThemeSupport.cmake -@@ -0,0 +1,122 @@ -+#.rst: -+# FindQt5ThemeSupport -+# ------- -+# -+# Try to find Qt5ThemeSupport on a Unix system. -+# -+# This will define the following variables: -+# -+# ``Qt5ThemeSupport_FOUND`` -+# True if (the requested version of) Qt5ThemeSupport is available -+# ``Qt5ThemeSupport_VERSION`` -+# The version of Qt5ThemeSupport -+# ``Qt5ThemeSupport_LIBRARIES`` -+# This can be passed to target_link_libraries() instead of the ``Qt5ThemeSupport::Qt5ThemeSupport`` -+# target -+# ``Qt5ThemeSupport_INCLUDE_DIRS`` -+# This should be passed to target_include_directories() if the target is not -+# used for linking -+# ``Qt5ThemeSupport_DEFINITIONS`` -+# This should be passed to target_compile_options() if the target is not -+# used for linking -+# -+# If ``Qt5ThemeSupport_FOUND`` is TRUE, it will also define the following imported target: -+# -+# ``Qt5ThemeSupport::Qt5ThemeSupport`` -+# The Qt5ThemeSupport library -+# -+# In general we recommend using the imported target, as it is easier to use. -+# Bear in mind, however, that if the target is in the link interface of an -+# exported library, it must be made available by the package config file. -+ -+#============================================================================= -+# Copyright 2014 Alex Merry <alex.merry@kde.org> -+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org> -+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com> -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+if(CMAKE_VERSION VERSION_LESS 2.8.12) -+ message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5ThemeSupport.cmake") -+endif() -+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) -+ message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5ThemeSupport.cmake") -+endif() -+ -+# Use pkg-config to get the directories and then use these values -+# in the FIND_PATH() and FIND_LIBRARY() calls -+find_package(PkgConfig) -+pkg_check_modules(PKG_Qt5ThemeSupport QUIET Qt5Gui) -+ -+set(Qt5ThemeSupport_DEFINITIONS ${PKG_Qt5ThemeSupport_CFLAGS_OTHER}) -+set(Qt5ThemeSupport_VERSION ${PKG_Qt5ThemeSupport_VERSION}) -+ -+find_path(Qt5ThemeSupport_INCLUDE_DIR -+ NAMES -+ QtThemeSupport/private/qgenericunixthemes_p.h -+ HINTS -+ ${PKG_Qt5ThemeSupport_INCLUDEDIR}/QtThemeSupport/${PKG_Qt5ThemeSupport_VERSION}/ -+) -+find_library(Qt5ThemeSupport_LIBRARY -+ NAMES -+ Qt5ThemeSupport -+ HINTS -+ ${PKG_Qt5ThemeSupport_LIBRARY_DIRS} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(Qt5ThemeSupport -+ FOUND_VAR -+ Qt5ThemeSupport_FOUND -+ REQUIRED_VARS -+ Qt5ThemeSupport_LIBRARY -+ Qt5ThemeSupport_INCLUDE_DIR -+ VERSION_VAR -+ Qt5ThemeSupport_VERSION -+) -+ -+if(Qt5ThemeSupport_FOUND AND NOT TARGET Qt5ThemeSupport::Qt5ThemeSupport) -+ add_library(Qt5ThemeSupport::Qt5ThemeSupport UNKNOWN IMPORTED) -+ set_target_properties(Qt5ThemeSupport::Qt5ThemeSupport PROPERTIES -+ IMPORTED_LOCATION "${Qt5ThemeSupport_LIBRARY}" -+ INTERFACE_COMPILE_OPTIONS "${Qt5ThemeSupport_DEFINITIONS}" -+ INTERFACE_INCLUDE_DIRECTORIES "${Qt5ThemeSupport_INCLUDE_DIR}" -+ ) -+endif() -+ -+mark_as_advanced(Qt5ThemeSupport_LIBRARY Qt5ThemeSupport_INCLUDE_DIR) -+ -+# compatibility variables -+set(Qt5ThemeSupport_LIBRARIES ${Qt5ThemeSupport_LIBRARY}) -+set(Qt5ThemeSupport_INCLUDE_DIRS ${Qt5ThemeSupport_INCLUDE_DIR}) -+set(Qt5ThemeSupport_VERSION_STRING ${Qt5ThemeSupport_VERSION}) -+ -+ -+include(FeatureSummary) -+set_package_properties(Qt5ThemeSupport PROPERTIES -+ URL "http://www.qt.io" -+ DESCRIPTION "Qt ThemeSupport module." -+) -+ -diff --git a/plugins/qpa/CMakeLists.txt b/plugins/qpa/CMakeLists.txt -index 1a91a0ff1..4094ae7d2 100644 ---- a/plugins/qpa/CMakeLists.txt -+++ b/plugins/qpa/CMakeLists.txt -@@ -1,6 +1,5 @@ - include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) - include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) --add_definitions(-DQ_FONTCONFIGDATABASE) - - set(QPA_SOURCES - abstractplatformcontext.cpp -@@ -19,10 +18,22 @@ include(ECMQtDeclareLoggingCategory) - ecm_qt_declare_logging_category(QPA_SOURCES HEADER logging.h IDENTIFIER KWIN_QPA CATEGORY_NAME kwin_qpa_plugin DEFAULT_SEVERITY Critical) - - add_library(KWinQpaPlugin MODULE ${QPA_SOURCES}) -+ -+if(Qt5Core_VERSION VERSION_LESS "5.8.0") -+ add_definitions(-DQ_FONTCONFIGDATABASE) -+ set(QT5PLATFORMSUPPORT_LIBS Qt5PlatformSupport::Qt5PlatformSupport) -+else() -+ set(QT5PLATFORMSUPPORT_LIBS -+ Qt5FontDatabaseSupport::Qt5FontDatabaseSupport -+ Qt5ThemeSupport::Qt5ThemeSupport -+ Qt5EventDispatcherSupport::Qt5EventDispatcherSupport -+) -+endif() -+ - target_link_libraries(KWinQpaPlugin - kwin - KF5::WaylandClient -- Qt5PlatformSupport::Qt5PlatformSupport -+ ${QT5PLATFORMSUPPORT_LIBS} - ${FONTCONFIG_LIBRARIES} - ${FREETYPE_LIBRARIES} - ) -diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp -index 8913bf0a1..fcca48f79 100644 ---- a/plugins/qpa/integration.cpp -+++ b/plugins/qpa/integration.cpp -@@ -46,9 +46,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. - #include <qpa/qplatforminputcontextfactory_p.h> - #include <qpa/qwindowsysteminterface.h> - #include <QtCore/private/qeventdispatcher_unix_p.h> -+ -+#if QT_VERSION >= 0x050800 -+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> -+#include <QtThemeSupport/private/qgenericunixthemes_p.h> -+#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h> -+#else - #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> - #include <QtPlatformSupport/private/qgenericunixthemes_p.h> - #include <QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h> -+#endif - - namespace KWin - { diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index 454ed1a57..89e2c1f3b 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e34d2b597d97d9dd81842d6ca0be9d737d96ec3cfe632b52b72b94a140479b4c3af29376599fa6ea23befd20b88bde679c5ebe47e091aba6efd163968f76318c kwindowsystem-5.41.0.tar.xz" +sha512sums="fa3df2f1a3eb1596ef429b8e84ce9696ffef3aa125727f0becf725b949611022887074a796116aadbb81adf6e5ff8e3b9fd49e72cf0066138c91ef09fdffd1c8 kwindowsystem-5.43.0.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 100b2bdd6..93a9733d6 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c8e7d39ebf8e0cb887f7b8bde7fb1a9a5f35e24972df26b1ba9ff5bb444fc905bd9380e6daf3b52a6bfe97d022029f9c00f55b0062d24de51dc0b0ccd255f1a1 kxmlgui-5.41.0.tar.xz" +sha512sums="ace47a5a01267ba33bc9173058a05cb49cfba7d18a171527df4afb094e437885b697fe5ab02d1609f6e577857f3f27d7d4ac2a25f6ea2dd659291d82fe25aa75 kxmlgui-5.43.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 98b6dc1b6..e95b965f7 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffb485f7c6027861d51da96eec33c68551627def1bee467797bf2864207584f74c6847b6ffca4ea130709615d9dae451cd406d391644712ad78f09d175dfc030 kxmlrpcclient-5.41.0.tar.xz" +sha512sums="82940cd57ab846009b3bb2f50ff8502679a24212df6d4c8f7499874070dbf43858564f29ea09b278d766ee4a13ce5b92b0d847e5ecb8aacb00194a31393bba3f kxmlrpcclient-5.43.0.tar.xz" diff --git a/user/kxstitch/APKBUILD b/user/kxstitch/APKBUILD new file mode 100644 index 000000000..3546db37e --- /dev/null +++ b/user/kxstitch/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kxstitch +pkgver=2.1.0 +pkgrel=0 +pkgdesc="Cross-stitch pattern editor by KDE" +url="https://userbase.kde.org/KXStitch" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev + kdoctools-dev kconfig-dev kconfigwidgets-dev kcompletion-dev ki18n-dev + kio-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev imagemagick-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/kxstitch/$pkgver/kxstitch-$pkgver.tar.xz" +builddir="$srcdir/kxstitch-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608 kxstitch-2.1.0.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 2b1cc53d8..89b2de68e 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" arch="all" +options="!check" # Tests require X11 license="LGPL-2.0" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev kcoreaddons-dev @@ -53,3 +54,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } +sha512sums="48f00d7ee7fcad83bace4858659ca5b44138f8fbb1a92d7bba5394ba6a0689414ece948a7ee51ab1648b59ab0b64be0d091010493cd91f1247e53b769cf285e2 libkdegames-17.12.2.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD new file mode 100644 index 000000000..87e786340 --- /dev/null +++ b/user/libkipi/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkipi +pkgver=17.12.2 +pkgrel=0 +pkgdesc="KDE Image Plugin Interface library" +url="https://www.digikam.org/" +arch="all" +options="!check" # Tests fail to compile. +license="GPL-2.0+ AND LGPL-2.0+" +depends="" +depends_dev="qt5-qtbase-dev kconfig-dev kxmlgui-dev kservice-dev" +makedepends="$depends_dev cmake extra-cmake-modules" +install="" +subpackages="$pkgname-dev" +source="http://download.kde.org/stable/applications/$pkgver/src/libkipi-$pkgver.tar.xz" +builddir="$srcdir/libkipi-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8f80bcc86174fa9a0e4e746b1b3e59dad4dc313fb1f6a8a28ea442a171a84059a70611eaff1c00469e156f89641f8c51cbcc4b997961caccf7309d64db0039fc libkipi-17.12.2.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 7d0652085..07b36d230 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de8f854592786b325f14a5e6be620fd28c9dadf49963070f33105a84249481bfb2a0f179335a760bf7067625a4295af868df10c4214c1001efda8c3aa25f8e3a libkleo-17.08.2.tar.xz" +sha512sums="bc697f39310d7fa84dfd3ac186b3f1f7715b272bb70b4505439ef64c6fb1b453274cf46c5cce7d89c579a3e5be197fcfb7aa9a097a22081964c2a16d90e17607 libkleo-17.12.2.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 05d4f557b..b6dbba428 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2a7a74397ee22d1a8a6b988973753150d07a667e98abcba82850d85fc7f841d2c00ba30ade05bef7f4ec17ca75493754615fb52fd57ae8be2a48c8aa8b7d15c5 libkmahjongg-17.08.2.tar.xz" +sha512sums="72df346ca92610bcb49e2067a35b1ca441b4649139998f3ed36104f92bb0a93a1bcc5283fd49901b5b66ed35fd8e865d04360267edc75a779ac0bce02047944a libkmahjongg-17.12.2.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD new file mode 100644 index 000000000..d15e9eee2 --- /dev/null +++ b/user/libksane/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libksane +pkgver=17.12.2 +pkgrel=0 +pkgdesc="KDE scanning library" +url="https://www.kde.org" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="sane-dev" +makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev + kwallet-dev ktextwidgets-dev kwidgetsaddons-dev" +install="" +subpackages="$pkgname-dev $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz" +builddir="$srcdir/libksane-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8567fc8da31ded406dfe2e72ff0a209741e437e51ab4beca75feabbb915842e1b3e7f692c94b448512e76f2b60487030da94518d240422653a90eaa0ef3205c1 libksane-17.12.2.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index f90541eda..ab64e2f8a 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkscreen -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="194f6b1cb5abb38f5c4fc425546652e31f8b0b0a0ae6e3d657c98095df13f383258f0e16c74b5add0935158c1affd27b21ae76cf7b951801f4250f6dc527006e libkscreen-5.8.7.tar.xz" +sha512sums="867ad3ab214a1399177c9c33b94e9438b1d2262f815a71ab12303cfcb6e701406e7fa237afaf7df7f2d2fe0da1bf106c21b4039d8ea05853345a2b397fdc8785 libkscreen-5.12.2.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index ac86a6684..666c72ff1 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksysguard -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -16,7 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev libx11-dev zlib-dev" install="" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/Attic/plasma/$pkgver/libksysguard-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" builddir="$srcdir/libksysguard-$pkgver" build() { @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2b29e548e76d73814b4775343449ca84d48c53967830eb2c96064f385e83ec800e50bff172868d381f24c790a13aef90e5745ba0d545e50a2fd4c040b5d9749 libksysguard-5.8.7.tar.xz" +sha512sums="3047c1c048b910e77dc40bee978636cb3e5ade7897d976139e858b9fd70362eb725430ac5e608fee2b03fe4bda3c4b681145b707177aa39f851f56f1e5fedf86 libksysguard-5.12.2.tar.xz" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 2747353f9..d60d6d5df 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1aecae025e1ed8d4c8a25a3f4fe8fc8de8e6886a2337a5b63c9396ac447954a2c31fcfac5d590611e7b222e6fcc3c17fe536cd5f71b330d8b4c9eb6dd2151d1d lskat-17.08.2.tar.xz" +sha512sums="320d30ccb8511c7e7701bbd619973387da2ff6a5cf79d5dae0576627efa3d0b99870d58498a8baf5edbc26fcdf6e061d6c28c6a5344600c010db7d032f8c9003 lskat-17.12.2.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 6bb3ce183..292947995 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-desktop pkgver=0.12.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="Complete LXQt desktop" url="https://lxqt.org" @@ -12,11 +12,11 @@ depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox lxqt-panel lxqt-runner lxqt-qtplugin qterminal pcmanfm-qt lxqt-sudo lxqt-session lxqt-powermanagement lxqt-policykit lxqt-openssh-askpass lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about - lximage-qt lxqt-themes pavucontrol-qt compton-conf" + lximage-qt lxqt-themes pavucontrol-qt qt5ct" makedepends="" install="" -subpackages="" -source="org.adelie-linux.about-lxqt.desktop" +subpackages="$pkgname-doc" +source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -27,5 +27,9 @@ package() { cd "$srcdir" install -D -m644 "$srcdir"/org.adelie-linux.about-lxqt.desktop \ "$pkgdir"/usr/share/applications/org.adelie-linux.about-lxqt.desktop + install -D -m755 "$srcdir"/startlxqt "$pkgdir"/usr/bin/startlxqt + install -D -m644 "$srcdir"/startlxqt.1 "$pkgdir"/usr/share/man/man1/startlxqt.1 } -sha512sums="e954a41cad44cad7ef3a7695c28396540556ee7bc374ee00f95c4117988d84f6989de7a030ddf11e426b895577e392100f8c5696f0cc3fdc03c2500498580af0 org.adelie-linux.about-lxqt.desktop" +sha512sums="e954a41cad44cad7ef3a7695c28396540556ee7bc374ee00f95c4117988d84f6989de7a030ddf11e426b895577e392100f8c5696f0cc3fdc03c2500498580af0 org.adelie-linux.about-lxqt.desktop +f520387e49335df3fb7fa972e3f1336e4841feb24c073dc0b777a400274087a00ec4c9f89bda4556d80a0622854d7131f771c866c921174473456a9a80582a5c startlxqt +4a56f5bd9364cac0cb32dd119ff209452249efff9de3be20297c1db6524dd1ef24ed7249f22a738a82dab4e61481e11dcceaf9e9474620fa1ca0b1616aa7dfe7 startlxqt.1" diff --git a/user/lxqt-desktop/startlxqt b/user/lxqt-desktop/startlxqt new file mode 100755 index 000000000..09b73f337 --- /dev/null +++ b/user/lxqt-desktop/startlxqt @@ -0,0 +1,99 @@ +#!/bin/sh + +contains() +{ + local str="$1" substr="$2" + [ "$str" = "$substr" -o -z "${str##$substr:*}" -o -z "${str##*:$substr:*}" -o -z "${str%%*:$substr}" ] +} + +if [ -z "$XDG_DATA_HOME" ]; then + export XDG_DATA_HOME="$HOME/.local/share" +fi + +if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" +fi + +if [ -z "$XDG_DATA_DIRS" ]; then + XDG_DATA_DIRS="$XDG_DATA_HOME:/usr/local/share:/usr/share" +else + if ! contains "$XDG_DATA_DIRS" "/usr/share"; then + XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/share" + fi +fi +export XDG_DATA_DIRS + +if [ -z "$XDG_CONFIG_DIRS" ]; then + export XDG_CONFIG_DIRS="/etc/xdg" +else + if ! contains "$XDG_CONFIG_DIRS" '/etc/xdg'; then + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg" + fi +fi + +if [ -z "$XDG_CACHE_HOME" ]; then + export XDG_CACHE_HOME="$HOME/.cache" +fi + +# Ensure the existance of the 'Desktop' folder +if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then + . "$XDG_CONFIG_HOME/user-dirs.dirs" +else + XDG_DESKTOP_DIR="$HOME/Desktop" +fi +mkdir -p "$XDG_DESKTOP_DIR" + +# Clean up after GDM (GDM sets the number of desktops to one) +xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null + +# Enable Qt integration for OpenOffice.org, if available. +if [ -z "$SAL_USE_VCLPLUGIN" ]; then + export SAL_USE_VCLPLUGIN=kde4 +fi + +# Launch DBus if needed +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -z "$XDG_RUNTIME_DIR" ] || ! [ -S "$XDG_RUNTIME_DIR/bus" ] || ! [ -O "$XDG_RUNTIME_DIR/bus" ]; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" || echo "startlxqt: error executing dbus-launch" >&2 + fi +fi + +# Copy default settings of openbox +if [ ! -e "$XDG_CONFIG_HOME/openbox/lxqt-rc.xml" ] ; then + ob_config_copied=0 + for considered_file in 'lxde-rc.xml' 'rc.xml'; do + if [ -e "$XDG_CONFIG_HOME/openbox/$considered_file" ]; then + #copy existing configuration of openbox + cp "$XDG_CONFIG_HOME/openbox/$considered_file" "$XDG_CONFIG_HOME/openbox/lxqt-rc.xml" + message="Your existing configuration for openbox '$XDG_CONFIG_HOME/openbox/$considered_file' was used to +fill the LXQt's openbox configuration '$XDG_CONFIG_HOME/openbox/lxqt-rc.xml'. +If you want to use the predefined LXQt's openbox configuration, run: + cp '/etc/xdg/openbox/lxqt-rc.xml' '$XDG_CONFIG_HOME/openbox'" + echo "$message" >&2 + xmessage -center -title "LXQt Openbox configuration" "$message" & + ob_config_copied=1 + break + fi + done + if [ 0 -eq "$ob_config_copied" ]; then + #copy predefined configuration + mkdir -p "$XDG_CONFIG_HOME/openbox" + #user/distribution can change the default configuration via LXQT_DEFAULT_OPENBOX_CONFIG + [ -r "$LXQT_DEFAULT_OPENBOX_CONFIG" ] || LXQT_DEFAULT_OPENBOX_CONFIG='/etc/xdg/openbox/lxqt-rc.xml' + cp "$LXQT_DEFAULT_OPENBOX_CONFIG" "$XDG_CONFIG_HOME/openbox" + fi +fi + +# Qt4 platform plugin +export QT_PLATFORM_PLUGIN=lxqt + +# Qt5 platform plugin +export QT_QPA_PLATFORMTHEME=qt5ct + +# use lxqt-applications.menu for main app menu +export XDG_MENU_PREFIX="lxqt-" + +export XDG_CURRENT_DESKTOP="LXQt" + +# Start the LXQt session +exec lxqt-session diff --git a/user/lxqt-desktop/startlxqt.1 b/user/lxqt-desktop/startlxqt.1 new file mode 100644 index 000000000..9eaba0337 --- /dev/null +++ b/user/lxqt-desktop/startlxqt.1 @@ -0,0 +1,48 @@ +.TH STARTLXQT 1 2015-11-03 "LXQt 0.10.0" "LXQt session management" +.SH NAME +startlxqt \- script to initialize and launch LXQt sessions +.SH SYNOPSIS +.B startlxqt +.SH DESCRIPTION +\fBstartlxqt\fR is a shell script meant to initialize and launch LXQt sessions. +It is as such similar to counterparts of other desktop environments like startlxde in +LXDE or startkde in KDE. +.P +It's main tasks are exporting environment variables, partly after performing +corresponding checks, and launching \fBlxqt-session\fR, the LXQt session manager. +.P +It is not meant to be run by users. +Rather, it is invoked as backend, e. g. by script \fBstartx\fR on virtual terminals or display +managers like SDDM or LightDM, see section \fIEXAMPLE\fR. +.SH FILES +.I $XDG_DATA_DIRS/xsessions/lxqt.desktop +.RS 5 +Desktop entry file stating startlxqt as binary needed to start LXQt sessions. Sourced e. g. +by display managers. +.RE +.SH BUGS +None at the time of this writing. Bugs can be reported on https://github.com/lxde/lxqt/issues. +.SH EXAMPLE +To start an LXQt session from a virtual terminal (virtual console) add a line +.P +.RS 5 +exec startlxqt +.RE +.P +to file \fI~/.xinitrc\fR. An LXQt session will then be launched by running \fBstartx\fR. +.P +Display managers are making use of scripts like \fBstartlxqt\fR automatically. Information about +available desktop environments is provided by files \fI$XDG_DATA_DIRS/xsessions/*.desktop\fR, typically +\fI/usr/share/xessions/*.desktop\fR. +.br +File \fIlxqt.desktop\fR provided by LXQt is stating \fBstartlxqt\fR in key \fIExec\fR while making sure the session +manager \fBlxqt-session\fR does exist by stating it in key \fITryExec\fR. +.SH SEE ALSO +.BR lxqt-session (1) +.BR startx (1) +.BR sddm (1) +.P +.B http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/ +.RS 5 +Desktop Entry Specification defining desktop entry files (*.desktop). +.RE diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index f4edc933c..72f527106 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-session pkgver=0.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="Session management utilities for LXQt" url="http://lxqt.org" arch="all" @@ -40,6 +40,8 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/bin/startlxqt + rm "$pkgdir"/usr/share/man/man1/start* } sha512sums="035954e684ea7ccc6f9a681150aaa482963b57fb4c97595448af170e9f01b2e60dc890ea08a3fdb81548035bbda1d4564e44b7997ff036ffa5ed77b5cbe7aaab lxqt-session-0.12.0.tar.xz" diff --git a/user/man-db/APKBUILD b/user/man-db/APKBUILD index 32e688455..ff748ba3f 100644 --- a/user/man-db/APKBUILD +++ b/user/man-db/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db pkgver=2.7.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" @@ -12,7 +12,8 @@ makedepends="db-dev gettext-dev libpipeline-dev zlib-dev" subpackages="$pkgname-lang $pkgname-doc" options="!check" # requires //IGNORE in iconv source="http://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz - man-db.trigger" + man-db.trigger + man-db-2.7.5-iconv.patch" triggers="man-db.trigger=/usr/share/man" build() { @@ -44,4 +45,5 @@ package() { } sha512sums="623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 man-db-2.7.6.1.tar.xz -0d2ab0b42888178ffb83c5dd5eaac8005f047de56af55eb3046291318fd8ed8c4999a4ea0148367ea07c0a0490eb8b9bc726a03b46533ef51bec6a5747719b64 man-db.trigger" +0d2ab0b42888178ffb83c5dd5eaac8005f047de56af55eb3046291318fd8ed8c4999a4ea0148367ea07c0a0490eb8b9bc726a03b46533ef51bec6a5747719b64 man-db.trigger +bdf53b2868eb0652f8ca5bec340736a1923b52921bc1a33bde691f005be937f0a01dd32ff46d04ba956aa9c05b2cf276a03877de6c5fd1d997c4a5b029f330e2 man-db-2.7.5-iconv.patch" diff --git a/user/man-db/man-db-2.7.5-iconv.patch b/user/man-db/man-db-2.7.5-iconv.patch new file mode 100644 index 000000000..24fea8872 --- /dev/null +++ b/user/man-db/man-db-2.7.5-iconv.patch @@ -0,0 +1,75 @@ +diff --git man-db-2.7.5/src/man.c man-db-fixed/src/man.c +index bea684f..df5f5cb 100644 +--- man-db-2.7.5/src/man.c ++++ man-db-fixed/src/man.c +@@ -1503,11 +1503,9 @@ static void add_output_iconv (pipeline *p, + { + debug ("add_output_iconv: source %s, target %s\n", source, target); + if (source && target && !STREQ (source, target)) { +- char *target_translit = xasprintf ("%s//TRANSLIT", target); + pipeline_command_args (p, "iconv", "-c", +- "-f", source, "-t", target_translit, ++ "-f", source, "-t", target, + NULL); +- free (target_translit); + } + } + +diff --git man-db-2.7.5/src/manconv.c man-db-fixed/src/manconv.c +index cae9b67..48b7a81 100644 +--- man-db-2.7.5/src/manconv.c ++++ man-db-fixed/src/manconv.c +@@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to, + static char *utf8 = NULL, *output = NULL; + size_t utf8left = 0; + iconv_t cd_utf8, cd = NULL; +- int to_utf8 = STREQ (try_to_code, "UTF-8") || +- STRNEQ (try_to_code, "UTF-8//", 7); +- const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8"; +- int ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);; ++ int to_utf8 = STREQ (try_to_code, "UTF-8"); ++ const char *utf8_target = "UTF-8"; ++ int ignore_errors = 0; + int ret = 0; + + debug ("trying encoding %s -> %s\n", try_from_code, try_to_code); +diff --git man-db-2.7.5/src/manconv_client.c man-db-fixed/src/manconv_client.c +index 2949c75..7805f90 100644 +--- man-db-2.7.5/src/manconv_client.c ++++ man-db-fixed/src/manconv_client.c +@@ -131,7 +131,7 @@ void add_manconv (pipeline *p, const char *source, const char *target) + codes->from[2] = NULL; + name = appendstr (name, "UTF-8:", source, NULL); + } +- codes->to = xasprintf ("%s//IGNORE", target); ++ codes->to = xstrdup (target); + /* informational only; no shell quoting concerns */ + name = appendstr (name, " -t ", codes->to, NULL); + if (quiet >= 2) +diff --git man-db-2.7.5/src/manconv_main.c man-db-fixed/src/manconv_main.c +index 166a2b8..4e700e9 100644 +--- man-db-2.7.5/src/manconv_main.c ++++ man-db-fixed/src/manconv_main.c +@@ -105,9 +105,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + return 0; + case 't': + to_code = xstrdup (arg); +- if (!strstr (to_code, "//")) +- to_code = appendstr (to_code, "//TRANSLIT", +- NULL); + return 0; + case 'd': + debug_level = 1; +diff --git man-db-2.7.5/src/whatis.c man-db-fixed/src/whatis.c +index 39aa093..0a25c92 100644 +--- man-db-2.7.5/src/whatis.c ++++ man-db-fixed/src/whatis.c +@@ -948,7 +948,7 @@ int main (int argc, char *argv[]) + display_seen = hashtable_create (&null_hashtable_free); + + #ifdef HAVE_ICONV +- locale_charset = xasprintf ("%s//IGNORE", get_locale_charset ()); ++ locale_charset = xstrdup (get_locale_charset ()); + conv_to_locale = iconv_open (locale_charset, "UTF-8"); + free (locale_charset); + #endif /* HAVE_ICONV */ diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index 7d9acf61d..a8f6b492d 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=milou -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -13,8 +13,7 @@ makedepends="kcoreaddons-dev ki18n-dev kdeclarative-dev kservice-dev cmake extra-cmake-modules python3 gettext-dev" install="" subpackages="$pkgname-lang" -source="http://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz - fix-test-signedness.patch" +source="http://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz" builddir="$srcdir/milou-$pkgver" build() { @@ -43,5 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7c6d4d6d6fc1166fa816ff7e772ed339f92c35be6b888ab9fb7974e2d6f459a37e1f8f12dd4f3e836df338bc414cf233304003c9115721f86957a8528579ff0 milou-5.8.7.tar.xz -f67b9f4040fa946ab9ededdcdc301cba969754f7b538d7b02ca73f4d72194d0eef18ff9c5963953d225604e46223d193c9f4e20df6157795a20fa5dcdd4dd5ff fix-test-signedness.patch" +sha512sums="1ce53df971ad028432761bf17e6b9a3f3608a4bd548e8dcb33eb9d7217cb484a18944163a2a944bcdf0210ec3b909018e33be0926e847b8e391bc111a323f031 milou-5.12.2.tar.xz" diff --git a/user/milou/fix-test-signedness.patch b/user/milou/fix-test-signedness.patch deleted file mode 100644 index 373c67bc1..000000000 --- a/user/milou/fix-test-signedness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- milou-5.8.7/lib/test/modeltest.cpp.old 2017-05-23 07:05:02.000000000 -0500 -+++ milou-5.8.7/lib/test/modeltest.cpp 2017-10-06 05:05:21.383062040 -0500 -@@ -451,7 +451,7 @@ - // Check that the alignment is one we know about - QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); - if ( textAlignmentVariant.isValid() ) { -- int alignment = textAlignmentVariant.toInt(); -+ unsigned int alignment = textAlignmentVariant.toUInt(); - QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); - } - diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 350d917c7..1b0eccd73 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okteta -pkgver=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -11,7 +11,8 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kbookmarks-dev kcodecs-dev kcompletion-dev kconfigwidgets-dev ki18n-dev kcrash-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev kcmutils-dev - knewstuff-dev kparts-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev" + knewstuff-dev kparts-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev + qca-dev shared-mime-info" install="" subpackages="$pkgname-doc $pkgname-lang" source="http://download.kde.org/stable/applications/$pkgver/src/okteta-$pkgver.tar.xz" @@ -35,7 +36,8 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + local _skip="libkasten-core-testdocumenttest|libkasten-core-documentmanagertest|oktetakasten-document-bytearraydocumenttest|kpart-oktetaparttest" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "($_skip)" } package() { @@ -43,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83647b379f6ba2d7c5c10b8ba40162811f35883df099bb296a3a0fde25d2f49863c786df59aecc12088e1ed31aa72b67f0a10c929f49f1bd3869b0fba51ce2c2 okteta-17.08.2.tar.xz" +sha512sums="f7a113c2b65761ed2edd538491f0bcf2e47aebdc5ba5a4ed8d583a33e00ce57ed86918b57ca5dac806f68573d63ebeca3fcde74564c2c09f5bd1a94bbd024d8c okteta-17.12.2.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD new file mode 100644 index 000000000..a47db7dff --- /dev/null +++ b/user/okular/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=okular +pkgver=17.12.2 +pkgrel=0 +pkgdesc="Universal document reader developed by KDE" +url="https://okular.kde.org/" +arch="all" +license="GPL-2.0+ LGPL-2.0+" +depends="kirigami2" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev + qt5-qtdeclarative-dev karchive-dev kbookmarks-dev kcompletion-dev + kconfigwidgets-dev kcoreaddons-dev kdoctools-dev kiconthemes-dev + kio-dev kjs-dev kparts-dev kwallet-dev kwindowsystem-dev khtml-dev + threadweaver-dev kactivities-dev poppler-qt5-dev tiff-dev qca-dev + libjpeg-turbo-dev kpty-dev kirigami2-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz" +builddir="$srcdir/okular-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + # All other tests require X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -R '^shelltest' +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4bd6eda7a5ebe3b0fb4a0e4518a321e2e8ecb74984c89085eba24afe76828f0f7af16f066519b52926edbb593965ce294dc28d1281200e9d284a6b630e92da2a okular-17.12.2.tar.xz" diff --git a/user/otter-browser/APKBUILD b/user/otter-browser/APKBUILD index 6986cc9f6..ec0d59264 100644 --- a/user/otter-browser/APKBUILD +++ b/user/otter-browser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=otter-browser -pkgver=0.9.93 +pkgver=0.9.96 pkgrel=0 pkgdesc="A free, open browser focused on user privacy" url="https://otter-browser.org/" @@ -14,7 +14,7 @@ makedepends="cmake qt5-qtbase-dev qt5-qttools-dev openssl-dev gstreamer-dev install="" langdir="/usr/share/otter-browser/locale" subpackages="$pkgname-doc $pkgname-lang" -source="https://sourceforge.net/projects/$pkgname/files/$pkgname-rc3/$pkgname-$pkgver.tar.bz2" +source="https://sourceforge.net/projects/$pkgname/files/$pkgname-rc6/$pkgname-$pkgver.tar.bz2" build() { cd "$builddir" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a45c8594c3de91e6ca317cbfe440c43be470d6364201cced5093ec233a24f194d89918e886603453de433636915f8c80f6144a69058aa54674a188fda716e80 otter-browser-0.9.93.tar.bz2" +sha512sums="4ba915226360ae1d6f5fd9bf5ea502ea9f2104594536eff0cfe57f162fb769158b03da2da9e5c0ce757af8fafa6f379ce81391b648bf4253c2bb35f12c3620b3 otter-browser-0.9.96.tar.bz2" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index a10fde8ba..21673f969 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c7d53f2da76cc34272977d23856fa527a540aefff8308513603338aa5a48c59654d69e60da11b528ccd335d58b71159b36646e4f8cddb24937c36ef5bf9cf6d oxygen-5.8.7.tar.xz" +sha512sums="6c753eaf27e6507d0bbc8b5f8b5a4a30263bb5577924a30f21268657696d56908a2fc75827311285ce323ad97b65b4e4e793f8df1ff881838c50a1070b46db13 oxygen-5.12.2.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index e64363cfa..f506865a1 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20171007 +pkgver=20180214 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -11,22 +11,13 @@ options="!check" # Icon set. depends="" makedepends="" install="" -subpackages="$pkgname-light $pkgname-dark $pkgname-adapta e$pkgname:elementary" -source="https://dl.opendesktop.org/api/files/download/id/1507885652/papirus-icon-theme-$pkgver.tar.gz" -builddir="$srcdir" - -build() { - cd "$builddir" -} +subpackages="$pkgname-light $pkgname-dark $pkgname-adapta" +source="$pkgname-$pkgver.tar.gz::https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/$pkgver.tar.gz" +builddir="$srcdir/papirus-icon-theme-$pkgver" package() { cd "$builddir" - mkdir -p "$pkgdir"/usr/share/icons - - for iconset in Papirus Papirus-Adapta Papirus-Adapta-Nokto Papirus-Dark \ - Papirus-Light ePapirus; do - mv "$builddir"/$iconset "$pkgdir"/usr/share/icons/ - done + make IGNORE="ePapirus" DESTDIR="$pkgdir" install } light() { @@ -51,10 +42,4 @@ adapta() { "$subpkgdir"/usr/share/icons/ } -elementary() { - pkgdesc="$pkgdesc (elementaryOS style)" - mkdir -p "$subpkgdir"/usr/share/icons - mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ -} - -sha512sums="82830fa69cbc5113728c3b390bbe3e4cbb270cdd6d386951efdc23c7495aa187b330954ccbaa67103e8f15c0e1367ad4198c2cbd2fcba01ed044bb490bf9e4c6 papirus-icon-theme-20171007.tar.gz" +sha512sums="e3cff11cb4e0ad71ff5c44da9ef5135ce7fc2f4bea5e95f4c42963868ef7fce19daf45bc7f5649186bbedeb683d8a56a48f859cda17acacad7c3fbf35fdcd291 papirus-icons-20180214.tar.gz" diff --git a/user/pax/APKBUILD b/user/pax/APKBUILD index d27e68633..5d59e0280 100644 --- a/user/pax/APKBUILD +++ b/user/pax/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pax pkgver=20161104 -pkgrel=0 +pkgrel=1 pkgdesc="Portable Archive eXchange, the POSIX archival tool" url="https://www.mirbsd.org/pax.htm" arch="all" +options="!check" # No test suite. license="BSD" depends_dev="libbsd-dev fts-dev" makedepends="$depends_dev" diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD new file mode 100644 index 000000000..e70865521 --- /dev/null +++ b/user/perl-test-command/APKBUILD @@ -0,0 +1,50 @@ +# Automatically generated by apkbuild-cpan, template 1 +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Kiyoshi Aman <aerdan@adelielinux.org> +pkgname=perl-test-command +_pkgreal=Test-Command +pkgver=0.11 +pkgrel=1 +pkgdesc="Perl module for Test-Command" +url="http://search.cpan.org/dist/Test-Command/" +arch="noarch" +license="GPL PerlArtistic" +cpandepends="" +cpanmakedepends="perl-module-build" +depends="$cpandepends" +makedepends="perl-dev $cpanmakedepends" +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/D/DA/DANBOO/$_pkgreal-$pkgver.tar.gz" + +builddir="$srcdir/$_pkgreal-$pkgver" + +prepare() { + cd "$builddir" + if [ -e Build.PL ]; then + perl Build.PL installdirs=vendor + else + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + fi +} + +build() { + cd "$builddir" + export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + ./Build +} + +check() { + cd "$builddir" + ./Build test +} + +package() { + cd "$builddir" + ./Build install destdir="$pkgdir" + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +md5sums="9ab83c4695961dbe92cd86efe08f0634 Test-Command-0.11.tar.gz" +sha256sums="28a3fc6fea73a19f563f11bd0f28186756d4c74207be6deacaad26d2081b9533 Test-Command-0.11.tar.gz" +sha512sums="79a8f41132b965ad4f6e8b4d97f8fb6181a1e394bcf8825abda2c8ee12dd5f6ef8d7c69df84d306c3841bb516213742c4a0a43c2f3d6b39ce6e163d6d77f45f8 Test-Command-0.11.tar.gz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index a23600c83..d53e6825a 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-desktop -pkgver=5.8.7.1 -pkgrel=3 +pkgver=5.12.2 +pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/info/plasma-desktop" arch="all" @@ -26,8 +26,8 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev makedepends="$depends_dev cmake extra-cmake-modules xkeyboard-config" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://download.kde.org/Attic/plasma/5.8.7/plasma-desktop-$pkgver.tar.xz" -builddir="$srcdir/$pkgname-5.8.7" +source="http://download.kde.org/stable/plasma/5.12.2/plasma-desktop-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-5.12.2" build() { cd "$builddir" @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da5d7a5e815f4e5895e93788f1634cd624bf385303599d6db9145f185b1429b24614d5c42e55d15b1202d5233b1c52db8bcb7fa6a0317ac1ebaa6b56020f228d plasma-desktop-5.8.7.1.tar.xz" +sha512sums="9d0497269451e39464a0e637fafb3e7830801be0895552a2275daf81cd6d372fded790ced806c2b09f48e0b28ac0940fe8d6ca2bf2789103321dcf35f4871e5c plasma-desktop-5.12.2.tar.xz" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index 0f8cb9beb..aa53087c2 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=1 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev kactivities-dev karchive-dev kconfigwidgets-dev kdbusaddons-dev kdeclarative-dev kio-dev kconfig-dev kglobalaccel-dev kguiaddons-dev kiconthemes-dev ki18n-dev kservice-dev kwindowsystem-dev knotifications-dev kpackage-dev - kwayland-dev" + kwayland-dev qt5-qtquickcontrols2-dev kirigami2-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev doxygen kdoctools-dev libx11-dev libxcb-dev graphviz qt5-qttools-dev" install="" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb94919f85393fd09a5a926a093bca80c243260adcb9dcbcee822295bc5773bf176cdbcb4b554473f3413f95ca5be061fe5e5b17d4949947f2bf510894a7a67d plasma-framework-5.41.0.tar.xz" +sha512sums="e86d8ba66edd21712bdaba0d2e86c3a2618b8925115022d3f614d5d0bcc7b9f9c1b33a4d09ca090555c508d316ba7341d85d3f515698982e014d1e5c3d1c7fcc plasma-framework-5.43.0.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index 8e5452518..3fe5c72d5 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,18 +1,18 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-integration -pkgver=5.8.7 -pkgrel=2 +pkgver=5.12.2 +pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" arch="all" license="LGPL-2.1" options="!check" # Times out, requires X11 desktop. depends="breeze ttf-noto" -depends_dev="qt5-qtbase-dev qt5-qtx11extras-dev kconfig-dev kconfigwidgets-dev - ki18n-dev kiconthemes-dev kio-dev knotifications-dev kwayland-dev - kwidgetsaddons-dev kwindowsystem-dev breeze-dev libxcursor-dev" -makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev" +makedepends="cmake extra-cmake-modules python3 gettext-dev qt5-qtbase-dev + qt5-qtx11extras-dev kconfig-dev kconfigwidgets-dev ki18n-dev kio-dev + kiconthemes-dev knotifications-dev kwayland-dev kwidgetsaddons-dev + kwindowsystem-dev breeze-dev libxcursor-dev qt5-qtquickcontrols2-dev" install="" subpackages="$pkgname-lang" source="http://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04e4528a59f916d9fed8d083b699711df62a504aada40b71607fa10fd51074aae63b163eca2c4893fc07bf86718a567a9047b61874da6eea282993e25bf5c919 plasma-integration-5.8.7.tar.xz" +sha512sums="19b3ad0a47631b8c61c4b23ba6d88007d105742ed1223ef027d9e72d8549d51dc1473499300967471224bcd43bdc205a39650cdc4a551bf8e006af5c271b62d4 plasma-integration-5.12.2.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index c6b4dc276..8da9a35ac 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-workspace -pkgver=5.8.7 -pkgrel=8 +pkgver=5.12.2 +pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" arch="all" @@ -23,15 +23,11 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtscript-dev kwallet-dev kcrash-dev kglobalaccel-dev kdbusaddons-dev kitemmodels-dev kdesu-dev kidletime-dev kwayland-dev kjsembed-dev kxmlrpcclient-dev kholidays-dev libksysguard-dev kpackage-dev baloo-dev kwin-dev libdbusmenu-qt-dev - ktexteditor-dev prison-dev" + ktexteditor-dev prison-dev libxtst-dev" makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/Attic/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz - plasma-workspace-5.8-cmake-update.patch - plasma-workspace-5.8.7-disable-broken-test.patch - plasma-workspace-5.8-honour-uint.patch - fix-crash-on-wallpaper-change.patch +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz " builddir="$srcdir/plasma-workspace-$pkgver" @@ -61,8 +57,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ba35a050384e0bf410097027bfb70ca7594cd5352fd6470228d537f4e876ec72ec26bac3be9a6750f306b1d2937ff53c267c2246f191c93a13972a0cf33b4faf plasma-workspace-5.8.7.tar.xz -3d7cfb1c7c54bcbca47c5c01497c776d54d1e2327bc0a3777cfaf001f44ec7c1863f15ab0586c00db6d7194f759b91d0a86e47ae99e7fa23782dd7deda264e47 plasma-workspace-5.8-cmake-update.patch -2151dab30716e0b2b6a9146fd6262f4f134884961bebe9cf9baee269f35b1b3955ed07dcee2602b5adc2fc93aa15d37cb72d6983f026a2b504feb451d944d965 plasma-workspace-5.8.7-disable-broken-test.patch -48b4c448a4e964e61f25fa751fbc67f6cfce0e792139a124a70fa5c07f8b1b1a1c51fd5652679a3c46ac997c2dda3df476e8c8ebfdc6a08ece4f2e79282d81a3 plasma-workspace-5.8-honour-uint.patch -52ac2f37a7e1fde97385a372a4c198b573fb51fe1334bddf340c034ba0fbd2a97174d9bab9f9c8446048deb3a2c9ea3c571b0adcdb1f710b513b311c824ab88a fix-crash-on-wallpaper-change.patch" +sha512sums="5e4d5386e1d4fc0fa81303c22b1570da8b6d82f8cf47a7137f7edbe1647ad5575ce36465010a7433183e29f4704cb17a40ff869d7df7d6706ba35ccc79bd190e plasma-workspace-5.12.2.tar.xz" diff --git a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch b/user/plasma-workspace/fix-crash-on-wallpaper-change.patch deleted file mode 100644 index 078a48e3a..000000000 --- a/user/plasma-workspace/fix-crash-on-wallpaper-change.patch +++ /dev/null @@ -1,58 +0,0 @@ -From a44d84ef47492ca60ee608996b5ab1f2849ef16e Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Mon, 14 Aug 2017 10:04:19 +0100 -Subject: Don't change fillMode of image just before deleting it - -It is still set for when a source is applied for the next -transistion. - -Summary: -This saves evaluating a new paintedSize and doing a bunch of evaluations -which are not used. - -More importantly it works round a Qt animation crash. - -fadeAnim.running is bound to otherImage.status !== loading - -with the intention of delaying animations until the images are really -loaded. - -By setting the fill mode and then the source, we go to loading and back, -effectively restarting the animation from within the animation. -This leads to a crash. - -CCBUG: 381105 - -Test Plan: -End user result is the same. - -Reviewers: #plasma, broulik, mart - -Reviewed By: #plasma, broulik, mart - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D7248 ---- - wallpapers/image/imagepackage/contents/ui/main.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml -index fc22176..0539f37 100644 ---- a/wallpapers/image/imagepackage/contents/ui/main.qml -+++ b/wallpapers/image/imagepackage/contents/ui/main.qml -@@ -193,8 +193,8 @@ Item { - } - ScriptAction { - script: { -- otherImage.fillMode = fillMode; - otherImage.source = ""; -+ otherImage.fillMode = fillMode; - } - } - } --- -cgit v0.11.2 - diff --git a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch b/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch deleted file mode 100644 index e77731eb5..000000000 --- a/user/plasma-workspace/plasma-workspace-5.8-cmake-update.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 052ab380b6cb7f27da19ba0937bc2563b175a19b Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Mon, 17 Jul 2017 00:07:47 +0200 -Subject: Fix compilation with current cmake (git branch release). - -I don't see what the private/ in front of the moc_ filenames was for anyway. ---- - shell/containmentconfigview.cpp | 2 +- - shell/currentcontainmentactionsmodel.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp -index 4d107be..8d6df0d 100644 ---- a/shell/containmentconfigview.cpp -+++ b/shell/containmentconfigview.cpp -@@ -245,4 +245,4 @@ void ContainmentConfigView::syncWallpaperObjects() - m_currentWallpaperConfig = static_cast<KDeclarative::ConfigPropertyMap *>(wallpaperGraphicsObject->property("configuration").value<QObject *>()); - } - --#include "private/moc_containmentconfigview.cpp" -+#include "moc_containmentconfigview.cpp" -diff --git a/shell/currentcontainmentactionsmodel.cpp b/shell/currentcontainmentactionsmodel.cpp -index 08317ed..521d1c9 100644 ---- a/shell/currentcontainmentactionsmodel.cpp -+++ b/shell/currentcontainmentactionsmodel.cpp -@@ -275,4 +275,4 @@ void CurrentContainmentActionsModel::save() - } - } - --#include "private/moc_currentcontainmentactionsmodel.cpp" -+#include "moc_currentcontainmentactionsmodel.cpp" --- -cgit v0.11.2 - diff --git a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch b/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch deleted file mode 100644 index a5e16d7b3..000000000 --- a/user/plasma-workspace/plasma-workspace-5.8-honour-uint.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2f22f0a935b69f2f2a866050be5b905f9df4e4b6 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Mon, 20 Mar 2017 16:59:25 +0100 -Subject: fix compilation with old gcc - -Summary: -gcc 4.8.5 (opensuse leap) fails building modeltest with -CMakeFiles/testHistoryModel.dir/modeltest.cpp.o: In function `ModelTest::data()': -modeltest.cpp:(.text+0x5a57): undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)' - -Test Plan: -builds fine now -same thing should be done to modeltest usage in kwin - -Reviewers: #plasma, davidedmundson - -Reviewed By: #plasma, davidedmundson - -Subscribers: davidedmundson, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D5083 ---- - klipper/autotests/modeltest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/klipper/autotests/modeltest.cpp b/klipper/autotests/modeltest.cpp -index d42d95f..d9b70f9 100644 ---- a/klipper/autotests/modeltest.cpp -+++ b/klipper/autotests/modeltest.cpp -@@ -453,7 +453,7 @@ void ModelTest::data() - // Check that the alignment is one we know about - QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); - if ( textAlignmentVariant.isValid() ) { -- int alignment = textAlignmentVariant.toInt(); -+ unsigned int alignment = textAlignmentVariant.toUInt(); - QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); - } - --- -cgit v0.11.2 - diff --git a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch b/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch deleted file mode 100644 index 362002d61..000000000 --- a/user/plasma-workspace/plasma-workspace-5.8.7-disable-broken-test.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt.old 2017-05-23 07:17:40.000000000 -0500 -+++ plasma-workspace-5.8.7/drkonqi/tests/CMakeLists.txt 2017-10-05 18:04:03.428394763 -0500 -@@ -1,5 +1,5 @@ - add_subdirectory(crashtest) --add_subdirectory(backtraceparsertest) -+#add_subdirectory(backtraceparsertest) - if(KF5XmlRpcClient_FOUND) - add_subdirectory(bugzillalibtest) - endif() diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD new file mode 100644 index 000000000..871d112a4 --- /dev/null +++ b/user/poppler-qt5/APKBUILD @@ -0,0 +1,48 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> + +pkgname=poppler-qt5 +_realname=poppler +pkgver=0.56.0 +pkgrel=0 +pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" +url="http://poppler.freedesktop.org/" +arch="all" +license="GPL" +options="!check" # Test data not included in tarball +subpackages="$pkgname-dev" +makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev + qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev" +depends= +replaces="poppler-glib" +depends_dev="$makedepends" +source="http://poppler.freedesktop.org/poppler-$pkgver.tar.xz" + +builddir="$srcdir/$_realname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-poppler-glib \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg \ + --enable-zlib \ + --enable-poppler-qt5 \ + --disable-utils + make +} + +package() { + cd "$builddir" + install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc + cd qt5 + make DESTDIR="$pkgdir" install +} + +sha512sums="74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528 poppler-0.56.0.tar.xz" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 9f433fd59..694100859 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="14f952aa1c8fc289efd6ae34c3476ba44b68c3aca9169754d0b79b11114d9aef4a101a071b0da1dc46c517165626073dff6a36bd6f4b6b86a0945ae03130e960 prison-5.41.0.tar.xz" +sha512sums="6cb086396557a7bddb4ae7bc75e8503f5f037138b6c486abf10eec681e9440a642e5fe21178005092ae537a2e7272ada33aeb17ff70a65849a7476810bae15b6 prison-5.43.0.tar.xz" diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD new file mode 100644 index 000000000..7610acac0 --- /dev/null +++ b/user/qpdfview/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=qpdfview +pkgver=0.4.16 +pkgrel=0 +pkgdesc="A tabbed document viewer" +url="https://launchpad.net/qpdfview" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev pkgconf cups-dev gnutls-dev" +install="" +subpackages="$pkgname-doc" +source="$url/trunk/$pkgver/+download/qpdfview-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" +options="!check" # No test suite. + +build() { + cd "$builddir" + lrelease-qt5 qpdfview.pro + qmake-qt5 CONFIG+="without_ps without_djvu" qpdfview.pro + make +} + +package() { + cd "$builddir" + make INSTALL_ROOT="$pkgdir" install +} + +sha512sums="d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 qpdfview-0.4.16.tar.gz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index e659b97bd..c4f4579a0 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 -pkgver=5.9.1 +pkgver=5.9.3 pkgrel=0 pkgdesc="Qt5 - QtQuick controls 2.0" url="http://qt-project.org/" @@ -35,4 +35,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="277a56adde27f2552cdc392f9c1f312104887624c0ecc6b3e465b61d17f01ea63bd9bcff45e00903dc3b53e6bcb211ac41fd28702fa72f48db35dfacc2d072e4 qtquickcontrols2-opensource-src-5.9.1.tar.xz" +sha512sums="34bec1d3c68eb86ff078fded6d19f463ee78f4929adae54beb2a1c0b1dc3f5b1a7e73210ac05e3a7e3391919c37892dde4aff88cf20e2fb148cb2a03401856ee qtquickcontrols2-opensource-src-5.9.3.tar.xz" diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD new file mode 100644 index 000000000..9359d02f8 --- /dev/null +++ b/user/qt5-qtsensors/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtsensors +pkgver=5.9.3 +pkgrel=0 +pkgdesc="Qt5 - Sensor library" +url="http://qt-project.org/" +arch="all" +license="LGPLv2 with exceptions or GPLv3 with exceptions" +options="!check" +depends="" +makedepends="qt5-qtbase-dev" +install="" +subpackages="$pkgname-dev" + +_ver=${pkgver/_/-} +_ver=${_ver/beta0/beta} +_ver=${_ver/rc0/rc} +_V=${_ver/rc/RC} +case $pkgver in +*_beta*|*_rc*) _rel=development_releases;; +*) _rel=official_releases;; +esac + +source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtsensors-opensource-src-$_V.tar.xz" + +builddir="$srcdir"/qtsensors-opensource-src-$_V +build() { + cd "$builddir" + qmake-qt5 && make +} + +package() { + cd "$builddir" + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="848184de2c914c0240f3ecffe96ab267fb24693d16a55c1c757d83af9f282bc6f6c5cd762cb42fc389bc02e301c21a6da7b178260f534db35f0abe277f638ea9 qtsensors-opensource-src-5.9.3.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index c158524c0..1cf3a08fa 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras -pkgver=5.9.1 +pkgver=5.9.3 pkgrel=0 pkgdesc="Qt5 - Extra libraries for X11 support" url="http://qt-project.org/" @@ -35,4 +35,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="71b49d4c313e69d47b4e8652913005afe178caaee30f123016ed87ef4d798c347fd15135895a3e434ca32a80aee82a1b2d7da8278ceef92bdee9c35b7cdce84e qtx11extras-opensource-src-5.9.1.tar.xz" +sha512sums="0d1547e25f5d051daa8b20f54ca146bc5a6ad6fdae2c9b9e90dae574840a350bc3ac82b05ddb93b7a544e689fc06e633e57a40f31475cd118e156fad78e91d6c qtx11extras-opensource-src-5.9.3.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD new file mode 100644 index 000000000..279383ac7 --- /dev/null +++ b/user/qt5ct/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=qt5ct +pkgver=0.35 +pkgrel=0 +pkgdesc="GUI utility for configuring Qt5" +url="https://sourceforge.net/projects/qt5ct/" +arch="all" +license="BSD-2-Clause" +depends="" +depends_dev="" +makedepends="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev $depends_dev" +install="" +source="https://sourceforge.net/projects/qt5ct/files/qt5ct-$pkgver.tar.bz2" +builddir="$srcdir/qt5ct-$pkgver" +# test requires X +options="!check" + +build() { + cd "$builddir" + qmake-qt5 PREFIX=/usr + make +} + +package() { + cd "$builddir" + make INSTALL_ROOT="$pkgdir" install +} + +sha512sums="2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a qt5ct-0.35.tar.bz2" diff --git a/user/rfkill/APKBUILD b/user/rfkill/APKBUILD index 3e2cad165..9f9889e9a 100644 --- a/user/rfkill/APKBUILD +++ b/user/rfkill/APKBUILD @@ -2,17 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rfkill pkgver=0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to query the state of the rfkill switches and buttons" url="https://wireless.wiki.kernel.org/en/users/Documentation/rfkill" arch="all" -license="GPL" +options="!check" # No test suite. +license="MIT" depends="" makedepends="" install="" -options="!check" subpackages="$pkgname-doc" -source="https://www.kernel.org/pub/software/network/rfkill/rfkill-$pkgver.tar.xz" +source="https://www.kernel.org/pub/software/network/rfkill/rfkill-$pkgver.tar.xz + dont-use-git.patch" build() { cd "$builddir" @@ -24,4 +25,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ad4d28e7bf7ec69ec6a600cd774b7b3c60e85849ae3fca0f5509ed6a283ed5656d37cfd770df45ff1ceca59edd814807d116b30e199fca303baf496441419d7 rfkill-0.5.tar.xz" +sha512sums="6ad4d28e7bf7ec69ec6a600cd774b7b3c60e85849ae3fca0f5509ed6a283ed5656d37cfd770df45ff1ceca59edd814807d116b30e199fca303baf496441419d7 rfkill-0.5.tar.xz +635d948b4addfb418a3dd1a0f2482b15e5dae7e161f3fc1a430a2052d2aeb4e0d0a8c7663e27d1f8741920a497f0e36bac949f14544f5157f037315822a08d04 dont-use-git.patch" diff --git a/user/rfkill/dont-use-git.patch b/user/rfkill/dont-use-git.patch new file mode 100644 index 000000000..d673adc85 --- /dev/null +++ b/user/rfkill/dont-use-git.patch @@ -0,0 +1,24 @@ +This is required because packages.git is a git repo. + +--- rfkill-0.5/version.sh 2013-05-03 11:24:22.000000000 +0000 ++++ rfkill-0.5/version.sh 2018-03-05 02:54:41.510838411 +0000 +@@ -12,19 +12,6 @@ + + if test "x$SUFFIX" != 'x'; then + v="$VERSION$SUFFIX" +-elif head=`git rev-parse --verify HEAD 2>/dev/null`; then +- git update-index --refresh --unmerged > /dev/null +- descr=$(git describe 2>/dev/null || echo "v$VERSION") +- +- # on git builds check that the version number above +- # is correct... +- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 +- +- echo -n 'const char rfkill_version[] = "' > "$OUT" +- v="${descr#v}" +- if git diff-index --name-only HEAD | read dummy ; then +- v="$v"-dirty +- fi + else + v="$VERSION" + fi diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 518cb46dc..8bf3865dd 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm-kcm -pkgver=5.8.7 +pkgver=5.12.2 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -10,7 +10,8 @@ license="GPL-2.0" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev qt5-qtdeclarative-dev kcoreaddons-dev ki18n-dev kxmlgui-dev kauth-dev - kconfigwidgets-dev kio-dev libxcb-dev xcb-util-image-dev libxcursor-dev" + kconfigwidgets-dev kio-dev libxcb-dev xcb-util-image-dev libxcursor-dev + knewstuff-dev" install="" install_if="systemsettings sddm" subpackages="$pkgname-lang" @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="782e56627071ff36e1724b0d1289fc0a5bef51cc3b54378ebccbe5d912d741e8b7649f0a8b493e8139c14ea6393d5f3dfcd85edbb4385252a59e84ef983d2834 sddm-kcm-5.8.7.tar.xz" +sha512sums="130c86c9e56421ee3a656c6c1c7005052c9343e34c809faa77504539cadc474452c59e403a0c79f518b712ba4ef690d6ca7099d9fa34a582d258265e1fe59a92 sddm-kcm-5.12.2.tar.xz" diff --git a/user/skanlite/APKBUILD b/user/skanlite/APKBUILD new file mode 100644 index 000000000..c0f3194c5 --- /dev/null +++ b/user/skanlite/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=skanlite +pkgver=2.0.1 +pkgrel=0 +pkgdesc="Simple image scanning application" +url="https://www.kde.org/applications/graphics/skanlite/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev libksane-dev kio-dev + kcoreaddons-dev ki18n-dev kxmlgui-dev kdoctools-dev libpng-dev zlib-dev + ktextwidgets-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/skanlite/2.0/skanlite-$pkgver.tar.xz + fix-version.patch + review-129989.patch + png-review-129988.patch" +builddir="$srcdir/skanlite-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e skanlite-2.0.1.tar.xz +80411112612025cb061960e7baf013efbe36d78a1567d169f313b9d39563c2d816c637f3b0ce45980e4a8ae8bf42e74677e32735fbfc5d8d63b6d637dcfac0fc fix-version.patch +d20473d75ba9be608fedc843fe6128e4b57a20af0d13dd88c36ab93efc3e11c764431935e3bab2cf495f9735f221236c5c1d061fbc863a26eb3a637be9bd0436 review-129989.patch +a960317f96dad1424cebd6b4734ce98c7f7401385b4434b961a0304283cd1d98bd99788be21eaa9e2bf0a5a01f6c647b6b5709334e0bd3f2b65fc12e3c56cbf3 png-review-129988.patch" diff --git a/user/skanlite/fix-version.patch b/user/skanlite/fix-version.patch new file mode 100644 index 000000000..94c5f345d --- /dev/null +++ b/user/skanlite/fix-version.patch @@ -0,0 +1,23 @@ +--- skanlite-2.0.1/CMakeLists.txt.old 2016-10-26 12:00:57.000000000 -0500 ++++ skanlite-2.0.1/CMakeLists.txt 2018-03-13 17:08:17.378028117 -0500 +@@ -43,7 +43,8 @@ + + set(SKANLITE_VERSION_STRING "2.0.1") + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h" "${CMAKE_CURRENT_BINARY_DIR}/src/version.h" COPYONLY) ++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) + + find_package(KF5 ${KF5_VERSION} REQUIRED + COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED) +--- skanlite-2.0.1/src/main.cpp.old 2016-10-26 17:00:34.000000000 +0000 ++++ skanlite-2.0.1/src/main.cpp 2018-03-13 22:59:18.898057063 +0000 +@@ -44,7 +44,7 @@ + + KAboutData aboutData(QLatin1String("Skanlite"), // componentName, k4: appName + i18n("Skanlite"), // displayName, k4: programName +- QLatin1String(skanlite_version), // version ++ QLatin1String(SKANLITE_VERSION_STRING), // version + i18n("Scanning application for KDE based on libksane."), // shortDescription + KAboutLicense::GPL, // licenseType + i18n("(C) 2008-2016 Kåre Särs"), // copyrightStatement diff --git a/user/skanlite/png-review-129988.patch b/user/skanlite/png-review-129988.patch new file mode 100644 index 000000000..05697078c --- /dev/null +++ b/user/skanlite/png-review-129988.patch @@ -0,0 +1,99 @@ +From 9f1e7b3596b114ef23834810f661307ef49a38de Mon Sep 17 00:00:00 2001 +From: Alexander Trufanov <trufanovan@gmail.com> +Date: Wed, 8 Mar 2017 17:11:25 +0300 +Subject: fix DPI info in 16-bit PNG + +REVIEW:129988 + +Skanlite tries to save 16bit PNG files on its own in its KSaneImageSaver class because KSaneWidget (part of libksane) uses QImage to save files and QImage doesn't support 16bit images. Related warning in [libksane](https://github.com/KDE/libksane/blob/master/src/ksanewidget.h#L118) + +But Skanlite doesn't add most of optional PNG headers to the exported png file. In particulary it misses pHYs (Physical Pixel Dimensions) info. Without it ScanTailor app can't detect scan's dpi and forces user to choose it manually while png file importing. [Related issue in scantailor](https://github.com/scantailor/scantailor/issues/250) +I've fixed this by adding pHYs to 16bit png based on KSaneWidget::currentDPI() as KSaneWidget [do it itself](https://github.com/KDE/libksane/blob/master/src/ksanewidget.cpp#L627) +--- + src/KSaneImageSaver.cpp | 11 ++++++++--- + src/KSaneImageSaver.h | 4 ++-- + src/skanlite.cpp | 2 +- + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/src/KSaneImageSaver.cpp b/src/KSaneImageSaver.cpp +index aaffed2..49123a1 100644 +--- a/src/KSaneImageSaver.cpp ++++ b/src/KSaneImageSaver.cpp +@@ -46,6 +46,7 @@ struct KSaneImageSaver::Private { + int m_width; + int m_height; + int m_format; ++ int m_dpi; + ImageType m_type; + + bool savePng(); +@@ -64,7 +65,7 @@ KSaneImageSaver::~KSaneImageSaver() + delete d; + } + +-bool KSaneImageSaver::savePng(const QString &name, const QByteArray &data, int width, int height, int format) ++bool KSaneImageSaver::savePng(const QString &name, const QByteArray &data, int width, int height, int format, int dpi) + { + if (!d->m_runMutex.tryLock()) { + return false; +@@ -75,15 +76,16 @@ bool KSaneImageSaver::savePng(const QString &name, const QByteArray &data, int w + d->m_width = width; + d->m_height = height; + d->m_format = format; ++ d->m_dpi = dpi; + d->m_type = Private::ImageTypePNG; + + start(); + return true; + } + +-bool KSaneImageSaver::savePngSync(const QString &name, const QByteArray &data, int width, int height, int format) ++bool KSaneImageSaver::savePngSync(const QString &name, const QByteArray &data, int width, int height, int format, int dpi) + { +- if (!savePng(name, data, width, height, format)) { ++ if (!savePng(name, data, width, height, format, dpi)) { + qDebug() << "fail"; + return false; + } +@@ -192,6 +194,9 @@ bool KSaneImageSaver::Private::savePng() + + png_set_sBIT(png_ptr, info_ptr, &sig_bit); + ++ png_uint_32 dpm = m_dpi * (1000.0 / 25.4); ++ png_set_pHYs(png_ptr, info_ptr, dpm, dpm, 1); ++ + /* Optionally write comments into the image */ + // text_ptr[0].key = "Title"; + // text_ptr[0].text = "Mona Lisa"; +diff --git a/src/KSaneImageSaver.h b/src/KSaneImageSaver.h +index 0ee23ac..96cc763 100644 +--- a/src/KSaneImageSaver.h ++++ b/src/KSaneImageSaver.h +@@ -37,9 +37,9 @@ public: + KSaneImageSaver(QObject *parent = 0); + ~KSaneImageSaver(); + +- bool savePng(const QString &name, const QByteArray &data, int width, int height, int format); ++ bool savePng(const QString &name, const QByteArray &data, int width, int height, int format, int dpi); + +- bool savePngSync(const QString &name, const QByteArray &data, int width, int height, int format); ++ bool savePngSync(const QString &name, const QByteArray &data, int width, int height, int format, int dpi); + + bool saveTiff(const QString &name, const QByteArray &data, int width, int height, int format); + +diff --git a/src/skanlite.cpp b/src/skanlite.cpp +index 1f1541c..7a671a2 100644 +--- a/src/skanlite.cpp ++++ b/src/skanlite.cpp +@@ -498,7 +498,7 @@ void Skanlite::saveImage() + (m_format == KSaneIface::KSaneWidget::FormatGrayScale16)) + { + KSaneImageSaver saver; +- if (saver.savePngSync(localName, m_data, m_width, m_height, m_format)) { ++ if (saver.savePngSync(localName, m_data, m_width, m_height, m_format, m_ksanew->currentDPI())) { + m_showImgDialog->close(); // closing the window if it is closed should not be a problem. + } + else { +-- +cgit v0.11.2 + diff --git a/user/skanlite/review-129989.patch b/user/skanlite/review-129989.patch new file mode 100644 index 000000000..431f1a720 --- /dev/null +++ b/user/skanlite/review-129989.patch @@ -0,0 +1,72 @@ +From e9eaf4c80ef0f90f53ee7aa284e56e808dcbe6c4 Mon Sep 17 00:00:00 2001 +From: Alexander Trufanov <trufanovan@gmail.com> +Date: Wed, 8 Mar 2017 17:55:33 +0300 +Subject: Bugfix: wrong folder selection dialog behavior + +REVIEW:129989 + +There are 2 problems with directory selection dialog. +1. If you scan very first page you'll get SaveLocation dialog but if you press the "..." button in it to specify folder for scans - a file selection dialog will be opened. Not directory selection, but file selection. If you select a file in it - a directory selection dialog pop up just after you close previous one. So you'll get a second dialog. Your first file selection result will be overwritten by folder selection. +2. If you choose for example "/tmp/" in directory selection dialog you'll get "/tmp" in the text box. Without trailing path separator. And resulted filename preview will be "/prefix-0001.png", not "/tmp/prefix-0001.png". If you didn't notice that and press ok you'll get an error as nothing can be saved to root. If you selected another folder you later may realize that your scans are in parent directory. Why? Bcs SkanLite doesn't check trailing path separator in directory path and believes that "/tmp" is a file tmp in the root folder. And Qt's directory selection dialogs always return directory name without trailing path separator in it. + +I've fixed both problems. +Second one is easy, just `if (!dir.endsWith(QDir::separator())) dir = dir.append(QDir::separator());` before proceeding with directory selection results. + +First one is a bit awkward. There is a slot `getDir()` and 2 widgets connected to it. `u_urlRequester` from SaveLocation dialog and `getDirButton` from Settings dialog. the slot opens QFileDialog::getExistingDirectory(). It's fine for getDirButton which is a QButton. But u_urlRequester is a KUrlRequester and contains own button and launches own file selection dialog which is for files by default. That's obviously wrong. +There are notes in `getDir()` slot about `// FIXME KF5`. Seems to be [this](https://mail.kde.org/pipermail/kde-frameworks-devel/2014-March/013276.html) discussion. I believe it's irrelevant to this problem. Perhaps this problem is a former workaround for KF5 problem which is already disappeared. + +All you need to fix this behavior is to disconnect KUrlRequester from getDir() which explicitly calls getExistingDirectory() and let it use it's own. We just need to switch it in directory selection mode with `u_urlRequester->setMode(KFile::Directory);`. +--- + src/SaveLocation.cpp | 5 +++-- + src/skanlite.cpp | 4 +--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/SaveLocation.cpp b/src/SaveLocation.cpp +index 7d6135a..bb87047 100644 +--- a/src/SaveLocation.cpp ++++ b/src/SaveLocation.cpp +@@ -35,8 +35,8 @@ SaveLocation::SaveLocation(QWidget *parent) + { + setupUi(this); + ++ u_urlRequester->setMode(KFile::Directory); + connect(u_urlRequester, &KUrlRequester::textChanged, this, &SaveLocation::updateGui); +- connect(u_urlRequester, &KUrlRequester::urlSelected, this, &SaveLocation::getDir); + connect(u_imgPrefix, &QLineEdit::textChanged, this, &SaveLocation::updateGui); + connect(u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); + connect(u_numStartFrom, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &SaveLocation::updateGui); +@@ -52,7 +52,8 @@ void SaveLocation::updateGui() + u_numStartFrom->setValue(1); // Reset the counter whenever the directory or the prefix is changed + } + const QString name = QString::fromLatin1("%1%2.%3").arg(u_imgPrefix->text()).arg(u_numStartFrom->value(), 4, 10, QLatin1Char('0')).arg(u_imgFormat->currentText()); +- u_resultValue->setText(QUrl(u_urlRequester->url().resolved(QUrl(name))).toString(QUrl::PreferLocalFile | QUrl::NormalizePathSegments)); ++ QString dir = QDir::cleanPath(u_urlRequester->url().toString()).append(QLatin1Char('/')); //make sure whole value is processed as path to directory ++ u_resultValue->setText(QUrl(dir).resolved(QUrl(name)).toString(QUrl::PreferLocalFile | QUrl::NormalizePathSegments)); + } + + void SaveLocation::getDir(void) +diff --git a/src/skanlite.cpp b/src/skanlite.cpp +index 7a671a2..1817425 100644 +--- a/src/skanlite.cpp ++++ b/src/skanlite.cpp +@@ -368,7 +368,7 @@ void Skanlite::saveImage() + m_firstImage = false; + } + +- QString dir = m_saveLocation->u_urlRequester->url().url(); ++ QString dir = QDir::cleanPath(m_saveLocation->u_urlRequester->url().url()).append(QLatin1Char('/')); //make sure whole value is processed as path to directory + QString prefix = m_saveLocation->u_imgPrefix->text(); + QString imgFormat = m_saveLocation->u_imgFormat->currentText().toLower(); + int fileNumber = m_saveLocation->u_numStartFrom->value(); +@@ -557,8 +557,6 @@ void Skanlite::saveImage() + + void Skanlite::getDir(void) + { +- // FIXME KF5 / WAIT: this is not working yet due to a bug in frameworkintegration: +- // see commit: 2c1ee08a21a1f16f9c2523718224598de8fc0d4f for kf5/src/frameworks/frameworkintegration/tests/qfiledialogtest.cpp + QString dir = QFileDialog::getExistingDirectory(m_settingsDialog, QString(), m_settingsUi.saveDirLEdit->text()); + if (!dir.isEmpty()) { + m_settingsUi.saveDirLEdit->setText(dir); +-- +cgit v0.11.2 + diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index b4e91a1fe..6da097500 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2ebe5352863b27c4ff83d3d6f6961de00ba3ada81e697a1519c9f86849561dc3da8d3cc8df5a79c2cd2288c08f7c033b6bbefff02ba938cb450b38cc0db81c3 solid-5.41.0.tar.xz" +sha512sums="6a7dc7d75a0340e69900758be5aecc201bf8c1e5a28b549e4f50107ae9ff800701b0abb88cf0c917347723e62d3222f4e066e399c916c537f3560ac7b9d20f1d solid-5.43.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 98c548f28..ce8297d05 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -35,7 +35,8 @@ build() { check() { cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Highlighter test requires X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E sonnet-test_highlighter } package() { @@ -47,8 +48,8 @@ aspell() { pkgdesc="$pkdesc (aspell backend)" install_if="$pkgname=$pkgver-$pkgrel aspell" mkdir -p "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet - mv "$pkgdir"/usr/lib/qt5/plugins/kf5/sonnet/aspell.so \ - "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/aspell.so + mv "$pkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so \ + "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="608b0c476f6a1bb9e598c9c3dbb58882ec80f2e3d436cf4e4657cccc2ca5abd24bf7af5f7982ff79d80eb602c92a26be498a9bd02fcb8b6ac44298b42af6648b sonnet-5.41.0.tar.xz" +sha512sums="63ee853d5f2df8b8163253add74418e46810188d58fc4ea56ee1d6dc6cd2f25b89c40f21039840c1992b2ce84e44acce26373cedb70770ca3d806e1dc73a0aa0 sonnet-5.43.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index e78e9911c..0f3b0b31c 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=17.08.2 +pkgver=17.12.2 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7cedd7a8151051365df956ac65038354027c9365e7e166e17d3d91ef55390b0521e0ed0912c61612b23dcea3c1f2604535536ae7119b3415ac5cb7079e55abf spectacle-17.08.2.tar.xz" +sha512sums="b6725931831d0faa02e2f4f65b53be7d2a2e25fab48b785432540d89c2f3fd4134c86f647f60a51c757428db2ea88aee7174295b50c14c3a5bfeb97b478443f4 spectacle-17.12.2.tar.xz" diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD new file mode 100644 index 000000000..024486ea4 --- /dev/null +++ b/user/sprunge/APKBUILD @@ -0,0 +1,57 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=sprunge +pkgver=0.6 +pkgrel=0 +pkgdesc="Helper script to paste things to http://sprunge.us" +url="http://sprunge.us" +arch="noarch" +license="GPL-2.0" +depends="curl" +makedepends= +install="" +subpackages="tpaste dpaste ix" +source="" +builddir="$srcdir" +options="!check" # Simple shell scripts; no test required. + +build() { + cd "$builddir" +} + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/usr/bin + printf "#!/bin/sh\n\nexec curl -F 'sprunge=<-' http://sprunge.us" > \ + "$pkgdir"/usr/bin/sprunge + chmod 755 "$pkgdir"/usr/bin/sprunge +} + +tpaste() { + cd "$builddir" + url="http://tpaste.us" + pkgdesc="Helper script to paste things to $url" + mkdir -p "$subpkgdir"/usr/bin + printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' http://tpaste.us" > \ + "$subpkgdir"/usr/bin/tpaste + chmod 755 "$subpkgdir"/usr/bin/tpaste +} + +dpaste() { + cd "$builddir" + url="http://dpaste.com" + pkgdesc="Helper script to paste things to $url" + mkdir -p "$subpkgdir"/usr/bin + printf "#!/bin/sh\n\nexec curl --silent -F 'content=<-' https://dpaste.de/api/ | sed -e 's/\"//g' -e 's/\$/\/raw\\\n/'" > \ + "$subpkgdir"/usr/bin/dpaste + chmod 755 "$subpkgdir"/usr/bin/dpaste +} + +ix() { + cd "$builddir" + url="http://ix.io" + pkgdesc="Helper script to paste things to $url" + mkdir -p "$subpkgdir"/usr/bin + printf "#!/bin/sh\n\nexec curl -F f:1='<-' ix.io/" > \ + "$subpkgdir"/usr/bin/ix + chmod 755 "$subpkgdir"/usr/bin/ix +} diff --git a/user/symboleditor/APKBUILD b/user/symboleditor/APKBUILD new file mode 100644 index 000000000..48e91e83c --- /dev/null +++ b/user/symboleditor/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=symboleditor +_realpkg=SymbolEditor +pkgver=2.0.0 +pkgrel=0 +pkgdesc="Symbol library creator for Qt 5" +url="https://userbase.kde.org/SymbolEditor" +arch="all" +license="GPL-2.0+" +depends="shared-mime-info" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kconfig-dev + ki18n-dev kio-dev kwidgetsaddons-dev kxmlgui-dev" +install="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/$pkgname/$pkgver/src/SymbolEditor-$pkgver.tar.bz2" +builddir="$srcdir/$_realpkg-$pkgver" + +build() { + cd "$builddir" + 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" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993 SymbolEditor-2.0.0.tar.bz2" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 9f87744f9..464d9de02 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="86ed50766c9c0a3ef9e71421f5e7b9248ab1f28d0ecd424af57d643e613f488e572d001c55c58ab0ef501d6160b2db75dec0b325447132a5f49ff6dc6c52afea syntax-highlighting-5.41.0.tar.xz" +sha512sums="3d9f2e073e05690922126b4b5360ef178655482158ff3471b469826681b86cba1ce1e555f0bc15df27dd980632a8324ad666bad178ee98eaf5fcdf58e2618c83 syntax-highlighting-5.43.0.tar.xz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 3292521f3..c0cde059f 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,17 +1,18 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=systemsettings -pkgver=5.8.7 -pkgrel=0 +pkgver=5.12.2 +pkgrel=1 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" arch="all" license="LGPL-2.1" -depends="" +depends="kirigami2" depends_dev="qt5-qtbase-dev kauth-dev kcmutils-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kio-dev kiconthemes-dev kitemviews-dev kservice-dev kwidgetsaddons-dev - kwindowsystem-dev kxmlgui-dev" + kwindowsystem-dev kxmlgui-dev kactivities-dev kactivities-stats-dev + khtml-dev kirigami2-dev" makedepends="$depends_dev cmake extra-cmake-modules" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -44,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="38bc0b65e5fbe10a1c229e91b93f59a1837fdfd1f2d89d7ab7bf0d64ffecc5d1b7ac946c03a8bc91e6c75ad522ed26a6351e5cfc4044b04170281854fc8c32c7 systemsettings-5.8.7.tar.xz" +sha512sums="1c5bcc72130208208d08880c0e53a647333622033bc825961bae835cea677b93101c7e1c285e97c769cef947331efb41c0736e83bbd715d86111ad2444fefef4 systemsettings-5.12.2.tar.xz" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index a9dbfc648..07c021922 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.41.0 +pkgver=5.43.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d8e0e6fe9a6b1310d936f646a888d00ec6abafe073665a6ad5115bf4dfe11908db5714f321590c553c00edd5663fd609dd5f3af36d78263cd6ee93d5e27d805 threadweaver-5.41.0.tar.xz" +sha512sums="0810e64bc4bacc548d1b839633e0fdd178f86bfb80c7e2b77fc185810207c3c2ca7619d982b806d7a0337329a034d09106fedbaea6218df78e46079d703a57c1 threadweaver-5.43.0.tar.xz" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD new file mode 100644 index 000000000..782061ea3 --- /dev/null +++ b/user/thunderbird/APKBUILD @@ -0,0 +1,90 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=thunderbird +pkgver=52.6.0 +pkgrel=0 +pkgdesc="Email client from Mozilla" +url="https://www.mozilla.org/thunderbird/" +arch="all" +options="!check" # X11 required +license="MPL" +depends="" +# moz build system stuff +# system-libs +# actual deps +makedepends=" + autoconf2.13 debianutils-which perl python2 + + alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev + libjpeg-turbo-dev libvpx-dev nspr-dev nss-dev pulseaudio-dev zlib-dev + + dbus-glib-dev gconf-dev gtk+2.0-dev gtk+3.0-dev hunspell-dev libsm-dev + libnotify-dev libxcomposite-dev libxdamage-dev libxrender-dev libxt-dev + nss-static sqlite-dev startup-notification-dev unzip yasm zip + " +install="" +subpackages="$pkgname-dev" +source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz + mozconfig + bad-google-code.patch + fix-seccomp-bpf.patch + mach-linux-musl.patch + profiler.patch + proper-system-hunspell.patch + stab.h + thunderbird.desktop + " +somask="liblgpllibs.so + libmozgtk.so + libmozsandbox.so + libxul.so" +_tbirddir=/usr/lib/${pkgname}-${pkgver} + +prepare() { + default_prepare + cp "$srcdir"/stab.h "$builddir"/mozilla/toolkit/crashreporter/google-breakpad/src/ + cp "$srcdir"/mozconfig "$builddir"/mozconfig + echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig + echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig + echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig +} + +build() { + cd "$builddir" + + # reportedly needed for gcc6; confirm this? + export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-schedule-insns2" + + export LDFLAGS="$LDFLAGS -Wl,-rpath,${_tbirddir}" + export USE_SHORT_LIBNAME=1 + + ./mozilla/mach build +} + +package() { + cd "$builddir" + DESTDIR="$pkgdir" ./mozilla/mach install + install -D -m644 "$srcdir"/thunderbird.desktop \ + "$pkgdir"/usr/share/applications/thunderbird.desktop +} + +dev() { + pkgdesc="$pkgdesc (development files)" + + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/include "$subpkgdir"/usr/include + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/thunderbird-devel* "$subpkgdir"/usr/lib + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/idl "$subpkgdir"/usr/share +} + +sha512sums="80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0 thunderbird-52.6.0.source.tar.xz +000b4403bfac4a6192ebe36a734ef3e464f3bdd3bc797e87bc487b4d9d93cd4b41137d82726617205e39f7aedf8bf2dfb11645db24a8b0b0137a141c9133f151 mozconfig +9b11ba43f1f3fe9cda69b6b92e2073ea5165a47e30084537f396ceb8fb63573c4eb057251644837504aa4546183dc8f77fbb24f1450b6a15a1386f29180deefc bad-google-code.patch +2f52fcd7c42f8e12c955e05aa12449aa486c5347d2a7406ff0dada66f64079152b18c3f65c43410df372e871488f17889bc337ced37d0b76305afdbcb55cb580 fix-seccomp-bpf.patch +475bdf81c41775634b131635197fa449b5068f2624a6b120d1878e2191a8e7badf01ac79a15ccf39242c64a29357f2ed7bae96352ceb70a234b17468a999e0c4 mach-linux-musl.patch +7e72b96196f51cc02478f1802a10b1c1754db09d7d35aef697c5dcaace107e7a45a1b97256cc98b4aa728845694be093b148b61868e8ebfc8317fea19d6c71fa profiler.patch +63b09028262a109e3a02f928c12323793df65dbd6d5605ddc315978b50ff4b50f6d1af410dc7c00538c80009a8721900c6320b166c8aa9bc6dce170ebcd6fc91 proper-system-hunspell.patch +0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h +95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/bad-google-code.patch b/user/thunderbird/bad-google-code.patch new file mode 100644 index 000000000..4be2b6748 --- /dev/null +++ b/user/thunderbird/bad-google-code.patch @@ -0,0 +1,49 @@ +--- thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc ++++ thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +@@ -45,6 +45,7 @@ + #include <sys/mman.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <libgen.h> + + #include <iostream> + #include <set> +--- thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc ++++ thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc +@@ -41,6 +41,10 @@ + + #include "common/using_std_string.h" + ++#ifndef N_UNDF ++#define N_UNDF 0 ++#endif ++ + using std::vector; + + namespace google_breakpad { +--- thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h ++++ thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h +@@ -55,7 +55,7 @@ + + #ifdef HAVE_MACH_O_NLIST_H + #include <mach-o/nlist.h> +-#elif defined(HAVE_A_OUT_H) ++#elif 0 + #include <a.out.h> + #endif + +--- thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h ++++ thunderbird-52.6.0/mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h +@@ -1134,6 +1134,12 @@ struct kernel_statfs { + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#undef __NR_pread ++#define __NR_pread __NR_pread64 ++#undef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 diff --git a/user/thunderbird/disable-hunspell_hooks.patch b/user/thunderbird/disable-hunspell_hooks.patch new file mode 100644 index 000000000..1eaa4d035 --- /dev/null +++ b/user/thunderbird/disable-hunspell_hooks.patch @@ -0,0 +1,11 @@ +--- a/mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 ++++ b/mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 +@@ -54,7 +54,7 @@ + * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, + * unless --enable-system-hunspell is defined. + */ +-#if defined(HUNSPELL_STATIC) ++#if 0 + #include "hunspell_alloc_hooks.h" + #include "hunspell_fopen_hooks.h" + #endif diff --git a/user/thunderbird/fix-seccomp-bpf.patch b/user/thunderbird/fix-seccomp-bpf.patch new file mode 100644 index 000000000..844ec7b96 --- /dev/null +++ b/user/thunderbird/fix-seccomp-bpf.patch @@ -0,0 +1,14 @@ +--- a/mozilla/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 ++++ b/mozilla/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 +@@ -23,6 +23,11 @@ + #include "sandbox/linux/services/android_ucontext.h" + #endif + ++// musl libc defines siginfo_t __si_fields instead of _sifields ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#define _sifields __si_fields ++#endif ++ + namespace { + + struct arch_sigsys { diff --git a/user/thunderbird/mach-linux-musl.patch b/user/thunderbird/mach-linux-musl.patch new file mode 100644 index 000000000..6bddf6ff6 --- /dev/null +++ b/user/thunderbird/mach-linux-musl.patch @@ -0,0 +1,119 @@ + +# HG changeset patch +# User Mike Hommey <mh+mozilla@glandium.org> +# Date 1502856976 -32400 +# Node ID 8d9ae8c45dd07496f164364f24c5f43edcf2eb6e +# Parent fa02d334033f0039ef82b3d7dc194312ba250279 +Bug 1384062 - Make SystemResourceMonitor.stop more resilient to errors. r=ahal,gps + +The poll() call in SystemResourceMonitor.stop might fail even though +there is something to read from the pipe, in some corner cases, and +python won't let us know about it. In that case, an exception is thrown, +leaving the SystemResourceMonitor (and its callers) in a weird state. In +practice, this leads BuildMonitor.__exit__ to recall stop, which then +fails. + +So when poll() throws an exception, we pretend there's still something +to read, and we try to read anyways. If there is something to read, +recv() will return it, otherwise, it will throw an exception of its own, +which we catch, pretending we're done. + +Furthermore, when there is nothing to read from the pipe, poll() simply +returns False, and our loop never sets `done` to True, and we then hit +an assert, which doesn't have its place here, so we remove it. + +Finally, the other end of the pipe might have died at any time, making +sending over the pipe fail, so we also protect against that. + +With all these changes, it feels like the reason to backout bug 1239939 +in bug 1272782 should have been dealt with, and we can drop the timeout +again. + +diff --git a/mozilla/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/mozilla/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py +--- a/mozilla/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py ++++ b/mozilla/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py +@@ -284,57 +284,71 @@ class SystemResourceMonitor(object): + """ + if not self._process: + self._stopped = True + return + + assert self._running + assert not self._stopped + +- self._pipe.send(('terminate',)) ++ try: ++ self._pipe.send(('terminate',)) ++ except Exception: ++ pass + self._running = False + self._stopped = True + + self.measurements = [] + +- done = False +- + # The child process will send each data sample over the pipe + # as a separate data structure. When it has finished sending + # samples, it sends a special "done" message to indicate it + # is finished. +- while self._pipe.poll(1.0): +- start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \ +- swap_mem = self._pipe.recv() ++ ++ # multiprocessing.Pipe is not actually a pipe on at least Linux. that ++ # has an effect on the expected outcome of reading from it when the ++ # other end of the pipe dies, leading to possibly hanging on revc() ++ # below. So we must poll(). ++ def poll(): ++ try: ++ return self._pipe.poll(0.1) ++ except Exception: ++ # Poll might throw an exception even though there's still ++ # data to read. That happens when the underlying system call ++ # returns both POLLERR and POLLIN, but python doesn't tell us ++ # about it. So assume there is something to read, and we'll ++ # get an exception when trying to read the data. ++ return True ++ while poll(): ++ try: ++ start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \ ++ swap_mem = self._pipe.recv() ++ except Exception: ++ # Let's assume we're done here ++ break + + # There should be nothing after the "done" message so + # terminate. + if start_time == 'done': +- done = True + break + + io = self._io_type(*io_diff) + virt = self._virt_type(*virt_mem) + swap = self._swap_type(*swap_mem) + cpu_times = [self._cpu_times_type(*v) for v in cpu_diff] + + self.measurements.append(SystemResourceUsage(start_time, end_time, + cpu_times, cpu_percent, io, virt, swap)) + + # We establish a timeout so we don't hang forever if the child + # process has crashed. + self._process.join(10) + if self._process.is_alive(): + self._process.terminate() + self._process.join(10) +- else: +- # We should have received a "done" message from the +- # child indicating it shut down properly. This only +- # happens if the child shuts down cleanly. +- assert done + + if len(self.measurements): + self.start_time = self.measurements[0].start + self.end_time = self.measurements[-1].end + + # Methods to record events alongside the monitored data. + + def record_event(self, name): + diff --git a/user/thunderbird/mozconfig b/user/thunderbird/mozconfig new file mode 100644 index 000000000..8359687c5 --- /dev/null +++ b/user/thunderbird/mozconfig @@ -0,0 +1,33 @@ +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --disable-crashreporter +ac_add_options --disable-elf-hack +ac_add_options --disable-install-strip +ac_add_options --disable-jemalloc +ac_add_options --disable-profiling +ac_add_options --disable-strip +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --enable-application=mail +ac_add_options --enable-alsa +ac_add_options --enable-calendar +ac_add_options --enable-dbus +ac_add_options --enable-default-toolkit=cairo-gtk3 +ac_add_options --enable-gio +ac_add_options --enable-official-branding +ac_add_options --enable-pie +ac_add_options --enable-pulseaudio +ac_add_options --enable-startup-notification +ac_add_options --enable-system-ffi +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-pthreads +ac_add_options --with-system-bz2 +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-zlib diff --git a/user/thunderbird/profiler.patch b/user/thunderbird/profiler.patch new file mode 100644 index 000000000..1b502a243 --- /dev/null +++ b/user/thunderbird/profiler.patch @@ -0,0 +1,44 @@ +--- a/mozilla/tools/profiler/core/platform-linux.cc ++++ b/mozilla/tools/profiler/core/platform-linux.cc +@@ -711,11 +711,13 @@ void OS::Startup() { + void TickSample::PopulateContext(void* aContext) + { + MOZ_ASSERT(aContext); ++#if defined(__GLIBC__) + ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext); + if (!getcontext(pContext)) { + context = pContext; + SetSampleContext(this, aContext); + } ++#endif + } + + void OS::SleepMicro(int microseconds) +--- a/mozilla/tools/profiler/core/platform.h ++++ b/mozilla/tools/profiler/core/platform.h +@@ -34,6 +34,8 @@ + #define MOZ_COUNT_DTOR(name) + #endif + ++#include <sys/types.h> ++ + #ifdef ANDROID + #include <android/log.h> + #else +--- a/mozilla/tools/profiler/lul/LulElf.cpp ++++ b/mozilla/tools/profiler/lul/LulElf.cpp +@@ -483,10 +483,10 @@ string FormatIdentifier(unsigned char identifier[16]) { + // Return the non-directory portion of FILENAME: the portion after the + // last slash, or the whole filename if there are no slashes. + string BaseFileName(const string &filename) { +- // Lots of copies! basename's behavior is less than ideal. +- char *c_filename = strdup(filename.c_str()); +- string base = basename(c_filename); +- free(c_filename); ++ // basename's behavior is less than ideal so avoid it ++ const char *c_filename = filename.c_str(); ++ const char *p = strrchr(c_filename, '/'); ++ string base = p ? p+1 : c_filename; + return base; + } + diff --git a/user/thunderbird/proper-system-hunspell.patch b/user/thunderbird/proper-system-hunspell.patch new file mode 100644 index 000000000..e1429de08 --- /dev/null +++ b/user/thunderbird/proper-system-hunspell.patch @@ -0,0 +1,22 @@ +moz seem to have no idea what their own damn build system is doing... + +--- thunderbird-52.6.0/mozilla/extensions/spellcheck/hunspell/glue/moz.build 2018-01-24 03:06:15.000000000 +0000 ++++ thunderbird-52.6.0/mozilla/extensions/spellcheck/hunspell/glue/moz.build 2018-03-12 09:17:05.386773708 +0000 +@@ -16,6 +16,9 @@ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS'] + else: ++ # This variable is referenced in configure.in. Make sure to change that file ++ # too if you need to change this variable. ++ DEFINES['HUNSPELL_STATIC'] = True + LOCAL_INCLUDES += ['../src'] + + LOCAL_INCLUDES += [ +@@ -33,7 +36,3 @@ + 'RemoteSpellCheckEngineChild.h', + 'RemoteSpellCheckEngineParent.h', + ] +- +-# This variable is referenced in configure.in. Make sure to change that file +-# too if you need to change this variable. +-DEFINES['HUNSPELL_STATIC'] = True diff --git a/user/thunderbird/stab.h b/user/thunderbird/stab.h new file mode 100644 index 000000000..6f70af398 --- /dev/null +++ b/user/thunderbird/stab.h @@ -0,0 +1,71 @@ +/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */ +/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */ + +/*- + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)stab.h 5.2 (Berkeley) 4/4/91 + */ + +#ifndef _STAB_H_ +#define _STAB_H_ + +/* + * The following are symbols used by various debuggers and by the Pascal + * compiler. Each of them must have one (or more) of the bits defined by + * the N_STAB mask set. + */ + +#define N_GSYM 0x20 /* global symbol */ +#define N_FNAME 0x22 /* F77 function name */ +#define N_FUN 0x24 /* procedure name */ +#define N_STSYM 0x26 /* data segment variable */ +#define N_LCSYM 0x28 /* bss segment variable */ +#define N_MAIN 0x2a /* main function name */ +#define N_PC 0x30 /* global Pascal symbol */ +#define N_RSYM 0x40 /* register variable */ +#define N_SLINE 0x44 /* text segment line number */ +#define N_DSLINE 0x46 /* data segment line number */ +#define N_BSLINE 0x48 /* bss segment line number */ +#define N_SSYM 0x60 /* structure/union element */ +#define N_SO 0x64 /* main source file name */ +#define N_LSYM 0x80 /* stack variable */ +#define N_BINCL 0x82 /* include file beginning */ +#define N_SOL 0x84 /* included source file name */ +#define N_PSYM 0xa0 /* parameter variable */ +#define N_EINCL 0xa2 /* include file end */ +#define N_ENTRY 0xa4 /* alternate entry point */ +#define N_LBRAC 0xc0 /* left bracket */ +#define N_EXCL 0xc2 /* deleted include file */ +#define N_RBRAC 0xe0 /* right bracket */ +#define N_BCOMM 0xe2 /* begin common */ +#define N_ECOMM 0xe4 /* end common */ +#define N_ECOML 0xe8 /* end common (local name) */ +#define N_LENG 0xfe /* length of preceding entry */ + +#endif /* !_STAB_H_ */ diff --git a/user/thunderbird/thunderbird.desktop b/user/thunderbird/thunderbird.desktop new file mode 100644 index 000000000..210859df0 --- /dev/null +++ b/user/thunderbird/thunderbird.desktop @@ -0,0 +1,64 @@ +[Desktop Entry] +Name=Thunderbird +GenericName=Mail Client +GenericName[ast]=Client de correu +GenericName[ca]=Client de correu +GenericName[cs]=Poštovní klient +GenericName[da]=E-postklient +GenericName[de]=E-Mail-Anwendung +GenericName[el]=Λογισμικό αλληλογραφίας +GenericName[es]=Cliente de correo +GenericName[fi]=Sähköpostiohjelma +GenericName[fr]=Client de messagerie +GenericName[gl]=Cliente de correo electrónico +GenericName[he]=לקוח דוא״ל +GenericName[hr]=Klijent e-pošte +GenericName[hu]=Levelezőkliens +GenericName[it]=Client email +GenericName[ja]=電子メールクライアント +GenericName[ko]=메일 클라이언트 +GenericName[nl]=E-mailprogramma +GenericName[pl]=Klient poczty +GenericName[pt_BR]=Cliente de E-mail +GenericName[ru]=Почтовый клиент +GenericName[sk]=Poštový klient +GenericName[ug]=ئېلخەت دېتالى +GenericName[uk]=Поштова програма +GenericName[vi]=Phần mềm khách quản lý thư điện tử +GenericName[zh_CN]=邮件新闻客户端 +GenericName[zh_TW]=郵件用戶端 +Comment=Send and receive mail with Thunderbird +Comment[ast]=Lleer y escribir corréu electrónicu +Comment[ca]=Llegiu i escriviu correu +Comment[cs]=Čtení a psaní pošty +Comment[da]=Skriv/læs e-post/nyhedsgruppe med Mozilla Thunderbird +Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben +Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird +Comment[es]=Lea y escriba correos y noticias con Thunderbird +Comment[fi]=Lue ja kirjoita sähköposteja +Comment[fr]=Lire et écrire des courriels +Comment[gl]=Lea e escriba correo electrónico +Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird +Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird +Comment[hu]=Levelek írása és olvasása a Thunderbirddel +Comment[it]=Per leggere e scrivere email +Comment[ja]=メールの読み書き +Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트 +Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird +Comment[pl]=Czytanie i wysyłanie e-maili +Comment[pt_BR]=Leia e escreva suas mensagens +Comment[ru]=Читайте и пишите письма +Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird +Comment[sv]=Läs och skriv e-post +Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش +Comment[uk]=Читання та написання листів +Comment[vi]=Đọc và soạn thư điện tử +Comment[zh_CN]=阅读邮件或新闻 +Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞 +Exec=thunderbird %u +Icon=thunderbird +Terminal=false +Type=Application +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true +Categories=Network;Email; diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD new file mode 100644 index 000000000..aa18627a5 --- /dev/null +++ b/user/xsane/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsane +pkgver=0.999 +pkgrel=0 +pkgdesc="Graphical scanning software" +url="http://xsane.org/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+" +depends="" +makedepends="gettext-dev gtk+2.0-dev lcms-dev libjpeg-turbo-dev libpng-dev + sane-dev tiff-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="http://www.xsane.org/download/xsane-$pkgver.tar.gz + xsane-0.999-libpng16.patch" +builddir="$srcdir/xsane-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed xsane-0.999.tar.gz +6b271360b9cb7e2db165fbd67eed95fdfa9a2e52d61ce54679f5a6a0bdc6cee79be3224063da22907f6eaa6e6645d321ccddd9b37484156ba55aef8977e25738 xsane-0.999-libpng16.patch" diff --git a/user/xsane/xsane-0.999-libpng16.patch b/user/xsane/xsane-0.999-libpng16.patch new file mode 100644 index 000000000..2f947e73c --- /dev/null +++ b/user/xsane/xsane-0.999-libpng16.patch @@ -0,0 +1,20 @@ +--- xsane-0.999/src/xsane-save.c.old 2010-11-16 21:06:00.000000000 +0000 ++++ xsane-0.999/src/xsane-save.c 2018-03-08 22:45:17.763964565 +0000 +@@ -4910,7 +4910,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); +@@ -5100,7 +5100,7 @@ + return -1; /* error */ + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); |