diff options
Diffstat (limited to 'user')
50 files changed, 504 insertions, 281 deletions
diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index a147b9183..bd65db3b5 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins pkgver=3.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" arch="all" diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index 3b55131e2..431553cb6 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze-gtk -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" @@ -14,7 +14,6 @@ install_if="breeze~$pkgver gtk+2.0" source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5be51fc6a884e4f3338b3ad3044b918f7267205c5234b2053edd4773be42b90fb8f665e339a40c1d49d6eea16e90e1e51f58f149002568e2e7ce0be69ee412d9 breeze-gtk-5.12.7.tar.xz" +sha512sums="7c9602161cf77e263a84e7fd5f5780a8bc84b4b747356eace7c05768c9cb6a7a39691ba800db654ea1a058209906b1ed762f211a063f8d05596d32fd1dbc867f breeze-gtk-5.12.8.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 17e5d241e..e040ec01e 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c0e564fa6df64c225ea7754271c138d4b4304068c5fcf2e0502f109af3478f37d2781ac13d068b0818c819c8f60d6c4a333ff8940334c3ee5030607f80080b99 breeze-5.12.7.tar.xz" +sha512sums="135c431c979cfb82833c6525f72167e0e334519b8c10c57e97e96f8a15a8b2b141c4b94c37985a5a53f1ccc19ab3be9121e55bfe3412fad06122b2927e9e3cbc breeze-5.12.8.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 6c0ed7c7d..8dd0c6168 100644 --- a/user/btrfs-progs/APKBUILD +++ b/user/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=btrfs-progs -pkgver=5.1.1 +pkgver=5.2.1 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd btrfs-progs-v5.1.1.tar.xz" +sha512sums="7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59 btrfs-progs-v5.2.1.tar.xz" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 319bf9998..1a46d92d1 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail -pkgver=3.17.3 +pkgver=3.17.4 pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8 claws-mail-3.17.3.tar.xz" +sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz" diff --git a/user/desktop-file-utils/APKBUILD b/user/desktop-file-utils/APKBUILD index f8a62336f..62a1e58bb 100644 --- a/user/desktop-file-utils/APKBUILD +++ b/user/desktop-file-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=desktop-file-utils -pkgver=0.23 +pkgver=0.24 pkgrel=0 pkgdesc="Utilities for working with Desktop Entry files" url="https://www.freedesktop.org/wiki/Software/desktop-file-utils/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a desktop-file-utils-0.23.tar.xz" +sha512sums="b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0 desktop-file-utils-0.24.tar.xz" diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index c2a85db1f..8ff9cc8d9 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dialog -pkgver=1.3.20190211 +pkgver=1.3.20190728 _realver="${pkgver%.*}-${pkgver##*.}" pkgrel=0 pkgdesc="Script interpreter providing curses widgets" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="247639190c97c1baa6aa2cc75bc17593a0e33fcfcfd6dbc4a1903b55709f8f102c965de03f0620c48463f018525eb77f9b62b39db8331b811a227bbf39b254c4 dialog-1.3-20190211.tgz" +sha512sums="e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6 dialog-1.3-20190728.tgz" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index e24353ac0..3c0e6ad73 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,24 +1,24 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.0 +pkgver=22.0.7 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" arch="all" license="Apache-2.0" depends="" -makedepends="flex libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl - unixodbc-dev" +makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-dev + openssl-dev perl unixodbc-dev" subpackages="$pkgname-dev" -source="http://erlang.org/download/otp_src_$pkgver.tar.gz +source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz fix-wx-linking.patch safe-signal-handling.patch " -builddir="$srcdir/otp_src_$pkgver" +builddir="$srcdir/otp-OTP-$pkgver" build() { - cd "$builddir" + ./otp_build autoconf ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,8 +34,6 @@ build() { check() { local _header - - cd "$builddir" export ERL_TOP=$builddir make release_tests @@ -50,10 +48,9 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3f98697b59b33910fa461141fc4fe9635c4b6a53900dd90920add709dc10468aad7b9fde12419f05b27e038aee5a254319b1c5dc0e26ceabf29a7eb8020b5d23 otp_src_22.0.tar.gz -5f1b05d8be71d5e3d7e8c5ad019329af8f68174251b5b6e0a9ee9cb3da51a10983b8696e23b3954c19de5d54783ec16f38c80c74724341dbafb22fcac83c77d4 fix-wx-linking.patch +sha512sums="cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 erlang-22.0.7.tar.gz +91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch index eb5649164..e1e8d4333 100644 --- a/user/erlang/fix-wx-linking.patch +++ b/user/erlang/fix-wx-linking.patch @@ -1,10 +1,10 @@ ---- otp_src_21.2/lib/wx/configure.old 2018-12-10 20:11:00.000000000 +0000 -+++ otp_src_21.2/lib/wx/configure 2019-02-24 22:16:37.340000000 +0000 -@@ -5765,7 +5765,7 @@ +--- otp-OTP-22.0.7/lib/wx/configure.in.old 2019-07-10 16:05:15.000000000 +0000 ++++ otp-OTP-22.0.7/lib/wx/configure.in 2019-08-07 01:00:20.532799505 +0000 +@@ -650,7 +650,7 @@ // it isn't in too old wxWidgets versions wxString test = wxString::FromUTF8((const char *)"foo"); wxStyledTextCtrl * foo = new wxStyledTextCtrl(); -- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, +- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, + wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL, wxDefaultPosition,wxDefaultSize,0); return true; diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 963fe871c..791fcb610 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 -pkgver=0.27.1 +pkgver=0.27.2 pkgrel=0 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="https://www.exiv2.org/" @@ -74,6 +74,14 @@ builddir="$srcdir/$pkgname-$pkgver-Source" # - CVE-2018-17581 # - CVE-2018-19107 # - CVE-2018-19108 +# 0.27.2-r0: +# - CVE-2019-13108 +# - CVE-2019-13109 +# - CVE-2019-13110 +# - CVE-2019-13111 +# - CVE-2019-13112 +# - CVE-2019-13113 +# - CVE-2019-13114 prepare() { default_prepare @@ -98,4 +106,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529 exiv2-0.27.1-Source.tar.gz" +sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 exiv2-0.27.2-Source.tar.gz" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index dada6f23a..49be257f1 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.1.3 +pkgver=4.2 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" @@ -38,16 +38,13 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz # - CVE-2017-14225 build() { - local _dbg="--disable-debug" local _asm="" - [ -n "$DEBUG" ] && _dbg="--enable-debug" case "$CARCH" in ppc64) _asm="--cpu=G5" ;; pmmx) _asm="--disable-asm" ;; esac - cd "$builddir" ./configure \ --prefix=/usr \ --enable-avresample \ @@ -82,7 +79,7 @@ build() { --enable-libwebp \ --enable-libpulse \ --optflags="$CFLAGS" \ - $_asm $_dbg + $_asm make ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c } @@ -100,5 +97,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="0a540a0c5395f42c6079bc26d1b3baca453995693da7de21da469ce40b3a548bea14ff46a72c6f4c32256333855f9b86207cb8bf1d0dda33a17ddca54970daa3 ffmpeg-4.1.3.tar.xz +sha512sums="c1f6a86736c417790d7b88d687fdba28c620682a7247d8865062b90a9510b798a0230ab0bc993de85021fefb1044fa929a6c29c77d91b81c52873af569210313 ffmpeg-4.2.tar.xz 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 818172fd7..8640fcf1b 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.60.4 +pkgver=2.60.6 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -75,7 +75,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc glib-2.60.4.tar.xz +sha512sums="2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9 glib-2.60.6.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD index 95abb88e6..7ce73da60 100644 --- a/user/gtk-doc/APKBUILD +++ b/user/gtk-doc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk-doc -pkgver=1.30 +pkgver=1.31 pkgrel=0 pkgdesc="Documentation tool for public library API" url="https://www.gtk.org/gtk-doc/" @@ -14,11 +14,6 @@ makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool" checkdepends="bc" source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" -prepare() { - autoreconf -vif - default_prepare -} - build() { export PYTHON="/usr/bin/python3" ./configure \ @@ -37,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fde6aa89cdf0ce59999a17d7f1ecb51e63f93aa7514aeffac6504a357408151f8fb86431050285596e9da2a9612840969a42d7423e8df316e9dadddd5fc1612 gtk-doc-1.30.tar.xz" +sha512sums="5f1bd314cafa5dee53fe3358b66b1f730536306cdec4294327410e86353040a05716e33990af03e221e83f917fab0224eeb22f13ec6cf901e81466eb7c720e86 gtk-doc-1.31.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index 0cc1627dc..c4a6cb641 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -14,14 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild . + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } -sha512sums="3825a79e9f1092af177606d8eb4acaeb0a7022eecc09a5066d6f8f404319e313bc16c7d5f8c22e34f19cbfbfd1dfabd1e01c8df954f8cbdd147c06492ce67245 kactivitymanagerd-5.12.7.tar.xz" +sha512sums="b2c0a65eebd680c3652ee76ced11c6103ddf96ab9d5c6a8b7a15f56b64d2370f55e9f93bb4c73544c46d0822f4f31bb6b2d858eb76a3c9b5fb93223969c0f966 kactivitymanagerd-5.12.8.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index 1bc604c64..229cb371e 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-lang $pkgname-doc" source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="44dd8a9b999dd0f4fb9f5953da7b9af805ba0508b18bbcb8420418049318b095d9553b1723e1ddab8b7d3d48ed42ca75fb0ede17043c2a82c95769938130ad77 kde-cli-tools-5.12.7.tar.xz" +sha512sums="54bed8cd64fb59abdfcea0a346e76cbc79f35b4d7c23e8a072e30b2489d636d47f119c8dc9f254c15b26c3bb69098a864589088ab4e2a1c2669375d1810276c3 kde-cli-tools-5.12.8.tar.xz" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index cf0ef1c81..4890f6185 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b6698fba63f5a9d3d58112ecd2c198e9edb9b0ad9d6c8a670bef3f0e836fcf0c5f2c5444d6cbdf7370f2bfcfe5ad8a770b513ebb7a693c19624bf52bf9d02056 kde-gtk-config-5.12.7.tar.xz" +sha512sums="6ed8dd86ed2f0e5e3ac7ee6010b8ef4441380eab5425e2e98fbdfbf6f756c295956f9fbff61524d55961edd66e212a0f2004aed70be2f97a04634751e3553ebd kde-gtk-config-5.12.8.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 31d3b27db..596214fbf 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdecoration -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev" source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="acebb17f42e46dfcb57b5f94e2612e0c4f773ad15e911543281c578de4a409b8f65a028b458afd01f578abb69906316b3c6f2b6d6edd4918b302a8a26227ad95 kdecoration-5.12.7.tar.xz" +sha512sums="ee93718d25ebf51a61fd8fab8be7138b3bddcbc87422e88e9500c40b72a0211abfa3df168277e7d1cee759bb995ea993d618024979a4d4127729a40b3e910f61 kdecoration-5.12.8.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index 0c929b5f6..4bd1c3710 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -16,14 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,18 +28,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild \ + . + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } -sha512sums="7af90cee5605dd1b3548c033216b57128e3ef99043168a165b75d3a97fd54794182ffb97846bac91cf806ba4e1a82365a5d61c58f8537de43364c626de392bc7 kdeplasma-addons-5.12.7.tar.xz" +sha512sums="3b0a92a90770c718de4065ad9e6f2e7937aa047ecea32ba7c28bf2324d9ad2cd2c825e6bc21a37d494b1d2e5409ba2b4efeaae2be811bee09c9ece2cc3a6941f kdeplasma-addons-5.12.8.tar.xz" diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index 83ed6b482..bd2d6cbb9 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kgamma5 -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Control monitor gamma from KDE 5" url="https://www.KDE.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="074dffc56a333bf88bb1942b3021c690822a234e26d41ff1b2d3e81f7f86f6ac272cb80f6f2552cbc5098880de520aebb8549f2a004608b824ea0c48f4e01cc6 kgamma5-5.12.7.tar.xz" +sha512sums="fdb359cb5b4b48df023657ffbd919421f45f938a7b430f20d0fad6b27d060b9aeaf886cab411d143b8698f041ffa273bc2a5ce4ab468e5e0b3d46bdbe7f6a65d kgamma5-5.12.8.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD index a77c93a0c..0d53161a8 100644 --- a/user/khotkeys/APKBUILD +++ b/user/khotkeys/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=khotkeys -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Hot key mapping for KDE Plasma 5" url="https://www.KDE.org/" @@ -13,10 +13,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev kxmlgui-dev libice-dev libx11-dev plasma-framework-dev plasma-workspace-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz + cmake-fixes.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5cdfb182fc6c5edabc7bd979c86c423243ab390e25981359c68cfb1a258503fdf26b723399f4e3a688212c3a92703aaeb359b7c71ada216657282952dd4092b4 khotkeys-5.12.7.tar.xz" +sha512sums="df60c9d9be901cfeb6cc41e006015b98f373493362c10cf54bc479eb60a3d7ef33aca557497cdae32e351fd413a615620bbc04d53b42bd7ff7de458c36f8c170 khotkeys-5.12.8.tar.xz +1c2558d8b142bc1de236e35b8f55a825f55d4c38c2b5cb2fbf02dcae1128325f45b15246f9c9d874d1afd2a4483df8501877121c6052b6d067892c5fbeca1dc5 cmake-fixes.patch" diff --git a/user/khotkeys/cmake-fixes.patch b/user/khotkeys/cmake-fixes.patch new file mode 100644 index 000000000..6f6bfcc5d --- /dev/null +++ b/user/khotkeys/cmake-fixes.patch @@ -0,0 +1,49 @@ +From ae5743738245437332b1bb670b9a3f8c429211e2 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 10 Feb 2019 20:26:25 +0100 +Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01. + +--- + CMakeLists.txt | 1 + + config-X11.h.cmake | 2 +- + libkhotkeysprivate/conditions/existing_window_condition.h | 1 - + 3 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a96e3b..0955f4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,7 @@ find_package(LibKWorkspace CONFIG REQUIRED) + if(X11_FOUND) + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras ) + set(HAVE_XTEST ${X11_XTest_FOUND}) ++ set(HAVE_X11 1) + endif() + + configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 60286dd..ae8978a 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -41,4 +41,4 @@ + #cmakedefine HAS_RANDR_1_3 1 + + /* Define if you have X11 at all */ +-#define HAVE_X11 ${X11_FOUND} +\ No newline at end of file ++#cmakedefine01 HAVE_X11 +diff --git a/libkhotkeysprivate/conditions/existing_window_condition.h b/libkhotkeysprivate/conditions/existing_window_condition.h +index 92815eb..b6a4278 100644 +--- a/libkhotkeysprivate/conditions/existing_window_condition.h ++++ b/libkhotkeysprivate/conditions/existing_window_condition.h +@@ -26,7 +26,6 @@ + + #include <KConfig> // Needed because of some Qt Status redefinitions + #include <KConfigGroup> // Needed because of some Qt Status redefinitions +-#include <config-kwindowsystem.h> // Needed for HAVE_X11 + #include <config-X11.h> + #include <kdemacros.h> + +-- +cgit v1.1 + diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index ad9169bfc..b757698dd 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kinfocenter -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Information about the running computer" url="https://www.kde.org/applications/system/kinfocenter/" @@ -17,7 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b kinfocenter-5.12.7.tar.xz" +sha512sums="3c473afa486b80a679d6f78c8000b115b65465b7fc5a6c95af35899f6cb50971422203fc28149b534ad6107e1a78b646b96e60fa5be0182fa5cd0b92a2c6da71 kinfocenter-5.12.8.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD index 0ec9952e0..f28736562 100644 --- a/user/kmenuedit/APKBUILD +++ b/user/kmenuedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kmenuedit -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Menu editor for Plasma 5" url="https://www.KDE.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7bc5df0512b58bcc9e403449a3cafd7889a815d17d7387986750477e1420e71fce4d98980a789a16240ef6d2a7f316df9e0a1525c96b89df193aa601a2571062 kmenuedit-5.12.7.tar.xz" +sha512sums="1de4301df485237c0c0c855e7d2f8a4774fb3054ee5c458ea2d58acd2899965cf960a1020e157f394c9a0786e47efb9f0dfa1201718d5ccfbedaeca041974ea2 kmenuedit-5.12.8.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 5157a19ff..e566e197e 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" @@ -21,7 +21,6 @@ source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar kde-np.pam" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -37,17 +36,15 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6 kscreenlocker-5.12.7.tar.xz +sha512sums="d389991d1af70c588c6918305649c6a5616a617fb7f010d7d5b3dfb5b97ec878069deef69676dbd8ac97a4f46b97c1a78b8b32980cafb49294e83021acd4c8f7 kscreenlocker-5.12.8.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD index 513a419e1..2bf88f6b0 100644 --- a/user/ksshaskpass/APKBUILD +++ b/user/ksshaskpass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksshaskpass -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Plasma integration for SSH agents" url="https://www.KDE.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0c613b5263721a510844b24f4311d906f229acdbb72967902973f995b88973f68f13fd098bf702d1281023f17eafb87de388589062da1b58923479e6fe831a7a ksshaskpass-5.12.7.tar.xz" +sha512sums="31181cba266e8fe5bcb7c6ab988a213fefed7e3717af5780e90d69b519b2ef21647d69c60331e9c3745fdb8d9a6b61ae2f02a5573c1d908b8c3fc3cc812580b7 ksshaskpass-5.12.8.tar.xz" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 864e7add2..54c227779 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksysguard -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -19,7 +19,6 @@ source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,15 +34,13 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="745958c74914d9b21373919b0e54cf7d1dd0621769aa8a480bac924862c494c68c86fa36c019fb13d71d8d86c8d923161290ef9a967b98c1182df88da63bbb35 ksysguard-5.12.7.tar.xz +sha512sums="9ea21ba61866f1b36f15f41011dfcab562ede45cc3403f030184680f6e3b0717fc5ac774089784a3d14015728c3b721887083154b32b786e804dfc1aace89585 ksysguard-5.12.8.tar.xz 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch 0a424bb5e23f283d0cccfe86c0a6c2915f563a82e27a1dc16be8b4dc4b3d90ce116c4eb448dd1d5dc07602225468880206a5eb70c1b66d1e19e9a405fae7aa88 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index e25ff42ac..02c40e3c0 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -27,7 +27,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -43,13 +42,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="acb58cd5681727aa2ebcfb75d2abc3ea636811b490d8b15a4b89e55cfb81ce8aeed9568a52d4d1c3274852f26823ec5301a6721d9be64ba9a2b65e04f6029760 kwin-5.12.7.tar.xz" +sha512sums="56b4cb7ffb8df382fbea7c21cff529241e9cf124d97f08ec94dff8d91bcdb8df43c5d1471b63bf608594d23cb430e79ee96ebc25b75233105a3f8750c7f46fd0 kwin-5.12.8.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index c241f9e62..20754ea80 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkscreen -pkgver=5.12.7 -pkgrel=1 +pkgver=5.12.8 +pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" arch="all" @@ -16,7 +16,6 @@ subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland" source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,12 +31,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -55,4 +52,4 @@ wayland() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ } -sha512sums="fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c libkscreen-5.12.7.tar.xz" +sha512sums="773b6782cbe7da02b7bcbe889e98d613321d7e80aa3af7643dd0e21776e2a688f31f83c5429a17a956fb9715c788e90aae80f650a11bf80b667eae948169893a libkscreen-5.12.8.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index f74519692..e8a05e1d1 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libksysguard -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -18,7 +18,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,13 +33,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="78a063606567632c19a7f1c9d2e7d69634432f3e49bb08a3162805aeb94e0930f2d43e9372207512558b785b8c7e20fdca801de35c055e456ac3cb812bd96efa libksysguard-5.12.7.tar.xz" +sha512sums="9913b5491ad8305efa20e933db3a108da93b83323cde33cdef24f3b40beadb166de99cbd5cbde033d82de913c5a66b493860f9d14351a7b20c401bd1a5648039 libksysguard-5.12.8.tar.xz" diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index fe9b06d4a..787a48375 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=milou -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e46395992fd53ec9f230790d4e0eccfb91f925729088f0c8d602524828ce4ff2a55bbcab843daa66c57eff20393c291f9e0f860a4b4b11fc834374b386fcfdbd milou-5.12.7.tar.xz" +sha512sums="87b34643c32e9c57cc3aa8b12b536d2cb1bf38fb8f4c4ea7df7b6022c498d3f3d796cb825b14d9fa7b636c30bfb2d136d4771b68e9951d4e5e9fc98bd4a53a28 milou-5.12.8.tar.xz" diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 6b6ce9a71..576de2514 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mplayer pkgver=1.4 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source media player and ripper" url="https://mplayerhq.hu" arch="all" diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index 33ca734d6..9c12a7aa6 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mpv pkgver=0.29.1 -pkgrel=1 +pkgrel=2 pkgdesc="An improved fork of mplayer" url="https://mpv.io" arch="all" @@ -23,7 +23,6 @@ subpackages="$pkgname-doc" source="mpv-$pkgver.tar.gz::https://github.com/mpv-player/mpv/archive/v$pkgver.tar.gz" build() { - cd "$builddir" python3 ./bootstrap.py python3 ./waf configure \ --prefix=/usr \ @@ -41,7 +40,6 @@ build() { } package() { - cd "$builddir" python3 ./waf install --destdir="$pkgdir" } diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index 6933df4d5..e94059d0b 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=oxygen -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="20e448f223c13f60b929d3fe0be4070868ddf9189a1108b2a798ce08ca654db082798c6389e6dbd06dcc72fff061e3178c805c9f1fb595b1649235e0ec5231ff oxygen-5.12.7.tar.xz" +sha512sums="d6d60c295eab7e1d8eb453c3150ad50fa387dc6ad8f2950ed53df320ccd2499397b35561dafcf7c3f4faef84039a9c1f54ad19b69a42c100d453ad87420982b3 oxygen-5.12.8.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index 963cfc1dd..4d7883931 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-desktop -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -25,10 +25,11 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz + cmake-fixes.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -45,13 +46,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d plasma-desktop-5.12.7.tar.xz" +sha512sums="dc55d9a894c52c44cd2aff844793e038dd66854862a212d47dfb0144dd489c3ae8d2c4e289a1e76c3d31ca68a8543bb511623f96617db799d28009736591c58f plasma-desktop-5.12.8.tar.xz +45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch" diff --git a/user/plasma-desktop/cmake-fixes.patch b/user/plasma-desktop/cmake-fixes.patch new file mode 100644 index 000000000..c6457351a --- /dev/null +++ b/user/plasma-desktop/cmake-fixes.patch @@ -0,0 +1,174 @@ +From bcd8015eaf3638fca0e369955aa1a4290d079ef8 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 31 Mar 2019 19:49:40 +0200 +Subject: Harmonize use of HAVE_X11, using cmakedefine01. + +Fixes: config-X11.h:44:18: warning: "TRUE" is not defined, evaluates to 0 [-Wundef] + +It should *all* be ported to cmakedefine01... +--- + CMakeLists.txt | 3 +++ + config-X11.h.cmake | 2 +- + kcms/fonts/fonts.cpp | 4 ++-- + kcms/fonts/fonts.h | 4 ++-- + 4 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 036d781..df43295 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,6 +88,9 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" + TYPE REQUIRED + PURPOSE "Required for building the X11 based workspace" + ) ++if(X11_FOUND) ++ set(HAVE_X11 1) ++endif() + + find_package(UDev) + set_package_properties(UDev PROPERTIES DESCRIPTION "UDev library" +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 60286dd..ae8978a 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -41,4 +41,4 @@ + #cmakedefine HAS_RANDR_1_3 1 + + /* Define if you have X11 at all */ +-#define HAVE_X11 ${X11_FOUND} +\ No newline at end of file ++#cmakedefine01 HAVE_X11 +diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp +index f336518..218c3eb 100644 +--- a/kcms/fonts/fonts.cpp ++++ b/kcms/fonts/fonts.cpp +@@ -224,7 +224,7 @@ + } + + /**** FontAASettings ****/ +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + FontAASettings::FontAASettings(QWidget *parent) + : QDialog(parent), + changesMade(false) +@@ -501,13 +501,13 @@ + + void FontAASettings::changed() + { +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + changesMade = true; + enableWidgets(); + #endif + } + +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + int FontAASettings::exec() + { + const int i = QDialog::exec(); +@@ -643,7 +643,7 @@ + QGridLayout *lay = new QGridLayout(); + layout->addLayout(lay); + lay->setColumnStretch(3, 10); +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + QLabel *label = 0L; + label = new QLabel(i18n("Use a&nti-aliasing:"), this); + label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); +@@ -692,7 +692,7 @@ + lay->addWidget(spinboxDpi, 1, 1); + layout->addStretch(1); + +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + aaSettings = new FontAASettings(this); + #endif + +@@ -720,7 +720,7 @@ + fontUseList.at(i)->setDefault(); + } + +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + useAA = AASystem; + cbAA->setCurrentIndex(useAA); + aaSettings->defaults(); +@@ -739,7 +739,7 @@ + (*it)->readFont(); + } + +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + useAA_original = useAA = aaSettings->load() ? AAEnabled : AADisabled; + cbAA->setCurrentIndex(useAA); + #endif +@@ -762,7 +762,7 @@ + spinboxDpi->setValue(dpicfg); + dpi_original = dpicfg; + }; +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + if (cfgfonts.readEntry("dontChangeAASettings", true)) { + useAA_original = useAA = AASystem; + cbAA->setCurrentIndex(useAA); +@@ -791,7 +791,7 @@ + } else { + cfgfonts.writeEntry("forceFontDPI", dpi); + } +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + cfgfonts.writeEntry("dontChangeAASettings", cbAA->currentIndex() == AASystem); + #endif + cfgfonts.sync(); +@@ -817,7 +817,7 @@ + // Don't overwrite global settings unless explicitly asked for - e.g. the system + // fontconfig setup may be much more complex than this module can provide. + // TODO: With AASystem the changes already made by this module should be reverted somehow. +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + bool aaSave = false; + if (cbAA->currentIndex() == AAEnabled ) { + aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled); +@@ -870,7 +870,7 @@ + + void KFonts::slotUseAntiAliasing() + { +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + useAA = static_cast< AASetting >(cbAA->currentIndex()); + aaSettingsButton->setEnabled(useAA == AAEnabled); + emit changed(true); +@@ -879,7 +879,7 @@ + + void KFonts::slotCfgAa() + { +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + if (aaSettings->exec()) { + emit changed(true); + } +diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h +index f7ade6b..d760e52 100644 +--- a/kcms/fonts/fonts.h ++++ b/kcms/fonts/fonts.h +@@ -80,7 +80,7 @@ + + public: + +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + FontAASettings(QWidget *parent); + + bool save(KXftConfig::AntiAliasing::State aaState); +@@ -135,7 +135,7 @@ + void slotCfgAa(); + + private: +-#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) ++#if defined(HAVE_FONTCONFIG) && HAVE_X11 + enum AASetting { AAEnabled, AASystem, AADisabled }; + AASetting useAA, useAA_original; + QComboBox *cbAA; +-- +cgit v1.1 diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index 2b3981303..fbd0642e0 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-integration -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,13 +34,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b33b1b2d044f36b3dad8bf854acb9a1f94be527c9c9b84d18a58323ab249a63276ee91553b6d92fd77b347a52d6dc4c10c080e0333dd31d4ef1f6058cb557fe0 plasma-integration-5.12.7.tar.xz" +sha512sums="81c0c14680eee8b81e303ebf874dec11b43cee65f210eed90594a5496f83d59aa8527bb31aab82cc5a045c37ab954b07c6c023083b134d755b8b02bf0c041938 plasma-integration-5.12.8.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD index d4d5fc2d3..e42251f11 100644 --- a/user/plasma-workspace-wallpapers/APKBUILD +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace-wallpapers -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Default wallpapers from KDE" url="https://www.KDE.org/" @@ -13,7 +13,6 @@ subpackages="" source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,13 +28,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7abda6e4cf223a72222ab2f2b3d8deb631b7ce1e6a415697c367acb53ae5f653fc8dbf6ddd631ff7a1888c2293d102bc0ba1753e50419138f7c9d7d2ea5f08a9 plasma-workspace-wallpapers-5.12.7.tar.xz" +sha512sums="9ac764a16eead6cebbeb720548b15946eba619d5de1d2bb5f74f65f85fa14565e42a26c91a23a3473d4ad4b0c819c0a50a92891018b8ee29e5909229932f1622 plasma-workspace-wallpapers-5.12.8.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 3d60e96e2..036b2b456 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -29,10 +29,11 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev kwallet-dev kwayland-dev kwin-dev kxmlrpcclient-dev libksysguard-dev plasma-framework-dev prison-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz + cmake-fixes.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -49,13 +50,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623 plasma-workspace-5.12.7.tar.xz" +sha512sums="c19d338117c5d9b05581fc1be7d99fc60f4453a009a04ddf3609add1fef7ad08bdd0d0c19c0f4151484253036cc444d8301c3fb8ee0d29d8ecc19d9929a9ff8b plasma-workspace-5.12.8.tar.xz +39ea169f50b98fd2dd246396133a3e8d9c844409338c9c3ecd79474945377886c5d1050205ad73c3d8c789315e8a4353311bafa9f1ddd22f25403b3ed7f30fde cmake-fixes.patch" diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch new file mode 100644 index 000000000..16307ce31 --- /dev/null +++ b/user/plasma-workspace/cmake-fixes.patch @@ -0,0 +1,89 @@ +From c534fdf1ba34d0ea8a08b9b5266384a3243271e0 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 10 Feb 2019 20:21:57 +0100 +Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01 everywhere + +I got "#define HAVE_X11 TRUE" and errors because of that where #if was +used. + +This also obeys the logic that HAVE_X11 is set (in the toplevel +CMakeLists.txt) not only when X11_FOUND but also when XCB is found. +--- + appmenu/appmenu.cpp | 2 +- + config-X11.h.cmake | 2 +- + libkworkspace/config-libkworkspace.h.cmake | 2 +- + runners/windows/config-windowsrunner.h.cmake | 2 +- + shell/scripting/appinterface.cpp | 2 +- + soliduiserver/soliduiserver.cpp | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp +index 7c956c6..4ab7106 100644 +--- a/appmenu/appmenu.cpp ++++ b/appmenu/appmenu.cpp +@@ -106,7 +106,7 @@ AppMenuModule::~AppMenuModule() = default; + + void AppMenuModule::slotWindowRegistered(WId id, const QString &serviceName, const QDBusObjectPath &menuObjectPath) + { +-#ifdef HAVE_X11 ++#if HAVE_X11 + if (KWindowSystem::isPlatformX11()) { + auto *c = QX11Info::connection(); + +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 60286dd..ae8978a 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -41,4 +41,4 @@ + #cmakedefine HAS_RANDR_1_3 1 + + /* Define if you have X11 at all */ +-#define HAVE_X11 ${X11_FOUND} ++#cmakedefine01 HAVE_X11 +diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/config-libkworkspace.h.cmake +index 36a826e..c3ae6d7 100644 +--- a/libkworkspace/config-libkworkspace.h.cmake ++++ b/libkworkspace/config-libkworkspace.h.cmake +@@ -1,2 +1,2 @@ + /* Define if you have X11 at all */ +-#define HAVE_X11 ${X11_FOUND} +\ No newline at end of file ++#cmakedefine01 HAVE_X11 +diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows/config-windowsrunner.h.cmake +index 36a826e..c3ae6d7 100644 +--- a/runners/windows/config-windowsrunner.h.cmake ++++ b/runners/windows/config-windowsrunner.h.cmake +@@ -1,2 +1,2 @@ + /* Define if you have X11 at all */ +-#define HAVE_X11 ${X11_FOUND} +\ No newline at end of file ++#cmakedefine01 HAVE_X11 +diff --git a/shell/scripting/appinterface.cpp b/shell/scripting/appinterface.cpp +index bd66cd2..a0ad73c 100644 +--- a/shell/scripting/appinterface.cpp ++++ b/shell/scripting/appinterface.cpp +@@ -37,7 +37,7 @@ + #include <windows.h> + #endif + +-#ifdef HAVE_X11 ++#if HAVE_X11 + #include <X11/Xlib.h> + #include <fixx11h.h> + #endif +diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp +index 3ec09c0..d06a1e6 100644 +--- a/soliduiserver/soliduiserver.cpp ++++ b/soliduiserver/soliduiserver.cpp +@@ -219,7 +219,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI + + KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent + +-#ifdef HAVE_X11 ++#if HAVE_X11 + if (modal) { + KWindowSystem::setState(dialog->winId(), NET::Modal); + } else { +-- +cgit v1.1 + diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index 91da76bb6..16bb82b24 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=powerdevil -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e85f93f494d2ce86676269c1bfe49d59a855bbcd5f260bc3205e3b2ef38de5dd17ee47397eca3280e9dcb484c80b79c670a1b2e089891d5090e9ee935504d4c9 powerdevil-5.12.7.tar.xz" +sha512sums="ad159287ababd4410d2277bc43c0f006209f457a1c08ba903db25f60c62be95fd3b114abd56d5c64ebaccbecb523338766bc28468dc54fa7fc072f6381b8e181 powerdevil-5.12.8.tar.xz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 8e07f64aa..42039bf3d 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -5,12 +5,13 @@ pkgname=py3-lxml _pkgname=lxml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.3.4 +pkgver=4.4.0 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" arch="all" options="!check" # No test suite. +# Certified net clean license="BSD-3-Clause" depends="" makedepends="python3-dev libxml2-dev libxslt-dev" @@ -25,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed lxml-4.3.4.tar.gz" +sha512sums="21db932bc0897fec0d8b0d7bc71ff8e8b5d447016691b5d438cb7c835a1dfe5c154da44bbbbde59af35faf11a67055e58160ae810ee75ab0759039396bcf2482 lxml-4.4.0.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index 0f7a0ab72..00dcf775d 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -4,11 +4,12 @@ pkgname=py3-mako _pkgname=Mako _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.12 +pkgver=1.1.0 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" arch="noarch" +# Certified net clean license="MIT" depends="python3" makedepends="python3-dev" @@ -22,11 +23,11 @@ build() { } check() { - python3 setup.py test + py.test } package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="aa295880c07938425e661b8865fed7cf398ac257d6b84bdbef5a2c542bbae79cd27df363e81c10450c9b6c8e038360166480b06e701d5a5affeb7bd03a7f5d83 Mako-1.0.12.tar.gz" +sha512sums="acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4 Mako-1.1.0.tar.gz" diff --git a/user/py3-websockets/APKBUILD b/user/py3-websockets/APKBUILD index d3db557cb..2655259cf 100644 --- a/user/py3-websockets/APKBUILD +++ b/user/py3-websockets/APKBUILD @@ -4,11 +4,12 @@ pkgname=py3-websockets _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=8.0 +pkgver=8.0.2 pkgrel=0 pkgdesc="Python implementation of RFCs 6455 and 7692" url="https://pypi.org/project/websockets/" arch="all" +# Certified net clean license="BSD-3-Clause" depends="python3" makedepends="python3-dev" @@ -29,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="8ae408224367b4e1fcab4d39758f75902072b15e833ed9db41afc9b69deb8cb6f1c538c200785e260cd890f31562feaeb99bdbcec445c5561714a9f08b936f6f websockets-8.0.tar.gz" +sha512sums="d2a1a4c781776ec621e63e020033b1d6a6b35109d7648940a980f01067edc39fbdb49cde6ab606319584cc75d0d5f16c34fec7a308b14eaf672a5730e84c3791 websockets-8.0.2.tar.gz" diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD index 99c1b1838..4e68d859c 100644 --- a/user/py3-zope-deferredimport/APKBUILD +++ b/user/py3-zope-deferredimport/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-zope-deferredimport _pkgname=zope.deferredimport -pkgver=4.3 +pkgver=4.3.1 pkgrel=0 pkgdesc="Zope module that allows for lazy module importing" url="https://github.com/zopefoundation/zope.deferredimport" @@ -16,13 +16,11 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="0b62cf6caa7709dbb6b0ae85bf9c5e24909c79af57da8e3d081e69ff9f73fc60fbe5a83cdfe795551eeee3c045d3783a09cb3e6eb3964a44e6fbbea149ca3f8a zope.deferredimport-4.3.tar.gz" +sha512sums="1c367def232ec79ad10a9d8f1e068598d2fdb49b067c2c3f44c9ad25c198afbbf2d52659c3795aad76f8c82d212e49086b81ab1c1dcc6aac2e3ce66c35ff5750 zope.deferredimport-4.3.1.tar.gz" diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 19d4af447..6a8deccf3 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> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=sddm-kcm -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -14,10 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev knewstuff-dev" install_if="systemsettings sddm" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz + qt59.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +34,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="29d7b03378a6d5a3d58a0c2b85f6dbe4d0114785456072f16872cd09e7ce355f4e59149e31cb69fe7fbb35678c6fc075c788a091c3b638661a64a856aa4a145b sddm-kcm-5.12.7.tar.xz" +sha512sums="dbf341868837044a12d50c9292fefaf6a28cd3da48b91a0516f9709c63124ab2ccc73e3472d78dd41209fd07532126bb94059d1b27bf877e61deb1b3cbd5ac64 sddm-kcm-5.12.8.tar.xz +698bdd605b96655dc2038378cb3a749101c0dcc19cf7ba996f4d64ec6281e8541efb313b8dbf6095181766ab5a5bb3d2fecd25267e61b848dc4f08f89cde9bde qt59.patch" diff --git a/user/sddm-kcm/qt59.patch b/user/sddm-kcm/qt59.patch new file mode 100644 index 000000000..977874172 --- /dev/null +++ b/user/sddm-kcm/qt59.patch @@ -0,0 +1,28 @@ +From e2f7ead351eedf245c2bb1840053288d18d5c0fc Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Tue, 5 Mar 2019 14:05:21 +0000 +Subject: Revert "Fix autologin session loading" + +It introduces Qt API > 5.8 which Plasma 5.12 depends on + +This reverts commit 634a2dd1bef5dd8434db95a391300f68f30fd14e. +--- + src/sessionmodel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp +index 08fe05d..9e52b12 100644 +--- a/src/sessionmodel.cpp ++++ b/src/sessionmodel.cpp +@@ -64,7 +64,7 @@ void SessionModel::loadDir(const QString &path, SessionType type) + QFile inputFile(dir.absoluteFilePath(session)); + if (!inputFile.open(QIODevice::ReadOnly)) + continue; +- SessionPtr si { new Session { session.chopped(strlen(".desktop")), QString(), QString(), QString() } }; ++ SessionPtr si { new Session { session, "", "", "" } }; + bool isHidden = false; + QString current_section; + QTextStream in(&inputFile); +-- +cgit v1.1 + diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 58d109aed..3fa213be7 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=systemsettings -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cc8f5cdd2275816f1e7c6af2b5d06a018a35646460a71ce6ec7ab7dda7d286139836b3625239cb45316f2f7dd1f12d260ffdb44064b349948d93929654363735 systemsettings-5.12.7.tar.xz" +sha512sums="00dc0c39004bfd8938610ef6e0c08dc1d0c8738e7b3f7f4044586c0628d5a574c07f9a69bfa288ab8c3dd7beced4d5fa4b8ba34ace35668a53b364534d929d78 systemsettings-5.12.8.tar.xz" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 5af50c850..3fb5df741 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.2 -pkgrel=1 +pkgver=3.2.1 +pkgrel=0 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" @@ -37,16 +37,16 @@ build() { } check() { - # imagejob, cite, csv: needs running X11 + # imagejob, cite, csv, pdf: needs running X11 # htmlexporter: needs plasma desktop # filelisting: needs dbus # tellicoread: needs network - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|tellicoread)test' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread)test' } package() { make DESTDIR="$pkgdir" install } -sha512sums="a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd tellico-3.2.tar.xz +sha512sums="ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b tellico-3.2.1.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD index 7864d7720..cddcb2960 100644 --- a/user/user-manager/APKBUILD +++ b/user/user-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=user-manager -pkgver=5.12.7 +pkgver=5.12.8 pkgrel=0 pkgdesc="Manage user accounts from KDE" url="https://www.KDE.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f user-manager-5.12.7.tar.xz" +sha512sums="2dd6ce318bede7fea7e80e54e1f9432b0dfa5e99e34def28d91c99230de175a9d84acf6c3a4b0c27fb311a34ddd3d98b0d7dbf3cbacd0e030c880b853279430d user-manager-5.12.8.tar.xz" diff --git a/user/zstd/APKBUILD b/user/zstd/APKBUILD deleted file mode 100644 index e47eceb12..000000000 --- a/user/zstd/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=zstd -pkgver=1.4.0 -pkgrel=0 -pkgdesc="Fast real-time compression algorithm" -url="https://facebook.github.io/zstd/" -arch="all" -license="BSD-3-Clause AND GPL-2.0-only" -depends="" -makedepends="lz4-dev xz-dev zlib-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver.tar.gz" - -build() { - make PREFIX="/usr" -} - -check() { - make PREFIX="/usr" check -} - -package() { - make PREFIX="/usr" DESTDIR="$pkgdir" install -} - -sha512sums="ef6d95639593fed3cfb9ff4f1527c4ba38658e42f16eb3369b2a4bbe150905751bb71c6e3fe9c8bbdfceee26a540ae3e41bd0f0bc692d36db444b7da65a6e304 zstd-1.4.0.tar.gz" |