diff options
Diffstat (limited to 'user')
733 files changed, 9379 insertions, 6175 deletions
diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD index 4996402cb..d63dd1819 100644 --- a/user/adwaita-icon-theme/APKBUILD +++ b/user/adwaita-icon-theme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adwaita-icon-theme -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="GNOME system icon set" url="https://www.gnome.org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5414e4e38d9ffdd5ae8e14cb2f467fc449ca833b3ffd888fa8dde8708ba0cd9292bec8d3c0bc9d917c3117a8d21f828d4113a85c3786d5dcadde46367659934 adwaita-icon-theme-3.36.0.tar.xz" +sha512sums="5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9 adwaita-icon-theme-3.36.1.tar.xz" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 8681e7991..25cbe8d4d 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2 akonadi-contacts-19.12.3.tar.xz" +sha512sums="ccb65c3874853dc9d9f9dd5b39d8f541357d49543386302c99bd1e978d87c9c5b9aee45f5e5589a4f61a04fd82a2867baf1d4fac0936036559957a9be463bb2d akonadi-contacts-20.04.3.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 013d8e49c..238d026f5 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251 akonadi-mime-19.12.3.tar.xz" +sha512sums="a22c8eaa5912fc2b13cf018b89062063157eb87570a9367d9fc4cabdf87e132fc564c81b21583fd0693b7ae4b2f13da6e2f7d6683a441ac2f320f594123bde0a akonadi-mime-20.04.3.tar.xz" diff --git a/user/akonadi-search/APKBUILD b/user/akonadi-search/APKBUILD new file mode 100644 index 000000000..8e1957d8f --- /dev/null +++ b/user/akonadi-search/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=akonadi-search +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Search functionality for Akonadi" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND GPL-2.0-only AND GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcmutils-dev kconfig-dev + kcrash-dev kdbusaddons-dev ki18n-dev kio-dev krunner-dev akonadi-dev + akonadi-mime-dev boost-dev kcalendarcore-dev kcontacts-dev kmime-dev + xapian-core-dev kauth-dev kcodecs-dev kcoreaddons-dev kitemmodels-dev + kjobwidgets-dev kpackage-dev kservice-dev solid-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-search-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # sqlite backend requires D-Bus server. + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'akonadi-sqlite*' +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="902fdef259863d0d0789af29d7ac5cf49e0b95df4f3509a444a20fefd9948c134e024a685bddc1c547efef6d2ef7872d00e5a1f3ecb836b88103d17de47ce413 akonadi-search-20.04.3.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 2b8ba158a..77c35b8ac 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -18,6 +18,7 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc + atomics.patch " build() { @@ -47,5 +48,6 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 akonadi-19.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" +sha512sums="29612920af6794f096d6ae51d98830f38f4d94bfb3669e11b748fbf7556b2396fac1837f1ee14cfdbc2285164c8b08206d2d46a62d0929354af47c77d9978698 akonadi-20.04.3.tar.xz +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc +6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch" diff --git a/user/akonadi/atomics.patch b/user/akonadi/atomics.patch new file mode 100644 index 000000000..078501362 --- /dev/null +++ b/user/akonadi/atomics.patch @@ -0,0 +1,10 @@ +--- akonadi-20.04.2/src/server/CMakeLists.txt.old 2020-06-02 07:09:51.000000000 +0000 ++++ akonadi-20.04.2/src/server/CMakeLists.txt 2020-06-16 00:56:48.253282683 +0000 +@@ -170,6 +170,7 @@ + set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver) + target_link_libraries(libakonadiserver + akonadi_shared ++ atomic + KF5AkonadiPrivate + Qt5::Core + Qt5::Network diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index fa4d4c35d..685cfa1cb 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.2 +pkgver=8.0.3 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -14,9 +14,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtwebkit-dev kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev kpackage-dev plasma-framework-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz - webkit.patch - " +source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz -0a9db2efedb01bcd31a3d15890b00f2186d4ff1fc37426f09bd659ae757afca15f996a52f4b6cc64b6b8dfd7010683bbb6e72c8e89a3332b37f4c85828e2de76 webkit.patch" +sha512sums="04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e alkimia-8.0.3.tar.xz" diff --git a/user/alkimia/webkit.patch b/user/alkimia/webkit.patch deleted file mode 100644 index 224ac2e8b..000000000 --- a/user/alkimia/webkit.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- alkimia-8.0.2/src/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000 -+++ alkimia-8.0.2/src/CMakeLists.txt 2020-01-14 09:56:58.676667188 +0000 -@@ -115,7 +115,6 @@ - alkimia-internal - ${QT_USE_LIBSPREFIX}Core - ${ALKIMIA_LIBS} -- ${QT_USE_LIBSPREFIX}WebKit - ${QT_USE_LIBSPREFIX}DBus - PUBLIC - ${MP_LIBRARIES} ---- alkimia-8.0.2/autotests/CMakeLists.txt.old 2019-09-06 16:21:26.211957302 +0000 -+++ alkimia-8.0.2/autotests/CMakeLists.txt 2020-01-14 09:57:05.305955497 +0000 -@@ -5,7 +5,7 @@ - ${QT_USE_LIBSPREFIX}Test - ${QT_USE_LIBSPREFIX}Core - ${QT_USE_LIBSPREFIX}DBus -- ${QT_USE_LIBSPREFIX}WebKit -+ ${QT_USE_LIBSPREFIX}WebKitWidgets - ${MP_LIBRARIES} - ) - ---- alkimia-8.0.2/tests/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000 -+++ alkimia-8.0.2/tests/CMakeLists.txt 2020-01-14 09:57:10.785367251 +0000 -@@ -3,7 +3,7 @@ - alkimia - alkimia-internal - ${QT_USE_LIBSPREFIX}Core -- ${QT_USE_LIBSPREFIX}WebKit -+ ${QT_USE_LIBSPREFIX}WebKitWidgets - ) - - if(BUILD_QT4) diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD index 6023176f3..2ac0989d2 100644 --- a/user/alpine/APKBUILD +++ b/user/alpine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=alpine -pkgver=2.22 +pkgver=2.23 pkgrel=0 pkgdesc="Terminal-based email client" url="http://alpine.x10host.com/alpine/" @@ -11,14 +11,7 @@ depends="" makedepends="aspell-dev krb5-dev linux-pam-dev ncurses-dev openldap-dev openssl-dev autoconf automake libtool" subpackages="$pkgname-doc" -source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz - support-musl.patch - " - -prepare() { - default_prepare - autoreconf -vif -} +source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz" build() { ./configure \ @@ -39,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1 alpine-2.22.tar.xz -f26aaac4f81762227254e913f15c18b444e89d92b6885d62755d673d1f3097a126d297dc655b619d91b83bf5645ed0b4d5454c74a95cc142cd5fe3cb391e81cd support-musl.patch" +sha512sums="abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b alpine-2.23.tar.xz" diff --git a/user/alpine/support-musl.patch b/user/alpine/support-musl.patch deleted file mode 100644 index a63a351d9..000000000 --- a/user/alpine/support-musl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -726,7 +726,7 @@ - else - dnl preload c-client default locations/options - case $host in -- *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) -+ *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*|*-linux-musl*) - if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then - alpine_SSLTYPE="nopwd" - if test -d /etc/pki/tls ; then -@@ -1070,7 +1070,7 @@ - dnl build from c-client. Most of this will go away when c-client - dnl adopts configure - case "$host" in -- *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) -+ *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*|*-linux-musl*) - alpine_path_delim="/" - alpine_mode_readonly="(0600)" - if test -f /etc/fedora-release ; then diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index f4e12d964..d44a0451f 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9 analitza-19.12.3.tar.xz" +sha512sums="25a5f20505f27902623029f0da416209186dd8274479c808a466225759efb0389816388e2fc77e708362ebde4815ca298840d67c98cbd43f516b73d66159c629 analitza-20.04.3.tar.xz" diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD index ea5d40f04..bb36e3fbb 100644 --- a/user/ant/APKBUILD +++ b/user/ant/APKBUILD @@ -3,11 +3,12 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=ant -pkgver=1.10.6 +pkgver=1.10.8 pkgrel=0 pkgdesc="Java-based build tool" url="http://ant.apache.org/" arch="noarch" +options="!check" # ExecStreamRedirectorTest locks on ppc64, SMTP tests fail license="Apache-2.0" depends="openjdk8" makedepends="" @@ -21,6 +22,10 @@ builddir="$srcdir/apache-$pkgname-$pkgver" _anthome="/usr/lib/java/$pkgname" +# secfixes: +# 1.10.8-r0: +# - CVE-2020-1945 + build() { sh ./bootstrap.sh ./bootstrap/bin/ant dist-lite @@ -54,7 +59,7 @@ package() { install -m644 -D $srcdir/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh } -sha512sums="2bef0cf5f53ce9fa6e9dc7a673745f75bcd0df027f9ff07442cf66bc8d7d99e022153b08d20d314061b497763e85d587c3087952b3f5730e5a19b2656f3236fb apache-ant-1.10.6-src.tar.gz -955fe52b415d57716df1338eff6d667d80e06a67bffd53def7d63d96f1224157b724a92df647afe8b3243dea749e221aec1e86d5be01060408fa000ec1132374 ant.sh -9a698041a06ccc6db7765133fc6fabc6f2d0e70b96ff9de594bd836fc05ac33f489968a4fdd12fe044458eb3b99e905ca1e2a62a55acdbacebff9782c82a27de imageio_fix_java_test.patch -1457c7415df1e80c8763b4db9f41cbdebfa58e17bcd263dae9ce31f9ee601650b51a893e4e0a324c974b60a6c2076fddfd78180baca0bcdbff65e9e88b30e063 imageio_fix_test.patch" +sha512sums="08312b38db21f0e9b32cbe45aebe42ff8abbc1feab0f7343c9c60ea751fb9ad3a92ecd36cdf89bc1cc77a381c945da6194fc611b26e385a915d8e2404cc168c6 apache-ant-1.10.8-src.tar.gz +955fe52b415d57716df1338eff6d667d80e06a67bffd53def7d63d96f1224157b724a92df647afe8b3243dea749e221aec1e86d5be01060408fa000ec1132374 ant.sh +9a698041a06ccc6db7765133fc6fabc6f2d0e70b96ff9de594bd836fc05ac33f489968a4fdd12fe044458eb3b99e905ca1e2a62a55acdbacebff9782c82a27de imageio_fix_java_test.patch +1457c7415df1e80c8763b4db9f41cbdebfa58e17bcd263dae9ce31f9ee601650b51a893e4e0a324c974b60a6c2076fddfd78180baca0bcdbff65e9e88b30e063 imageio_fix_test.patch" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 48fcaf26d..a14c25cc8 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=apache-httpd _pkgreal=httpd -pkgver=2.4.43 +pkgver=2.4.46 pkgrel=0 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" @@ -37,6 +37,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" options="suid !check" # secfixes: http_server +# 2.4.46-r0: +# - CVE-2020-9490 +# - CVE-2020-11984 +# - CVE-2020-11993 # 2.4.43-r0: # - CVE-2020-1934 # - CVE-2020-1927 @@ -146,7 +150,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="d9879b8f8ef7d94dee1024e9c25b56d963a3b072520878a88a044629ad577c109a5456791b39016bf4f6672c04bf4a0e5cfd32381211e9acdc81d4a50b359e5e httpd-2.4.43.tar.gz +sha512sums="5801c1dd0365f706a5e2365e58599b5adac674f3c66b0f39249909841e6cdf16bfdfe001fbd668f323bf7b6d14b116b5e7af49867d456336fad5e685ba020b15 httpd-2.4.46.tar.gz c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd diff --git a/user/apkfoundry/APKBUILD b/user/apkfoundry/APKBUILD new file mode 100644 index 000000000..007c3d913 --- /dev/null +++ b/user/apkfoundry/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=apkfoundry +pkgver=0.5 +pkgrel=0 +pkgdesc="APK build orchestrator and distribution builder" +url="https://dev.sick.bike/apkfoundry/" +arch="all" +options="!check" # Cannot be run inside itself. +license="GPL-2.0-only AND MIT" +depends="bubblewrap-nosuid python3 shadow-uidmap" +makedepends="" +subpackages="$pkgname-doc" +source="https://dev.sick.bike/dist/apkfoundry-$pkgver.tar.gz" + +build() { + cat >config.mk <<-EOF + DEFAULT_ARCH = $CARCH + EOF + make configure + make +} + +check() { + make check +} + +package() { + make install DESTDIR="$pkgdir" +} + +sha512sums="169caf3b594929814c87fa7a3b7d8e56476a7862d64eaf7bfdf13468c4258e8879f5de738758de39631085a5cbae4b47f7656b4335bb4d7fafd2abce834ee233 apkfoundry-0.5.tar.gz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index f6240a428..048af3204 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a ark-19.12.3.tar.xz" +sha512sums="6274483bc7cad9b8b3842a622a3f243fd5756aec147624eb9041459efd5c833e203c286412185bb105133d8c83a7503c8c7e519b8cb9cbd13830793c3429e142 ark-20.04.3.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index a66845948..0441318f7 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32 artikulate-19.12.3.tar.xz" +sha512sums="ee7292aff6a4639f310284e2d508dcecad49f9b12550dfa9616e8a56f6955ae3b872733e20f7ba0135321a16bc9cc7b3fc72019b1e4b8ff00d8df31124f8c0ab artikulate-20.04.3.tar.xz" diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index a3bade532..ff226f2fe 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pl -pkgver=20190107 +pkgver=20200619 pkgrel=0 pkgdesc="Polish dictionaries for aspell" url="https://sjp.pl/slownik/ort/" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="https://distfiles.adelielinux.org/source/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2" +source="https://dev.sick.bike/dist/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz"2 builddir="$srcdir/aspell6-pl-6.0_$pkgver-0" build() { @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a898462495e4797173141f2f82ce74fadb80dfc469e7c4b44871f2622137d5958fad30fd0525ac9cf7a07c31b74d805bb789f022ccbcacadd0d4d1f172986665 sjp-aspell6-pl-6.0_20190107-0.tar.bz2" +sha512sums="76be557382fbc255b32c1be13124090ce65514b2472e57a7205fdeefeae8dac929c8d4a075c2ff18d6bb0dc195fcb4294c621c06b128dad9de12431bfe338c49 sjp-aspell6-pl-6.0_20200619-0.tar.bz2" diff --git a/user/astyle/APKBUILD b/user/astyle/APKBUILD new file mode 100644 index 000000000..ace28efdb --- /dev/null +++ b/user/astyle/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=astyle +pkgver=3.1 +pkgrel=0 +pkgdesc="Automatic code formatting library" +url="http://astyle.sourceforge.net/" +arch="all" +options="!check" # No test suite. +license="MIT" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/astyle/astyle_${pkgver}_linux.tar.gz + limits.patch + " +builddir="$srcdir"/$pkgname + +build() { + make -C build/gcc shared +} + +package() { + mkdir -p "$pkgdir"/usr/lib "$pkgdir"/usr/include \ + "$pkgdir"/usr/share/doc/astyle-$pkgver + install -m644 build/gcc/bin/libastyle.so* "$pkgdir"/usr/lib/ + _soname=$(ls build/gcc/bin) + ln -s $_soname "$pkgdir"/usr/lib/libastyle.so + install -m644 src/astyle.h "$pkgdir"/usr/include/ + install -D -m644 doc/* "$pkgdir"/usr/share/doc/astyle-$pkgver/ +} + +sha512sums="2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2 astyle_3.1_linux.tar.gz +a5bc2d90cbd803219e7a5ff4078ff07ffec407eb31b7694aca089bd4884b8a9e63568974e7583a6981bca78c3ed5a34710fff2c2193f80c972ba5d9dde0f06d0 limits.patch" diff --git a/user/astyle/limits.patch b/user/astyle/limits.patch new file mode 100644 index 000000000..9853819f4 --- /dev/null +++ b/user/astyle/limits.patch @@ -0,0 +1,12 @@ +PATH_MAX is not defined unless we pull in <limits.h> on musl. + +--- astyle/src/astyle_main.cpp.old 2018-01-11 17:18:19.000000000 +0000 ++++ astyle/src/astyle_main.cpp 2020-07-19 20:23:56.774222078 +0000 +@@ -37,6 +37,7 @@ + + #include <algorithm> + #include <cerrno> ++#include <climits> + #include <clocale> // needed by some compilers + #include <cstdlib> + #include <fstream> diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 0ca0f7cc1..b64c2e0f2 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="d30c07a37e42d33ac0658f55e881ab2ca6faa45c251acbd99433ec0f119466f41bb2b6f4b953a7830dd120959aa7f1ee86a763881784e42ea9454f19893a6576 at-spi2-atk-2.34.1.tar.xz" +sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 at-spi2-atk-2.34.2.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 4e7ea3109..5788deb50 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.34.0 +pkgver=2.36.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 at-spi2-core-2.34.0.tar.xz" +sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 at-spi2-core-2.36.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c6040d0c6..e4829b041 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.34.1 +pkgver=2.36.0 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -24,4 +24,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e atk-2.34.1.tar.xz" +sha512sums="d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 atk-2.36.0.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index 7688326f4..cd5f1f6cc 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="225bec1c0e54ce1c13273aeb8ea2350c15f147c0d68c6a4427b5da381f72dfb5817eabb5f2a798cece49d14b111ca205b21576222ed8eeb8000b7fa760a1d30d attica-5.68.0.tar.xz" +sha512sums="b8730c6b3f0b268c07e2b6f9752ccf0b41953148bdb91087ddee5bbdfb496012e119486e66c48ecb9d4790a875baa8e0066e0c008396027f0ee440f74648c38b attica-5.72.0.tar.xz" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 3b9fca102..8200310e5 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins -pkgver=4.0.1 +pkgver=4.0.5 pkgrel=0 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6611a9204f3f6e70b126ec4712078ba3e5a317b8a41e6d753a24e37e9b19894444ae091654240c6aa0c4d13d53b72d722549edf6077a565ebdd8caf3000823a0 audacious-plugins-4.0.1.tar.bz2" +sha512sums="90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108 audacious-plugins-4.0.5.tar.bz2" diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD index 473e37ff2..aa5838289 100644 --- a/user/audacious/APKBUILD +++ b/user/audacious/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious -pkgver=4.0.1 +pkgver=4.0.5 pkgrel=0 pkgdesc="A playlist-oriented media player with multiple interfaces" url="https://audacious-media-player.org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bd1387af281e7f533d4a21bf9fdb8ae49d5a406c051bcfa3a509b9d3cf8fdf6faff21dee841fad9ce1c9bf1a24ce1c08d9dc27a7a28b78ade3f0075fa89aad3d audacious-4.0.1.tar.bz2" +sha512sums="4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46 audacious-4.0.5.tar.bz2" diff --git a/user/avahi/APKBUILD b/user/avahi/APKBUILD new file mode 100644 index 000000000..f1534a5e5 --- /dev/null +++ b/user/avahi/APKBUILD @@ -0,0 +1,74 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=avahi +pkgver=0.8 +pkgrel=0 +pkgdesc="Local network service discovery library" +url="https://avahi.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="dbus-dev expat-dev glib-dev gobject-introspection-dev + gtk+3.0-dev libdaemon-dev libevent-dev qt5-qtbase-dev doxygen + py3-dbus-python py3-pygobject-dev" +pkgusers="avahi avahi-autoipd" +pkggroups="avahi avahi-autoipd" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc + $pkgname-gtk3 $pkgname-py3 $pkgname-qt5" +install="$pkgname.pre-install $pkgname.pre-upgrade" +source="https://avahi.org/download/avahi-$pkgver.tar.gz + build-db + " + +prepare() { + default_prepare + # Missing from release tarballs: + # https://github.com/lathiat/avahi/pull/281 + mv "$srcdir"/build-db "$builddir"/service-type-database/ +} + +build() { + [ "$CBUILD_ARCH" = "$CTARGET_ARCH" ] || \ + die "You cannot cross-build Avahi; dbm files are not portable." + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-distro=gentoo \ + --enable-core-docs \ + --disable-mono \ + --disable-gdbm + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +gtk3() { + pkgdesc="$pkgdesc (Gtk+ 3 bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libavahi*gtk3* "$subpkgdir"/usr/lib/ +} + +py3() { + pkgdesc="$pkgdesc (Python bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ +} + +qt5() { + pkgdesc="$pkgdesc (Qt 5 bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libavahi*qt5* "$subpkgdir"/usr/lib/ +} + +sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz +60f5cab8417ba1f7ef9b3e30a9f33923fd71a11ae846dda9c29fd0327008821f55f6c77f8ef8442e6dd164d1b777d858cec95c31b7b3bc7f1121417620ca5f08 build-db" diff --git a/user/avahi/avahi.pre-install b/user/avahi/avahi.pre-install new file mode 100644 index 000000000..4d6a7d061 --- /dev/null +++ b/user/avahi/avahi.pre-install @@ -0,0 +1,10 @@ +#!/bin/sh + +groupadd -r -g 201 avahi 2>/dev/null +groupadd -r -g 202 avahi-autoipd 2>/dev/null +useradd -c "Service Discovery User" -s /sbin/nologin -g avahi \ + -d /var/empty -M -N -u 201 2>/dev/null +useradd -c "IPv4LL network address configuration daemon" -s /sbin/nologin \ + -g avahi-autoipd -d /var/empty -M -N -u 202 2>/dev/null + +exit 0 diff --git a/user/avahi/avahi.pre-upgrade b/user/avahi/avahi.pre-upgrade new file mode 120000 index 000000000..6b36c801b --- /dev/null +++ b/user/avahi/avahi.pre-upgrade @@ -0,0 +1 @@ +avahi.pre-install
\ No newline at end of file diff --git a/user/avahi/build-db b/user/avahi/build-db new file mode 100644 index 000000000..78ee892f6 --- /dev/null +++ b/user/avahi/build-db @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# -*-python-*- +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +try: + import anydbm as dbm +except ImportError: + import dbm + +import sys + +if len(sys.argv) > 1: + infn = sys.argv[1] +else: + infn = "service-types" + +if len(sys.argv) > 2: + outfn = sys.argv[2] +else: + outfn = infn + ".db" + +db = dbm.open(outfn, "n") + +for ln in open(infn, "r"): + ln = ln.strip(" \r\n\t") + + if ln == "" or ln.startswith("#"): + continue + + t, n = ln.split(":", 1) + + db[t.strip()] = n.strip() + +db.close() diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD index fd0aaf9db..5b4751bad 100644 --- a/user/ayatana-ido/APKBUILD +++ b/user/ayatana-ido/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ayatana-ido -pkgver=0.4.4 -pkgrel=1 +pkgver=0.5.0 +pkgrel=0 pkgdesc="Indicator display object library for the Gnome desktop environment" url="https://ayatanaindicators.github.io/" arch="all" @@ -13,7 +13,6 @@ makedepends="glib-dev gobject-introspection-dev gtest-dev gtk+3.0-dev subpackages="$pkgname-dev" source="ayatana-ido-$pkgver.tar.gz::https://github.com/AyatanaIndicators/ayatana-ido/archive/$pkgver.tar.gz gtk-doc-fix.patch - remove-private.patch " prepare() { @@ -40,6 +39,5 @@ package() { DESTDIR="$pkgdir" make install } -sha512sums="ef04b0b6c959d209e88b1de322ac64ea33fdd043a73980bf3b043380603b6a448ea7bf43ba8e2750e1a0a9bef704a7099f7ae9b92a97d3ce0be2e9f48ba16703 ayatana-ido-0.4.4.tar.gz -92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch -a28c4cbfb5f386a9ee42ec50011bce603191b901760e6f9799a58b9ff2b223d03c15df00bd6fab6e13b9b9d5b70ecedef245665ebf4e240df1f1321e658b38fa remove-private.patch" +sha512sums="573dd0d6693670bfda0e883c94d483d708bb83f20eb621eae26a0624aa76045ba6e9563ce36587c9ca3d5acfe4b4c0d9f9ce8da62a788d206f3d00ebdded0228 ayatana-ido-0.5.0.tar.gz +92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch" diff --git a/user/ayatana-ido/remove-private.patch b/user/ayatana-ido/remove-private.patch deleted file mode 100644 index 848b1b026..000000000 --- a/user/ayatana-ido/remove-private.patch +++ /dev/null @@ -1,2295 +0,0 @@ -Required to build against newer GLib, else: - -idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_init’: -idocalendarmenuitem.c:109:13: error: G_ADD_PRIVATE [-Werror] - priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); - ^~~~~~~~~~~~~~~ -idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_finalize’: -idocalendarmenuitem.c:139:13: error: G_ADD_PRIVATE [-Werror] - IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); - ^~~~~~~~~~~~~~~ - - -From 0ab4079b28220f4051f8d0935a976e550514ad7f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Tue, 3 Dec 2019 22:14:51 +0000 -Subject: [PATCH] Avoid deprecated g_type_class_add_private. - ---- - src/idobasicmenuitem.c | 33 ++++------- - src/idobasicmenuitem.h | 2 - - src/idocalendarmenuitem.c | 116 +++++++++++++++++++++++-------------- - src/idocalendarmenuitem.h | 3 - - src/idodetaillabel.c | 42 +++++++------- - src/idodetaillabel.h | 2 - - src/idoentrymenuitem.c | 61 ++++++++++++------- - src/idoentrymenuitem.h | 3 - - src/idolocationmenuitem.c | 34 +++++------ - src/idolocationmenuitem.h | 2 - - src/idomessagedialog.c | 26 ++++----- - src/idorange.c | 20 +++---- - src/idorange.h | 2 - - src/idoscalemenuitem.c | 75 +++++++++++++----------- - src/idoscalemenuitem.h | 3 - - src/idoswitchmenuitem.c | 33 +++++++---- - src/idoswitchmenuitem.h | 3 - - src/idotimeline.c | 100 +++++++++++++++----------------- - src/idotimestampmenuitem.c | 65 ++++++++++----------- - src/idotimestampmenuitem.h | 2 - - src/idousermenuitem.c | 63 ++++++++++---------- - src/idousermenuitem.h | 2 - - 22 files changed, 356 insertions(+), 336 deletions(-) - -diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c -index 382a150..cf57e7c 100644 ---- a/src/idobasicmenuitem.c -+++ b/src/idobasicmenuitem.c -@@ -37,8 +37,7 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoBasicMenuItemPrivate --{ -+typedef struct { - GIcon * icon; - char * text; - char * secondary_text; -@@ -46,11 +45,9 @@ struct _IdoBasicMenuItemPrivate - GtkWidget * image; - GtkWidget * label; - GtkWidget * secondary_label; --}; -- --typedef IdoBasicMenuItemPrivate priv_t; -+} IdoBasicMenuItemPrivate; - --G_DEFINE_TYPE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM); - - /*** - **** GObject Virtual Functions -@@ -63,7 +60,7 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate * p = ido_basic_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -117,7 +114,7 @@ static void - my_dispose (GObject * object) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - g_clear_object (&p->icon); - -@@ -128,7 +125,7 @@ static void - my_finalize (GObject * object) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - g_free (p->text); - g_free (p->secondary_text); -@@ -139,7 +136,7 @@ my_finalize (GObject * object) - static void - ido_basic_menu_item_update_image (IdoBasicMenuItem *self) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - gtk_image_clear (GTK_IMAGE (p->image)); - -@@ -191,8 +188,6 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass) - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoBasicMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -228,15 +223,11 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass) - static void - ido_basic_menu_item_init (IdoBasicMenuItem *self) - { -- priv_t * p; -+ - GtkWidget * w; - GtkGrid * grid; - -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_BASIC_MENU_ITEM, -- IdoBasicMenuItemPrivate); -- -- p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - p->image = gtk_image_new (); - gtk_misc_set_alignment(GTK_MISC(p->image), 0.0, 0.0); -@@ -287,7 +278,7 @@ ido_basic_menu_item_new (void) - void - ido_basic_menu_item_set_icon (IdoBasicMenuItem * self, GIcon * icon) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (p->icon != icon) - { -@@ -314,7 +305,7 @@ ido_basic_menu_item_set_icon_from_file (IdoBasicMenuItem * self, const char * fi - void - ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (g_strcmp0 (p->text, text)) - { -@@ -331,7 +322,7 @@ ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text) - void - ido_basic_menu_item_set_secondary_text (IdoBasicMenuItem * self, const char * secondary_text) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (g_strcmp0 (p->secondary_text, secondary_text)) - { -diff --git a/src/idobasicmenuitem.h b/src/idobasicmenuitem.h -index 6a4b83a..38ae830 100644 ---- a/src/idobasicmenuitem.h -+++ b/src/idobasicmenuitem.h -@@ -30,7 +30,6 @@ G_BEGIN_DECLS - - typedef struct _IdoBasicMenuItem IdoBasicMenuItem; - typedef struct _IdoBasicMenuItemClass IdoBasicMenuItemClass; --typedef struct _IdoBasicMenuItemPrivate IdoBasicMenuItemPrivate; - - struct _IdoBasicMenuItemClass - { -@@ -44,7 +43,6 @@ struct _IdoBasicMenuItem - { - /*< private >*/ - GtkMenuItem parent; -- IdoBasicMenuItemPrivate * priv; - }; - - -diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c -index 557d898..f3881bc 100644 ---- a/src/idocalendarmenuitem.c -+++ b/src/idocalendarmenuitem.c -@@ -51,17 +51,14 @@ static void calendar_day_selected_double_click_cb (GtkWidget *widg - gpointer user_data); - static void calendar_day_selected_cb (GtkWidget *widget, - gpointer user_data); --struct _IdoCalendarMenuItemPrivate --{ -+typedef struct { - GtkWidget *box; - GtkWidget *calendar; - GtkWidget *parent; - gboolean selected; --}; -- --G_DEFINE_TYPE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM) -+} IdoCalendarMenuItemPrivate; - --#define IDO_CALENDAR_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_CALENDAR_MENU_ITEM, IdoCalendarMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM) - - static void - ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) -@@ -84,8 +81,6 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) - - menu_item_class->hide_on_activate = TRUE; - -- g_type_class_add_private (gobject_class, sizeof (IdoCalendarMenuItemPrivate)); -- - g_signal_new("month-changed", G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, -@@ -104,9 +99,7 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) - static void - ido_calendar_menu_item_init (IdoCalendarMenuItem *item) - { -- IdoCalendarMenuItemPrivate *priv; -- -- priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); - - /* Will be disposed automatically */ - priv->calendar = g_object_new (gtk_calendar_get_type (), -@@ -136,7 +129,7 @@ static void - ido_calendar_menu_item_finalize (GObject *object) - { - IdoCalendarMenuItem *item = IDO_CALENDAR_MENU_ITEM (object); -- IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); - - if (G_IS_OBJECT (priv->calendar)) - { -@@ -183,13 +176,14 @@ ido_calendar_menu_item_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) - { -- IdoCalendarMenuItem *menuitem = (IdoCalendarMenuItem *)data; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (data); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); - - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), FALSE); - -- if (menuitem->priv->selected) -+ if (priv->selected) - { -- GtkWidget *calendar = menuitem->priv->calendar; -+ GtkWidget *calendar = priv->calendar; - - gtk_widget_event (calendar, - ((GdkEvent *)(void*)(event))); -@@ -215,7 +209,10 @@ static gboolean - ido_calendar_menu_item_button_press (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *calendar = priv->calendar; - - if (event->button == 1) { - if (gtk_widget_get_window (calendar) != NULL) { -@@ -265,7 +262,10 @@ static gboolean - ido_calendar_menu_item_button_release (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *calendar = priv->calendar; - GTK_WIDGET_GET_CLASS(calendar)->button_release_event(GTK_WIDGET(calendar), event); - - return TRUE; -@@ -274,17 +274,23 @@ ido_calendar_menu_item_button_release (GtkWidget *widget, - static void - ido_calendar_menu_item_select (GtkMenuItem *item) - { -- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = TRUE; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ priv->selected = TRUE; - -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), TRUE); -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), TRUE); - } - - static void - ido_calendar_menu_item_deselect (GtkMenuItem *item) - { -- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = FALSE; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); - -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE); -+ priv->selected = FALSE; -+ -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE); - } - - static void -@@ -296,25 +302,27 @@ calendar_realized_cb (GtkWidget *widget, - gdk_window_raise (gtk_widget_get_window (widget)); - } - -- item->priv->parent = gtk_widget_get_parent (GTK_WIDGET (item)); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); -+ -+ priv->parent = gtk_widget_get_parent (GTK_WIDGET (item)); - -- g_object_add_weak_pointer (G_OBJECT (item->priv->parent), -- (gpointer*) &item->priv->parent); -+ g_object_add_weak_pointer (G_OBJECT (priv->parent), -+ (gpointer*) &priv->parent); - -- g_signal_connect (item->priv->parent, -+ g_signal_connect (priv->parent, - "key-press-event", - G_CALLBACK (ido_calendar_menu_item_key_press), - item); - -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "month-changed", - G_CALLBACK (calendar_month_changed_cb), - item); -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "day-selected", - G_CALLBACK (calendar_day_selected_cb), - item); -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "day-selected-double-click", - G_CALLBACK (calendar_day_selected_double_click_cb), - item); -@@ -327,7 +335,10 @@ calendar_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoCalendarMenuItem *item) - { -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE); -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE); - - g_signal_emit_by_name (item, - "move-focus", -@@ -386,7 +397,9 @@ ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *menuitem) - { - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), NULL); - -- return menuitem->priv->calendar; -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ return priv->calendar; - } - - /** -@@ -402,8 +415,10 @@ gboolean - ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); -- -- gtk_calendar_mark_day(GTK_CALENDAR (menuitem->priv->calendar), day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_mark_day(GTK_CALENDAR (priv->calendar), day); - return TRUE; - } - -@@ -420,8 +435,10 @@ gboolean - ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); -- -- gtk_calendar_unmark_day(GTK_CALENDAR (menuitem->priv->calendar), day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_unmark_day(GTK_CALENDAR (priv->calendar), day); - return TRUE; - } - -@@ -435,8 +452,10 @@ void - ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem) - { - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- -- gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar)); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_clear_marks(GTK_CALENDAR (priv->calendar)); - } - - /** -@@ -450,8 +469,10 @@ void - ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags) - { - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- -- gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_set_display_options (GTK_CALENDAR (priv->calendar), flags); - } - - /** -@@ -466,8 +487,10 @@ GtkCalendarDisplayOptions - ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), 0); -- -- return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ return gtk_calendar_get_display_options (GTK_CALENDAR (priv->calendar)); - } - - /** -@@ -484,9 +507,12 @@ ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, - guint *year, - guint *month, - guint *day) { -- -+ - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_get_date (GTK_CALENDAR (priv->calendar), year, month, day); - } - - /** -@@ -510,13 +536,15 @@ ido_calendar_menu_item_set_date (IdoCalendarMenuItem *menuitem, - - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); - -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ - ido_calendar_menu_item_get_date (menuitem, &old_y, &old_m, &old_d); - - if ((old_y != year) || (old_m != month)) -- gtk_calendar_select_month (GTK_CALENDAR (menuitem->priv->calendar), month, year); -+ gtk_calendar_select_month (GTK_CALENDAR (priv->calendar), month, year); - - if (old_d != day) -- gtk_calendar_select_day (GTK_CALENDAR (menuitem->priv->calendar), day); -+ gtk_calendar_select_day (GTK_CALENDAR (priv->calendar), day); - - return TRUE; - } -diff --git a/src/idocalendarmenuitem.h b/src/idocalendarmenuitem.h -index 5cd913e..8c1528d 100644 ---- a/src/idocalendarmenuitem.h -+++ b/src/idocalendarmenuitem.h -@@ -39,13 +39,10 @@ G_BEGIN_DECLS - - typedef struct _IdoCalendarMenuItem IdoCalendarMenuItem; - typedef struct _IdoCalendarMenuItemClass IdoCalendarMenuItemClass; --typedef struct _IdoCalendarMenuItemPrivate IdoCalendarMenuItemPrivate; - - struct _IdoCalendarMenuItem - { - GtkMenuItem parent_instance; -- -- IdoCalendarMenuItemPrivate *priv; - }; - - struct _IdoCalendarMenuItemClass -diff --git a/src/idodetaillabel.c b/src/idodetaillabel.c -index b36b222..c502f92 100644 ---- a/src/idodetaillabel.c -+++ b/src/idodetaillabel.c -@@ -21,14 +21,11 @@ - - #include <math.h> - --G_DEFINE_TYPE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET) -- --struct _IdoDetailLabelPrivate --{ -+typedef struct { - gchar *text; - PangoLayout *layout; - gboolean draw_lozenge; --}; -+} IdoDetailLabelPrivate; - - enum - { -@@ -39,6 +36,8 @@ enum - - static GParamSpec *properties[NUM_PROPERTIES]; - -+G_DEFINE_TYPE_WITH_PRIVATE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET) -+ - static void - ido_detail_label_get_property (GObject *object, - guint property_id, -@@ -46,11 +45,12 @@ ido_detail_label_get_property (GObject *object, - GParamSpec *pspec) - { - IdoDetailLabel *self = IDO_DETAIL_LABEL (object); -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(self); - - switch (property_id) - { - case PROP_TEXT: -- g_value_set_string (value, self->priv->text); -+ g_value_set_string (value, priv->text); - break; - - default: -@@ -81,7 +81,7 @@ ido_detail_label_set_property (GObject *object, - static void - ido_detail_label_finalize (GObject *object) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object)); - - g_free (priv->text); - -@@ -91,7 +91,7 @@ ido_detail_label_finalize (GObject *object) - static void - ido_detail_label_dispose (GObject *object) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object)); - - g_clear_object (&priv->layout); - -@@ -101,7 +101,7 @@ ido_detail_label_dispose (GObject *object) - static void - ido_detail_label_ensure_layout (IdoDetailLabel *label) - { -- IdoDetailLabelPrivate *priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); - - if (priv->layout == NULL) - { -@@ -156,7 +156,8 @@ gtk_widget_get_font_metrics (GtkWidget *widget, - static gint - ido_detail_label_get_minimum_text_width (IdoDetailLabel *label) - { -- IdoDetailLabelPrivate *priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ - PangoContext *context; - PangoFontMetrics *metrics; - gint char_width; -@@ -176,7 +177,8 @@ ido_detail_label_draw (GtkWidget *widget, - cairo_t *cr) - { - IdoDetailLabel *label = IDO_DETAIL_LABEL (widget); -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ - PangoRectangle extents; - GtkAllocation allocation; - double x, w, h, radius; -@@ -224,7 +226,8 @@ ido_detail_label_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget)); -+ - PangoRectangle extents; - double radius; - -@@ -244,7 +247,7 @@ ido_detail_label_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget)); - PangoContext *context; - PangoFontMetrics *metrics; - PangoRectangle extents; -@@ -277,8 +280,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass) - widget_class->get_preferred_width = ido_detail_label_get_preferred_width; - widget_class->get_preferred_height = ido_detail_label_get_preferred_height; - -- g_type_class_add_private (klass, sizeof (IdoDetailLabelPrivate)); -- - properties[PROP_TEXT] = g_param_spec_string ("text", - "Text", - "The text of the label", -@@ -292,10 +293,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass) - static void - ido_detail_label_init (IdoDetailLabel *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_DETAIL_LABEL, -- IdoDetailLabelPrivate); -- - gtk_widget_set_has_window (GTK_WIDGET (self), FALSE); - } - -@@ -311,7 +308,10 @@ const gchar * - ido_detail_label_get_text (IdoDetailLabel *label) - { - g_return_val_if_fail (IDO_IS_DETAIL_LABEL (label), NULL); -- return label->priv->text; -+ -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ -+ return priv->text; - } - - /* collapse_whitespace: -@@ -362,7 +362,7 @@ ido_detail_label_set_text_impl (IdoDetailLabel *label, - const gchar *text, - gboolean draw_lozenge) - { -- IdoDetailLabelPrivate * priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); - - g_clear_object (&priv->layout); - g_free (priv->text); -diff --git a/src/idodetaillabel.h b/src/idodetaillabel.h -index 1995fee..6b6f57a 100644 ---- a/src/idodetaillabel.h -+++ b/src/idodetaillabel.h -@@ -31,12 +31,10 @@ - - typedef struct _IdoDetailLabel IdoDetailLabel; - typedef struct _IdoDetailLabelClass IdoDetailLabelClass; --typedef struct _IdoDetailLabelPrivate IdoDetailLabelPrivate; - - struct _IdoDetailLabel - { - GtkWidget parent; -- IdoDetailLabelPrivate *priv; - }; - - struct _IdoDetailLabelClass -diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c -index 5b5a3fb..d2948df 100644 ---- a/src/idoentrymenuitem.c -+++ b/src/idoentrymenuitem.c -@@ -27,6 +27,7 @@ - #include "idoentrymenuitem.h" - #include "config.h" - -+static void ido_entry_menu_item_finalize (GObject *item); - static void ido_entry_menu_item_select (GtkMenuItem *item); - static void ido_entry_menu_item_deselect (GtkMenuItem *item); - static gboolean ido_entry_menu_item_button_release (GtkWidget *widget, -@@ -44,16 +45,13 @@ static void entry_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoEntryMenuItem *item); - --struct _IdoEntryMenuItemPrivate --{ -+typedef struct { - GtkWidget *box; - GtkWidget *entry; - gboolean selected; --}; -- --G_DEFINE_TYPE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM) -+} IdoEntryMenuItemPrivate; - --#define IDO_ENTRY_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_ENTRY_MENU_ITEM, IdoEntryMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM) - - static void - ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) -@@ -66,6 +64,8 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) - widget_class = GTK_WIDGET_CLASS (klass); - menu_item_class = GTK_MENU_ITEM_CLASS (klass); - -+ gobject_class->finalize = ido_entry_menu_item_finalize; -+ - widget_class->button_release_event = ido_entry_menu_item_button_release; - widget_class->button_press_event = ido_entry_menu_item_button_press; - -@@ -73,8 +73,6 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) - menu_item_class->deselect = ido_entry_menu_item_deselect; - - menu_item_class->hide_on_activate = TRUE; -- -- g_type_class_add_private (gobject_class, sizeof (IdoEntryMenuItemPrivate)); - } - - static void -@@ -88,7 +86,7 @@ ido_entry_menu_item_init (IdoEntryMenuItem *item) - border.top = 2; - border.bottom = 2; - -- priv = item->priv = IDO_ENTRY_MENU_ITEM_GET_PRIVATE (item); -+ priv = ido_entry_menu_item_get_instance_private(item); - - priv->entry = g_object_new (gtk_entry_get_type (), - "inner-border", &border, -@@ -135,12 +133,13 @@ ido_entry_menu_item_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) - { -- IdoEntryMenuItem *menuitem = (IdoEntryMenuItem *)data; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(data); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); - -- if (menuitem->priv->selected && -+ if (priv->selected && - is_key_press_valid (menuitem, event->keyval)) - { -- GtkWidget *entry = menuitem->priv->entry; -+ GtkWidget *entry = priv->entry; - - gtk_widget_event (entry, - ((GdkEvent *)(void*)(event))); -@@ -179,7 +178,10 @@ static gboolean - ido_entry_menu_item_button_press (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *entry = priv->entry; - - if (event->button == 1) - { -@@ -206,7 +208,10 @@ static gboolean - ido_entry_menu_item_button_release (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *entry = priv->entry; - - gtk_widget_event (entry, - ((GdkEvent *)(void*)(event))); -@@ -217,17 +222,23 @@ ido_entry_menu_item_button_release (GtkWidget *widget, - static void - ido_entry_menu_item_select (GtkMenuItem *item) - { -- IDO_ENTRY_MENU_ITEM (item)->priv->selected = TRUE; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ priv->selected = TRUE; - -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), TRUE); -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), TRUE); - } - - static void - ido_entry_menu_item_deselect (GtkMenuItem *item) - { -- IDO_ENTRY_MENU_ITEM (item)->priv->selected = FALSE; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); - -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE); -+ priv->selected = FALSE; -+ -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE); - } - - -@@ -253,7 +264,9 @@ entry_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoEntryMenuItem *item) - { -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(item); -+ -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE); - - g_signal_emit_by_name (item, - "move-focus", -@@ -286,5 +299,13 @@ ido_entry_menu_item_get_entry (IdoEntryMenuItem *menuitem) - { - g_return_val_if_fail (IDO_IS_ENTRY_MENU_ITEM (menuitem), NULL); - -- return menuitem->priv->entry; -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ return priv->entry; -+} -+ -+static void -+ido_entry_menu_item_finalize (GObject *gobject) -+{ -+ /* no-op */ - } -diff --git a/src/idoentrymenuitem.h b/src/idoentrymenuitem.h -index 417e774..7c5da79 100644 ---- a/src/idoentrymenuitem.h -+++ b/src/idoentrymenuitem.h -@@ -39,13 +39,10 @@ G_BEGIN_DECLS - - typedef struct _IdoEntryMenuItem IdoEntryMenuItem; - typedef struct _IdoEntryMenuItemClass IdoEntryMenuItemClass; --typedef struct _IdoEntryMenuItemPrivate IdoEntryMenuItemPrivate; - - struct _IdoEntryMenuItem - { - GtkMenuItem parent_instance; -- -- IdoEntryMenuItemPrivate *priv; - }; - - struct _IdoEntryMenuItemClass -diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c -index 335422a..eb6b38b 100644 ---- a/src/idolocationmenuitem.c -+++ b/src/idolocationmenuitem.c -@@ -37,16 +37,13 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoLocationMenuItemPrivate --{ -+typedef struct { - char * timezone; - - guint timestamp_timer; --}; -+} IdoLocationMenuItemPrivate; - --typedef IdoLocationMenuItemPrivate priv_t; -- --G_DEFINE_TYPE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM); - - /*** - **** Timestamp Label -@@ -58,7 +55,9 @@ update_timestamp (IdoLocationMenuItem * self) - GTimeZone * tz; - GDateTime * date_time; - -- tz = g_time_zone_new (self->priv->timezone); -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); -+ -+ tz = g_time_zone_new (priv->timezone); - if (tz == NULL) - tz = g_time_zone_new_local (); - date_time = g_date_time_new_now (tz); -@@ -73,7 +72,7 @@ update_timestamp (IdoLocationMenuItem * self) - static void - stop_timestamp_timer (IdoLocationMenuItem * self) - { -- priv_t * p = self->priv; -+ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self); - - if (p->timestamp_timer != 0) - { -@@ -130,6 +129,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self) - const char * fmt = ido_time_stamp_menu_item_get_format (IDO_TIME_STAMP_MENU_ITEM (self)); - gboolean timestamp_shows_seconds; - int interval_sec; -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); - - stop_timestamp_timer (self); - -@@ -142,7 +142,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self) - else - interval_sec = calculate_seconds_until_next_minute(); - -- self->priv->timestamp_timer = g_timeout_add_seconds (interval_sec, -+ priv->timestamp_timer = g_timeout_add_seconds (interval_sec, - on_timestamp_timer, - self); - } -@@ -158,7 +158,7 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -204,8 +204,9 @@ static void - my_finalize (GObject * object) - { - IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (object); -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); - -- g_free (self->priv->timezone); -+ g_free (priv->timezone); - - G_OBJECT_CLASS (ido_location_menu_item_parent_class)->finalize (object); - } -@@ -219,8 +220,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass) - { - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoLocationMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -239,10 +238,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass) - static void - ido_location_menu_item_init (IdoLocationMenuItem *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_LOCATION_MENU_ITEM_TYPE, -- IdoLocationMenuItemPrivate); -- - /* Update the timer whenever the format string changes - because it determines whether we update once per second or per minute */ - g_signal_connect (self, "notify::format", -@@ -271,10 +266,11 @@ void - ido_location_menu_item_set_timezone (IdoLocationMenuItem * self, - const char * timezone) - { -- priv_t * p; -+ IdoLocationMenuItemPrivate * p; - - g_return_if_fail (IDO_IS_LOCATION_MENU_ITEM (self)); -- p = self->priv; -+ -+ p = ido_location_menu_item_get_instance_private(self); - - g_free (p->timezone); - p->timezone = g_strdup (timezone); -diff --git a/src/idolocationmenuitem.h b/src/idolocationmenuitem.h -index 2ae231f..5d1c660 100644 ---- a/src/idolocationmenuitem.h -+++ b/src/idolocationmenuitem.h -@@ -31,7 +31,6 @@ G_BEGIN_DECLS - - typedef struct _IdoLocationMenuItem IdoLocationMenuItem; - typedef struct _IdoLocationMenuItemClass IdoLocationMenuItemClass; --typedef struct _IdoLocationMenuItemPrivate IdoLocationMenuItemPrivate; - - struct _IdoLocationMenuItemClass - { -@@ -48,7 +47,6 @@ struct _IdoLocationMenuItem - { - /*< private >*/ - IdoTimeStampMenuItem parent; -- IdoLocationMenuItemPrivate * priv; - }; - - -diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c -index 5b73950..ef5f148 100644 ---- a/src/idomessagedialog.c -+++ b/src/idomessagedialog.c -@@ -34,22 +34,18 @@ - #include "idotimeline.h" - #include "config.h" - --#define IDO_MESSAGE_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogPrivate)) -- - static GtkWidget *ido_message_dialog_get_secondary_label (IdoMessageDialog *dialog); - static GtkWidget *ido_message_dialog_get_primary_label (IdoMessageDialog *dialog); - --typedef struct _IdoMessageDialogPrivate IdoMessageDialogPrivate; --typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext; -- --struct _IdoMessageDialogPrivate --{ -+typedef struct { - GtkWidget *action_area; - GtkWidget *primary_label; - GtkWidget *secondary_label; - - gboolean expanded; --}; -+} IdoMessageDialogPrivate; -+ -+typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext; - - struct _IdoMessageDialogMorphContext - { -@@ -60,13 +56,13 @@ struct _IdoMessageDialogMorphContext - GtkRequisition end; - }; - --G_DEFINE_TYPE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG) - - static void - ido_message_dialog_map (GtkWidget *widget) - { - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - GTK_WIDGET_CLASS (ido_message_dialog_parent_class)->map (widget); - -@@ -145,7 +141,7 @@ timeline_finished_cb (IdoTimeline *timeline, - gpointer user_data) - { - IdoMessageDialogMorphContext *context = user_data; -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (context->widget); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (IDO_MESSAGE_DIALOG (context->widget)); - - gtk_widget_show (priv->action_area); - gtk_widget_show (priv->secondary_label); -@@ -158,7 +154,7 @@ ido_message_dialog_focus_in_event (GtkWidget *widget, - GdkEventFocus *event) - { - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - if (!priv->expanded) - { -@@ -203,7 +199,9 @@ ido_message_dialog_focus_in_event (GtkWidget *widget, - static void - ido_message_dialog_constructed (GObject *object) - { -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (object); -+ -+ IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (object); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - GtkWidget *vbox; - GtkWidget *event_box; - -@@ -231,8 +229,6 @@ ido_message_dialog_class_init (IdoMessageDialogClass *class) - - widget_class->map = ido_message_dialog_map; - widget_class->focus_in_event = ido_message_dialog_focus_in_event; -- -- g_type_class_add_private (object_class, sizeof (IdoMessageDialogPrivate)); - } - - static void -diff --git a/src/idorange.c b/src/idorange.c -index acdfa5d..634b223 100644 ---- a/src/idorange.c -+++ b/src/idorange.c -@@ -27,10 +27,9 @@ - #include "idotypebuiltins.h" - #include "config.h" - --struct _IdoRangePrivate --{ -+typedef struct { - IdoRangeStyle style; --}; -+} IdoRangePrivate; - - static void ido_range_constructed (GObject *object); - static void ido_range_set_property (GObject *object, -@@ -42,9 +41,7 @@ static void ido_range_get_property (GObject *object, - GValue *value, - GParamSpec *pspec); - --#define IDO_RANGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_RANGE, IdoRangePrivate)) -- --G_DEFINE_TYPE (IdoRange, ido_range, GTK_TYPE_SCALE) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoRange, ido_range, GTK_TYPE_SCALE) - - enum { - PROP_0, -@@ -87,8 +84,6 @@ ido_range_class_init (IdoRangeClass *class) - G_MAXINT, - 8, - G_PARAM_READABLE)); -- -- g_type_class_add_private (class, sizeof (IdoRangePrivate)); - } - - static void -@@ -97,7 +92,8 @@ ido_range_get_property (GObject *object, - GValue *value, - GParamSpec *pspec) - { -- IdoRangePrivate *priv = IDO_RANGE (object)->priv; -+ IdoRange *range = IDO_RANGE (object); -+ IdoRangePrivate *priv = ido_range_get_instance_private (range); - - switch (prop_id) - { -@@ -117,7 +113,8 @@ ido_range_set_property (GObject *object, - const GValue *value, - GParamSpec *pspec) - { -- IdoRangePrivate *priv = IDO_RANGE (object)->priv; -+ IdoRange *range = IDO_RANGE (object); -+ IdoRangePrivate *priv = ido_range_get_instance_private (range); - - switch (prop_id) - { -@@ -135,6 +132,7 @@ static void - ido_range_constructed (GObject *object) - { - IdoRange *range = IDO_RANGE (object); -+ - IdoRangeStyle style; - char buf[1024]; - -@@ -163,7 +161,7 @@ ido_range_constructed (GObject *object) - static void - ido_range_init (IdoRange *range) - { -- range->priv = IDO_RANGE_GET_PRIVATE (range); -+ /* no-op */ - } - - /** -diff --git a/src/idorange.h b/src/idorange.h -index 7c2e79b..beef43f 100644 ---- a/src/idorange.h -+++ b/src/idorange.h -@@ -44,13 +44,11 @@ typedef enum - } IdoRangeStyle; - - typedef struct _IdoRange IdoRange; --typedef struct _IdoRangePrivate IdoRangePrivate; - typedef struct _IdoRangeClass IdoRangeClass; - - struct _IdoRange - { - GtkScale parent_instance; -- IdoRangePrivate *priv; - }; - - struct _IdoRangeClass -diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c -index de9884f..9f5f29c 100644 ---- a/src/idoscalemenuitem.c -+++ b/src/idoscalemenuitem.c -@@ -64,7 +64,7 @@ static void update_packing (IdoScaleMenuItem - static void default_primary_clicked_handler (IdoScaleMenuItem *self); - static void default_secondary_clicked_handler (IdoScaleMenuItem *self); - --struct _IdoScaleMenuItemPrivate { -+typedef struct { - GtkWidget *scale; - GtkAdjustment *adjustment; - GtkWidget *primary_image; -@@ -78,7 +78,7 @@ struct _IdoScaleMenuItemPrivate { - IdoRangeStyle range_style; - gboolean ignore_value_changed; - gboolean has_focus; --}; -+} IdoScaleMenuItemPrivate; - - enum { - SLIDER_GRABBED, -@@ -99,15 +99,15 @@ enum { - - static guint signals[LAST_SIGNAL] = { 0 }; - --G_DEFINE_TYPE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM) -- --#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_SCALE_MENU_ITEM, IdoScaleMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM) - - static gboolean - ido_scale_menu_item_scroll_event (GtkWidget *menuitem, - GdkEventScroll *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkWidget *scale = priv->scale; - - if (priv->reverse_scroll) -@@ -138,7 +138,7 @@ ido_scale_menu_item_scale_value_changed (GtkRange *range, - gpointer user_data) - { - IdoScaleMenuItem *self = user_data; -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); - - /* The signal is not sent when it was set through - * ido_scale_menu_item_set_value(). */ -@@ -151,7 +151,8 @@ static void - ido_scale_menu_item_constructed (GObject *object) - { - IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); -+ - GObject *adj = G_OBJECT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0)); - IdoRangeStyle range_style; - GtkWidget *hbox; -@@ -322,14 +323,13 @@ ido_scale_menu_item_class_init (IdoScaleMenuItemClass *item_class) - G_TYPE_NONE, - 1, G_TYPE_DOUBLE); - -- -- g_type_class_add_private (item_class, sizeof (IdoScaleMenuItemPrivate)); - } - - static void - update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); -+ - GtkBox * box = GTK_BOX (priv->hbox); - GtkContainer *container = GTK_CONTAINER (priv->hbox); - -@@ -366,7 +366,7 @@ update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style) - static void - ido_scale_menu_item_init (IdoScaleMenuItem *self) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); - - priv->reverse_scroll = TRUE; - -@@ -380,7 +380,7 @@ ido_scale_menu_item_set_property (GObject *object, - GParamSpec *pspec) - { - IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - switch (prop_id) - { -@@ -413,7 +413,7 @@ ido_scale_menu_item_get_property (GObject *object, - GParamSpec *pspec) - { - IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - GtkAdjustment *adjustment; - - switch (prop_id) -@@ -442,7 +442,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget, - GdkEventKey *event, - gpointer user_data) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (user_data); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (user_data); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - /* only listen to events when the playback menu item is selected */ - if (!priv->has_focus) -@@ -469,7 +470,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget, - static void - ido_scale_menu_item_select (GtkMenuItem *item) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - priv->has_focus = TRUE; - gtk_widget_set_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED, FALSE); -@@ -480,7 +482,8 @@ ido_scale_menu_item_select (GtkMenuItem *item) - static void - ido_scale_menu_item_deselect (GtkMenuItem *item) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - priv->has_focus = FALSE; - gtk_widget_unset_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED); -@@ -492,7 +495,9 @@ static gboolean - ido_scale_menu_item_button_press_event (GtkWidget *menuitem, - GdkEventButton *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkAllocation alloc; - gint x, y; - -@@ -516,7 +521,8 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem, - GdkEventButton *event) - { - IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkWidget *scale = priv->scale; - GtkAllocation alloc; - gint x, y; -@@ -569,7 +575,9 @@ static gboolean - ido_scale_menu_item_motion_notify_event (GtkWidget *menuitem, - GdkEventMotion *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); -+ - GtkAllocation alloc; - gint x, y; - -@@ -596,7 +604,7 @@ static void - menu_hidden (GtkWidget *menu, - IdoScaleMenuItem *scale) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (scale); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (scale); - - if (priv->grabbed) - { -@@ -718,7 +726,7 @@ ido_scale_menu_item_get_scale (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->scale; - } -@@ -739,7 +747,7 @@ ido_scale_menu_item_get_style (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), IDO_SCALE_MENU_ITEM_STYLE_NONE); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->style; - } -@@ -760,7 +768,7 @@ ido_scale_menu_item_set_style (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - priv->style = style; - -@@ -784,7 +792,7 @@ ido_scale_menu_item_get_primary_image (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->primary_image; - } -@@ -806,7 +814,7 @@ ido_scale_menu_item_get_secondary_image (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->secondary_image; - } -@@ -859,7 +867,7 @@ ido_scale_menu_item_get_primary_label (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return gtk_label_get_text (GTK_LABEL (priv->primary_label)); - } -@@ -881,7 +889,7 @@ ido_scale_menu_item_get_secondary_label (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return gtk_label_get_text (GTK_LABEL (priv->secondary_label)); - } -@@ -903,7 +911,7 @@ ido_scale_menu_item_set_primary_label (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - if (priv->primary_label) - { -@@ -928,7 +936,7 @@ ido_scale_menu_item_set_secondary_label (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - if (priv->secondary_label) - { -@@ -954,7 +962,8 @@ static void - default_primary_clicked_handler (IdoScaleMenuItem * item) - { - g_debug ("%s: setting scale to lower bound", G_STRFUNC); -- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); - gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj)); - } -@@ -977,7 +986,7 @@ static void - default_secondary_clicked_handler (IdoScaleMenuItem * item) - { - g_debug ("%s: setting scale to upper bound", G_STRFUNC); -- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item); - GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); - gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj)); - } -@@ -991,7 +1000,7 @@ static void - ido_scale_menu_item_set_value (IdoScaleMenuItem *item, - gdouble value) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); - - /* set ignore_value_changed to signify to the scale menu item that it - * should not emit its own value-changed signal, as that should only -diff --git a/src/idoscalemenuitem.h b/src/idoscalemenuitem.h -index 2c32a49..de6968e 100644 ---- a/src/idoscalemenuitem.h -+++ b/src/idoscalemenuitem.h -@@ -47,13 +47,10 @@ typedef enum - - typedef struct _IdoScaleMenuItem IdoScaleMenuItem; - typedef struct _IdoScaleMenuItemClass IdoScaleMenuItemClass; --typedef struct _IdoScaleMenuItemPrivate IdoScaleMenuItemPrivate; - - struct _IdoScaleMenuItem - { - GtkMenuItem parent_instance; -- -- IdoScaleMenuItemPrivate *priv; - }; - - struct _IdoScaleMenuItemClass -diff --git a/src/idoswitchmenuitem.c b/src/idoswitchmenuitem.c -index d47392f..bd00e1d 100644 ---- a/src/idoswitchmenuitem.c -+++ b/src/idoswitchmenuitem.c -@@ -23,24 +23,25 @@ - #include "idoswitchmenuitem.h" - #include "idoactionhelper.h" - -+static void ido_switch_menu_finalize (GObject * item); - static gboolean ido_switch_menu_button_release_event (GtkWidget * widget, - GdkEventButton * event); - - --struct _IdoSwitchMenuItemPrivate -+typedef struct - { - GtkWidget * box; - GtkWidget * content_area; - GtkWidget * label; - GtkWidget * image; - GtkWidget * switch_w; --}; -+} IdoSwitchMenuItemPrivate; - - /*** - **** Life Cycle - ***/ - --G_DEFINE_TYPE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM) - - static void - ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) -@@ -50,7 +51,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) - GtkCheckMenuItemClass * check_class; - - gobject_class = G_OBJECT_CLASS (klass); -- g_type_class_add_private (gobject_class, sizeof (IdoSwitchMenuItemPrivate)); -+ -+ gobject_class->finalize = ido_switch_menu_finalize; - - widget_class = GTK_WIDGET_CLASS (klass); - widget_class->button_release_event = ido_switch_menu_button_release_event; -@@ -62,9 +64,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) - static void - ido_switch_menu_item_init (IdoSwitchMenuItem *item) - { -- IdoSwitchMenuItemPrivate *priv; -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); - -- priv = item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemPrivate); - priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - priv->content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - priv->switch_w = gtk_switch_new (); -@@ -134,6 +135,8 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) - - g_return_val_if_fail (IDO_IS_SWITCH_MENU_ITEM(item), NULL); - -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); -+ - if (!warned) - { - g_warning ("%s is deprecated. Please don't use it, especially if you're using" -@@ -141,7 +144,7 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) - warned = TRUE; - } - -- return GTK_CONTAINER (item->priv->content_area); -+ return GTK_CONTAINER (priv->content_area); - } - - /** -@@ -160,7 +163,7 @@ ido_switch_menu_item_set_label (IdoSwitchMenuItem *item, - g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item)); - g_return_if_fail (label != NULL); - -- priv = item->priv; -+ priv = ido_switch_menu_item_get_instance_private(item); - - if (priv->label == NULL) - { -@@ -189,7 +192,7 @@ ido_switch_menu_item_set_icon (IdoSwitchMenuItem *item, - g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item)); - g_return_if_fail (icon == NULL || G_IS_ICON (icon)); - -- priv = item->priv; -+ priv = ido_switch_menu_item_get_instance_private(item); - - if (icon) - { -@@ -213,10 +216,11 @@ ido_source_menu_item_state_changed (IdoActionHelper *helper, - GVariant *state, - gpointer user_data) - { -- IdoSwitchMenuItem *item = user_data; -+ IdoSwitchMenuItem *item = IDO_SWITCH_MENU_ITEM (user_data); -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); - - if (g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN)) -- gtk_switch_set_active (GTK_SWITCH (item->priv->switch_w), -+ gtk_switch_set_active (GTK_SWITCH (priv->switch_w), - g_variant_get_boolean (state)); - } - -@@ -269,3 +273,10 @@ ido_switch_menu_item_new_from_menu_model (GMenuItem *menuitem, - - return item; - } -+ -+static void -+ido_switch_menu_finalize (GObject * item) -+{ -+ /* no-op */ -+} -+ -diff --git a/src/idoswitchmenuitem.h b/src/idoswitchmenuitem.h -index 222b473..de218d1 100644 ---- a/src/idoswitchmenuitem.h -+++ b/src/idoswitchmenuitem.h -@@ -34,13 +34,10 @@ G_BEGIN_DECLS - - typedef struct _IdoSwitchMenuItem IdoSwitchMenuItem; - typedef struct _IdoSwitchMenuItemClass IdoSwitchMenuItemClass; --typedef struct _IdoSwitchMenuItemPrivate IdoSwitchMenuItemPrivate; - - struct _IdoSwitchMenuItem - { - GtkCheckMenuItem parent_instance; -- -- IdoSwitchMenuItemPrivate *priv; - }; - - struct _IdoSwitchMenuItemClass -diff --git a/src/idotimeline.c b/src/idotimeline.c -index 8eea4b5..4929ba3 100644 ---- a/src/idotimeline.c -+++ b/src/idotimeline.c -@@ -25,15 +25,11 @@ - #include <gtk/gtk.h> - #include <math.h> - --#define IDO_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IDO_TYPE_TIMELINE, IdoTimelinePriv)) - #define MSECS_PER_SEC 1000 - #define FRAME_INTERVAL(nframes) (MSECS_PER_SEC / nframes) - #define DEFAULT_FPS 30 - --typedef struct IdoTimelinePriv IdoTimelinePriv; -- --struct IdoTimelinePriv --{ -+typedef struct { - guint duration; - guint fps; - guint source_id; -@@ -48,7 +44,7 @@ struct IdoTimelinePriv - guint animations_enabled : 1; - guint loop : 1; - guint direction : 1; --}; -+} IdoTimelinePrivate; - - enum { - PROP_0, -@@ -81,7 +77,7 @@ static void ido_timeline_get_property (GObject *object, - static void ido_timeline_finalize (GObject *object); - - --G_DEFINE_TYPE (IdoTimeline, ido_timeline, G_TYPE_OBJECT) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeline, ido_timeline, G_TYPE_OBJECT) - - - static void -@@ -193,16 +189,12 @@ ido_timeline_class_init (IdoTimelineClass *klass) - g_cclosure_marshal_VOID__DOUBLE, - G_TYPE_NONE, 1, - G_TYPE_DOUBLE); -- -- g_type_class_add_private (klass, sizeof (IdoTimelinePriv)); - } - - static void - ido_timeline_init (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -- -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - priv->fps = DEFAULT_FPS; - priv->duration = 0.0; -@@ -251,11 +243,8 @@ ido_timeline_get_property (GObject *object, - GValue *value, - GParamSpec *pspec) - { -- IdoTimeline *timeline; -- IdoTimelinePriv *priv; -- -- timeline = IDO_TIMELINE (object); -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimeline *timeline = IDO_TIMELINE (object); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - switch (prop_id) - { -@@ -282,9 +271,8 @@ ido_timeline_get_property (GObject *object, - static void - ido_timeline_finalize (GObject *object) - { -- IdoTimelinePriv *priv; -- -- priv = IDO_TIMELINE_GET_PRIV (object); -+ IdoTimeline *timeline = IDO_TIMELINE (object); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -@@ -301,11 +289,10 @@ ido_timeline_finalize (GObject *object) - static gboolean - ido_timeline_run_frame (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; - gdouble delta_progress, progress; - guint elapsed_time; - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000); - g_timer_start (priv->timer); -@@ -395,12 +382,12 @@ ido_timeline_new_for_screen (guint duration, - void - ido_timeline_start (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - gboolean enable_animations = FALSE; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (!priv->source_id) - { -@@ -446,11 +433,11 @@ ido_timeline_start (IdoTimeline *timeline) - void - ido_timeline_pause (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -@@ -470,11 +457,11 @@ ido_timeline_pause (IdoTimeline *timeline) - void - ido_timeline_rewind (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (ido_timeline_get_direction(timeline) != IDO_TIMELINE_DIRECTION_FORWARD) - priv->progress = priv->last_progress = 1.; -@@ -502,11 +489,11 @@ ido_timeline_rewind (IdoTimeline *timeline) - gboolean - ido_timeline_is_running (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - return (priv->source_id != 0); - } -@@ -522,11 +509,12 @@ ido_timeline_is_running (IdoTimeline *timeline) - guint - ido_timeline_get_fps (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 1); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->fps; - } - -@@ -542,12 +530,12 @@ void - ido_timeline_set_fps (IdoTimeline *timeline, - guint fps) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - g_return_if_fail (fps > 0); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - /* Coverity CID: 12650/12651: guard against division by 0. */ - priv->fps = fps > 0 ? fps : priv->fps; -@@ -575,11 +563,12 @@ ido_timeline_set_fps (IdoTimeline *timeline, - gboolean - ido_timeline_get_loop (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->loop; - } - -@@ -595,11 +584,11 @@ void - ido_timeline_set_loop (IdoTimeline *timeline, - gboolean loop) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (loop != priv->loop) - { -@@ -619,11 +608,11 @@ void - ido_timeline_set_duration (IdoTimeline *timeline, - guint duration) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (duration != priv->duration) - { -@@ -643,11 +632,11 @@ ido_timeline_set_duration (IdoTimeline *timeline, - guint - ido_timeline_get_duration (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - return priv->duration; - } -@@ -663,11 +652,11 @@ void - ido_timeline_set_direction (IdoTimeline *timeline, - IdoTimelineDirection direction) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (direction != priv->direction) - { -@@ -687,11 +676,12 @@ ido_timeline_set_direction (IdoTimeline *timeline, - IdoTimelineDirection - ido_timeline_get_direction (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), IDO_TIMELINE_DIRECTION_FORWARD); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->direction; - } - -@@ -706,12 +696,12 @@ void - ido_timeline_set_screen (IdoTimeline *timeline, - GdkScreen *screen) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - g_return_if_fail (GDK_IS_SCREEN (screen)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->screen) - g_object_unref (priv->screen); -@@ -732,11 +722,12 @@ ido_timeline_set_screen (IdoTimeline *timeline, - GdkScreen * - ido_timeline_get_screen (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), NULL); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->screen; - } - -@@ -751,11 +742,12 @@ ido_timeline_get_screen (IdoTimeline *timeline) - gdouble - ido_timeline_get_progress (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0.); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->progress; - } - -@@ -769,11 +761,11 @@ ido_timeline_get_progress (IdoTimeline *timeline) - void - ido_timeline_set_progress (IdoTimeline *timeline, gdouble progress) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -diff --git a/src/idotimestampmenuitem.c b/src/idotimestampmenuitem.c -index 0d33deb..0c9c086 100644 ---- a/src/idotimestampmenuitem.c -+++ b/src/idotimestampmenuitem.c -@@ -39,17 +39,14 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoTimeStampMenuItemPrivate --{ -+typedef struct { - char * format; - GDateTime * date_time; --}; -- --typedef IdoTimeStampMenuItemPrivate priv_t; -+} IdoTimeStampMenuItemPrivate; - --G_DEFINE_TYPE (IdoTimeStampMenuItem, -- ido_time_stamp_menu_item, -- IDO_TYPE_BASIC_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeStampMenuItem, -+ ido_time_stamp_menu_item, -+ IDO_TYPE_BASIC_MENU_ITEM); - - /*** - **** GObject Virtual Functions -@@ -62,16 +59,16 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - - switch (property_id) - { - case PROP_FORMAT: -- g_value_set_string (v, p->format); -+ g_value_set_string (v, priv->format); - break; - - case PROP_DATE_TIME: -- g_value_set_boxed (v, p->date_time); -+ g_value_set_boxed (v, priv->date_time); - break; - - default: -@@ -108,9 +105,9 @@ static void - my_dispose (GObject * object) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - -- g_clear_pointer (&p->date_time, g_date_time_unref); -+ g_clear_pointer (&priv->date_time, g_date_time_unref); - - G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->dispose (object); - } -@@ -119,9 +116,9 @@ static void - my_finalize (GObject * object) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - -- g_free (p->format); -+ g_free (priv->format); - - G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->finalize (object); - } -@@ -136,8 +133,6 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass) - GParamFlags prop_flags; - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoTimeStampMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -167,20 +162,18 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass) - static void - ido_time_stamp_menu_item_init (IdoTimeStampMenuItem *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_TIME_STAMP_MENU_ITEM, -- IdoTimeStampMenuItemPrivate); -- -+ /* no-op */ - } - - static void - update_timestamp_label (IdoTimeStampMenuItem * self) - { - char * str; -- priv_t * p = self->priv; - -- if (p->date_time && p->format) -- str = g_date_time_format (p->date_time, p->format); -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ if (priv->date_time && priv->format) -+ str = g_date_time_format (priv->date_time, priv->format); - else - str = NULL; - -@@ -210,14 +203,15 @@ void - ido_time_stamp_menu_item_set_date_time (IdoTimeStampMenuItem * self, - GDateTime * date_time) - { -- priv_t * p; -+ IdoTimeStampMenuItemPrivate * priv; - - g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self)); -- p = self->priv; - -- g_clear_pointer (&p->date_time, g_date_time_unref); -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ g_clear_pointer (&priv->date_time, g_date_time_unref); - if (date_time != NULL) -- p->date_time = g_date_time_ref (date_time); -+ priv->date_time = g_date_time_ref (date_time); - update_timestamp_label (self); - } - -@@ -234,20 +228,25 @@ void - ido_time_stamp_menu_item_set_format (IdoTimeStampMenuItem * self, - const char * strftime_fmt) - { -- priv_t * p; -+ IdoTimeStampMenuItemPrivate * priv; - - g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self)); -- p = self->priv; - -- g_free (p->format); -- p->format = g_strdup (strftime_fmt); -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ g_free (priv->format); -+ priv->format = g_strdup (strftime_fmt); - update_timestamp_label (self); - } - - const gchar * - ido_time_stamp_menu_item_get_format (IdoTimeStampMenuItem * self) - { -+ IdoTimeStampMenuItemPrivate * priv; -+ - g_return_val_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self), NULL); - -- return self->priv->format; -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ return priv->format; - } -diff --git a/src/idotimestampmenuitem.h b/src/idotimestampmenuitem.h -index 5847ba8..b596fad 100644 ---- a/src/idotimestampmenuitem.h -+++ b/src/idotimestampmenuitem.h -@@ -31,7 +31,6 @@ G_BEGIN_DECLS - - typedef struct _IdoTimeStampMenuItem IdoTimeStampMenuItem; - typedef struct _IdoTimeStampMenuItemClass IdoTimeStampMenuItemClass; --typedef struct _IdoTimeStampMenuItemPrivate IdoTimeStampMenuItemPrivate; - - struct _IdoTimeStampMenuItemClass - { -@@ -49,7 +48,6 @@ struct _IdoTimeStampMenuItem - { - /*< private >*/ - IdoBasicMenuItem parent; -- IdoTimeStampMenuItemPrivate * priv; - }; - - -diff --git a/src/idousermenuitem.c b/src/idousermenuitem.c -index 8d8673e..bbb7916 100644 ---- a/src/idousermenuitem.c -+++ b/src/idousermenuitem.c -@@ -42,8 +42,7 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoUserMenuItemPrivate --{ -+typedef struct { - GtkWidget* user_image; - GtkWidget* user_name; - GtkWidget* container; -@@ -52,9 +51,9 @@ struct _IdoUserMenuItemPrivate - gboolean is_current_user; - gchar * label; - GIcon * icon; --}; -+} IdoUserMenuItemPrivate; - --G_DEFINE_TYPE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM); - - /* Prototypes */ - static gboolean ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * image, -@@ -72,23 +71,24 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - switch (property_id) - { - case PROP_LABEL: -- g_value_set_string (value, self->priv->label); -+ g_value_set_string (value, priv->label); - break; - - case PROP_ICON: -- g_value_set_object (value, self->priv->icon); -+ g_value_set_object (value, priv->icon); - break; - - case PROP_IS_LOGGED_IN: -- g_value_set_boolean (value, self->priv->is_logged_in); -+ g_value_set_boolean (value, priv->is_logged_in); - break; - - case PROP_IS_CURRENT_USER: -- g_value_set_boolean (value, self->priv->is_current_user); -+ g_value_set_boolean (value, priv->is_current_user); - break; - - default: -@@ -104,6 +104,7 @@ my_set_property (GObject * o, - GParamSpec * pspec) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -120,7 +121,7 @@ my_set_property (GObject * o, - break; - - case PROP_IS_CURRENT_USER: -- self->priv->is_current_user = g_value_get_boolean (value); -+ priv->is_current_user = g_value_get_boolean (value); - gtk_widget_queue_draw (GTK_WIDGET(self)); - break; - -@@ -134,8 +135,9 @@ static void - my_dispose (GObject *object) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- g_clear_object (&self->priv->icon); -+ g_clear_object (&priv->icon); - - G_OBJECT_CLASS (ido_user_menu_item_parent_class)->dispose (object); - } -@@ -144,8 +146,9 @@ static void - my_finalize (GObject *object) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- g_free (self->priv->label); -+ g_free (priv->label); - - G_OBJECT_CLASS (ido_user_menu_item_parent_class)->finalize (object); - } -@@ -156,8 +159,6 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass) - GParamFlags prop_flags; - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoUserMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -197,13 +198,7 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass) - static void - ido_user_menu_item_init (IdoUserMenuItem *self) - { -- IdoUserMenuItemPrivate * priv; -- -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_USER_MENU_ITEM_TYPE, -- IdoUserMenuItemPrivate); -- -- priv = self->priv; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - // Create the UI elements. - priv->user_image = gtk_image_new (); -@@ -260,7 +255,7 @@ ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * widget, - - g_return_val_if_fail(IS_IDO_USER_MENU_ITEM(user_data), FALSE); - -- priv = IDO_USER_MENU_ITEM(user_data)->priv; -+ priv = ido_user_menu_item_get_instance_private(IDO_USER_MENU_ITEM(user_data)); - - /* Draw dot only when user is the current user. */ - if (priv->is_current_user) -@@ -303,6 +298,8 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - gint height; - GdkPixbuf *pixbuf; - -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ - file = g_file_icon_get_file (G_FILE_ICON (icon)); - path = g_file_get_path (file); - -@@ -316,7 +313,7 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - - if (pixbuf) - { -- gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->user_image), pixbuf); -+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->user_image), pixbuf); - g_object_unref (pixbuf); - return TRUE; - } -@@ -331,15 +328,15 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - void - ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon) - { -- IdoUserMenuItemPrivate * p = self->priv; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- if (p->icon == icon) -+ if (priv->icon == icon) - return; - -- g_clear_object (&p->icon); -+ g_clear_object (&priv->icon); - - if (icon) -- p->icon = g_object_ref (icon); -+ priv->icon = g_object_ref (icon); - - /* Avatars are always loaded from disk. Show the fallback when no icon - * is set, the icon is not a file icon, or the file could not be -@@ -349,7 +346,7 @@ ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon) - !G_IS_FILE_ICON (icon) || - !ido_user_menu_item_set_icon_from_file_icon (self, G_FILE_ICON (icon))) - { -- gtk_image_set_from_icon_name (GTK_IMAGE (p->user_image), -+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->user_image), - FALLBACK_ICON_NAME, - GTK_ICON_SIZE_MENU); - } -@@ -370,20 +367,26 @@ ido_user_menu_item_set_icon_from_file (IdoUserMenuItem * self, const char * file - void - ido_user_menu_item_set_logged_in (IdoUserMenuItem * self, gboolean is_logged_in) - { -- gtk_widget_set_visible (self->priv->tick_icon, is_logged_in); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ gtk_widget_set_visible (priv->tick_icon, is_logged_in); - } - - void - ido_user_menu_item_set_current_user (IdoUserMenuItem * self, gboolean is_current_user) - { -- self->priv->is_current_user = is_current_user; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ priv->is_current_user = is_current_user; - gtk_widget_queue_draw (GTK_WIDGET (self)); - } - - void - ido_user_menu_item_set_label (IdoUserMenuItem * self, const char * label) - { -- gtk_label_set_label (GTK_LABEL(self->priv->user_name), label); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ gtk_label_set_label (GTK_LABEL(priv->user_name), label); - } - - GtkWidget* -diff --git a/src/idousermenuitem.h b/src/idousermenuitem.h -index d1d5729..093078d 100644 ---- a/src/idousermenuitem.h -+++ b/src/idousermenuitem.h -@@ -32,7 +32,6 @@ G_BEGIN_DECLS - - typedef struct _IdoUserMenuItem IdoUserMenuItem; - typedef struct _IdoUserMenuItemClass IdoUserMenuItemClass; --typedef struct _IdoUserMenuItemPrivate IdoUserMenuItemPrivate; - - /* property keys */ - #define IDO_USER_MENU_ITEM_PROP_LABEL "label" -@@ -49,7 +48,6 @@ struct _IdoUserMenuItem - { - /*< private >*/ - GtkMenuItem parent; -- IdoUserMenuItemPrivate * priv; - }; - - GType ido_user_menu_item_get_type (void) G_GNUC_CONST; diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index dcdb6d85e..609bbac16 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f baloo-widgets-19.12.3.tar.xz" +sha512sums="831a063d15958cb96d86e4273fe66fb7fc8d0f408fd9ecac2871da411ed41b88623680ff4a449ba2013aa006cba0c2e6b5ff9e2e3214513f0eed1306b62dd504 baloo-widgets-20.04.3.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 4f84cbb32..b1672e90b 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -54,5 +54,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 baloo-5.68.0.tar.xz +sha512sums="0c23bd056bfb934b1e623e0aeaa151d47d2f0f4938c40ece1b738b35bf81eb424b2d4772b276f8893e8c914b904c172f7b28d25ea2b5e96771cc5d1f121e64e5 baloo-5.72.0.tar.xz a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 5135228af..04cd2de05 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.10 +pkgver=9.14.12 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -153,7 +153,7 @@ tools() { done } -sha512sums="81d453c4e90fea3a21b2485bea2f5321ca8a7ef58eb9a9bc1eaa1463989aefa439e4e45c9a43b1ec6a62c52f0e73d82ebd91cd084ad6ef2a67b705736e9e8d00 bind-9.14.10.tar.gz +sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf bind-9.14.12.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 1ec66b771..f7592b23f 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938 blinken-19.12.3.tar.xz" +sha512sums="5c84a319d980be8273a593d2ae00fb75cd6444347f54f00b3f533d8d9b4cf5f1612f3db8a4a040a650dd30506d3070ad647a179d7498be4727315eb30ad2975e blinken-20.04.3.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD index 2f4fc80a2..d4a8635d4 100644 --- a/user/bluez-qt/APKBUILD +++ b/user/bluez-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt integration with BlueZ" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c11a43b29f1c04fc67abf2c7f5a2e53e098cdeeddde84ed88a46a15d1dce537442d24422c245f23506840aef2d84d5d828b4c7951362537725b59d31a9a402c7 bluez-qt-5.68.0.tar.xz" +sha512sums="3b935d88e0ed5637b35f01ea1aaf32c693d2cbbcbcb0d64c06f7134995dd3b348399d7597fb26874bbb9a98fa2a224b09106ceb87aa797ebc064257c8242e862 bluez-qt-5.72.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index af4f09ba8..6f90834b1 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.53 +pkgver=5.54 pkgrel=1 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" license="GPL-2.0+" -depends="consolekit2 dbus" +depends="dbus elogind" makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev linux-headers ncurses-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd @@ -29,6 +29,10 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz time64.patch " +# secfixes: +# 5.54-r0: +# - CVE-2020-0556 + prepare() { default_prepare @@ -128,7 +132,7 @@ tools() { done } -sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74 bluez-5.53.tar.xz +sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe bluez-5.54.tar.xz 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD index b14289263..b9b75ff19 100644 --- a/user/bolt/APKBUILD +++ b/user/bolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bolt -pkgver=0.8 +pkgver=0.9 pkgrel=0 pkgdesc="Thunderbolt 3 device manager" url=" " @@ -10,9 +10,7 @@ license="LGPL-2.1-only" depends="" makedepends="eudev-dev glib-dev meson ninja polkit-dev" subpackages="" -source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz - wakeup.patch - " +source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz" build() { meson \ @@ -32,5 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 bolt-0.8.tar.gz -487f2c7824edba318692d40ffc4e55f893602587b1380b18877d9dca3b5b22b14e27001b3547369a8ec1a6c5fe7a5facc1fa97e92b3a5011a67ec967afce25ea wakeup.patch" +sha512sums="427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 bolt-0.9.tar.gz" diff --git a/user/bolt/wakeup.patch b/user/bolt/wakeup.patch deleted file mode 100644 index a10d420c4..000000000 --- a/user/bolt/wakeup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001 -From: Christian Kellner <christian@kellner.me> -Date: Mon, 13 Jan 2020 17:38:47 +0100 -Subject: [PATCH] manager: ignore wakeup device uevents for probing - -The probing detection code should ignore wakeup device uevents -because these virtual devices can be added (and removed) without -and correspondence to any physical thunderbolt device (un-)plug -events. ---- - boltd/bolt-manager.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c -index 877c008..c8b60da 100644 ---- a/boltd/bolt-manager.c -+++ b/boltd/bolt-manager.c -@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev) - bolt_streq (driver, "thunderbolt"); - } - -+static gboolean -+device_is_wakeup (struct udev_device *dev) -+{ -+ const char *subsys; -+ -+ subsys = udev_device_get_subsystem (dev); -+ -+ return bolt_streq (subsys, "wakeup"); -+} -+ - static gboolean - probing_add_root (BoltManager *mgr, - struct udev_device *dev) -@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr, - if (syspath == NULL) - return; - -+ /* ignore events for wakeup devices which get removed -+ * and added at random time without any connection to -+ * any physical thunderbolt device */ -+ if (device_is_wakeup (dev)) -+ return; -+ - roots = mgr->probing_roots; - for (guint i = 0; i < roots->len; i++) - { --- -2.24.1 - diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 029cb84a2..09519b7c7 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb bomber-19.12.3.tar.xz" +sha512sums="c4ecae31c9f1a4af628dc5a7dbc587f5d05d3bb141942584bb8ca6cb932f32e5df1cd77f8891189fb9fdad510cd027b664c75e520e9c90bf3d054a930dc6935d bomber-20.04.3.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 4f98235e9..1cfaa4ff7 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855 bovo-19.12.3.tar.xz" +sha512sums="cf01b8713aa79f562dd89744e7f6b070fdad30b257bd13d570c6e26a38b3bfb96882a36159ba432dc06fa4a81591a17a613deecdb09b2bfd129b97c2d6aa8bda bovo-20.04.3.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 2142678a6..6832d03e6 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -45,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="d66ee651d8d69e5e162cf2f74f1f84255db121e90e8a2150813a06a918af8642b41a23b3b5885b8b10d23ec0a3bdb654affca78790b6d2158833a34e7bc1d7d3 breeze-icons-5.68.0.tar.xz" +sha512sums="c6a42baeb391ab236cfc28f856176dbb9a435dc967adc9ab30172dbdf344f6c53380fc9f5149c3b2eac5d42d1e1b3e886d7576a908e3768b66226cb0e92e4d84 breeze-icons-5.72.0.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 079282295..e8412ef96 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.4.1 +pkgver=5.7 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="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz" +sha512sums="72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 btrfs-progs-v5.7.tar.xz" diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD index 41ebe01f6..2ab70e6f1 100644 --- a/user/bzflag/APKBUILD +++ b/user/bzflag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bzflag -pkgver=2.4.18 +pkgver=2.4.20 pkgrel=0 pkgdesc="3D networked multi-player multi-platform tank battle game" url="https://www.bzflag.org/" @@ -10,9 +10,7 @@ license="LGPL-2.1+ AND MPL-2.0" depends="" makedepends="c-ares-dev curl-dev glew-dev ncurses-dev sdl2-dev zlib-dev" subpackages="$pkgname-doc" -source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2 - defineAddrLen.patch - " +source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2" build() { LIBS="-ltinfo" ./configure \ @@ -33,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246 bzflag-2.4.18.tar.bz2 -6c7a1873706140b1b0b254d6f8350f47adef8f499a7e7b3418331beda11bdc71e2e0dee74e17d4a955960de66adf90d22796b440e1afa78d328077235e2e3dde defineAddrLen.patch" +sha512sums="6140123d37065bead3021ef9c36db1210ad2c71a4a7deb6894bb3f856a571197a7eac37d16b8e3b587549dc201c4ac8d7bbe03d1a05d067dc452861924005169 bzflag-2.4.20.tar.bz2" diff --git a/user/bzflag/defineAddrLen.patch b/user/bzflag/defineAddrLen.patch deleted file mode 100644 index a25eb96c3..000000000 --- a/user/bzflag/defineAddrLen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzflag-2.4.16/include/network.h.old 2018-09-27 19:16:48.015111918 -0700 -+++ bzflag-2.4.16/include/network.h 2018-09-27 19:17:06.195370763 -0700 -@@ -57,7 +57,7 @@ - # include <bstring.h> - #endif - --#if defined(BSD) || defined(__sun__) || defined(__GLIBC__) -+#if defined(BSD) || defined(__sun__) || defined(__linux__) - # define AddrLen socklen_t - #elif defined (__APPLE__) - # include <AvailabilityMacros.h> diff --git a/user/c-ares/APKBUILD b/user/c-ares/APKBUILD index 8b9cc81ee..564b70ce9 100644 --- a/user/c-ares/APKBUILD +++ b/user/c-ares/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=c-ares -pkgver=1.15.0 -pkgrel=1 +pkgver=1.16.1 +pkgrel=0 pkgdesc="Asynchronous DNS/name resolver library" url="https://c-ares.haxx.se/" arch="all" @@ -11,9 +11,7 @@ license="MIT" depends="" makedepends="" subpackages="$pkgname-doc $pkgname-dev" -source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz - onion-segfault.patch - " +source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 c-ares-1.15.0.tar.gz -f26d4e981afc87fe734893d91210f1d5cbdf841d7704acf41a964991ab669fffd0ffd661c24be84d67edc9e1d6804214e6e7188e77f6555c01c9ad8165f6fbfa onion-segfault.patch" +sha512sums="4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471 c-ares-1.16.1.tar.gz" diff --git a/user/c-ares/onion-segfault.patch b/user/c-ares/onion-segfault.patch deleted file mode 100644 index 7e5a712cd..000000000 --- a/user/c-ares/onion-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 43a915a1b741b7c5bad2f622de90f353cdae7694 Mon Sep 17 00:00:00 2001 -From: Khaidi Chu <i@2333.moe> -Date: Mon, 4 Feb 2019 10:38:07 +0800 -Subject: [PATCH] fix: init bufp before reject .onion to make it can be free - correctly (#241) - -When querying a .onion domain, it returns directly without setting bufp to NULL. A subsequent free() that occurs can cause a segmentation fault. - -Fix By: Khaidi Chu (@XadillaX) ---- - ares_create_query.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ares_create_query.c b/ares_create_query.c -index 1606b1a1..9efce17c 100644 ---- a/ares_create_query.c -+++ b/ares_create_query.c -@@ -94,14 +94,14 @@ int ares_create_query(const char *name, int dnsclass, int type, - size_t buflen; - unsigned char *buf; - -- /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -- if (ares__is_onion_domain(name)) -- return ARES_ENOTFOUND; -- - /* Set our results early, in case we bail out early with an error. */ - *buflenp = 0; - *bufp = NULL; - -+ /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -+ if (ares__is_onion_domain(name)) -+ return ARES_ENOTFOUND; -+ - /* Allocate a memory area for the maximum size this packet might need. +2 - * is for the length byte and zero termination if no dots or ecscaping is - * used. diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index 60d8a0e8e..7fa944d3a 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.1 +pkgrel=0 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" @@ -23,35 +23,15 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev boost-dev eigen-dev fontconfig-dev freetype-dev gsl-dev lcms2-dev libetonyek-dev libgit2-dev libodfgen-dev librevenge-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev - qca-dev + qca-dev okular kcalendarcore-dev kcontacts-dev kdiagram-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz - https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz - c99-math.patch - kcalcore.patch - kf5.patch - plan.patch - poppler.patch - poppler2.patch - poppler3.patch - poppler4.patch - poppler-73.patch - poppler-81.patch - poppler-83.patch - qt5.patch + braindump.patch + ridiculous-typo.patch " -prepare() { - # Run this *before* default_prepare so patches can work on plan! - mv ../calligraplan-$pkgver plan - default_prepare - sed -e "/add_subdirectory(plan)/s/#//" \ - -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ - -i CMakeLists.txt -} - build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -64,7 +44,9 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ - -DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \ + -DPRODUCTSET=desktop \ + -DQt5WebKitWidgets_FOUND=True \ + -DAPP_BRAINDUMP=True \ -DBUILD_UNMAINTAINED=True \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -79,17 +61,6 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz -a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz -b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch -7c7c0dbf0603e1ff1dba640364c58922e1f59f0c60ef4a1afbd330e454259a2ef767d94d54e8c0ef5c228c6972e91cbdc32cb6242a27e5374ddf0c5d4ea983d6 kcalcore.patch -0edb2b9ef6c9aad374d3e25bbc637f9a3447a6e70d153fbec4ab87dc213e96076a6c8df5a65fb020d7f232269ee8cf4561f5d13724df827247379c321c15401d kf5.patch -7d4654810d0aa1bcbd3609e0d9067e357284a9cd97d50aa3782ef8e341478c3c16acba85428595ddb1d5b22397703f2383304d2c39c48d3fd5e2cfa2768bc6bc plan.patch -960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch -53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch -a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch -df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch -8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch -354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch -b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch -440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch" +sha512sums="e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f calligra-3.2.1.tar.xz +786f02e5e21535c08343bee10ddf5d331dd34e778a117228edc010ca20dc497c285d3938a3166892f2faa20167133f3b64ab66f0a8b623ae5318601a7218359d braindump.patch +3fa0700f471202eb8b76ded3928b884f43aa1c52e3fa6fc33b7fb62d5b1dcff1df2823723963a40f383e466eb7bebb1a66db14f2bd076a41f25b74f1a5f7f8d5 ridiculous-typo.patch" diff --git a/user/calligra/braindump.patch b/user/calligra/braindump.patch new file mode 100644 index 000000000..741221700 --- /dev/null +++ b/user/calligra/braindump.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/CMakeLists.txt.old 2020-05-14 06:53:49.000000000 +0000 ++++ calligra-3.2.1/CMakeLists.txt 2020-07-29 23:07:48.255879433 +0000 +@@ -1068,7 +1068,7 @@ + # e.g.: + # calligra_disable_product(APP_FOO "isn't buildable at the moment") + +-calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") ++#calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") + + ############################################# + #### Calculate buildable products #### diff --git a/user/calligra/c99-math.patch b/user/calligra/c99-math.patch deleted file mode 100644 index 4326dd7fa..000000000 --- a/user/calligra/c99-math.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt.old 2018-01-26 09:24:44.000000000 +0000 -+++ calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt 2018-10-24 23:22:43.440000000 +0000 -@@ -64,12 +64,12 @@ - set( CMAKE_REQUIRED_INCLUDES math.h ) - endif() - --check_function_exists( isinf HAVE_FUNC_ISINF ) --check_function_exists( isnan HAVE_FUNC_ISNAN ) -+check_symbol_exists( isinf math.h HAVE_FUNC_ISINF ) -+check_symbol_exists( isnan math.h HAVE_FUNC_ISNAN ) - if(MINGW) - add_definitions( -DHAVE_FUNC_ISFINITE ) - endif() --check_function_exists( finite HAVE_FUNC_FINITE ) -+check_symbol_exists( finite math.h HAVE_FUNC_FINITE ) - check_function_exists( _finite HAVE_FUNC__FINITE ) - - # diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch deleted file mode 100644 index 8124192db..000000000 --- a/user/calligra/kcalcore.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 12:20:29 +0200 -Subject: Fix compilation after recent KCalCore API changes - ---- - .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -index 757d693..daf1c2d 100644 ---- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,6 +31,7 @@ - #include <kcalcore/attachment.h> - #include <kcalcore/icalformat.h> - #include <kcalcore/memorycalendar.h> -+#include <kcalcore_version.h> - - #include <QTextCodec> - #include <QByteArray> -@@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setOrganizer(node->projectNode()->leader()); - } - if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); -+ KCalCore::Attendee a(p.name(), p.email()); -+ a.setRole(KCalCore::Attendee::NonParticipant); -+#else - KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); - KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); - a->setRole(KCalCore::Attendee::NonParticipant); -+#endif - todo->addAttendee(a); - } - DateTime st = node->startTime(id); -@@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - const QList<Resource*> lst = task->requestedResources(); - foreach(const Resource *r, lst) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - } else { - foreach(const Resource *r, s->resources()) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - -@@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setPercentComplete(task->completion().percentFinished()); - } - foreach(const Document *doc, node->documents().documents()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttachment(KCalCore::Attachment(doc->url().url())); -+#else - todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); -+#endif - } - if (! parent.isNull()) { - todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 - diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch deleted file mode 100644 index 1a424ef98..000000000 --- a/user/calligra/kf5.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Nov 2019 14:28:36 +0100 -Subject: port away from deprecated methods in KWindowSystem >= 5.62 - -(this is in order to make KWindowSystem independent from QtWidgets) ---- - plan/src/workpackage/commandlineparser.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp -index 432f99a..f9be208 100644 ---- a/plan/src/workpackage/commandlineparser.cpp -+++ b/plan/src/workpackage/commandlineparser.cpp -@@ -28,6 +28,7 @@ - #include <KStartupInfo> - #include <KWindowSystem> - #include <KMessageBox> -+#include <kwindowsystem_version.h> - - #include <QApplication> - #include <QDir> -@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons - handleCommandLine(QDir(workingDirectory)); - - // terminate startup notification and activate the mainwindow -+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0) -+ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true); -+ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId()); -+#else - KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId()); -+#endif - KWindowSystem::forceActiveWindow(m_mainwindow->winId()); - - } --- -cgit v1.1 - diff --git a/user/calligra/plan.patch b/user/calligra/plan.patch deleted file mode 100644 index c8f8c91fb..000000000 --- a/user/calligra/plan.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 36ec68024620211edbcdb31a5ef6021545fe9451 Mon Sep 17 00:00:00 2001 -From: Dag Andersen <danders@get2net.dk> -Date: Fri, 9 Feb 2018 08:40:34 +0100 -Subject: Plan: Fix crash in tj scheduler if a resource does not have a - calendar - -This can happen when there is no default calendar and no calendar has been set for a resource. ---- - plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -index 4f4e825..548969e 100644 ---- a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -+++ b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -@@ -259,6 +259,9 @@ bool PlanTJScheduler::kplatoToTJ() - addRequests(); - addStartEndJob(); - -+ if (result != -1) { -+ return false; -+ } - return check(); - } - -@@ -596,6 +599,7 @@ TJ::Resource *PlanTJScheduler::addResource( KPlato::Resource *r) - res->setEfficiency( (double)(r->units()) / 100. ); - } - Calendar *cal = r->calendar(); -+ Q_ASSERT(cal); - DateTime start = qMax( r->availableFrom(), m_project->constraintStartTime() ); - DateTime end = m_project->constraintEndTime(); - if ( r->availableUntil().isValid() && end > r->availableUntil() ) { -@@ -887,6 +891,11 @@ void PlanTJScheduler::addRequest( TJ::Task *job, Task *task ) - return; - } - foreach ( ResourceRequest *rr, task->requests().resourceRequests( true /*resolveTeam*/ ) ) { -+ if (!rr->resource()->calendar()) { -+ result = 1; // stops scheduling -+ logError(task, 0, i18n("No working hours defined for resource: %1",rr->resource()->name())); -+ continue; // may happen if no calendar is set, and no default calendar -+ } - TJ::Resource *tjr = addResource( rr->resource() ); - TJ::Allocation *a = new TJ::Allocation(); - a->setSelectionMode( TJ::Allocation::order ); --- -cgit v1.1 - diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch deleted file mode 100644 index aa71e20b4..000000000 --- a/user/calligra/poppler-73.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000 -@@ -402,7 +402,7 @@ - - QString str; - -- const char * p = s->getCString(); -+ const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -451,11 +451,11 @@ - *d->body << " y=\"" << y << "px\""; - - if (font && font->getFamily()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; -+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); - } else if (font && font->getName()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; -+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); - } - *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; - -@@ -488,7 +488,7 @@ - if (maskColors) { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - - for (int x = 0; x < width; x++) { -@@ -507,7 +507,7 @@ - } else { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - diff --git a/user/calligra/poppler-81.patch b/user/calligra/poppler-81.patch deleted file mode 100644 index 3211b7b8e..000000000 --- a/user/calligra/poppler-81.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 8f462b7b597..945eebbe676 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -1,4 +1,8 @@ - -+if(Poppler_VERSION VERSION_LESS "0.82.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_82") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 18c6fbb4a44..3ebb2281bf3 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -405,7 +405,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; -+#ifdef HAVE_POPPLER_PRE_0_82 - Unicode *u = nullptr; -+#else -+ const Unicode *u = nullptr; -+#endif - int uLen; - double dx, dy, originX, originY; - while (len > 0) { -@@ -474,9 +478,15 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - *d->body << "</text>" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+#ifdef HAVE_POPPLER_PRE_0_82 -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool /*interpolate*/, int *maskColors, bool /*inlineImg*/) -+#else -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool /*interpolate*/, int *maskColors, bool inlineImg) -+ bool /*interpolate*/, const int *maskColors, bool inlineImg) -+#endif - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2c161ce50af..2b0ea41e30c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -61,9 +61,17 @@ public: - void drawString(GfxState * state, const GooString * s) override; - -+#ifdef HAVE_POPPLER_PRE_0_82 -+ // images -+ void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool interpolate, int *maskColors, bool inlineImg) override; -+#else - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool interpolate, int *maskColors, bool inlineImg) override; -+ bool interpolate, const int *maskColors, bool inlineImg) override; -+#endif -+ - - // styles - void updateAll(GfxState *state) override; diff --git a/user/calligra/poppler-83.patch b/user/calligra/poppler-83.patch deleted file mode 100644 index e158ac4ff..000000000 --- a/user/calligra/poppler-83.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt 2020-01-13 12:08:05.610601265 +0000 -@@ -3,6 +3,10 @@ - add_definitions("-DHAVE_POPPLER_PRE_0_82") - endif() - -+if(Poppler_VERSION VERSION_LESS "0.83.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_83") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) ---- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp.old 2020-01-13 10:34:30.622852616 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2020-01-13 12:26:57.029441237 +0000 -@@ -60,19 +60,31 @@ - } - - // read config file -+#ifdef HAVE_POPPLER_PRE_0_83 - globalParams = new GlobalParams(); -+#else -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams()); -+#endif - if (! globalParams) - return KoFilter::NotImplemented; - - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); - if (! pdfDoc) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - return KoFilter::StupidError; - } - - if (! pdfDoc->isOk()) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - delete pdfDoc; - return KoFilter::StupidError; - } -@@ -99,8 +111,12 @@ - - delete dev; - delete pdfDoc; -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; - globalParams = 0; -+#else -+ globalParams.reset(); -+#endif - - return KoFilter::OK; - } ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2020-01-13 11:57:43.537339118 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2020-01-13 12:18:49.211663293 +0000 -@@ -172,7 +172,11 @@ - *d->body << "/>" << endl; - } - -+#ifdef HAVE_POPPLER_PRE_0_83 - QString SvgOutputDev::convertPath(GfxPath *path) -+#else -+QString SvgOutputDev::convertPath(const GfxPath *path) -+#endif - { - if (! path) - return QString(); -@@ -180,7 +184,12 @@ - QString output; - - for (int i = 0; i < path->getNumSubpaths(); ++i) { -- GfxSubpath * subpath = path->getSubpath(i); -+#ifdef HAVE_POPPLER_PRE_0_83 -+ GfxSubpath * subpath; -+#else -+ const GfxSubpath * subpath; -+#endif -+ subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); - int j = 1; ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2020-01-13 12:11:30.918610131 +0000 -@@ -87,7 +87,11 @@ - /// Dumps content to svg file - void dumpContent(); - private: -+#ifdef HAVE_POPPLER_PRE_0_83 - QString convertPath(GfxPath *path); -+#else -+ QString convertPath(const GfxPath *path); -+#endif - QString convertMatrix(const QMatrix &matrix); - QString convertMatrix(const double * matrix); - QString printFill(); diff --git a/user/calligra/poppler.patch b/user/calligra/poppler.patch deleted file mode 100644 index 458a31514..000000000 --- a/user/calligra/poppler.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Wed, 24 Oct 2018 08:28:00 +0200 -Subject: Fix build with poppler>=0.69 - -Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's - -Differential Revision: https://phabricator.kde.org/D16388 ---- - filters/karbon/pdf/PdfImport.cpp | 3 --- - filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- - filters/karbon/pdf/SvgOutputDev.h | 2 +- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0..48b08df 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - -- // check for memory leaks -- Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917a..7901317 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) - .arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") - .arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - -- char * p = s->getCString(); -+ const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55d..2a44908 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); -- QString convertMatrix(double * matrix); -+ QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); - --- -cgit v0.11.2 - diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch deleted file mode 100644 index 6f18c070f..000000000 --- a/user/calligra/poppler2.patch +++ /dev/null @@ -1,114 +0,0 @@ -From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Thu, 25 Oct 2018 23:04:39 +0200 -Subject: Mark the functions as override - -So when poppler API breaks (as it often does) it stops compiling and -someone has to fix it ---- - filters/karbon/pdf/SvgOutputDev.cpp | 13 +++-------- - filters/karbon/pdf/SvgOutputDev.h | 43 +++++++++++++++++-------------------- - 2 files changed, 23 insertions(+), 33 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 5692824..1d07f16 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke() - return stroke; - } - --void SvgOutputDev::drawString(GfxState * state, GooString * s) -+void SvgOutputDev::drawString(GfxState * state, const GooString * s) - { - int render = state->getRender(); - // check for invisible text -- this is used by Acrobat Capture -@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - *d->body << "</text>" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, -+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool /*inlineImg*/) -+ GBool /*interpolate*/, int *maskColors, GBool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - delete imgStr; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) --{ -- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); --} -- -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2a44908..422027c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -46,38 +46,35 @@ public: - - GBool isOk(); - -- virtual GBool upsideDown(); -- virtual GBool useDrawChar(); -- virtual GBool interpretType3Chars(); -- virtual void startPage(int pageNum, GfxState *state, XRef *xref); -- virtual void endPage(); -+ GBool upsideDown() override; -+ GBool useDrawChar() override; -+ GBool interpretType3Chars() override; -+ void startPage(int pageNum, GfxState *state, XRef *xref) override; -+ void endPage() override; - - // path painting -- virtual void stroke(GfxState * state); -- virtual void fill(GfxState * state); -- virtual void eoFill(GfxState *state); -+ void stroke(GfxState * state) override; -+ void fill(GfxState * state) override; -+ void eoFill(GfxState *state) override; - - // text -- virtual void drawString(GfxState * state, GooString * s); -+ void drawString(GfxState * state, const GooString * s) override; - - // images -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool inlineImg); -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg); -+ GBool interpolate, int *maskColors, GBool inlineImg) override; - - // styles -- virtual void updateAll(GfxState *state); -- virtual void updateFillColor(GfxState *state); -- virtual void updateStrokeColor(GfxState *state); -- virtual void updateFillOpacity(GfxState *state); -- virtual void updateStrokeOpacity(GfxState *state); -- virtual void updateLineJoin(GfxState *state); -- virtual void updateLineCap(GfxState *state); -- virtual void updateMiterLimit(GfxState *state); -- virtual void updateLineWidth(GfxState *state); -+ void updateAll(GfxState *state) override; -+ void updateFillColor(GfxState *state) override; -+ void updateStrokeColor(GfxState *state) override; -+ void updateFillOpacity(GfxState *state) override; -+ void updateStrokeOpacity(GfxState *state) override; -+ void updateLineJoin(GfxState *state) override; -+ void updateLineCap(GfxState *state) override; -+ void updateMiterLimit(GfxState *state) override; -+ void updateLineWidth(GfxState *state) override; - - /// Dumps content to svg file - void dumpContent(); --- -cgit v1.1 - diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch deleted file mode 100644 index 54702b515..000000000 --- a/user/calligra/poppler3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Thu, 25 Oct 2018 23:06:34 +0200 -Subject: GBool -> bool - -It was just a typedef in poppler and it'll die in next versions ---- - filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------ - filters/karbon/pdf/SvgOutputDev.h | 10 +++++----- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 1d07f16..870a940 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -52,7 +52,7 @@ public: - QString defsData; - QTextStream * defs; - QTextStream * body; -- GBool state; -+ bool state; - QSizeF pageSize; - QPen pen; - QBrush brush; -@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev() - delete d; - } - --GBool SvgOutputDev::isOk() -+bool SvgOutputDev::isOk() - { - return d->state; - } - --GBool SvgOutputDev::upsideDown() -+bool SvgOutputDev::upsideDown() - { - return gTrue; - } - --GBool SvgOutputDev::useDrawChar() -+bool SvgOutputDev::useDrawChar() - { - return gFalse; - } - --GBool SvgOutputDev::interpretType3Chars() -+bool SvgOutputDev::interpretType3Chars() - { - return gFalse; - } -@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) -+ bool /*interpolate*/, int *maskColors, bool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 422027c..df2805c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -44,11 +44,11 @@ public: - explicit SvgOutputDev(const QString &fileName); - virtual ~SvgOutputDev(); - -- GBool isOk(); -+ bool isOk(); - -- GBool upsideDown() override; -- GBool useDrawChar() override; -- GBool interpretType3Chars() override; -+ bool upsideDown() override; -+ bool useDrawChar() override; -+ bool interpretType3Chars() override; - void startPage(int pageNum, GfxState *state, XRef *xref) override; - void endPage() override; - -@@ -63,7 +63,7 @@ public: - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg) override; -+ bool interpolate, int *maskColors, bool inlineImg) override; - - // styles - void updateAll(GfxState *state) override; --- -cgit v1.1 - diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch deleted file mode 100644 index 9a13bcdec..000000000 --- a/user/calligra/poppler4.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Fri, 2 Nov 2018 21:23:13 +0100 -Subject: Fix build with poppler 0.71 - -Port away from removed API - -Differential Revision: https://phabricator.kde.org/D16607 ---- - filters/karbon/pdf/PdfImport.cpp | 6 +++--- - filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index 48b08df..e910dae 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); - if (dev->isOk()) { - int rotate = 0; -- GBool useMediaBox = gTrue; -- GBool crop = gFalse; -- GBool printing = gFalse; -+ bool useMediaBox = true; -+ bool crop = false; -+ bool printing = false; - pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); - dev->dumpContent(); - } -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 9063e69..80f01a5 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -39,7 +39,7 @@ class SvgOutputDev::Private - { - public: - Private(const QString &fname) -- : svgFile(fname), defs(0), body(0), state(gTrue) -+ : svgFile(fname), defs(0), body(0), state(true) - , brush(Qt::SolidPattern) {} - - ~Private() { -@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) - : d(new Private(fileName)) - { - if (! d->svgFile.open(QIODevice::WriteOnly)) { -- d->state = gFalse; -+ d->state = false; - return; - } - -@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk() - - bool SvgOutputDev::upsideDown() - { -- return gTrue; -+ return true; - } - - bool SvgOutputDev::useDrawChar() - { -- return gFalse; -+ return false; - } - - bool SvgOutputDev::interpretType3Chars() - { -- return gFalse; -+ return false; - } - - void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) --- -cgit v1.1 - diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch deleted file mode 100644 index a40d92127..000000000 --- a/user/calligra/qt5.patch +++ /dev/null @@ -1,293 +0,0 @@ -From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 18 Mar 2018 11:56:57 +0100 -Subject: Fix build with Qt 5.11 (missing headers) - -Reviewers: #calligra:_3.0, anthonyfieroni, danders - -Reviewed By: #calligra:_3.0, anthonyfieroni, danders - -Subscribers: anthonyfieroni, danders - -Tags: #calligra:_3.0 - -Differential Revision: https://phabricator.kde.org/D11454 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plan/src/kptview.h | 1 + - plan/src/kptviewlist.cpp | 1 + - plan/src/libs/ui/kptaccountseditor.cpp | 1 + - plan/src/libs/ui/kptdocumentspanel.h | 1 + - plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- - plan/src/libs/ui/kpttaskeditor.cpp | 1 + - plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + - plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include <QButtonGroup> - #include <QTextCodec> - #include <QTextStream> - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plan/src/kptview.h b/plan/src/kptview.h -index 44d1193..a98e553 100644 ---- a/plan/src/kptview.h -+++ b/plan/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include <QActionGroup> - #include <QDockWidget> - #include <QMap> - -diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp -index f34e702..0e6db7b 100644 ---- a/plan/src/kptviewlist.cpp -+++ b/plan/src/kptviewlist.cpp -@@ -25,6 +25,7 @@ - #include <QStyle> - #include <QBrush> - #include <QContextMenuEvent> -+#include <QHeaderView> - #include <QMenu> - - #include <kmessagebox.h> -diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp -index 7991faf..54e3a87 100644 ---- a/plan/src/libs/ui/kptaccountseditor.cpp -+++ b/plan/src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include <QContextMenuEvent> - #include <QMenu> - #include <QAction> -+#include <QHeaderView> - - #include <KLocalizedString> - #include <kactioncollection.h> -diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h -index 00ea3af..491cb1e 100644 ---- a/plan/src/libs/ui/kptdocumentspanel.h -+++ b/plan/src/libs/ui/kptdocumentspanel.h -@@ -26,6 +26,7 @@ - - #include "kptdocuments.h" - -+#include <QModelIndexList> - #include <QWidget> - #include <kundo2qstack.h> - -diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1f..7c97a07 100644 ---- a/plan/src/libs/ui/kptitemviewsettup.cpp -+++ b/plan/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ - - #include "KoPageLayoutWidget.h" - -+#include <QHeaderView> - #include <QPushButton> - -- - namespace KPlato - { - -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp -index 2154611..91db5ac 100644 ---- a/plan/src/libs/ui/kpttaskeditor.cpp -+++ b/plan/src/libs/ui/kpttaskeditor.cpp -@@ -45,6 +45,7 @@ - #include <QVBoxLayout> - #include <QDragMoveEvent> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - #include <kactionmenu.h> -diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -index 344ebc2..9146f06 100644 ---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -31,6 +31,7 @@ - #include <KFile> - - #include <QAction> -+#include <QHeaderView> - #include <QTreeView> - #include <QStandardItemModel> - #include <QModelIndex> -diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -index c9e17b7..b67e984 100644 ---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp -+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include <QAbstractItemModel> -+#include <QAction> - - // Calligra - #include <KoIcon.h> -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <QWidgetAction> - #include <QTableWidget> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include <math.h> - - #include <QIntValidator> -+#include <QButtonGroup> - #include <QCheckBox> - #include <QFrame> - #include <QLabel> -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> - #include <QComboBox> - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -cgit v1.1 - -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 3 Apr 2018 00:31:19 +0200 -Subject: Fix compilation with Qt 5.11 (missing include) - ---- - stage/part/KPrPresentationTool.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include <QDesktopServices> - #include <QUrl> - #include <QDBusConnection> -+#include <QFrame> - - #include <KoShape.h> - #include <KoShapeManager.h> --- -cgit v1.1 - -From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 12:20:03 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - plan/src/workpackage/view.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h -index b10547e..c5231e59 100644 ---- a/plan/src/workpackage/view.h -+++ b/plan/src/workpackage/view.h -@@ -24,6 +24,7 @@ - #include <KoView.h> - - #include <QStackedWidget> -+#include <QMap> - - class QPrinter; - class QPrintDialog; --- -cgit v1.1 - -From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 13:02:34 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp -index b10b230..0c5eeb6 100644 ---- a/sheets/plugins/calendar/CalendarToolWidget.cpp -+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <kdatepicker.h> - - #include <QPushButton> -+#include <QDate> - - namespace Calligra - { --- -cgit v1.1 - diff --git a/user/calligra/ridiculous-typo.patch b/user/calligra/ridiculous-typo.patch new file mode 100644 index 000000000..9d81e899e --- /dev/null +++ b/user/calligra/ridiculous-typo.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp.old 2020-05-14 06:51:30.000000000 +0000 ++++ calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp 2020-07-30 00:37:08.634435315 +0000 +@@ -94,7 +94,7 @@ + qDebug() << _shape << _shape->absolutePosition(KoFlake::TopLeftCorner).y() << " " << _shape->position().y(); + } + qDebug() << "</moh>"; +- std:sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); ++ std::sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); + // Update position + qreal y = 0; + qDebug() << "<Updating>"; diff --git a/user/cantarell-fonts/APKBUILD b/user/cantarell-fonts/APKBUILD index 16b5ef3f6..1ec4938d1 100644 --- a/user/cantarell-fonts/APKBUILD +++ b/user/cantarell-fonts/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantarell-fonts -pkgver=0.111 -pkgrel=1 +pkgver=0.201 +pkgrel=0 pkgdesc="Humanist sans-serif typeface, designed for GNOME Shell" url=" " arch="noarch" @@ -18,4 +18,4 @@ package() { install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/prebuilt/*.otf } -sha512sums="638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e cantarell-fonts-0.111.tar.xz" +sha512sums="c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98 cantarell-fonts-0.201.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index e7e1a9b11..2ffb273ab 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a cantor-19.12.3.tar.xz" +sha512sums="07351d8b4b72653394a337bc3ae5c8f8c669dd8cd66f4cf9d41bbdd25b47a8b3666f79580e319ef56c878ab626ce959d825b4a34243c5f639de96674a1bc111d cantor-20.04.3.tar.xz" diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index 8d0a30b7e..8bd26157c 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -1,9 +1,10 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Contributor: Gentoo Rust Maintainers <rust@gentoo.org> # Contributor: Samuel Holland <samuel@sholland.org> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: pkgname=cbindgen -pkgver=0.13.2 +pkgver=0.14.2 pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" @@ -22,6 +23,7 @@ c2-chacha-0.2.3 cfg-if-0.1.10 clap-2.33.0 getrandom-0.1.13 +heck-0.3.1 itoa-0.4.4 libc-0.2.66 log-0.4.8 @@ -43,6 +45,7 @@ syn-1.0.11 tempfile-3.1.0 textwrap-0.11.0 toml-0.5.5 +unicode-segmentation-1.6.0 unicode-width-0.1.7 unicode-xid-0.2.0 vec_map-0.8.1 @@ -102,7 +105,7 @@ package() { } -sha512sums="2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66 cbindgen-0.13.2.tar.gz +sha512sums="d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0 cbindgen-0.14.2.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz @@ -110,6 +113,7 @@ ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 getrandom-0.1.13.tar.gz +134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz @@ -131,6 +135,7 @@ ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz +80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e unicode-segmentation-1.6.0.tar.gz 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 9076bbb09..6c14d092e 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.7 +pkgver=3.7.11 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -47,4 +47,4 @@ package() { done } -sha512sums="f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816 ccache-3.7.7.tar.xz" +sha512sums="47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11 ccache-3.7.11.tar.xz" diff --git a/user/cervisia/APKBUILD b/user/cervisia/APKBUILD new file mode 100644 index 000000000..8229df3f3 --- /dev/null +++ b/user/cervisia/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cervisia +pkgver=20.04.3 +pkgrel=0 +pkgdesc="CVS Frontend" +url="https://kde.org/applications/development/org.kde.cervisia" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kdoctools-dev kdesu-dev + kiconthemes-dev kinit-dev kitemviews-dev knotifications-dev kparts-dev + kwidgetsaddons-dev + + kauth-dev kcodecs-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev + kdbusaddons-dev kio-dev kjobwidgets-dev kpty-dev kservice-dev solid-dev + sonnet-dev kwindowsystem-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/cervisia-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="cdbd6d9c212e92ca7f925c23c20442fa72cb07f666a5f2895a1cb631ff9bc87024bdf2bdbb8b2c638104f688cca585b64eaec5c8ed20ea153fa1184a2f5193c2 cervisia-20.04.3.tar.xz" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index 9a3be5d89..bc910040e 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -3,9 +3,9 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=cgit -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 -_gitver=2.25.0 +_gitver=2.25.1 pkgdesc="A fast Web interface for Git" url="https://git.zx2c4.com/cgit/" arch="all" @@ -57,5 +57,5 @@ package() { ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit } -sha512sums="ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9 cgit-1.2.2.tar.xz -8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz" +sha512sums="58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504 cgit-1.2.3.tar.xz +15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 git-2.25.1.tar.xz" diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index b616e4fab..735afa9e2 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=checkbashisms -pkgver=2.20.2 +pkgver=2.20.4 pkgrel=0 pkgdesc="Check shell scripts for POSIX compliance" url="https://salsa.debian.org/debian/devscripts" @@ -37,4 +37,4 @@ bashcomp() { "$subpkgdir/usr/share/bash-completion/completions/$pkgname" } -sha512sums="d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510 devscripts_2.20.2.tar.xz" +sha512sums="49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c devscripts_2.20.4.tar.xz" diff --git a/user/chntpw/APKBUILD b/user/chntpw/APKBUILD new file mode 100644 index 000000000..a62408ce0 --- /dev/null +++ b/user/chntpw/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=chntpw +pkgver=140201 +pkgrel=0 +pkgdesc="Change passwords in Windows SAM files" +url="https://pogostick.net/~pnh/ntpasswd/" +arch="all" +options="!check" # No test suite. +license="(LGPL-2.1-only AND GPL-2.0-only)" +depends="" +makedepends="" +source="https://pogostick.net/~pnh/ntpasswd/$pkgname-source-$pkgver.zip + stdint.patch + chntpw-080526-correct-test-for-failing-open-syscall.patch + chntpw-110511-detect-failure-to-write-key.patch + chntpw-110511-reged-no-deref-null.patch + chntpw-110511-robustness.patch + chntpw-140201-get_abs_path.patch + getopt-signed-char-return.patch + " + +build() { + make CC="${CC:-gcc}" CFLAGS="$CFLAGS" \ + chntpw cpnt reged +} + +package() { + install -d "$pkgdir"/usr/bin + install chntpw cpnt reged "$pkgdir"/usr/bin/ +} + +sha512sums="a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa chntpw-source-140201.zip +3ed747119d125b3e4dc8dbb2a697d411ef2f4403ec84c60177d8e35389bc695bb0c65f7aa4314ca320ffceec87e60e2a0c81d52544b90463fe23aa7d4a50df67 stdint.patch +1332407858eb20e0f1304472bc458789ef78638059137b91ff0b7bac9619740e8a608aace0330ace363853b5c02642fdbbc66bc47dac19f6807dae57cdaca4ca chntpw-080526-correct-test-for-failing-open-syscall.patch +a570451f52943a2ccdced349c5fe4e82e1a338dd6d0067ddaf18dc328b2c3ee3976d08827eee866b4654ccbda93ad95dcbabaddd0b6487a1e4112b66fc63bde1 chntpw-110511-detect-failure-to-write-key.patch +c61ea69ea1f039e470f501fddd1d3674ee7427e9084361a1aba03402d302a07efd1a2630e16f479bd3cef13b17e85c14cbfff53cb33bccb470465276b1b7ac22 chntpw-110511-reged-no-deref-null.patch +bcc314545272b5be04612e435a2f9dd13cbf065cfbd80aed2ed57147ee9e73b2478cd18e95cbaa7ad3b5dfcf4788a3026b5ddd767f89ea9c80ba7a2efc7ea8c4 chntpw-110511-robustness.patch +1bb5939d2cfd3718b9e630998b250c3c37d50d5769463f4f8456ede9fa4521e1bf9d9f05986883df36418d91bef591b34a81cd36bfacca053160e4d95c03cb4b chntpw-140201-get_abs_path.patch +85bbe9c7f21362cdff6becd94fe402d051a770105ec2eeb61e1936693e0a39ee03b6e971843c251f7768499444711392d966227f6126c328f7f58055cafe38d7 getopt-signed-char-return.patch" diff --git a/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch b/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch new file mode 100644 index 000000000..3c68146b0 --- /dev/null +++ b/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch @@ -0,0 +1,75 @@ +From jim@meyering.net Mon Jul 20 20:05:55 2009 +Return-Path: jim@meyering.net +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on amd.home.annexia.org +X-Spam-Level: +X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00, + UNPARSEABLE_RELAY autolearn=ham version=3.2.5 +Received: from mail.corp.redhat.com [10.5.5.51] + by amd.home.annexia.org with IMAP (fetchmail-6.3.8) + for <rjones@localhost> (single-drop); Mon, 20 Jul 2009 20:05:55 +0100 (BST) +Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO + zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by + mail06.corp.redhat.com with LMTP; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from localhost (localhost.localdomain [127.0.0.1]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2C1134E4EB + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1]) + by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id a7N9dvNRkYQB for <rjones@redhat.com>; + Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 034384E4D6 + for <rjones@mail.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 (EDT) +Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) + by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6KJ5kIt032703 + for <rjones@int-mx2.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 +Received: from mx.meyering.net (sebastian-int.corp.redhat.com [172.16.52.221]) + by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6KJ5jf3021050 + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:45 -0400 +Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) + id D674638154; Mon, 20 Jul 2009 21:05:44 +0200 (CEST) +From: Jim Meyering <jim@meyering.net> +To: "Richard W. M. Jones" <rjones@redhat.com> +Subject: chntpw [PATCH] correct test for failing "open" syscall +Date: Mon, 20 Jul 2009 21:05:44 +0200 +Message-ID: <878wij899z.fsf@meyering.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 +Status: RO +Content-Length: 1103 +Lines: 33 + +This one is weird. +It must be code that is never exercised, +since the existing code is totally bogus. +The condition, !open(...), will almost always be true. +(sole exception is when starting a program with stdin +initially closed) + +>From bc4cddb06cf13c189fbdc93e6962cad072779097 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Mon, 20 Jul 2009 14:59:19 -0400 +Subject: [PATCH] correct test for failing "open" syscall + +* ntreg.c (writeHive): Test open() < 0, not !open(). +--- + ntreg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ntreg.c b/ntreg.c +index be6b680..21cd3e3 100644 +--- a/ntreg.c ++++ b/ntreg.c +@@ -2765,7 +2765,7 @@ int writeHive(struct hive *hdesc) + if ( !(hdesc->state & HMODE_DIRTY)) return(0); + + if ( !(hdesc->state & HMODE_OPEN)) { /* File has been closed */ +- if (!(hdesc->filedesc = open(hdesc->filename,O_RDWR))) { ++ if ((hdesc->filedesc = open(hdesc->filename,O_RDWR)) < 0) { + fprintf(stderr,"writeHive: open(%s) failed: %s, FILE NOT WRITTEN!\n",hdesc->filename,strerror(errno)); + return(1); + } +-- +1.6.2.5 + diff --git a/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch b/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch new file mode 100644 index 000000000..818639d83 --- /dev/null +++ b/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch @@ -0,0 +1,19 @@ +diff -ur chntpw-110511.orig/ntreg.c chntpw-110511/ntreg.c +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-11-01 13:45:02.550421729 -0700 +@@ -3389,7 +3389,14 @@ + + fprintf(file,"\r\n"); /* Must end file with an empty line, windows does that */ + +- fclose(file); ++ if (ferror (file)) { ++ printf("failed to write file '%s'\n", filename); ++ fclose (file); ++ return; ++ } ++ if (fclose(file)) ++ printf("failed to write file '%s': %s\n", filename, ++ strerror(errno)); + } + + /* ================================================================ */ diff --git a/user/chntpw/chntpw-110511-reged-no-deref-null.patch b/user/chntpw/chntpw-110511-reged-no-deref-null.patch new file mode 100644 index 000000000..0193cd493 --- /dev/null +++ b/user/chntpw/chntpw-110511-reged-no-deref-null.patch @@ -0,0 +1,15 @@ +diff -ur chntpw-110511.orig/reged.c chntpw-110511/reged.c +--- chntpw-110511.orig/reged.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/reged.c 2011-11-01 13:46:55.569625286 -0700 +@@ -167,6 +167,11 @@ + + if (edit) { /* Call editor. Rest of arguments are considered hives to load */ + hivename = argv[optind+no_hives]; ++ if (!hivename) { ++ fprintf(stderr,"with -e you must specify at least one hive file name\n"); ++ usage(); ++ exit(1); ++ } + do { + if (!(hive[no_hives] = openHive(hivename, + HMODE_RW|mode))) { diff --git a/user/chntpw/chntpw-110511-robustness.patch b/user/chntpw/chntpw-110511-robustness.patch new file mode 100644 index 000000000..ea2363f34 --- /dev/null +++ b/user/chntpw/chntpw-110511-robustness.patch @@ -0,0 +1,39 @@ +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-12-18 17:09:06.290818997 -0800 +@@ -190,14 +190,18 @@ + + int fmyinput(char *prmpt, char *ibuf, int maxlen) + { +- ++ int len; + printf("%s",prmpt); + + fgets(ibuf,maxlen+1,stdin); ++ len = strlen(ibuf); + +- ibuf[strlen(ibuf)-1] = 0; ++ if (len) { ++ ibuf[len-1] = 0; ++ --len; ++ } + +- return(strlen(ibuf)); ++ return len; + } + + /* Print len number of hexbytes */ +@@ -4119,6 +4123,14 @@ + closeHive(hdesc); + return(NULL); + } ++ ++ if (r < sizeof (*hdesc)) { ++ fprintf(stderr, ++ "file is too small; got %d bytes while expecting %d or more\n", ++ r, sizeof (*hdesc)); ++ closeHive(hdesc); ++ return(NULL); ++ } + + /* Now run through file, tallying all pages */ + /* NOTE/KLUDGE: Assume first page starts at offset 0x1000 */ diff --git a/user/chntpw/chntpw-140201-get_abs_path.patch b/user/chntpw/chntpw-140201-get_abs_path.patch new file mode 100644 index 000000000..c9f1a3dec --- /dev/null +++ b/user/chntpw/chntpw-140201-get_abs_path.patch @@ -0,0 +1,10 @@ +--- chntpw-140201/ntreg.c.orig 2014-02-01 08:54:37.000000000 -0800 ++++ chntpw-140201/ntreg.c 2018-07-02 16:10:39.625152640 -0700 +@@ -1511,6 +1511,7 @@ + } + + strncpy(tmp,path,ABSPATHLEN-1); ++ tmp[ABSPATHLEN-1] = '\0'; + + if (key->type & 0x20) + keyname = mem_str(key->keyname, key->len_name); diff --git a/user/chntpw/getopt-signed-char-return.patch b/user/chntpw/getopt-signed-char-return.patch new file mode 100644 index 000000000..6dc78c624 --- /dev/null +++ b/user/chntpw/getopt-signed-char-return.patch @@ -0,0 +1,37 @@ +diff -ur chntpw-140201.orig/chntpw.c chntpw-140201/chntpw.c +--- chntpw-140201.orig/chntpw.c 2020-06-08 14:21:55.839494887 +0000 ++++ chntpw-140201/chntpw.c 2020-06-08 14:22:29.922115922 +0000 +@@ -1026,7 +1026,8 @@ + int mode = HMODE_INFO; + extern int /* opterr, */ optind; + extern char* optarg; +- char *filename,c; ++ char *filename; ++ signed char c; + char *who = "Administrator"; + char iwho[100]; + FILE *ch; /* Write out names of touched files to this */ +diff -ur chntpw-140201.orig/sampasswd.c chntpw-140201/sampasswd.c +--- chntpw-140201.orig/sampasswd.c 2020-06-08 14:21:49.661563576 +0000 ++++ chntpw-140201/sampasswd.c 2020-06-08 14:22:21.009215027 +0000 +@@ -140,7 +140,7 @@ + int first = 0; + int ret, wret, il; + char *hivename; +- char c; ++ signed char c; + char *usr = NULL; + + char *options = "rlHu:vNEthaf"; +diff -ur chntpw-140201.orig/samusrgrp.c chntpw-140201/samusrgrp.c +--- chntpw-140201.orig/samusrgrp.c 2020-06-08 14:21:47.330589493 +0000 ++++ chntpw-140201/samusrgrp.c 2020-06-08 14:22:19.218234941 +0000 +@@ -176,7 +176,7 @@ + int human = 0; + int ret, wret, il; + char *hivename; +- char c; ++ signed char c; + char *usr = NULL; + char *grp = NULL; + diff --git a/user/chntpw/stdint.patch b/user/chntpw/stdint.patch new file mode 100644 index 000000000..841e25ed7 --- /dev/null +++ b/user/chntpw/stdint.patch @@ -0,0 +1,11 @@ +--- ./ntreg.h.orig ++++ ./ntreg.h +@@ -25,6 +25,8 @@ + #ifndef _INCLUDE_NTREG_H + #define _INCLUDE_NTREG_H 1 + ++#include <stdint.h> ++ + #define SZ_MAX 4096 /* Max unicode strlen before we truncate */ + + #define KEY_ROOT 0x2c /* Type ID of ROOT key node */ diff --git a/user/choqok/APKBUILD b/user/choqok/APKBUILD new file mode 100644 index 000000000..889566410 --- /dev/null +++ b/user/choqok/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=choqok +pkgver=1.7.0 +pkgrel=0 +pkgdesc="Microblogging client from KDE" +url="https://kde.org/applications/internet/org.kde.choqok" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtnetworkauth-dev cmake extra-cmake-modules + kcmutils-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev + kemoticons-dev kglobalaccel-dev kguiaddons-dev ki18n-dev kio-dev + knotifications-dev knotifyconfig-dev ktextwidgets-dev kwallet-dev + kwidgetsaddons-dev kxmlgui-dev purpose-dev qca-dev sonnet-dev + kdewebkit-dev kparts-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/choqok/1.7/src/choqok-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96 choqok-1.7.0.tar.xz" diff --git a/user/ckbcomp/APKBUILD b/user/ckbcomp/APKBUILD new file mode 100644 index 000000000..8f025d141 --- /dev/null +++ b/user/ckbcomp/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ckbcomp +pkgver=1.196 +pkgrel=0 +pkgdesc="XKB keyboard layout translation utility" +url="https://salsa.debian.org/installer-team/console-setup" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0+" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz" +builddir="$srcdir"/console-setup-$pkgver + +package() { + install -Dm755 -t "$pkgdir"/usr/bin Keyboard/ckbcomp + install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/ckbcomp.1 +} + +sha512sums="f100cdf2226cdad94c595ca269e65155b52ec23996f2fee8d4916f7a414c7a6f70ae51e9ba2d3c7ae4a93a8830ee2e3eb2f1d09c636f49005d54d52ec674e938 console-setup_1.196.tar.xz" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 880f8fafb..72256b3a5 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.5 +pkgver=3.17.6 pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f claws-mail-3.17.5.tar.xz" +sha512sums="07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0 claws-mail-3.17.6.tar.xz" diff --git a/user/clazy/APKBUILD b/user/clazy/APKBUILD new file mode 100644 index 000000000..8423b9b92 --- /dev/null +++ b/user/clazy/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=clazy +pkgver=1.7 +pkgrel=0 +pkgdesc="Clang compiler plugin to warn about Qt best practices" +url="https://kde.org/applications/development/org.kde.clazy" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="cmake clang-dev llvm-dev" +subpackages="$pkgname-doc" +source="https://download.kde.org/stable/clazy/$pkgver/src/clazy-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6 clazy-1.7.tar.xz" diff --git a/user/clisp/APKBUILD b/user/clisp/APKBUILD new file mode 100644 index 000000000..e4ce5999d --- /dev/null +++ b/user/clisp/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Soren Tempel <soeren+alpine@soeren-tempel.net> +# Contrubutor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Lee Starnes <lee@canned-death.us> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=clisp +pkgver=2.49 +pkgrel=0 +pkgdesc="ANSI Common Lisp interpreter, compiler, and debugger" +url="https://clisp.sourceforge.io" +arch="all" +license="GPL-2.0-only" +depends="" +depends_dev="libsigsegv-dev libffcall-dev ncurses-dev" +makedepends="$depends_dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + no-page.h.patch" + +prepare() { + default_prepare + update_config_sub +} + +build() { + ./configure \ + --prefix=/usr \ + --with-ffcall \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + "$builddir" + # Parallel builds fail + make -j1 +} + +check() { + make check +} + +package() { + make -j1 DESTDIR="$pkgdir" install +} + +sha512sums="eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81 clisp-2.49.tar.bz2 +86273c5d5d05a8d41ab6311192e0c757d3f7fe4d78546590830aa00f8c2f170fcb08f66ea739ae8834cec00cdf0f6a20824eb6a3d0f6df97be405c26b1cc5d39 no-page.h.patch" diff --git a/user/clisp/no-page.h.patch b/user/clisp/no-page.h.patch new file mode 100644 index 000000000..aafb98a31 --- /dev/null +++ b/user/clisp/no-page.h.patch @@ -0,0 +1,12 @@ +--- a/src/unix.d ++++ b/src/unix.d +@@ -135,9 +135,6 @@ + #ifdef UNIX_AUX + #include <sys/mmu.h> /* for SHMLBA */ + #endif +- #if defined(UNIX_LINUX) && !defined(UNIX_GNU) +- #include <asm/page.h> /* for SHMLBA on Linux 2.0 */ +- #endif + /* <sys/shm.h> declares shmget(), shmat(), shmdt(), shmctl() */ + #endif + /* used by SPVW, STREAM */ diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index c05fdc470..328305587 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cloc -pkgver=1.84 +pkgver=1.86 pkgrel=0 pkgdesc="Perl utility for counting lines of code in various languages" url="https://github.com/AlDanial/cloc" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" -C Unix install } -sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" +sha512sums="dc88f7499ab371eef5ae39352e10539a507bd77fa7b83d562e3b9774e053872ea56529ea937db9fafd50971900e03d95236450348d8981fa0123f936e893975c cloc-1.86.tar.gz" diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 81910704b..5cb9f34ef 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cogl -pkgver=1.22.6 +pkgver=1.22.8 pkgrel=0 pkgdesc="GObject-based GL/GLES abstraction library" url="https://gnome.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483 cogl-1.22.6.tar.xz" +sha512sums="702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f cogl-1.22.8.tar.xz" diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD index 6becb4de9..0142a6618 100644 --- a/user/comic-neue/APKBUILD +++ b/user/comic-neue/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=comic-neue -pkgver=2.4 +pkgver=2.5 pkgrel=0 pkgdesc="Casual typeface" url="http://comicneue.com/" @@ -15,7 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p builddir="$srcdir/comicneue-$pkgver" package() { - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/Fonts/OTF/ComicNeue/*.otf } -sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8 comic-neue-2.4.zip" +sha512sums="32cc6370f127dd7d773ce80a1c0530c9fe329a5e06fab6e416e1075f99f27a9eb551f3e27c0bec307862b171130d5ae774f32f8385618c3f91a2abb796c3715c comic-neue-2.5.zip" diff --git a/user/command-not-found/APKBUILD b/user/command-not-found/APKBUILD index ed9919343..c91ff15a4 100644 --- a/user/command-not-found/APKBUILD +++ b/user/command-not-found/APKBUILD @@ -4,7 +4,7 @@ pkgname=command-not-found pkgver=0.3 pkgrel=0 pkgdesc="Provide suggestions for missing commands via APK" -url="https://git.dereferenced.org/kaniini/command-not-found" +url=" " arch="noarch" options="!check" # No test suite. license="MIT" diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 3899919dd..093054850 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=compton-conf -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="GUI configuration tool for the Compton X compositor" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - libconfig-dev liblxqt-dev lxqt-build-tools>=0.6.0" + libconfig-dev liblxqt-dev lxqt-build-tools>=$_lxqt_build" subpackages="" source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz" @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="76cacb0960112ab3d0b7a05fba3ac2418c2bd37f4273fc20383b49ce035fd045a2a8e8a1ae5a8a5dc116f46ab6ccd7a5764dd2c3ec64822d930c7dd268533db4 compton-conf-0.14.1.tar.xz" +sha512sums="c7390de74304e362a0c63c901c718dbf0427eb821d06236ceb5746b67c27a6ff9ef53a456808d01019fa7ff10fbf11c909c1234560d75ab97df8057d39fc1f4a compton-conf-0.15.0.tar.xz" diff --git a/user/consolekit2/APKBUILD b/user/consolekit2/APKBUILD deleted file mode 100644 index 084504191..000000000 --- a/user/consolekit2/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Contributor: Bart Ribbers <bribbers@disroot.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgbase=ConsoleKit2 -pkgname=consolekit2 -pkgver=1.2.1 -pkgrel=1 -pkgdesc="Framework for defining and tracking users, login sessions, and seats" -url="https://consolekit2.github.io/ConsoleKit2" -arch="all" -license="GPL-2.0+" -depends="eudev polkit" -checkdepends="libxml2-utils" -makedepends="acl-dev docbook-xml eudev-dev glib-dev libdrm-dev libevdev-dev - libnih-dev libxslt-dev linux-pam-dev polkit-dev xmlto xorg-server-dev - zlib-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" -source="https://github.com/ConsoleKit2/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.bz2 - consolekit2.initd - pam-foreground-compat.ck - poweroff.patch" -# Capital "ConsoleKit" -builddir="$srcdir"/$pkgbase-$pkgver - -build() { - XMLTO_FLAGS='--skip-validation' ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-pam-module \ - --enable-udev-acl \ - --enable-tests \ - --enable-docbook-docs \ - --enable-polkit - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install - install -m 755 "$srcdir"/pam-foreground-compat.ck \ - "$pkgdir"/usr/lib/ConsoleKit/run-session.d/ - install -D -m755 "$srcdir"/consolekit2.initd \ - "$pkgdir"/etc/init.d/consolekit -} - -sha512sums="31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10 ConsoleKit2-1.2.1.tar.bz2 -8c16c452707475bdd4a50d3ade367d52ad92a6560be48b4e21e5b5eadef6e56c39d3d03d3a64f9b45a59eca50179cf5aa9c11978904d5d101db7498fb9bc0339 consolekit2.initd -3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910 pam-foreground-compat.ck -033595766671f545ba6c9f3fcb529547d20359cdd8eb901bb7a6c3b319b495038e8072e3b01f2fd264f592b0c7825a79282d8bc590f057a5f62e9fdfedde9c68 poweroff.patch" diff --git a/user/consolekit2/consolekit2.initd b/user/consolekit2/consolekit2.initd deleted file mode 100644 index 697eea8f9..000000000 --- a/user/consolekit2/consolekit2.initd +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/openrc-run - -description="Tracks sessions and seats" -pidfile="/var/run/ConsoleKit/pid" -command="/usr/sbin/console-kit-daemon" - -depend() { - need dbus -} diff --git a/user/consolekit2/pam-foreground-compat.ck b/user/consolekit2/pam-foreground-compat.ck deleted file mode 100644 index c9255503c..000000000 --- a/user/consolekit2/pam-foreground-compat.ck +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 -[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi diff --git a/user/consolekit2/poweroff.patch b/user/consolekit2/poweroff.patch deleted file mode 100644 index 8ae9d21a5..000000000 --- a/user/consolekit2/poweroff.patch +++ /dev/null @@ -1,22 +0,0 @@ -Most users expect "shutdown" to also power off the machine when -requested from a graphical environment. "Actions after halting are -unspecified" when using -h (LSB 3.0) - sysvinit additionally tries to -power off when using -h, whereas s6-linux-init only halts. -Use the **non-standard** -P option (implemented by sysvinit and -s6-linux-init since 1.0.2.0) to request power off after halting. - ---- ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2017-06-02 01:31:44.000000000 +0000 -+++ ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2019-06-09 17:40:31.110006347 +0000 -@@ -2,10 +2,10 @@ - - #Try for common tools - if [ -x "/sbin/shutdown" ] ; then -- /sbin/shutdown -h now -+ /sbin/shutdown -hP now - exit $? - elif [ -x "/usr/sbin/shutdown" ] ; then -- /usr/sbin/shutdown -h now -+ /usr/sbin/shutdown -hP now - exit $? - else - exit 1 diff --git a/user/cppcheck/APKBUILD b/user/cppcheck/APKBUILD new file mode 100644 index 000000000..43608bd3c --- /dev/null +++ b/user/cppcheck/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cppcheck +pkgver=2.1 +pkgrel=0 +pkgdesc="Tool for static C/C++ code analysis" +url="http://cppcheck.sourceforge.net/" +arch="all" +license="GPL-3.0-only" +depends="" +makedepends="cmake pcre-dev qt5-qtbase-dev qt5-qttools-dev z3-dev" +subpackages="$pkgname-gui" +source="cppcheck-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_GUI=ON \ + -DBUILD_TESTS=ON \ + -DHAVE_RULES=ON \ + -DUSE_MATCHCOMPILER=ON \ + -DUSE_Z3=ON \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +gui() { + pkgdesc="$pkgdesc (Qt UI)" + depends="cppcheck" + mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/cppcheck-gui "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/*.qm "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/share/applications "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share/ +} + +sha512sums="7e1ef473168f9af35db0979f85ddb4d66b91c09051e27bc28ea7453dbe94fbf799515701c737820e0a3bea77da0d8ef171313612f65e954718a80bbcb56d54ed cppcheck-2.1.tar.gz" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index efb5baccc..346878925 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.25.6 +pkgver=1.25.13 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" @@ -59,4 +59,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33 cups-filters-1.25.6.tar.xz" +sha512sums="4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611 cups-filters-1.25.13.tar.xz" diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index ef8e9f89c..987ef76a3 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=cups -pkgver=2.2.12 +pkgver=2.2.13 pkgrel=0 pkgdesc="The CUPS Printing System" url="https://www.cups.org/" @@ -122,7 +122,7 @@ _mv() { done } -sha512sums="b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 cups-2.2.12-source.tar.gz +sha512sums="dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d cups-2.2.13-source.tar.gz cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd 7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch diff --git a/user/davmail/APKBUILD b/user/davmail/APKBUILD new file mode 100644 index 000000000..b65994cef --- /dev/null +++ b/user/davmail/APKBUILD @@ -0,0 +1,60 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=davmail +pkgver=5.5.1.3299 +_pkgver=${pkgver%.*}-${pkgver##*.} +pkgrel=0 +pkgdesc="POP/IMAP/SMTP/Caldav/Carddav/LDAP proxy for Exchange/O365 servers" +url="http://davmail.sourceforge.net/" # No HTTPS +arch="noarch" +options="!check" # Requires running mail servers and X11 +license="GPL-2.0+ AND MIT AND (LGPL-2.1+ or Apache-2.0) AND BSD-2-Clause AND Apache-2.0 AND LGPL-2.1 AND BSD-3-Clause AND (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0)" +depends="/bin/sh openjdk8-jre" +makedepends="ant desktop-file-utils" +subpackages="" +source="https://sourceforge.net/projects/davmail/files/davmail/${pkgver%.*}/davmail-src-$_pkgver.tgz + davmail.sh + " +builddir="$srcdir/$pkgname-src-$_pkgver" + +_ant() { + . /etc/profile.d/java.sh + . /etc/profile.d/ant.sh + ant "$@" +} + +build() { + _ant jar +} + +check() { + _ant test +} + +package() { + _ant prepare-dist + + install -Dm755 "$srcdir"/davmail.sh \ + "$pkgdir"/usr/bin/davmail + + rm -f dist/lib/*growl* \ + dist/lib/*x86*.jar \ + dist/lib/junit-*.jar \ + dist/lib/winrun4j-*.jar + install -Dm644 -t "$pkgdir"/usr/lib/java/davmail/lib \ + dist/lib/* dist/davmail.jar + + desktop-file-install --dir "$pkgdir"/usr/share/applications \ + src/desktop/davmail.desktop + + for _i in 16 32 48 128; do + case $_i in + 16) _fn=src/java/tray.png;; + *) _fn=src/java/tray$_i.png;; + esac + install -Dm644 $_fn \ + "$pkgdir"/usr/share/icons/hicolor/${_i}x${_i}/apps/davmail.png + done +} + +sha512sums="0d3481f0930e09b30ae4341149b443bd92f107872d4e39dcc66e5e6c2fa6a667f9dde2c5a49bc5c96375d9e9b4b824a4211bf90a985a2cc2b1b8aa7613f02b5d davmail-src-5.5.1-3299.tgz +e937f3bdf71cddba4678b768bc6fc87320cd2a76d324f5ef99a0248ddc989d89c25e1f0e291416acb264cb2a1dbfef6d5eeea092c95d9be3f75669d6f68d1fdd davmail.sh" diff --git a/user/davmail/davmail.sh b/user/davmail/davmail.sh new file mode 100755 index 000000000..17c5cd45e --- /dev/null +++ b/user/davmail/davmail.sh @@ -0,0 +1,7 @@ +#!/bin/sh -e +# Usage: davmail [</path/to/davmail.properties>] + +# force GTK2 to avoid crash with OpenJDK 11 +JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2" +JAVA_CP="/usr/lib/java/davmail/lib/*" +exec java $JAVA_OPTS -cp "$JAVA_CP" davmail.DavGateway "$@" diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index d9a305186..fcd7da74d 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus -pkgver=1.12.16 -pkgrel=1 +pkgver=1.12.20 +pkgrel=0 pkgdesc="IPC/message bus system, allowing user applications to communicate" -url="http://www.freedesktop.org/wiki/Software/dbus/" +url="https://www.freedesktop.org/wiki/Software/dbus/" pkggroups="messagebus" pkgusers="messagebus" arch="all" @@ -23,7 +23,9 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz # secfixes: # 1.12.16-r0: -# - CVE-2019-12749 +# - CVE-2019-12749 +# 1.12.18-r0: +# - CVE-2020-12049 build() { ./configure \ @@ -65,5 +67,5 @@ x11() { mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ } -sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb dbus-1.12.16.tar.gz +sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz df74e7d6a4f76f777d356e94bd23422b17656aa51a5b2d3c655fcabb32c84f2f06b9f5cd8827920d51842f89e8c0d968a6e723315e4bf216e55711fcda9b0ee9 dbus.initd" diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD index a62b71c5e..0a45a2ce6 100644 --- a/user/ddrescue/APKBUILD +++ b/user/ddrescue/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ddrescue -pkgver=1.24 +pkgver=1.25 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="https://www.gnu.org/s/ddrescue/ddrescue.html" -arch="all !aarch64" +arch="all" license="GPL-3.0+" depends="" makedepends="" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa ddrescue-1.24.tar.lz" +sha512sums="90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8 ddrescue-1.25.tar.lz" diff --git a/user/desktop-file-utils/APKBUILD b/user/desktop-file-utils/APKBUILD index 62a1e58bb..4dd077102 100644 --- a/user/desktop-file-utils/APKBUILD +++ b/user/desktop-file-utils/APKBUILD @@ -1,34 +1,29 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=desktop-file-utils -pkgver=0.24 +pkgver=0.26 pkgrel=0 pkgdesc="Utilities for working with Desktop Entry files" url="https://www.freedesktop.org/wiki/Software/desktop-file-utils/" arch="all" +options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="glib-dev" +makedepends="glib-dev meson ninja" subpackages="$pkgname-doc" source="https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - make check + ninja -C build check } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0 desktop-file-utils-0.24.tar.xz" +sha512sums="5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 desktop-file-utils-0.26.tar.xz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index 19b63bc1a..d8c3e6a1e 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=8.1.6 +pkgver=8.1.9 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -42,6 +42,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz +sha512sums="40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a dhcpcd-8.1.9.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index c7ffa7108..ada33e4a5 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 dolphin-19.12.3.tar.xz" +sha512sums="fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca dolphin-20.04.3.tar.xz" diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD index e811aa22c..f3a83f46e 100644 --- a/user/dosbox/APKBUILD +++ b/user/dosbox/APKBUILD @@ -21,6 +21,12 @@ source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513 builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316" build() { + _extra_conf="" + + case $CTARGET_ARCH in + pmmx) _extra_conf="--disable-dynamic-x86";; + esac + ./autogen.sh ./configure \ --build=$CBUILD \ @@ -28,7 +34,8 @@ build() { --prefix=/usr \ --enable-debug \ --enable-core-inline \ - --enable-sdl2 + --enable-sdl2 \ + $_extra_conf make } diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD new file mode 100644 index 000000000..5af5254e1 --- /dev/null +++ b/user/dovecot/APKBUILD @@ -0,0 +1,286 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Lukasz Jendrysik <scadu@yandex.com> +# Contributor: Michael Mason <ms13sp@gmail.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=dovecot +pkgver=2.3.10.1 +_pkgvermajor=2.3 +pkgrel=0 +_pigeonholever=0.5.9 +_pigeonholevermajor=${_pigeonholever%.*} +pkgdesc="IMAP and POP3 server" +url="https://www.dovecot.org/" +arch="all" +options="libtool" +license="LGPL-2.0+" +depends="openssl" +pkgusers="dovecot dovenull" +pkggroups="dovecot dovenull" +makedepends=" + autoconf + automake + bzip2-dev + clucene-dev + expat-dev + krb5-dev + libcap-dev + openssl-dev + libtool + linux-headers + linux-pam-dev + mariadb-dev + openldap-dev + postgresql-dev + sqlite-dev + zlib-dev + libsodium-dev + " +install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" +subpackages=" + $pkgname-doc + $pkgname-dev + $pkgname-openrc + $pkgname-lmtpd + $pkgname-pop3d + $pkgname-submissiond + $pkgname-pigeonhole-plugin-ldap:_sieve_ldap + $pkgname-pigeonhole-plugin:_sieve + $pkgname-sql + $pkgname-pgsql + $pkgname-mysql + $pkgname-sqlite + $pkgname-gssapi + $pkgname-ldap + $pkgname-fts-solr:_fts_solr + $pkgname-fts-lucene:_fts_lucene + " +source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz + https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz + skip-iconv-check.patch + split-protocols.patch + default-config.patch + ssl-paths.patch + dovecot.logrotate + dovecot.initd + " +_builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever" + +# secfixes: +# 2.3.10.1-r0: +# - CVE-2020-10957 +# - CVE-2020-10958 +# - CVE-2020-10967 + +_configure() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + "$@" +} + +build() { + _configure \ + --with-gssapi=plugin \ + --with-ldap=plugin \ + --with-sql=plugin \ + --with-pam \ + --with-mysql \ + --with-sqlite \ + --with-pgsql \ + --with-solr \ + --with-lucene \ + --with-ssl=openssl \ + --with-ssldir=/etc/ssl/dovecot \ + --with-rundir=/run/dovecot + make + + # Build pigeonhole plugin + cd "$_builddir_pigeonhole" + _configure \ + --with-dovecot="$builddir" \ + --with-ldap=plugin + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + + install -d ./etc/ssl/dovecot + install -D -m 755 "$srcdir"/dovecot.initd ./etc/init.d/dovecot + install -D -m 644 "$srcdir"/dovecot.logrotate ./etc/logrotate.d/dovecot + + # default config + rm ./etc/dovecot/* + rm ./usr/share/doc/dovecot/mkcert.sh + mv ./usr/share/doc/dovecot/dovecot-openssl.cnf ./etc/dovecot/ + mv ./usr/share/doc/dovecot/example-config/dovecot* \ + ./usr/share/doc/dovecot/example-config/conf.d \ + ./etc/dovecot/ + rm -fr ./usr/share/doc/dovecot/example-config + + # Installing pigeonhole plugin. + cd "$_builddir_pigeonhole" + make install DESTDIR="$pkgdir" + + # Moving config in the correct place + mv "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/* \ + "$pkgdir"/etc/dovecot/conf.d + + # Remove libtool archives. abuild doesn't remove them automatically even without options=libtool. + find "$pkgdir" -name '*.la' | xargs rm -f +} + +dev() { + default_dev + mkdir -p "$subpkgdir"/usr/lib/dovecot + mv "$pkgdir"/usr/lib/dovecot/dovecot-config \ + "$subpkgdir"/usr/lib/dovecot/ +} + +lmtpd() { + pkgdesc="$pkgdesc (LMTP server)" + _protocol lmtp +} + +pop3d() { + pkgdesc="$pkgdesc (POP3 daemon)" + _protocol pop3 +} + +submissiond() { + pkgdesc="$pkgdesc (mail submission agent)" + _protocol submission +} + +_protocol() { + depends="$pkgname=$pkgver-r$pkgrel" + _name="$1" + _protocolsd="$subpkgdir/usr/share/dovecot/protocols.d" + + cd "$pkgdir" + _submv usr/libexec/dovecot/$_name* + _submv etc/dovecot/conf.d/*-$_name.conf + + mkdir -p "$_protocolsd" + echo "protocols = \$protocols $_name" \ + > "$_protocolsd"/${subpkgname#$pkgname-}.conf +} + +_sieve() { + pkgdesc="Sieve and managesieve plugin for Dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*sieve_extprograms*') + _submv $(find usr/ -name '*sieve_imapsieve*') + _submv $(find usr/ -name '*sieve*') + _submv $(find usr/ -name '*pigeonhole*') + _submv $(find etc/dovecot/ -name '*sieve*') +} + +_sieve_ldap() { + pkgdesc="Sieve and managesieve plugin for Dovecot (LDAP support)" + depends="$pkgname-pigeonhole-plugin=$pkgver-r$pkgrel $pkgname-ldap=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*_sieve_storage_ldap_*') +} + +pgsql() { + pkgdesc="PostgreSQL driver for Dovecot" + depends="$pkgname-sql=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*_pgsql*') +} + +mysql() { + pkgdesc="MySQL driver for Dovecot" + depends="$pkgname-sql=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*_mysql*') +} + +sqlite() { + pkgdesc="SQLite driver for Dovecot" + depends="$pkgname-sql=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*_sqlite*') +} + +gssapi() { + pkgdesc="GSSAPI auth plugin for Dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*_gssapi*') +} + +ldap() { + pkgdesc="LDAP auth plugin for Dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*[_-]ldap*') + _submv $(find etc/dovecot/ -name '*-ldap.conf*') +} + +sql() { + pkgdesc="SQL plugin for dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*-sql.*') + _submv $(find etc/dovecot/ -name '*-sql.conf*') +} + +_fts_solr() { + pkgdesc="FTS-Solr plugin for dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*fts*solr*') +} + +_fts_lucene() { + pkgdesc="FTS-Lucene plugin for dovecot" + depends="$pkgname=$pkgver-r$pkgrel" + + cd "$pkgdir" + _submv $(find usr/ -name '*fts*lucene*') +} + +_submv() { + while [ $# -gt 0 ]; do + _dir=${1%/*} + mkdir -p "$subpkgdir"/$_dir + mv "$pkgdir/$1" "$subpkgdir/$_dir/" + [ "$(ls -A $pkgdir/$_dir)" ] || rmdir "$pkgdir"/$_dir + shift + done +} + +sha512sums="5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06 dovecot-2.3.10.1.tar.gz +1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8 dovecot-2.3-pigeonhole-0.5.9.tar.gz +fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch +794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch +0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch +5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch +9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate +d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd" diff --git a/user/dovecot/default-config.patch b/user/dovecot/default-config.patch new file mode 100644 index 000000000..0f8a7385a --- /dev/null +++ b/user/dovecot/default-config.patch @@ -0,0 +1,46 @@ +--- a/doc/example-config/conf.d/10-mail.conf ++++ b/doc/example-config/conf.d/10-mail.conf +@@ -208,10 +208,10 @@ + + # UNIX socket path to master authentication server to find users. + # This is used by imap (for shared users) and lda. +-#auth_socket_path = /var/run/dovecot/auth-userdb ++#auth_socket_path = /run/dovecot/auth-userdb + + # Directory where to look up mail plugins. +-#mail_plugin_dir = /usr/lib/dovecot ++#mail_plugin_dir = /usr/lib/dovecot/modules + + # Space separated list of plugins to load for all services. Plugins specific to + # IMAP, LDA, etc. are added to this list in their own .conf files. +@@ -322,6 +322,7 @@ protocol !indexer-worker { + # them simultaneously. + #mbox_read_locks = fcntl + #mbox_write_locks = dotlock fcntl ++mbox_write_locks = fcntl + + # Maximum time to wait for lock (all of them) before aborting. + #mbox_lock_timeout = 5 mins +--- a/doc/example-config/conf.d/10-ssl.conf ++++ b/doc/example-config/conf.d/10-ssl.conf +@@ -3,7 +3,10 @@ + ## + + # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt> +-#ssl = yes ++# Disable plain (unencrypted) POP3 and IMAP, allowed are only POP3+TLS, ++# POP3S, IMAP+TLS and IMAPS. ++# Plain IMAP and POP3 are still allowed for local connections. ++ssl = required + + # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before + # dropping root privileges, so keep the key file unreadable by anyone but +@@ -67,7 +67,7 @@ + #ssl_curve_list = + + # Prefer the server's order of ciphers over client's. +-#ssl_prefer_server_ciphers = no ++ssl_prefer_server_ciphers = yes + + # SSL crypto device to use, for valid values run "openssl engine" + #ssl_crypto_device = diff --git a/user/dovecot/dovecot.initd b/user/dovecot/dovecot.initd new file mode 100644 index 000000000..721f131ad --- /dev/null +++ b/user/dovecot/dovecot.initd @@ -0,0 +1,40 @@ +#!/sbin/openrc-run + +[ "$RC_SVCNAME" != "${RC_SVCNAME##*.}" ] && instance=${RC_SVCNAME##*.} + +description="Secure POP3/IMAP server" + +cfgfile=/etc/dovecot/dovecot${instance:+.$instance}.conf +pidfile=$(doveconf -c $cfgfile -h base_dir 2>/dev/null)/master.pid +command=/usr/sbin/dovecot +command_args=${instance:+-c $cfgfile} +required_files="$cfgfile" +extra_started_commands="reload reopen" +description_reload="Reload configuration" +description_reopen="Reopen log files" + +depend() { + need localmount net + before mta + after bootmisc firewall ldap mysql ntp-client ntpd postgresql saslauthd slapd + use logger +} + +start_pre() { + ebegin + doveconf -c $cfgfile -x >/dev/null 2>&1 && \ + checkpath --directory ${pidfile%/*} + eend $? +} + +reload() { + ebegin "Reloading $RC_SVCNAME configs and restarting auth/login processes" + start_pre && start-stop-daemon --signal HUP --pidfile $pidfile + eend $? +} + +reopen() { + ebegin "Reopening $RC_SVCNAME log files" + start-stop-daemon --signal USR1 --pidfile $pidfile + eend $? +} diff --git a/user/dovecot/dovecot.logrotate b/user/dovecot/dovecot.logrotate new file mode 100644 index 000000000..b1a4087b4 --- /dev/null +++ b/user/dovecot/dovecot.logrotate @@ -0,0 +1,12 @@ +/var/log/dovecot*.log { + daily + missingok + copytruncate + rotate 7 + compress + notifempty + sharedscripts + postrotate + /etc/init.d/dovecot --quiet --ifstarted reopen + endscript +} diff --git a/user/dovecot/dovecot.post-install b/user/dovecot/dovecot.post-install new file mode 100644 index 000000000..eb70cdece --- /dev/null +++ b/user/dovecot/dovecot.post-install @@ -0,0 +1,45 @@ +#!/bin/sh + +# based on doc/mkcert.sh + +# if ssl disabled then lets just exit +doveconf ssl 2>/dev/null | grep -Eq '(yes|required)' || exit 0 +# Generates a self-signed certificate. + +OPENSSL=${OPENSSL-openssl} +SSLDIR=${SSLDIR-/etc/ssl/dovecot} +OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/dovecot-openssl.cnf} + +CERTDIR=$SSLDIR +KEYDIR=$SSLDIR + +# check if we have ssl_cert and/or key (for dovecot-2.0+) +# try expand the cert/key itself and if found, lets just keep it +[ -n "$(doveconf -x ssl_cert 2>/dev/null)" ] && exit 0 +[ -n "$(doveconf -x ssl_key 2>/dev/null)" ] && exit 0 + +ssl_cert_file=$(doveconf ssl_cert | sed 's/.*= <//') +ssl_key_file=$(doveconf ssl_key | sed 's/.*= <//') + +CERTFILE=${ssl_cert_file:-$CERTDIR/server.pem} +KEYFILE=${ssl_key_file:-$KEYDIR/server.key} + +if [ -e "$CERTFILE" ]; then + echo "Keeping existing $CERTFILE" + exit 0 +fi + +if [ -e "$KEYFILE" ]; then + echo "Keeping existing $KEYFILE" + exit 0 +fi + +if [ ! -c /dev/urandom ] && [ ! -c /dev/random ]; then + echo "No /dev/urandom or /dev/random so ssl cert not created" + exit 1 +fi + +$OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 +chmod 0600 $KEYFILE +echo +$OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2 diff --git a/user/dovecot/dovecot.post-upgrade b/user/dovecot/dovecot.post-upgrade new file mode 100644 index 000000000..69f4366ed --- /dev/null +++ b/user/dovecot/dovecot.post-upgrade @@ -0,0 +1,7 @@ +#!/bin/sh +if ! grep ^"version_ignore=yes" /etc/dovecot/dovecot.conf; then + printf "dovecot restart required (version_ignore=yes not set)\n" +fi + +exit $? + diff --git a/user/dovecot/dovecot.pre-install b/user/dovecot/dovecot.pre-install new file mode 100644 index 000000000..73a0aa3e3 --- /dev/null +++ b/user/dovecot/dovecot.pre-install @@ -0,0 +1,8 @@ +#!/bin/sh + +groupadd -r dovecot 2>/dev/null +groupadd -r dovenull 2>/dev/null +useradd -r -u 90 -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null +useradd -r -u 91 -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null + +exit 0 diff --git a/user/dovecot/skip-iconv-check.patch b/user/dovecot/skip-iconv-check.patch new file mode 100644 index 000000000..bb1002c84 --- /dev/null +++ b/user/dovecot/skip-iconv-check.patch @@ -0,0 +1,11 @@ +--- a/src/lib-charset/test-charset.c ++++ b/src/lib-charset/test-charset.c +@@ -159,7 +159,7 @@ + static void (*const test_functions[])(void) = { + test_charset_is_utf8, + test_charset_utf8, +-#ifdef HAVE_ICONV ++#if 0 //def HAVE_ICONV + test_charset_iconv, + test_charset_iconv_crashes, + test_charset_iconv_utf7_state, diff --git a/user/dovecot/split-protocols.patch b/user/dovecot/split-protocols.patch new file mode 100644 index 000000000..b4bed2ccb --- /dev/null +++ b/user/dovecot/split-protocols.patch @@ -0,0 +1,30 @@ +For each protocol $prot, which is moved into subpackage $subname, +is installed file /usr/share/dovecot/protocols.d/$subname.conf with: + + protocols = $protocols $prot + +--- a/doc/example-config/dovecot.conf ++++ b/doc/example-config/dovecot.conf +@@ -20,8 +20,9 @@ + # options. The paths listed here are for configure --prefix=/usr + # --sysconfdir=/etc --localstatedir=/var + +-# Protocols we want to be serving. +-#protocols = imap pop3 lmtp submission ++# Enable installed protocols. ++#protocols = imap ++!include_try /usr/share/dovecot/protocols.d/*.conf + + # A comma separated list of IPs or hosts where to listen in for connections. + # "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces. +--- a/src/master/master-settings.c.orig ++++ b/src/master/master-settings.c +@@ -206,7 +206,7 @@ + .state_dir = PKG_STATEDIR, + .libexec_dir = PKG_LIBEXECDIR, + .instance_name = PACKAGE, +- .protocols = "imap pop3 lmtp", ++ .protocols = "imap", + .listen = "*, ::", + .ssl = "yes:no:required", + .default_internal_user = "dovecot", diff --git a/user/dovecot/ssl-paths.patch b/user/dovecot/ssl-paths.patch new file mode 100644 index 000000000..b354b607e --- /dev/null +++ b/user/dovecot/ssl-paths.patch @@ -0,0 +1,13 @@ +--- dovecot-2.3.10/doc/example-config/conf.d/10-ssl.conf 2020-03-05 14:35:53.000000000 +0000 ++++ dovecot-2.3.10.new/doc/example-config/conf.d/10-ssl.conf 2020-04-26 06:49:45.860000000 +0000 +@@ -9,8 +9,8 @@ + # dropping root privileges, so keep the key file unreadable by anyone but + # root. Included doc/mkcert.sh can be used to easily generate self-signed + # certificate, just make sure to update the domains in dovecot-openssl.cnf +-ssl_cert = </etc/ssl/certs/dovecot.pem +-ssl_key = </etc/ssl/private/dovecot.pem ++ssl_cert = </etc/ssl/dovecot/server.pem ++ssl_key = </etc/ssl/dovecot/server.key + + # If key file is password protected, give the password here. Alternatively + # give it when starting dovecot with -p parameter. Since this file is often diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD index eefc391ce..9255fda64 100644 --- a/user/doxygen/APKBUILD +++ b/user/doxygen/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: pkgname=doxygen -pkgver=1.8.16 +pkgver=1.8.18 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${pkgver#*.*.} -pkgrel=1 +pkgrel=0 pkgdesc="A documentation system for C++, C, Java, IDL, and PHP" url="http://www.doxygen.org/" arch="all" @@ -12,7 +12,6 @@ depends="" makedepends="bison cmake coreutils flex perl python3" checkdepends="libxml2-utils" source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz - doxygen-1.8.14-install.patch time64.patch " builddir="$srcdir/doxygen-Release_$_pkgver" @@ -22,8 +21,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -Dbuild_xmlparser=ON \ - -DMAN_INSTALL_DIR=/usr/share/man/man1 \ - -DDOC_INSTALL_DIR=/usr/share/doc/doxygen + -DMAN_INSTALL_DIR=share/man/man1 \ + -DDOC_INSTALL_DIR=share/doc/doxygen make } @@ -38,6 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz -725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch +sha512sums="32b0d9e5fbb44e947eb771f323ce4aa76f8b31e940f47dcec2af6c5e98a20b58cb4627eff6e70faac6b8cb2ad67b88b0280496310a5b784466196c22e1174233 Release_1_8_18.tar.gz 92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch" diff --git a/user/doxygen/doxygen-1.8.14-install.patch b/user/doxygen/doxygen-1.8.14-install.patch deleted file mode 100644 index 71448b8b4..000000000 --- a/user/doxygen/doxygen-1.8.14-install.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- doxygen-1.8.14/doc/CMakeLists.txt.config 2017-12-31 15:28:32.351163123 +0100 -+++ doxygen-1.8.14/doc/CMakeLists.txt 2017-12-31 15:29:11.490119182 +0100 -@@ -168,15 +168,15 @@ install(FILES - "${PROJECT_BINARY_DIR}/man/doxywizard.1" - "${PROJECT_BINARY_DIR}/man/doxysearch.1" - "${PROJECT_BINARY_DIR}/man/doxyindexer.1" -- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 -+ DESTINATION "${MAN_INSTALL_DIR}" - ) - - install(FILES - "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" -+ DESTINATION "${DOC_INSTALL_DIR}" - ) - - install(DIRECTORY - "${PROJECT_BINARY_DIR}/html" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" -+ DESTINATION "${DOC_INSTALL_DIR}" - ) diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD index 40f60f469..744b206c5 100644 --- a/user/dracut/APKBUILD +++ b/user/dracut/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dracut pkgver=050 -pkgrel=0 +pkgrel=1 pkgdesc="Event-driven initramfs infrastructure" url="https://dracut.wiki.kernel.org/" arch="all" @@ -16,6 +16,7 @@ source="https://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.ta fts.patch header-fix.patch mount-run-without-noexec.patch + dracut.easy-boot " prepare() { @@ -44,6 +45,9 @@ package() { 01systemd-initrd 02systemd-networkd; do rm -r "$pkgdir"/usr/lib/dracut/modules.d/$sysdmod done + + install -Dm755 "$srcdir"/dracut.easy-boot \ + "$pkgdir"/etc/easy-boot.d/20-dracut } bashcomp() { @@ -71,4 +75,5 @@ lvm() { sha512sums="eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850 dracut-050.tar.xz ce84e527e441e18494ea9011b4b10cf723ce5981c4717140f43861b6ed3e0f0aa78545be41c111d3338422f2ad158edc8704376c3dca207ae4445c58f54a4574 fts.patch 988f03a3fd2e7ee62409d3c57e8029403513dcec5efb37e64633d989728e4c7b619ce5b8775a04c5a0b654f7f093777d94fe6e4098a99a690c353a94f537e24c header-fix.patch -d7aa2b35def975ec2a9620d3e8c94da5fad5be51e81ac913b9f3497b3ca62beefb9d4cf8e4ba3b292f89b936373486d0e3184f65eb1eaed972f38d17424a32b1 mount-run-without-noexec.patch" +d7aa2b35def975ec2a9620d3e8c94da5fad5be51e81ac913b9f3497b3ca62beefb9d4cf8e4ba3b292f89b936373486d0e3184f65eb1eaed972f38d17424a32b1 mount-run-without-noexec.patch +ea576d30e51b2f1c676e29fb81b064b3b8c696a3692dbcf6a31f8a589ab2a426f421bc1002295eb79843cba22d6ddeb04fadb3f99d9e5c00d2d5f53fd3a6c484 dracut.easy-boot" diff --git a/user/dracut/dracut.easy-boot b/user/dracut/dracut.easy-boot new file mode 100644 index 000000000..53c95c54e --- /dev/null +++ b/user/dracut/dracut.easy-boot @@ -0,0 +1,14 @@ +#!/bin/sh -e + +for i in /boot/vmlinu[xz]*; do + version="${i##*/vmlinu[xz]}" + # Support filenames with no version. LILO supports this, but GRUB + # doesn't (currently). + version="${version#-}" + if ! [ -d /lib/modules/"$version" ]; then + printf '>>> %s: no modules installed, skipping\n' "$version" >&2 + continue + fi + printf '>>> %s\n' "$version" >&2 + dracut --force --quiet /boot/initramfs-"$version".img "$version" +done diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index f0d269483..43548942e 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8 dragon-19.12.3.tar.xz" +sha512sums="1e802291d58fed6e9f0a51dfea8157e897b36ddab4e61a7af4d9350116f0d8ae871c15289f3bb0ee0c63401e830f8dc256f7709fa9d309b06f4f0f01afc8b59b dragon-20.04.3.tar.xz" diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD index 5f2149b22..379316b65 100644 --- a/user/efibootmgr/APKBUILD +++ b/user/efibootmgr/APKBUILD @@ -5,7 +5,7 @@ pkgver=16 pkgrel=0 pkgdesc="User-space application to modify the Intel EFI Boot Manager" url="https://github.com/rhboot/efibootmgr" -arch="pmmx x86_64 arm64 ia64" +arch="pmmx x86_64 aarch64 ia64" options="!check" # Dangerous. license="GPL-2.0-only" depends="" diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD index 13b1b64bd..c8a8ba600 100644 --- a/user/efivar/APKBUILD +++ b/user/efivar/APKBUILD @@ -5,7 +5,7 @@ pkgver=37 pkgrel=0 pkgdesc="Tools and library to manipulate EFI variables" url="https://github.com/rhboot/efivar" -arch="pmmx x86_64 arm64 ia64" +arch="pmmx x86_64 aarch64 ia64" options="!check" # "WARNING: You should probably not run tests /ever/. This is not a joke." license="LGPL-2.1+" depends="" diff --git a/user/elixir/APKBUILD b/user/elixir/APKBUILD new file mode 100644 index 000000000..83731fd94 --- /dev/null +++ b/user/elixir/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Daniel Isaksen <d@duniel.no> +# Contributor: Marlus Saraiva <marlus.saraiva@gmail.com> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=elixir +pkgver=1.10.4 +pkgrel=0 +pkgdesc="Dynamic, functional language designed for building scalable and maintainable applications" +url="https://elixir-lang.org/" +arch="noarch" +license="Apache-2.0" +depends="erlang" +makedepends="erlang-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/elixir-lang/elixir/archive/v$pkgver.tar.gz + tests1.patch + tests2.patch + " + +build() { + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" PREFIX=/usr install +} + +sha512sums="844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7 elixir-1.10.4.tar.gz +4b014bc616c729dba673693b8157e1923eff840d83798051aeb297056383c7b3490fb9d0749eb21ba6c09f6128b36510f1c943e2d8daf393d4c719d021693978 tests1.patch +fa2f24514e4859449ec260cb179a1e523580d8681a9ad55aff7e447ae4feee6f5a09a4f1857b481a973d4f8e759cb194ffdd9b2b230ec8a59bd33fd53ad47730 tests2.patch" diff --git a/user/elixir/tests1.patch b/user/elixir/tests1.patch new file mode 100644 index 000000000..7c74074a9 --- /dev/null +++ b/user/elixir/tests1.patch @@ -0,0 +1,87 @@ +From aaae97992d33ba11374a9140e2ad8aa9aca45e32 Mon Sep 17 00:00:00 2001 +From: Jonny Stoten <jonny@jonnystoten.com> +Date: Mon, 13 Jan 2020 08:37:20 +0000 +Subject: [PATCH] Don't GPG sign commits or tags in git tests (#9719) + +If the machine/user git config is set to sign all commits/tags, +these tests fail. +--- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index 5d9eb8390a..f8f1baaf15 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index b652cd07b2..65e41aa1d1 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -218,7 +218,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "bad"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -237,8 +237,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) +- System.cmd("git", ~w[tag without_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[tag --no-sign without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -279,8 +279,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "lib"]) +- System.cmd("git", ~w[tag with_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) ++ System.cmd("git", ~w[tag --no-sign with_module]) + end) + end + +@@ -309,7 +309,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m without-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -336,7 +336,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m with-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) + end) + end + +@@ -364,7 +364,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + end) + end + diff --git a/user/elixir/tests2.patch b/user/elixir/tests2.patch new file mode 100644 index 000000000..f44b028df --- /dev/null +++ b/user/elixir/tests2.patch @@ -0,0 +1,159 @@ +From 3d1c1b4e2396e9891d38d00185889bd4a421db1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co> +Date: Sat, 13 Jun 2020 10:01:10 +0200 +Subject: [PATCH] Use global gitconfig instead of individual options on + commands + +Closes #10098. +--- + lib/mix/lib/mix/scm/git.ex | 7 ++-- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 45 +++++++++++++------------ + 3 files changed, 29 insertions(+), 25 deletions(-) + +diff --git a/lib/mix/lib/mix/scm/git.ex b/lib/mix/lib/mix/scm/git.ex +index 2c07b9515f..6f66202052 100644 +--- a/lib/mix/lib/mix/scm/git.ex ++++ b/lib/mix/lib/mix/scm/git.ex +@@ -251,8 +251,11 @@ defmodule Mix.SCM.Git do + opts = cmd_opts(into: into, stderr_to_stdout: true) + + case System.cmd("git", args, opts) do +- {response, 0} -> response +- {_, _} -> Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed") ++ {response, 0} -> ++ response ++ ++ {response, _} -> ++ Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed with reason: #{response}") + end + end + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index f8f1baaf15..5d9eb8390a 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index 88c6434816..1dec2be0b0 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -182,18 +182,23 @@ defmodule MixTest.Case do + end + end + +-## Set up Mix home with Rebar ++## Set up globals + +-home = MixTest.Case.tmp_path(".mix") ++home = MixTest.Case.tmp_path(".home") + File.mkdir_p!(home) +-System.put_env("MIX_HOME", home) ++System.put_env("HOME", home) ++ ++mix = MixTest.Case.tmp_path(".mix") ++File.mkdir_p!(mix) ++System.put_env("MIX_HOME", mix) ++ + System.delete_env("XDG_DATA_HOME") + System.delete_env("XDG_CONFIG_HOME") + + rebar = System.get_env("REBAR") || Path.expand("fixtures/rebar", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar")) ++File.cp!(rebar, Path.join(mix, "rebar")) + rebar = System.get_env("REBAR3") || Path.expand("fixtures/rebar3", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar3")) ++File.cp!(rebar, Path.join(mix, "rebar3")) + + ## Copy fixtures to tmp + +@@ -207,6 +212,8 @@ Enum.each(fixtures, fn fixture -> + end) + + ## Generate Git repo fixtures ++System.cmd("git", ~w[config --global user.email "mix@example.com"]) ++System.cmd("git", ~w[config --global user.name "mix-repo"]) + + # Git repo + target = Path.expand("fixtures/git_repo", __DIR__) +@@ -220,11 +227,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) ++ System.cmd("git", ~w[commit -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -243,8 +248,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) +- System.cmd("git", ~w[tag --no-sign without_module]) ++ System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[tag without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -285,8 +290,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) +- System.cmd("git", ~w[tag --no-sign with_module]) ++ System.cmd("git", ~w[commit -m "lib"]) ++ System.cmd("git", ~w[tag with_module]) + end) + end + +@@ -311,11 +316,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) ++ System.cmd("git", ~w[commit -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -342,7 +345,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) ++ System.cmd("git", ~w[commit -m with-dep]) + end) + end + +@@ -366,11 +369,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + end) + end + diff --git a/user/elogind/APKBUILD b/user/elogind/APKBUILD new file mode 100644 index 000000000..30dd59823 --- /dev/null +++ b/user/elogind/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=elogind +pkgver=243.7 +pkgrel=0 +pkgdesc="Session manager system" +url=" " +arch="all" +license="LGPL-2.1+" +depends="dbus eudev polkit utmps" +makedepends="meson ninja acl-dev dbus-dev docbook-xsl eudev-dev gperf libcap-dev + libxslt-dev linux-headers linux-pam-dev m4 skalibs-libs-dev + utmps-libs-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" +install="$pkgname.post-install $pkgname.post-deinstall" +source="elogind-$pkgver.tar.gz::https://github.com/elogind/elogind/archive/v$pkgver.tar.gz + utmps.patch + + elogind.pamd + elogind.confd + elogind.initd + " + +build() { + export LDFLAGS="-Wl,--no-as-needed -l:libutmps.so -Wl,--as-needed" + # Note: We can't use openrc as our cgroup controller, + # otherwise we aren't portable to s6/runit later. + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + -Dcgroup-controller=elogind \ + -Ddefault-kill-user-processes=false \ + -Dman=auto \ + build + ninja -C build +} + +check() { + ninja -C build test +} + +package() { + DESTDIR="$pkgdir" ninja -C build install + install -D -m644 "$srcdir"/elogind.pamd "$pkgdir"/etc/pam.d/elogind-user + install -D -m755 "$srcdir"/elogind.initd "$pkgdir"/etc/init.d/elogind + install -D -m644 "$srcdir"/elogind.confd "$pkgdir"/etc/conf.d/elogind +} + +sha512sums="fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472 elogind-243.7.tar.gz +5c1596b85e893e965ffb6f401c51d07dc4a77468b2ccfbe93a2b84eae596acf8a31a760c16f174cf73ffd6d404e9252e9baa7ea5ecc7785e6bf66282c27c66fc utmps.patch +b5043d7bcbefdf00704d40670deafa0984899cc7be083e8d886a92137932a9f23c25749c106cfc07906166e57db32fe6c602cf1c54129faa7e5b04d6228b7c17 elogind.pamd +2c9047c054582824f8a3e71bb0a79a5621d7a92cb15c66bb7e7a8deb931037b6d3a331b86cdc9eb5ec4e7b2b725548a7ee6657e3c3193d81ba6422cd101a2491 elogind.confd +bbc203a924abf65b45d7d4d2fc31baf2d4e23135d98c7c937f93a4fe2d4ce9dac3d4e0747c1e09101f8b2ce674d25d49e085bf2445e7cb28408d7d209f8f4491 elogind.initd" diff --git a/user/elogind/elogind.confd b/user/elogind/elogind.confd new file mode 100644 index 000000000..f212514cb --- /dev/null +++ b/user/elogind/elogind.confd @@ -0,0 +1,4 @@ +# /etc/conf.d/elogind: config file for /etc/init.d/elogind + +# this is where elogind will store its pid file +ELOGIND_PIDFILE="/run/elogind.pid" diff --git a/user/elogind/elogind.initd b/user/elogind/elogind.initd new file mode 100644 index 000000000..ab6a3905c --- /dev/null +++ b/user/elogind/elogind.initd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need dbus + + # Make sure elogind is up before xdm starts any dm + before xdm + before sddm +} + +start() { + ebegin "Starting elogind" + + start-stop-daemon --start --quiet \ + --pidfile "${ELOGIND_PIDFILE}" \ + --exec /lib/elogind/elogind -- --daemon + eend $? +} + +stop() { + ebegin "Stopping elogind" + start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}" + eend $? +} diff --git a/user/elogind/elogind.pamd b/user/elogind/elogind.pamd new file mode 100644 index 000000000..210d3becb --- /dev/null +++ b/user/elogind/elogind.pamd @@ -0,0 +1,18 @@ +# Welcome to Adélie Linux. +# This file describes the PAM configuration for elogind. +# This is *not* the configuration that adds elogind to the system; +# that file is $SYSROOT/etc/pam.d/base-session-elogind. + +account required pam_access.so +account include base-account + +session required pam_env.so +session required pam_limits.so +session required pam_unix.so +session required pam_loginuid.so +session optional pam_keyinit.so force revoke +session optional pam_elogind.so + +auth required pam_deny.so + +password required pam_deny.so diff --git a/user/elogind/elogind.post-deinstall b/user/elogind/elogind.post-deinstall new file mode 100644 index 000000000..76e04048e --- /dev/null +++ b/user/elogind/elogind.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +printf "" > /etc/pam.d/base-session-elogind diff --git a/user/elogind/elogind.post-install b/user/elogind/elogind.post-install new file mode 100644 index 000000000..8a6636660 --- /dev/null +++ b/user/elogind/elogind.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +printf "# Welcome to Adélie Linux\n# This file integrates elogind with your system PAM configuration.\n# It should not be modified. If you no longer wish to use elogind,\n# simply remove the include line from /etc/pam.d/base-session.\n\nsession\t\trequired\tpam_loginuid.so\nsession\t\toptional\tpam_elogind.so\n" > /etc/pam.d/base-session-elogind diff --git a/user/elogind/utmps.patch b/user/elogind/utmps.patch new file mode 100644 index 000000000..c1ac7c515 --- /dev/null +++ b/user/elogind/utmps.patch @@ -0,0 +1,21 @@ +--- elogind-243.7/src/shared/musl_missing.h.old 2020-03-12 19:33:40.000000000 +0000 ++++ elogind-243.7/src/shared/musl_missing.h 2020-07-24 23:42:45.556511070 +0000 +@@ -76,7 +76,6 @@ + /* Make musl utmp/wtmp stubs visible if needed. */ + #if ENABLE_UTMP + # include <paths.h> +-# include <utmp.h> + # include <utmpx.h> + # if defined(_PATH_UTMP) && !defined(_PATH_UTMPX) + # define _PATH_UTMPX _PATH_UTMP +--- elogind-243.7/src/basic/user-util.c.old 2020-03-12 19:33:40.000000000 +0000 ++++ elogind-243.7/src/basic/user-util.c 2020-07-24 23:44:44.253733648 +0000 +@@ -12,7 +12,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> +-#include <utmp.h> ++#include <utmpx.h> + + #include "alloc-util.h" + #include "errno-util.h" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index bb270f035..f1aba2563 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.7 +pkgver=2.2.8 pkgrel=0 pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6 enchant-2.2.7.tar.gz" +sha512sums="4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090 enchant-2.2.8.tar.gz" diff --git a/user/eudev/APKBUILD b/user/eudev/APKBUILD index 16858e1f5..86a8e30f8 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=eudev pkgver=3.2.9 -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" arch="all" @@ -91,12 +91,16 @@ openrc() { replaces="udev-init-scripts-openrc" default_openrc install -d "$subpkgdir"/usr/share/openrc/runlevels/sysinit + install -d "$subpkgdir"/etc/runlevels/sysinit # https://bts.adelielinux.org/show_bug.cgi?id=51 # if eudev is installed, it should be running in the sysinit runlevel ln -s /etc/init.d/udev \ "$subpkgdir"/usr/share/openrc/runlevels/sysinit/udev + ln -s /etc/init.d/udev "$subpkgdir"/etc/runlevels/sysinit/udev ln -s /etc/init.d/udev-trigger \ "$subpkgdir"/usr/share/openrc/runlevels/sysinit/udev-trigger + ln -s /etc/init.d/udev-trigger \ + "$subpkgdir"/etc/runlevels/sysinit/udev-trigger } sha512sums="09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f eudev-3.2.9.tar.gz diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 6ddc8cf92..8d6368a9b 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince -pkgver=3.36.0 +pkgver=3.36.7 pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="914c182f0ca71a0df99036339fe18f7c93514bae461ddecd719c5659c1cc67701f825e7a58b1eb203051ec55ccd402371fc70d3a27134ccdf915966e5bad8b7a evince-3.36.0.tar.xz" +sha512sums="dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910 evince-3.36.7.tar.xz" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 37a599524..3d2b55f65 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e3d7d9c6fd58dbf87923ec35709bbf11386d65038f698461de51bdb65a9f05c84fe9902184f97f47b133dfb88118d6306f30f6eeee912f89b9c41a3e30ffac1 extra-cmake-modules-5.68.0.tar.xz +sha512sums="4bae3b862b473df8115246924813b379f2b957ae700c4be45f13fe44519d7f011c235459a0dc8b10aad920dee318435747f1ff3ea8c270ca53ec2f4ebe90b098 extra-cmake-modules-5.72.0.tar.xz a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/f2fs-tools/APKBUILD b/user/f2fs-tools/APKBUILD new file mode 100644 index 000000000..7784c170d --- /dev/null +++ b/user/f2fs-tools/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=f2fs-tools +pkgver=1.13.0 +pkgrel=0 +pkgdesc="Tools for the Flash-Friendly File System (F2FS)" +url="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+ OR LGPL-2.1+" +depends="" +makedepends="automake autoconf bsd-compat-headers libtool util-linux-dev linux-headers" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz" + +prepare() { + default_prepare + ./autogen.sh +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr + make +} + +package() { + make install DESTDIR="$pkgdir" + install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/ +} + +sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f f2fs-tools-1.13.0.tar.gz" diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index 679d7831e..0a81a14f9 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=faad2 -pkgver=2.9.1 +pkgver=2.9.2 _pkgver="$(printf '%s' "$pkgver" | tr . _)" pkgrel=0 pkgdesc="ISO AAC audio decoder" @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1015f5b49baebf6c9404cfcd7b9d524cc76a57abcd1a46bb851463ae5226bfd8b80155b661708f66548466422855cd7aeec5676463cd1346c5fb1dc0821621ce faad2-2.9.1.tar.gz" +sha512sums="996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2 faad2-2.9.2.tar.gz" diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD index 944256215..fa0891b31 100644 --- a/user/fdupes/APKBUILD +++ b/user/fdupes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fdupes -pkgver=1.6.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Identify or delete duplicate files in a directory tree" url=" " @@ -9,16 +9,23 @@ arch="all" options="!check" # No test suite. license="MIT" depends="" -makedepends="" +makedepends="autoconf automake ncurses-dev pcre2-dev" subpackages="$pkgname-doc" source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz" +prepare() { + default_prepare + autoreconf -vif +} + build() { - make PREFIX=/usr + LIBS="-ltinfow" ./configure \ + --prefix=/usr + make } package() { - make PREFIX=/usr DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } -sha512sums="6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db fdupes-1.6.1.tar.gz" +sha512sums="e098647f57d0f9fb183b9f3c4cc36d33427edb3982763a894251c5a9f8432302329cc8d1ab5a09dc27a247065bdd40936c48d3846f1babf3300ca011a37a1b7d fdupes-2.1.1.tar.gz" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index e88d1344e..848ca9e9b 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=featherpad -pkgver=0.13.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,5 +31,5 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="287a97907baba93a760751f8f28472b12d6c65ebb0855fcf684e126d8635adbc4e00b2fb4703bbabdc182b8a337dd9281b5b2c97add4b571fca976d90ecc7db9 FeatherPad-0.13.1.tar.gz +sha512sums="d66b999b11fb42de0ffe270b01186a9fbdedd211bf03f81c3b2adc717c2d427f5292008c1e5319c01a90e50ec23bc92767940741a80780fa9160fd3ce4839016 FeatherPad-0.14.2.tar.gz 471714eec9a376b138cc4c6c7b7d1339c9767091309c95b11ef2a8536250c796367b1544dca9610cc10babdbd08ac1436784d71292680b9da90e681dd855aaf0 hunspell-link.patch" diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index 899461202..b95aaf01d 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=3.3 +pkgver=3.4.1 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="https://feh.finalrewind.org/" @@ -12,7 +12,14 @@ checkdepends="perl-test-command" makedepends="curl-dev imlib2-dev libexif-dev libjpeg-turbo-dev libpng-dev libxinerama-dev libxt-dev" subpackages="$pkgname-doc" -source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2" +source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2 + getopt.patch + " + +prepare() { + default_prepare + rm src/getopt.c src/getopt1.c src/getopt.h +} build() { make PREFIX=/usr curl=1 exif=1 xinerama=1 @@ -31,4 +38,5 @@ package() { install } -sha512sums="0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 feh-3.3.tar.bz2" +sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 feh-3.4.1.tar.bz2 +cf02fbfcb1fd4f4e5cf899f7f94fd42521dbe8f1b805268eae5ae6222b85884c31abc3346a95ed46dfece7b89b445018e159ff8a42b799b3db18275e29eba1e3 getopt.patch" diff --git a/user/feh/getopt.patch b/user/feh/getopt.patch new file mode 100644 index 000000000..be7616fa9 --- /dev/null +++ b/user/feh/getopt.patch @@ -0,0 +1,100 @@ +--- feh-3.4.1/src/feh.h 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/feh.h 2020-06-20 02:22:16.040051483 +0000 +@@ -74,7 +74,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE + #include "menu.h" + + #include "utils.h" +-#include "getopt.h" ++#include <getopt.h> + + #include "debug.h" + +--- feh-3.4.1/src/Makefile 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/Makefile 2020-06-20 02:22:43.660051920 +0000 +@@ -4,8 +4,6 @@ TARGETS = \ + events.c \ + feh_png.c \ + filelist.c \ +- getopt.c \ +- getopt1.c \ + gib_hash.c \ + gib_imlib.c \ + gib_list.c \ +--- feh-3.4.1/src/deps.mk 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/deps.mk 2020-06-20 02:23:33.810052712 +0000 +@@ -1,57 +1,55 @@ + events.o: events.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h thumbnail.h + feh_png.o: feh_png.c feh_png.h feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h ++ gib_style.h structs.h menu.h utils.h debug.h + filelist.o: filelist.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + signals.h options.h +-getopt.o: getopt.c +-getopt1.o: getopt1.c getopt.h + gib_hash.o: gib_hash.c gib_hash.h gib_list.h utils.h debug.h + gib_imlib.o: gib_imlib.c gib_imlib.h gib_style.h gib_list.h utils.h \ + debug.h + gib_list.o: gib_list.c gib_list.h utils.h debug.h + gib_style.o: gib_style.c gib_style.h gib_list.h utils.h debug.h + imlib.o: imlib.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h signals.h \ ++ structs.h menu.h utils.h debug.h filelist.h signals.h \ + winwidget.h options.h + index.o: index.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h index.h + keyevents.o: keyevents.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h thumbnail.h \ ++ gib_style.h structs.h menu.h utils.h debug.h thumbnail.h \ + filelist.h winwidget.h options.h + list.o: list.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + main.o: main.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h signals.h wallpaper.h + md5.o: md5.c md5.h + menu.o: menu.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h thumbnail.h filelist.h \ ++ structs.h menu.h utils.h debug.h thumbnail.h filelist.h \ + winwidget.h wallpaper.h options.h + multiwindow.o: multiwindow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h winwidget.h \ ++ gib_style.h structs.h menu.h utils.h debug.h winwidget.h \ + timers.h filelist.h options.h signals.h + options.o: options.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + signals.o: signals.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h + slideshow.o: slideshow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + timers.h winwidget.h options.h signals.h + thumbnail.o: thumbnail.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h thumbnail.h md5.h feh_png.h index.h signals.h + timers.o: timers.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h timers.h ++ structs.h menu.h utils.h debug.h options.h timers.h + utils.o: utils.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h ++ structs.h menu.h utils.h debug.h options.h + wallpaper.o: wallpaper.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + options.h wallpaper.h + winwidget.o: winwidget.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h events.h diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index b6de0597c..06e68aecb 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg pkgver=4.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" @@ -21,6 +21,8 @@ makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch + CVE-2019-13312.patch + CVE-2020-12284.patch " # secfixes: @@ -37,6 +39,9 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz # - CVE-2017-14222 # - CVE-2017-14223 # - CVE-2017-14225 +# 4.2.2-r1: +# - CVE-2019-13312 +# - CVE-2020-12284 build() { _asm="" @@ -98,4 +103,6 @@ libs() { } sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz -1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" +1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +0c53680ae480b8f848893d4e5c40ea522bd25a72860e0955e039ec838ee09159ab2bfa0eafc71113009082c7f53981ba70116dcef17053cd3cc3ea59e4da5a5c CVE-2019-13312.patch +910f8da9ed8e0998c311cc451f1725a20c4cc3e9f0c2d1981a1ceea8da5f434519044b4997e71d87424e19fcc45cb203238e49ad178e313696667e6c9bf311c9 CVE-2020-12284.patch" diff --git a/user/ffmpeg/CVE-2019-13312.patch b/user/ffmpeg/CVE-2019-13312.patch new file mode 100644 index 000000000..1ef9d92b4 --- /dev/null +++ b/user/ffmpeg/CVE-2019-13312.patch @@ -0,0 +1,30 @@ +From ea56af88956061d700043c5c4b026ac57834b0c8 Mon Sep 17 00:00:00 2001 +From: Carl Eugen Hoyos <ceffmpeg@gmail.com> +Date: Mon, 1 Jul 2019 01:45:36 +0200 +Subject: [PATCH] lavc/zmbvenc: Do not left-shift negative values. + +Fixes the following ubsan errors with the sample from ticket #7980: +libavcodec/zmbvenc.c:243:29: runtime error: left shift of negative value -4 +libavcodec/zmbvenc.c:244:28: runtime error: left shift of negative value -2 +--- + libavcodec/zmbvenc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c +index 4887175..0e22ce6 100644 +--- a/libavcodec/zmbvenc.c ++++ b/libavcodec/zmbvenc.c +@@ -240,8 +240,8 @@ FF_ENABLE_DEPRECATION_WARNINGS + tprev = prev + x * c->bypp; + + zmbv_me(c, tsrc, p->linesize[0], tprev, c->pstride, x, y, &mx, &my, &xored); +- mv[0] = (mx << 1) | !!xored; +- mv[1] = my << 1; ++ mv[0] = (mx * 2) | !!xored; ++ mv[1] = my * 2; + tprev += mx * c->bypp + my * c->pstride; + if(xored){ + for(j = 0; j < bh2; j++){ +-- +2.7.4 + diff --git a/user/ffmpeg/CVE-2020-12284.patch b/user/ffmpeg/CVE-2020-12284.patch new file mode 100644 index 000000000..7360b5870 --- /dev/null +++ b/user/ffmpeg/CVE-2020-12284.patch @@ -0,0 +1,32 @@ +From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Sat, 7 Mar 2020 15:42:58 +0100 +Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS + +Fixes: out of array access +Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584 +Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680 + +Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +--- + libavcodec/cbs_jpeg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c +index 6bbce5f..89512a2 100644 +--- a/libavcodec/cbs_jpeg.c ++++ b/libavcodec/cbs_jpeg.c +@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, + if (marker == JPEG_MARKER_SOS) { + length = AV_RB16(frag->data + start); + ++ if (length > end - start) ++ return AVERROR_INVALIDDATA; ++ + data_ref = NULL; + data = av_malloc(end - start + + AV_INPUT_BUFFER_PADDING_SIZE); +-- +2.7.4 + diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 82d7730c7..6986f1947 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191 ffmpegthumbs-19.12.3.tar.xz" +sha512sums="8b9cbcbad56aed5924fa416d295a42cbe1fa992287919fb8475d1dde41fd45608afeb97fd8a747a77d71823f92597428c99896792291a3def0d539f29df3870e ffmpegthumbs-20.04.3.tar.xz" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index a04dacd5f..2796e3e36 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=68.7.0 +pkgver=68.10.0 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" url="https://www.mozilla.org/firefox/" @@ -41,7 +41,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f mozilla-build-arm.patch ppc32-fix.patch rust-32bit.patch - rust-config.patch + seccomp-musl.patch + seccomp-time64.patch shut-up-warning.patch skia-sucks1.patch skia-sucks2.patch @@ -120,6 +121,22 @@ ldpath="$_mozappdir" # - CVE-2020-6821 # - CVE-2020-6822 # - CVE-2020-6825 +# 68.8.0-r0: +# - CVE-2020-6831 +# - CVE-2020-12387 +# - CVE-2020-12392 +# - CVE-2020-12395 +# 68.9.0-r0: +# - CVE-2020-12399 +# - CVE-2020-12405 +# - CVE-2020-12406 +# - CVE-2020-12410 +# 68.10.0-r0: +# - CVE-2020-12417 +# - CVE-2020-12418 +# - CVE-2020-12419 +# - CVE-2020-12420 +# - CVE-2020-12421 unpack() { default_unpack @@ -235,7 +252,7 @@ package() { EOF } -sha512sums="a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593 firefox-68.7.0esr.source.tar.xz +sha512sums="c5c1833560364851e7cf8ea51659bc4fb60239b960125cdb20fe31f742d757ffdaef8f314f800dc91214ee8e358033dc2af971c08bbba474ef6158b101881653 firefox-68.10.0esr.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -246,7 +263,8 @@ de8e3b15cd7dffb0eca5a729434986e5916234914cdc5fdcdbbc67d8bb439a535ed932293518dd74 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch 7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch -45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch +efc77a320850e10e8b99e6fb5d3dd28a3044e287fd87efbdf95807de26a6885235b2d994743cb374345d91a0353abd70a5790b829e37b717b77605e24d4f7f98 seccomp-musl.patch +4b20dfa3ef3d470af069a274c53ea35c67d2d123f1b543ee243e7038ed94f5a1a6121f1f67713a9442e246b979c042f11efc7a6c32d0b8d3fd2c448dd1258733 seccomp-time64.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch 9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch diff --git a/user/firefox-esr/rust-config.patch b/user/firefox-esr/rust-config.patch deleted file mode 100644 index eab72a0e4..000000000 --- a/user/firefox-esr/rust-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urw firefox-68.0-old/build/moz.configure/rust.configure firefox-68.0/build/moz.configure/rust.configure ---- firefox-68.0-old/build/moz.configure/rust.configure 2019-07-07 15:56:29.345963800 +0000 -+++ firefox-68.0/build/moz.configure/rust.configure 2019-07-07 16:19:25.990645334 +0000 -@@ -193,12 +193,16 @@ - ambiguous = set() - per_raw_os = {} - for t in out: -+ if 'fuchsia' in t: continue - t = split_triplet(t, allow_unknown=True) - endianness = t.endianness - if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): - endianness = 'little' - key = (t.cpu, endianness, t.os) - if key in per_os: -+ # hax to allow Adélie toolchains to work -+ if 'foxkit' in per_os[key].alias: -+ continue - previous = per_os[key] - per_raw_os[(previous.cpu, previous.endianness, - previous.raw_os)] = previous diff --git a/user/firefox-esr/seccomp-musl.patch b/user/firefox-esr/seccomp-musl.patch new file mode 100644 index 000000000..edd4a3024 --- /dev/null +++ b/user/firefox-esr/seccomp-musl.patch @@ -0,0 +1,49 @@ +Backport of https://hg.mozilla.org/mozilla-central/rev/a0be746532f437055e4190cc8db802ad1239405e + +diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp +--- a/security/sandbox/linux/SandboxFilter.cpp ++++ b/security/sandbox/linux/SandboxFilter.cpp +@@ -419,16 +419,20 @@ class SandboxPolicyCommon : public Sandb + case __NR_faccessat: + return Trap(AccessAtTrap, mBroker); + CASES_FOR_stat: + return Trap(StatTrap, mBroker); + CASES_FOR_lstat: + return Trap(LStatTrap, mBroker); + CASES_FOR_fstatat: + return Trap(StatAtTrap, mBroker); ++ // Used by new libc and Rust's stdlib, if available. ++ // We don't have broker support yet so claim it does not exist. ++ case __NR_statx: ++ return Error(ENOSYS); + case __NR_chmod: + return Trap(ChmodTrap, mBroker); + case __NR_link: + return Trap(LinkTrap, mBroker); + case __NR_mkdir: + return Trap(MkdirTrap, mBroker); + case __NR_symlink: + return Trap(SymlinkTrap, mBroker); +@@ -538,16 +542,20 @@ class SandboxPolicyCommon : public Sandb + .ElseIf(advice == MADV_HUGEPAGE, Allow()) + .ElseIf(advice == MADV_NOHUGEPAGE, Allow()) + #ifdef MOZ_ASAN + .ElseIf(advice == MADV_DONTDUMP, Allow()) + #endif + .Else(InvalidSyscall()); + } + ++ // musl libc will set this up in pthreads support. ++ case __NR_membarrier: ++ return Allow(); ++ + // Signal handling + #if defined(ANDROID) || defined(MOZ_ASAN) + case __NR_sigaltstack: + #endif + CASES_FOR_sigreturn: + CASES_FOR_sigprocmask: + CASES_FOR_sigaction: + return Allow(); + + diff --git a/user/firefox-esr/seccomp-time64.patch b/user/firefox-esr/seccomp-time64.patch new file mode 100644 index 000000000..72cc28b5d --- /dev/null +++ b/user/firefox-esr/seccomp-time64.patch @@ -0,0 +1,112 @@ +This drops the use of the chromium sandbox syscall headers which were +defining syscall numbers if they were undefined. This masked the time64 +issue initially since while musl renamed several of the time32 syscall +numbers to catch breakage like this, these headers were silently +bringing them back. I did this by comparing the syscall numbers provided +by the chromium and musl headers and redefining the generic names to +their time64 counterparts. + +For gettimeofday and settimeofday there does not appear to be a time64 +counterpart so I have defined them as the time32 versions. For +settimeofday this should not matter (the seccomp filter will block this +by virture of not being on the whitelist - no content process needs to +set the time anyway). + +It is not possible to entirely block the usage of time32 syscalls +because musl uses them internally when it can or in fallback paths. + +I did not check the MIPS headers since we don't currently ship a MIPS +port, so in the future those includes should be examined and dropped +too... + +--- firefox-68.8.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_syscalls.h 2020-04-29 16:49:45.000000000 -0500 ++++ firefox-68.8.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_syscalls.h 2020-05-20 03:09:47.369457646 -0500 +@@ -8,18 +8,7 @@ + + #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ +- +-#if defined(__x86_64__) +-#include "sandbox/linux/system_headers/x86_64_linux_syscalls.h" +-#endif +- +-#if defined(__i386__) +-#include "sandbox/linux/system_headers/x86_32_linux_syscalls.h" +-#endif +- +-#if defined(__arm__) && defined(__ARM_EABI__) +-#include "sandbox/linux/system_headers/arm_linux_syscalls.h" +-#endif ++#include <sys/syscall.h> + + #if defined(__mips__) && (_MIPS_SIM == _ABIO32) + #include "sandbox/linux/system_headers/mips_linux_syscalls.h" +@@ -33,5 +22,36 @@ + #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" + #endif + ++#if !defined(__NR_clock_getres) && defined(__NR_clock_getres_time64) ++#define __NR_clock_getres __NR_clock_getres_time64 ++#endif ++#if !defined(__NR_clock_gettime) && defined(__NR_clock_gettime64) ++#define __NR_clock_gettime __NR_clock_gettime64 ++#endif ++#if !defined(__NR_clock_nanosleep) && defined(__NR_clock_nanosleep_time64) ++#define __NR_clock_nanosleep __NR_clock_nanosleep_time64 ++#endif ++#if !defined(__NR_clock_settime) && defined(__NR_clock_settime64) ++#define __NR_clock_settime __NR_clock_settime64 ++#endif ++#if !defined(__NR_gettimeofday) && defined(__NR_gettimeofday_time32) ++#define __NR_gettimeofday __NR_gettimeofday_time32 ++#endif ++#if !defined(__NR_settimeofday) && defined(__NR_settimeofday_time32) ++#define __NR_settimeofday __NR_settimeofday_time32 ++#endif ++#if !defined(__NR_timer_gettime) && defined(__NR_timer_gettime64) ++#define __NR_timer_gettime __NR_timer_gettime64 ++#endif ++#if !defined(__NR_timer_settime) && defined(__NR_timer_settime64) ++#define __NR_timer_settime __NR_timer_settime64 ++#endif ++#if !defined(__NR_timerfd_gettime) && defined(__NR_timerfd_gettime64) ++#define __NR_timerfd_gettime __NR_timerfd_gettime64 ++#endif ++#if !defined(__NR_timerfd_settime) && defined(__NR_timerfd_settime64) ++#define __NR_timerfd_settime __NR_timerfd_settime64 ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + +--- firefox-68.8.0/security/sandbox/linux/SandboxFilter.cpp 2020-04-29 16:49:45.000000000 -0500 ++++ firefox-68.8.0/security/sandbox/linux/SandboxFilter.cpp 2020-05-19 23:33:27.829642593 -0500 +@@ -478,6 +478,9 @@ class SandboxPolicyCommon : public Sandb + + // Thread synchronization + case __NR_futex: ++#ifdef __NR_futex_time64 ++ case __NR_futex_time64: ++#endif + // FIXME: This could be more restrictive.... + return Allow(); + +@@ -488,6 +491,9 @@ class SandboxPolicyCommon : public Sandb + case __NR_epoll_pwait: + case __NR_epoll_ctl: + case __NR_ppoll: ++#ifdef __NR_ppoll_time64 ++ case __NR_ppoll_time64: ++#endif + case __NR_poll: + return Allow(); + +@@ -1017,6 +1023,9 @@ class ContentSandboxPolicy : public Sand + + CASES_FOR_select: + case __NR_pselect6: ++#ifdef __NR_pselect6_time64 ++ case __NR_pselect6_time64: ++#endif + return Allow(); + + CASES_FOR_getdents: diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 9754c4a0b..08e2a6e47 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,34 +1,35 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=fish -pkgver=3.0.2 +pkgver=3.1.2 pkgrel=0 pkgdesc="Modern interactive commandline shell" url="http://www.fishshell.com" arch="all" -options="!check" # No test suite. license="BSD-3-Clause AND BSD-2-Clause AND GPL-2.0+ AND GPL-2.0-only AND ISC" -depends="bc" +depends="bc groff" depends_dev="$pkgname-tools" -makedepends="libtool doxygen ncurses-dev pcre2-dev" +checkdepends="expect" +makedepends="cmake doxygen ncurses-dev pcre2-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools::noarch" source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCURSES_NEED_NCURSES=ON \ + -Bbuild . + make -C build +} + +check() { + make -C build test } package() { - make install DESTDIR="$pkgdir" - rm -fr "$pkgdir"/usr/share/$pkgname/groff + make -C build install DESTDIR="$pkgdir" } dev() { @@ -53,4 +54,4 @@ tools() { mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname } -sha512sums="cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3 fish-3.0.2.tar.gz" +sha512sums="b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 fish-3.1.2.tar.gz" diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index 7f061b427..c14ed3770 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.1.1 +pkgver=2.1.4 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8 fluidsynth-2.1.1.tar.gz" +sha512sums="22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190 fluidsynth-2.1.4.tar.gz" diff --git a/user/fontawesome/APKBUILD b/user/fontawesome/APKBUILD index 9837e1f00..26d9692e1 100644 --- a/user/fontawesome/APKBUILD +++ b/user/fontawesome/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontawesome -pkgver=5.11.2 +pkgver=5.14.0 pkgrel=0 pkgdesc="Typeface for iconography" url="https://fontawesome.com" @@ -18,4 +18,4 @@ package() { install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf } -sha512sums="c9896d1c6c0e47d3a42702a65b73e168fd0998850011dca05129bfc2413d21c540a9704c6c05ceff4f74ac52b729f14609af28407f6f8e76fd3dd2fbf75c20df fontawesome-free-5.11.2-desktop.zip" +sha512sums="7f53e514b88d6ae952cee085ea811f83d1cbec8521996abd575508a1a2bea692039d7cbb0afbb9f336ea46453eb1f93241c57aac66be159f59c603e897ccb4d2 fontawesome-free-5.14.0-desktop.zip" diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD index c8c4c8739..4c9243a9b 100644 --- a/user/fonttosfnt/APKBUILD +++ b/user/fonttosfnt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fonttosfnt -pkgver=1.0.5 +pkgver=1.1.0 pkgrel=0 pkgdesc="Wrap X11 bitmap fonts in TrueType containers" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297 fonttosfnt-1.0.5.tar.bz2" +sha512sums="f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173 fonttosfnt-1.1.0.tar.bz2" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 8b7f57f3f..61acf6bce 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3aa3c8cd7d5c1b7d444be504fbf1d3ff3cabdd4c043d98436e82d57415c8d9f99158f90065cf3f06b007585dfd2d4a5a8ee978795f4f7285f0e50c52dc74e372 frameworkintegration-5.68.0.tar.xz" +sha512sums="2b3da662fcb4b7f64597c4d69d0f8988466353a5064ecae80a4f82bb6f8b3d8b849aef83dce83cf6fc53577f47daee345d439d761548ff0b5f16f38d0b762df0 frameworkintegration-5.72.0.tar.xz" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 3687b3cdc..d1827f3e4 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetds -pkgver=1.1.6 +pkgver=1.1.42 pkgrel=0 pkgdesc="Library for accessing Sybase and MS SQL Server databases" url="https://www.freetds.org/" @@ -13,6 +13,10 @@ subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.freetds.org/pub/freetds/stable/$pkgname-$pkgver.tar.gz fix-includes.patch" +# secfixes: +# 1.1.40-r0: +# - CVE-2019-13508 + build() { ./configure \ --build=$CBUILD \ @@ -36,5 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="fcd3ed52ffbf482535d8d343b2d45c999875d2bfcbf13ef72a15f4440c791ff138b839798bad05593428c0839981e667133473f7d76570e0de3ebf9e474ea632 freetds-1.1.6.tar.gz +sha512sums="af00e73e761efdd54511bbf98a4d4bd3929658eb56a5749f6266c55dd0ae1036e371ada95eee10705786de1c710e38f7550e9df0e45f50c086945a0df21121d7 freetds-1.1.42.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index cc04fd333..78c8d96ae 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetype -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz" +sha512sums="cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa freetype-2.10.2.tar.xz" diff --git a/user/fribidi/APKBUILD b/user/fribidi/APKBUILD index 39523b2db..224dfca76 100644 --- a/user/fribidi/APKBUILD +++ b/user/fribidi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fribidi -pkgver=1.0.8 +pkgver=1.0.10 pkgrel=0 pkgdesc="Free Implementation of the Unicode Bidirectional algorithm" url="http://fribidi.org" @@ -9,7 +9,7 @@ license="LGPL-2.1+" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.bz2" +source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.xz" build() { ./configure \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2 fribidi-1.0.8.tar.bz2" +sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz" diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index 14cafec71..5d8d8f7bd 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse3 _pkgname=fuse -pkgver=3.9.1 +pkgver=3.9.2 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -80,6 +80,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329 fuse-3.9.1.tar.xz +sha512sums="47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed fuse-3.9.2.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index bbc4eedc9..5dc8d6c74 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gcompat -pkgver=0.4.0 +pkgver=0.9.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" url="https://code.foxkit.us/adelie/gcompat" @@ -32,4 +32,4 @@ package() { make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } -sha512sums="32b4038a031b9af2d5febb547fe9268eb829f40bb2437c94afe5b939e06e7337448ad7f2dce34362829d19672ede54eec8fc34dc755736dbc76f347906ba5ead gcompat-0.4.0.tar.xz" +sha512sums="d19a1b450f84de80579ce562946ad3da155fa50c2c0642f4b94c8ec22517151493852888455f6d813529816d7518468ec7b5178bb536514045596700fd05738c gcompat-0.9.0.tar.xz" diff --git a/user/gitlab-runner/APKBUILD b/user/gitlab-runner/APKBUILD new file mode 100644 index 000000000..62c9ef24c --- /dev/null +++ b/user/gitlab-runner/APKBUILD @@ -0,0 +1,88 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=gitlab-runner +pkgver=12.1.0 +pkgrel=0 +_testver=91956efe +_branch="${pkgver%.*}" +_branch="${pkgver%%.*}-${_branch#*.}-stable" +pkgdesc="GitLab runner for CI/CD jobs" +url="https://docs.gitlab.com/runner/" +# golang.org packages do not support ppc32 +arch="all !ppc" +pkgusers="gitlab-runner" +pkggroups="gitlab-runner" +options="!check" # Tests require network (git cloning) +license="MIT" +depends="" +makedepends="gcc-go" +subpackages="$pkgname-openrc" +install="$pkgname.pre-install" +source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-runner-v$pkgver.tar.gz + https://dev.sick.bike/dist/gitlab-test-$_testver.tar.gz + $pkgname.confd + $pkgname.initd + clean-tmpdirs.patch + disable-crap.patch + gccgo.patch + posix-shell.patch + posix-shell-escape.patch + tests.patch + " +builddir="$srcdir/$pkgname-v$pkgver" + +unpack() { + default_unpack + mkdir "$builddir"/tmp + mv gitlab-test "$builddir"/tmp +} + +_make() { + make "$@" VERSION="$pkgver" REVISION="v$pkgver" BRANCH="$_branch" +} + +build() { + _make build_simple +} + +check() { + # Even with network access and a clean chroot, there are some + # tests that fail: + # + # gitlab.com/gitlab-org/gitlab-runner/commands/helpers : + # TestCacheArchiverAddingUntrackedFiles + # TestCacheArchiverAddingUntrackedUnicodeFiles + + # gitlab.com/gitlab-org/gitlab-runner/executors/shell : + # TestBuildWithGitStrategyFetchWithLFS + # TestBuildWithGitStrategyCloneWithLFS + # TestBuildWithSubmoduleLFSPullsLFSObject + # + # gitlab.com/gitlab-org/gitlab-runner/network (error: use of + # undefined type ‘RegisterRunnerParameters’) + _make test +} + +package() { + install -Dm755 out/binaries/gitlab-runner \ + "$pkgdir"/usr/bin/gitlab-runner + install -dm750 -g gitlab-runner \ + "$pkgdir"/etc/gitlab-runner + install -dm750 -o gitlab-runner -g gitlab-runner \ + "$pkgdir"/var/lib/gitlab-runner + + install -Dm644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname + install -Dm755 "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname +} + +sha512sums="1b3f06b7000252631bec04a58474dda826b0fb8d28c4144051a231fba5ef0c5c4b6e0f9ca6bdf9bf9b16b9117cbcf6385eb7bac85bda7b9f99de4300cbcc2066 gitlab-runner-v12.1.0.tar.gz +7bccab81aa1cb88c6a0f83a6d3dfc509e6f9ecb4d0168a5b30cc4e8fdd823294b95fe3633e09757905466f83bb3bf73b1d28fac475dff2dc3164604db4b5b995 gitlab-test-91956efe.tar.gz +f8a0c7e77cd563d7e5b4fb2319181ceab8de44c555cefa4803e985ad3ac6a9fea7bca469d80b28974edcfb65f2095d019bfdf0abd8a3221464276a8d89debc0d gitlab-runner.confd +7f785a65b46919f6a6695e25fdc414ee3204eb9aa1a3735e7884575434af94b20a48f2fe7a1fb787473de23a7bd2d56bc1e9c1fc6b522c6f0c05c47b3d37ab1c gitlab-runner.initd +f17a6b5053933d83d90272be7e98d4abf8d63e8a9c5ad30bbb61a29dbfa1e1b55421ba14be9f7db17cae30b2ff04efcb5da68543a2fa3d0e3e1882bc128cac06 clean-tmpdirs.patch +a32b7a6fa28c7f5bcb505308e615f17de179c15ce8c2ef73078143204195e36d99b18489114ce694c3d821378c1e9ccb26a999a50372b97df163e2512080f07e disable-crap.patch +4bc8f827cbcec212fcb1c5598aaf725138efa9a1de699d6261a65207cca7ef46f441edc02987efdd6d7c6e62943fda8f3f2a5a596d8d33b49fb78ba5df612e8b gccgo.patch +444adec507c5eebcfae268f2f475d29316119f30750f06877a91dff56942d0e4d34ed3011b774b0d7acd59acfe2ddbe75082b3cd5aebd72ddb4703fd083ad301 posix-shell.patch +05d12046448c79a12bf92974089ff97781304083f7bf35abb0b0c0f990c536bd6ff51652e16035a38e4ba5620dcad6e051ecdf4a80eb62039a15371073e525b5 posix-shell-escape.patch +dae9c3f86fdf21bd41202fc2c0bc7dd764078ea9215d7ddbac1f7bc47b0943f7a912250a3006122f74ed50052378ed2c946eefe5c1ce8400cd682b183221025a tests.patch" diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch new file mode 100644 index 000000000..89efd7a22 --- /dev/null +++ b/user/gitlab-runner/clean-tmpdirs.patch @@ -0,0 +1,21 @@ +Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978 + +--- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000 +@@ -7,6 +7,7 @@ import ( + "fmt" + "io" + "io/ioutil" ++ "os" + "path/filepath" + + "github.com/sirupsen/logrus" +@@ -216,6 +217,8 @@ func (e *executor) Cleanup() { + return + } + ++ defer os.RemoveAll(e.tempDir) ++ + // nothing to do, as there's no cleanup_script + if e.config.CleanupExec == "" { + return diff --git a/user/gitlab-runner/disable-crap.patch b/user/gitlab-runner/disable-crap.patch new file mode 100644 index 000000000..b375934fc --- /dev/null +++ b/user/gitlab-runner/disable-crap.patch @@ -0,0 +1,21 @@ +--- gitlab-runner-v12.1.0/main.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/main.go 2020-03-04 22:28:31.741878923 +0000 +@@ -11,18 +11,11 @@ import ( + "gitlab.com/gitlab-org/gitlab-runner/helpers/cli" + "gitlab.com/gitlab-org/gitlab-runner/log" + +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/gcs" +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/s3" + _ "gitlab.com/gitlab-org/gitlab-runner/commands" + _ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/custom" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker/machine" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/kubernetes" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox" + _ "gitlab.com/gitlab-org/gitlab-runner/shells" + ) + diff --git a/user/gitlab-runner/gccgo.patch b/user/gitlab-runner/gccgo.patch new file mode 100644 index 000000000..6c10893c7 --- /dev/null +++ b/user/gitlab-runner/gccgo.patch @@ -0,0 +1,68 @@ +* does not support -X ldflag: https://github.com/golang/go/issues/25183 +* does not support -cover testflag +* needs CGO to be enabled to build syscall module +* wants -gccgoflags, not -ldflags +* don't test stuff we've disabled + +--- gitlab-runner-v12.1.0/Makefile 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/Makefile 2020-04-26 23:58:20.823352305 +0000 +@@ -4,7 +4,6 @@ export VERSION := $(shell ./ci/version) + REVISION := $(shell git rev-parse --short=8 HEAD || echo unknown) + BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) + BUILT := $(shell date -u +%Y-%m-%dT%H:%M:%S%z) +-export TESTFLAGS ?= -cover + + LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) + export IS_LATEST := +@@ -45,14 +44,11 @@ export PATH := $(GOPATH_BIN):$(PATH) + + # Packages in vendor/ are included in ./... + # https://github.com/golang/go/issues/11659 +-export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/')) ++export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -ve '/vendor/' -e '/cache/gcs' -e '/cache/s3' -e '/docker' -e '/kubernetes' -e '/parallels' -e '/virtualbox')) + +-GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \ +- -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \ +- -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ +- -s -w ++GO_LDFLAGS ?= -s -w + GO_FILES ?= $(shell find . -name '*.go' | grep -v './.gopath/') +-export CGO_ENABLED ?= 0 ++export CGO_ENABLED ?= 1 + + + # Development Tools +@@ -114,7 +110,7 @@ build: $(GOX) + build_simple: $(GOPATH_SETUP) + # Building $(NAME) in version $(VERSION) for current platform +- go build \ +- -ldflags "$(GO_LDFLAGS)" \ ++ go build -v \ ++ -gccgoflags "$(GO_LDFLAGS)" \ + -o "out/binaries/$(NAME)" \ + $(PKG) + +@@ -123,7 +119,7 @@ build_current: helper-docker build_simpl + check_race_conditions: + @./scripts/check_race_conditions $(OUR_PACKAGES) + +-test: $(PKG_BUILD_DIR) helper-docker ++test: $(PKG_BUILD_DIR) + go test $(OUR_PACKAGES) $(TESTFLAGS) + + parallel_test_prepare: $(GOPATH_SETUP) +--- gitlab-runner-v12.1.0/common/version.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/version.go 2020-04-27 00:57:04.923408027 +0000 +@@ -9,9 +9,9 @@ import ( + ) + + var NAME = "gitlab-runner" +-var VERSION = "development version" +-var REVISION = "HEAD" +-var BRANCH = "HEAD" ++var VERSION = "12.1.0" ++var REVISION = "v12.1.0" ++var BRANCH = "12-1-stable" + var BUILT = "unknown" + + var AppVersion AppVersionInfo diff --git a/user/gitlab-runner/gitlab-runner.confd b/user/gitlab-runner/gitlab-runner.confd new file mode 100644 index 000000000..05a3ac1bb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.confd @@ -0,0 +1,17 @@ +#export CONFIG_FILE="/etc/gitlab-runner/config.toml" +#command_args="--working-directory /var/lib/gitlab-runner" +#logfile="/var/log/gitlab-runner.log" + +# Time to wait (in seconds) when gracefully stopping before forcefully +# stopping. +#timeout="300" + +# Time to wait (in seconds) when forcefully stopping the server before +# giving up. The runner can be a little slower than the OpenRC default +# of 5 seconds to stop when jobs are running. +#retry="60" + +# Run user service (default): +#command_user="gitlab-runner:gitlab-runner" +# Run system service: +#command_user="root:root" diff --git a/user/gitlab-runner/gitlab-runner.initd b/user/gitlab-runner/gitlab-runner.initd new file mode 100644 index 000000000..a5f65dacb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.initd @@ -0,0 +1,46 @@ +#!/sbin/openrc-run + +: "${CONFIG_FILE:=/etc/gitlab-runner/config.toml}" +: "${command_args:=--working-directory /var/lib/gitlab-runner}" +: "${logfile:=/var/log/gitlab-runner.log}" +: "${timeout:=300}" +: "${retry:=60}" +: "${command_user:=gitlab-runner:gitlab-runner}" +export CONFIG_FILE + +command="/usr/bin/gitlab-runner" +command_args="run --service ${RC_SVCNAME} ${command_args}" +command_background="true" +start_stop_daemon_args="--stdout ${logfile} --stderr ${logfile}" +pidfile="/run/${RC_SVCNAME}.pid" + +extra_started_commands="reload gracefulstop" +description_reload="Reload configuration" +description_gracefulstop="Finish current jobs, then stop" + +start_pre() { + checkpath -f -m 640 -o "${command_user}" "${logfile}" +} + +reload() { + ebegin "Reloading ${RC_SVCNAME} configuration" + start-stop-daemon --quiet --signal HUP --pidfile "${pidfile}" + eend $? +} + +gracefulstop() { + ebegin "Gracefully stopping ${RC_SVCNAME}" + mark_service_stopping "${RC_SERVICE}" + start-stop-daemon --quiet --progress --stop --pidfile "${pidfile}" \ + --signal QUIT --retry "${timeout}" + if eend $?; then + mark_service_stopped "${RC_SVCNAME}" + else + eerror "${RC_SVCNAME} timed out, forcefully stopping" + if stop; then + mark_service_stopped "${RC_SVCNAME}" + else + return 1 + fi + fi +} diff --git a/user/gitlab-runner/gitlab-runner.pre-install b/user/gitlab-runner/gitlab-runner.pre-install new file mode 100644 index 000000000..9ef046f29 --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r gitlab-runner 2>/dev/null +useradd -c gitlab-runner -s /sbin/nologin -g gitlab-runner \ + -d /var/lib/gitlab-runner -r gitlab-runner 2>/dev/null + +exit 0 diff --git a/user/gitlab-runner/posix-shell-escape.patch b/user/gitlab-runner/posix-shell-escape.patch new file mode 100644 index 000000000..b454141ed --- /dev/null +++ b/user/gitlab-runner/posix-shell-escape.patch @@ -0,0 +1,139 @@ +--- gitlab-runner-v12.1.0/helpers/shell_escape.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape.go 2020-04-26 23:12:59.813309281 +0000 +@@ -4,7 +4,6 @@ package helpers + + import ( + "bytes" +- "encoding/hex" + "strings" + ) + +@@ -13,35 +12,10 @@ import ( + */ + + const ( +- ACK = 6 +- TAB = 9 +- LF = 10 +- CR = 13 +- US = 31 +- SPACE = 32 +- AMPERSTAND = 38 + SINGLE_QUOTE = 39 +- PLUS = 43 +- NINE = 57 +- QUESTION = 63 +- LOWERCASE_Z = 90 +- OPEN_BRACKET = 91 + BACKSLASH = 92 +- UNDERSCORE = 95 +- CLOSE_BRACKET = 93 +- BACKTICK = 96 +- TILDA = 126 +- DEL = 127 + ) + +-// ShellEscape is taken from https://github.com/solidsnack/shell-escape/blob/master/Text/ShellEscape/Bash.hs +-/* +-A Bash escaped string. The strings are wrapped in @$\'...\'@ if any +-bytes within them must be escaped; otherwise, they are left as is. +-Newlines and other control characters are represented as ANSI escape +-sequences. High bytes are represented as hex codes. Thus Bash escaped +-strings will always fit on one line and never contain non-ASCII bytes. +-*/ + func ShellEscape(str string) string { + if str == "" { + return "''" +@@ -50,85 +24,20 @@ func ShellEscape(str string) string { + out := bytes.NewBuffer(make([]byte, 0, len(str)*2)) + i := 0 + l := len(in) +- escape := false +- +- hex := func(char byte) { +- escape = true +- +- data := []byte{BACKSLASH, 'x', 0, 0} +- hex.Encode(data[2:], []byte{char}) +- out.Write(data) +- } +- +- backslash := func(char byte) { +- escape = true +- out.Write([]byte{BACKSLASH, char}) +- } +- +- escaped := func(str string) { +- escape = true +- out.WriteString(str) +- } +- +- quoted := func(char byte) { +- escape = true +- out.WriteByte(char) +- } +- +- literal := func(char byte) { +- out.WriteByte(char) +- } + ++ out.WriteByte(SINGLE_QUOTE) + for i < l { + char := in[i] +- switch { +- case char == TAB: +- escaped(`\t`) +- case char == LF: +- escaped(`\n`) +- case char == CR: +- escaped(`\r`) +- case char <= US: +- hex(char) +- case char <= AMPERSTAND: +- quoted(char) +- case char == SINGLE_QUOTE: +- backslash(char) +- case char <= PLUS: +- quoted(char) +- case char <= NINE: +- literal(char) +- case char <= QUESTION: +- quoted(char) +- case char <= LOWERCASE_Z: +- literal(char) +- case char == OPEN_BRACKET: +- quoted(char) +- case char == BACKSLASH: +- backslash(char) +- case char <= CLOSE_BRACKET: +- quoted(char) +- case char == UNDERSCORE: +- literal(char) +- case char <= BACKTICK: +- quoted(char) +- case char <= TILDA: +- quoted(char) +- case char == DEL: +- hex(char) +- default: +- hex(char) ++ if (char == SINGLE_QUOTE) { ++ out.Write([]byte{SINGLE_QUOTE, BACKSLASH, SINGLE_QUOTE, SINGLE_QUOTE}) ++ } else { ++ out.WriteByte(char) + } + i++ + } ++ out.WriteByte(SINGLE_QUOTE) + +- outStr := out.String() +- +- if escape { +- outStr = "$'" + outStr + "'" +- } +- +- return outStr ++ return out.String() + } + + func ToBackslash(path string) string { diff --git a/user/gitlab-runner/posix-shell.patch b/user/gitlab-runner/posix-shell.patch new file mode 100644 index 000000000..6169c3ecc --- /dev/null +++ b/user/gitlab-runner/posix-shell.patch @@ -0,0 +1,30 @@ +--- gitlab-runner-v12.1.0/shells/bash.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash.go 2020-04-26 23:07:57.303304498 +0000 +@@ -102,12 +102,12 @@ func (b *BashWriter) Variable(variable c + } + + func (b *BashWriter) IfDirectory(path string) { +- b.Line(fmt.Sprintf("if [[ -d %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -d %q ]; then", path)) + b.Indent() + } + + func (b *BashWriter) IfFile(path string) { +- b.Line(fmt.Sprintf("if [[ -e %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -e %q ]; then", path)) + b.Indent() + } + +@@ -200,9 +200,10 @@ func (b *BashWriter) Finish(trace bool) + io.WriteString(w, "set -o xtrace\n") + } + +- io.WriteString(w, "set -eo pipefail\n") ++ io.WriteString(w, "set -e\n") + io.WriteString(w, "set +o noclobber\n") +- io.WriteString(w, ": | eval "+helpers.ShellEscape(b.String())+"\n") ++ io.WriteString(w, "(\nexec </dev/null\n") ++ io.WriteString(w, b.String() + "\n)\n") + io.WriteString(w, "exit 0\n") + w.Flush() + return buffer.String() diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch new file mode 100644 index 000000000..1aff6c653 --- /dev/null +++ b/user/gitlab-runner/tests.patch @@ -0,0 +1,63 @@ +--- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 +@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{} + writer.Command("foo", "x&(y)") + +- assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) ++ assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) + } + + func TestBash_IfCmdShellEscapes(t *testing.T) { + writer := &BashWriter{} + writer.IfCmd("foo", "x&(y)") + +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) ++ assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) + } +--- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 +@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 +@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 +@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { + in string + out string + }{ +- {"standard string", "$'standard string'"}, +- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, ++ {"standard string", "'standard string'"}, ++ {"+\t\n\r&", "'+\t\n\r&'"}, + {"", "''"}, + } + +--- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 +@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { + }, + jobTimeout: 3600, + waitForTerminalTimeout: time.Hour, +- expectedErr: "terminal disconnected by system signal: interrupt", ++ expectedErr: "terminal disconnected by system signal: Interrupt", + }, + { + name: "Terminal Disconnect", diff --git a/user/glew/APKBUILD b/user/glew/APKBUILD index e5f6c1b18..374a8d512 100644 --- a/user/glew/APKBUILD +++ b/user/glew/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glew -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" @@ -12,9 +12,7 @@ depends="" depends_dev="libxi-dev libxmu-dev mesa-dev" makedepends="$depends_dev glu-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz - mesa-compat.patch - " +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" prepare() { default_prepare @@ -30,5 +28,4 @@ package() { install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz -6598a3d8263b8e49ca45cea00fed6b6921b6e75ff120d7f4f86b6e181dd9c8d56d52d1664a1693cf807dda130cfebd1a9a0bf8b2edc02552c1831486378adf1a mesa-compat.patch" +sha512sums="57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 glew-2.2.0.tgz" diff --git a/user/glew/mesa-compat.patch b/user/glew/mesa-compat.patch deleted file mode 100644 index 14404ed30..000000000 --- a/user/glew/mesa-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d6c2c3b9ca52af697088f280c30fe5b27f7a694f Mon Sep 17 00:00:00 2001 -From: Deve <deveee@gmail.com> -Date: Wed, 14 Nov 2018 21:07:29 +0100 -Subject: [PATCH] Fixed compilation with current mesa versions. - -As you can see in -https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h -now the file uses __gl_glext_h_ instead of __glext_h_ -It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada ---- - auto/src/glew_head.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h -index 41e5a262..742f27f5 100644 ---- a/auto/src/glew_head.h -+++ b/auto/src/glew_head.h -@@ -14,7 +14,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -30,6 +30,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) ---- glew-2.1.0/include/GL/glew.h.old 2017-07-31 11:25:39.000000000 +0000 -+++ glew-2.1.0/include/GL/glew.h 2019-03-20 19:05:46.240000000 +0000 -@@ -93,7 +93,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -109,6 +109,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) diff --git a/user/glfw/APKBUILD b/user/glfw/APKBUILD new file mode 100644 index 000000000..7acd66438 --- /dev/null +++ b/user/glfw/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=glfw +pkgver=3.3.2 +pkgrel=0 +pkgdesc="OpenGL desktop development library" +url="https://www.glfw.org/" +arch="all" +options="!check" # Tests require X11, GL, and manual intervention. +license="Zlib" +depends="" +depends_dev="mesa-dev" +makedepends="$depends_dev cmake doxygen libx11-dev libxrandr-dev libxcursor-dev + libxi-dev libxinerama-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/glfw/glfw/releases/download/$pkgver/glfw-$pkgver.zip" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_SHARED_LIBS=ON \ + -DGLFW_BUILD_TESTS=OFF \ + -DGLFW_BUILD_EXAMPLES=OFF \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install + install -D -d "$builddir"/docs/html "$pkgdir"/usr/share/doc/$pkgname/ +} + +sha512sums="3084f405f6ecfa182df0841ffb44248b716fc03282afd8e6dc9a1361897fe62a1ce049b95f662d79aaae45aa52208bb552b8c649284f7f6d9c12623ac3728e60 glfw-3.3.2.zip" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index f07a9d235..e18329b26 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.62.1 +pkgver=2.62.4 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -28,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="6f9064d42d28b674dea0fb4ffcc954210aae92b7fcb7bcaae7a28a600b4a8782aed9077e61dd2a55ff0a8ade060c9a5556ba2e3bd2e697521f8d80bfdd241195 glib-networking-2.62.1.tar.xz" +sha512sums="cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a glib-networking-2.62.4.tar.xz" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index f0c35dca1..083aee633 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.62.5 +pkgver=2.62.6 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -13,6 +13,8 @@ depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" checkdepends="tzdata shared-mime-info" makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev + $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-gquark-fix-initialization-with-c-constructors.patch broken-gio-tests.patch @@ -22,7 +24,6 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve ridiculous-strerror-nonconformance.patch meson-sucks-and-i-hate-you-so-much-right-now.patch " -subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" # secfixes: # 2.60.4-r0: @@ -75,7 +76,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371 glib-2.62.5.tar.xz +sha512sums="8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5 glib-2.62.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/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index f847f2914..c54a49822 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.46 +pkgver=1.12.47 pkgrel=0 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea gnumeric-1.12.46.tar.xz" +sha512sums="f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab gnumeric-1.12.47.tar.xz" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index 3056c30a3..7f5fe77e4 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.19 +pkgver=2.2.21 pkgrel=0 pkgdesc="Complete and free implementation of the OpenPGP standard" url="https://www.gnupg.org/" @@ -52,7 +52,7 @@ package() { install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd gnupg-2.2.19.tar.bz2 +sha512sums="b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 gnupg-2.2.21.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 616793f57..e75b1d552 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,12 +2,11 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.11.1 +pkgver=3.6.14 pkgrel=0 pkgdesc="A TLS protocol implementation" -url="http://www.gnutls.org/" +url="https://www.gnutls.org/" arch="all" -options="!check" # https://gitlab.com/gnutls/gnutls/issues/560 license="LGPL-2.1+" makedepends="libtasn1-dev libunistring-dev nettle-dev p11-kit-dev texinfo unbound-dev cmd:which zlib-dev" @@ -23,11 +22,16 @@ case $pkgver in ;; esac source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz - gnulib-tests-dont-require-gpg-passphrase.patch" + gnulib-tests-dont-require-gpg-passphrase.patch + disable-certtool-test.patch + " # secfixes: # 3.5.13-r0: # - CVE-2017-7507 +# 3.6.14-r0: +# - CVE-2020-11501 +# - CVE-2020-13777 build() { LIBS="-lgmp" ./configure \ @@ -79,5 +83,6 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489 gnutls-3.6.11.1.tar.xz -abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" +sha512sums="b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 gnutls-3.6.14.tar.xz +abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch +25400be364c1f27b88451002a471cbf841b9738dd93c42dcbeaf7644c3deea6afc85300b40d5ae32d29dc4d441237e8b311f3e07f0af2fb4788701ee4e240c0f disable-certtool-test.patch" diff --git a/user/gnutls/disable-certtool-test.patch b/user/gnutls/disable-certtool-test.patch new file mode 100644 index 000000000..2ae16a38e --- /dev/null +++ b/user/gnutls/disable-certtool-test.patch @@ -0,0 +1,33 @@ +If GNUTLS_PIN is not available in the environment, the test will fail +because it cannot ask for the password: + +Generating a self signed certificate... +No PIN given. +note: when operating in batch mode, set the GNUTLS_PIN or GNUTLS_SO_PIN environment variables +cert generation failed +FAIL certtool (exit status: 1) + +The comment above this line says "some CI runners need GNUTLS_PIN +(GNUTLS_PIN=${PASS})" (i.e. GNUTLS_PIN=1234). When this is passed +instead, the test fails again because "No password was asked" (it greps +for "Enter password" in the output, but this won't happen because +GNUTLS_PIN is set). + +The folks at Nix believe this is an incompatibility due to musl's +getpass not falling back to stdin/stderr if it cannot connect to a tty, +as glibc does. + +https://gitlab.com/gnutls/gnutls/-/issues/945 + +--- gnutls-3.6.13/tests/cert-tests/certtool 2020-01-01 14:10:19.000000000 -0600 ++++ gnutls-3.6.13/tests/cert-tests/certtool 2020-06-02 20:36:20.380039844 -0500 +@@ -20,6 +20,9 @@ + + #set -e + ++echo 'this test is not compatible with musl' ++exit 77 ++ + srcdir="${srcdir:-.}" + CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" + DIFF="${DIFF:-diff -b -B}" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 6a60b2ce1..13ba8b6d4 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice -pkgver=0.10.46 +pkgver=0.10.47 pkgrel=0 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3 goffice-0.10.46.tar.xz" +sha512sums="0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76 goffice-0.10.47.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index d4973d5ff..0d9df9720 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5 granatier-19.12.3.tar.xz" +sha512sums="612395ddca651052a8ffae48a3e977780297c0ef397946705baf735cdf447a0a782c4a0299cab496332592d0aac33000de969978669c4b8122e2353429e17613 granatier-20.04.3.tar.xz" diff --git a/user/grantlee/APKBUILD b/user/grantlee/APKBUILD index b76b2d792..19d90c41f 100644 --- a/user/grantlee/APKBUILD +++ b/user/grantlee/APKBUILD @@ -2,14 +2,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grantlee pkgver=5.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="Qt string template engine based on the Django template system" url="https://github.com/steveire/grantlee/" arch="all" license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="cmake $depends_dev qt5-qtscript-dev doxygen graphviz" +makedepends="cmake $depends_dev qt5-qtscript-dev doxygen graphviz + qt5-qtdeclarative-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://downloads.grantlee.org/grantlee-5.2.0.tar.gz" diff --git a/user/grantleetheme/APKBUILD b/user/grantleetheme/APKBUILD new file mode 100644 index 000000000..6ac4749c7 --- /dev/null +++ b/user/grantleetheme/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=grantleetheme +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE Grantlee theme support library" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules grantlee-dev kauth-dev + kcodecs-dev kconfigwidgets-dev kcoreaddons-dev kguiaddons-dev ki18n-dev + kiconthemes-dev knewstuff-dev kservice-dev kwidgetsaddons-dev + kxmlgui-dev attica-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/grantleetheme-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4bf3dd73238fffa4db2c2ec8d619100570847684e2fc5ec84b2f23c651b505127cfa019d0a8ceb9f8b0237124f53007d7052d67d7476f0f43a51e29b92e787cf grantleetheme-20.04.3.tar.xz" diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 74e5b7032..3b02c91e9 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=graphite2 _realname=${pkgname%2} -pkgver=1.3.13 +pkgver=1.3.14 pkgrel=0 pkgdesc="Text processing engine for complex languages" url="http://graphite.sil.org/" @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir/" -C build install } -sha512sums="8e2c6047a66b4d8873842de6b9b1909d326512b47a04f483b3a6113b97fd0d47e0da7cf9ecf96e060ca06e5288b49f1300e2fd7165d2d82d6a8eb8cb7d53d33f graphite2-1.3.13.tar.gz +sha512sums="49d127964d3f5c9403c7aecbfb5b18f32f25fe4919a81c49e0534e7123fe845423e16b0b8c8baaae21162b1150ab3e0f1c22c344e07d4364b6b8473c40a0822c graphite2-1.3.14.tar.gz 4ef5414e6d554bb8d6ead435e38d061a073f350c313b7141158bb68332f5f57ca5250385875a387b828bb657964588e974143b96b5e11c2cd314871e7baddb88 graphite2-1.2.0-cmakepath.patch" diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index f02cec944..aa9e3e906 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=graphviz -pkgver=2.42.3 +pkgver=2.44.0 pkgrel=0 pkgdesc="Graph visualization software" url="http://www.graphviz.org/" @@ -19,7 +19,7 @@ install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" subpackages="$pkgname-dev $pkgname-doc guile-$pkgname:guile $pkgname-gtk $pkgname-graphs perl-gv:_pl py3-gv:_py3 tcl-$pkgname:_tcl" -source="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.42.3.tar.gz +source="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$pkgver.tar.gz $pkgname.trigger 0001-clone-nameclash.patch " @@ -106,6 +106,6 @@ _tcl() { _lang tcl "Tcl/Tk" } -sha512sums="e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 graphviz-2.42.3.tar.gz +sha512sums="9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752 graphviz-2.44.0.tar.gz 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" diff --git a/user/groff/APKBUILD b/user/groff/APKBUILD new file mode 100644 index 000000000..1045af000 --- /dev/null +++ b/user/groff/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=groff +pkgver=1.22.4 +pkgrel=0 +pkgdesc="GNU troff text-formatting system" +url="https://www.gnu.org/software/groff/groff.html" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="perl texinfo" +subpackages="$pkgname-doc" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" + +build () { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --without-x + # work around parallel build issue + make arch/misc && make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/lib/charset.alias + rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true +} + +sha512sums="1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d groff-1.22.4.tar.gz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 2c0cfdbc9..66488715d 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub pkgver=2.04 -pkgrel=3 +pkgrel=4 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -31,7 +31,6 @@ for f in $flavors; do done install="$pkgname.post-upgrade" -triggers="$pkgname.trigger=/boot" source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz adelie-branding.patch @@ -134,6 +133,10 @@ package() { install -Dm755 "$i" \ "$pkgdir"/etc/grub-quirks.d/"${i##"$srcdir"/quirk-}" done + + mkdir -p "$pkgdir"/etc/easy-boot.d + ln -s ../../usr/sbin/update-grub \ + "$pkgdir"/etc/easy-boot.d/50-grub } bios() { diff --git a/user/grub/grub.trigger b/user/grub/grub.trigger deleted file mode 100644 index eba13a458..000000000 --- a/user/grub/grub.trigger +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec update-grub diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index eaf6b74a3..46fd83a7e 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.34.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" @@ -37,4 +37,4 @@ dev() { } -sha512sums="6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 gsettings-desktop-schemas-3.34.0.tar.xz" +sha512sums="623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8 gsettings-desktop-schemas-3.36.1.tar.xz" diff --git a/user/gsm/APKBUILD b/user/gsm/APKBUILD index 493eac0a3..a11efa124 100644 --- a/user/gsm/APKBUILD +++ b/user/gsm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=gsm -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=0 _soname=1.0.12 pkgdesc="Shared libraries for GSM speech compressor" @@ -48,6 +48,6 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="c5b597f68d4a270e1d588f480dcde66fda8302564c687d753f2bd4fc41d246109243e567568da61eddce170f5232d869984743ddf1eea7696d673014a1a453b7 gsm-1.0.18.tar.gz +sha512sums="f69b4bf2d918b118b5de90b8ab88fd026008ac7432f07b872b81fe52cdc781f605dca8eedcdaebc8beb974cef388496c618f92a41961c62057009964159f8392 gsm-1.0.19.tar.gz 5b01f6d2fd3ee7cd859da70870463e2ccc6614c5fb1bd5efc88a223a0c5477271221557fef13ba46697e70cc5820c13efff738413f8990d5884b95cc89c30152 gsm-64bit.patch 1d92b7eacf52e5281c9f1a0f08313d10f15c35d22fb2292e5a885ceb3cb766557a5e3a08954db75fb13db59345ef9f6b08939881ba38c9d384e09a1c96b47bc5 gsm-makefile.patch" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 1f8b5e082..2b87ed367 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.13 +pkgver=3.24.21 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -48,4 +48,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406 gtk+-3.24.13.tar.xz" +sha512sums="97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e gtk+-3.24.21.tar.xz" diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index b3575c955..1d2720d7d 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -1,40 +1,36 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gucharmap -pkgver=12.0.1 -_unicode=12.1.0 +pkgver=13.0.2 +_unicode=13.0.0 pkgrel=0 pkgdesc="Unicode utility for the Gnome desktop environment" url="https://gnome.org" arch="all" license="GPL-3.0+" depends="" -makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev intltool - itstool libxml2-utils unicode-data" +makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev gtk-doc + intltool itstool libxml2-utils meson ninja perl unicode-data vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz - unicode-12.1.patch - " +source="https://gitlab.gnome.org/GNOME/gucharmap/-/archive/$pkgver/gucharmap-$pkgver.tar.gz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --with-unicode-data=/usr/share/unicode/$_unicode - make + -Ducd_path=/usr/share/unicode/$_unicode \ + . output + ninja -C output } check() { - make check + ninja -C output test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install } -sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz -aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f unicode-12.1.patch" +sha512sums="66918666607190f6a364b4709fbd51a08ada29986b549ae779452ec98eb4944d0969ad593296ac84cac8dc4791d718dd522add6cf475116765426505647971a9 gucharmap-13.0.2.tar.gz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index af6b363ae..e8a0a2f35 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gvim _pkgreal=vim -pkgver=8.2.0529 +pkgver=8.2.1382 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -71,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="73cd3eb1522189f603c65ef1e80c0d1c860ce7332817967ab289aa8f2fdf376235fc9c30af53a66164cfe83a882b55003b4073b27852061295ca9b5fe203501d vim-8.2.0529.tar.gz" +sha512sums="3e8a8cc5e566983fd1da3a9f4434b9c5b9dad91d08e807cb5b4b8f5029e201d3dd4bc2badc5cf6b1e41339fd6667cd91a6fb6c95a0914abe93b1e42fcec07fbd vim-8.2.1382.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index a9a767f1a..8d017e520 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0 gwenview-19.12.3.tar.xz" +sha512sums="c670111e75938028713ea77695bbe6fdd8e76d0dea74acc0cff3a20dd5a7ee4c956ef79b67c7ac8e99bb07b9895c16fcf985580d91442005451c6439f19726f1 gwenview-20.04.3.tar.xz" diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index f621148bd..4d525b242 100644 --- a/user/harfbuzz/APKBUILD +++ b/user/harfbuzz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net> # Maintainer: pkgname=harfbuzz -pkgver=2.6.4 +pkgver=2.6.7 pkgrel=0 pkgdesc="Text shaping library" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -53,4 +53,4 @@ icu() { mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ } -sha512sums="d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f harfbuzz-2.6.4.tar.xz" +sha512sums="6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de harfbuzz-2.6.7.tar.xz" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD index c3e631de2..10617286b 100644 --- a/user/haveged/APKBUILD +++ b/user/haveged/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=haveged -pkgver=1.9.8c +pkgver=1.9.13 pkgrel=0 pkgdesc="Entropy harvesting daemon using CPU timings" url="http://www.issihosts.com/haveged/" @@ -41,6 +41,6 @@ package() { "$pkgdir"/etc/conf.d/haveged } -sha512sums="24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa haveged-1.9.8c.tar.gz +sha512sums="dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576 haveged-1.9.13.tar.gz 5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd 58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 4670ecd7f..c71c13969 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.54 +pkgver=3.57.1 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -11,7 +11,7 @@ license="GPL-3.0+" depends="" makedepends="boost-dev lua5.3-dev" subpackages="$pkgname-doc" -source="http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2" +source="http://www.andre-simon.de/zip/$pkgname-$pkgver.zip" build() { make cli @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5a0982e9cd5c48d1ffa3ce2286020c1285eacf32928b08e3718582f4d131b05726920156c4357e595403474d4c389fc70e2aff789e17962963b9d8d23ac6488 highlight-3.54.tar.bz2" +sha512sums="c73d76005b08a4b04b73c005c7f6c45d173be39e7324e073f2a451e686a1104e164f981dba2431fea6b9b05ce3086f4ffb02f95fb0b20608f9da5015e9c383fe highlight-3.57.1.zip" diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD new file mode 100644 index 000000000..dcc9d9bf7 --- /dev/null +++ b/user/horizon/APKBUILD @@ -0,0 +1,149 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=horizon +pkgver=0.9.3 +pkgrel=0 +pkgdesc="Installation tools for Adélie Linux" +url="https://horizon.adelielinux.org/" +arch="all" +options="!archcheck !check" # Unpackaged dependency ruby-aruba. +license="AGPL-3.0+" +depends="" +checkdepends="ruby-aruba ruby-rspec valgrind" +# Second group is the Qt5 UI deps. +makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev + linux-headers parted-dev skalibs-dev util-linux-dev + + libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" +subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 + $pkgname-tools $pkgname-wizard $pkgname-boot" +source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DBUILD_TOOLS=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DINSTALL=ON \ + ${CMAKE_CROSSOPTS} \ + -Bbuild + make -C build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=False \ + -DBUILD_TOOLS=OFF \ + -DBUILD_UI=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DINSTALL=OFF \ + ${CMAKE_CROSSOPTS} \ + -Bbuild-wizard + make -C build-wizard +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +image() { + pkgdesc="Tools for generating images using HorizonScript" + depends="mtools" + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/lib + mkdir -p "$subpkgdir"/usr/share/horizon + + mv "$pkgdir"/usr/bin/hscript-image "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/lib/libhi-backends.so "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/horizon/iso "$subpkgdir"/usr/share/horizon/ +} + +qt5() { + pkgdesc="Qt 5 installation wizard for Adélie Linux" + depends="horizon" + mkdir -p "$subpkgdir"/etc/horizon + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/var/log/horizon + + for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do + mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/ + done +} + +tools() { + pkgdesc="Tools for authoring HorizonScript files" + mkdir -p "$subpkgdir"/usr/bin + + for _bin in hscript-fromjson hscript-simulate hscript-validate; do + mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/ + done +} + +wizard() { + pkgdesc="Wizard to generate a HorizonScript for another computer" + + make DESTDIR="$subpkgdir" -C "$builddir"/build-wizard install + rm -r "$subpkgdir"/usr/include + rm -r "$subpkgdir"/usr/lib + rm -r "$subpkgdir"/usr/share +} + +boot() { + pkgdesc="Boot to Horizon" + depends="horizon-qt5 horizon kwin qt5ct sddm + netsurf partitionmanager xterm" + + mkdir -p "$subpkgdir"/etc/profile.d + mkdir -p "$subpkgdir"/etc/sddm.conf.d + mkdir -p "$subpkgdir"/etc/xdg/qt5ct + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/share/qt5ct/qss + mkdir -p "$subpkgdir"/usr/share/xsessions + + cat >"$subpkgdir"/etc/profile.d/horizon-qt5.sh <<PROFILE +#!/bin/sh +export QT_QUICK_BACKEND=software +export QT_QPA_PLATFORMTHEME=qt5ct +PROFILE + chmod 755 "$subpkgdir"/etc/profile.d/horizon-qt5.sh + cat >"$subpkgdir"/etc/xdg/kdeglobals <<GLOBALS +[General] +ColorScheme=Steel + +[Icons] +Theme=Papirus + +[WM] +activeBackground=104,0,0 +GLOBALS + + install -D -m644 "$builddir"/boot/horizon.sddm.conf \ + "$subpkgdir"/etc/sddm.conf.d/horizon.conf + + install -D -m755 "$builddir"/boot/start-horizon-qt5 \ + "$subpkgdir"/usr/bin/start-horizon-qt5 + + install -D -m644 "$builddir"/boot/kwinrc \ + "$subpkgdir"/etc/xdg/kwinrc + + install -D -m644 "$builddir"/boot/qt5ct.conf \ + "$subpkgdir"/etc/xdg/qt5ct/qt5ct.conf + install -D -m644 "$builddir"/boot/horizon.qss \ + "$subpkgdir"/usr/share/qt5ct/qss/horizon.qss + + install -D -m644 "$builddir"/boot/horizon-session.desktop \ + "$subpkgdir"/usr/share/xsessions/horizon.desktop +} + +sha512sums="99c1d939abc33c4a072712e75c6c8ada16deb1fe59b9da839dffd695a0d40dbf48499cc00751285300127a7fc701e8e1c434e9f8a222f1981ccbebd6ee72e43e horizon-0.9.3.tar.xz" diff --git a/user/horizon/fix-qt-runner.patch b/user/horizon/fix-qt-runner.patch new file mode 100644 index 000000000..39cab1181 --- /dev/null +++ b/user/horizon/fix-qt-runner.patch @@ -0,0 +1,25 @@ +From 9f737dbab8b9ed9fa57bdf15542cc00a8363d98b Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 4 Jun 2020 21:29:37 -0500 +Subject: [PATCH] Qt UI: Ensure log is opened when built in release modes + +--- + ui/qt5/runner/executepage.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/qt5/runner/executepage.cc b/ui/qt5/runner/executepage.cc +index 999731a..d5788df 100644 +--- a/ui/qt5/runner/executepage.cc ++++ b/ui/qt5/runner/executepage.cc +@@ -48,7 +48,7 @@ ExecutePage::ExecutePage(QWidget *parent) : HorizonWizardPage(parent) { + }); + + log.setFileName("/var/log/horizon/executor.log"); +- Q_ASSERT(log.open(QFile::Append)); ++ log.open(QFile::Append); + + this->current = Prepare; + markRunning(this->current); +-- +2.25.4 + diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index af90a5f0e..cc6281b98 100644 --- a/user/http-parser/APKBUILD +++ b/user/http-parser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=http-parser -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -11,7 +11,9 @@ depends="" depends_dev="" makedepends="$depends_dev" subpackages="$pkgname-dev" -source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz" +source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz + remove-bogus-sizeof-test.patch + " build() { make @@ -25,4 +27,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b http-parser-2.9.3.tar.gz" +sha512sums="b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd http-parser-2.9.4.tar.gz +aaf666728ab860a19398a631276d7caaf696d29bfbce39408bbcd65775f23d452e477af481333631b8dd07eacb8ba44fb4c58d1216dc5fb0dfac88062c7f478b remove-bogus-sizeof-test.patch" diff --git a/user/http-parser/remove-bogus-sizeof-test.patch b/user/http-parser/remove-bogus-sizeof-test.patch new file mode 100644 index 000000000..5f912fb5b --- /dev/null +++ b/user/http-parser/remove-bogus-sizeof-test.patch @@ -0,0 +1,14 @@ +Upstream issues: +https://github.com/nodejs/http-parser/issues/507 +https://github.com/nodejs/http-parser/pull/510 + +--- http-parser-2.9.4/test.c 2020-03-24 05:54:06.000000000 -0500 ++++ http-parser-2.9.4/test.c 2020-06-15 22:54:06.020315073 -0500 +@@ -4221,7 +4221,6 @@ main (void) + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); + + //// API + test_preserve_data(); diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 7cf320dd9..875d58a01 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.17.1 +pkgver=4.18.2 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -41,7 +41,7 @@ package() { install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f i3-4.17.1.tar.bz2 +sha512sums="997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc i3-4.18.2.tar.bz2 6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 51804b714..b8a4dbf04 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=icewm -pkgver=1.6.5 +pkgver=1.7.0 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be icewm-1.6.5.tar.lz" +sha512sums="1b0faed0e9ead837dcb0d3ce91ad5248d7fca5ad48455c838700c66482a3373bb4e552dbc252b93b0a5613d53e2663cea756e64b3f3fb073d9ba2797e2b69601 icewm-1.7.0.tar.lz" diff --git a/user/ikona/APKBUILD b/user/ikona/APKBUILD new file mode 100644 index 000000000..c70ad2e59 --- /dev/null +++ b/user/ikona/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ikona +pkgver=1.0 +pkgrel=0 +pkgdesc="Icon preview utility" +url="https://kde.org/applications/graphics/org.kde.Ikona" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kconfigwidgets-dev ki18n-dev kirigami2-dev rust cargo + cairo-dev gdk-pixbuf-dev pango-dev" +subpackages="$pkgname-lang $pkgname-bash-completion:bashcomp:noarch + $pkgname-fish-completion:fishcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch" +source="https://download.kde.org/stable/ikona/$pkgver/ikona-$pkgver.tar.xz + https://download.kde.org/stable/ikona/1.0/ikona-1.0.cargo.vendor.tar.xz + " + +unpack() { + default_unpack + mv "$srcdir"/ikona-1.0.cargo.vendor.tar.xz \ + "$builddir"/ikona.cargo.vendor.tar.xz +} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +bashcomp() { + pkgdesc="$pkgdesc (Bash completions)" + mkdir -p "$subpkgdir"/etc + mv "$pkgdir"/etc/bash_completion.d "$subpkgdir"/etc/ +} + +fishcomp() { + pkgdesc="$pkgdesc (Fish completions)" + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/fish "$subpkgdir"/usr/share/ +} + +zshcomp() { + pkgdesc="$pkgdesc (Z shell completions)" + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/ +} + +sha512sums="30bde3f3b062ccf661ee8950c762412a6b9eebff625216641607cbae7f7f8123702c231cbce82acfb666a8b69c863e4b22e8daf79d1541b7c70781189ffee144 ikona-1.0.tar.xz +3bca0c7b66e603e7e06e0ac30c0cdb3d8c3baa812e600f322ef56a0be1692e57cc39348f1c40fdcfe07da6d4b624604cec0003f0d7e1be419462fff5832cd301 ikona-1.0.cargo.vendor.tar.xz" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index f167ef0c3..a3b265ee5 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.7 +pkgver=3.8.1 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -28,8 +28,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-profiling + --infodir=/usr/share/info make } @@ -46,7 +45,7 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="9b8d1ac6bdebb00e38e196db9a71ae6ff3b8b763cd4b1336d078c31f6d0a5ab53bbe70ba949c601af5efe674dbd032ed5d58a761d5159dae4e50122b68a8f086 iperf3-3.7.tar.gz +sha512sums="0b80849d7705277f63982bbf7a1c159cd9eed65fc89e5f0d443364e8ada7ed0e670c8747a8c5464c3425c134c19ac8bb6b028867f892e70201d4450c7c5a033e iperf3-3.8.1.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd 126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD index 3c470fda1..4cf764bad 100644 --- a/user/iptables/APKBUILD +++ b/user/iptables/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Molly Miller <adelie@m-squa.red> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: pkgname=iptables -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="https://www.netfilter.org/projects/iptables/index.html" @@ -60,7 +61,7 @@ package() { install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables } -sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2 +sha512sums="6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8 iptables-1.8.5.tar.bz2 726dfa1aa598d9dff802b99347138c861703b3dd28b2721a6b79b12f87d988369d3b4b9daee7cb2f9a930daac8921600de1e5342a347b3eae3791f0b9f0acbeb iptables.initd cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 896a990a4..81721b787 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.4 +pkgver=4.5.0 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url="https://salsa.debian.org/iso-codes-team/iso-codes" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" +sha512sums="49ad3fad7ab7e489df9fd421a582e09fb116149af7e409d7b592704c95c50e2043880791403f20978f9027c2875ea57dec04c4fe5bdf623c7544edae3f90a084 iso-codes-iso-codes-4.5.0.tar.bz2" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index 5b922eb90..51d8a3e6e 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: pkgname=isync -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2 isync-1.3.1.tar.gz" +sha512sums="9b45a7e80dca938329d4bf40996ddbaa008c1fb5a0ac2a7f6277ce78a86fd320083cd96041f6aa8e223b48e17e8b8dd9c5666e989e953a4cd7bc970c84763cba isync-1.3.2.tar.gz" diff --git a/user/jansson/APKBUILD b/user/jansson/APKBUILD index b6f332c62..0d583f27f 100644 --- a/user/jansson/APKBUILD +++ b/user/jansson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=jansson -pkgver=2.12 +pkgver=2.13.1 pkgrel=0 pkgdesc="C library for encoding, decoding and manipulating JSON data" url="http://www.digip.org/jansson/" # No HTTPS @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb jansson-2.12.tar.gz" +sha512sums="e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192 jansson-2.13.1.tar.gz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index ed6cdf89f..8874668e0 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcompletion-dev kcrash-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kdoctools-dev kio-dev kjobwidgets-dev ktextwidgets-dev knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev - kwindowsystem-dev taglib-dev phonon-dev" + kwindowsystem-dev taglib-dev phonon-dev kitemmodels-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb juk-19.12.3.tar.xz" +sha512sums="ae0b998856129548b99abd5d9567fbec79a7760e9898a58c5d0334e2be2c8e54fc2dfb13ebadaf77aeea86ee3cea4677319a7a11f048b84322171580853ec562 juk-20.04.3.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 5c8cc99c9..28bced096 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ba4241d0aa0b76639d7d7231ef3cf6f38db710dc6df8d9553242c1faac40839853437710cfcfb1f246c68e7e26a4fe887eb5b058421798e885b43777b0360be9 kactivities-stats-5.68.0.tar.xz" +sha512sums="e3a7d4921a05b3e240f3ab526480d573ee397d0c363513d152e5165372d9841d7797d804bb44dadb3f594dd1a0276f73e6fc8e54745c32f18a076eee6d635f4c kactivities-stats-5.72.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index cbe2c27f1..9580aa2c1 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="1490834305965cff0c8ddc4e38be4960a88266f10806478e41cd976f0461a83ae4b6a4e9f3566fd90d5afcf3f38a291609179bea0781b939831ce8f788acc552 kactivities-5.68.0.tar.xz" +sha512sums="cf9642e2d1c9cb932eda588e2d1c32c654b467f5ce17af78b93d951a5a4315427f18ccca4c270cb5141298345eeb47d677333f88cc69df68301922f5db95bb5a kactivities-5.72.0.tar.xz" diff --git a/user/kaddressbook/APKBUILD b/user/kaddressbook/APKBUILD new file mode 100644 index 000000000..95ec26d52 --- /dev/null +++ b/user/kaddressbook/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kaddressbook +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE contact manager" +url="https://kontact.kde.org/components/kaddressbook.html" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules akonadi-dev boost-dev + akonadi-contacts-dev akonadi-mime-dev akonadi-search-dev gpgme-dev + grantlee-dev grantleetheme-dev kauth-dev kcalendarcore-dev + kcmutils-dev kcodecs-dev kcompletion-dev kconfigwidgets-dev + kcontacts-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev + kimap-dev kio-dev kitemmodels-dev kitemviews-dev kjobwidgets-dev + kmime-dev kontactinterface-dev kparts-dev kpimtextedit-dev kservice-dev + kdepim-apps-libs-dev kuserfeedback-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev libkdepim-dev libkleo-dev pimcommon-dev + prison-dev solid-dev sonnet-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kaddressbook-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="3b9d3f17a73c5687a30b10909004aa9c6ed52210808cb147badae4bc07046cac44b0ae2f64e8c950344e755afe3da0f402fb3ed6688d825d99d5e0faf160df5a kaddressbook-20.04.3.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 319d4fec1..b83781b70 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab kalgebra-19.12.3.tar.xz" +sha512sums="215218105cb7fe76da3439aabfbdc97c1c5ab396aab21e9dfd8cc8d91c897d2fc94db06e405a44e45710e2d4211049b084306fb85595aaa84443828f8258acb0 kalgebra-20.04.3.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 9d5e3cb16..87fb05861 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b kalzium-19.12.3.tar.xz" +sha512sums="fa8f67128d35faa8bdc343cf425aedda8a9370584bdeb69e22ca229c0c1029a5d178f851d4131bd60c635d8d846c8bf1e9104fc030fddb15578ead4c2cba7ea0 kalzium-20.04.3.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD index 649746130..13942f444 100644 --- a/user/kamera/APKBUILD +++ b/user/kamera/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kamera -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Digital camera support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da kamera-19.12.3.tar.xz" +sha512sums="56393780a07c72c069595188a56eb449873683942a404343336a36c598036b4a339795af8441c073b2a9a5b5145b913ed19d0f7f19933cf999d87886e9aa5592 kamera-20.04.3.tar.xz" diff --git a/user/kamoso/APKBUILD b/user/kamoso/APKBUILD new file mode 100644 index 000000000..e87d3f305 --- /dev/null +++ b/user/kamoso/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kamoso +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE camera software" +url="https://kde.org/applications/multimedia/org.kde.kamoso" +arch="all" +license="GPL-2.0+" +depends="gst-plugins-base qt5-qtgraphicaleffects qt5-qtquickcontrols + qt5-qtquickcontrols2" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kauth-dev kcodecs-dev kcompletion-dev kconfig-dev kconfigwidgets-dev + kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev kitemviews-dev + kjobwidgets-dev knotifications-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev purpose-dev solid-dev gstreamer-dev + gst-plugins-base-dev kirigami2-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kamoso-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7da5f635cd5744215e7d3c3332729c149786b10a50ecb6c1e63843da8756da2dd2b355b837d24bed670c52990c7f5322b52d703ca61c5c6ec87d89de04458e80 kamoso-20.04.3.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index d2d98aa08..43a7ece1d 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0 kanagram-19.12.3.tar.xz" +sha512sums="e25f5bd4724b8f55ccf6b1fc71ab614ed7cb813c6558abafb0c1cfcc002d04edee856667f361c1a23b1297fc71b70af28069f320bab923403dcd56b48e2143a2 kanagram-20.04.3.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index cc65b5056..0837f3941 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34 kapman-19.12.3.tar.xz" +sha512sums="1b291f4ab39e5f0fd3e0624bf65afc2fc1fb5990ce73cc90a2737fa8fd420d6d9692a64c75d15b6710d62e81045e41751e14cef5a9907a86b92e00bf93399c8a kapman-20.04.3.tar.xz" diff --git a/user/kapptemplate/APKBUILD b/user/kapptemplate/APKBUILD new file mode 100644 index 000000000..b5cd35203 --- /dev/null +++ b/user/kapptemplate/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kapptemplate +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE application code template generator" +url="https://kde.org/applications/development/org.kde.kapptemplate" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules karchive-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev + ki18n-dev kio-dev kjobwidgets-dev kservice-dev solid-dev kauth-dev + kcodecs-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kapptemplate-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="29d5be322cee268e308513c2080eb8b87cec251fa09bc8ff9aaf9705126c69a9bc8a7173fa96397125c5190f6ec8f8a46d460093a666ffeeb7aa5d74be5f041b kapptemplate-20.04.3.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 6760b73cf..74bf7a2b8 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0d14773c4eb27281178d5f00f789256cc44aab057bc20239237a0031750d82765a7afae7cd804b200f713a8f93cd95f5a78828641a748e9b38a6d3c84aff3cc karchive-5.68.0.tar.xz" +sha512sums="d6ac7a618182467975c26ba4a5294c2500e4216e9fa8c6d0be89a5ef0c2ef4573e7ef5dadd3ab01f1e3e378c2a5031fd6bbca39b17aa17baac3fa8892e2c5d32 karchive-5.72.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index d9df73288..e55886e1f 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -85,4 +85,4 @@ kwrite_lang() { done } -sha512sums="aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817 kate-19.12.3.tar.xz" +sha512sums="b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9 kate-20.04.3.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 24acd289a..2d1f22e2f 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411 katomic-19.12.3.tar.xz" +sha512sums="757d63edb5541ad8cf8524b7bfcd9f42c9ee0b5ceb3fd90120442a8ca58c40779ac0c53f0c66f238c46d7917590cdc2d7c18e5a8a8126b8271c5b68b680f3370 katomic-20.04.3.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 525a86fd4..fcfb6079a 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="006ed4eb03276546f99525ede235e721ea4092da3b00735afe2f06f35c146d6a75b64e3e1b872feb6f1a986680ae6415f0d4a3dbdf4ecad07d94aaac1061d605 kauth-5.68.0.tar.xz" +sha512sums="e6b3ed0de6aa9537f0fb6630857b2f61fada3643f49fd4797366a6fa2c554fdaf10bb513245bac95dce3d73feabc8728ef01567cea26ff707622a876e8af4d90 kauth-5.72.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 1dd52516e..11a1d7779 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43 kblackbox-19.12.3.tar.xz" +sha512sums="2b97dab5f04807f03d84fa9a5611b3bbe733db71cc88ef4bb240d67419eb0645cfd5ac7ba46ca25b71d3f8bb5862134b9c5b2d96ca8f763cfc32312a3b4a3399 kblackbox-20.04.3.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index e89b067ee..a8e13d581 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6 kblocks-19.12.3.tar.xz" +sha512sums="9179ef69c21fcbf7e6c1071f34d1ff93045f4fe16f50db42a88a116c49f30acfaa16e7e78b3731be584de76d1907208d050fbef9b246602efdc48038ed8a8671 kblocks-20.04.3.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 396ce7df1..0b0790980 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56712cd6312d534f33459c18b05f12141546df82a1c1a822a74ddfbde515fc4c67b7d66a6dbd0b7221808d714e2d8c0f72d18f6857ea624bb6a768b9ffffde7e kbookmarks-5.68.0.tar.xz" +sha512sums="67311098678fc670fbadecf0a0f49d97e43d650196600c9d24d3c998785b0bdf72e622ed99d2adc4450ebb6c9df2e3ee25a8d2a3586ef09a119864fac375b431 kbookmarks-5.72.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 88d847de4..09a9973bd 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79 kbounce-19.12.3.tar.xz" +sha512sums="9391502dc08513036fa5dcdb571fd14596f6d143dd72231b1f8c9d23862cc216f3ba9468dbf9cd57cea5ab13af5673557221bb0bf65bb69c65ba43d4f12be140 kbounce-20.04.3.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index f416cc759..5e54bf9aa 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d kbreakout-19.12.3.tar.xz" +sha512sums="70005972ae58e9571dde11f68d4874ab65d934cd905786cf537cd3ac29c19a1bba29d4c5a79963d258a81f51926e2e5de543dd9152cdf5c4758f0003004a7119 kbreakout-20.04.3.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 927ebda72..b4cf2c7cd 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61 kbruch-19.12.3.tar.xz" +sha512sums="2cfb9bdac40fc025ddb87429f3bc6d79f8797be699761378bb23067bfe84ecfd5d9f05d51c4afa0e2e962370e2c588ff7b50483fb7e14f6283ec747784f8c6b8 kbruch-20.04.3.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 8c547e6d5..e140c7f41 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.12.3 -pkgrel=0 +pkgver=20.04.3 +pkgrel=1 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" arch="all" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013 kcachegrind-19.12.3.tar.xz" +sha512sums="d7d6f224293cfea1282d97fea543c22b235386e63633765b6c6431c586d24948f70df11478d2f1bf96b6f1b03585fa20f03461b7f24898435c6d266311d061e9 kcachegrind-20.04.3.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index da3c019b0..42780bcfa 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb kcalc-19.12.3.tar.xz" +sha512sums="dcc6765a8e0341f833e147015d1f6547adbe21eba6fe2bb7233bb717c29bc97115772001a7d7c654297b884ec7cd08373371d26ff60a50d2c4d527ebc0cf538e kcalc-20.04.3.tar.xz" diff --git a/user/kcalendarcore/APKBUILD b/user/kcalendarcore/APKBUILD index 23cf88fa2..c51eb43b0 100644 --- a/user/kcalendarcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalendarcore -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="256bcd4bbc0c3f2d53d05503955de505d937011fcc88006e1c52aaec9b8780e52ec18d229a4ce751df41c7ca2ddac07ba56cb5b743807a034fe7fb3f62dd7d0e kcalendarcore-5.68.0.tar.xz" +sha512sums="a25306ac357282c27a38ecb32ed3687ad259bf814bc67104c66a750fe4c6e76522fdc670e9237b1102f05b38685c8654688ff6a35cb8f8cbb84fc07a3d5cb626 kcalendarcore-5.72.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 4d903a763..b34bb275e 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006 kcharselect-19.12.3.tar.xz" +sha512sums="f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998 kcharselect-20.04.3.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index 8d3e41c5c..cc68d5c4d 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" arch="all" +options="!check" # Test suite requires running X11 session. license="LGPL-2.1-only AND LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kitemviews-dev kservice-dev @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d930874680c489465e72fd4fc7d0d920dfccccbe6e05213c654055d726bea8add2745ffe230ba2a3895dca860c4d93b0039ebe7db6397fb8c53b3c5f6edb7812 kcmutils-5.68.0.tar.xz" +sha512sums="7709e077b93999df5f3abca570a6f75f6866e70ca666dae02220b12daf92f0dfe06fa1f2bd62333e63e45472e6a0094d59df7d8b8b4b69bc37d8d8c4396d34fd kcmutils-5.72.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 446bcca99..d54696e0a 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" # secfixes: -# 5.68.0-r0: +# 5.72.0-r0: # - CVE-2013-0779 build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1edf80355d7d986338adfaff3067b0acd80d0fca47c7c81db0c510b1d32acb6ba8dcea33bd577a8ff0da60c4b4e8812c6981948a1eda84ce1acd8a05c87cd67d kcodecs-5.68.0.tar.xz" +sha512sums="39e902a8e0b3485dd0d146f2af0d6b166c8373015ec6c7baed53ceea67285f64d95368eebf302a153e916338f53a1357ea88f9ff3940d90f6953daf9afbbf2f9 kcodecs-5.72.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 2dc03be53..3a9036c79 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca kcolorchooser-19.12.3.tar.xz" +sha512sums="21ceff866c4658be0672625e9f3143d47a1ca0afd08e82db4a2648e8369522c4746b762db1e36c9da462ab109d7c55184dcd59c99843b52bc9c6a2f8cd031909 kcolorchooser-20.04.3.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index d0363ad66..db9a15b3c 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05c434549610404a8a9972fa88dd33245ec9b6e9b402a3602e2081b3ca3692127993307ceb56f8790b91d0a990a2241cf1258a54e316dedef1980b72741cb62e kcompletion-5.68.0.tar.xz" +sha512sums="8273b4130d7d4deb8f92baf1759af8ad3fa25d692d99530a2149c035c578dc6109da9cc6ff5c2860cacf3b2cbcd48710135430a96bcb3a66e4df2ae74bf90337 kcompletion-5.72.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 6e118e487..34b97505b 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670 kconfig-5.68.0.tar.xz" +sha512sums="951e3efb9eb229337cce55a00e9a22688548d448fd65007bfe413eb8af98cf18faa3e825c572d50ae0d0ee760e692532055f5ed018d2f9d9ecff70acf7bf1069 kconfig-5.72.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index ab6e3b9c8..de6095577 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6 kconfigwidgets-5.68.0.tar.xz" +sha512sums="07ec3af4df3837549bdda248ee1db217d5423bd823355c09517bb08f2531e6358f08b2a8bdcbdf7f637fc306cd929cf124a56c1a4eef4e0daba3c8be813f3857 kconfigwidgets-5.72.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 1fe5bd35c..777362891 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=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59734f680473ba97bae3406c04f9859997ddb29233d1870865c7f147b7271b7a3dde6ed05bf4cc8ebabd7639c8492bae1f8bab38437c3947495f3bc50190341f kcontacts-5.68.0.tar.xz" +sha512sums="00a6331db40c315ae503dc84ddbf1a14e729925ab69f387d11ffa2669108ffa03d0494513d419f5006d4e99cff244acf519fd7f40311cc3e73995d8d029cd2e9 kcontacts-5.72.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index f6c1ce99e..12231fb2a 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8 kcoreaddons-5.68.0.tar.xz +sha512sums="ad984361399bd147dc9f67e1abcd5f648e1f2dea29e874fc74a239da4fb9ddc6c05f8a3d224004845f828a2ac60ae67caa36d7ba9c356d3c38873abcbad0c20b kcoreaddons-5.72.0.tar.xz d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 04bbc7458..ae6d7438a 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a26607886537a2d6259c624907e0e5db133f58f0a55ea47845a83e4aa07c86be7f8030a21afddddef58cdac82ca42bed0c288737aaf57d424c6bf67916782811 kcrash-5.68.0.tar.xz" +sha512sums="10e51007f6fa16bcf7e4e34d555c59ef613ca5237447212190e47e5accca598f4f2f0ac7945fc86f0992ec95712446df47399aff39aebfc7f791c9b05c4cd628 kcrash-5.72.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index d4d6a1ede..6fcb13e79 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9d8be0a886037ce4804cbf6a3603350d08f805fac04b5ec5a5007e8ae01300e7cef7161ea13715e87bba544bf32062cc15f77a7890c3ca5699a59b7c5f11bd7 kdbusaddons-5.68.0.tar.xz" +sha512sums="d7183b08a0d35d0ecaddd98bd7fe39924d77af8ebf0040f50090a82097f5e56f8fa5c55f5b2deff05ab040624074eac3fbd71459f79245ee148d705a058f2239 kdbusaddons-5.72.0.tar.xz" diff --git a/user/kde-development/APKBUILD b/user/kde-development/APKBUILD new file mode 100644 index 000000000..72927d748 --- /dev/null +++ b/user/kde-development/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde-development +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Development software from the KDE Software Collection" +url="https://www.kde.org/applications/development/" +arch="noarch" +options="!check" # Empty meta package, no point in testing. +license="NCSA" +depends="cervisia clazy kapptemplate kcachegrind kdebugsettings kdesvn kdevelop + kdiff3 kirigami-gallery kompare lokalize massif-visualizer umbrello" +makedepends="" +source="org.adelie-linux.about-development.desktop" + +package() { + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ +} + +sha512sums="13a1ce0507e43512ca212bbbfd05a1b19515de3b661a3a4013c1482fa46cc3a5e98738dc8f096b6ad11bc17eec6903da7e7d49d190832615e344881f181cb2a9 org.adelie-linux.about-development.desktop" diff --git a/user/kde-development/org.adelie-linux.about-development.desktop b/user/kde-development/org.adelie-linux.about-development.desktop new file mode 100644 index 000000000..8cc47cad9 --- /dev/null +++ b/user/kde-development/org.adelie-linux.about-development.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Development +Comment=Learn about KDE development software included with Adélie +Icon=dialog-information +Categories=KDE;Development +Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/development.html diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index dbeb83fc9..668049c39 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" @@ -9,9 +9,10 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" # gcompris-qt is removed until it works with gettext-tiny. +# Parley is unavailable because of web engine requirement. depends="artikulate blinken cantor kalgebra kalzium kanagram kbruch - kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz - labplot marble minuet rocs step xdg-utils" + kgeography khangman kig kiten klettres kmplot kstars ktouch kturtle + kwordquiz labplot marble minuet rocs step xdg-utils" makedepends="" source="org.adelie-linux.about-education.desktop" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 764bea813..877430f84 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,19 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" arch="noarch" options="!check" # Metapackage, no tests needed. license="NCSA" -depends="bomber bovo granatier kapman katomic kblackbox kblocks kbounce - kbreakout kdiamond kfourinline kgoldrunner kigo killbots kiriki - kjumpingcube klickety klines kmahjongg kmines knavalbattle knetwalk - kolf kollision konquest kpat kreversi kshisen ksirk ksnakeduel - kspaceduel ksquares ksudoku kteatime ktuberling kubrick lskat palapeli - xdg-utils" +depends="blinken bomber bovo granatier kanagram kapman katomic kblackbox + kblocks kbounce kbreakout kdiamond kfourinline kgoldrunner khangman + kigo killbots kiriki kjumpingcube klickety klines kmahjongg kmines + knavalbattle knetwalk kolf kollision konquest kpat kreversi kshisen + ksirk ksnakeduel kspaceduel ksquares ksudoku ktuberling kubrick + lskat palapeli picmi xdg-utils" makedepends="" source="org.adelie-linux.about-games.desktop" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 891f92179..752f4b885 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" @@ -9,8 +9,7 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" ### FIXME: add karbon when calligra is packaged -### FIXME: add digikam when it works again -depends="gwenview kcolorchooser kgraphviewer kolourpaint +depends="digikam gwenview ikona kcolorchooser kgraphviewer kolourpaint kphotoalbum krita kruler kxstitch okular skanlite spectacle symboleditor" makedepends="" diff --git a/user/kde-internet/APKBUILD b/user/kde-internet/APKBUILD new file mode 100644 index 000000000..0c0b7826e --- /dev/null +++ b/user/kde-internet/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde-internet +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Internet software from the KDE Software Collection" +url="https://www.kde.org/applications/internet/" +arch="noarch" +options="!check" # Empty meta package, no point in testing. +license="NCSA" +# Add Banji when we can package libringqt +depends="choqok kget konversation kopete krdc krfb ktorrent" +makedepends="" +source="org.adelie-linux.about-internet.desktop" + +package() { + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ +} + +sha512sums="fd36955961bf12e394091e236a5110129c6db9e97220f9589938eadaa54e09af4b90921de9c328f893a15bfcd17fd487cbdb7ee3379996402428d47a720983bb org.adelie-linux.about-internet.desktop" diff --git a/user/kde-internet/org.adelie-linux.about-internet.desktop b/user/kde-internet/org.adelie-linux.about-internet.desktop new file mode 100644 index 000000000..0aefb991f --- /dev/null +++ b/user/kde-internet/org.adelie-linux.about-internet.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Internet Software +Comment=Learn about KDE Internet software included with Adélie +Icon=dialog-information +Categories=KDE;Network +Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/internet.html diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 186b142e1..fa9aa4096 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,14 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" -depends="dragonplayer juk kaffeine kdenlive kmediaplayer kmix kwave" +depends="dragonplayer juk kaffeine kamoso kdenlive kmediaplayer kmix + kwave" makedepends="" source="org.adelie-linux.about-multimedia.desktop" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 9f9c2802b..4aa4bdc4a 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=19.12.3 +pkgver=20.04.3 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 55833148a..e9241812f 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD index 2f5538124..c81ea60c1 100644 --- a/user/kde/APKBUILD +++ b/user/kde/APKBUILD @@ -1,17 +1,17 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde pkgver=5 -pkgrel=3 +pkgrel=4 pkgdesc="The K Desktop Environment" url="https://www.kde.org/" arch="noarch" options="!check" # Metapacakge license="NCSA" subpackages="" -depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia - kde-system kde-utilities plasma-desktop plasma-meta +depends="adelie-kde-theme - kcachegrind kget krdc ktorrent umbrello + kde-development kde-education kde-games kde-graphics kde-internet + kde-multimedia kde-system kde-utilities plasma-desktop plasma-meta kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers user-manager" diff --git a/user/kdebugsettings/APKBUILD b/user/kdebugsettings/APKBUILD new file mode 100644 index 000000000..d1b0bb962 --- /dev/null +++ b/user/kdebugsettings/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdebugsettings +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Set KDE debug settings" +url="https://kde.org/applications/development/org.kde.kdebugsettings" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcompletion-dev + kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kitemviews-dev + kwidgetsaddons-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="af6770415d7f8ba5ff56c13ce7227cc1b22b2db2f24da3ae5ee9d03d3275ced87dd0f73d310f0e4b1eaeb20bbe26df76f40b7c6a258be506529394d044826012 kdebugsettings-20.04.3.tar.xz" diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index b31caeb3c..be5aa701d 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c3253b1374e66c59436e4c88b8fd296dc60f7a19ef64fa750663afaf86f144b16323cde5af79c0a55d6f5e780085d671deac923d84410d6c31c2b88564ad363 kdeclarative-5.68.0.tar.xz" +sha512sums="93d07dcb5c6d1afd94f08b370ec4c1400156e725d80ea955d21cad48ab511dcb828f95ccf2e301a120c49d22d8f29b94308e0c1fbf3059742701570f2038b988 kdeclarative-5.72.0.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index b22a075ac..e125a4d7a 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0f1073ea2e57ae6fdd615a496c213393881f29193bd0904bdef752eec3d74463ac775c20b9c90c55f03e2aed34a86988833848b78835b52115fa46d99dbe999 kded-5.68.0.tar.xz" +sha512sums="9774fb214b454d699e0ca75f0c2f64ceb89aa030e04fc46a1c793418804bd11542ed21f3b1c812ab15b4e327902b2f8b9bbe767620ed96af027e889299d96bae kded-5.72.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index 0cc01f082..f424b235a 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470 kdegraphics-thumbnailers-19.12.3.tar.xz" +sha512sums="03eebd6dbf39b4d06d4584478158a75ccaa2f5f04c102d542109972a3ce0458080763a4aa60a7a68d35ab822f45c9aa9f1d91cce20557574c2008e768f911c44 kdegraphics-thumbnailers-20.04.3.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 57d2eb9b4..79c246886 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9862e320f028e4a80f33db4532b9e865a8b8d642d434e064988fc1f72d9270e3f5883c17caca61f307b86dbf24b4a070bf27ddf12f1777d84a742749d0b8dc42 kdelibs4support-5.68.0.tar.xz" +sha512sums="00011144e62d188b686742b0f22ea8f68ea81dcec7d49b52cf0f9c0b13119f46f30185fda684f2e8e4ce1e8805d3eaf39d7b635915c2255a8a23039cc41b95f6 kdelibs4support-5.72.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 39c3b74f5..22fcf1c1b 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -11,14 +11,14 @@ options="!check" # keyframetest.cpp seems to be broken: # and then abort(3)s with an assertion in QAbstractItemModel # I believe the fakeit/Mock code is subtly broken somewhere. license="GPL-2.0-only" -depends="" +depends="qt5-qtquickcontrols2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev qt5-qtsvg-dev qt5-qtdeclarative-dev kxmlgui-dev karchive-dev kcrash-dev kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev - kdeclarative-dev qt5-qtmultimedia-dev rttr-dev" + kdeclarative-dev qt5-qtmultimedia-dev rttr-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad kdenlive-19.12.3.tar.xz" +sha512sums="5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689 kdenlive-20.04.3.tar.xz" diff --git a/user/kdepim-apps-libs/APKBUILD b/user/kdepim-apps-libs/APKBUILD new file mode 100644 index 000000000..f8e1bd317 --- /dev/null +++ b/user/kdepim-apps-libs/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdepim-apps-libs +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Runtime libraries for KDE PIM applications" +url="https://kontact.kde.org/" +arch="all" +license="LGPL-2.1+ AND GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules akonadi-dev + akonadi-contacts-dev boost-dev gpgme-dev grantlee-dev grantleetheme-dev + kauth-dev kcodecs-dev kcompletion-dev kconfig-dev kconfigwidgets-dev + kcontacts-dev kcoreaddons-dev ki18n-dev kimap-dev kitemmodels-dev + kitemviews-dev kjobwidgets-dev kio-dev kmime-dev kservice-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev libkleo-dev + pimcommon-dev prison-dev solid-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdepim-apps-libs-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="3858a3ec173545383f71a02ca55662f7fd636d55f187cf0a46b1c2b663e793a298f053768e7ed4d0fec812e1cebdfce62a390d4a912bb2fc363673edeee464e1 kdepim-apps-libs-20.04.3.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 755c94066..327e4a51e 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef kdesignerplugin-5.68.0.tar.xz" +sha512sums="04d92a05353e8358623ae4762f1d5fe2c01ddf24147810c98d7c30ea52b7267953ce9018ad599c25a723eaf6c192fb026d712e0d35e8496455ccab113b0c9e6a kdesignerplugin-5.72.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index a0a2c23d2..a34776bf5 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd31b83be237adb2b13896714ee07af659780b1028149e04ce797edf737d03dd0a7e1f2733c2ae28786c38e382806b558725f1f424910747df13719d35fad5f2 kdesu-5.68.0.tar.xz" +sha512sums="04ee875bf81ce529ef731a4035b3fb94630a9e8223e038aa6b4d708df195d03345c7fe0e57fe3b26312636b80b00a16bff39fe4fc12a4aaf209094cb6e004c50 kdesu-5.72.0.tar.xz" diff --git a/user/kdesvn/APKBUILD b/user/kdesvn/APKBUILD new file mode 100644 index 000000000..2b348f3c2 --- /dev/null +++ b/user/kdesvn/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdesvn +pkgver=2.1.0_p1 +dlver=$(echo $pkgver | sed s/_p/-/) +pkgrel=0 +pkgdesc="Graphical Subversion version control client" +url="https://kde.org/applications/development/org.kde.kdesvn" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kbookmarks-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kauth-dev + kdbusaddons-dev ki18n-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev + kio-dev knotifications-dev kparts-dev kservice-dev ktextwidgets-dev + kwallet-dev kwidgetsaddons-dev kxmlgui-dev apr-dev subversion-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kdesvn/${pkgver%_*}/kdesvn-$dlver.tar.xz" +builddir="$srcdir"/kdesvn-${pkgver%_*} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7d651abb99420caa368dec8d58bf80fc7cf75113f4f3639035835b2cef250de9e0cffab46f3d8efbdd33220b44cea77aa42f2f2ac54874f1ea6301b4718516ca kdesvn-2.1.0-1.tar.xz" diff --git a/user/kdevelop-pg-qt/APKBUILD b/user/kdevelop-pg-qt/APKBUILD new file mode 100644 index 000000000..6de09c288 --- /dev/null +++ b/user/kdevelop-pg-qt/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdevelop-pg-qt +pkgver=2.2.1 +pkgrel=0 +pkgdesc="Parser generator for using QMake with KDevelop" +url="https://kde.org/" +arch="all" +license="LGPL-2.0+ AND Expat AND GPL-3.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/kdevelop-pg-qt/$pkgver/src/kdevelop-pg-qt-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9 kdevelop-pg-qt-2.2.1.tar.xz" diff --git a/user/kdevelop/APKBUILD b/user/kdevelop/APKBUILD new file mode 100644 index 000000000..f1918555f --- /dev/null +++ b/user/kdevelop/APKBUILD @@ -0,0 +1,55 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdevelop +pkgver=5.5.2 +pkgrel=0 +pkgdesc="KDE Integrated Development Environment (IDE)" +url="https://www.kdevelop.org/" +arch="all" +options="!check" # Requires real X11 session. +license="GPL-2.0+" +# Yes, meson is a runtime dependency. +depends="clazy cppcheck kdevelop-pg-qt meson okteta qt5-qttools + shared-mime-info" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + karchive-dev kconfig-dev kcrash-dev kdeclarative-dev kdoctools-dev + kguiaddons-dev ki18n-dev kiconthemes-dev kio-dev kitemmodels-dev + kitemviews-dev kjobwidgets-dev kcmutils-dev knewstuff-dev + knotifications-dev knotifyconfig-dev kparts-dev kservice-dev + ktexteditor-dev kwindowsystem-dev kxmlgui-dev threadweaver-dev + libksysguard-dev grantlee-dev qt5-qttools-dev boost-dev clang-dev + qt5-qtwebkit-dev purpose-dev llvm-dev plasma-framework-dev okteta-dev + apr-dev astyle-dev krunner-dev subversion-dev libkomparediff2-dev + kdevelop-pg-qt-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kdevelop/$pkgver/src/kdevelop-$pkgver.tar.xz + libarchive-tar.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCLANG_BUILTIN_DIR=/usr/lib/clang/8.0.1/include \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2 kdevelop-5.5.2.tar.xz +c8b9cbdabb9285c183347889264e2089db5520879454fa4c85c2c1aa97612c3316c92f89bbd474d2c946c9bc8f29e4b8da79eabd6cb14e1213b0b2cdfba0c328 libarchive-tar.patch" diff --git a/user/kdevelop/libarchive-tar.patch b/user/kdevelop/libarchive-tar.patch new file mode 100644 index 000000000..318a6c2ed --- /dev/null +++ b/user/kdevelop/libarchive-tar.patch @@ -0,0 +1,30 @@ +--- kdevelop-5.5.2/kdevplatform/cmake/modules/KDevPlatformMacros.cmake.old 2020-06-02 13:20:26.000000000 +0000 ++++ kdevelop-5.5.2/kdevplatform/cmake/modules/KDevPlatformMacros.cmake 2020-07-19 21:24:00.465219669 +0000 +@@ -55,27 +55,12 @@ + ) + else() + +- if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + add_custom_command(OUTPUT ${_template} + COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName} + --exclude .kdev_ignore --exclude .svn --numeric-owner + -j -f ${_template} . + DEPENDS ${_deps} + ) +- else() +- set(extraArgs "") +- if(DEFINED ENV{SOURCE_DATE_EPOCH}) +- # We assume there is tar > 1.28 if a reproducible build is wanted. +- set(extraArgs --mtime="@$ENV{SOURCE_DATE_EPOCH}" --sort=name +- --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime) +- endif() +- add_custom_command(OUTPUT ${_template} +- COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName} +- --exclude .kdev_ignore --exclude .svn --mode=go=rX,u+rw,a-s +- --owner=0 --group=0 --numeric-owner -j -f ${_template} ${extraArgs} . +- DEPENDS ${_deps} +- ) +- endif() + + endif() + diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index b980489f7..affb0af1e 100644 --- a/user/kdewebkit/APKBUILD +++ b/user/kdewebkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdewebkit -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be885bc7234551adf38faadd03f863fec60588f46bb710558702570bb1a40dff44ea35155c2cf30624c2f9f7ae13dfe57cdc2f088538c35e11157189ba803594 kdewebkit-5.68.0.tar.xz" +sha512sums="35d03459adc4095027900f7b6f911e3a5ed82b40e12365cc89184293b472d92198c29106352b384350ebb5dfd2e49173fe3998fdf5a3fad7d51b16475a411693 kdewebkit-5.72.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 214475d1b..1db7b0aae 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a kdf-19.12.3.tar.xz" +sha512sums="df8ebbc258b5ffe9becd8beb4911dc16e0d18a5e0860a8dafb0e9a492997f6aa7741cbe789eff1eb89bfbb52ec4dd9a057d322669f3c9e2b5888bfdd3cede8aa kdf-20.04.3.tar.xz" diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD index 6fbff8e0a..8db99f14d 100644 --- a/user/kdiagram/APKBUILD +++ b/user/kdiagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiagram -pkgver=2.6.2 +pkgver=2.7.0 pkgrel=0 pkgdesc="Charting libraries used by KDE" url="https://www.kde.org/" @@ -10,8 +10,8 @@ options="!check" # Tests require X11 license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" -subpackages="$pkgname-dev $pkgname-lang" +makedepends="cmake doxygen extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz" build() { @@ -25,6 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} . make } @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="008688e76e30b933576523e2204b029ce2a5f5d232002d481c7c49f4ad2955b3f46cbe4b51a046a771130f3584225127b21df30efc042cddc9440f81ea8f495a kdiagram-2.6.2.tar.xz" +sha512sums="d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d kdiagram-2.7.0.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index fe347e5db..9ccb170ce 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268 kdiamond-19.12.3.tar.xz" +sha512sums="7b298724f37ca29784e9239716d97041c4219b9a1bff565bb034cbee7af40fc3609056ff019fba83d0c46a8005bc2b51e92130e4b431d427af068f95c5884e72 kdiamond-20.04.3.tar.xz" diff --git a/user/kdiff3/APKBUILD b/user/kdiff3/APKBUILD new file mode 100644 index 000000000..925b10184 --- /dev/null +++ b/user/kdiff3/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdiff3 +pkgver=1.8.3 +pkgrel=0 +pkgdesc="Diff/Patch frontend for KDE" +url="https://kde.org/applications/development/org.kde.kdiff3" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev + kdoctools-dev ki18n-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev + kparts-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d kdiff3-1.8.3.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 49398a2b0..3e26dddd7 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ada02627e705fabfa50ccbd7221969d123f0b9bdf51edb390c78a6cfaef545f1237fed91dad868d17800b85d677597df9e4d7906156a0816cb54f744ded89857 kdnssd-5.68.0.tar.xz" +sha512sums="9042e1873b996b9df5ab75f72cf2050035ea1e92af21fa2e47afe65bd3a6e57fd5e783a476494b18be7e2bc3f9c998b3fc0049a99a4579f069c12a901f6d4a7d kdnssd-5.72.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index ec2771be6..801d04d2f 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b kdoctools-5.68.0.tar.xz" +sha512sums="a4164b797a47353090725b6c9ee97220ea882aa8a15ff3d4ef143305423684c7fa611b923d458ae739252025d4930f72530c7b02f7f0d6933120c42bfc51e292 kdoctools-5.72.0.tar.xz" diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD index 4aa4ecff3..73329254c 100644 --- a/user/keepassxc/APKBUILD +++ b/user/keepassxc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=keepassxc -pkgver=2.5.3 +pkgver=2.6.0 pkgrel=0 pkgdesc="A community revival of the KeePassX password manager" url="https://keepassxc.org" @@ -10,7 +10,7 @@ license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LG depends="hicolor-icon-theme" makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev libsodium-dev libxi-dev libxtst-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev - qt5-qtx11extras-dev xz zlib-dev" + qt5-qtx11extras-dev xz zlib-dev asciidoctor" subpackages="$pkgname-doc" source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6 keepassxc-2.5.3-src.tar.xz" +sha512sums="c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17 keepassxc-2.6.0-src.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 89f47bb2c..79e9325be 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="44ef3ec99997ae99d90bd0c4318930db0ca2805f812ad8fd18166b801424d940a40a499266bfa20f6f9169cdd4608a42a206069e72af015956e16d95b9b5e731 kemoticons-5.68.0.tar.xz" +sha512sums="c767351a3c3a6a857f3b4240205a92a705c9204394da15b0f5154e6aba2c3b834f403729aaec1774cc8e70be26b8a101185303f610dc752421a43b2908039127 kemoticons-5.72.0.tar.xz" diff --git a/user/keyutils/APKBUILD b/user/keyutils/APKBUILD index 7efd00a7a..66eaa7dbc 100644 --- a/user/keyutils/APKBUILD +++ b/user/keyutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=keyutils -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=0 pkgdesc="Linux key management utilities" url="https://people.redhat.com/~dhowells/keyutils/" @@ -38,4 +38,4 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 keyutils-1.6.1.tar.gz" +sha512sums="f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 keyutils-1.6.3.tar.gz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 5c5e7374c..9dd12361a 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8e10b45b6c2790f1f0e41ea8f0a474d6a6b4e6c6bc73d53d26887b24b06f7c95c1fc3a81fc9096759c8506e64fd30f6b7f822ea6dc238ea787b812ba685f8bf kfilemetadata-5.68.0.tar.xz -17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch" +sha512sums="6f1c8dad61428b32c3aaabdc6f178fec07c96fd831c9e4b2be92130258241ea6d51c4ff6c0f3e42d22bd29b1b8fbf742e12725e6ec4229b9e59ad18f68e7ce7d kfilemetadata-5.72.0.tar.xz +ddbf9eb485b9f20c87284434bb705f2f401c77f6eaa2e611ee0cb4f15ef585c47c8dd39eb2f38e347f80db5e2bc0362861ed90beb8e09d9882172a899e473bff test-mimetype.patch" diff --git a/user/kfilemetadata/test-mimetype.patch b/user/kfilemetadata/test-mimetype.patch index 87b994920..f76824ac5 100644 --- a/user/kfilemetadata/test-mimetype.patch +++ b/user/kfilemetadata/test-mimetype.patch @@ -2,12 +2,12 @@ Our version of shared-mime-info differs for the AppImage MIME type. --- kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp.old 2019-12-12 22:37:05.000000000 +0000 +++ kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp 2019-12-29 15:56:30.981925832 +0000 -@@ -48,7 +48,7 @@ +@@ -36,7 +36,7 @@ m_knownFiles = { { "test.aif", "audio/x-aifc"}, { "test.ape", "audio/x-ape"}, - { "test.AppImage", "application/vnd.appimage"}, + { "test.AppImage", "application/x-iso9660-appimage"}, - { "test_apple_systemprofiler.spx", "application/xml"}, + { "test_apple_systemprofiler.spx", "application/x-apple-systemprofiler+xml"}, // s-m-i < 2.0 would give "application/xml" { "test.dot", "text/vnd.graphviz"}, { "test.eps", "image/x-eps"}, diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index e2da48d02..1eb66211c 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5 kfind-19.12.3.tar.xz" +sha512sums="cedc192ad1247131a2f708c4ff1266636c57eaf60e46b58f2b5eb9aded61aca63ddbdca936ff8cdc216891569e7c2aca9cf61371f93468df1bca799f8df3117a kfind-20.04.3.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 0c30fd2cc..a7290cffe 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba kfloppy-19.12.3.tar.xz" +sha512sums="0226a83e4350c10c3a706d2fc82fb64b510cb992b7c20a1d72dc880da3fb82896be8ff5804aa22c5fd47233625e42afed7239c6cc9ab7fa2f25c0fedef03f2ed kfloppy-20.04.3.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 12c8a62f9..8b0450af5 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df kfourinline-19.12.3.tar.xz" +sha512sums="895fd642e6407d4b2d7f78dccc72a257585cb9e47986186428b40e8d78ab27926346cd79390911660f9673014b872d679adee815a37eb864a1d6923d662523c7 kfourinline-20.04.3.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index a536493d7..3613979e5 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3 kgeography-19.12.3.tar.xz" +sha512sums="b5921fcba4fb2e72a78adad91bc0886818cf473b4c5ebba6d42496205ef76284836a9d71d283514add3cb75a7ce5970b23a62fb08c8444490302368dfe7bf7d5 kgeography-20.04.3.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 033ab8603..10add8da1 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887 kget-19.12.3.tar.xz" +sha512sums="55223e8e32392ea46dd50d90e532119fe8908641c6e49a29e62bd2f6a67db29940efc5e6344089c9e090810e9319399ce3dbdde61bb93f737591df03bfdf7f33 kget-20.04.3.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 03f2be72a..0df19d87e 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66929e86dd09acca739e71a88dff5818bf6602417fe257b6f195f2a194f1bb030ca44e25b37d9383f4bc4960da95ddcaa7330f3c2cfceb1772be50d80763796e kglobalaccel-5.68.0.tar.xz" +sha512sums="05430b734df4f127b68149e4b08e563fb35ba132f047437eaa41877962fb1e8f82c95880a3573d5f3e91a87c138150db735a996ce54bdad4b26a9269d73a9ed5 kglobalaccel-5.72.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index e10b5e835..fe2662190 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3 kgoldrunner-19.12.3.tar.xz" +sha512sums="1c759f7e7fe7f4369f7fe1b1812f8e5a1e7cd5c6588f67c6998849e01c013826f517401d541130be8d03ab152b737176889a70f7f6c8e2a13cfe440fa9ffb91e kgoldrunner-20.04.3.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index c815bf81a..1f93a580b 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109 kgpg-19.12.3.tar.xz" +sha512sums="b36ff19ee02a8bbaa64cfece378178fd4d10700a0f62a44e3d911cebeb147564c577336681937e3be795924ab1da522a38b07a32335c95c3c7f711361f0a8a9c kgpg-20.04.3.tar.xz" diff --git a/user/kgraphviewer/APKBUILD b/user/kgraphviewer/APKBUILD index db2f22ca1..fa05a6f27 100644 --- a/user/kgraphviewer/APKBUILD +++ b/user/kgraphviewer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgraphviewer pkgver=2.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Graphviz DOT graph viewer" url="https://www.kde.org/applications/graphics/kgraphviewer/" arch="all" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 9b0559805..f1778e2a8 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00 kguiaddons-5.68.0.tar.xz" +sha512sums="03037263d10dc75d7a409856d64b460e078e550841261287a141325a72aca3dc09ff5cb62f6c6a53ae44259380d283c9e76d33edc2a6e777c7ad58e379e64f30 kguiaddons-5.72.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 2db471d89..a54197585 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526 khangman-19.12.3.tar.xz" +sha512sums="d70def96ffbfed0dfca4e3ac21613639f0344520d8364793d22fe8e90cea376ac7024959007660ffa9e9849fa66158752db83333acd15103e09467a5f5cf5037 khangman-20.04.3.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index a332d276c..f5c1c2e00 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6 khelpcenter-19.12.3.tar.xz" +sha512sums="0859633ea0a9e8b9a304057e3261614e560d6764d60c42eb377c8cd2d1e9ef3c185feb7221276c6b160365c6041c6711891435d8ce23c1b53ef660706ead14c0 khelpcenter-20.04.3.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index f3af735bc..3050c693d 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=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad4ab73880862104cc7aa1fff2dd91c5b9fe36f8f8ee0fb1f217a0e159ca4184984767ba5bebbb3ef0bd6a1fd6cbff09a019fe3c26826ab4df5cfabcb80ce9a3 kholidays-5.68.0.tar.xz" +sha512sums="ca97d24de46db1131af391a4a45c38001bae88c04994f377f6b22dd3bbe35a40432adce34d29587dcde2863e96305844f10902f452621e1bca43035c95b021b6 kholidays-5.72.0.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 747a25921..ee3bf8575 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a306f5da7bf03f77111af4f3e4d4a2b21e483861e7e5d4265941e914f788e58079fce11ab2667bb802d512d7c84fa70653a94a16cdb14221ce1aebbe300ce2ee khtml-5.68.0.tar.xz" +sha512sums="f1d5feca1e164d361ec9175277f5646ee39ebdc5bc601556cea2c0f0b859e1bb044043c685ddcb4d5e4d883e14ee5fd6f278838e2b5ddcf9f1fd4cbf982308a5 khtml-5.72.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index e2cd6c3b9..41abc7789 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2256e06a40761b7f948cd83caf527e8533035afd2ecda266535b67dab9030571154a6eab75744db94da4c13c27bcc67d1d2dcdfb3b9de92e75abcf3f517e52e7 ki18n-5.68.0.tar.xz" +sha512sums="754302680a70e8c8a68ee9b2873b6d42a806c4f473b2daf1d3435f4e70d9e285a5e93d092f8503218d17f8981d87be7cea388c5ca4998fab973c5baf806a582f ki18n-5.72.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 126088b51..2cccfa3e8 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b kiconthemes-5.68.0.tar.xz" +sha512sums="55184ee31084ae56d47a1f618b2484c2994c2d022cd19e7eae75850f4affb25b7e90c4510c3e3d1a6bb81c5b4fd60e780819ade7947ab62f4c778606cc342acc kiconthemes-5.72.0.tar.xz" diff --git a/user/kidentitymanagement/APKBUILD b/user/kidentitymanagement/APKBUILD new file mode 100644 index 000000000..4c8cb0a59 --- /dev/null +++ b/user/kidentitymanagement/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kidentitymanagement +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Identity management library for KDE" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kconfig-dev kcoreaddons-dev kiconthemes-dev kio-dev kjobwidgets-dev + kpimtextedit-dev kservice-dev ktextwidgets-dev kxmlgui-dev solid-dev + sonnet-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kidentitymanagement-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="df5507c67fb151953b8e1ab98580d77e297a13fdede2ee5b484262768932335b8289ebfbb83ffa8eaf8a3e85c25f61b13ffd73823aa210fe9d940f3361a33f80 kidentitymanagement-20.04.3.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index f7769d45d..8088dbc3f 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c803de25cf6f26b2d320ec7e35ba598f134e75575dd8f1c06b41461975c99a6b46e7d60bb34b09ed2d799837cf7682bc3d09ba720b2b7dbb1b1bee668fdb1b01 kidletime-5.68.0.tar.xz" +sha512sums="3a5fd03eabfbe99368b670fe78c985a65d354cd38eb3f4e5bc6fa25d71c36bfe48f14c8cbc64035d286ec9f29780fa168febc1e1284af9f1fac30cb7f94608cf kidletime-5.72.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 707245af9..0f0c32039 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url="https://www.kde.org/applications/education/kig/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109 kig-19.12.3.tar.xz" +sha512sums="64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963 kig-20.04.3.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index b458397ef..ef83f27e1 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce kigo-19.12.3.tar.xz" +sha512sums="26d1bd6d282e5cd535408148be13ab468831ef7ff2c6e75052a65804123fb4440ba54a0fa1d280834ce83400d8f897825bfd34cc02751800660e953762779981 kigo-20.04.3.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 706c3efe2..7e0c2afb9 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514 killbots-19.12.3.tar.xz" +sha512sums="0336667db017881a2bff454c2cfd2c5e80ee19d4567b89c517f072f190544616cce29664bd8471de517a9df3e1a7d7bdc726b564f3904965e03ba9464391441f killbots-20.04.3.tar.xz" diff --git a/user/kimap/APKBUILD b/user/kimap/APKBUILD new file mode 100644 index 000000000..aba216edf --- /dev/null +++ b/user/kimap/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kimap +pkgver=20.04.3 +pkgrel=0 +pkgdesc="IMAP library for KDE" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules cyrus-sasl-dev kauth-dev + kcodecs-dev kcoreaddons-dev ki18n-dev kio-dev kjobwidgets-dev kmime-dev + kservice-dev solid-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kimap-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d9bfc2390270eb46b903e54f88e84fbc8dbae0cbf71fe69ad826d77d64978c1512b7c9de617ab64cb449d5c0d6fa386ab60f3da634bdcbce01b924a36a7c10e5 kimap-20.04.3.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index b80261ce0..191f08215 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66d39c7bb330e7237ba4334938451ba5d1faad3f38e1c577036061cd75e2770c858c897317543222b208f8a694e29c30eb142483f4617e30954a34813e941530 kinit-5.68.0.tar.xz" +sha512sums="a18ca2d8395964284b78fe662b2eac9141df9451e8de47a4a0d80f64226e8228d45382dd4bdaf4b29bbb6ae79f549fb5405a7206fd4fe266f4a6cc7643e51c39 kinit-5.72.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 8fdc83304..597696c56 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -17,9 +17,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kactivities-stats-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz - D17205-nfs-tirpc.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -44,5 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz -dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" +sha512sums="25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3 kio-extras-20.04.3.tar.xz" diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch deleted file mode 100644 index b12c0a2c5..000000000 --- a/user/kio-extras/D17205-nfs-tirpc.patch +++ /dev/null @@ -1,143 +0,0 @@ -Subject: Build kio_nfs against standalone libtirpc -From: asturmlechner -Date: Wed 28 Nov 07:41:00 UTC 2018 - -Summary - -Since glibc-2.26, cmake skipped over nfs when standalone tirpc -was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...) - -Use FindTIRPC and make kio_nfs optional that way -FindTIRPC taken from https://phabricator.kde.org/D12761 - -Test Plan - -Built with libtirpc successfully. - -https://phabricator.kde.org/D17205 - -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,6 +132,11 @@ - set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL - PURPOSE "Needed to build the man kioslave" - ) -+ -+ find_package(TIRPC) -+ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL -+ PURPOSE "Needed to build the NFS kioslave" -+ ) - else() - # FIXME: on windows we ignore support until trash gets integrated - endif() -@@ -174,9 +179,7 @@ - if(Gperf_FOUND AND KF5KHtml_FOUND) - add_subdirectory( man ) - endif() -- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) -- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave") -- if(HAVE_RPC_RPC_H) -+ if(TIRPC_FOUND) - add_subdirectory( nfs ) - endif() - endif() -diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake -new file mode 100644 ---- /dev/null -+++ b/cmake/FindTIRPC.cmake -@@ -0,0 +1,60 @@ -+# - Try to find TI-RPC -+# -+# The following variables will be available once found : -+# -+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location -+# TIRPC_LIBRARIES - Link these to use TI-RPC -+# TIRPC_VERSION - The TIRPC version -+# -+#============================================================================= -+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr> -+# -+# -+# 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. -+#============================================================================= -+ -+find_package(PkgConfig QUIET) -+pkg_check_modules(PC_TIRPC libtirpc) -+ -+find_path(TIRPC_INCLUDE_DIRS -+ NAMES netconfig.h -+ PATH_SUFFIXES tirpc -+ HINTS ${PC_TIRPC_INCLUDE_DIRS} -+) -+ -+find_library(TIRPC_LIBRARIES -+ NAMES tirpc -+ HINTS ${PC_TIRPC_LIBRARY_DIRS} -+) -+ -+set(TIRPC_VERSION ${PC_TIRPC_VERSION}) -+ -+include(FindPackageHandleStandardArgs) -+ -+find_package_handle_standard_args(TIRPC -+ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS -+ VERSION_VAR TIRPC_VERSION -+) -+ -+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES) -diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt ---- a/nfs/CMakeLists.txt -+++ b/nfs/CMakeLists.txt -@@ -1,10 +1,12 @@ - ## Check for XDR functions --include(CheckFunctionExists) -+include(CheckSymbolExists) - --CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T) --CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T) --CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER) --CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T) -+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES}) -+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS}) -+check_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T) -+check_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T) -+check_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER) -+check_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T) - - if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T) - message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!") -@@ -24,9 +26,10 @@ - endif (HAVE_XDR_U_LONGLONG_T) - - add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\") -+include_directories(${TIRPC_INCLUDE_DIRS}) - - add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c) --target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network) -+target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES}) - set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs") - - install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) - diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 8f56f536e..c10d2ecc7 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz +sha512sums="2e89d38a70274d34d2d5c45abcf75c35cf93bbf9987b4b590e351620fa9b2ecf360e24cc8d2f79e3ef2ada6e2a5f364ee16d6062f77f01a1b285b2527618529c kio-5.72.0.tar.xz a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kirigami-gallery/APKBUILD b/user/kirigami-gallery/APKBUILD new file mode 100644 index 000000000..348814521 --- /dev/null +++ b/user/kirigami-gallery/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kirigami-gallery +pkgver=20.04.3 +pkgrel=0 +pkgdesc="View examples of Kirigami components" +url="https://kde.org/applications/development/org.kde.kirigami2.gallery" +arch="all" +license="GPL-2.0-only" +depends="qt5-qtquickcontrols2 qt5-qtgraphicaleffects kirigami2" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kirigami2-dev qt5-qttools-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kirigami-gallery-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="860e4a09bdbf6a201ec3107b94a0cfcb6f956b26a93f9b01b89bc1ac9b67e13a798ced51d3d836ff7638ee352900eb4ae9085d266d0c3c07de407329713b4bd2 kirigami-gallery-20.04.3.tar.xz" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index 4c0ec71dc..8c87980ba 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f9f84893dec3298066e7dd3f283a118a488403d23895992875b9229d26d3b3ad14ff14bdd7a5afc79591d96ac431556ea15fcb65dffe23c42a3144f1fbe88f21 kirigami2-5.68.0.tar.xz" +sha512sums="1de45469e5804af015dc9bed531dfbb739163e10226e71c0b6d9b5ca3a2b193dc0b75c543775c9795e27d7bef5f4351ab4e312c212d2fcf47966e614946e26e9 kirigami2-5.72.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 8c1a5bbc1..d204153e9 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece kiriki-19.12.3.tar.xz" +sha512sums="5f4d6eff93c3432d5606644ac4a30b37d37fdadbb0f2a05b5fb115fa99d5f226078dce16aca0ab6549d82f77131c802e7bd97d4fa67dd739b7ce3945030c54a7 kiriki-20.04.3.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index b329016d1..eff622e7c 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcdb8ad9783f84b8838d7c87516f4813b0a257eca4af83cbb2225d4d5f5d17eb21b25ce35afb7a4e5dc1471f56ffd8e2c5598d797cf21eb4baf613e5b132c421 kitemmodels-5.68.0.tar.xz" +sha512sums="ea296038c0e4e5fe2ee665d28320668616c5ffb94683b081f4bde8e04748a1312e447987ba16406271ba2a67487b2a5590a88b186de0c5149dfb96e80a773bb3 kitemmodels-5.72.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 1c340843c..feed1c343 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d744473ddb697e89adc54cd74c4b5688b7244b0ddb17bb26cb6bc762faf8b39018b4d4498c89a9c8df05e241d75bffe00d01c02bb0d70a8f9b1f64b7d9c313 kitemviews-5.68.0.tar.xz" +sha512sums="bb44a6dd41b1ccd8504458d7f28c3e0a8558d647aeea659158e27a051db86eb404b6f6b4ba080323266caa57ed0dc83d1d26ee99e47d305c7c215f2518854fab kitemviews-5.72.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index ed9df5a20..45f75c14e 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526 kiten-19.12.3.tar.xz" +sha512sums="7d2a11354ee2070ca02b733a2945530f0baaba0138b66973b1efac5bb9475a0bcead6951404af02d1e18d676c125c6e17f367f0d41e2b5e86bec874c44eddad6 kiten-20.04.3.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index f1d68af28..737c56cc2 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1db735d465b3df1081bdde0eeefecbe6c86d20e520ef18842375f7c583abdfd8ee9017688de2ec193b220712f4c9742b379492612b55bc3495aea3996fed015 kjobwidgets-5.68.0.tar.xz" +sha512sums="c6382fe45243abb5fdf5d58052f519bfef79f7bb59c1ca2b5420e449364d6ac722a56a3cc66c03b3bd6be723cd1be1c0db7bab15ec0fd7c05a6074cf456b3efd kjobwidgets-5.72.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index ff7755686..e01438a8c 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0daf43ef5fb1c50114e3df6cdff19d162fb8d53b13188a201250c3e7fe1e1b72691389ae73ffaa5b2880343492f5f7efdd3f85245673edf2d6cf9b12b34e27f4 kjs-5.68.0.tar.xz" +sha512sums="e926c5251954186c7ce8568b64a921cf6e7a7c379e8b481aeca5e4ce6d9fa4d1bba11109305e41832d8a167905462d63c43765c73df4bd5ae3067696ab56f6b2 kjs-5.72.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 2e3c29afd..572aefdf0 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2fcab72f43bf66f69f8b5a2463ca50baaacf239d84f9d99ba75f8e9661b30303cb8e2601d53280b54743436481a32d9294b97d3b4a9eaceb401274d0169bf1c0 kjsembed-5.68.0.tar.xz" +sha512sums="80761776f8ecc54a16d81749989b047cd3b088c0e26c1685a5de31d16f056f18407939055e88e7fd49a24f64e685b304eb42903f1a9c0c4f0eae8ba21664a6df kjsembed-5.72.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 76e54d98d..eb25d2357 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca kjumpingcube-19.12.3.tar.xz" +sha512sums="63a37453020c2305efd8833cc223f5709f08f0f0ef3ea1a5dc8e5b0aab763ec9180199b249c7e28119bc5c8db16d525fe25d606a5b6c5c057c8fa889ad5b3e45 kjumpingcube-20.04.3.tar.xz" diff --git a/user/kldap/APKBUILD b/user/kldap/APKBUILD new file mode 100644 index 000000000..91ae10663 --- /dev/null +++ b/user/kldap/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kldap +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE LDAP library" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules cyrus-sasl-dev kauth-dev + kcodecs-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev + kjobwidgets-dev kservice-dev kwidgetsaddons-dev openldap-dev solid-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kldap-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="6ae46a9ca2bc6d44c4ff4ba17d9681e74d20e50307af2a924b323487f368ade746a8d13060b8d2410b6f67a7a8577df2ef413f3987faad5c73eb49d4ac36d303 kldap-20.04.3.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index ecfead943..b75d88a78 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a kleopatra-19.12.3.tar.xz" +sha512sums="b72ffb37b3116525d8a531c056a0457e6fb3257081d639fc1c175c8dd4566e4f3c0989cfc696c43c92b630b43dcad90f667a9f3496fede0121065553041c554a kleopatra-20.04.3.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index eb1357a8c..d407cf4ac 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3 klettres-19.12.3.tar.xz" +sha512sums="e8fedb9dbbb0f7d19cf7fe2f0687d56371eb716d8e40da762eef7798f40e462da137430497cc13331766c87652c9b32e65c839a0d7b5279e6ef36a59b0fc1ae4 klettres-20.04.3.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 70c9f3b30..c59e7bd1a 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0 klickety-19.12.3.tar.xz" +sha512sums="617b8d4d4a43a3056a36d29a36ff7c9948311f206567b4d8dba35ee55cf69059653e10de99820f2ea663e07e0427450a3a43c1a7146bdbc8c98dc269e7c6a870 klickety-20.04.3.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 1f0f4c0ff..46d6187f0 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf klines-19.12.3.tar.xz" +sha512sums="ccdb8191589ae8cbe3cd74d117acbb39828eb4e9c197e31af169f2acd824086f4e96adba59dd6bbc6051b78992899c234316a2ded5fcf5930cf83045fffbeb30 klines-20.04.3.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index f2637de08..ac91f47b5 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3 kmag-19.12.3.tar.xz" +sha512sums="44806fa8130bc2fc96fbd7484da157c0a75e2f2a00c8f4b1193dd755f13f23a4f23dbb89aa51099011628a96e5126e5bdcf99f3344d0903ccf351b62e52b1909 kmag-20.04.3.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 33970e576..115de67fc 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5 kmahjongg-19.12.3.tar.xz" +sha512sums="4a59ce38dc083981ba619e1ed039159a8655884dd515cacd095a1ac1ab16f35bddee202eaf6cd41b56237f0ce6bf0e5a0f0ee853d80ba169e0bacbd4f57d3aa5 kmahjongg-20.04.3.tar.xz" diff --git a/user/kmailtransport/APKBUILD b/user/kmailtransport/APKBUILD new file mode 100644 index 000000000..1f862bce4 --- /dev/null +++ b/user/kmailtransport/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kmailtransport +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE email transport library" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcmutils-dev kmime-dev + kwallet-dev akonadi-dev akonadi-mime-dev ksmtp-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmailtransport-$pkgver.tar.xz + degoogled.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # Akonadi tests require D-Bus. + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'akonadi-*' +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c49b5d5a4f58aab8bcf7a7a5bdc10df38d91caa61b05501cc57530e09a68046d527cd2bfe2fc634d64fde7fb24f41fb2ae657a9eb3bbb4b2dea2fede0ccadf93 kmailtransport-20.04.3.tar.xz +f775ef03389421b1818d5f781c65d45d4154ebcb28c3114164d698db7b7149ef56f7f5bd222ce49de143f06a8eb23b63ba69809791a010144075df42d4783385 degoogled.patch" diff --git a/user/kmailtransport/degoogled.patch b/user/kmailtransport/degoogled.patch new file mode 100644 index 000000000..1bb7086c5 --- /dev/null +++ b/user/kmailtransport/degoogled.patch @@ -0,0 +1,222 @@ +diff -Naur kmailtransport-20.04.3/CMakeLists.txt kmailtransport-degoogled/CMakeLists.txt +--- kmailtransport-20.04.3/CMakeLists.txt 2020-07-18 22:38:18.572259714 +0000 ++++ kmailtransport-degoogled/CMakeLists.txt 2020-07-18 22:38:06.963507959 +0000 +@@ -29,7 +29,6 @@ + set(AKONADI_LIB_VERSION "5.14.3") + set(AKONADIMIME_LIB_VERSION "5.14.3") + set(KSMTP_LIB_VERSION "5.14.3") +-set(KGAPI_LIB_VERSION "5.14.3") + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport") + +@@ -43,7 +42,6 @@ + find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED) + find_package(KPimSMTP ${KSMTP_LIB_VERSION} CONFIG REQUIRED) +-find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG REQUIRED) + + option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) + if (EXISTS "${CMAKE_SOURCE_DIR}/.git") +diff -Naur kmailtransport-20.04.3/src/kmailtransport/mailtransport.kcfg kmailtransport-degoogled/src/kmailtransport/mailtransport.kcfg +--- kmailtransport-20.04.3/src/kmailtransport/mailtransport.kcfg 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/mailtransport.kcfg 2020-07-18 22:35:49.028339597 +0000 +@@ -79,7 +79,6 @@ + <choice name="APOP" /> + <choice name="CLEAR" /> + <choice name="ANONYMOUS" /> +- <choice name="XOAUTH2" /> + </choices> + <default>PLAIN</default> + </entry> +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/CMakeLists.txt kmailtransport-degoogled/src/kmailtransport/plugins/smtp/CMakeLists.txt +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/CMakeLists.txt 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/CMakeLists.txt 2020-07-18 22:37:43.696009823 +0000 +@@ -27,5 +27,4 @@ + KF5::ConfigWidgets + KF5::KIOWidgets + KPim::SMTP +- KPim::GAPICore + ) +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt kmailtransport-degoogled/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt 2020-07-18 22:37:50.785247545 +0000 +@@ -15,6 +15,5 @@ + KF5::ConfigWidgets + KF5::KIOWidgets + KPim::SMTP +- KPim::GAPICore + TEST_NAME smtpjobtest + ) +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp 2020-07-18 22:37:12.009416961 +0000 +@@ -70,8 +70,7 @@ + << Transport::EnumAuthenticationType::CRAM_MD5 + << Transport::EnumAuthenticationType::DIGEST_MD5 + << Transport::EnumAuthenticationType::NTLM +- << Transport::EnumAuthenticationType::GSSAPI +- << Transport::EnumAuthenticationType::XOAUTH2; ++ << Transport::EnumAuthenticationType::GSSAPI; + sslCapa = tlsCapa = noEncCapa; + updateAuthCapbilities(); + } +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.cpp kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.cpp +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.cpp 2020-07-18 22:37:25.447971965 +0000 +@@ -38,13 +38,6 @@ + #include <KSMTP/LoginJob> + #include <KSMTP/SendJob> + +-#include <KGAPI/Account> +-#include <KGAPI/AuthJob> +-#include <KGAPI/AccountManager> +- +-#define GOOGLE_API_KEY QStringLiteral("554041944266.apps.googleusercontent.com") +-#define GOOGLE_API_SECRET QStringLiteral("mdT1DjzohxN3npUUzkENT0gO") +- + using namespace MailTransport; + + class SessionPool +@@ -196,50 +189,9 @@ + return; + } + +- if (transport()->authenticationType() == TransportBase::EnumAuthenticationType::XOAUTH2) { +- auto promise = KGAPI2::AccountManager::instance()->findAccount( +- GOOGLE_API_KEY, transport()->userName(), { KGAPI2::Account::mailScopeUrl() }); +- connect(promise, &KGAPI2::AccountPromise::finished, +- this, [forceRefresh, this](KGAPI2::AccountPromise *promise) { +- if (promise->account()) { +- if (forceRefresh) { +- promise = KGAPI2::AccountManager::instance()->refreshTokens( +- GOOGLE_API_KEY, GOOGLE_API_SECRET, transport()->userName()); +- } else { +- onTokenRequestFinished(promise); +- return; +- } +- } else { +- promise = KGAPI2::AccountManager::instance()->getAccount( +- GOOGLE_API_KEY, GOOGLE_API_SECRET, transport()->userName(), +- { KGAPI2::Account::mailScopeUrl() }); +- } +- connect(promise, &KGAPI2::AccountPromise::finished, +- this, &SmtpJob::onTokenRequestFinished); +- }); +- } else { +- startLoginJob(); +- } +-} +- +-void SmtpJob::onTokenRequestFinished(KGAPI2::AccountPromise *promise) +-{ +- if (promise->hasError()) { +- qCWarning(MAILTRANSPORT_SMTP_LOG) << "Error obtaining XOAUTH2 token:" << promise->errorText(); +- setError(KJob::UserDefinedError); +- setErrorText(promise->errorText()); +- emitResult(); +- return; +- } +- +- const auto account = promise->account(); +- const QString tokens = QStringLiteral("%1\001%2").arg(account->accessToken(), +- account->refreshToken()); +- transport()->setPassword(tokens); + startLoginJob(); + } + +- + void SmtpJob::startLoginJob() + { + if (!transport()->requiresAuthentication()) { +@@ -281,11 +233,7 @@ + } + } + +- if (transport()->authenticationType() == Transport::EnumAuthenticationType::XOAUTH2) { +- passwd = passwd.left(passwd.indexOf(QLatin1Char('\001'))); +- } else { +- passwd = transport()->password(); +- } ++ passwd = transport()->password(); + login->setUserName(transport()->userName()); + login->setPassword(passwd); + switch (transport()->authenticationType()) { +@@ -298,9 +246,6 @@ + case TransportBase::EnumAuthenticationType::CRAM_MD5: + login->setPreferedAuthMode(KSmtp::LoginJob::CramMD5); + break; +- case TransportBase::EnumAuthenticationType::XOAUTH2: +- login->setPreferedAuthMode(KSmtp::LoginJob::XOAuth2); +- break; + case TransportBase::EnumAuthenticationType::DIGEST_MD5: + login->setPreferedAuthMode(KSmtp::LoginJob::DigestMD5); + break; +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.h kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.h +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.h 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.h 2020-07-18 22:37:38.056616206 +0000 +@@ -31,10 +31,6 @@ + class Slave; + } + +-namespace KGAPI2 { +-class AccountPromise; +-} +- + class SmtpJobPrivate; + + namespace MailTransport { +@@ -74,7 +70,6 @@ + + private: + void startPasswordRetrieval(bool forceRefresh = false); +- void onTokenRequestFinished(KGAPI2::AccountPromise *result); + void startSmtpJob(); + void startLoginJob(); + void startSendJob(); +diff -Naur kmailtransport-20.04.3/src/kmailtransport/servertest.cpp kmailtransport-degoogled/src/kmailtransport/servertest.cpp +--- kmailtransport-20.04.3/src/kmailtransport/servertest.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/servertest.cpp 2020-07-18 22:36:05.166604311 +0000 +@@ -80,10 +80,6 @@ + bool handleNntpConversation(MailTransport::Socket *socket, int type, int *stage, const QString &response, bool *shouldStartTLS); + QVector<int> parseAuthenticationList(const QStringList &authentications); + +- inline bool isGmail(const QString &server) const { +- return server.endsWith(QLatin1String("gmail.com")) || server.endsWith(QLatin1String("googlemail.com")); +- } +- + // slots + void slotNormalPossible(); + void slotNormalNotPossible(); +@@ -156,10 +152,6 @@ + result << Transport::EnumAuthenticationType::GSSAPI; + } else if (current == QLatin1String("ANONYMOUS")) { + result << Transport::EnumAuthenticationType::ANONYMOUS; +- } else if (current == QLatin1String("XOAUTH2")) { +- if (isGmail(server)) { +- result << Transport::EnumAuthenticationType::XOAUTH2; +- } + } + // APOP is handled by handlePopConversation() + } +@@ -183,9 +175,6 @@ + } + + QStringList protocols; +- if (isGmail(server)) { +- protocols << QStringLiteral("XOAUTH2"); +- } + + protocols << QStringLiteral("LOGIN") + << QStringLiteral("PLAIN") << QStringLiteral("CRAM-MD5") +diff -Naur kmailtransport-20.04.3/src/kmailtransport/transport.cpp kmailtransport-degoogled/src/kmailtransport/transport.cpp +--- kmailtransport-20.04.3/src/kmailtransport/transport.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/transport.cpp 2020-07-18 22:35:40.749229818 +0000 +@@ -142,8 +142,6 @@ + return QStringLiteral("APOP"); + case EnumAuthenticationType::ANONYMOUS: + return i18nc("Authentication method", "Anonymous"); +- case EnumAuthenticationType::XOAUTH2: +- return QStringLiteral("XOAUTH2"); + } + Q_ASSERT(false); + return QString(); diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index 4d5566cf1..ec0ed1dec 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca3cb02ed23492495d2c5e2f8e75d542daae61542fa9dcc3f632b421be82cf4373d01afcba47512c029f03bb0418c09625da56b7090d84e5d3d763cf650652a6 kmediaplayer-5.68.0.tar.xz" +sha512sums="faa511b885eaaa0ba403911baa50c7c09519326d8c1f75d835be4c7cdfa2ddfd313a8e5293a1579b52b8abf91c06c0660f56ff45fb2c7db43348ea9b34c629f8 kmediaplayer-5.72.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index bd4858607..6a1e2be50 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5 kmime-19.12.3.tar.xz" +sha512sums="2f97616a576f02e81ad0ae2386c4ba4570a1b068e6221837ac34552810e51aa75407a0b55078c0f104ac149720d2bfc61efe73cf045548a3f435b7028b186ddb kmime-20.04.3.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 34c37429d..9781d28c6 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b kmines-19.12.3.tar.xz" +sha512sums="cb13f8fcaae9134941d942c2b9457849fef0397bbada55387f47a3f0a147bd33e308cf41c78124ab4abbb249db0ece6fbbdb8e23e47a250895b2f4f10e9bc7c0 kmines-20.04.3.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 664764ae1..e657b3061 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 kmix-19.12.3.tar.xz" +sha512sums="80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78 kmix-20.04.3.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index b483246a6..16cdc2214 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00 kmousetool-19.12.3.tar.xz" +sha512sums="d949c5c54a3bbfdc1ae6ab1795efaa7d2f08a18310a528c196ebba97467894a32417be18c555bdbbf5e485012b4a5492451d4aba00e9cf1847e31a27abfa0f56 kmousetool-20.04.3.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 71ed030d8..4f514d012 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95 kmplot-19.12.3.tar.xz" +sha512sums="06cb19924e6d460b52f419d29e028ab4cb13cab6ab14f1a27216d3d0ecd467676d337ec04d2c3fcc2b081853d3e0858ce2f2cc46279efc8fe692b8ab6a4ee5ff kmplot-20.04.3.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index ca553dc8a..9e68ccbef 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100 knavalbattle-19.12.3.tar.xz" +sha512sums="a4300f137f45adc62d1741239712e27e8033581f26c16feb8a32097b214c84e0e81602a27f7cfe078cf2c3d27896bd5f8b3a508e8fd8632c378c72c176ae4de4 knavalbattle-20.04.3.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index e40238805..459c1850d 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e knetwalk-19.12.3.tar.xz" +sha512sums="b1466213ff25b5e8352669e4fbc82da444897934faa21e27b758b15d65e12c59384c5edac6400700c57b52a59a67a9452687f834000694a93503887b576296f3 knetwalk-20.04.3.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index ec88617c9..38205c34d 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev attica-dev kconfig-dev kservice-dev kxmlgui-dev openssl-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev karchive-dev kcompletion-dev kcoreaddons-dev kio-dev - ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev + ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev kpackage-dev ktextwidgets-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37e4aabd22eddb1ad216bc07d275006215008845af7979ee5aed9123b7fc2b8742cd07259294876b03c04706a417f1f648f26ef6355f8937d8d9b927e9ce6e5d knewstuff-5.68.0.tar.xz" +sha512sums="dc2b89b7be62bd5cecce0b250ed1afd85f9c7a69715eda39e20ba25b6fd296d8fb7c50d29e9f885e24a986a4cd6fb3e16691194ee235ec4ec697350e6bf7f7d3 knewstuff-5.72.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 5952a53f6..38801651f 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="301b300a6da4631d49c1e0004938872091c857bfbf312ab85aaa8f0ce3ce28425cbcdfa380a7ed46211d6e95776ea91cf9fd2a5521add05d5956de5e97f3958e knotifications-5.68.0.tar.xz" +sha512sums="dfdbad7b477c03ce478da6452b0f7208364715240ff64ede5808e9ca87671e11c184cd3d134f58485551752e48cddd613403d00e3ba929110d6d9bd44a3b47bb knotifications-5.72.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 88bb47763..9c261cc79 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de9269b4654fec05b7b87aaf91c35158b9fcc7a9afb18d42f7810c493dfdbe6ff82ed6fa044d369186b8fb087d524d6a5597365c3f967e95d93be54a03b13568 knotifyconfig-5.68.0.tar.xz" +sha512sums="c9bc7c2c2e4baf8ab06cdc9f7c419f7bff31eddfc2ab0208a79ad2b25903b76c952c73514fe30466c2cccd3f9226e5f4f288b313521b9acdedb726e46daed24f knotifyconfig-5.72.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 44e8fee1b..99a7f2219 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee kolf-19.12.3.tar.xz" +sha512sums="a1f5a1502a609f7e3ab9efefd22506a660d3d5b331fe7890ad52d3ef26372daf7d511ebe251aeb961343f54f04884d204fb2c675d5ee5b482152b8db46c32b37 kolf-20.04.3.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 9585e0db6..516270fbc 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141 kollision-19.12.3.tar.xz" +sha512sums="42458c1308d785c06019da797bb1948066a82da5de2607878299e17766b2ab3279efdc2382276b4afca24dc3d922fa17837a93fca12e0879a3306b0fd68ce155 kollision-20.04.3.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 0b1c2f4b6..d0a913d46 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf kolourpaint-19.12.3.tar.xz" +sha512sums="fdefd7de9cbb65f791b1cd243d60a3ed81994b6ae4243a76efe024d7259e64f214f5bb6d67e6dfdc7339dd6dec93bb2498d0b4a3e80104b89022bd881ad0a1a1 kolourpaint-20.04.3.tar.xz" diff --git a/user/kompare/APKBUILD b/user/kompare/APKBUILD new file mode 100644 index 000000000..d1ea99957 --- /dev/null +++ b/user/kompare/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kompare +pkgver=20.04.3 +pkgrel=0 +pkgdesc="View and merge differences between files" +url="https://kde.org/applications/development/org.kde.kompare" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev + kdoctools-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev kparts-dev + kservice-dev ktexteditor-dev kwidgetsaddons-dev kwindowsystem-dev + kxmlgui-dev libkomparediff2-dev solid-dev sonnet-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kompare-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5eb80a8e6aaa4bc05b24297f86ef5bb018f078a62d7eb99345ba49b0d95fe637eef75df0c5caf469c75f0b32c5d8afa6b40f10e3f3c9f2730a71469ead446ba2 kompare-20.04.3.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index d91dd1e03..b32e790bb 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7 konquest-19.12.3.tar.xz" +sha512sums="df78794926668a2f58434df50a24d3093d2f60e2c29906d46b98b3323d5f766a774431bf4ae20740a8e55bc2a13047582f8607165d75f06c57b7942f1bb06e71 konquest-20.04.3.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 5b700fe16..416e3729c 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 konsole-19.12.3.tar.xz" +sha512sums="37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813 konsole-20.04.3.tar.xz" diff --git a/user/kontactinterface/APKBUILD b/user/kontactinterface/APKBUILD new file mode 100644 index 000000000..4a7aae210 --- /dev/null +++ b/user/kontactinterface/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kontactinterface +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Kontact public interface library" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcoreaddons-dev ki18n-dev kjobwidgets-dev kparts-dev kservice-dev + kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kontactinterface-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a702d601ed90c6d90442bf13bf739917180670912dab6c3c4792046daa545ccb7294c8cb6a206dbd9fe6ef411eb7cd4cf113bc87e6b6f2f4517e8180fb4a6c87 kontactinterface-20.04.3.tar.xz" diff --git a/user/kopete/APKBUILD b/user/kopete/APKBUILD new file mode 100644 index 000000000..8eb618417 --- /dev/null +++ b/user/kopete/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kopete +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE Instant Messenger (IM) client" +url="https://kde.org/applications/internet/org.kde.kopete" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules phonon-dev kcmutils-dev + kconfig-dev kcontacts-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdelibs4support-dev kdoctools-dev kemoticons-dev khtml-dev ki18n-dev + knotifyconfig-dev kparts-dev ktexteditor-dev kwallet-dev libkleo-dev + kidentitymanagement-dev kpimtextedit-dev kdnssd-dev v4l-utils-dev + glib-dev alsa-lib-dev qca-dev speex-dev gpgme-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kopete-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="979f84c986f78aaab9bd23fb9e0df265ea8734d855b8370c93adbe037d6dfeb4271658dbd27c2b315b363731976a62750e2ed5dace45bc69e72c0645a533b5a0 kopete-20.04.3.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index 29ad6f8da..c325648be 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b77c8656c34a40962eed49e67a8368dcb43a842ad4009505778fefc90be96de2baed382c693eaf3ebf499b6f9e6117584cea839993e14ba94290a2c4f67f70ef kpackage-5.68.0.tar.xz" +sha512sums="dcf424964b2a1db2f94121a9aac687b70520d263883f8dc236e6143d9c54a7d055e6889ef468637a0c9f51740586723d080f0b1be67dce96404ab5b54da035a5 kpackage-5.72.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 37a314abc..389eab534 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7fa0575ab194e8921b22f54f80f3aa85aa0ec608364d920e0202295f142ee7919fce0f79e1de840be5cc3fa6a2dc99e47e6cb94d95df5c7f151b76dcb713d20b kparts-5.68.0.tar.xz" +sha512sums="497cfb1d210d2947c3ef5212640ab918058a128f62815fa8f778c3525952584c9d4e2012269d5e9910379ca8e63a14e7388b8591b256323db87bd93bacd333e9 kparts-5.72.0.tar.xz" diff --git a/user/kpartx/APKBUILD b/user/kpartx/APKBUILD new file mode 100644 index 000000000..e1e0feddb --- /dev/null +++ b/user/kpartx/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=kpartx +pkgver=0.8.4 +pkgrel=0 +pkgdesc="Manipulates device mappings for the partitions of any block device." +url="http://christophe.varoqui.free.fr/" +arch="all" +options="!check" # Requires root and loopback/dm-mod kernel modules. +license="LGPL-2.0-only" +depends="" +makedepends="lvm2-dev" +checkdepends="debianutils-which parted" +subpackages="$pkgname-doc" +source="multipath-tools-$pkgver.tar.gz::https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/$pkgver;sf=tgz;/multipath-tools-$pkgver.tar.gz +test-kpartx" +builddir="$srcdir/multipath-tools-$pkgver/kpartx" + +build() { + make kpartx +} + +check() { + sudo KPARTX="${builddir}/kpartx" WAIT_US=1000000 "${srcdir}/test-kpartx" +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="130308e61d6dce31085fc2763219f4df0f3ad9153e0e6e7a5a1c3c948a2305cff9413699025c28f9b81dd24d2a9263f9fa825253060e44232c3bb6600cd1f07f multipath-tools-0.8.4.tar.gz +2e3702243bfc52df7353cc828fb03e3dff36eddbf77eb13140fd58d857c3d45990c679c535c00c569e5a5412ad3823717e264449c038ebf1726a4e7adc08e06e test-kpartx" diff --git a/user/kpartx/test-kpartx b/user/kpartx/test-kpartx new file mode 100755 index 000000000..93a5abdbd --- /dev/null +++ b/user/kpartx/test-kpartx @@ -0,0 +1,395 @@ +#! /bin/bash + +# This is a unit test program for kpartx, in particular for deleting partitions. +# +# The rationale is the following: +# +# 1) kpartx should delete all mappings it created beforehand. +# 2) kpartx should handle partitions on dm devices and other devices +# (e.g. loop devices) equally well. +# 3) kpartx should only delete "partitions", which are single-target +# linear mappings into a block device. Other maps should not be touched. +# 4) kpartx should only delete mappings it created itself beforehand. +# In particular, it shouldn't delete LVM LVs, even if they are fully +# contained in the block device at hand and thus look like partitions +# in the first place. (For historical compatibility reasons, we allow +# such mappings to be deleted with the -f/--force flag). +# 5) DM map names may be changed, thus kpartx shouldn't rely on them to +# check whether a mapping is a partition of a particular device. It is +# legal for a partition of /dev/loop0 to be named "loop0". + +# Note: This program tries hard to clean up, but if tests fail, +# stale DM or loop devices may keep lurking around. + +# Set WORKDIR in environment to existing dir to for persistence +# WARNING: existing files will be truncated. +# If empty, test will be done in temporary dir +: ${WORKDIR:=} +# Set this environment variable to test an alternative kpartx executable +: ${KPARTX:=} +# Options to pass to kpartx always +: ${KPARTX_OPTS:=-s} +# Time to wait for device nodes to appear (microseconds) +# Waiting is only needed if "s" is not in $KPARTX_OPTS +: ${WAIT_US:=0} + +# IMPORTANT: The ERR trap is essential for this program to work correctly! +#trap 'LINE=$LINENO; trap - ERR; echo "== error in $BASH_COMMAND on line $LINE ==" >&2; ls -la /dev/mapper; read a; exit 1' ERR +trap 'cleanup' 0 + +CLEANUP=: +cleanup() { + trap - ERR + trap - 0 + if [[ $OK ]]; then + echo == all ${ALL_PASS} tests completed successfully == >&2 + else + printf "== Final Results ==\n%s of %s failed!\n\n" "${ALL_FAIL}" "$(( ALL_PASS + ALL_FAIL ))" >&2 + fi + eval "$CLEANUP" &>/dev/null +} + +push_cleanup() { + CLEANUP="$@;$CLEANUP" +} + +pop_cleanup() { + # CAUTION: simplistic + CLEANUP=${CLEANUP#*;} +} + +step() { + STEP="$@" + + if [ $PASS -gt 0 -o $FAIL -gt 0 ] + then + printf "PASS: %s FAIL: %s\n\n" "${PASS}" "${FAIL}" + PASS=0 + FAIL=0 + fi + + echo == Test step: $STEP == >&2 +} + +mk_partitions() { + parted -s $1 mklabel msdos + parted -s -- $1 mkpart prim ext2 1MiB -1s +} + +wipe_ptable() { + dd if=/dev/zero of=$1 bs=1b count=1 +} + +usleep() { + if which usleep >/dev/null 2>&1 + then + env usleep "${1}" + else + sleep $( echo "${1}" / 1000000.0 | bc ) + fi +} + +invoke_kpartx() { + $KPARTX $KPARTX_OPTS "${@}" + usleep "${WAIT_US}" +} + +assert_exists() { + local result=0 + while [ "${1}" ] + do + if [ -b "$(readlink -f "${1}")" ] + then + PASS=$(( PASS + 1 )) + ALL_PASS=$(( ALL_PASS + 1 )) + else + FAIL=$(( FAIL + 1 )) + ALL_FAIL=$(( ALL_FAIL + 1 )) + echo "assert_exists: Device does not exist when it should: ${1}" + result=1 + fi + shift + done + return $result +} + +assert_unexists() { + local result=0 + while [ "${1}" ] + do + if [ ! -b "$(readlink -f "${1}")" ] + then + PASS=$(( PASS + 1 )) + ALL_PASS=$(( ALL_PASS + 1 )) + else + FAIL=$(( FAIL + 1 )) + ALL_FAIL=$(( ALL_FAIL + 1 )) + echo "assert_exists: Device exists when it should not: ${1}" + result=1 + fi + shift + done + return $result +} + +PASS=0 +ALL_PASS=0 +FAIL=0 +ALL_FAIL=0 + +step preparation + +[[ $UID -eq 0 ]] +[[ $KPARTX ]] || { + if [[ -x $PWD/kpartx/kpartx ]]; then + KPARTX=$PWD/kpartx/kpartx + else + KPARTX=$(which kpartx) + fi +} +[[ $KPARTX ]] + +FILE1=kpartx1 +FILE2=kpartx2 +FILE3=kpartx3 +FILE4=kpartx4 + +SIZE=$((1024*1024*1024)) # use bytes as units here +SECTSIZ=512 +OFFS=32 # offset of linear mapping into dev, sectors +VG=kpvg # volume group name +LV=kplv # logical vol name +LVMCONF='devices { filter = [ "a|/dev/loop.*|", r".*" ] }' + +OK= + +[[ $WORKDIR ]] || { + WORKDIR=$(mktemp -d /tmp/kpartx-XXXXXX) + push_cleanup 'rm -rf $WORKDIR' +} + +push_cleanup "cd $PWD" +cd "$WORKDIR" + +step "create loop devices" +truncate -s $SIZE $FILE1 +truncate -s $SIZE $FILE2 +truncate -s $SIZE $FILE3 +truncate -s $SIZE $FILE4 + +LO1=$(losetup -f $FILE1 --show) +push_cleanup 'losetup -d $LO1' +LO2=$(losetup -f $FILE2 --show) +push_cleanup 'losetup -d $LO2' +LO3=$(losetup -f $FILE3 --show) +push_cleanup 'losetup -d $LO3' +LO4=$(losetup -f $FILE4 --show) +push_cleanup 'losetup -d $LO4' + +[[ $LO1 && $LO2 && $LO3 && $LO4 && -b $LO1 && -b $LO2 && -b $LO3 && -b $LO4 ]] +DEV1=$(stat -c "%t:%T" $LO1) +DEV2=$(stat -c "%t:%T" $LO2) +DEV3=$(stat -c "%t:%T" $LO3) + +usleep $WAIT_US + +step "create DM devices (spans)" +# Create two linear mappings spanning two loopdevs. +# One of them gets a pathological name colliding with +# the loop device name. +# These mappings must not be removed by kpartx. +# They also serve as DM devices to test partition removal on those. + +TABLE="\ +0 $((SIZE/SECTSIZ-OFFS)) linear $DEV1 $OFFS +$((SIZE/SECTSIZ-OFFS)) $((SIZE/SECTSIZ-OFFS)) linear $DEV2 $OFFS" + +SPAN1=kpt +SPAN2=$(basename $LO2) +dmsetup create $SPAN1 <<<"$TABLE" +push_cleanup 'dmsetup remove -f $SPAN1' + +dmsetup create $SPAN2 <<<"$TABLE" +push_cleanup 'dmsetup remove -f $SPAN2' + +# This is a non-kpartx pseudo "partition" mapping +USER1=user1 +push_cleanup 'dmsetup remove -f $USER1' +dmsetup create $USER1 <<EOF +0 $((SIZE/SECTSIZ-OFFS)) linear $DEV1 $OFFS +EOF + +usleep $WAIT_US +assert_exists /dev/mapper/$SPAN1 /dev/mapper/$SPAN2 /dev/mapper/$USER1 +[[ -b /dev/mapper/$SPAN1 ]] +[[ -b /dev/mapper/$SPAN2 ]] +[[ -b /dev/mapper/$USER1 ]] + +step "create vg on $LO3" +# On the 3rd loop device, we create a VG and an LV +# The LV should not be removed by kpartx. +pvcreate --config "$LVMCONF" -f $LO3 +vgcreate --config "$LVMCONF" $VG $LO3 +push_cleanup 'vgremove --config "$LVMCONF" -f $VG' +lvcreate --config "$LVMCONF" -L $((SIZE/2))B -n $LV $VG +push_cleanup 'lvremove --config "$LVMCONF" -f $VG/$LV' +usleep $WAIT_US + +assert_exists /dev/mapper/$VG-$LV +[[ -b /dev/mapper/$VG-$LV ]] + +# dmsetup table /dev/mapper/$VG-$LV +# dmsetup info /dev/mapper/$VG-$LV + +step "create partitions on loop devices" + +mk_partitions $LO1 +mk_partitions $LO2 +mk_partitions $LO4 + +# Test invocation of kpartx with regular file here +LO2P1=/dev/mapper/$(basename $LO2)-foo1 +invoke_kpartx -a -p -foo $FILE2 +assert_exists $LO2P1 +[[ -b $LO2P1 ]] +push_cleanup 'dmsetup remove -f $(basename $LO2P1)' + +step "remove partitions with deleted ptable" +wipe_ptable $LO2 +invoke_kpartx -d $LO2 +assert_unexists $LO2P1 + +mk_partitions $LO2 +invoke_kpartx -a -p -foo $FILE2 +assert_exists $LO2P1 + +LO1P1=/dev/mapper/$(basename $LO1)-eggs1 +invoke_kpartx -a -p -eggs $LO1 +push_cleanup 'dmsetup remove -f $(basename $LO1P1)' + +usleep $WAIT_US +assert_exists $LO1P1 $LO2P1 + +# dmsetup info $LO2P1 + +# Set pathological name for partition on $LO1 (same as loop device itself) +dmsetup rename $(basename $LO1P1) $(basename $LO1) +LO1P1=/dev/mapper/$(basename $LO1) +pop_cleanup +push_cleanup 'dmsetup remove -f $(basename $LO1P1)' + +# dmsetup info $LO1P1 + +step "create partitions on DM devices" +mk_partitions /dev/mapper/$SPAN2 + +invoke_kpartx -a -p -bar /dev/mapper/$SPAN2 +SPAN2P1=/dev/mapper/${SPAN2}-bar1 + +# udev rules may have created partition mappings without UUIDs +# which aren't removed by default (if system standard kpartx doesn't +# set the UUID). Remove them using -f +push_cleanup 'invoke_kpartx -f -d /dev/mapper/$SPAN2' +push_cleanup 'dmsetup remove -f $(basename $SPAN2P1)' + +invoke_kpartx -a -p -spam /dev/mapper/$SPAN1 +SPAN1P1=/dev/mapper/${SPAN1}-spam1 +# see above +push_cleanup 'invoke_kpartx -f -d /dev/mapper/$SPAN1' +push_cleanup 'dmsetup remove -f $(basename $SPAN1P1)' + +usleep $WAIT_US +assert_exists $SPAN2P1 $SPAN1P1 + +step "rename partitions on DM device to default" +invoke_kpartx -u /dev/mapper/$SPAN1 +assert_unexists $SPAN1P1 +# This assumes that $SPAN1 ends in a non-digit +assert_exists ${SPAN1P1//-spam/} + +step "rename partitions on DM device back from default" +invoke_kpartx -u -p -spam /dev/mapper/$SPAN1 +assert_exists $SPAN1P1 +assert_unexists ${SPAN1P1//-spam/} + +step "delete partitions on DM devices" +invoke_kpartx -d /dev/mapper/$SPAN1 >&2 +usleep $WAIT_US + +assert_exists $SPAN2P1 $LO1P1 $LO2P1 +assert_unexists $SPAN1P1 + +invoke_kpartx -d /dev/mapper/$SPAN2 +usleep $WAIT_US + +assert_exists $LO1P1 $LO2P1 +assert_unexists $SPAN2P1 + +step "rename partitions on loop device" +invoke_kpartx -u -p -spam $LO2 +assert_unexists $LO2P1 +assert_exists ${LO2P1//-foo/-spam} + +step "rename partitions on loop device back" +invoke_kpartx -u -p -foo $LO2 +assert_exists $LO2P1 +assert_unexists ${LO2P1//-foo/-spam} + +step "rename partitions on loop device to default" +invoke_kpartx -u $LO2 +#read a +assert_unexists $LO2P1 +assert_exists ${LO2P1//-foo/p} +# $LO1 ends in a digit + +step "rename partitions on loop device back from default" +invoke_kpartx -u -p -foo $LO2 +assert_exists $LO2P1 +assert_unexists ${LO2P1//-foo/p} + +step "rename partitions on loop devices" +invoke_kpartx -u -p spam $LO2 + +step "delete partitions on loop devices" + +invoke_kpartx -d $LO3 + +# This will also delete the loop device +invoke_kpartx -d $FILE2 +invoke_kpartx -d $LO1 +usleep $WAIT_US + +# ls -l /dev/mapper +assert_unexists $LO1P1 +pop_cleanup +assert_unexists $LO2P1 +pop_cleanup +# spans should not have been removed +# LVs neither +assert_exists /dev/mapper/$SPAN1 /dev/mapper/$SPAN2 /dev/mapper/$USER1 /dev/mapper/$VG-$LV + +step "delete partitions on $LO3 with -f" + +invoke_kpartx -f -d $LO3 +# -d -f should delete the LV, too +assert_unexists /dev/mapper/$VG-$LV +assert_exists /dev/mapper/$SPAN1 /dev/mapper/$SPAN2 + +step "test kpartx creation/deletion on an image file with no existing loopdev" +losetup -d $LO4 + +OUTPUT=$(invoke_kpartx -v -a $FILE4 2>&1) +read loop dm < \ + <(sed -n 's/^add map \(loop[0-9]*\)p1 ([0-9]*:\([0-9]*\)).*$/\1 dm-\2/p' \ + <<<$OUTPUT) +[[ $dm && $loop ]] +push_cleanup "dmsetup remove -f /dev/$dm" +push_cleanup "losetup -d /dev/$loop" + +assert_exists /dev/mapper/${loop}p1 +invoke_kpartx -d $FILE4 +assert_unexists /dev/mapper/${loop}p1 +# /dev/$loop is _not_ automatically deleted +assert_exists /dev/${loop} + +[ $ALL_FAIL -eq 0 ] && OK=yes diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 7205b2642..895c4ac91 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7 kpat-19.12.3.tar.xz" +sha512sums="d178a1360b37acdbba9fa33de56929b51c19b81ff6ee01d3f8780fe507800d9c9c1155bd0ae4e2f8b6baff5410133020c113aa6ed3f86aee2238f448216ce7ad kpat-20.04.3.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 5ac60fc11..79a5a68e5 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.68.0 +pkgver=5.72.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" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f249fa3cc21a378824d13050919554dec6058277e9c737730bedbc2651d1191833dd7f5ecbfb74158c78808504a300861b5463e23058fef522e1ae3f21aa8e1 kpeople-5.68.0.tar.xz +sha512sums="3310188ef1ab1d1023f8997314481228f9e875a40ef4f40dc517f578c53ba84866accfdac70b0d79167eba8dc1a6d55d60117ba78279d9ced04e554ecba17842 kpeople-5.72.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 40a274b58..269d4bdbc 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a kpimtextedit-19.12.3.tar.xz" +sha512sums="0d7e0d84d9c25dbeb28413350e7f17f45c643e5335cd26fac28fb5e4e2bc2797d223f9137cbfc2f9fe2f13806ab321ba2a058b7dc40c02762707170285336abe kpimtextedit-20.04.3.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 1661cf6f1..ec59bf26e 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f4b5158afc2eb4d38278618a475dbc26482682cc77d7ae0e3bb799b25a43f156946791156f73a1fd030b7602fb691364e491bef4686d36bc4f955ac2b8033e1b kplotting-5.68.0.tar.xz" +sha512sums="cea99437675f47021573fb7bf4ec493b76a231c387bb88b198ceb2d543e87ebe414ab8c33bc43d1e0f658e86936b363f06af8012f17a3ace3aa684c45d110580 kplotting-5.72.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index e71c433e1..d2a55162d 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ea1452994e66d92a99595f4cbf53f94abe3af4d35f7adb57deb1a2ae7ab6d95524a7e8bd82af90ca7ade39644f6af9002ebbfee751a0395a705e38b1e8b4e23 kpty-5.68.0.tar.xz" +sha512sums="1c80aed7b5ded81434734eebeb297eaddefe4411e5470a98363b43a7ecf89429048dcb56031c553004f5a96ac76c243fdc98f1446608ecbbb295e2c060ebfd4b kpty-5.72.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD index 7adaa073f..7bc3c5281 100644 --- a/user/kquickcharts/APKBUILD +++ b/user/kquickcharts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kquickcharts -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="A QtQuick plugin providing high-performance charts" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90d50f5aa211d97656e3b8c1dcc0c069675e432ebaf0c33b0fa956e69319d670feaaedd38d24e587f3188b8cf8816d1d0fbdb33010447b3c4c1175ab9062f5c7 kquickcharts-5.68.0.tar.xz" +sha512sums="170ef5c5928e0949584dc4905a86893a477a6922f85eccb6d5d70938b8808bfc67a534eb88a712ef7e4e7b64a65790ac0eb08035b9cb2dc833f5b458bb3ab44f kquickcharts-5.72.0.tar.xz" diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD index 24269bd32..731bc7c08 100644 --- a/user/krb5/APKBUILD +++ b/user/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krb5 -pkgver=1.17 +pkgver=1.18.2 pkgrel=0 case $pkgver in *.*.*) _ver=${pkgver%.*};; @@ -87,7 +87,7 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52 krb5-1.17.tar.gz +sha512sums="7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c krb5-1.18.2.tar.gz 5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 603f52565..b84f7999d 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 krdc-19.12.3.tar.xz" +sha512sums="f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff krdc-20.04.3.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index b2e8a65a9..cb3c0246d 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0 kreversi-19.12.3.tar.xz" +sha512sums="fe211d107b0ba1ce7b3edd0c108be13cbfc7d6a3257c62e5536a248cfae6953e10c7ac0ce47d021bd7dc3e1c6d77799919939285e5d73fc466fcfec6d887fbc5 kreversi-20.04.3.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 1c606cb71..c968718d9 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36 krfb-19.12.3.tar.xz" +sha512sums="91a8281fb6e9756de262fcc02f98863b1ec74a30a2ed6e2a51a73808e293680ac3dbee555af4dd007f9c3ecfd6163c7328cabf4f6cc31fa55932b7db56cad65e krfb-20.04.3.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 0150420b8..8148d50fd 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.2.8.2 +pkgver=4.3.0 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -17,7 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev libraw-dev quazip-dev giflib-dev poppler-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/4.2.8/krita-$pkgver.tar.gz +source="https://download.kde.org/stable/krita/4.3.0/krita-$pkgver.tar.gz fix-nullptr-deref.patch " @@ -47,5 +47,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="aab4096bef81a7205a04e3a4080d95ccbd1ba84a0cdb959fca8a0e6e7e8183f79857bde0b301dd9db642bd71042ef43b99768dbb7cd91d32e93df3da391d1a4b krita-4.2.8.2.tar.gz +sha512sums="2f60d407a9e143aac289b16ba442619660d3ec56492c5a85095004d724378a682661d4594a0c3aec9b10cc225c45058d7890be3d05ce4460fa807eca59020509 krita-4.3.0.tar.gz fd43f21da937c29f550e24d459e83ad9714befe82fe0cae493b28cad6526b11f80a5e3d350be1fa910a62c07284774a6f5fac4bbf4801be378987fbfaef61254 fix-nullptr-deref.patch" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index f9aa5ceca..150e97f4d 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3e610248a2f6328b805d59fe8007bba02bd7af02edc93756626f5b3449a494207ed73c27ff504b85aa2d03c70f1a78b8a60289f39cdd6afdfe53c5386e429f23 kross-5.68.0.tar.xz" +sha512sums="812680b9cb7fccb8056bc32e0fc0b46910a24979cce9f25ab9ae87c5302086ea7b8bbc2758cfd888406b368f385b35fe5389c2f33b7b95c751a0dfb707dea83b kross-5.72.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index b87df305b..f41e6fdc7 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0 kruler-19.12.3.tar.xz" +sha512sums="c6b683dfab8ee15d84723af481c0ea031f96266b321135a932f6442081a97f9d016392e57c789fc2ca1c0585286bdac230ae9d1cfa4cd18c4a898d7e92754396 kruler-20.04.3.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 9d291a1f2..52f97afc4 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f3c7bb4afbd1b30405d9ab5265804b62e2928249d4334bbbcd1094cf28c8d9c587995182008f0c8fb4eab8a7a0ace5a18b9aa518139481b786cd54e5f081b47 krunner-5.68.0.tar.xz" +sha512sums="60102796a301d839ee29724111f1ef22a0b6b1bf7bf11d5952d219106ef38dd4278dbadd05043814c3d2d5b619c68252d9de46631a9bb6577cfd0a2e8ada2547 krunner-5.72.0.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 19f6a0c4d..64c3da085 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -2,20 +2,20 @@ # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker pkgver=5.18.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" arch="all" options="!check" # requires loginctl license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+" -depends="consolekit2 linux-pam qdbus" +depends="elogind linux-pam qdbus" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev libxcb-dev libxcursor-dev libxext-dev libxi-dev linux-pam-dev qt5-qtdeclarative-dev kcmutils-dev kcrash-dev kdeclarative-dev kglobalaccel-dev ki18n-dev kidletime-dev knotifications-dev ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev - consolekit2-dev" + elogind-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/${pkgver%.*}/kscreenlocker-$pkgver.tar.xz kde.pam diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index d8a092326..7d5e0e5c6 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="3581b7ec51317a0b2b63fac7e0491e89da8ba03cd90ba0ef745fc84792af4cd247c80eeec0396069a26f8bc73b971f8444e80ac7749d05b379c29138df6725ec kservice-5.68.0.tar.xz" +sha512sums="b6e7d819dcc1747d6ddaa1936cb52f910b7f0e4fa6db792420bd35c8c0afb6cc670375c4618a6703ca046cb440fa9c45b860b6eaa2905c0a264b9c7ed622c7e3 kservice-5.72.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 9015a6e74..8f8c031b9 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb kshisen-19.12.3.tar.xz" +sha512sums="15ab1702a08b9616d9fd84f9707cf4344d327410283e785bb47eb9f9126319c0e00f5f480830198bb6db426e1abc75d92e5c142aec37ec01b072c840d3c735c4 kshisen-20.04.3.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 0319102ea..bdb1416a2 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb ksirk-19.12.3.tar.xz" +sha512sums="a0f7e1bd3e3b9acf0927bb15b65a9d9cc8f4b9411ecf22c6f17f75402e991526d97defd64f5d98dda4a4f41690c0ff1835e0fef0805c5074b029d47b03b38edc ksirk-20.04.3.tar.xz" diff --git a/user/ksmtp/APKBUILD b/user/ksmtp/APKBUILD new file mode 100644 index 000000000..3ca2dcbc2 --- /dev/null +++ b/user/ksmtp/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ksmtp +pkgver=20.04.3 +pkgrel=0 +pkgdesc="SMTP library for KDE" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcoreaddons-dev ki18n-dev kio-dev kjobwidgets-dev kservice-dev + solid-dev cyrus-sasl-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksmtp-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c9794ca8dd93e25c79dd22fab38f71a421da1612658830ffe87cc8e751db9624a3d1924edd52d6fdaa97044e4d1accef5b6807f9461f857bedccc00f4d54f109 ksmtp-20.04.3.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index c8340b11f..867a3b7e3 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6 ksnakeduel-19.12.3.tar.xz" +sha512sums="43e336c8eb8a7fb7390d257f176b8f451fc940126fda75a2daaebbbc5fa18cfb0bdb4b7221fb919486575aff7d5fcb7d8efd4812ce6b4065f318554b5461eb6a ksnakeduel-20.04.3.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 5405515bb..0723fda19 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1 kspaceduel-19.12.3.tar.xz" +sha512sums="c62b03feb0b91e2e061d0e5b4a342f9f5e6f79f8336c04bf72ea6dc83ec9b5f6908a95aefaeff9583b26e7138f296147c79024baa6b3a5e7d6445c516bbe255b kspaceduel-20.04.3.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 847a5a2ab..7078222d4 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760 ksquares-19.12.3.tar.xz" +sha512sums="a334f0b990edecbe03441a9595242b057d26ff837014a82dfb8b61491b563c9a0821d7f08b40fd5c667ea1afb755c47f01a5ff3b47ec1c16fa3798bfa3e8f3d5 ksquares-20.04.3.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 3792a7b3b..8ff32ce79 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.4.1 +pkgver=3.4.3 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" arch="all" +options="!check" # Requires FITS library. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev @@ -27,6 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING:BOOL=OFF \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -41,4 +43,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af kstars-3.4.1.tar.xz" +sha512sums="47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4 kstars-3.4.3.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index e6b2ab920..3b8168ebf 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64 ksudoku-19.12.3.tar.xz" +sha512sums="39002ce3aefcee4d1f166dd5178dc961df2530643b95db53c4eca8a8335c4d4a233524d725bbebc376d93f1326de164b423ecd4b5a84b3dbe50e421a57eb1abd ksudoku-20.04.3.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index e6616b810..bd8442053 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530 ksystemlog-19.12.3.tar.xz" +sha512sums="05a358eac885d1ca2ca8ea0f2a49fc98b6310ff17c9e830f2a931e5c20ba38bbbf0b7597029549ff4ee9a2bd7e769da5b3bb7ed57b9a304be9202ebea20eca2e ksystemlog-20.04.3.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 9e99e9e6a..707e52353 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77 kteatime-19.12.3.tar.xz" +sha512sums="1b9f9ffdc2e3b2d1fb1c63459073067af2afd9feed6e437efcd593a61fd6c9dd8054dc4c4e8d40a356abefdae5288d68465fd5e584b0e5f0770b5d4de98d94f7 kteatime-20.04.3.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index c1f2a264c..ef5e75a1e 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88cf4826cd0d0811a1f1d9193fb505e1fd6221192b22b14cca1d491f923dbad1816b9c29d540ff733c2f165c3ac456ac3b425c318a45b9aefd506a2b36e6fb43 ktexteditor-5.68.0.tar.xz" +sha512sums="8dca328976699af3cb726f28a78caa11986056b2018a6c5e6d614e63ad0c247d69543aff72766cb000b7cf3fa30505889c95af7fde1b11fdd87bb21d69591521 ktexteditor-5.72.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index a9d90c430..af590223e 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="75bcf0f0f3ff55770768a95eb3376cf97f6f56cf97dd0223d5615c29bbdf98692db4a1179c802a848a88aeb65a3f1ba2cad0599cf983351cdcf2be555c32bbef ktextwidgets-5.68.0.tar.xz" +sha512sums="7ec2e3624aff5cc8e9d806f884eb98478e8e44c814e7a4912f14fffb3f4ccfb212ce6c40a66e923b038b10b1a66b8b322876960f330209e508ee839be0e3e3a1 ktextwidgets-5.72.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 30d577ba8..cc802e222 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358 ktimer-19.12.3.tar.xz" +sha512sums="313ff9e8627cb0553c6e4a9b60349a842c016f9f20f952bcf1347c2500641242f095226e85eb66330a6d6d5292de8d0b26ef74127ac17e226337324e3f517eb6 ktimer-20.04.3.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index d64205f64..7f0c2af1a 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.2 +pkgver=5.2.0 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" +sha512sums="141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387 ktorrent-5.2.0.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index f54a8937b..232a289d1 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6 ktouch-19.12.3.tar.xz" +sha512sums="3ae31fc5bcb439ae0ac6fdf736fd79858e6aa24841d76f348efa12d085744594f6965608e01309b704a5500fdf91cc3b121de418a921c021f1bf4eeba42cb124 ktouch-20.04.3.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index abf428ce8..b87bb3d68 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f ktuberling-19.12.3.tar.xz" +sha512sums="12ebc06af1eef962fd2ce2e578ebed4512a2d5d829daaaa6027e85bb779f61305a29d0d12caa0aad6fac7ecb555c1d58b2a09d6ea1cb6724149c3d3793f12c6f ktuberling-20.04.3.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 8720725d7..140336d51 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a kturtle-19.12.3.tar.xz" +sha512sums="4e6948dc9fb2b9d14bb823d2f25651352ab7630e82d0d883fcdcd90b7a159920bbd0795873cb8f987775e5319d08f34de61b1d17c1522b887ce6228bd44bb91f kturtle-20.04.3.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index f8630b026..287034f55 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9 kubrick-19.12.3.tar.xz" +sha512sums="aa0c6b0003643fcd38b5e9953be373ecf5957458c73b77d0722c553f5fc806daa1102aee5b31664e459ef98e461efbde7dfdcfbe59f2d7b24236398f6ceb703d kubrick-20.04.3.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 5994321cd..559ad0d87 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="38e26fc71d9080e876db1f458d0f76d4a102cb40d506c721e4f1fd53dcf7a5fe1de963b3c2aeb16e51c903208c976d6455b34787670032e33c88f30a9e5a15b9 kunitconversion-5.68.0.tar.xz" +sha512sums="c4516d1560e65418545af14a2380e72e82ffd08977a94f7453edec74b6ab55d2c43646d7f9ac614feb3a1368cfa780e5d7e9641dc7333cc4db558c96bab6ac88 kunitconversion-5.72.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 3c1b192f7..fcd069e39 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004 kwallet-5.68.0.tar.xz -edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" +sha512sums="b7f76434fac04ef188bb032cd515db970ec38c8be782ab6a959bbdd30e41d61ab062f3ff20529da55e0dd757078964ebaba4c0df8cc38bafe83bfc3257cc2a0e kwallet-5.72.0.tar.xz +229e001354c00832d15442b6ee2cd6062e759a560d67e9ded024735e5012aeec022f8e12ed346e090bbe2967c3bd335e5dd73b3fe5b7da93b89f1a7842411e3e kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch index 9d76cc25c..81c475c28 100644 --- a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch +++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch @@ -1,6 +1,6 @@ --- kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc.old 2016-12-03 21:12:17.000000000 +0000 +++ kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-29 18:02:10.193293280 +0000 -@@ -31,9 +31,7 @@ +@@ -31,12 +31,7 @@ #include "blowfishtables.h" @@ -8,6 +8,9 @@ -// We need to live with -Wundef until someone really figures out the problem. -//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends +#include <QtGlobal> // for Q_BYTE_ORDER and friends +-// Workaround for -Wundef +-#define Q_BIG_ENDIAN 1 +-#define Q_BYTE_ORDER Q_BIG_ENDIAN BlowFish::BlowFish() { diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index ddee7952f..ef25ed3a2 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e kwalletmanager-19.12.3.tar.xz" +sha512sums="aa6dfcec025d73d4a1139321436ae122e16e4ce3d57cd624c95003df395ca7d4273191b480ea6cf6849e0d630fd6044b833dae9674dcb8bdec43592f2b8f8a0d kwalletmanager-20.04.3.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 89664524c..07d601e6e 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -44,6 +44,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba kwave-19.12.3.tar.xz +sha512sums="f57712472ba19695c77904a804c7dd599cc762e7018fed1d16398746156c25832795215d71aa54b143671342db6a1e442f79bfaed491e16657b820e14ac1306d kwave-20.04.3.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index d8df26b71..655539980 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -11,7 +11,8 @@ license="LGPL-2.1-only OR LGPL-3.0-only" depends="" depends_dev="qt5-qtbase-dev wayland-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz - qt5-qttools-dev wayland-protocols" + qt5-qttools-dev qt5-qtwayland qt5-qtwayland-dev qt5-qtwayland-tools + wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="384628349c53a92925aa072941821ff153208415ff08fd9d32523a3e0b362d4fbf6539ebc0b3790112a570c70782989daa4cf1bf0ece26621cc8cc2d499654c8 kwayland-5.68.0.tar.xz" +sha512sums="5a0c2ac98fc90d0d2b0ed9f7c8837a81814bd5f4657dff57a4e84b5e93dfd7a74d0585e753152e3c9c073a706caffad5988b047ea0f319f13ab00f13907617bb kwayland-5.72.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index a1ce477e6..07ee62917 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64556563d0d45cbffa68b4eecc3c7c31d3597a598a63e713ac29377cf544354c25232cda78973bc15999d3e0b305810b480556a06fba45e811b8b0fe7c97cf23 kwidgetsaddons-5.68.0.tar.xz" +sha512sums="53d5e7dfbb12b427bf73ac6c09e27ea7497b460f6e4716a8fe61e2de3aed5885334e2d4292bbf3ce5661a86207135e3afb662dea93489b64ae4ffc3da998bb4c kwidgetsaddons-5.72.0.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index 80a107032..f5dfe3aa4 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9 kwindowsystem-5.68.0.tar.xz" +sha512sums="a13357a40b1d4364579b405ae467071414f4a775f0c79765a3867adb40c259a0e5b35cc5e6298e4310e1c54397c269f7b277d02a7adf2194614c44be6888ba68 kwindowsystem-5.72.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 0d096c2ea..93482e1d2 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6 kwordquiz-19.12.3.tar.xz" +sha512sums="3c69549a37266f7228e851b60d2afb13e65087f54373e80f933dbaf21641cf9a2dde491e57afa9c4a767edbc8cd3d8892b04ba51f044861f1637691259c69167 kwordquiz-20.04.3.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 55c6b6ac2..9101596b1 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de98fab8c9a878b24081ec0676fef35da39f44391689ce7087c367d8e54c3122f13214cac8fda3fa9bf59c1515a1328bc704b550bf0c0cc1ca11dc898a01d430 kxmlgui-5.68.0.tar.xz" +sha512sums="368e48c046441f525695f1c22cec13a893bb0ef8190d41c862aefbcdc45583268127de4c2deecff2eb0e1a82788c7ca677537a3e07d82879f11f8e5498165b12 kxmlgui-5.72.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 0586cc70d..dab02be61 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev ki18n-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kxmlrpcclient-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kxmlrpcclient-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89350795c4c3601fca751fc80cf4c331bd4e692d85f672c50bdd1871cfb72809004d4ec0bc0826020c42a21c38d18962481477ac3f95ecbf219f4b88aa586aad kxmlrpcclient-5.68.0.tar.xz" +sha512sums="cd25199689fffcbe5db628a04f3acf4007be32b664c30533882445175f46624622185d5e0888acb19ea725b2d56da943aa14dfd41ee4a9c94ee80f5ca270cee7 kxmlrpcclient-5.72.0.tar.xz" diff --git a/user/latte-dock/APKBUILD b/user/latte-dock/APKBUILD new file mode 100644 index 000000000..619645630 --- /dev/null +++ b/user/latte-dock/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=latte-dock +pkgver=0.9.11 +pkgrel=0 +pkgdesc="KDE dock" +url="https://kde.org/applications/utilities/org.kde.latte-dock" +arch="all" +license="GPL-2.0+" +depends="plasma-workspace qqc2-desktop-style qt5-qtgraphicaleffects + qt5-qtquickcontrols" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev + kactivities-dev karchive-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdeclarative-dev kglobalaccel-dev kguiaddons-dev ki18n-dev + kiconthemes-dev knewstuff-dev knotifications-dev kwayland-dev + kwindowsystem-dev kxmlgui-dev plasma-framework-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/latte-dock/latte-dock-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5 latte-dock-0.9.11.tar.xz" diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD index c1df9d6d2..d096b78cc 100644 --- a/user/lcms2/APKBUILD +++ b/user/lcms2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lcms2 -pkgver=2.9 +pkgver=2.11 pkgrel=0 pkgdesc="Colour management engine using ICC standard" url="http://www.littlecms.com/" @@ -14,6 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" source="http://www.littlecms.com/lcms2-$pkgver.tar.gz" # secfixes: +# 2.11-r0: +# - CVE-2018-16435 # 2.8-r1: # - CVE-2016-10165 @@ -48,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="70b1c51fa8d137d5072425e580745ff1fbf49c6e8bb1da0a8adb0647d3b7c095208793cb02de1e8d1a01363b8575fa60c61bedbff99bbec57a44228239cb00e5 lcms2-2.9.tar.gz" +sha512sums="96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e lcms2-2.11.tar.gz" diff --git a/user/libaacs/APKBUILD b/user/libaacs/APKBUILD index 11bb90c18..b4243813f 100644 --- a/user/libaacs/APKBUILD +++ b/user/libaacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libaacs -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=0 pkgdesc="Library to decrypt Advanced Access Content System content" url="https://www.videolan.org/developers/libaacs.html" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2" +sha512sums="4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e libaacs-0.10.0.tar.bz2" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 934c901f8..b10b69d05 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.23 +pkgver=2.24 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" +sha512sums="92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6 libblockdev-2.24.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index 4357d589c..dc548d86c 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbluray -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2" +sha512sums="d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2" diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD index 3c91d3cb2..cb97a469d 100644 --- a/user/libbytesize/APKBUILD +++ b/user/libbytesize/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbytesize -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="Library for working with sizes in bytes" url="https://github.com/storaged-project/libbytesize/" @@ -23,9 +23,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --without-python2 - # XXX We do not have a msgfilter app in gettext-tiny. - # This would be required to ship a Serbian translation. - rm po/sr* make } @@ -44,5 +41,5 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1 libbytesize-2.2.tar.gz +sha512sums="23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a libbytesize-2.3.tar.gz 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch" diff --git a/user/libdaemon/APKBUILD b/user/libdaemon/APKBUILD new file mode 100644 index 000000000..de0a34ad8 --- /dev/null +++ b/user/libdaemon/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libdaemon +pkgver=0.14 +pkgrel=0 +pkgdesc="Library for creating Unix daemons" +url="http://0pointer.de/lennart/projects/libdaemon/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="doxygen lynx" +subpackages="$pkgname-dev $pkgname-doc" +source="http://0pointer.de/lennart/projects/libdaemon/libdaemon-$pkgver.tar.gz" + +prepare() { + update_config_guess + update_config_sub + default_prepare +} + +build() { + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-examples + make + make -C doc doxygen +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + mv doc/reference/man/man3/_*libdaemon_.3 doc/reference/man/man3/libdaemon.3 + install -v -D -m644 doc/reference/html/* -t "$pkgdir"/usr/share/doc/libdaemon-0.14/reference/html/ + install -v -D -m644 doc/reference/man/man3/* -t "$pkgdir"/usr/share/man/man3/ +} + +sha512sums="a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2 libdaemon-0.14.tar.gz" diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index 99534d596..cc0811c9b 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.101 +pkgver=2.4.102 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -42,4 +42,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz" +sha512sums="386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz" diff --git a/user/libdvdnav/APKBUILD b/user/libdvdnav/APKBUILD index 832270be3..f2527b2bf 100644 --- a/user/libdvdnav/APKBUILD +++ b/user/libdvdnav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdnav -pkgver=6.0.1 +pkgver=6.1.0 pkgrel=0 pkgdesc="Library for sophisticated DVD navigation features" url="http://dvdnav.mplayerhq.hu/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f libdvdnav-6.0.1.tar.bz2" +sha512sums="40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71 libdvdnav-6.1.0.tar.bz2" diff --git a/user/libdvdread/APKBUILD b/user/libdvdread/APKBUILD index 295c93920..4642a04c6 100644 --- a/user/libdvdread/APKBUILD +++ b/user/libdvdread/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdread -pkgver=6.0.2 +pkgver=6.1.1 pkgrel=0 pkgdesc="Library for reading DVD video discs" url="http://dvdnav.mplayerhq.hu/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c libdvdread-6.0.2.tar.bz2" +sha512sums="f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278 libdvdread-6.1.1.tar.bz2" diff --git a/user/libev/APKBUILD b/user/libev/APKBUILD index eb2a629e6..65eac2c9f 100644 --- a/user/libev/APKBUILD +++ b/user/libev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=libev -pkgver=4.31 +pkgver=4.33 pkgrel=0 pkgdesc="Event dispatch library" url="http://software.schmorp.de/pkg/libev.html" @@ -34,5 +34,5 @@ package() { rm "$pkgdir"/usr/include/event.h } -sha512sums="c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18 libev-4.31.tar.gz +sha512sums="c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b libev-4.33.tar.gz b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index 8e9083d17..ef892cbf1 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.8.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" +sha512sums="7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645 libevdev-1.9.1.tar.xz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index 3e864cc4f..6e2ebd8d6 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: pkgname=libevent -pkgver=2.1.11 +pkgver=2.1.12 pkgrel=0 pkgdesc="An event notification library" -url="http://libevent.org/" +url="https://libevent.org/" arch="all" license="BSD-3-Clause" depends="" @@ -48,5 +48,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3 libevent-2.1.11-stable.tar.gz +sha512sums="88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f libevent-2.1.12-stable.tar.gz ca097528f88b0a86248be594b44eaa7edcb3a1ee2b808685c09aa7947bb5c10342f4b584e7f2fcef6bc4a185fecb80da4a7a6660dd5c075f3416f9a55a1389b0 py3_rpcgen.patch" diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD index 06e1e832a..320b87492 100644 --- a/user/libexif/APKBUILD +++ b/user/libexif/APKBUILD @@ -1,19 +1,17 @@ # Maintainer: pkgname=libexif -pkgver=0.6.21 -pkgrel=4 +pkgver=0.6.22 +_pkgver=$(printf '%s' "$pkgver" | tr . _) +pkgrel=0 pkgdesc="Library to parse EXIF metadata" -url="https://sourceforge.net/projects/libexif" +url="https://libexif.github.io/" arch="all" license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" makedepends="" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - CVE-2016-6328.patch - CVE-2017-7544.patch - CVE-2018-20030.patch - CVE-2019-9278.patch +source="https://github.com/libexif/libexif/releases/download/libexif-$_pkgver-release/libexif-$pkgver.tar.xz + CVE-2020-0198.patch " # secfixes: @@ -23,6 +21,14 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 # 0.6.21-r4: # - CVE-2016-6328 # - CVE-2019-9278 +# 0.6.22-r0: +# - CVE-2020-0093 +# - CVE-2020-0182 +# - CVE-2020-0198 +# - CVE-2020-12767 +# - CVE-2020-13112 +# - CVE-2020-13113 +# - CVE-2020-13114 prepare() { default_prepare @@ -45,8 +51,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35 libexif-0.6.21.tar.bz2 -c0d4c74207993efc373615ef2c797d720162a2ee6fd7ad026edf2ced4198d9b1165b88790c2af3194f6bb7c2de88d4672c041c2cff8a82c8914700633332b8c5 CVE-2016-6328.patch -d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d CVE-2017-7544.patch -0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch -c30c03fefea94d175b94c9f0c4d60cbb3aa0ad78b0d29008975fbbb15c17f2907a16fd50970e5fa18d533d0ce291a5ee9b62934210cb40b0f463693460607738 CVE-2019-9278.patch" +sha512sums="0a9e7bf0258ed98a794b667d45e8fc65299101a2a2d2e39c358715b20b003beff258782f0736cd5b53978428a2f878a989f303bee249a978850a065f33c534af libexif-0.6.22.tar.xz +7df084f9acdc09bd05fadfb66332956d8587fcaac9d693000f47fadeba17b3c49eafa402d1e2c9b7d394e697feccd1f760bab8b64378deaea1777c5a3b90c3b2 CVE-2020-0198.patch" diff --git a/user/libexif/CVE-2016-6328.patch b/user/libexif/CVE-2016-6328.patch deleted file mode 100644 index 0568f27d2..000000000 --- a/user/libexif/CVE-2016-6328.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } diff --git a/user/libexif/CVE-2017-7544.patch b/user/libexif/CVE-2017-7544.patch deleted file mode 100644 index 534817417..000000000 --- a/user/libexif/CVE-2017-7544.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:38:56 +0200 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..91f4c33 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - diff --git a/user/libexif/CVE-2018-20030.patch b/user/libexif/CVE-2018-20030.patch deleted file mode 100644 index 837d003d7..000000000 --- a/user/libexif/CVE-2018-20030.patch +++ /dev/null @@ -1,115 +0,0 @@ -Edited slightly to backport to stable - -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich <dan@coneharvesters.com> -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. ---- - libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index e35403d..a6f9c94 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include <libexif/olympus/exif-mnote-data-olympus.h> - #include <libexif/pentax/exif-mnote-data-pentax.h> - -+#include <math.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; diff --git a/user/libexif/CVE-2019-9278.patch b/user/libexif/CVE-2019-9278.patch deleted file mode 100644 index bd15e8d13..000000000 --- a/user/libexif/CVE-2019-9278.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <meissner@suse.de> -Date: Sat, 18 Jan 2020 09:29:42 +0100 -Subject: [PATCH] fix CVE-2019-9278 - -avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) - -check for the actual sizes, which should also handle the overflows -document other places google patched, but do not seem relevant due to other restrictions - -fixes https://github.com/libexif/libexif/issues/26 ---- - libexif/exif-data.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index a6f9c94..6332cd1 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, - doff = offset + 8; - - /* Sanity checks */ -- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { -+ if (doff >= size) { - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Tag data past end of buffer (%u > %u)", doff+s, size); -+ "Tag starts past end of buffer (%u > %u)", doff, size); -+ return 0; -+ } -+ -+ if (s > size - doff) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -+ "Tag data goes past end of buffer (%u > %u)", doff+s, size); - return 0; - } - -@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong o, ExifLong s) - { - /* Sanity checks */ -- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { -- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Bogus thumbnail offset (%u) or size (%u).", -- o, s); -+ if (o >= ds) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); -+ return; -+ } -+ if (s > ds - o) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); - return; - } -- - if (data->data) - exif_mem_free (data->priv->mem, data->data); - if (!(data->data = exif_data_alloc (data, s))) { -@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 0 at %i.", (int) offset); - -- /* Sanity check the offset, being careful about overflow */ -+ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ - if (offset > ds || offset + 6 + 2 > ds) - return; - -@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); -+ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ - if (offset + 6 + 2 + 12 * n + 4 > ds) - return; - -@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 1 at %i.", (int) offset); - -- /* Sanity check. */ -- if (offset > ds || offset + 6 > ds) { -+ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ -+ if (offset > ds - 6) { - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", "Bogus offset of IFD1."); - } else { diff --git a/user/libexif/CVE-2020-0198.patch b/user/libexif/CVE-2020-0198.patch new file mode 100644 index 000000000..e0358c220 --- /dev/null +++ b/user/libexif/CVE-2020-0198.patch @@ -0,0 +1,58 @@ +From ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 8 Jun 2020 17:27:06 +0200 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..b495726 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); diff --git a/user/libffcall/APKBUILD b/user/libffcall/APKBUILD new file mode 100644 index 000000000..48b16a78f --- /dev/null +++ b/user/libffcall/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Will Sinatra <wpsinatra@gmail.com> +# Contributor: Lee Starnes <lee@canned-death.us> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=libffcall +pkgver=2.2 +pkgrel=0 +pkgdesc="C library for implementing foreign function calls in embedded interpreters" +url="https://www.gnu.org/software/libffcall" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://ftp.gnu.org/gnu/libffcall/libffcall-$pkgver.tar.gz + ppc64.patch + " + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var + # Fails to build if building in parallel + make -j1 +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" htmldir=/usr/share/doc/ffcall install + +} + +sha512sums="b9d3ca4c67ab92915a8183d850153e585dcb58ceb2199a104426a7aae363d37017b1226440acd18a2db0cc207e044f71e932857189964261e8eaa6de5cef1731 libffcall-2.2.tar.gz +db7fae1d2f0d95003186671fd89b097b4abf6184d3001e34dd93419640502b9cd5cf32aef4839d6a4208f4aed793c70f9a4367f12adde21372dc131b111238fe ppc64.patch" diff --git a/user/libffcall/ppc64.patch b/user/libffcall/ppc64.patch new file mode 100644 index 000000000..74525987b --- /dev/null +++ b/user/libffcall/ppc64.patch @@ -0,0 +1,1685 @@ +--- libffcall-2.2/avcall/avcall-powerpc64.c.old 2018-09-17 16:47:43.000000000 +0000 ++++ libffcall-2.2/avcall/avcall-powerpc64.c 2020-05-11 23:06:57.534813743 +0000 +@@ -181,111 +181,111 @@ + /* In the ELFv2 ABI, gcc returns structs of size <= 16 in registers. */ + if (l->rsize > 0 && l->rsize <= 16) { + void* raddr = l->raddr; +- #if 0 /* Unoptimized */ ++ #if 1 /* Unoptimized */ + if (l->rsize == 1) { + ((unsigned char *)raddr)[0] = (unsigned char)(iret); + } else + if (l->rsize == 2) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>8); + } else + if (l->rsize == 3) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[2] = (unsigned char)(iret); + ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); +- ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>16); + } else + if (l->rsize == 4) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); +- ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); +- ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24); ++ ((unsigned char *)raddr)[3] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[2] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret>>16); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>24); + } else + if (l->rsize == 5) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[4] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[3] = (unsigned char)(iret>>8); + ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); +- ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24); +- ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret>>24); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>32); + } else + if (l->rsize == 6) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); +- ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); +- ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24); +- ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32); +- ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40); ++ ((unsigned char *)raddr)[5] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[4] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[3] = (unsigned char)(iret>>16); ++ ((unsigned char *)raddr)[2] = (unsigned char)(iret>>24); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret>>32); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>40); + } else + if (l->rsize == 7) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); +- ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); ++ ((unsigned char *)raddr)[6] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[5] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[4] = (unsigned char)(iret>>16); + ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24); +- ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32); +- ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40); +- ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48); ++ ((unsigned char *)raddr)[2] = (unsigned char)(iret>>32); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret>>40); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>48); + } else + if (l->rsize >= 8 && l->rsize <= 16) { +- ((unsigned char *)raddr)[0] = (unsigned char)(iret); +- ((unsigned char *)raddr)[1] = (unsigned char)(iret>>8); +- ((unsigned char *)raddr)[2] = (unsigned char)(iret>>16); +- ((unsigned char *)raddr)[3] = (unsigned char)(iret>>24); +- ((unsigned char *)raddr)[4] = (unsigned char)(iret>>32); +- ((unsigned char *)raddr)[5] = (unsigned char)(iret>>40); +- ((unsigned char *)raddr)[6] = (unsigned char)(iret>>48); +- ((unsigned char *)raddr)[7] = (unsigned char)(iret>>56); ++ ((unsigned char *)raddr)[7] = (unsigned char)(iret); ++ ((unsigned char *)raddr)[6] = (unsigned char)(iret>>8); ++ ((unsigned char *)raddr)[5] = (unsigned char)(iret>>16); ++ ((unsigned char *)raddr)[4] = (unsigned char)(iret>>24); ++ ((unsigned char *)raddr)[3] = (unsigned char)(iret>>32); ++ ((unsigned char *)raddr)[2] = (unsigned char)(iret>>40); ++ ((unsigned char *)raddr)[1] = (unsigned char)(iret>>48); ++ ((unsigned char *)raddr)[0] = (unsigned char)(iret>>56); + if (l->rsize == 8) { + } else + if (l->rsize == 9) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); + } else + if (l->rsize == 10) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); + } else + if (l->rsize == 11) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); + } else + if (l->rsize == 12) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); +- ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32); + } else + if (l->rsize == 13) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); +- ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24); +- ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32); ++ ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24); + } else + if (l->rsize == 14) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); +- ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24); +- ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32); +- ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32); ++ ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24); ++ ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16); + } else + if (l->rsize == 15) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); +- ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24); +- ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32); +- ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40); +- ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32); ++ ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24); ++ ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16); ++ ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8); + } else + if (l->rsize == 16) { +- ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2); +- ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>8); +- ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>16); +- ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>24); +- ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>32); +- ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>40); +- ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>48); +- ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+0] = (unsigned char)(iret2>>56); ++ ((unsigned char *)raddr)[8+1] = (unsigned char)(iret2>>48); ++ ((unsigned char *)raddr)[8+2] = (unsigned char)(iret2>>40); ++ ((unsigned char *)raddr)[8+3] = (unsigned char)(iret2>>32); ++ ((unsigned char *)raddr)[8+4] = (unsigned char)(iret2>>24); ++ ((unsigned char *)raddr)[8+5] = (unsigned char)(iret2>>16); ++ ((unsigned char *)raddr)[8+6] = (unsigned char)(iret2>>8); ++ ((unsigned char *)raddr)[8+7] = (unsigned char)(iret2); + } + } + #else /* Optimized: fewer conditional jumps, fewer memory accesses */ +--- libffcall-2.2/avcall/avcall-powerpc64-elfv2-linux.S.old 2019-08-25 01:03:04.000000000 +0000 ++++ libffcall-2.2/avcall/avcall-powerpc64-elfv2-linux.S 2020-05-11 23:07:17.992574561 +0000 +@@ -1,44 +1,52 @@ + .file "avcall-powerpc64.c" +- .machine power4 + .abiversion 2 +- .section ".toc","aw" + .section ".text" + .align 2 + .p2align 4,,15 + .globl avcall_call + .type avcall_call, @function + avcall_call: +-0: addis 2,12,.TOC.-0b@ha +- addi 2,2,.TOC.-0b@l ++.LFB0: ++ .cfi_startproc ++.LCF0: ++0: addis 2,12,.TOC.-.LCF0@ha ++ addi 2,2,.TOC.-.LCF0@l + .localentry avcall_call,.-avcall_call + mflr 0 + std 30,-16(1) + std 31,-8(1) ++ .cfi_register 65, 0 ++ .cfi_offset 30, -16 ++ .cfi_offset 31, -8 + mr 30,3 + std 0,16(1) +- stdu 1,-112(1) +- ld 3,48(3) +- ld 9,40(30) ++ stdu 1,-128(1) ++ .cfi_def_cfa_offset 128 ++ .cfi_offset 65, 16 + mr 31,1 ++ .cfi_def_cfa_register 31 ++ ld 3,48(3) + ld 10,0(1) ++ ld 9,-28688(13) ++ std 9,104(31) ++ li 9,0 ++ ld 9,40(30) ++ stdu 10,-2048(1) + subf 9,3,9 +- stdu 10,-2064(1) + sradi 9,9,3 + cmpwi 7,9,8 + ble 7,.L6 +- addi 10,9,-9 +- addi 8,1,96 +- addi 9,3,56 +- rldicl 10,10,0,32 +- addi 8,8,-8 +- addi 10,10,8 +- sldi 10,10,3 +- add 10,3,10 ++ addi 8,9,-9 ++ addi 7,1,96 ++ addi 10,3,56 ++ rldic 8,8,3,29 ++ addi 9,7,-8 ++ add 7,7,8 + .p2align 4,,15 + .L5: +- ldu 7,8(9) +- cmpld 7,10,9 +- stdu 7,8(8) ++ ldu 8,8(10) ++ stdu 8,8(9) ++ cmpld 7,7,9 + bne 7,.L5 + .L6: + ld 10,64(30) +@@ -114,191 +122,210 @@ + ld 2,24(1) + lwz 9,24(30) + cmplwi 7,9,1 +- beq 7,.L19 ++ beq 7,.L20 + cmpdi 7,9,0 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,2 +- beq 7,.L45 ++ beq 7,.L62 + cmplwi 7,9,3 +- beq 7,.L45 ++ beq 7,.L62 + cmplwi 7,9,4 +- beq 7,.L45 ++ beq 7,.L62 + cmplwi 7,9,5 +- beq 7,.L46 ++ beq 7,.L63 + cmplwi 7,9,6 +- beq 7,.L46 ++ beq 7,.L63 + cmplwi 7,9,7 +- beq 7,.L47 ++ beq 7,.L64 + cmplwi 7,9,8 +- beq 7,.L47 ++ beq 7,.L64 + cmplwi 7,9,9 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,10 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,11 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,12 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,13 +- beq 7,.L52 ++ beq 7,.L71 + cmplwi 7,9,14 +- beq 7,.L53 ++ beq 7,.L72 + cmplwi 7,9,15 +- beq 7,.L50 ++ beq 7,.L68 + cmplwi 7,9,16 +- bne 7,.L19 ++ bne 7,.L20 + lwz 9,0(30) +- rldicl. 10,9,55,63 +- beq 0,.L19 ++ andi. 9,9,0x200 ++ beq 0,.L20 + ld 10,32(30) + addi 9,10,-1 + cmpldi 7,9,15 +- bgt 7,.L19 +- ld 8,16(30) +- cmpldi 7,10,8 +- rldicl 9,8,0,61 +- rldicr 8,8,0,60 +- add 10,10,9 +- bgt 7,.L35 ++ bgt 7,.L20 ++ cmpldi 7,10,1 ++ ld 9,16(30) ++ rlwinm 8,3,0,0xff ++ beq 7,.L69 ++ cmpldi 7,10,2 ++ beq 7,.L73 ++ cmpldi 7,10,3 ++ rldicl 8,3,48,56 ++ beq 7,.L74 ++ cmpldi 7,10,4 ++ beq 7,.L75 ++ cmpldi 7,10,5 ++ rldicl 8,3,32,56 ++ beq 7,.L76 ++ cmpldi 7,10,6 ++ rldicl 7,3,24,56 ++ beq 7,.L77 ++ cmpldi 7,10,7 ++ rldicl 6,3,16,56 ++ beq 7,.L78 ++ std 3,0(9) ++ ld 10,32(30) + cmpldi 7,10,8 +- bgt 7,.L36 +- slwi 10,10,3 +- li 7,2 +- ld 6,0(8) +- slwi 9,9,3 +- addi 10,10,-1 +- sld 10,7,10 +- li 7,1 +- sld 7,7,9 +- sld 9,3,9 +- subf 10,7,10 +- xor 9,9,6 +- and 9,10,9 +- xor 9,9,6 +- std 9,0(8) +-.L19: +- addi 1,31,112 ++ beq 7,.L20 ++ cmpldi 7,10,9 ++ beq 7,.L79 ++ cmpldi 7,10,10 ++ beq 7,.L80 ++ cmpldi 7,10,11 ++ beq 7,.L81 ++ cmpldi 7,10,12 ++ beq 7,.L82 ++ cmpldi 7,10,13 ++ beq 7,.L83 ++ cmpldi 7,10,14 ++ beq 7,.L84 ++ cmpldi 7,10,15 ++ beq 7,.L85 ++ cmpldi 7,10,16 ++ bne 7,.L20 ++ std 4,8(9) ++ .p2align 4,,15 ++.L20: ++ ld 9,104(31) ++ ld 10,-28688(13) ++ xor. 9,9,10 ++ li 10,0 + li 3,0 ++ bne 0,.L86 ++ addi 1,31,128 ++ .cfi_remember_state ++ .cfi_def_cfa 1, 0 + ld 0,16(1) + ld 30,-16(1) + ld 31,-8(1) + mtlr 0 ++ .cfi_restore 65 ++ .cfi_restore 31 ++ .cfi_restore 30 + blr + .p2align 4,,15 +-.L50: ++.L68: ++ .cfi_restore_state + ld 9,16(30) + std 3,0(9) +- addi 1,31,112 +- li 3,0 +- ld 0,16(1) +- ld 30,-16(1) +- ld 31,-8(1) +- mtlr 0 +- blr ++ b .L20 + .p2align 4,,15 +-.L45: ++.L62: + ld 9,16(30) + stb 3,0(9) +- addi 1,31,112 +- li 3,0 +- ld 0,16(1) +- ld 30,-16(1) +- ld 31,-8(1) +- mtlr 0 +- blr +-.L46: ++ b .L20 ++.L63: + ld 9,16(30) + sth 3,0(9) +- b .L19 +-.L47: ++ b .L20 ++.L64: + ld 9,16(30) + stw 3,0(9) +- b .L19 +-.L52: ++ b .L20 ++.L71: + ld 9,16(30) + stfs 1,0(9) +- b .L19 +-.L53: ++ b .L20 ++.L72: + ld 9,16(30) + stfd 1,0(9) +- b .L19 +-.L36: +- rldicl 9,9,0,32 +- slwi 10,10,3 +- ld 11,0(8) +- ld 4,8(8) +- li 7,2 +- mulli 6,9,-8 +- addi 10,10,-65 +- slwi 9,9,3 +- sld 10,7,10 +- sld 5,3,9 +- li 7,-1 +- addi 6,6,64 +- addi 10,10,-1 +- sld 7,7,9 +- srad 3,3,6 +- xor 6,5,11 +- xor 9,3,4 +- and 7,7,6 +- and 9,10,9 +- xor 10,7,11 +- xor 9,9,4 +- std 10,0(8) +- std 9,8(8) +- b .L19 +-.L35: +- rldicl 9,9,0,32 +- ld 11,0(8) +- li 6,-1 +- cmpldi 7,10,16 +- slwi 5,9,3 +- sld 7,3,5 +- sld 6,6,5 +- xor 7,7,11 +- and 7,6,7 +- xor 7,7,11 +- std 7,0(8) +- ble 7,.L54 +- mulli 9,9,-8 +- ld 11,16(8) +- slwi 10,10,3 +- li 7,2 +- addi 10,10,-129 +- addi 9,9,64 +- sld 7,7,10 +- srad 6,4,9 +- srad 3,3,9 +- addi 7,7,-1 +- sld 9,4,5 +- xor 10,6,11 +- or 9,3,9 +- and 10,7,10 +- std 9,8(8) +- xor 10,10,11 +- std 10,16(8) +- b .L19 +-.L54: +- mulli 9,9,-4 +- slwi 10,10,3 +- ld 11,8(8) +- sld 4,4,5 +- addi 10,10,-65 +- li 6,2 +- addi 9,9,32 +- sld 10,6,10 +- srad 3,3,9 +- srad 9,3,9 +- or 7,9,4 +- addi 9,10,-1 +- xor 10,7,11 +- and 9,10,9 +- xor 9,9,11 +- std 9,8(8) +- b .L19 ++ b .L20 ++.L86: ++ bl __stack_chk_fail ++ nop ++.L74: ++ sth 3,1(9) ++.L69: ++ stb 8,0(9) ++ b .L20 ++.L85: ++ srdi 7,4,32 ++ sradi 8,4,24 ++ sradi 10,4,16 ++ sradi 4,4,8 ++ stw 7,8(9) ++ stb 8,12(9) ++ stb 10,13(9) ++ stb 4,14(9) ++ b .L20 ++.L76: ++ stw 3,1(9) ++ stb 8,0(9) ++ b .L20 ++.L75: ++ stw 3,0(9) ++ b .L20 ++.L73: ++ sth 3,0(9) ++ b .L20 ++.L84: ++ srdi 8,4,32 ++ sradi 10,4,24 ++ sradi 4,4,16 ++ stw 8,8(9) ++ stb 10,12(9) ++ stb 4,13(9) ++ b .L20 ++.L83: ++ srdi 10,4,32 ++ sradi 4,4,24 ++ stw 10,8(9) ++ stb 4,12(9) ++ b .L20 ++.L82: ++ srdi 4,4,32 ++ stw 4,8(9) ++ b .L20 ++.L81: ++ srdi 10,4,48 ++ sradi 4,4,40 ++ sth 10,8(9) ++ stb 4,10(9) ++ b .L20 ++.L80: ++ srdi 4,4,48 ++ sth 4,8(9) ++ b .L20 ++.L79: ++ sradi 4,4,56 ++ stb 4,8(9) ++ b .L20 ++.L78: ++ stw 3,3(9) ++ stb 8,2(9) ++ stb 7,1(9) ++ stb 6,0(9) ++ b .L20 ++.L77: ++ stw 3,2(9) ++ stb 8,1(9) ++ stb 7,0(9) ++ b .L20 + .long 0 + .byte 0,0,0,1,128,2,0,0 ++ .cfi_endproc ++.LFE0: + .size avcall_call,.-avcall_call ++ .gnu_attribute 4, 9 + #if defined __linux__ || defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__ + .section .note.GNU-stack,"",@progbits + #endif +--- libffcall-2.2/vacall/vacall-powerpc64.c.old 2020-05-11 23:11:15.566571148 +0000 ++++ libffcall-2.2/vacall/vacall-powerpc64.c 2020-05-11 23:16:52.489693582 +0000 +@@ -140,111 +140,111 @@ + if (list.flags & __VA_REGISTER_STRUCT_RETURN) { + /* In the ELFv2 ABI, gcc returns structs of size <= 16 in registers. */ + if (list.rsize > 0 && list.rsize <= 16) { +- #if 0 /* Unoptimized */ ++ #if 1 /* Unoptimized */ + if (list.rsize == 1) { + iret = (__vaword)((unsigned char *) list.raddr)[0]; + } else + if (list.rsize == 2) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8); ++ iret = ((__vaword)((unsigned char *) list.raddr)[1]) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 8); + } else + if (list.rsize == 3) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) ++ iret = ((__vaword)((unsigned char *) list.raddr)[2]) + | ((__vaword)((unsigned char *) list.raddr)[1] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[2] << 16); ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 16); + } else + if (list.rsize == 4) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[2] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[3] << 24); ++ iret = ((__vaword)((unsigned char *) list.raddr)[3]) ++ | ((__vaword)((unsigned char *) list.raddr)[2] << 8) ++ | ((__vaword)((unsigned char *) list.raddr)[1] << 16) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 24); + } else + if (list.rsize == 5) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8) ++ iret = ((__vaword)((unsigned char *) list.raddr)[4]) ++ | ((__vaword)((unsigned char *) list.raddr)[3] << 8) + | ((__vaword)((unsigned char *) list.raddr)[2] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[3] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[4] << 32); ++ | ((__vaword)((unsigned char *) list.raddr)[1] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 32); + } else + if (list.rsize == 6) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[2] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[3] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[4] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[5] << 40); ++ iret = ((__vaword)((unsigned char *) list.raddr)[5]) ++ | ((__vaword)((unsigned char *) list.raddr)[4] << 8) ++ | ((__vaword)((unsigned char *) list.raddr)[3] << 16) ++ | ((__vaword)((unsigned char *) list.raddr)[2] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[1] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 40); + } else + if (list.rsize == 7) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[2] << 16) ++ iret = ((__vaword)((unsigned char *) list.raddr)[6]) ++ | ((__vaword)((unsigned char *) list.raddr)[5] << 8) ++ | ((__vaword)((unsigned char *) list.raddr)[4] << 16) + | ((__vaword)((unsigned char *) list.raddr)[3] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[4] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[5] << 40) +- | ((__vaword)((unsigned char *) list.raddr)[6] << 48); ++ | ((__vaword)((unsigned char *) list.raddr)[2] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[1] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 48); + } else + if (list.rsize >= 8 && list.rsize <= 16) { +- iret = ((__vaword)((unsigned char *) list.raddr)[0]) +- | ((__vaword)((unsigned char *) list.raddr)[1] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[2] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[3] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[4] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[5] << 40) +- | ((__vaword)((unsigned char *) list.raddr)[6] << 48) +- | ((__vaword)((unsigned char *) list.raddr)[7] << 56); ++ iret = ((__vaword)((unsigned char *) list.raddr)[7]) ++ | ((__vaword)((unsigned char *) list.raddr)[6] << 8) ++ | ((__vaword)((unsigned char *) list.raddr)[5] << 16) ++ | ((__vaword)((unsigned char *) list.raddr)[4] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[3] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[2] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[1] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[0] << 56); + if (list.rsize == 8) { + } else + if (list.rsize == 9) { +- iret2 = (__vaword)((unsigned char *) list.raddr)[8]; ++ iret2 = (__vaword)((unsigned char *) list.raddr)[8] << 56; + } else + if (list.rsize == 10) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48); + } else + if (list.rsize == 11) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40); + } else + if (list.rsize == 12) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[11] << 24); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[11] << 32); + } else + if (list.rsize == 13) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[11] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[12] << 32); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[11] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[12] << 24); + } else + if (list.rsize == 14) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[11] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[12] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[13] << 40); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[11] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[12] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[13] << 16); + } else + if (list.rsize == 15) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[11] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[12] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[13] << 40) +- | ((__vaword)((unsigned char *) list.raddr)[14] << 48); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[11] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[12] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[13] << 16) ++ | ((__vaword)((unsigned char *) list.raddr)[14] << 8); + } else + if (list.rsize == 16) { +- iret2 = ((__vaword)((unsigned char *) list.raddr)[8]) +- | ((__vaword)((unsigned char *) list.raddr)[9] << 8) +- | ((__vaword)((unsigned char *) list.raddr)[10] << 16) +- | ((__vaword)((unsigned char *) list.raddr)[11] << 24) +- | ((__vaword)((unsigned char *) list.raddr)[12] << 32) +- | ((__vaword)((unsigned char *) list.raddr)[13] << 40) +- | ((__vaword)((unsigned char *) list.raddr)[14] << 48) +- | ((__vaword)((unsigned char *) list.raddr)[15] << 56); ++ iret2 = ((__vaword)((unsigned char *) list.raddr)[8] << 56) ++ | ((__vaword)((unsigned char *) list.raddr)[9] << 48) ++ | ((__vaword)((unsigned char *) list.raddr)[10] << 40) ++ | ((__vaword)((unsigned char *) list.raddr)[11] << 32) ++ | ((__vaword)((unsigned char *) list.raddr)[12] << 24) ++ | ((__vaword)((unsigned char *) list.raddr)[13] << 16) ++ | ((__vaword)((unsigned char *) list.raddr)[14] << 8) ++ | ((__vaword)((unsigned char *) list.raddr)[15]); + } + } + #else /* Optimized: fewer conditional jumps, fewer memory accesses */ +--- libffcall-2.2/vacall/vacall-powerpc64-elfv2-linux.S.old 2019-08-25 01:03:06.000000000 +0000 ++++ libffcall-2.2/vacall/vacall-powerpc64-elfv2-linux.S 2020-05-11 23:18:00.842212129 +0000 +@@ -1,9 +1,8 @@ + .file "vacall-powerpc64.c" +- .machine power4 + .abiversion 2 +- .section ".toc","aw" + .section ".text" + .section ".toc","aw" ++ .align 3 + .LC0: + .quad vacall_function + .section ".text" +@@ -12,40 +11,50 @@ + .globl vacall_receiver + .type vacall_receiver, @function + vacall_receiver: +-0: addis 2,12,.TOC.-0b@ha +- addi 2,2,.TOC.-0b@l ++.LFB0: ++ .cfi_startproc ++.LCF0: ++0: addis 2,12,.TOC.-.LCF0@ha ++ addi 2,2,.TOC.-.LCF0@l + .localentry vacall_receiver,.-vacall_receiver + mflr 0 + std 31,-8(1) ++ std 30,-16(1) + addis 11,2,.LC0@toc@ha +- ld 12,.LC0@toc@l(11) +- li 11,0 + std 0,16(1) + stdu 1,-224(1) +- mr 31,1 +- ld 0,0(12) ++ .cfi_def_cfa_offset 224 ++ .cfi_offset 65, 16 ++ .cfi_offset 31, -8 ++ .cfi_offset 30, -16 ++ li 0,0 ++ ld 12,.LC0@toc@l(11) + std 2,24(1) ++ mr 31,1 ++ .cfi_def_cfa_register 31 ++ addi 11,31,256 ++ ld 30,-28688(13) ++ std 30,200(31) ++ li 30,0 ++ std 6,280(31) ++ ld 6,0(12) + std 9,304(31) + li 9,0 + std 3,256(31) +- addi 3,31,32 + std 4,264(31) ++ stfd 1,96(31) + std 5,272(31) +- mtctr 0 +- stw 9,32(31) +- std 6,280(31) + std 7,288(31) + std 8,296(31) ++ mtctr 6 + std 10,312(31) +- stfd 1,96(31) +- addi 9,31,256 + stfd 2,104(31) + stfd 3,112(31) + stfd 4,120(31) ++ mr 12,6 + stfd 5,128(31) +- mr 12,0 +- std 9,56(31) + stfd 6,136(31) ++ addi 3,31,32 + stfd 7,144(31) + stfd 8,152(31) + stfd 9,160(31) +@@ -53,173 +62,232 @@ + stfd 11,176(31) + stfd 12,184(31) + stfd 13,192(31) +- std 11,64(31) +- stw 11,72(31) +- stw 11,88(31) ++ stw 0,32(31) ++ std 11,56(31) ++ std 9,64(31) ++ stw 9,72(31) ++ stw 9,88(31) + bctrl + ld 2,24(1) + lwz 9,72(31) + cmpdi 7,9,0 + beq 7,.L1 + cmplwi 7,9,1 +- beq 7,.L27 ++ beq 7,.L41 + cmplwi 7,9,2 +- beq 7,.L30 ++ beq 7,.L45 + cmplwi 7,9,3 +- beq 7,.L27 ++ beq 7,.L41 + cmplwi 7,9,4 +- beq 7,.L31 ++ beq 7,.L46 + cmplwi 7,9,5 +- beq 7,.L32 ++ beq 7,.L47 + cmplwi 7,9,6 +- beq 7,.L33 ++ beq 7,.L48 + cmplwi 7,9,7 +- beq 7,.L34 ++ beq 7,.L49 + cmplwi 7,9,8 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,9 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,10 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,11 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,12 +- beq 7,.L35 ++ beq 7,.L50 + cmplwi 7,9,13 +- beq 7,.L36 ++ beq 7,.L51 + cmplwi 7,9,14 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,15 + bne 7,.L1 + lwz 9,32(31) +- rldicl. 10,9,54,63 ++ andi. 9,9,0x400 + beq 0,.L1 +- ld 9,80(31) +- addi 10,9,-1 +- cmpldi 7,10,15 ++ ld 10,80(31) ++ addi 9,10,-1 ++ cmpldi 7,9,15 + bgt 7,.L1 ++ cmpldi 7,10,1 + ld 8,64(31) +- cmpldi 7,9,8 +- rldicl 10,8,0,61 +- rldicr 8,8,0,60 +- add 9,9,10 +- bgt 7,.L17 +- cmpldi 7,9,8 +- slwi 9,9,3 +- bgt 7,.L18 +- ld 7,0(8) +- addi 9,9,-1 +- li 8,2 +- slwi 10,10,3 +- sld 9,8,9 +- addi 9,9,-1 +- and 9,9,7 +- srad 3,9,10 ++ lbz 9,0(8) ++ beq 7,.L52 ++ cmpldi 7,10,2 ++ beq 7,.L53 ++ cmpldi 7,10,3 ++ lbz 7,1(8) ++ lbz 6,2(8) ++ beq 7,.L54 ++ cmpldi 7,10,4 ++ beq 7,.L55 ++ cmpldi 7,10,5 ++ beq 7,.L56 ++ cmpldi 7,10,6 ++ beq 7,.L57 ++ cmpldi 7,10,7 ++ beq 7,.L58 ++ cmpldi 7,10,8 ++ ld 3,0(8) ++ beq 7,.L1 ++ cmpldi 7,10,9 ++ lbz 9,8(8) ++ sldi 9,9,56 ++ beq 7,.L59 ++ lbz 7,9(8) ++ cmpldi 7,10,10 ++ sldi 7,7,48 ++ or 7,7,9 ++ beq 7,.L60 ++ cmpldi 7,10,11 ++ lbz 9,10(8) ++ sldi 9,9,40 ++ beq 7,.L43 ++ cmpldi 7,10,12 ++ lbz 6,11(8) ++ sldi 6,6,32 ++ beq 7,.L61 ++ cmpldi 7,10,13 ++ lbz 5,12(8) ++ sldi 5,5,24 ++ beq 7,.L62 ++ cmpldi 7,10,14 ++ lbz 11,13(8) ++ sldi 11,11,16 ++ beq 7,.L63 ++ cmpldi 7,10,15 ++ beq 7,.L64 ++ ld 4,8(8) ++ .p2align 4,,15 + .L1: ++ ld 9,200(31) ++ ld 10,-28688(13) ++ xor. 9,9,10 ++ li 10,0 ++ bne 0,.L65 + addi 1,31,224 ++ .cfi_remember_state ++ .cfi_def_cfa 1, 0 + ld 0,16(1) ++ ld 30,-16(1) + ld 31,-8(1) + mtlr 0 ++ .cfi_restore 65 ++ .cfi_restore 31 ++ .cfi_restore 30 + blr + .p2align 4,,15 +-.L27: +- addi 1,31,224 ++.L41: ++ .cfi_restore_state + lbz 3,40(31) +- ld 0,16(1) +- ld 31,-8(1) +- mtlr 0 +- blr ++ b .L1 + .p2align 4,,15 +-.L30: +- lbz 9,40(31) +- extsb 3,9 ++.L45: ++ lbz 3,40(31) ++ extsb 3,3 + b .L1 + .p2align 4,,15 +-.L28: +- ld 3,40(31) ++.L48: ++ lwa 3,40(31) + b .L1 + .p2align 4,,15 +-.L31: ++.L46: + lha 3,40(31) + b .L1 + .p2align 4,,15 +-.L32: ++.L47: + lhz 3,40(31) + b .L1 + .p2align 4,,15 +-.L33: +- lwa 3,40(31) +- b .L1 +- .p2align 4,,15 +-.L35: +- lfs 1,40(31) ++.L42: ++ ld 3,40(31) + b .L1 + .p2align 4,,15 +-.L34: ++.L49: + lwz 3,40(31) + b .L1 +-.L36: ++.L50: ++ lfs 1,40(31) ++ b .L1 ++.L51: + lfd 1,40(31) + b .L1 +-.L17: +- cmpldi 7,9,16 +- rldicl 10,10,0,32 +- slwi 9,9,3 +- ble 7,.L37 +- li 7,2 +- addi 9,9,-129 +- ld 11,16(8) +- ld 5,0(8) +- mulli 6,10,-8 +- sld 9,7,9 +- ld 7,8(8) +- addi 8,9,-1 +- slwi 9,10,3 +- addi 6,6,64 +- and 10,8,11 +- srad 8,5,9 +- sld 5,7,6 +- srad 9,7,9 +- sld 10,10,6 +- or 3,8,5 +- or 4,10,9 +- b .L1 +-.L18: +- rldicl 10,10,0,32 +- li 7,2 +- ld 6,8(8) +- ld 8,0(8) +- addi 9,9,-65 +- sld 9,7,9 +- mulli 7,10,-8 +- slwi 10,10,3 +- addi 9,9,-1 +- srad 10,8,10 +- and 9,9,6 +- addi 7,7,64 +- sld 9,9,7 +- or 3,9,10 +- b .L1 +-.L37: +- li 7,2 +- addi 9,9,-65 +- ld 5,8(8) +- ld 6,0(8) +- sld 9,7,9 +- mulli 7,10,-4 +- addi 9,9,-1 +- addi 7,7,32 +- and 8,9,5 +- slwi 9,10,3 +- sld 10,8,7 +- srad 6,6,9 +- srad 4,8,9 +- sld 7,10,7 +- or 3,6,7 ++.L65: ++ bl __stack_chk_fail ++ nop ++.L64: ++ or 4,9,6 ++ lbz 9,14(8) ++ or 4,4,5 ++ sldi 9,9,8 ++ or 4,4,11 ++ or 4,4,9 ++ or 4,4,7 ++ b .L1 ++.L63: ++ or 4,9,6 ++ or 4,4,5 ++ or 4,4,11 ++ or 4,4,7 ++ b .L1 ++.L55: ++ lwz 3,0(8) ++ b .L1 ++.L54: ++ sldi 7,7,8 ++ sldi 9,9,16 ++ or 9,7,9 ++ or 3,9,6 ++ b .L1 ++.L53: ++ lhz 3,0(8) ++ b .L1 ++.L52: ++ mr 3,9 ++ b .L1 ++.L62: ++ or 9,9,6 ++ or 4,9,5 ++ or 4,4,7 ++ b .L1 ++.L61: ++ or 9,9,6 ++.L43: ++ or 4,9,7 ++ b .L1 ++.L60: ++ mr 4,7 ++ b .L1 ++.L59: ++ mr 4,9 ++ b .L1 ++.L58: ++ sldi 6,6,32 ++ sldi 7,7,40 ++ lwz 3,3(8) ++ sldi 9,9,48 ++ or 7,6,7 ++ or 3,7,3 ++ or 3,3,9 ++ b .L1 ++.L57: ++ sldi 7,7,32 ++ sldi 9,9,40 ++ lwz 3,2(8) ++ or 9,7,9 ++ or 3,9,3 ++ b .L1 ++.L56: ++ lwz 3,1(8) ++ sldi 9,9,32 ++ or 3,3,9 + b .L1 + .long 0 +- .byte 0,0,0,1,128,1,0,0 ++ .byte 0,0,0,1,128,2,0,0 ++ .cfi_endproc ++.LFE0: + .size vacall_receiver,.-vacall_receiver ++ .gnu_attribute 4, 9 + #if defined __linux__ || defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__ + .section .note.GNU-stack,"",@progbits + #endif +--- libffcall-2.2/callback/vacall_r/vacall-powerpc64-elfv2-linux.S.old 2019-08-25 01:03:08.000000000 +0000 ++++ libffcall-2.2/callback/vacall_r/vacall-powerpc64-elfv2-linux.S 2020-05-11 23:26:54.443785997 +0000 +@@ -1,45 +1,56 @@ + .file "vacall-powerpc64.c" +- .machine power4 + .abiversion 2 +- .section ".toc","aw" + .section ".text" + .align 2 + .p2align 4,,15 + .type callback_receiver, @function + callback_receiver: +-0: addis 2,12,.TOC.-0b@ha +- addi 2,2,.TOC.-0b@l ++.LFB0: ++ .cfi_startproc ++.LCF0: ++0: addis 2,12,.TOC.-.LCF0@ha ++ addi 2,2,.TOC.-.LCF0@l + .localentry callback_receiver,.-callback_receiver + mflr 0 +- std 30,-16(1) ++ std 28,-32(1) ++ std 29,-24(1) + std 31,-8(1) ++ std 30,-16(1) + std 0,16(1) +- stdu 1,-224(1) +- li 0,0 +- ld 30,0(11) ++ stdu 1,-240(1) ++ .cfi_def_cfa_offset 240 ++ .cfi_offset 65, 16 ++ .cfi_offset 28, -32 ++ .cfi_offset 29, -24 ++ .cfi_offset 31, -8 ++ .cfi_offset 30, -16 ++ li 28,0 ++ std 2,24(1) + mr 31,1 +- std 3,256(31) +- std 4,264(31) +- addi 4,31,32 +- ld 3,8(11) +- std 9,304(31) +- mtctr 30 ++ .cfi_def_cfa_register 31 ++ addi 29,31,272 ++ ld 0,-28688(13) ++ std 0,200(31) ++ li 0,0 ++ ld 0,0(11) ++ std 9,320(31) + li 9,0 +- std 5,272(31) +- std 6,280(31) +- std 7,288(31) +- std 8,296(31) +- stw 9,32(31) +- std 10,312(31) + stfd 1,96(31) ++ std 3,272(31) ++ std 4,280(31) ++ std 5,288(31) + stfd 2,104(31) +- mr 12,30 +- addi 9,31,256 ++ mtctr 0 ++ std 6,296(31) ++ std 7,304(31) ++ std 8,312(31) ++ std 10,328(31) + stfd 3,112(31) + stfd 4,120(31) + stfd 5,128(31) + stfd 6,136(31) +- std 9,56(31) ++ mr 12,0 ++ addi 4,31,32 + stfd 7,144(31) + stfd 8,152(31) + stfd 9,160(31) +@@ -47,195 +58,266 @@ + stfd 11,176(31) + stfd 12,184(31) + stfd 13,192(31) +- std 0,64(31) +- stw 0,72(31) +- stw 0,88(31) +- std 2,24(1) ++ ld 3,8(11) ++ stw 28,32(31) ++ std 9,64(31) ++ stw 9,72(31) ++ stw 9,88(31) ++ std 29,56(31) + bctrl + ld 2,24(1) + lwz 9,72(31) + cmpdi 7,9,0 + beq 7,.L1 + cmplwi 7,9,1 +- beq 7,.L27 ++ beq 7,.L41 + cmplwi 7,9,2 +- beq 7,.L30 ++ beq 7,.L45 + cmplwi 7,9,3 +- beq 7,.L27 ++ beq 7,.L41 + cmplwi 7,9,4 +- beq 7,.L31 ++ beq 7,.L46 + cmplwi 7,9,5 +- beq 7,.L32 ++ beq 7,.L47 + cmplwi 7,9,6 +- beq 7,.L33 ++ beq 7,.L48 + cmplwi 7,9,7 +- beq 7,.L34 ++ beq 7,.L49 + cmplwi 7,9,8 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,9 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,10 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,11 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,12 +- beq 7,.L35 ++ beq 7,.L50 + cmplwi 7,9,13 +- beq 7,.L36 ++ beq 7,.L51 + cmplwi 7,9,14 +- beq 7,.L28 ++ beq 7,.L42 + cmplwi 7,9,15 + bne 7,.L1 + lwz 9,32(31) +- rldicl. 10,9,54,63 ++ andi. 9,9,0x400 + beq 0,.L1 +- ld 9,80(31) +- addi 10,9,-1 +- cmpldi 7,10,15 ++ ld 10,80(31) ++ addi 9,10,-1 ++ cmpldi 7,9,15 + bgt 7,.L1 ++ cmpldi 7,10,1 + ld 8,64(31) +- cmpldi 7,9,8 +- rldicl 10,8,0,61 +- rldicr 8,8,0,60 +- add 9,9,10 +- bgt 7,.L17 +- cmpldi 7,9,8 +- slwi 9,9,3 +- bgt 7,.L18 +- ld 7,0(8) +- addi 9,9,-1 +- li 8,2 +- slwi 10,10,3 +- sld 9,8,9 +- addi 9,9,-1 +- and 9,9,7 +- srad 3,9,10 ++ lbz 9,0(8) ++ beq 7,.L52 ++ cmpldi 7,10,2 ++ beq 7,.L53 ++ cmpldi 7,10,3 ++ lbz 7,1(8) ++ lbz 6,2(8) ++ beq 7,.L54 ++ cmpldi 7,10,4 ++ beq 7,.L55 ++ cmpldi 7,10,5 ++ beq 7,.L56 ++ cmpldi 7,10,6 ++ beq 7,.L57 ++ cmpldi 7,10,7 ++ beq 7,.L58 ++ cmpldi 7,10,8 ++ ld 3,0(8) ++ beq 7,.L1 ++ cmpldi 7,10,9 ++ lbz 9,8(8) ++ sldi 9,9,56 ++ beq 7,.L59 ++ lbz 7,9(8) ++ cmpldi 7,10,10 ++ sldi 7,7,48 ++ or 7,7,9 ++ beq 7,.L60 ++ cmpldi 7,10,11 ++ lbz 9,10(8) ++ sldi 9,9,40 ++ beq 7,.L43 ++ cmpldi 7,10,12 ++ lbz 6,11(8) ++ sldi 6,6,32 ++ beq 7,.L61 ++ cmpldi 7,10,13 ++ lbz 5,12(8) ++ sldi 5,5,24 ++ beq 7,.L62 ++ cmpldi 7,10,14 ++ lbz 0,13(8) ++ sldi 0,0,16 ++ beq 7,.L63 ++ cmpldi 7,10,15 ++ beq 7,.L64 ++ ld 4,8(8) ++ .p2align 4,,15 + .L1: +- addi 1,31,224 ++ ld 9,200(31) ++ ld 10,-28688(13) ++ xor. 9,9,10 ++ li 10,0 ++ bne 0,.L65 ++ addi 1,31,240 ++ .cfi_remember_state ++ .cfi_def_cfa 1, 0 + ld 0,16(1) ++ ld 28,-32(1) ++ ld 29,-24(1) + ld 30,-16(1) + ld 31,-8(1) + mtlr 0 ++ .cfi_restore 65 ++ .cfi_restore 31 ++ .cfi_restore 30 ++ .cfi_restore 29 ++ .cfi_restore 28 + blr + .p2align 4,,15 +-.L27: +- addi 1,31,224 ++.L41: ++ .cfi_restore_state + lbz 3,40(31) +- ld 0,16(1) +- ld 30,-16(1) +- ld 31,-8(1) +- mtlr 0 +- blr ++ b .L1 + .p2align 4,,15 +-.L30: +- lbz 9,40(31) +- extsb 3,9 ++.L45: ++ lbz 3,40(31) ++ extsb 3,3 + b .L1 + .p2align 4,,15 +-.L28: +- ld 3,40(31) ++.L48: ++ lwa 3,40(31) + b .L1 + .p2align 4,,15 +-.L31: ++.L46: + lha 3,40(31) + b .L1 + .p2align 4,,15 +-.L32: ++.L47: + lhz 3,40(31) + b .L1 + .p2align 4,,15 +-.L33: +- lwa 3,40(31) +- b .L1 +- .p2align 4,,15 +-.L35: +- lfs 1,40(31) ++.L42: ++ ld 3,40(31) + b .L1 + .p2align 4,,15 +-.L34: ++.L49: + lwz 3,40(31) + b .L1 +-.L36: ++.L50: ++ lfs 1,40(31) ++ b .L1 ++.L51: + lfd 1,40(31) + b .L1 +-.L17: +- cmpldi 7,9,16 +- rldicl 10,10,0,32 +- slwi 9,9,3 +- ble 7,.L37 +- li 7,2 +- addi 9,9,-129 +- ld 0,16(8) +- ld 5,0(8) +- mulli 6,10,-8 +- sld 9,7,9 +- ld 7,8(8) +- addi 8,9,-1 +- slwi 9,10,3 +- addi 6,6,64 +- and 10,8,0 +- srad 8,5,9 +- sld 5,7,6 +- srad 9,7,9 +- sld 10,10,6 +- or 3,8,5 +- or 4,10,9 +- b .L1 +-.L18: +- rldicl 10,10,0,32 +- li 7,2 +- ld 6,8(8) +- ld 8,0(8) +- addi 9,9,-65 +- sld 9,7,9 +- mulli 7,10,-8 +- slwi 10,10,3 +- addi 9,9,-1 +- srad 10,8,10 +- and 9,9,6 +- addi 7,7,64 +- sld 9,9,7 +- or 3,9,10 +- b .L1 +-.L37: +- li 7,2 +- addi 9,9,-65 +- ld 5,8(8) +- ld 6,0(8) +- sld 9,7,9 +- mulli 7,10,-4 +- addi 9,9,-1 +- addi 7,7,32 +- and 8,9,5 +- slwi 9,10,3 +- sld 10,8,7 +- srad 6,6,9 +- srad 4,8,9 +- sld 7,10,7 +- or 3,6,7 ++.L65: ++ bl __stack_chk_fail ++ nop ++.L64: ++ or 4,9,6 ++ lbz 9,14(8) ++ or 4,4,5 ++ sldi 9,9,8 ++ or 4,4,0 ++ or 4,4,9 ++ or 4,4,7 ++ b .L1 ++.L63: ++ or 4,9,6 ++ or 4,4,5 ++ or 4,4,0 ++ or 4,4,7 ++ b .L1 ++.L55: ++ lwz 3,0(8) ++ b .L1 ++.L54: ++ sldi 7,7,8 ++ sldi 9,9,16 ++ or 9,7,9 ++ or 3,9,6 ++ b .L1 ++.L53: ++ lhz 3,0(8) ++ b .L1 ++.L52: ++ mr 3,9 ++ b .L1 ++.L62: ++ or 9,9,6 ++ or 4,9,5 ++ or 4,4,7 ++ b .L1 ++.L61: ++ or 9,9,6 ++.L43: ++ or 4,9,7 ++ b .L1 ++.L60: ++ mr 4,7 ++ b .L1 ++.L59: ++ mr 4,9 ++ b .L1 ++.L58: ++ sldi 6,6,32 ++ sldi 7,7,40 ++ lwz 3,3(8) ++ sldi 9,9,48 ++ or 7,6,7 ++ or 3,7,3 ++ or 3,3,9 ++ b .L1 ++.L57: ++ sldi 7,7,32 ++ sldi 9,9,40 ++ lwz 3,2(8) ++ or 9,7,9 ++ or 3,9,3 ++ b .L1 ++.L56: ++ lwz 3,1(8) ++ sldi 9,9,32 ++ or 3,3,9 + b .L1 + .long 0 +- .byte 0,0,0,1,128,2,0,0 ++ .byte 0,0,0,1,128,4,0,0 ++ .cfi_endproc ++.LFE0: + .size callback_receiver,.-callback_receiver + .align 2 + .p2align 4,,15 + .globl callback_get_receiver + .type callback_get_receiver, @function + callback_get_receiver: +-0: addis 2,12,.TOC.-0b@ha +- addi 2,2,.TOC.-0b@l ++.LFB1: ++ .cfi_startproc ++.LCF1: ++0: addis 2,12,.TOC.-.LCF1@ha ++ addi 2,2,.TOC.-.LCF1@l + .localentry callback_get_receiver,.-callback_get_receiver + std 31,-8(1) + stdu 1,-48(1) ++ .cfi_def_cfa_offset 48 ++ .cfi_offset 31, -8 + addis 3,2,callback_receiver@toc@ha + addi 3,3,callback_receiver@toc@l + mr 31,1 ++ .cfi_def_cfa_register 31 + addi 1,31,48 ++ .cfi_def_cfa 1, 0 + ld 31,-8(1) ++ .cfi_restore 31 + blr + .long 0 + .byte 0,0,0,0,128,1,0,0 ++ .cfi_endproc ++.LFE1: + .size callback_get_receiver,.-callback_get_receiver ++ .gnu_attribute 4, 9 + #if defined __linux__ || defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__ + .section .note.GNU-stack,"",@progbits + #endif diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 62110c28a..674621204 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt library for file management and bindings for libfm" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" depends_dev="libfm-dev menu-cache-dev libexif-dev" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev qt5-qtx11extras-dev $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 libfm-qt-0.14.1.tar.xz" +sha512sums="9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5 libfm-qt-0.15.1.tar.xz" diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD index bfa1a39b3..246642192 100644 --- a/user/libgit2/APKBUILD +++ b/user/libgit2/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgit2 -pkgver=0.28.4 +pkgver=0.28.5 pkgrel=0 pkgdesc="Pure C re-entrant library for custom Git applications" url="https://libgit2.org/" @@ -37,11 +37,12 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Don't run online tests by default. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E online } package() { make DESTDIR="$pkgdir" install } -sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 libgit2-0.28.4.tar.gz" +sha512sums="abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a libgit2-0.28.5.tar.gz" diff --git a/user/libgnt/APKBUILD b/user/libgnt/APKBUILD new file mode 100644 index 000000000..bd4b921c4 --- /dev/null +++ b/user/libgnt/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libgnt +pkgver=2.14.0 +pkgrel=0 +pkgdesc="Glib Ncurses Toolkit" +url="https://pidgin.im/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="glib-dev gtk-doc meson ncurses-dev ninja" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/pidgin/libgnt-$pkgver.tar.xz + tinfo.patch + " + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38 libgnt-2.14.0.tar.xz +56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416 tinfo.patch" diff --git a/user/libgnt/tinfo.patch b/user/libgnt/tinfo.patch new file mode 100644 index 000000000..1e4ab4902 --- /dev/null +++ b/user/libgnt/tinfo.patch @@ -0,0 +1,18 @@ +--- libgnt-2.14.0/meson.build ++++ libgnt-2.14.0/meson.build +@@ -72,6 +72,7 @@ + ncurses_available = true + ncurses_inc = [] + ncurses_libs = [ ++ compiler.find_library('tinfow', required : false), + compiler.find_library('ncursesw', required : false), + compiler.find_library('panelw', required : false) + ] +@@ -113,6 +114,7 @@ + else + # ncursesw was not found. Look for plain old ncurses + ncurses_libs = [ ++ compiler.find_library('tinfo', required : false), + compiler.find_library('ncurses', required : false), + compiler.find_library('panel', required : false) + ] diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index aee8693b1..e152d5e7b 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.23 -pkgrel=1 +pkgver=2.5.25 +pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" arch="all" @@ -42,4 +42,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="f5f8f33e934989e6f832952c6c7c2c9e37c436652a08191e8ccced293447a090cb596fff80b9b0ad52c99c0ffc08a1207ca7ef2b630dc52f4c6d7f86e4cbc95a libgphoto2-2.5.23.tar.bz2" +sha512sums="ee3b9c36d41eb1271faad7a172b0c58134debf8c1104396868fa2c1032d69b4e8821117825f952049a6c36078461aabb7f87712c8563573fa69d1e9383b87845 libgphoto2-2.5.25.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index cd5faf416..5ad06e158 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.46 +pkgver=1.14.47 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -42,4 +42,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0 libgsf-1.14.46.tar.xz" +sha512sums="143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b libgsf-1.14.47.tar.xz" diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 0adc3e92f..3a3fd1858 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libical -pkgver=3.0.7 +pkgver=3.0.8 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8 libical-3.0.7.tar.gz" +sha512sums="ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b libical-3.0.8.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 1e2c6d670..b5562874e 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.15.4 +pkgver=1.15.6 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz" +sha512sums="90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969 libinput-1.15.6.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index ad4a4076a..cbecdd1a4 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" @@ -10,7 +10,9 @@ license="IJG AND BSD-3-Clause AND Zlib" depends="" makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" -source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz + CVE-2020-13790.patch + " case "$CTARGET_ARCH" in pmmx | x86 | x86_64) makedepends="$makedepends nasm" ;; @@ -19,11 +21,20 @@ esac # secfixes: # 2.0.3-r0: # - CVE-2019-2201 +# 2.0.4-r1: +# - CVE-2020-13790 build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/344 + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + case "$CARCH" in + ppc) _floattest=64bit;; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \ @@ -32,6 +43,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_STATIC=OFF \ -DWITH_JPEG8=ON \ + ${_floattest:+-DFLOATTEST="$_floattest"} \ ${CMAKE_CROSSOPTS} . make } @@ -51,4 +63,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz" +sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz +83752558d0cf60508a9ccd55505b91f4faa22277537916629a045b2aaa0cb3649e2f90b0df26d389687dc4aba78bdf76e64fc5e5eb324a65026ec86cd95dbe6a CVE-2020-13790.patch" diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch new file mode 100644 index 000000000..aaeec0c9c --- /dev/null +++ b/user/libjpeg-turbo/CVE-2020-13790.patch @@ -0,0 +1,35 @@ +From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001 +From: DRC <information@libjpeg-turbo.org> +Date: Tue, 2 Jun 2020 14:15:37 -0500 +Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM + +This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to +include binary PPM files with maximum values < 255, thus preventing a +malformed binary PPM input file with those specifications from +triggering an overrun of the rescale array and potentially crashing +cjpeg, TJBench, or any program that uses the tjLoadImage() function. + +Fixes #433 + +diff --git a/rdppm.c b/rdppm.c +index 87bc33090..a8507b902 100644 +--- a/rdppm.c ++++ b/rdppm.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2009 by Bill Allombert, Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2015-2017, D. R. Commander. ++ * Copyright (C) 2015-2017, 2020, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) + /* On 16-bit-int machines we have to be careful of maxval = 65535 */ + source->rescale = (JSAMPLE *) + (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, +- (size_t)(((long)maxval + 1L) * ++ (size_t)(((long)MAX(maxval, 255) + 1L) * + sizeof(JSAMPLE))); + half_maxval = maxval / 2; + for (val = 0; val <= (long)maxval; val++) { diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 982cb008a..e855609c2 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d libkdcraw-19.12.3.tar.xz" +sha512sums="b2ceae6785c356f7f169e2efd8b47d920663dfc187d7e5abbf7ffbec934deb78bbfa096e2417f712c2e298e720bd11c1a8883372ef151826a8573df65e772aa7 libkdcraw-20.04.3.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 1d1243c7a..a33e9d83e 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -60,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b libkdegames-19.12.3.tar.xz" +sha512sums="4681b4b37a78796eecd0daf00d231909391510122de4ad2ecb0c50ba7309c3119895c3490e727425ef0088a84e76cae26bc595730f4a673f7cfdf9aa559f0a74 libkdegames-20.04.3.tar.xz" diff --git a/user/libkdepim/APKBUILD b/user/libkdepim/APKBUILD new file mode 100644 index 000000000..f1a122510 --- /dev/null +++ b/user/libkdepim/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkdepim +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE PIM runtime library" +url="https://kontact.kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev qt5-qttools-dev cmake extra-cmake-modules boost-dev + kauth-dev kcalendarcore-dev kcmutils-dev kcodecs-dev kcompletion-dev + kconfigwidgets-dev kcontacts-dev kcoreaddons-dev ki18n-dev kio-dev + kitemmodels-dev kitemviews-dev kjobwidgets-dev kldap-dev kmime-dev + kservice-dev kwallet-dev kwidgetsaddons-dev kwindowsystem-dev + kxmlgui-dev solid-dev + + akonadi-dev akonadi-contacts-dev akonadi-mime-dev akonadi-search-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkdepim-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="b1be6f143466b52342a659fd76124808354584355dbcb283ffc41b126bdbf79b4bf01028954be6be450f3634ced8748f2be4433ee0393505388f442e7393b0dc libkdepim-20.04.3.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 2dde5afba..c1e55793c 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063 libkeduvocdocument-19.12.3.tar.xz" +sha512sums="ab6d63394302eca90c3f430753daa9535b30a5883ef899b21e4ba3d90fb5faec5990a7593d3c21cd78916238a9b14ac3fb24ee062171035e3afacaeb99ba3d7e libkeduvocdocument-20.04.3.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 094839e20..40e3f3dc2 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644 libkexiv2-19.12.3.tar.xz" +sha512sums="88846e87b64e2b0b213afc2765af69e4fb034caa6708f73db3f6180bb52e34a1e6ea14f06416f939ef66ed16cf0e1a43b03d6452eabe0cb24c40faddf39376a9 libkexiv2-20.04.3.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 67b24bc4f..6c946d53a 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9 libkipi-19.12.3.tar.xz" +sha512sums="0cd89507fcebacf64c69665e7d2e1c780f478c1234e714b4db0823aced184bc274ed363f78983e44c6e28e4654dbf8ba6792aec0225065e516749b381a8fed28 libkipi-20.04.3.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 594c36564..5ac0da36b 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e libkleo-19.12.3.tar.xz" +sha512sums="a318ba0517e193e69969427e8edb69c8a127deea9ae7e8ebf6ad0a6766ee237cedcf67322c47e3fb6d65aef94e7f54bc2d6d444743aa9753e0daa422ad23e1fb libkleo-20.04.3.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index b8645ac60..d4a5a0cac 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09 libkmahjongg-19.12.3.tar.xz" +sha512sums="8ad55d17a0b6e06cf1abdec265abb55bcd5dd5aa80c2d9f9a3ef7331875d89c5a0dfb6bfad3e8e23d34ba7e6e5a20a6499ed0391f8c5ddd7e356aaee7dfd9010 libkmahjongg-20.04.3.tar.xz" diff --git a/user/libkomparediff2/APKBUILD b/user/libkomparediff2/APKBUILD new file mode 100644 index 000000000..99124c04e --- /dev/null +++ b/user/libkomparediff2/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkomparediff2 +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE diff library" +url="https://kde.org/applications/development/org.kde.kompare" +arch="all" +license="GPL-2.0+ AND GPL-2.0-only AND LGPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev + kio-dev kitemviews-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev solid-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkomparediff2-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="880b8ed7d8e3df82f82509ef42f0c951340ed5c735e19af067381c9b0613afd43af97695bd42c8b60febda5605f22c6fb215ff2acbc5f6754e7c0076455e891f libkomparediff2-20.04.3.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 0430b4e9b..31a6c5b04 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121 libksane-19.12.3.tar.xz" +sha512sums="6c38f8978149bd3b823d94822996dd2bbed2542a23960a3b8e399eb0fedeee5536e65ab27760941ad037101dbc27ffadf51a4103d0323c4e674f25d5fa12481e libksane-20.04.3.tar.xz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 1ab72541a..b801a4063 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libktorrent -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev boost-dev qca-dev libgcrypt-dev" makedepends="cmake extra-cmake-modules $depends_dev doxygen ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.2.0/libktorrent-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" +sha512sums="2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a libktorrent-2.2.0.tar.xz" diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 020e173ee..24ff091bf 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=liblxqt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Core LXQt library" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.3.1 - kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.5.0 + kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.7.0" subpackages="$pkgname-dev" source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz" +sha512sums="a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c liblxqt-0.15.1.tar.xz" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 2456f0522..80bdb5e5b 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Maintainer: pkgname=libnftnl -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -33,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d libnftnl-1.1.6.tar.bz2 -" +sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2" diff --git a/user/libnice/APKBUILD b/user/libnice/APKBUILD index cd7579a03..d50182820 100644 --- a/user/libnice/APKBUILD +++ b/user/libnice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnice -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=0 pkgdesc="GLib-based Interactive Connectivity Establishment (ICE) library" url="https://nice.freedesktop.org/wiki/" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fdf0f9fcf43c0fdffbdcb61988a7f9e14bd13bb1bc561d2b9faf493deb18151da14d484740571a302fa203ec7109d45c361ea791e81a2b29932a26220ce902c libnice-0.1.16.tar.gz +sha512sums="177ee47712233af379f422cbe24befaa1b744444241723a6575f17db30f7032aa8a34b1c6e160f6f406545fc42c1e7e3ca36c274bea5adb169b02434712c908e libnice-0.1.17.tar.gz c81aff0f8a674315997f2ecc1f0cbc501b54d49c142949aee68af42aaccf2a2f61d5eb46ce8c123b05fb98c2cd5ef5751b9228783e5e221b12be06b805da0ad3 dont-error-on-socket-close.patch" diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD index 66d49e293..2b842085b 100644 --- a/user/libpsl/APKBUILD +++ b/user/libpsl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libpsl -pkgver=0.21.0 +pkgver=0.21.1 pkgrel=0 pkgdesc="C library for examining the Public Suffix List" url="https://rockdaboot.github.io/libpsl" @@ -10,7 +10,7 @@ license="MIT AND BSD-3-Clause" depends="" makedepends="python3 libidn2-dev libunistring-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$pkgver/libpsl-$pkgver.tar.gz +source="https://github.com/rockdaboot/libpsl/releases/download/$pkgver/libpsl-$pkgver.tar.gz use-python3.patch " @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d libpsl-0.21.0.tar.gz +sha512sums="a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5 libpsl-0.21.1.tar.gz 00c9c09bac334efcd7ae6240b740ac88453425cc380cc23b443a0579f4ccabf86eafdb90f5f05027cc55ee20f6c1d4388939792a55cd95705d5e6919d40b30e5 use-python3.patch" diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index 60f967c06..7b0e70656 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libqtxdg -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=0 pkgdesc="Qt5-based library implementing the XDG spec" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # Test suite requires X11. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qtbase-dev qt5-qtsvg-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 libqtxdg-3.4.0.tar.xz" +sha512sums="014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653 libqtxdg-3.5.0.tar.xz" diff --git a/user/libquotient/APKBUILD b/user/libquotient/APKBUILD index 003f53e3f..4eb2070be 100644 --- a/user/libquotient/APKBUILD +++ b/user/libquotient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libquotient -pkgver=0.5.2 +pkgver=0.5.3.2 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" url="https://matrix.org/docs/projects/sdks/#lib-q-matrix-client" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1037139d62c41e35cd415e85ec8b7d3577af193e19a4307bcd65f83f43a54e015e4a888a0c26a266e41df613a329edd985e8935a9ea9d54f19662fdbfe55577 libquotient-0.5.2.tar.gz" +sha512sums="b887432ba7fb2b89c72ae5342fbd11b0066770851e8d0ea85ae4d6375bca726a5ee601c4f3d35a11fa1f2ef679ad5436917c08139e114f91516ccb370321e428 libquotient-0.5.3.2.tar.gz" diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD index d03f54449..aff21f6f1 100644 --- a/user/librdkafka/APKBUILD +++ b/user/librdkafka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=librdkafka -pkgver=1.3.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="The Apache Kafka C/C++ library" url="https://github.com/edenhill/librdkafka" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669 librdkafka-1.3.0.tar.gz" +sha512sums="ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262 librdkafka-1.5.0.tar.gz" diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD index c466b1750..e6a0e891a 100644 --- a/user/libsass/APKBUILD +++ b/user/libsass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsass -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=0 pkgdesc="Library for preprocessing CSS" url="https://sass-lang.com/libsass" @@ -24,4 +24,4 @@ package() { make BUILD="shared" PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee libsass-3.6.3.tar.gz" +sha512sums="1f79553be31949d45adf440dcbcf4b828a7e4f71c6f63f288f99451fccc490ebf0c68c58d91deabede37962e35a8cf9af8b0d60d89349fd0adea1ac061c8c2c8 libsass-3.6.4.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index cf4630962..23846af80 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857 libsecret-0.20.2.tar.xz" +sha512sums="020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22 libsecret-0.20.3.tar.xz" diff --git a/user/libshout/APKBUILD b/user/libshout/APKBUILD index 1672399d8..a4624bb2c 100644 --- a/user/libshout/APKBUILD +++ b/user/libshout/APKBUILD @@ -4,7 +4,7 @@ pkgname=libshout pkgver=2.4.3 pkgrel=0 pkgdesc="Library for accessing a Icecast server" -url="http://www.icecast.org/" +url="https://www.icecast.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0+" diff --git a/user/libsigsegv/APKBUILD b/user/libsigsegv/APKBUILD new file mode 100644 index 000000000..a99ee7075 --- /dev/null +++ b/user/libsigsegv/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Lee Starnes <lee@canned-death.us> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=libsigsegv +pkgver=2.12 +pkgrel=0 +pkgdesc="A library for handling page faults in user mode" +url="https://www.gnu.org/software/libsigsegv" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + musl-ppc32.patch + " + +build() { + ./configure \ + --prefix=/usr \ + --build=$CBUILD \ + --host=$CHOST \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-shared + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913 libsigsegv-2.12.tar.gz +fba3bf8679619d9e363bf42e476960dd73cc9a01915773193d6b6d2ca76ee5240a9284982d00bc40601c6da3210c08eb90e61661404ccaf017144ccc36b25762 musl-ppc32.patch" diff --git a/user/libsigsegv/musl-ppc32.patch b/user/libsigsegv/musl-ppc32.patch new file mode 100644 index 000000000..75e10a45f --- /dev/null +++ b/user/libsigsegv/musl-ppc32.patch @@ -0,0 +1,10 @@ +--- libsigsegv-2.12/src/fault-linux-powerpc.h.old 2017-03-04 15:28:15.000000000 +0000 ++++ libsigsegv-2.12/src/fault-linux-powerpc.h 2020-05-11 21:49:56.190783142 +0000 +@@ -33,6 +33,6 @@ + # if 0 + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] + # else +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] + # endif + #endif diff --git a/user/libslirp/APKBUILD b/user/libslirp/APKBUILD index 07d7eea31..bd88d3957 100644 --- a/user/libslirp/APKBUILD +++ b/user/libslirp/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libslirp -pkgver=4.2.0 +pkgver=4.3.0 pkgrel=0 pkgdesc="A general-purpose TCP/IP emulator" url="https://gitlab.freedesktop.org/slirp/libslirp" @@ -10,10 +10,14 @@ license="BSD-3-Clause AND MIT" depends="" makedepends="glib-dev meson" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$pkgver/libslirp-v$pkgver.tar.gz +source="https://elmarco.fedorapeople.org/libslirp-$pkgver.tar.xz + git-describe.patch static.patch " -builddir="$srcdir/libslirp-v$pkgver" + +# secfixes: +# 4.3.0-r0: +# - CVE-2020-1983 build() { meson \ @@ -30,5 +34,6 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="514744ac8325857915b9946a76f4a55d48c8361b6167cd69c533086928ae06f059d923c5f057e92a0915921bb363b69d34a939a0bcc28233515125a5d1858d25 libslirp-v4.2.0.tar.gz +sha512sums="656a57878354b893503af69dfb11ab93dcf4728cc68bd0b6aa352073cbcf1b558924a5932e1996011002f72f5bddfb22ddaffc5a88078a61862c630d908e8beb libslirp-4.3.0.tar.xz +fb66abe30c7b36c93bf759960275119c6d34e57861efe0cdc147a606a7a13b2d29f0f77dfe99326539800bd4ded9e39c736abd9d4ca9d6f16df2d50fd70fb7f6 git-describe.patch bb1bb5443d8083099d2a270b78b7ec74daa26634b2062d2c30460ed118b333942a9a555c96910216bb746311ae021d457f39a304a60fe07a3908a0c315a7c756 static.patch" diff --git a/user/libslirp/git-describe.patch b/user/libslirp/git-describe.patch new file mode 100644 index 000000000..9cc66bbad --- /dev/null +++ b/user/libslirp/git-describe.patch @@ -0,0 +1,24 @@ +Otherwise you might get "-dirty" in the pc: version + +--- libslirp-4.3.0/build-aux/git-version-gen 2020-04-23 06:09:44.166262600 -0500 ++++ libslirp-4.3.0/build-aux/git-version-gen 2020-04-24 15:08:09.450004079 -0500 +@@ -133,19 +133,6 @@ fi + + v=`echo "$v" |sed 's/^v//'` + +-# Don't declare a version "dirty" merely because a time stamp has changed. +-git update-index --refresh > /dev/null 2>&1 +- +-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +-case "$dirty" in +- '') ;; +- *) # Append the suffix only if there isn't one already. +- case $v in +- *-dirty) ;; +- *) v="$v-dirty" ;; +- esac ;; +-esac +- + # Omit the trailing newline, so that m4_esyscmd can use the result directly. + echo "$v" | tr -d "$nl" + diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 92acda745..6c4e0ffc4 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsysstat -pkgver=0.4.2 +pkgver=0.4.3 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Library for querying system information & statistics" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + qt5-qtbase-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$pkgver.tar.xz" @@ -32,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz" +sha512sums="a34511e4f9fe1ed977ffc65b11948459922760f9a22b225d48d1c7cae9fc6c94b315c1394768f4c7b94ffc28c1267410c21ba55ff89e54976526ea1e5e4d7a56 libsysstat-0.4.3.tar.xz" diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index e7322c37b..7ed91e7b7 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="https://sourceforge.net/projects/libtirpc/" @@ -13,7 +13,6 @@ makedepends="$depends_dev autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 bsd-types.patch - endian-header.patch " build() { @@ -29,6 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 libtirpc-1.2.5.tar.bz2 -237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch -0a7a21a3d08bb0ff0110b993b8f8ddca41513ddaa0a468028a53eac9732a2a2e5070abe7da0a3ecff265b3800490c82f08810bd34e9d0af2e75345c86ef7d638 endian-header.patch" +sha512sums="bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a libtirpc-1.2.6.tar.bz2 +237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch" diff --git a/user/libtirpc/endian-header.patch b/user/libtirpc/endian-header.patch deleted file mode 100644 index 9f9523305..000000000 --- a/user/libtirpc/endian-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix location of endian.h. Yay for POSIX next. - ---- libtirpc-1.2.5/src/xdr_float.c.old 2019-12-19 18:55:48.000000000 +0000 -+++ libtirpc-1.2.5/src/xdr_float.c 2019-12-29 18:54:28.408092748 +0000 -@@ -83,7 +83,7 @@ - }; - #else - --#include <bits/endian.h> -+#include <endian.h> - #define IEEEFP - - #endif /* vax */ diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD index 73d53a4e1..a3b80b05a 100644 --- a/user/libuninameslist/APKBUILD +++ b/user/libuninameslist/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuninameslist -pkgver=20200313 +pkgver=20200413 pkgrel=0 pkgdesc="Library of Unicode names and annotation data" url=" " @@ -38,4 +38,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="7f42d839b251859d94cca44d4f8a789aeed0554ce86bbdba38f25da2c2ce0626d95801679a1ce3c9f691ceb4988960c56f1268478e55175d94744a969e1bd6c3 libuninameslist-dist-20200313.tar.gz" +sha512sums="88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3 libuninameslist-dist-20200413.tar.gz" diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index d42e22efa..8e5efebfe 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva -pkgver=2.6.1 +pkgver=2.7.1 pkgrel=0 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d libva-2.6.1.tar.bz2" +sha512sums="f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 libva-2.7.1.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 2c8b32cb0..00208172d 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.3 +pkgver=1.4 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.3/libvdpau-$pkgver.tar.bz2" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$pkgver/libvdpau-$pkgver.tar.bz2" build() { meson -Dprefix=/usr \ @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2" +sha512sums="68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01 libvdpau-1.4.tar.bz2" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 7058ad208..8992096b8 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver -pkgver=0.9.12 -pkgrel=1 +pkgver=0.9.13 +pkgrel=0 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -14,11 +14,7 @@ depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" makedepends="$depends_dev cmake" subpackages="$pkgname-dev" -source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - CVE-2018-15127.patch - CVE-2019-15681.patch - CVE-2019-15690.patch - " +source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz" builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -30,6 +26,9 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # 0.9.12-r1: # - CVE-2019-15681 # - CVE-2019-15690 +# 0.9.13-r0: +# - CVE-2019-20788 +# - CVE-2020-14401 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,6 +36,7 @@ build() { fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -54,7 +54,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz -8b5b6742e6c3a181c60652484b15ec42cc0a3acc1e82cef38e82b61f43f1de456d09731976f4e5dfab44abf3e551e22aaf4300cb8418cd8e136d705fcb2a7dbe CVE-2018-15127.patch -5ecb5a26813f3f07440ef6c54eebaca4e9b4f7c1cf2ba13375e3b23b950a9b818d068d4eef5532d7ea4d7ae084c4356af7257c45426101ff51afe2b7da338a1f CVE-2019-15681.patch -52f62a65c3e91b7c7a11b5ad6e1432d697e1314bf6c938b5cb0c9cc8bdffbf1c25612c33e05282c11d59c6523e208b882f963fca8bcd34a5c72dd476427e7542 CVE-2019-15690.patch" +sha512sums="18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 LibVNCServer-0.9.13.tar.gz" diff --git a/user/libvncserver/CVE-2018-15127.patch b/user/libvncserver/CVE-2018-15127.patch deleted file mode 100644 index 146243670..000000000 --- a/user/libvncserver/CVE-2018-15127.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Mon, 7 Jan 2019 10:40:01 +0100 -Subject: [PATCH] Limit lenght to INT_MAX bytes in - rfbProcessFileTransferReadBuffer() - -This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap -out-of-bound write access in rfbProcessFileTransferReadBuffer() when -reading a transfered file content in a server. The former fix did not -work on platforms with a 32-bit int type (expected by rfbReadExact()). - -CVE-2018-15127 -<https://github.com/LibVNC/libvncserver/issues/243> -<https://github.com/LibVNC/libvncserver/issues/273> ---- - libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 7af84906..f2edbeea 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include <errno.h> - /* strftime() */ - #include <time.h> -+/* INT_MAX */ -+#include <limits.h> - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) - 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF - will safely be allocated since this check will never trigger and malloc() can digest length+1 - without problems as length is a uint32_t. -+ We also later pass length to rfbReadExact() that expects a signed int type and -+ that might wrap on platforms with a 32-bit int type if length is bigger -+ than 0X7FFFFFFF. - */ -- if(length == SIZE_MAX) { -+ if(length == SIZE_MAX || length > INT_MAX) { - rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); - rfbCloseClient(cl); - return NULL; diff --git a/user/libvncserver/CVE-2019-15681.patch b/user/libvncserver/CVE-2019-15681.patch deleted file mode 100644 index e328d8792..000000000 --- a/user/libvncserver/CVE-2019-15681.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 3bacc891..310e5487 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - sct.type = rfbServerCutText; diff --git a/user/libvncserver/CVE-2019-15690.patch b/user/libvncserver/CVE-2019-15690.patch deleted file mode 100644 index 7fe36e454..000000000 --- a/user/libvncserver/CVE-2019-15690.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Sun, 17 Nov 2019 17:18:35 +0100 -Subject: [PATCH] libvncclient/cursor: limit width/height input values - -Avoids a possible heap overflow reported by Pavel Cheremushkin -<Pavel.Cheremushkin@kaspersky.com>. - -re #275 ---- - libvncclient/cursor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c -index 67f45726..40ffb3b0 100644 ---- a/libvncclient/cursor.c -+++ b/libvncclient/cursor.c -@@ -28,6 +28,8 @@ - #define OPER_SAVE 0 - #define OPER_RESTORE 1 - -+#define MAX_CURSOR_SIZE 1024 -+ - #define RGB24_TO_PIXEL(bpp,r,g,b) \ - ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255 \ - << client->format.redShift | \ -@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h - if (width * height == 0) - return TRUE; - -+ if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE) -+ return FALSE; -+ - /* Allocate memory for pixel data and temporary mask data. */ - if(client->rcSource) - free(client->rcSource); diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD index 70fe0d512..acfc75c69 100644 --- a/user/libxdg-basedir/APKBUILD +++ b/user/libxdg-basedir/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libxdg-basedir -pkgver=1.2.0 +pkgver=1.2.2 pkgrel=0 pkgdesc="library for XDG base dir specification" url=" " # No URL. @@ -11,7 +11,7 @@ license="MIT" depends="" makedepends="autoconf automake libtool" subpackages="$pkgname-dev" -source="http://ponce.cc/slackware/sources/repo/libxdg-basedir-1.2.0.tar.xz" +source="https://github.com/davmac314/libxdg-basedir/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f1766cd94dd66fcba9211427910ef02c7f203c7bf655e74b903566a68521d1c156c9687cd89eca73428098c0a78a1458cada2057dd9268b6f6b48229c80b5d2e libxdg-basedir-1.2.0.tar.xz" +sha512sums="5817aea613be592d3d392401702ecd40ec949ee170365d720085919d773dc998daff65bde53d36429453dfe3944ff8666729553381c7b9ce410b009e7a5d5af5 libxdg-basedir-1.2.2.tar.xz" diff --git a/user/lilo/APKBUILD b/user/lilo/APKBUILD index 606b633b3..6282c211c 100644 --- a/user/lilo/APKBUILD +++ b/user/lilo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=lilo pkgver=24.2 -pkgrel=0 +pkgrel=1 pkgdesc="Minimal BIOS bootloader for x86 systems" url="https://www.joonet.de/lilo/" arch="pmmx x86 x86_64" @@ -10,13 +10,14 @@ license="BSD-3-Clause AND GPL-2.0+ AND Public-Domain" depends="perl" makedepends="dev86 linux-headers lvm2-dev sharutils" subpackages="$pkgname-doc" -triggers="$pkgname.trigger=/boot" source="https://www.joonet.de/lilo/ftp/sources/lilo-$pkgver.tar.gz adelie.patch cflags.patch + initramfs.patch musl.patch partuuid.patch lilo.conf.template + lilo.easy-boot " build() { @@ -41,11 +42,16 @@ package() { "$pkgdir"/etc/lilo/lilo.conf.template mv "$pkgdir"/etc/lilo/lilo.conf_example \ "$pkgdir"/etc/lilo/lilo.conf.example + + install -Dm755 "$srcdir"/lilo.easy-boot \ + "$pkgdir"/etc/easy-boot.d/50-lilo } sha512sums="4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 lilo-24.2.tar.gz cf8dab563e88cc7b280f5740c3b0f25049b9ce27c77a67e7b0c55dc21a158f8b2998f0c7743f11bcc4ae893697e6b6cc56054a40919899bf2d6d79b4e1a59190 adelie.patch ed1ffb03dbbbf6fe6974d045005f72b3657d470cd3f3556d582e09a38836090c3e75a684a1dcfbe7ade91e5ada3706b712ae7111460df85454518a746c60bde4 cflags.patch +98e26319a747e6cc7e9d7c695d20e511ef9d196dfc312403c7171380e75edbbdec6af39c0f1670956bcd7ec9ff203505c4001962c767f651b730da31830ed35f initramfs.patch 1c1ce61d2d7c88c1ba66e1415b36edb6743f46a50857b5bcd2b6b28a0711e4de3f0a75c352a5997bc9b5d50b0754c49a3f69b736e07a6e389c02da004289c64f musl.patch 3962bf30a866f31fa5263618210d61ac5663117cac1d5a52a5e14f3665ff8edfd628c80807591f3da5f2e6908b8c0af9b19fac32f6ab90e6c4755bf79cb34d5a partuuid.patch -489f57d29ee6607fb7040a33655bc369a510290804ae11686e02ba91d6cd3401175fa93d8d74da6058f03126b924004d28d5145ec5df70be4d04acba112c5729 lilo.conf.template" +489f57d29ee6607fb7040a33655bc369a510290804ae11686e02ba91d6cd3401175fa93d8d74da6058f03126b924004d28d5145ec5df70be4d04acba112c5729 lilo.conf.template +cdf4ea20a678cc01149c06556fe6b3b9b70a91aad7e44ffb7728b677297de8f68d4a5037aa44414bd606c838621fc9191c5ad45f909538b852c1f770b4fcb2e4 lilo.easy-boot" diff --git a/user/lilo/initramfs.patch b/user/lilo/initramfs.patch new file mode 100644 index 000000000..f6aca7f75 --- /dev/null +++ b/user/lilo/initramfs.patch @@ -0,0 +1,81 @@ +Adjust expected initrd name to match what dracut produces. + +--- lilo-24.2/scripts/liloconfig 2015-11-21 18:00:21.000000000 -0600 ++++ lilo-24.2/scripts/liloconfig 2020-07-11 00:35:13.400130230 -0500 +@@ -618,8 +618,8 @@ sub write_image_config { + foreach $image (@vmlinuz) { + # search for kernel initrd file + chomp $image; +- $initrd = $image; +- $initrd =~ s/vmlinuz/initrd\.img/; ++ $initrd = $image . ".img"; ++ $initrd =~ s/vmlinuz/initramfs/; + $initrd2 = $initrd; + $initrd2 =~ s/\.img//; + $nr2 = $nr + 1; +@@ -694,8 +694,8 @@ sub write_imagelinks_config { + foreach $image (@vmlinuz) { + # search for kernel initrd file + chomp $image; +- $initrd = $image; +- $initrd =~ s/vmlinuz/initrd\.img/; ++ $initrd = $image . ".img"; ++ $initrd =~ s/vmlinuz/initramfs/; + $nr2 = $nr + 1; + + print MYFH_NEW 'image = ' . $image . "\n"; +@@ -837,7 +837,7 @@ Lines in the configuration file /etc/lil + # restricted + # alias = 1 + # optional +- initrd = /boot/initrd.img-3.17-trunk-686 ++ initrd = /boot/initramfs-3.17-trunk-686.img + + image = /boot/vmlinuz-3.14-trunk-686 + label = "Linux Old" +@@ -847,7 +847,7 @@ Lines in the configuration file /etc/lil + # restricted + # alias = 2 + # optional +- initrd = /boot/initrd.img-3.14-trunk-686 ++ initrd = /boot/initramfs-3.14-trunk-686.img + + =head1 COPYRIGHT and LICENSE + +--- lilo-24.2/man/liloconfig.8 2015-11-21 17:25:48.000000000 -0600 ++++ lilo-24.2/man/liloconfig.8 2020-07-11 00:45:57.850132663 -0500 +@@ -140,7 +140,7 @@ Lines in the configuration file /etc/lil + \& # restricted + \& # alias = 1 + \& # optional +-\& initrd = /boot/initrd.img\-3.17\-trunk\-686 ++\& initrd = /boot/initramfs\-3.17\-trunk\-686.img + \& + \& image = /boot/vmlinuz\-3.14\-trunk\-686 + \& label = "Linux Old" +@@ -150,7 +150,7 @@ Lines in the configuration file /etc/lil + \& # restricted + \& # alias = 2 + \& # optional +-\& initrd = /boot/initrd.img\-3.14\-trunk\-686 ++\& initrd = /boot/initramfs\-3.14\-trunk\-686.img + .Ve + .SH "COPYRIGHT and LICENSE" + .IX Header "COPYRIGHT and LICENSE" +--- lilo-24.2/man/lilo.conf.5 2013-06-07 14:17:39.000000000 -0500 ++++ lilo-24.2/man/lilo.conf.5 2020-07-11 00:44:59.650132443 -0500 +@@ -47,12 +47,12 @@ menu-title=" John's Computer " + ### bootable kernel images ### + image=/boot/vmlinuz-2.6.29-1-i386 + label=try +- initrd=/boot/initrd.img-2.6.29-1-i386 ++ initrd=/boot/initramfs-2.6.29-1-i386.img + image=/boot/vmlinuz-2.4.33-1-i386 + label=2.4.33 + image=/tamu/vmlinuz + label=tamu +- initrd=/tamu/initrd.img ++ initrd=/tamu/initramfs.img + root=/dev/hdb2 + vga=ask + # diff --git a/user/lilo/lilo.trigger b/user/lilo/lilo.easy-boot index 0f5a802a2..0f5a802a2 100644 --- a/user/lilo/lilo.trigger +++ b/user/lilo/lilo.easy-boot diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 128b7ad39..224755425 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2019.12.30 +pkgver=2020.07.31 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -51,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="223ce65751099e5f84767939e75cefa19f10780d7e894991b4f7164c4bafa4ed8942713f237df74933caa0e1f0ead83bf69c95f232f84f7220082613cc84bc83 live.2019.12.30.tar.gz" +sha512sums="e23f6da5b0b1767c959bc3591276f8e0678732d4f197b1369aea2963ef2bf1e37a9ac714deded783819c1d5b5f9319cff0ed15f349908d88986649dc16e2da15 live.2020.07.31.tar.gz" diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index 0e09db7af..065576966 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=8.0.1 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" arch="all" options="!checkroot !dbg" @@ -25,6 +25,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l more-secure-plt.patch even-more-secure-plt.patch python3-test.patch + scc-insertion.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -233,4 +234,5 @@ caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60c e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch 7ba7f5b396e1afb49ea53fdc16729f0709fbba88de433cc8a8e2f751d13733011d4121318f68d7f8a16a6c57c3a1bee727cc3e0da0f5c6cae38eff70d3a539cf more-secure-plt.patch deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch -53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch" +53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch +4422a83ea953a6b30cb447a448d246956abd6b0cbd2451247e5f2c41318b2c0d18c7b6781155ea40a5558bbd66e9e1482cec0875d95776545fd0d87356b5e4bd scc-insertion.patch" diff --git a/user/llvm8/scc-insertion.patch b/user/llvm8/scc-insertion.patch new file mode 100644 index 000000000..b2d7d511a --- /dev/null +++ b/user/llvm8/scc-insertion.patch @@ -0,0 +1,33 @@ +From f7e9f4f4c50245d10ca9869a9f8f3d431dfb6948 Mon Sep 17 00:00:00 2001 +From: Warren Ristow <warren_ristow@playstation.sony.com> +Date: Tue, 14 Jan 2020 10:30:24 -0800 +Subject: [PATCH] SCC: Allow ReplaceNode to safely support insertion + +If scc_iterator::ReplaceNode is inserting a new entry in the map, +rather than replacing an existing entry, the possibility of growing +the map could cause a failure. This change safely implements the +insertion. + +Reviewed By: probinson + +Differential Revision: https://reviews.llvm.org/D72469 +--- + include/llvm/ADT/SCCIterator.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h +index eb1a5d0938cf..1e642b9f75d3 100644 +--- a/include/llvm/ADT/SCCIterator.h ++++ b/include/llvm/ADT/SCCIterator.h +@@ -134,7 +134,10 @@ class scc_iterator : public iterator_facade_base< + /// has been deleted, and \c New is to be used in its place. + void ReplaceNode(NodeRef Old, NodeRef New) { + assert(nodeVisitNumbers.count(Old) && "Old not in scc_iterator?"); +- nodeVisitNumbers[New] = nodeVisitNumbers[Old]; ++ // Do the assignment in two steps, in case 'New' is not yet in the map, and ++ // inserting it causes the map to grow. ++ auto tempVal = nodeVisitNumbers[Old]; ++ nodeVisitNumbers[New] = tempVal; + nodeVisitNumbers.erase(Old); + } + }; diff --git a/user/lmdb/APKBUILD b/user/lmdb/APKBUILD index f862931fa..eb7e1a1e6 100644 --- a/user/lmdb/APKBUILD +++ b/user/lmdb/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: pkgname=lmdb -pkgver=0.9.24 +pkgver=0.9.25 pkgrel=0 pkgdesc="Lightning Memory-Mapped Database" url="http://symas.com/mdb/" arch="all" license="OLDAP-2.8" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="https://github.com/LMDB/lmdb/archive/LMDB_$pkgver.tar.gz - lmdb_make.patch" -builddir="$srcdir/$pkgname-LMDB_$pkgver/libraries/liblmdb" +source="https://git.openldap.org/openldap/openldap/-/archive/LMDB_$pkgver/openldap-LMDB_$pkgver.tar.bz2 + lmdb_make.patch + " +builddir="$srcdir/openldap-LMDB_$pkgver/libraries/liblmdb" build() { make @@ -29,5 +30,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1 LMDB_0.9.24.tar.gz +sha512sums="8ee369f77b6acc75d5330ccfdb0531c543642a27a434551d7e800bcaf737ab16afc688a15ba30c0398702d4da54d347cf57f388e1c9525d0334a2677ea3d751e openldap-LMDB_0.9.25.tar.bz2 151022cad94d2138146e3cd36622171f07fb03cc66d116ac9ce766c61a8b1aa65b521bfda88b27456204f53ecd430bdeddb4d7786956a12ed0cd53f8323ffd03 lmdb_make.patch" diff --git a/user/lokalize/APKBUILD b/user/lokalize/APKBUILD new file mode 100644 index 000000000..b48609fd4 --- /dev/null +++ b/user/lokalize/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lokalize +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Computer-aided translation system" +url="https://kde.org/applications/development/org.kde.lokalize" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtscript-dev cmake extra-cmake-modules kauth-dev + kcodecs-dev kcompletion-dev kconfig-dev kconfigwidgets-dev + kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev + ki18n-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kparts-dev kross-dev kservice-dev ktextwidgets-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev + hunspell-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="becc88705957386a1012378e28c025eb4087f46e2f0953eaa3d8f8d6625cce3be1d23bf1a92ef38f02793a0f175115141839e360bce7f9adcf6ccd494b17b65c lokalize-20.04.3.tar.xz" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 8e6681499..47b2c741f 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed lskat-19.12.3.tar.xz" +sha512sums="2a3efc2843ed8749ba145d7d633915489fb3924ec91c7b12a218732fb705a716bf48bc79cced2e4dbd85db5a6576687a2b171a4834daa74e8190074abda0d0e6 lskat-20.04.3.tar.xz" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index 11e166311..c4449467b 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem -pkgver=1.7.0.2 +pkgver=1.8.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) _rockver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=0 pkgdesc="Filesystem functions for Lua" url="http://keplerproject.github.io/luafilesystem/" arch="all" @@ -30,4 +30,4 @@ package() { echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } -sha512sums="a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511 luafilesystem-1.7.0.2.tar.gz" +sha512sums="79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247 luafilesystem-1.8.0.tar.gz" diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index b5a76d86d..1dce23e0f 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lximage-qt -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=0 pkgdesc="Image viewer and screenshot tool for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 libexif-dev libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev kwindowsystem-dev" source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd lximage-qt-0.14.1.tar.xz" +sha512sums="980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23 lximage-qt-0.15.0.tar.xz" diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index a8d4d4b92..903ec3079 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 pkgdesc="Menu definition files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 767194b42..799843b1c 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-about -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Dialog window providing information about LXQt and the running system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0" source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a lxqt-about-0.14.1.tar.xz" +sha512sums="0572db83f7f11abe2b17c69ba3d1bcefc5daa011a3c474aa8217f2cf8cc1db54a5de1db4a0678381c4d37caf1d1ebbe4026ed63e17e2fbbaa4133d1e781c6e44 lxqt-about-0.15.0.tar.xz" diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index a464f20d0..5267f2663 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-admin -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Administrative tools for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="lxqt-policykit" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373 lxqt-admin-0.14.1.tar.xz" +sha512sums="830de1f3f65913b939b286adeeddfdfc22318bf09ea0ff7b705521c5c06f8edefa189b08bd4f6281116a12fc3255ace68a35ee56f3f7bec0e0f1cceea3b47c22 lxqt-admin-0.15.0.tar.xz" diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD new file mode 100644 index 000000000..b3a23905a --- /dev/null +++ b/user/lxqt-archiver/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=lxqt-archiver +pkgver=0.2.0 +_lxqt=0.15.0 +_lxqt_build=0.7.0 +pkgrel=0 +pkgdesc="Archive management utility for the LXQt desktop" +url="https://lxqt.github.io/" +arch="all" +options="!check" # No test suite +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules json-glib-dev libfm-qt-dev>=$_lxqt + lxqt-build-tools>=$_lxqt_build qt5-qttools-dev qt5-qtx11extras-dev" +source="https://github.com/lxqt/lxqt-archiver/releases/download/$pkgver/lxqt-archiver-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-$pkgver/build" + +prepare() { + mkdir -p "$builddir" && cd "$builddir"/.. + default_prepare +} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest .. +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7 lxqt-archiver-0.2.0.tar.xz" diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index a2ffa3160..3439629fe 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-build-tools -pkgver=0.6.0 +pkgver=0.7.0 pkgrel=0 pkgdesc="Toolchain for building and packaging LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" # no tests to run; this package just provides a common base for scaffolding. options="!check" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz" +sha512sums="4dc169a743f7ed549929cc2d3286098f94c851b8c2c2f689956bb123565940cfe142eaee006c1d50204943b59a45c1228ade042ce2491df9813e168b54c72ac7 lxqt-build-tools-0.7.0.tar.gz" diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 5f64da9ce..9f7b280df 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-config -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Collection of tools for configuring LXQt and the underlying system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 libxcursor-dev eudev-dev - kwindowsystem-dev libkscreen-dev xf86-input-libinput-dev libxi-dev" + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build + libxcursor-dev eudev-dev kwindowsystem-dev libkscreen-dev + xf86-input-libinput-dev libxi-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz" +sha512sums="68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d lxqt-config-0.15.0.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 6ad593a75..af52254f2 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,18 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-desktop -pkgver=0.13.0 -pkgrel=1 +pkgver=0.15.0 +pkgrel=0 arch="noarch" pkgdesc="Complete LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" license="NCSA" options="!check" # meta package, no tests needed. 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 qt5ct obconf-qt qps screengrab" + lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab + lxqt-archiver" makedepends="" subpackages="$pkgname-doc" source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1" diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index da75788ad..5e8f3d607 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-globalkeys -pkgver=0.14.3 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon and configuration utility for global shortcuts in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c lxqt-globalkeys-0.14.3.tar.xz" +sha512sums="95beba4ce6c2324582d93a6f3f56d57681ec7d992db80a8d9fae34a637ba1612260932944e3865c3c749982e6aa111b3495558bc5d36e8b4c8e21027775e346e lxqt-globalkeys-0.15.0.tar.xz" diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index b13843f75..8b670254e 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 pkgdesc="Localization files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 137b19cf8..186659ef6 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-notificationd -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 - lxqt-build-tools>=0.6.0 kwindowsystem-dev" + lxqt-build-tools>=$_lxqt_build kwindowsystem-dev" source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" build() { @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz" +sha512sums="0febe3ff61caaf4303e3853df6bc494ce8eb4a931e6d8600a2e38c07317ecadbe3d7060ac234d139326a726c43ac555153dde6b2d4d05e95ab357873457c9632 lxqt-notificationd-0.15.0.tar.xz" diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 0778adc3d..522c95b77 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-openssh-askpass -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for inputting passwords for SSH agents" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf lxqt-openssh-askpass-0.14.1.tar.xz" +sha512sums="e9dd41dd75892be234e6381670fa0b836bf040b00b7c59c7f23cadc9a916e8c646c4d44645a49183a305c6b755a01e6b8e6a3c0f84aa7c374cdb3ddd577e2f44 lxqt-openssh-askpass-0.15.0.tar.xz" diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 8f8a38643..612652a82 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,19 +1,21 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-panel -pkgver=0.14.1 +pkgver=0.15.1 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Panel for LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev - libdbusmenu-qt-dev kwindowsystem-dev solid-dev menu-cache-dev - lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev pulseaudio-dev - lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev libstatgrab-dev - libsysstat-dev qt5-qttools-dev libxkbcommon-dev libxcomposite-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + kguiaddons-dev libdbusmenu-qt-dev kwindowsystem-dev solid-dev + menu-cache-dev lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev + pulseaudio-dev lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev + libstatgrab-dev libsysstat-dev qt5-qttools-dev libxkbcommon-dev + libxcomposite-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" @@ -40,4 +42,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687 lxqt-panel-0.14.1.tar.xz" +sha512sums="8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f lxqt-panel-0.15.1.tar.xz" diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index 7b677a646..c1944f330 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-policykit -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="PolicyKit agent for LXQT" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev polkit-qt-1-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 qt5-qttools-dev + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz" @@ -38,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940 lxqt-policykit-0.14.1.tar.xz" +sha512sums="2dbbe6d626ef5da816f080354caf564a1aa58270ae299483b9a4ce35d5f1bdb3c652dcb5f12d2668a0ea82556414b00320d2bd88fcadb37fbbdbf724a17e3c41 lxqt-policykit-0.15.0.tar.xz" diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 0b3097cdd..775735e4c 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-powermanagement -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Power management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build upower-dev liblxqt-dev>=${pkgver%.*}.0 kidletime-dev qt5-qtsvg-dev qt5-qttools-dev solid-dev kwindowsystem-dev" source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10 lxqt-powermanagement-0.14.1.tar.xz" +sha512sums="8ea0765bad3885e6a8e574b382d6bea0bd5065b760241b5fa641e17096fffb43c5472577729365c36918caa4ca0d058fa1a24538dfe157e32ac519d94a4db039 lxqt-powermanagement-0.15.0.tar.xz" diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index 9d237c3f6..e9b2485d8 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-qtplugin -pkgver=0.14.0 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt plugin for platform integration with LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev libfm-qt-dev>=${pkgver%.*}.0 liblxqt-dev>=${pkgver%.*}.0 libdbusmenu-qt-dev" source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz" +sha512sums="6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f lxqt-qtplugin-0.15.1.tar.xz" diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 7acd62c9b..865c21555 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-runner -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based application launcher for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 lxqt-globalkeys-dev>=${pkgver%.*}.0 muparser-dev kwindowsystem-dev menu-cache-dev qt5-qttools-dev qt5-qtsvg-dev" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c lxqt-runner-0.14.1.tar.xz" +sha512sums="559a5ef627f311ee4894891445a7f1bf70349d7f89ec3eb1d5550f8e87486d695d03fb70a8ec936b074e83c82c29ff26c07ee3edeebbbf8dade2d9a5f4dacdba lxqt-runner-0.15.0.tar.xz" diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index d6cc987a0..a10f61174 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-session -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Session management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="xdg-user-dirs" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build eudev-dev liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { rm "$pkgdir"/usr/share/man/man1/start* } -sha512sums="9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c lxqt-session-0.14.1.tar.xz" +sha512sums="96ef9e58ca25303ac0213f1cb5faee5efddb61ac3705484ac55b39db56c9302ff646e317dbc753b213a5e2ea38818b247244a2be5219fbe6db9e419b8c638591 lxqt-session-0.15.0.tar.xz" diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index c65fe652c..8014d2bd9 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-sudo -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for sudo/su" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="sudo" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222 lxqt-sudo-0.14.1.tar.xz" +sha512sums="94c96a1eac5d1ec6e84c99ecbd08e7ecb8184d4e1ada0bce137c2c8d9508cd840b56dae38e3f418cb208a3eae5b3420bf33e0b9a1bb96969f2bd4d207e89304c lxqt-sudo-0.15.0.tar.xz" diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 6881e5a4d..63ff10079 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-themes -pkgver=0.14.0 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Core themes for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake lxqt-build-tools>=0.6.0" +makedepends="cmake lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz" build() { @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz" +sha512sums="7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d lxqt-themes-0.15.0.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 214373d24..1d895ffdd 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 marble-19.12.3.tar.xz" +sha512sums="5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd marble-20.04.3.tar.xz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 30c55065c..b138a4789 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=marco -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,5 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428 marco-1.24.0.tar.xz +sha512sums="55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85 marco-1.24.1.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 815a44faa..5deb6eb83 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.12 +pkgver=10.4.13 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -22,7 +22,7 @@ makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded - $pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc + $pkgname-common $pkgname-backup mytop::noarch $pkgname-openrc $pkgname-doc $pkgname-dev" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz crc32-power.patch @@ -265,7 +265,7 @@ doc() { default_doc } -sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 mariadb-10.4.12.tar.gz +sha512sums="68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 mariadb-10.4.13.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch diff --git a/user/massif-visualizer/APKBUILD b/user/massif-visualizer/APKBUILD new file mode 100644 index 000000000..9bcfb6490 --- /dev/null +++ b/user/massif-visualizer/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=massif-visualizer +pkgver=0.7.0 +pkgrel=0 +pkgdesc="Visual tool for inspecting Massif profiler data" +url="https://kde.org/applications/development/org.kde.massif-visualizer" +arch="all" +license="GPL-2.0" +depends="kgraphviewer shared-mime-info" +makedepends="qt5-qtbase-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev cmake + extra-cmake-modules karchive-dev kauth-dev kcodecs-dev kcompletion-dev + kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdiagram-dev ki18n-dev + kio-dev kitemviews-dev kjobwidgets-dev kparts-dev kservice-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/massif-visualizer/$pkgver/src/massif-visualizer-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561 massif-visualizer-0.7.0.tar.xz" diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD index 011965eca..24062053e 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/APKBUILD @@ -8,7 +8,7 @@ url="https://mate-desktop.org" arch="noarch" options="!check" # No tests license="Public-Domain" -depends="atril caja caja-dropbox caja-extensions consolekit2 engrampa eom marco +depends="atril caja caja-dropbox caja-extensions elogind engrampa eom marco mate-applets mate-backgrounds mate-calc mate-control-center mate-desktop mate-icon-theme mate-indicator-applet mate-media mate-menus mate-netbook mate-notification-daemon mate-panel diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD index 64559ad16..a994a5491 100644 --- a/user/mednafen/APKBUILD +++ b/user/mednafen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=mednafen -pkgver=1.22.2 +pkgver=1.24.3 pkgrel=0 pkgdesc="Portable multi-system emulator" url="https://mednafen.github.io/" @@ -32,6 +32,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e094a9134115344bf857eb7edce67f146fd43b83432db69271d5924ab5ec7dae11cdb7272c0d3c697a654902ce73cb42165f5e1256758f05e41167007e8f3a2d mednafen-1.22.2.tar.xz -264b22be3af9db57d0e8676d77b57338308764c79a5eae1c7bd3bb211c5e190ec0797e34a952039175395c0b8819e6285f2ac5f652ee0d5b9d1e0eaf43eca6e9 ppc.patch +sha512sums="6ed719a0cd247fb0d61fa0174fbd6e2dc9fa94343479aef98be0083268e18cf77a9f9b6a88e2231a7f14b152083e0683658d328d348ef2a1b55032f7c9e9d448 mednafen-1.24.3.tar.xz +04dd9085c65f0af2be3569b98c0af8a546ba03f6d08a2ba9e817fbed00030cb22aedde102e539573678e8f3bf178adda7caad3778cfa8576e8865eeb69fae7be ppc.patch 84cbff76b16960ec67fec785fc6e8d541db342e9567fb6f4d42c84ced3fc0f0dfe702a8a7fd7af4f84835f8efe289e7cb9cf18766e4196525686eaa23b02537c ppc64.patch" diff --git a/user/mednafen/ppc.patch b/user/mednafen/ppc.patch index 0f795f169..3642e401a 100644 --- a/user/mednafen/ppc.patch +++ b/user/mednafen/ppc.patch @@ -1,10 +1,10 @@ ---- mednafen/configure.ac.old 2019-01-28 06:52:37.000000000 +0000 -+++ mednafen/configure.ac 2019-03-24 22:30:31.180000000 +0000 -@@ -765,7 +765,7 @@ +--- mednafen/configure.ac.old 2020-05-04 05:35:56.000000000 +0000 ++++ mednafen/configure.ac 2020-07-08 18:14:09.005569259 +0000 +@@ -860,7 +860,7 @@ AM_CONDITIONAL(ARCH_X86_32, true) ;; -- powerpc) +- powerpc*) + powerpc*|ppc*) AC_DEFINE([ARCH_POWERPC], [1], [Define if we are compiling for PPC architectures.]) AM_CONDITIONAL(ARCH_POWERPC, true) diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index 7a79aa829..31c298de0 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mesa-demos pkgver=8.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mesa demos and utils" url="https://mesa3d.org" arch="all" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 2cc6eb4d7..193c03ed5 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0 minuet-19.12.3.tar.xz" +sha512sums="5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073 minuet-20.04.3.tar.xz" diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index 192101edb..695fdc5c2 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Marek Benc <dusxmt@gmx.com> # Maintainer: Marek Benc <dusxmt@gmx.com> pkgname=mksh -pkgver=57 +pkgver=59b pkgrel=0 pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter" url="http://mirbsd.de/mksh" @@ -47,4 +47,4 @@ package() { install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/ } -sha512sums="7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3 mksh-R57.tgz" +sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d mksh-R59b.tgz" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD index 0b84de2ea..e47c0db32 100644 --- a/user/modemmanager-qt/APKBUILD +++ b/user/modemmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt framework for ModemManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6314130e61e11d2a916e55630df4173ecf60a2c58bbca9b05b865505b916f783deec32fd3cd310bfe6a1171c9723ce84d4428f94c29aaa0aa033901909a4e19b modemmanager-qt-5.68.0.tar.xz" +sha512sums="9ec1985c5edc3fc08f1dfbe989c49f32e78dc19462a83991a67bc153f0416ad1e4e0680b528a6fb0d2d45cec1d138433b3d25761ef3fa1921cc002fff8f6e1d4 modemmanager-qt-5.72.0.tar.xz" diff --git a/user/mosquitto/APKBUILD b/user/mosquitto/APKBUILD index 67ec942a1..71e1fb99c 100644 --- a/user/mosquitto/APKBUILD +++ b/user/mosquitto/APKBUILD @@ -2,12 +2,11 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mosquitto -pkgver=1.6.9 +pkgver=1.6.10 pkgrel=0 pkgdesc="An Open Source MQTT Broker" url="https://mosquitto.org/" arch="all" -options="!check" # "Connection refused" during testing. license="EPL-1.0 AND EDL-1.0 AND MIT AND BSD-3-Clause" depends="" checkdepends="python3" @@ -74,7 +73,7 @@ clients() { mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/ } -sha512sums="f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7 mosquitto-1.6.9.tar.gz +sha512sums="2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25 mosquitto-1.6.10.tar.gz 681fddc737b3ef3e6c052f0c854a730df290352640a18a63e23ef83d14c425558aff87805d1eb95e44de101b5df48872173af9f5414464ffa8cf727ea2c0491e mosquitto.initd -3886171e36f759a717aa6626d5b8dbd392963c737d5de28b4d52b81359008927b99ff7a0ca82f56a0e5deaed4585571759ba9216336a664fd346845837c2bc18 disable-flaky-test.patch +daaae48d49e49a9911f152dfc80f67f2371ad62647d3324b360eb83f816c0898469c135209ddb69e80a29b313bbe3b6ee11463955c97a44584921c13832a07be disable-flaky-test.patch b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch" diff --git a/user/mosquitto/disable-flaky-test.patch b/user/mosquitto/disable-flaky-test.patch index 8fd51c403..1dade3cd4 100644 --- a/user/mosquitto/disable-flaky-test.patch +++ b/user/mosquitto/disable-flaky-test.patch @@ -9,3 +9,17 @@ ./11-persistent-subscription.py ./11-persistent-subscription-v5.py ./11-persistent-subscription-no-local.py + +Upstream issue: https://github.com/eclipse/mosquitto/issues/1659 + +--- mosquitto-1.6.10/test/lib/Makefile 2020-05-25 22:49:59.000000000 +0000 ++++ mosquitto-1.6.10/test/lib/Makefile 2020-06-20 01:41:00.350012338 +0000 +@@ -33,7 +33,7 @@ c : test-compile + ./02-subscribe-qos0.py $@/02-subscribe-qos0.test + ./02-subscribe-qos1.py $@/02-subscribe-qos1.test + ./02-subscribe-qos1.py $@/02-subscribe-qos1-async1.test +- ./02-subscribe-qos1.py $@/02-subscribe-qos1-async2.test ++ #./02-subscribe-qos1.py $@/02-subscribe-qos1-async2.test + ./02-subscribe-qos2.py $@/02-subscribe-qos2.test + ./02-unsubscribe-multiple-v5.py $@/02-unsubscribe-multiple-v5.test + ./02-unsubscribe-v5.py $@/02-unsubscribe-v5.test diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD index 7c75ee723..14324285a 100644 --- a/user/mpg123/APKBUILD +++ b/user/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mpg123 -pkgver=1.25.13 +pkgver=1.26.3 pkgrel=0 pkgdesc="Real time MPEG Audio player for Layers 1, 2 and 3" url="https://www.mpg123.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39 mpg123-1.25.13.tar.bz2" +sha512sums="7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d mpg123-1.26.3.tar.bz2" diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 8f703f637..4324b3565 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mplayer pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source media player and ripper" url="https://mplayerhq.hu" arch="all" @@ -21,15 +21,24 @@ makedepends="yasm ncurses-dev openssl-dev freetype-dev fribidi-dev cdparanoia-dev libbluray-dev a52dec-dev " subpackages="$pkgname-doc" -source="http://mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz" +source="http://mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz + ldt.patch + " builddir="$srcdir/MPlayer-$pkgver" build() { + _extra_conf="" + case $CTARGET_ARCH in + pmmx) _extra_conf="--disable-sse2 --disable-sse4 --disable-qtx";; + esac + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --confdir=/etc/mplayer \ - --disable-ffmpeg_a + --disable-ffmpeg_a \ + --enable-debug=3 \ + $_extra_conf make } @@ -38,4 +47,5 @@ package() { rm -r "$pkgdir/etc" } -sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz" +sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz +07efeaf1294fb3f0a4d8dd9885641ee919c17e93e1ada505c825645e1f04d18f615fbd0318e0cc09231b67881b18847e853b434f5d8164bd3178ab220c4523df ldt.patch" diff --git a/user/mplayer/ldt.patch b/user/mplayer/ldt.patch new file mode 100644 index 000000000..6ae5456bc --- /dev/null +++ b/user/mplayer/ldt.patch @@ -0,0 +1,11 @@ +--- MPlayer-1.4/loader/ldt_keeper.c.old 2013-03-23 14:48:22.000000000 +0000 ++++ MPlayer-1.4/loader/ldt_keeper.c 2020-07-06 21:22:30.344206427 +0000 +@@ -214,7 +214,7 @@ + array.limit_in_pages=0; + #ifdef __linux__ + //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s)); +- ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); ++ ret=syscall(__NR_modify_ldt, 0x1, &array, sizeof(struct modify_ldt_ldt_s)); + if(ret<0) + { + perror("install_fs"); diff --git a/user/mtools/APKBUILD b/user/mtools/APKBUILD new file mode 100644 index 000000000..34b0b8730 --- /dev/null +++ b/user/mtools/APKBUILD @@ -0,0 +1,32 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mtools +pkgver=4.0.24 +pkgrel=0 +pkgdesc="Utilities to access MS-DOS disks without mounting them" +url="https://www.gnu.org/software/mtools/" +arch="all" +options="!check" # No test suite. +license="GPL-3.0+" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://ftp.gnu.org/gnu/mtools/mtools-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + make DESTDIR="$pkgdir" install + install -Dm644 -t "$pkgdir"/etc mtools.conf + sed -i -e 's/^SAMPLE FILE$/#&/' "$pkgdir"/etc/mtools.conf +} + +sha512sums="b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04 mtools-4.0.24.tar.bz2" diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 7f3dd35c1..5e5ebbd46 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=muparser -pkgver=2.2.6.1 +pkgver=2.3.2 pkgrel=0 pkgdesc="Fast math parser library" url="https://beltoforion.de/article.php?a=muparser" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496 muparser-2.2.6.1.tar.gz" +sha512sums="8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef muparser-2.3.2.tar.gz" diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index 09b0f49d3..e686defab 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.13.4 +pkgver=1.14.6 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" url="http://www.mutt.org" # No HTTPS @@ -16,6 +16,10 @@ makedepends="cyrus-sasl-dev gdbm-dev gettext-tiny gpgme-dev subpackages="$pkgname-doc $pkgname-lang" source="https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz" +# secfixes: +# 1.14.4-r0: +# - CVE-2020-14093 + build() { ISPELL=/usr/bin/hunspell \ ./configure \ @@ -35,7 +39,6 @@ build() { --with-curses \ --with-mailpath=/var/spool/mail \ --with-docdir=/usr/share/doc/$pkgname \ - --without-included-gettext \ --with-ssl \ --with-sasl make @@ -57,4 +60,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3 mutt-1.13.4.tar.gz" +sha512sums="a442b3f6b8fc4c1a5ed9a870a321c883aeeb736ce58820d393ee6d9c646a607790ad8aeeb1efa4f5394586484f3181fa8cbb6c90d82bbf2a74a046b07d1467e6 mutt-1.14.6.tar.gz" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 9ff07764a..c88b4cf0a 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.8 +pkgver=4.9.3 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -10,7 +10,7 @@ license="GPL-3.0+" depends="" makedepends="file-dev ncurses-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.xz" +source="https://www.nano-editor.org/dist/v${pkgver%.*.*}/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -40,4 +40,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="9799d93f322ac12d95784b6ecc7f7f9037f0a395be0cafe238b9e0ae2d8d93181a8a114a11ccccb20bcf07375ddaf842f49f7d23372f0d330ce67a66d0318ae8 nano-4.8.tar.xz" +sha512sums="eefb88d7141f0c542a2d9b34fc8a079a92e512df0e9dbadcb3d780008ae19faf10296213ecdbf370fa8b81f5f3e81e2d419f5f76e62d669e61997d199a96ba18 nano-4.9.3.tar.xz" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 4e73db97e..c38933162 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=nasm -pkgver=2.14.02 +pkgver=2.15.03 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="71e3d44736493b1a56d4230bc2e5519e858aaadde5d89a692f1472fad6755084460e36b42852707f4c862eff75d3f2c232aedcc4e61e9d9ffcc8c9ca6498292b nasm-2.14.02.tar.bz2" +sha512sums="afb41cf5d0dc12802531b8d977f57dd360cb7cc72f3a4224a610529fdfab95ae6042af04419728895d270cdf4baf25243d17a8d4e04e1843472d052a770a8e83 nasm-2.15.03.tar.bz2" diff --git a/user/net-snmp/APKBUILD b/user/net-snmp/APKBUILD index 3fc1bceb4..8dea420b2 100644 --- a/user/net-snmp/APKBUILD +++ b/user/net-snmp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=net-snmp pkgver=5.8 -pkgrel=0 +pkgrel=1 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" arch="all" @@ -74,7 +74,7 @@ package() { install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd install -m644 -D "$srcdir"/snmptrapd.confd \ "$pkgdir"/etc/conf.d/snmptrapd - install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf + install -m600 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf echo "authCommunity log,execute,net public" > "$pkgdir"/etc/snmp/snmptrapd.conf mkdir -p "$pkgdir"/var/lib/net-snmp find "$pkgdir" -name perllocal.pod -delete diff --git a/user/netqmail/0005-CVE-2005-1513.patch b/user/netqmail/0005-CVE-2005-1513.patch new file mode 100644 index 000000000..3b3876cb3 --- /dev/null +++ b/user/netqmail/0005-CVE-2005-1513.patch @@ -0,0 +1,19 @@ +diff -rNU3 netqmail-1.06.old/alloc.c netqmail-1.06/alloc.c +--- netqmail-1.06.old/alloc.c 1998-06-15 10:53:16.000000000 +0000 ++++ netqmail-1.06/alloc.c 2020-05-21 11:33:24.689739728 +0000 +@@ -1,3 +1,4 @@ ++#include <limits.h> + #include "alloc.h" + #include "error.h" + extern char *malloc(); +@@ -15,6 +16,10 @@ + unsigned int n; + { + char *x; ++ if (n >= (INT_MAX >> 3)) { ++ errno = error_nomem; ++ return 0; ++ } + n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */ + if (n <= avail) { avail -= n; return space + avail; } + x = malloc(n); diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 551895f83..9be7d7c68 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=netqmail pkgver=1.06 -pkgrel=6 +pkgrel=7 pkgdesc="The qmail mail transfer agent (community version)" url="http://www.netqmail.org/" arch="all" license="Public-Domain" options="suid !check" # suid programs (qmail-queue); no test suite depends="execline s6 s6-networking" -makedepends="utmps-dev" +makedepends="groff utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" provider_priority=1 provides="sendmail" @@ -19,6 +19,7 @@ source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0002-qbiffutmpx-20170820.patch 0003-qmailremote-20170716.patch 0004-notifyfd.patch + 0005-CVE-2005-1513.patch qmail.run smtpd.run smtpsd.run @@ -106,6 +107,7 @@ ad126cad5c0d35351919ad87022fd94b910519d91cf82f38c158f423bbfc1b82455844a791ba0c69 b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e29b4ced4482f08b2d09e7818fd309123c0d087600500e336 0002-qbiffutmpx-20170820.patch cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4 0003-qmailremote-20170716.patch b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11 0004-notifyfd.patch +ac8406c1d16ce2e55e47bc83ca6e095833a54de73cecee222cad3fcececa518386b95a11cb0c9c2dcc6851bae28aa539b11069305aa887a291177bf177ee7b01 0005-CVE-2005-1513.patch 954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931 qmail.run c0cd244af4d8186305c51b0e93960bdb1ea6ce40f1adf20c4f72419aa7498e35649590919ebd16547a0313676bf9171c9efea2ff8ac3a5c773b18473a972a977 smtpd.run 719c4ce5ad93cddeafbb734cffeec3fd959d3f374e44e1f34e9a25d638303dd97df41642d3df5c7a069a8db47d1e31c32a16ecd2d04b72860c4e00bbba0c9fcf smtpsd.run diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 0c9fc7e8b..8b95a338e 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=netsurf -pkgver=3.9 +pkgver=3.10 pkgrel=0 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" @@ -10,25 +10,21 @@ options="!check" # No tests license="MIT AND GPL-2.0-only WITH openssl-exception" depends="" makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev - openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev - perl-html-parser" + openssl-dev expat-dev gperf gtk+3.0-dev librsvg-dev libwebp-dev + perl-html-parser vim" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz - Makefile.config + netsurf.desktop " builddir="$srcdir/netsurf-all-$pkgver" -prepare() { - default_prepare - cp "$srcdir"/Makefile.config "$builddir"/netsurf -} - build() { - make PREFIX=/usr NETSURF_USE_VIDEO=YES + make TARGET=gtk3 PREFIX=/usr NETSURF_USE_VIDEO=NO } package() { - make PREFIX=/usr DESTDIR="$pkgdir" install + make TARGET=gtk3 PREFIX=/usr DESTDIR="$pkgdir" install + install -D -m644 "$srcdir"/netsurf.desktop "$pkgdir"/usr/share/applications/netsurf.desktop } -sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" +sha512sums="fc4c300eef07c540a7e07f8034db25b7e5fb731b5956029af2220f8638802aa38c055ad54b5683c14501aef9c22fb781b96613c16ae9a6996c3833ceede6f9bf netsurf-all-3.10.tar.gz +81cce213162cc49ea6a85b81c143c480ed202e2d2d06bb79d2eea803d7e8361b063d29c74904451cc2ba4e31cdad3524098344eb140cd5080f83beaf43aa8dbd netsurf.desktop" diff --git a/user/netsurf/Makefile.config b/user/netsurf/Makefile.config deleted file mode 100644 index 0e58d6e7d..000000000 --- a/user/netsurf/Makefile.config +++ /dev/null @@ -1 +0,0 @@ -override NETSURF_USE_VIDEO := NO diff --git a/user/netsurf/netsurf.desktop b/user/netsurf/netsurf.desktop new file mode 100644 index 000000000..c899cbbaa --- /dev/null +++ b/user/netsurf/netsurf.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=3.10 +Name=NetSurf +Comment=A minimalist web browser +Icon=web-browser +Categories=Internet +Exec=netsurf-gtk3 diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD index 22d4d65d0..d307db266 100644 --- a/user/networkmanager-qt/APKBUILD +++ b/user/networkmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt framework for NetworkManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9b81c9720db55c4d403df06b6d56e7003adb08a437b9869a7e18fd1d3621fd24e73c254f957d41ee428b4449eb5484a06add15486a79bb901c2234d2db36f8f networkmanager-qt-5.68.0.tar.xz" +sha512sums="b2763a89de911b2f1bc9704302e3d6874cd8f93fb8497743be33a66e0bd72aa1d140f595392617d952ff6c332f7b54c84c9f54b4c9bd0d8974e6dff81be34675 networkmanager-qt-5.72.0.tar.xz" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index a86436b13..006e1a1e1 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,15 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.22.10 -pkgrel=0 +pkgver=1.22.14 +pkgrel=1 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" arch="all" options="!check" # Requires dbus-python and running DBus server. license="GPL-2.0+ AND LGPL-2.1+" depends="dhcpcd iputils ppp wpa_supplicant-dbus" -makedepends="bash bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev +makedepends="bash bluez-dev curl-dev dbus-dev dbus-glib-dev elogind-dev eudev-dev glib-dev gobject-introspection-dev intltool libedit-dev libndp-dev libxslt modemmanager-dev ncurses-dev newt-dev nss-dev perl polkit-dev ppp-dev py3-pygobject util-linux-dev vala-dev" @@ -56,8 +56,8 @@ build() { --with-nmcli=yes \ --with-nmtui \ --with-pppd-plugin-dir=/usr/lib/pppd/$(ls -1 /usr/lib/pppd | head) \ - --with-session-tracking=consolekit \ - --with-suspend-resume=consolekit \ + --with-session-tracking=elogind \ + --with-suspend-resume=elogind \ --without-dhclient \ --without-libaudit \ --without-libpsl \ @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="342d0c8db2c94992f8f53b13dc4432fe566637e03e1d65cdc44ebf51a4f70d4ec804ebc48ed9cbe010c61abc665f1bb1be22f9364de991d6e5ffc5212b9efd23 NetworkManager-1.22.10.tar.xz +sha512sums="81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453 NetworkManager-1.22.14.tar.xz ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch 7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch @@ -100,4 +100,4 @@ d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 01-org.freedesktop.NetworkManager.rules 26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a 10-openrc-status f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a nm.confd -a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658 nm.initd" +9a5ab7d317797489a555b185d103d3c526cd6963c6586da2f5212b41e68a9bf5dedd52d1fe58718fb686379b6e2434924d06d7da8070a62a3ec3e5626ab90d14 nm.initd" diff --git a/user/networkmanager/nm.initd b/user/networkmanager/nm.initd index 3209644c5..c8aae7e7f 100644 --- a/user/networkmanager/nm.initd +++ b/user/networkmanager/nm.initd @@ -8,7 +8,7 @@ when a network connection is established." depend() { need dbus - use consolekit + use elogind provide net } diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD index b9b3064d6..b4d265440 100644 --- a/user/nextcloud-client/APKBUILD +++ b/user/nextcloud-client/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=nextcloud-client -pkgver=2.6.3 +pkgver=2.6.4 pkgrel=0 pkgdesc="Nextcloud desktop client" url="https://github.com/nextcloud/desktop" @@ -42,6 +42,6 @@ package() { EOF } -sha512sums="ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 nextcloud-client-2.6.3.tar.gz +sha512sums="849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1 nextcloud-client-2.6.4.tar.gz 38dd89ca2bf67294187bb4d5c59cdf725ec3b502f23bf4a60210e85c66f6a7e00da0e0b41775bc138159bed300dc60a1f179d1d6ad3b7a27e1aadf4f0576f348 no-webengine.patch c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f test-fix-include.patch" diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index bc96a18f1..40eaa5a7f 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Maintainer: pkgname=nftables -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="https://netfilter.org/projects/nftables" @@ -47,7 +47,7 @@ package() { install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0 nftables-0.9.4.tar.bz2 +sha512sums="ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df nftables-0.9.6.tar.bz2 f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 41dd0bc58..063bc9b0f 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,17 +1,22 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.40.0 +pkgver=1.41.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" arch="all" +options="!check" # Requires cunit, which we don't currently ship license="MIT" depends="" makedepends="c-ares-dev libev-dev libxml2-dev openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" +# secfixes: +# 1.41.0-r0: +# - CVE-2020-11080 + build() { ./configure \ --build=$CBUILD \ @@ -37,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce nghttp2-1.40.0.tar.xz" +sha512sums="c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d nghttp2-1.41.0.tar.xz" diff --git a/user/node/APKBUILD b/user/node/APKBUILD index d60a359af..c74516b71 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -1,15 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node -pkgver=10.19.0 +pkgver=10.21.0 pkgrel=0 pkgdesc="JavaScript runtime" url="https://nodejs.org/" arch="all" -license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND OpenSSL AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" +options="net" # Required in check() +license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" depends="" makedepends="c-ares-dev http-parser-dev icu-dev libexecinfo-dev libuv-dev - nghttp2-dev python3 zlib-dev" + nghttp2-dev>=1.41 openssl-dev python3 zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz @@ -30,11 +31,15 @@ builddir="$srcdir/$pkgname-v$pkgver" # - CVE-2019-9516 # - CVE-2019-9517 # - CVE-2019-9518 +# 10.21.0-r0: +# - CVE-2020-7598 +# - CVE-2020-8174 unpack() { default_unpack [ -z $SKIP_PYTHON ] || return 0 + # TODO: when bumping to 12.x, python3 should be usable msg "Killing all remaining hope for humanity and building Python 2..." cd "$srcdir/Python-2.7.15" [ -d ../python ] && rm -r ../python @@ -47,7 +52,6 @@ unpack() { build() { export PATH="$srcdir/python/bin:$PATH" - # We can't use --shared-openssl until 1.1 is available. python ./configure.py \ --prefix=/usr \ --with-intl=system-icu \ @@ -55,15 +59,24 @@ build() { --shared-http-parser \ --shared-libuv \ --shared-nghttp2 \ - --openssl-no-asm \ + --shared-openssl \ + --openssl-use-def-ca-store \ --shared-zlib # keep DESTDIR set, to avoid a full rebuild in package() make DESTDIR="$pkgdir" } check() { + case "$CARCH" in + pmmx) + # https://bts.adelielinux.org/show_bug.cgi?id=306 + _skip="parallel/test-http-invalid-te,parallel/test-worker-stdio" + ;; + esac + export PATH="$srcdir/python/bin:$PATH" - make DESTDIR="$pkgdir" test-only + make DESTDIR="$pkgdir" test-only \ + ${_skip:+CI_SKIP_TESTS="$_skip"} } package() { @@ -71,7 +84,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee node-v10.19.0.tar.xz +sha512sums="613d3c1bca79ea5f127dc6793de2b5cfdfa056c01ec092e3b7ee79205894b21ca5ec4a367265122641dd1d360c675cfb36a4f7892894194ddd18abd1b2206544 node-v10.21.0.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch 6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD index 518fe3501..10451374d 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=nsd -pkgver=4.2.4 +pkgver=4.3.2 pkgrel=0 pkgdesc="An authoritative only name server" url="https://www.nlnetlabs.nl/projects/nsd/about/" @@ -51,6 +51,6 @@ openrc() { install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" } -sha512sums="5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208 nsd-4.2.4.tar.gz +sha512sums="0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8 nsd-4.3.2.tar.gz f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd 139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 08ad8f475..5c24d7987 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=obconf-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build openbox-dev liblxqt-dev qt5-qttools-dev" source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed obconf-qt-0.14.1.tar.xz" +sha512sums="a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279 obconf-qt-0.15.0.tar.xz" diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD index 9e1f520d1..32ee727fb 100644 --- a/user/ode/APKBUILD +++ b/user/ode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ode -pkgver=0.16 +pkgver=0.16.1 pkgrel=0 pkgdesc="High performance library for simulating rigid body dynamics" url="https://ode.org/" @@ -41,6 +41,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="302e6f689851acb9ba0db23e13ab59ae0acbbd8dbdfa7e277b57d870c0d3435274e64da16134fb4b7053f951489c138e485165d79664d11764a88b3437d703d3 ode-0.16.tar.gz +sha512sums="65aa7b6baf98bab9aa721a119246371e31e070d97770a8cdaea882de3cd5e2dfde7ca1b4258186b397853cc0dc3b2f7b6b7aef3ac86b48a72a3011d5ae536672 ode-0.16.1.tar.gz 8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch 0d618cec0afdab86279687275bf476594897d1dfd7b5619fe6bc05343f22f6292c9598a73ff6f2967d5f39e071abcf282fc673c0ffe33f7efd9bbe56ca674dae stdint.patch" diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index d7fc84030..be2c4a289 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=0.26.3 +pkgver=0.26.4 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6 okteta-0.26.3.tar.xz" +sha512sums="2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7 okteta-0.26.4.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 4e9567438..9c75fa6d2 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.12.3 -pkgrel=1 +pkgver=20.04.3 +pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz es-doc-fix.patch - CVE-2020-9359.patch " # secfixes: @@ -49,6 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz -de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch -02b27bd206006dbbafbe74e60665ad5159ef6ea32b8bf1526b9c655c046cb6de08630f28d64c9935e73d5707a30d0835f2ab8cd4521740e5236cefc3d3057d29 CVE-2020-9359.patch" +sha512sums="1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01 okular-20.04.3.tar.xz +de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch" diff --git a/user/okular/CVE-2020-9359.patch b/user/okular/CVE-2020-9359.patch deleted file mode 100644 index 34ff3e2ce..000000000 --- a/user/okular/CVE-2020-9359.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Tue, 10 Mar 2020 23:07:24 +0100 -Subject: [PATCH] Document::processAction: If the url points to a binary, don't - run it - ---- - core/document.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/document.cpp b/core/document.cpp -index 3215a1abc..0aa5b6980 100644 ---- a/core/document.cpp -+++ b/core/document.cpp -@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action ) - { - const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url); - // KRun autodeletes -- new KRun( realUrl, d->m_widget ); -+ KRun *r = new KRun( realUrl, d->m_widget ); -+ r->setRunExecutables(false); - } - } - } break; --- -2.25.2 - diff --git a/user/oniguruma/192.patch b/user/oniguruma/192.patch new file mode 100644 index 000000000..d027757d7 --- /dev/null +++ b/user/oniguruma/192.patch @@ -0,0 +1,25 @@ +From 47af49af70a717ac31c54ae55ad242a27f213def Mon Sep 17 00:00:00 2001 +From: "K.Kosako" <kkosako0@gmail.com> +Date: Wed, 22 Apr 2020 14:47:09 +0900 +Subject: [PATCH] fix #192: Unexpected regex match + +--- + src/regcomp.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/regcomp.c b/src/regcomp.c +index 4d5b78f..b3193c5 100644 +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -3567,6 +3567,11 @@ check_node_in_look_behind(Node* node, int not, int* used) + + if (IS_NOT_NULL(NODE_BODY(node))) + r = check_node_in_look_behind(NODE_BODY(node), not, used); ++ ++ /* Issue 192 ++ escape removing node in tune_look_behind() ++ */ ++ *used = TRUE; + break; + + case NODE_GIMMICK: diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD index c4399f782..e95c5229e 100644 --- a/user/oniguruma/APKBUILD +++ b/user/oniguruma/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=oniguruma -pkgver=6.9.4 +pkgver=6.9.5 pkgrel=0 pkgdesc="A regular expression library" url="https://github.com/kkos/oniguruma" @@ -11,7 +11,9 @@ license="BSD-2-Clause" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz" +source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz + 192.patch + " builddir="$srcdir/onig-$pkgver" # secfixes: @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b onig-6.9.4.tar.gz" +sha512sums="2bdb24914e7069c6df9ab8a3d0190ddb58440d94b13860cdc36d259062ae0bc2aa85d564a4209ec596fc7ee47b0823d1b817d4f7ffcc3ea60e9870da84491dc1 onig-6.9.5.tar.gz +b2e9926e0b9a22b2036bb43297e24726439938b8cf349f55ab09bf47d16a4862bb3bbdec8b425c7d174524121e49c4d6e567e26168894d7c564b7645d5a1bff5 192.patch" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index 7bdcc5597..94e1d0b89 100644 --- a/user/opal-utils/APKBUILD +++ b/user/opal-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opal-utils -pkgver=6.5.2 +pkgver=6.6.2 pkgrel=0 pkgdesc="Tools for IBM FSP and OpenPOWER systems" url="https://lists.ozlabs.org/listinfo/skiboot" @@ -39,6 +39,6 @@ package() { done } -sha512sums="765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091 skiboot-6.5.2.tar.gz +sha512sums="a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27 skiboot-6.6.2.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch 692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 4ad8f07a0..313812683 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjdk8 -_icedteaver=3.11.0 +_icedteaver=3.16.0 # pkgver is <JDK version>.<JDK update>.<JDK build> # Check https://icedtea.classpath.org/wiki/Main_Page when updating -pkgver=8.201.08 +pkgver=8.252.09 pkgrel=0 pkgdesc="Libre Java development kit for Java 8" url="https://icedtea.classpath.org/" @@ -13,7 +13,7 @@ license="GPL-2.0-only" depends="$pkgname-jre java-cacerts" makedepends="bash findutils libarchive-tools zip file util-linux libxslt autoconf automake linux-headers sed xz coreutils - openjdk7 ca-certificates libjpeg-turbo-dev cmd:which + $pkgname-bootstrap ca-certificates libjpeg-turbo-dev cmd:which nss-dev nss-static cups-dev giflib-dev libpng-dev libxt-dev lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev @@ -29,7 +29,7 @@ ppc64) _jarch=ppc64 *) _jarch="$CARCH";; esac -_bootstrap_java_home="/usr/lib/jvm/java-1.7-openjdk" +_bootstrap_java_home="/usr/lib/jvm/java-1.8-openjdk" _java_home="/usr/lib/jvm/java-1.8-openjdk" _jrelib="$_java_home/jre/lib/$_jarch" @@ -38,6 +38,8 @@ _jrelib="$_java_home/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + subpackages="$pkgname-dbg $pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc $pkgname-demos" @@ -62,14 +64,58 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x icedtea-jdk-fix-libjvm-load.patch icedtea-jdk-musl.patch icedtea-jdk-includes.patch - icedtea-jdk-getmntent-buffer.patch icedtea-autoconf-config.patch - icedtea-jdk-tls-nist-curves.patch remove-gawk.patch " builddir="$srcdir/icedtea-$_icedteaver" # secfixes: +# 8.252.09-r0: +# - CVE-2019-2602 +# - CVE-2019-2684 +# - CVE-2019-2698 +# - CVE-2019-2745 +# - CVE-2019-2762 +# - CVE-2019-2766 +# - CVE-2019-2769 +# - CVE-2019-2786 +# - CVE-2019-2816 +# - CVE-2019-2842 +# - CVE-2019-2894 +# - CVE-2019-2933 +# - CVE-2019-2945 +# - CVE-2019-2949 +# - CVE-2019-2958 +# - CVE-2019-2962 +# - CVE-2019-2964 +# - CVE-2019-2973 +# - CVE-2019-2975 +# - CVE-2019-2978 +# - CVE-2019-2981 +# - CVE-2019-2983 +# - CVE-2019-2987 +# - CVE-2019-2988 +# - CVE-2019-2989 +# - CVE-2019-2992 +# - CVE-2019-2999 +# - CVE-2019-7317 +# - CVE-2020-2583 +# - CVE-2020-2590 +# - CVE-2020-2593 +# - CVE-2020-2601 +# - CVE-2020-2604 +# - CVE-2020-2654 +# - CVE-2020-2659 +# - CVE-2020-2754 +# - CVE-2020-2755 +# - CVE-2020-2756 +# - CVE-2020-2757 +# - CVE-2020-2773 +# - CVE-2020-2781 +# - CVE-2020-2800 +# - CVE-2020-2803 +# - CVE-2020-2805 +# - CVE-2020-2830 # 8.201.08-r0: # - CVE-2019-2422 # - CVE-2019-2426 @@ -102,22 +148,22 @@ unpack() { } prepare() { - ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" - ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" - [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ - || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" + _ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + _ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" + [ "${pkgver#*.}" = "$_ver_u.$_ver_b" ] \ + || die "Version mismatch, source is 8.$_ver_u.$_ver_b, but abuild defines $pkgver!" # Busybox sha256 does not support longopts. sed -e "s/--check/-c/g" -i Makefile.am - for patch in $source; do - case $patch in + for _patch in $source; do + case $_patch in icedtea-*.patch) - cp ../$patch patches + cp ../$_patch patches ;; *.patch) - msg "Applying patch $patch" - patch -p1 -i "$srcdir"/$patch + msg "Applying patch $_patch" + patch -p1 -i "$srcdir"/$_patch ;; esac done @@ -134,10 +180,10 @@ build() { fi DISTRIBUTION_PATCHES="" - for patch in $source; do - case $patch in + for _patch in $source; do + case $_patch in icedtea-*.patch) - DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch" + DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$_patch" ;; esac done @@ -200,7 +246,7 @@ jrelib() { pkgdesc="OpenJDK 8 Java Runtime (class libraries)" depends="" - for file in jre/lib/images \ + for _file in jre/lib/images \ jre/lib/*.jar \ jre/lib/security \ jre/lib/ext/*.jar \ @@ -209,9 +255,9 @@ jrelib() { jre/THIRD_PARTY_README \ jre/LICENSE; do - dir=${file%/*} - mkdir -p "$subpkgdir"/$_java_home/$dir - mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir + _dir=${_file%/*} + mkdir -p "$subpkgdir"/$_java_home/$_dir + mv "$pkgdir"/$_java_home/$_file "$subpkgdir"/$_java_home/$_dir done } @@ -219,7 +265,7 @@ jre() { pkgdesc="OpenJDK 8 Java Runtime" mkdir -p "$subpkgdir" - for file in jre/bin/policytool \ + for _file in jre/bin/policytool \ bin/appletviewer \ bin/policytool \ jre/lib/$_jarch/libawt_xawt.so \ @@ -228,9 +274,9 @@ jre() { jre/lib/$_jarch/libjsoundalsa.so \ jre/lib/$_jarch/libsplashscreen.so; do - dir=${file%/*} - mkdir -p "$subpkgdir"/$_java_home/$dir - mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir + _dir=${_file%/*} + mkdir -p "$subpkgdir"/$_java_home/$_dir + mv "$pkgdir"/$_java_home/$_file "$subpkgdir"/$_java_home/$_dir done } @@ -244,9 +290,9 @@ jrebase() { mv "$pkgdir"/$_java_home/lib/$_jarch/jli \ "$subpkgdir"/$_java_home/lib/$_jarch/ - for file in java orbd rmid servertool unpack200 keytool \ + for _file in java orbd rmid servertool unpack200 keytool \ pack200 rmiregistry tnameserv; do - mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/ + mv "$pkgdir"/$_java_home/bin/$_file "$subpkgdir"/$_java_home/bin/ done # Rest of the jre subdir (which were not taken by -jre subpkg). @@ -269,24 +315,22 @@ demos() { "$subpkgdir"/$_java_home/ } -sha512sums="a71c9318d49077f8ae27f5c3e0b61df0709eded241f557c886f6b93aa98c13ad78f713d1286da286989bf62866dfff7538ad783eb804a705a160cbc096dea851 icedtea-3.11.0.tar.xz -fc3faa7d7b9531f10c40241d89c36854043921f6f1a0851f284bcab36fc54fb0bb8cf8365dd4b2fb22b3ee8ddb8ed4a79e0807f79cb95b4b00f164993f1acc0b openjdk-3.11.0.tar.xz -9b8a44dda0bbfba8dc0d659e0fabf22e84b9931518e4b199a238faa103cbc4ed814c97f0f38f0aed263846b46fc7eab4500ba9759503373083e12cb8b5b364b5 corba-3.11.0.tar.xz -9eba0f6ada2ae8adc1791a91ceb4fba9bd06aee0626cd1b4310ff16c7c8006045fed5fb7f109e490395b70695be4e6bfd6f1f5cbcdb095fb17abf123012a03de jaxp-3.11.0.tar.xz -ce5f0c2aced1af59f002dc9dc6cba4b9332167e9e019a3040267901ef7f325e05b8c99ed1f276b88ddb4e43cdd1b0c456e0c4dc2222ae6b3800c0502ffa840de jaxws-3.11.0.tar.xz -411508ed91f14ae1c51ea54de72a943db222ff572f3991631fe1a1fa97f9bb42da1e01ca98893f7236b4b44bae2917fc3f8622d7f94a085be30d437451acd272 jdk-3.11.0.tar.xz -363c376848870c6c28415967561c4b151f1256c38a315fabc69c90425f5255224182045349a00c9433db52c416b7ebffedaa4825c980460541a3f9338adbaa5e langtools-3.11.0.tar.xz -13fa35f4a4fe01b3da4efb8476c0cb3482a36596eb422f2ad958a4c51efc286962ac3123a75853e84c4db477ac064a0fd3ee5e03f1ea0ec4f7e2c8ac07aa2d0e hotspot-3.11.0.tar.xz -2b46a8599d530a351522420cae8ac780cd2e64a6d7adbff87397a178f12f0a992bccd0f56435582dbd10be2157d4a4540c41b3dca488566162eed680102e58a9 nashorn-3.11.0.tar.xz -c0776ff52e11a353fee29419319cd9e1fc4e5bb922832547616e8499fd52852a935a6a6fb93b49a67ab7b3fd2f7a63320f917e354cc7123220139e80694a7b5a icedtea-hotspot-musl.patch +sha512sums="67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac icedtea-3.16.0.tar.xz +76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e openjdk-3.16.0.tar.xz +bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56 corba-3.16.0.tar.xz +86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836 jaxp-3.16.0.tar.xz +824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d jaxws-3.16.0.tar.xz +9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55 jdk-3.16.0.tar.xz +1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642 langtools-3.16.0.tar.xz +19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d hotspot-3.16.0.tar.xz +4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c nashorn-3.16.0.tar.xz +bfbeccc931b9eab04fca94167b7569af26195297130e2effd9175d33b74dec3dc5727fea6e0cbf3cce21ba09641ddd868179544d3fabe8b128baaaccb9c2711c icedtea-hotspot-musl.patch e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef icedtea-hotspot-musl-ppc.patch 19459dbb922f5a71cd15b53199481498626a783c24f91d2544d55b7dddd2cdb34a64bbf0226b99548612dd1743af01b3f9ff32c30abbbc90ce727ca2dbbbd1f9 icedtea-hotspot-noagent-musl.patch f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a873ef50148df3baaf6a8421e2da0b15faac675867da714dd5f icedtea-jdk-execinfo.patch 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471 icedtea-jdk-fix-libjvm-load.patch -1fbc32ddc528c7c0099dbc1e48f88d29dccf55e7b8997793aa1d3d8408003a1223d898cca4248e1a12d343d3feec5144f875e6cdac8460d763c73ab3ad7e49f9 icedtea-jdk-musl.patch -e8d9f1b867bf4fc84aa00d1237b264bcf503b1ed5f34735e14b0b747a728953fe0051a5af69ed058d377fbf65d8be1ed9e38fe5fc6edb2d50b31f34bf3ba91dc icedtea-jdk-includes.patch -7e6fa46b10c630517bfa46943858aea1d032c12d32ba3fcb7a2143ae1e896c34fa4cb8f925af80cb19f8e29149b835aa054adfd30ebb00539f6c78588d6f5211 icedtea-jdk-getmntent-buffer.patch +17c78db081a85e37721c23e0c0e7cab85e2201a0969bd4858cb90375b97d1703c9bf867f8ac02f6b33f9775b78bae41e38223b7a887918d4a6c9f29b75f3de28 icedtea-jdk-musl.patch +974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch 662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch -9ea7ac942baf29cc619bc2e1acd59201b9f6d38f39a517b495d7613aec746459200c81afb57c5fcdcb856f6bc8b33f7566c8593fed07e5c73f43e08f1072d458 icedtea-jdk-tls-nist-curves.patch b0f6d07c6a949acdc8b4a25bf924f134f468e162f01dd440fd4ca80769fb84a0a54210f93efbe88012404fe3db6701aad31cdbc772bc054ad69021c37db5538c remove-gawk.patch" diff --git a/user/openjdk8/icedtea-hotspot-musl.patch b/user/openjdk8/icedtea-hotspot-musl.patch index 6cfb3e606..5d6f688a1 100644 --- a/user/openjdk8/icedtea-hotspot-musl.patch +++ b/user/openjdk8/icedtea-hotspot-musl.patch @@ -82,8 +82,8 @@ index d2c10e0..20f657f 100644 -# include <fpu_control.h> +# include <linux/types.h> /* provides __u64 */ - #ifdef BUILTIN_SIM - #define REG_SP REG_RSP + #define REG_FP 29 + diff --git openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp index 38388cb..2505ba8 100644 --- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp diff --git a/user/openjdk8/icedtea-jdk-getmntent-buffer.patch b/user/openjdk8/icedtea-jdk-getmntent-buffer.patch deleted file mode 100644 index 075a9d423..000000000 --- a/user/openjdk8/icedtea-jdk-getmntent-buffer.patch +++ /dev/null @@ -1,88 +0,0 @@ -Give a much bigger buffer to getmntent_r. - -https://bugs.alpinelinux.org/issues/7093 - -diff --git a/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c b/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -index c8500db..d0b85d6 100644 ---- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -+++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -@@ -33,6 +33,7 @@ - #include <dlfcn.h> - #include <errno.h> - #include <mntent.h> -+#include <limits.h> - - #include "sun_nio_fs_LinuxNativeDispatcher.h" - -@@ -173,8 +174,8 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - jlong value, jobject entry) - { - struct mntent ent; -- char buf[1024]; -- int buflen = sizeof(buf); -+ char *buf = NULL; -+ const size_t buflen = PATH_MAX * 4; - struct mntent* m; - FILE* fp = jlong_to_ptr(value); - jsize len; -@@ -183,10 +184,17 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - char* dir; - char* fstype; - char* options; -+ jint res = -1; - -- m = getmntent_r(fp, &ent, (char*)&buf, buflen); -- if (m == NULL) -+ buf = malloc(buflen); -+ if (buf == NULL) { -+ JNU_ThrowOutOfMemoryError(env, "native heap"); - return -1; -+ } -+ m = getmntent_r(fp, &ent, buf, buflen); -+ if (m == NULL) -+ goto out; -+ - name = m->mnt_fsname; - dir = m->mnt_dir; - fstype = m->mnt_type; -@@ -195,32 +203,35 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - len = strlen(name); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)name); - (*env)->SetObjectField(env, entry, entry_name, bytes); - - len = strlen(dir); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)dir); - (*env)->SetObjectField(env, entry, entry_dir, bytes); - - len = strlen(fstype); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)fstype); - (*env)->SetObjectField(env, entry, entry_fstype, bytes); - - len = strlen(options); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)options); - (*env)->SetObjectField(env, entry, entry_options, bytes); - -- return 0; -+ res = 0; -+out: -+ free(buf); -+ return res; - } - - JNIEXPORT void JNICALL diff --git a/user/openjdk8/icedtea-jdk-includes.patch b/user/openjdk8/icedtea-jdk-includes.patch index 6443a1973..5acbb9efb 100644 --- a/user/openjdk8/icedtea-jdk-includes.patch +++ b/user/openjdk8/icedtea-jdk-includes.patch @@ -53,17 +53,6 @@ /* O Flags */ ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c -@@ -28,7 +28,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #if defined(__linux__) && !defined(USE_SELECT) --#include <sys/poll.h> -+#include <poll.h> - #endif - #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ - #include <netinet/in.h> --- openjdk.orig/jdk/src/solaris/native/java/net/bsd_close.c +++ openjdk/jdk/src/solaris/native/java/net/bsd_close.c @@ -36,7 +36,7 @@ @@ -88,14 +77,14 @@ * Stack allocated by thread when doing blocking operation --- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h +++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h -@@ -33,7 +33,7 @@ - #include <unistd.h> - - #ifndef USE_SELECT +@@ -27,7 +27,7 @@ + #define NET_UTILS_MD_H + + #include <netdb.h> -#include <sys/poll.h> +#include <poll.h> - #endif - + #include <sys/socket.h> + int NET_Timeout(int s, long timeout); --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ openjdk/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c diff --git a/user/openjdk8/icedtea-jdk-musl.patch b/user/openjdk8/icedtea-jdk-musl.patch index 97946ba42..7dbd6872c 100644 --- a/user/openjdk8/icedtea-jdk-musl.patch +++ b/user/openjdk8/icedtea-jdk-musl.patch @@ -47,32 +47,10 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk #define HAS_GLIBC_GETHOSTBY_R 1 #endif -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -41,7 +41,6 @@ - #endif - #ifdef __linux__ - #include <unistd.h> --#include <sys/sysctl.h> - #include <sys/utsname.h> - #include <netinet/ip.h> - -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -43,7 +43,6 @@ - #endif - #ifdef __linux__ - #include <unistd.h> --#include <sys/sysctl.h> - #endif - - #include "jvm.h" diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c ---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2017-02-06 11:23:47.047832009 +0000 -@@ -56,7 +56,7 @@ +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2020-04-29 12:33:10.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2020-05-02 19:35:51.590000000 +0000 +@@ -58,7 +58,7 @@ typedef struct { /* * Signal to unblock thread */ @@ -80,8 +58,8 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/ +static int sigWakeup; /* - * The fd table and the number of file descriptors -@@ -95,6 +95,9 @@ + * fdTable holds one entry per file descriptor, up to a certain +@@ -147,6 +147,9 @@ static void __attribute((constructor)) i /* * Setup the signal handler */ diff --git a/user/openjdk8/icedtea-jdk-tls-nist-curves.patch b/user/openjdk8/icedtea-jdk-tls-nist-curves.patch deleted file mode 100644 index 75fb3af8c..000000000 --- a/user/openjdk8/icedtea-jdk-tls-nist-curves.patch +++ /dev/null @@ -1,47 +0,0 @@ -Bug #7404 TLS negotiation error in OpenJDK 8 u131 - -Fixes an OpenJDK 8 regression discovered in docker-library/openjdk#115 -on Alpine Linux 3.5 (u121) and 3.6 (u131) that causes TLS negotiation -errors for some clients. - -Root cause appears to be OpenJDK announcing support for NIST curves the -underlying NSS library does doesn't. This patch limits OpenJDK's -announcement to elliptic curves 23 (secp256r1), 24 (secp384r1), and 25 -(secp521r1). - -Related issues: - -* https://github.com/docker-library/openjdk/issues/115 -* https://bugs.alpinelinux.org/issues/7404 -* https://access.redhat.com/discussions/2339811 -* https://bugzilla.redhat.com/show_bug.cgi?id=1022017 -* https://bugzilla.redhat.com/show_bug.cgi?id=1348525 - ---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2017-05-08 20:03:50.000000000 -0700 -+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2017-06-14 13:37:00.000000000 -0700 -@@ -168,21 +168,10 @@ - "contains no supported elliptic curves"); - } - } else { // default curves -- int[] ids; -- if (requireFips) { -- ids = new int[] { -- // only NIST curves in FIPS mode -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- }; -- } else { -- ids = new int[] { -- // NIST curves first -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- // non-NIST curves -- 22, -- }; -- } -- -+ int[] ids = new int[] { -+ // NSS currently only supports these three NIST curves -+ 23, 24, 25 -+ }; - idList = new ArrayList<>(ids.length); - for (int curveId : ids) { - if (isAvailableCurve(curveId)) { diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 30f2059ff..1743a4e6d 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> # # secfixes: +# 2.4.50-r0: +# - CVE-2020-12243 # 2.4.48-r0: # - CVE-2019-13057 # - CVE-2019-13565 @@ -11,7 +13,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.49 +pkgver=2.4.50 pkgrel=0 pkgdesc="LDAP Server" url="https://www.openldap.org/" @@ -29,7 +31,7 @@ subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc pkgusers="ldap" pkggroups="ldap" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" -source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz +source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz openldap-2.4-ppolicy.patch openldap-2.4.11-libldap_r.patch fix-manpages.patch @@ -60,7 +62,6 @@ done prepare() { default_prepare - update_config_sub sed -i '/^STRIP/s,-s,,g' build/top.mk libtoolize --force && aclocal && autoconf @@ -198,7 +199,7 @@ _submv() { done } -sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 openldap-2.4.49.tgz +sha512sums="f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae openldap-2.4.50.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 44417d5a2..3831b7b86 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.10.0 +pkgver=1.10.2 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a openttd-1.10.0-source.tar.xz" +sha512sums="03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683 openttd-1.10.2-source.tar.xz" diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD index 07a844c14..d1083c600 100644 --- a/user/oprofile/APKBUILD +++ b/user/oprofile/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oprofile -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=0 pkgdesc="System profiler for Linux" url="http://oprofile.sourceforge.net/news/" @@ -34,6 +34,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba oprofile-1.3.0.tar.gz +sha512sums="44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df oprofile-1.4.0.tar.gz 9ad0e25f2ab165e6613d8fbd65b652fb82b41beef28f9edca6b763001d50fb5f35e433454a7beeecaa1d0d3adc9c9f16adc6d4d9f20ae9d27cc3120c04906576 disable-regex-test.patch 831fd9b18df0daaa01682c50479f432e81da951550db6d0b11315232b728517493533b41b46fd64f3e74405b8d515fb86d7b4b96898cf45b262a7e790a131740 posixise.patch" diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 5251ec8b0..1fbcc5e17 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -4,7 +4,7 @@ pkgname=opus pkgver=1.3.1 pkgrel=0 pkgdesc="Codec designed for speech and audio transmission" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD index c0208b12d..030d83d39 100644 --- a/user/opusfile/APKBUILD +++ b/user/opusfile/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: pkgname=opusfile -pkgver=0.11 +pkgver=0.12 pkgrel=0 pkgdesc="High-level API for decoding and seeking within .opus files" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349 opusfile-0.11.tar.gz" +sha512sums="e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af opusfile-0.12.tar.gz" diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index 397e87ce7..a3338be79 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7ba6906823b0e4c6a724b98b587808d8136e29a7f3bdf6fdb8309cbb9bfd43bc903a79cf5629c5f5cbf15510de3526332728f538d8ff624c52c021488b4ca6c oxygen-icons5-5.68.0.tar.xz" +sha512sums="bcc61669105dc03526bb20ea890c29de6c9caab88f588e96fcc01cb94c3404e0cd198ea4e3f828eebbcf6ddaa01ecef35d3d193a16ee9286db85016911bcaf70 oxygen-icons5-5.72.0.tar.xz" diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index b42538c03..2cd5b0de4 100644 --- a/user/p11-kit/APKBUILD +++ b/user/p11-kit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=p11-kit -pkgver=0.23.18.1 +pkgver=0.23.20 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" @@ -10,7 +10,7 @@ license="BSD-3-Clause" depends="" makedepends="libffi-dev libtasn1-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-trust" -source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -42,4 +42,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd p11-kit-0.23.18.1.tar.gz" +sha512sums="1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57 p11-kit-0.23.20.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 793560380..31bb41211 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676 palapeli-19.12.3.tar.xz" +sha512sums="e1048ed8ad2b00170eb1079146b18549ac579804d9f7abcaf7f3479ce1bfa9fb4d406b93e3ea889084cd9aa936dc6b7db884992af379a382eb2a147f7f6010bd palapeli-20.04.3.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index c3201a64d..761ce14e6 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=20200301 +pkgver=20200702 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="8b9f0a9b0fdb676365d6b30af8ba8dee71ff433a4c4317151899f09614da3fc9764e5e9c48743cdf7c8fde6eea53a1d3ab37eb890f1486fc54ce328e6af9b348 papirus-icons-20200301.tar.gz" +sha512sums="ff2aa30bb70361f2952be203b3e3d00aae248726b5413a3a8e9ad7d6e7d0759e9bfd156cc65520175aba0e5436e9e58453ae0058d7d639d5c9a818e7f158761c papirus-icons-20200702.tar.gz" diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index e8254c58e..5b81f0c88 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pavucontrol-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt port of pavucontrol, a PulseAudio mixer" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0" + lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 pavucontrol-qt-0.14.1.tar.xz" +sha512sums="c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600 pavucontrol-qt-0.15.0.tar.xz" diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index 45924bda1..75cac244f 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=pciutils -pkgver=3.6.2 -pkgrel=2 +pkgver=3.7.0 +pkgrel=0 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" @@ -44,6 +44,6 @@ package() { rm -r "$pkgdir"/usr/share/hwdata } -sha512sums="a9332f07755ab8af6ba99a5fa3cf739b0f3688276902673b9fe981955c4fa732c3d0ccaa150942ecaf4b263a10c2653f5454aa87492cac1dd805f33500fac489 pciutils-3.6.2.tar.gz +sha512sums="37c01619264d299ac1e367a022637d60ab2bf6e5533fe9d37b2d37fdc5070563b78bfedc200b6bcb9192ce43fdec09ff350080c3e3ba504b90766d004398efc5 pciutils-3.7.0.tar.gz 520b39602078e4325d7dac2d460547b360f7b52c668d88cf3d776c59246c8cfcb537b7b4f50575da9d2fcea1e207b3e99626ce4f23df890d2565b7dac1db2d94 fix-linking-pci-malloc-Makefile.patch aa1d3272500180256929b39a5fc4ea38ddb6a9fad090d732832ded9cc396303cf56efc91cfdeb76edbcfefc9a7c8eb058562c3c2b09a9090a59d3e68c27cec62 pread.patch" diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index a48274c4f..a72c1e6ea 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pcmanfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="File manager and desktop icon manager for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 liblxqt-dev>=${pkgver%.*}.0 libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e pcmanfm-qt-0.14.1.tar.xz" +sha512sums="db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559 pcmanfm-qt-0.15.1.tar.xz" diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index d4e0355a6..22742c197 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=pcsc-lite -pkgver=1.8.25 -pkgrel=1 +pkgver=1.8.26 +pkgrel=0 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="https://pcsclite.apdu.fr/" arch="all" @@ -61,5 +61,5 @@ dev() { mv "$subpkgdir"/usr/lib/libpcsclite.so "$pkgdir"/usr/lib/libpcsclite.so } -sha512sums="0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb pcsc-lite-1.8.25.tar.bz2 +sha512sums="23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037 pcsc-lite-1.8.26.tar.bz2 6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041 pcscd.initd" diff --git a/user/perl-array-intspan/APKBUILD b/user/perl-array-intspan/APKBUILD index b36cd9c62..40301129a 100644 --- a/user/perl-array-intspan/APKBUILD +++ b/user/perl-array-intspan/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Array-IntSpan _author=DDUMONT _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.003 +pkgver=2.004 pkgrel=0 pkgdesc="Perl modules for interacting with arrays via integers" url="https://metacpan.org/pod/Array::IntSpan" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f55e39f7cccc3db56be07442e8b5f62d1afbf798ba3cf4008134ace8a30a6387cd7876f534e6bccfb24eb05213cc56961c7a28f73902c06105c80612a7c000a4 Array-IntSpan-2.003.tar.gz" +sha512sums="52f210e3beec0c1839baa51d68456c6aafbf9764e938f366317895ec26a6101bd4c83b738cf80326bdf975d68e01a796c1fc6ca3c9584ec50aaa45b3e8d7c7ba Array-IntSpan-2.004.tar.gz" diff --git a/user/perl-common-sense/APKBUILD b/user/perl-common-sense/APKBUILD index 43a250151..13e9e65d3 100644 --- a/user/perl-common-sense/APKBUILD +++ b/user/perl-common-sense/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=common-sense _author=MLEHMANN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.74 +pkgver=3.75 pkgrel=0 pkgdesc="Implements some (in)sane defaults for Perl programs" url="https://metacpan.org/pod/common::sense" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60 common-sense-3.74.tar.gz" +sha512sums="cb6034d9ff721a4122e0215db8ad5279ec4b189c3364593d427d70a1e84a1583a0e1447e276aa9a4fcaeb2f9d47a465a5bc4c0f842c803d3ddf91755311f4af4 common-sense-3.75.tar.gz" diff --git a/user/perl-data-uuid/APKBUILD b/user/perl-data-uuid/APKBUILD index 17e97b05f..9a56e43a0 100644 --- a/user/perl-data-uuid/APKBUILD +++ b/user/perl-data-uuid/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Data-UUID _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.224 +pkgver=1.226 pkgrel=0 pkgdesc="Perl module for working with UUIDs" url="https://metacpan.org/pod/Data::UUID" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="897ab26e83600214110167b86fc63848281b7bdf3818dcfedb713bf2eb64a06c48cc7cee43bfa4130c6fdb912fb77863bd31ffe08c95ec85e6660a9b369b7970 Data-UUID-1.224.tar.gz" +sha512sums="61c13b1aab3263d7bf94ecfde758acbdd986879144adbc436d32e5f5e03d70c8475984458681ab1d73d71bf5169b368c1f21a576ce996e225b6d74b5afd061fe Data-UUID-1.226.tar.gz" diff --git a/user/perl-datetime-locale/APKBUILD b/user/perl-datetime-locale/APKBUILD index 06bef0c08..351e655e5 100644 --- a/user/perl-datetime-locale/APKBUILD +++ b/user/perl-datetime-locale/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime-Locale _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.25 +pkgver=1.26 pkgrel=0 pkgdesc="Locale support for Perl DateTime" url="https://metacpan.org/release/DateTime-Locale" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="31fb6c2a4d38350dea0160dc816c21ed2b97f11510fe9f545fe52530d00260b7bb64b1cab3a7e30531a1337aac2dd2983d0b3af09d24da0c4451498729d8777a DateTime-Locale-1.25.tar.gz" +sha512sums="2b664f931abf4c81b6ff80752b3eb03c7d71aa6cd11da0e925a157ea0838234bc1ccb243ddd129d65f7f47e5e739176591bfe1c7ed2ec4d1476e56bdbe66c1b1 DateTime-Locale-1.26.tar.gz" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 6e14ed90e..c9c60ee88 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime-TimeZone _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.38 +pkgver=2.39 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="984a3bf8e30bae0085be51d67288230ffd8d2834b066b275720ab3658df6cc0607316cb22b2ca28ec8c9c1be7f6cbb8509eee52d4906aedf6175bf36a413b643 DateTime-TimeZone-2.38.tar.gz" +sha512sums="6f7580aa873a66d1892cd9201b5b2efd088842ffc2696e94c59c5532935be7eecea067fa979465046e0eeb35ca34e73bc49006e176445eaed91ac179beacc13b DateTime-TimeZone-2.39.tar.gz" diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD index c1157189e..42e1494df 100644 --- a/user/perl-datetime/APKBUILD +++ b/user/perl-datetime/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.51 +pkgver=1.52 pkgrel=0 pkgdesc="Date and time object for Perl" url="https://metacpan.org/release/DateTime" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d94d673ecefb7ed8bd485f7be9f3c2c0e9a07c402793f14f5af3bc026cc875d7d2a151f72f1c1d3518e08af133eab247796400215f4304f785d17d84e53caded DateTime-1.51.tar.gz" +sha512sums="c2e359f480396e0da16afbec362cb744f201f6c777fa916228f0adfd26a848b9451535feeda4e1531e5afb40a286e3b11a44e95dc0947dc4e2ba714973bb5ac4 DateTime-1.52.tar.gz" diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD index 55a62f12a..2c41fb4d3 100644 --- a/user/perl-devel-hide/APKBUILD +++ b/user/perl-devel-hide/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Devel-Hide _author=DCANTRELL _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.0011 +pkgver=0.0013 pkgrel=0 pkgdesc="Perl module for forcing the unavailability of modules for testing" url="https://metacpan.org/pod/Devel::Hide" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8034ced8a126b88f3724780a40adbc13e662c794901ac103061416627b328f598e742e1353e15d6e89f648d9ac6e5804e9b41ced79bd7c600386fa874dc17042 Devel-Hide-0.0011.tar.gz" +sha512sums="acaa190dcc046ddc6c5bfb300ab2042b87bc43e67d1766cde07a83380ea3989461cec9527e0f7c1881ae7e9ac4aeb75b6255cdda287c280dabb2d5b7b9b785d6 Devel-Hide-0.0013.tar.gz" diff --git a/user/perl-email-mime-contenttype/APKBUILD b/user/perl-email-mime-contenttype/APKBUILD index a124048ce..33880b115 100644 --- a/user/perl-email-mime-contenttype/APKBUILD +++ b/user/perl-email-mime-contenttype/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=Email-MIME-ContentType _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.022 +pkgver=1.024 pkgrel=0 pkgdesc="Parse MIME Content-Type/Disposition headers in Perl" url="https://metacpan.org/release/Email-MIME-ContentType" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl" +depends="perl perl-text-unidecode" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="38561922e0dbc180ac24003a3b64ef39e25a5607bbedc75a3e4580490ab84e02bfd5165225eff4884112cf1f82ec46ee62f31c047acea6b9a3cca390deb965be Email-MIME-ContentType-1.022.tar.gz" +sha512sums="054d81ff9c4aa095e05a1bba287a26d4f7e8de3cec4d47b6cf7314acb04bb08270fac9c58d2b85e3ee5a02afa78d5f364717ff2b5793a1fe7ea1f2fef2812cfd Email-MIME-ContentType-1.024.tar.gz" diff --git a/user/perl-email-mime/APKBUILD b/user/perl-email-mime/APKBUILD index f4549e334..1992b6c0e 100644 --- a/user/perl-email-mime/APKBUILD +++ b/user/perl-email-mime/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Email-MIME _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.946 +pkgver=1.949 pkgrel=0 pkgdesc="Easy MIME message handling for Perl" url="https://metacpan.org/release/Email-MIME" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="335a8fd032cca0bb1cdb230899c53fc72037939bd11653d08e66a9ffa6fc5f87aefa2ce28f14b1cbb1a0bacd778b5459445d2829835bedc4f6276ae2ef2d6caa Email-MIME-1.946.tar.gz" +sha512sums="2cd8653a4efe8195d574827ad15883ff7f82d92325197c0458f1ddfd4c50ed275068e8a2df5ed5110b37b5b904aaf4234855eefec9cfc0d70987e678df2732ea Email-MIME-1.949.tar.gz" diff --git a/user/perl-exporter-tiny/APKBUILD b/user/perl-exporter-tiny/APKBUILD index b91680ef4..d0c70bac1 100644 --- a/user/perl-exporter-tiny/APKBUILD +++ b/user/perl-exporter-tiny/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Exporter-Tiny _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.002001 +pkgver=1.002002 pkgrel=0 pkgdesc="Light-weight exporter with the features of Sub::Exporter" url="https://metacpan.org/release/Exporter-Tiny" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b247e7785e02c3346f231736a430c2d54e5ac93c175892090c40121c86eb255ce4d138c65e31836fd2970b45fb71dc7e68ea3c45a06a9e9c4135b45df48621d8 Exporter-Tiny-1.002001.tar.gz" +sha512sums="b6d39ba1824f6c9d68cf75e7f28fd896c2c475e419f0b1aadec58d4e7e5c8d3fd7bf85d841758772055470de56ad7a3ad6787cfd9d6c5d61d8449cf8f40bda8d Exporter-Tiny-1.002002.tar.gz" diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index 46f78e1d9..8e3a89fc1 100644 --- a/user/perl-file-slurp/APKBUILD +++ b/user/perl-file-slurp/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=File-Slurp _author=CAPOEIRAB _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=9999.29 +pkgver=9999.32 pkgrel=0 pkgdesc="Simple and efficient file manipulation in Perl" url="https://metacpan.org/release/File-Slurp" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f98f83ceb17eef1e79ba9a9222106b0cc00bffe671b91046bcabda8aeb85a3d4f3ee7d64048a916c9486602326819ebfb4ede274e39435aacbda4e35d30cdd5c File-Slurp-9999.29.tar.gz" +sha512sums="413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56 File-Slurp-9999.32.tar.gz" diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD index df76050da..604ca22cb 100644 --- a/user/perl-gd/APKBUILD +++ b/user/perl-gd/APKBUILD @@ -5,8 +5,8 @@ _pkgreal=GD _author=RURBAN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.71 -pkgrel=1 +pkgver=2.72 +pkgrel=0 pkgdesc="Perl module for GD graphics library" url="https://metacpan.org/release/GD" arch="all" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3a1555f07e6ab36a7218f24853f4168914be45e8c19ab0fe971ab044725dc0d7efeca75be2e4408406e69601f07e047fd3ea157acc9b9d339c9917a1c3e1f74d GD-2.71.tar.gz" +sha512sums="93a42c2385673ce8133102adc125da966f8a8abcebe4a0a9d87ae3e77a84870138db81f532e393eb1c5be4b12c71b737bd5b85ed84cf4b8580f08a5296189103 GD-2.72.tar.gz" diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD index b5492009c..affb9612a 100644 --- a/user/perl-getopt-long-descriptive/APKBUILD +++ b/user/perl-getopt-long-descriptive/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Getopt-Long-Descriptive _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.104 +pkgver=0.105 pkgrel=0 pkgdesc="Simpler Perl implementation of Getopt::Long" url="https://metacpan.org/release/Getopt-Long-Descriptive" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5579faa6f9012cd03ac4d51149b0854771f15d8e324f8df345fe6af1a8f3fdeaaef6c5becee55bf77515da85d92aa61a63dfc5ee8264d2d0368e02a4a4cbd7fa Getopt-Long-Descriptive-0.104.tar.gz" +sha512sums="e7528ac509bc7fb49ee59a8ed8dec0c9a619a8f34c207e7a9185829666248797211a56576721b7fc8cdd44ae55d2d45f048958b79a6228ee76d91c3a52685236 Getopt-Long-Descriptive-0.105.tar.gz" diff --git a/user/perl-http-entity-parser/APKBUILD b/user/perl-http-entity-parser/APKBUILD index ea37b802a..7373c46d0 100644 --- a/user/perl-http-entity-parser/APKBUILD +++ b/user/perl-http-entity-parser/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=HTTP-Entity-Parser _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.22 +pkgver=0.23 pkgrel=0 pkgdesc="PSGI compliant HTTP entity parser for Perl" url="https://metacpan.org/release/HTTP-Entity-Parser" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fc54b92af197ec4dbdb1069f5a7a8db0892483f80a3737f4914cb6d03dd0ec01b2b215bed96b6736474d2d484516071926774610ace475199cae44174cc2abd0 HTTP-Entity-Parser-0.22.tar.gz" +sha512sums="7ae384ae91b5519b9953f7186a898c8821d600c6ff2d2c659003dc23307cd01a5a241d3470509bafde72db6e611a74a56bb48b1ddc9d8c0bd12662e660febd25 HTTP-Entity-Parser-0.23.tar.gz" diff --git a/user/perl-lwp-protocol-https/APKBUILD b/user/perl-lwp-protocol-https/APKBUILD index 6512088a6..303e8aee7 100644 --- a/user/perl-lwp-protocol-https/APKBUILD +++ b/user/perl-lwp-protocol-https/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=LWP-Protocol-https _author=OALDERS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=6.07 +pkgver=6.09 pkgrel=0 pkgdesc="HTTPS support for Perl LWP" url="https://metacpan.org/release/LWP-Protocol-https" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4a07cd8a1c44e31781069a632a77f3af43747933420e831b4fd4a12faac7dc04f0c6b10ea773c3e14ecb66209a547b3587c0e3f481a55b9929db65f7b10343aa LWP-Protocol-https-6.07.tar.gz" +sha512sums="53e1ec7dec04988c3c7fa70a5f0ed60c38270bbbb9fe99a7cfeb84db0c40f5ff6f6f94aa4aa639498af6d0bc201dcb7e6e3491bae96411250ef50b010d32add1 LWP-Protocol-https-6.09.tar.gz" diff --git a/user/perl-moose/APKBUILD b/user/perl-moose/APKBUILD index b716f58fc..c819afe09 100644 --- a/user/perl-moose/APKBUILD +++ b/user/perl-moose/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Moose _author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.2012 +pkgver=2.2013 pkgrel=0 pkgdesc="A postmodern object system for Perl 5" url="https://metacpan.org/release/Moose" @@ -38,4 +38,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="195079c32ce0110ae5d76bc1753b9e5c9aa8b3132049912d85600b7d29470b3426e10ccac50a24acbadbb8e00b68c99a98ca975a001b12096b02f2fa1c1264f3 Moose-2.2012.tar.gz" +sha512sums="9e177019930d6bae4fdd90713e3c95b16e6bc91e229ab2aacc03e14a5efbedf6c944b93fefbbcc4586ffb18cc786f323c4102f76d84af949c8f328acf69a5ec3 Moose-2.2013.tar.gz" diff --git a/user/perl-moox-struct/APKBUILD b/user/perl-moox-struct/APKBUILD index 116e1a0cc..66a7d2c50 100644 --- a/user/perl-moox-struct/APKBUILD +++ b/user/perl-moox-struct/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=MooX-Struct _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.017 +pkgver=0.020 pkgrel=0 pkgdesc="Structures for the Moo Perl object framework" url="https://metacpan.org/pod/MooX::Struct" arch="noarch" license="Artistic-2.0 OR GPL-2.0-only" -depends="perl perl-moo perl-namespace-clean perl-object-id perl-type-tiny" +depends="perl perl-moo perl-namespace-autoclean perl-object-id perl-type-tiny" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6877065c1ece8c7bef78871e76d279e9a35b7cf0ae6b499dcfb6f02e2fb6ad2a1c73823bb54b434ed8012eb3e8426a530155eae24e3053db46cfca7ff6ce8329 MooX-Struct-0.017.tar.gz" +sha512sums="a9a14efee9db43b39df02b452aed7f558360812c28581cc245ed8eea68fc328b40fee6a9c8949851048ee6fff3ec9aa99beb5ab63845f9bcb83d9c9d1c7e712e MooX-Struct-0.020.tar.gz" diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD index 638aea5bf..8fcf9b0cb 100644 --- a/user/perl-mouse/APKBUILD +++ b/user/perl-mouse/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Mouse _author=SKAJI _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.5.9 +pkgver=2.5.10 pkgrel=0 pkgdesc="Moose minus the antlers" url="https://metacpan.org/pod/Mouse" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e817eecaeccb979c1b78819b61724ebaad9f938d82b76ad7b73a8bfe2f5e1c63a2cd8e8439bcededd17be4770af6bfa98b594e58278e0388272dbd5d416ea6c0 Mouse-v2.5.9.tar.gz" +sha512sums="949a2f18257a5afcf4dbbb84094974f4d80e1e4531b4b9d8618cf141252fd11b09b79daafe1de79faa620905988f649627bc2fceac357ea2f180db74cd48f711 Mouse-v2.5.10.tar.gz" diff --git a/user/perl-mozilla-ca/APKBUILD b/user/perl-mozilla-ca/APKBUILD index 0d15aed92..d8713579a 100644 --- a/user/perl-mozilla-ca/APKBUILD +++ b/user/perl-mozilla-ca/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Mozilla-CA _author=ABH _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=20180117 +pkgver=20200520 pkgrel=0 pkgdesc="Mozilla's CA certificate bundle for Perl" url="https://metacpan.org/release/Mozilla-CA" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8b4187f47638ba8d670b3f5cafc1de4040dfec1dde6a932411c79b41a8a454bcd3b66f9818c6d28135e29551ce93bc3ddb61e648c7810b30cb147ea0beaaedba Mozilla-CA-20180117.tar.gz" +sha512sums="5bc7c43c55baa3f878fd2dbf1c85d6b20dcdc9e54ae073d1be4f6b808fa5a4b1205428b7967b5f752b31a62464a8b5cc67b32b3f70b834a4da9c39efe3d5d59f Mozilla-CA-20200520.tar.gz" diff --git a/user/perl-path-tiny/APKBUILD b/user/perl-path-tiny/APKBUILD index e30f0bbdd..f75e55398 100644 --- a/user/perl-path-tiny/APKBUILD +++ b/user/perl-path-tiny/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Path-Tiny _author=DAGOLDEN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.112 +pkgver=0.114 pkgrel=0 pkgdesc="File path utility" url="https://metacpan.org/pod/Path::Tiny" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c387192fc42a78aee506fa332fd9fcd385fbc28fed02bc41b9c50e4cff6c65700ad3fd9d840871ef3bf7a8029719d8fd8b84f993ac816ff65c8d4e2203ad3b3f Path-Tiny-0.112.tar.gz" +sha512sums="932d9d4658af1e578142ff3bb4e541e6fb7754397c55f869d17f9989a181c10b528779aeedcaafc2cd879a31a6febe63d220cbf843f187db92e6ae1087c39e56 Path-Tiny-0.114.tar.gz" diff --git a/user/perl-posix-strftime-compiler/APKBUILD b/user/perl-posix-strftime-compiler/APKBUILD index 5d5e4181b..641a6ffcd 100644 --- a/user/perl-posix-strftime-compiler/APKBUILD +++ b/user/perl-posix-strftime-compiler/APKBUILD @@ -5,14 +5,14 @@ _pkgreal=POSIX-strftime-Compiler _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.42 +pkgver=0.43 pkgrel=0 pkgdesc="Perl strftime compiler" url="https://metacpan.org/release/POSIX-strftime-Compiler" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="perl-dev perl-module-build" +makedepends="perl-dev perl-module-build-tiny" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0c07f1b8589b067533c65a023dd634a29640cb8992aae8047aa1063affe6b30b95930479829982a30a13b87bc7c9ebf82ca4837726bd29658d85d718164e3c76 POSIX-strftime-Compiler-0.42.tar.gz" +sha512sums="3a0a118509a4da3b4af774d75be5cf05e65672c61df57117317d39f13a835c1d8cd27c9bebe4d81c20e8a628e69f698e8406b93610feb8900c1f225c9dbd4f9d POSIX-strftime-Compiler-0.43.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 4ab828d5e..3c400e799 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Regexp-Pattern _author=PERLANCAR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.2.13 +pkgver=0.2.14 pkgrel=0 pkgdesc="Perl framework for regex collection standardization" url="https://metacpan.org/pod/Regexp::Pattern" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="174bdba6540a9593f99850f71ef919582e0a61c9079b89480fd1c817df5c40f7300c1402c9a9b1cc6844a0eb6af9ef48fac35ef1646754d1700759e94381114e Regexp-Pattern-0.2.13.tar.gz" +sha512sums="85386d757982eb374a85c8c12d16a1ad24384b741ed1bd63292d2d3504ff0ec613fa49627a7e7d4d0f53f8e594bd613dd0c5b9da5b3237ad54c0a099ece60b0e Regexp-Pattern-0.2.14.tar.gz" diff --git a/user/perl-specio/APKBUILD b/user/perl-specio/APKBUILD index e4b98e930..2952124bc 100644 --- a/user/perl-specio/APKBUILD +++ b/user/perl-specio/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Specio _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.45 +pkgver=0.46 pkgrel=0 pkgdesc="Type constraints and coercions for Perl" url="https://metacpan.org/release/Specio" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="28c32b155ddd1537e2ed2e634b667c4010903a4c68e4684f07f4bb74414eeaf5f5ef05f4ed898c830751abfacc51280b00970250db1b2e1219acc23e834994d7 Specio-0.45.tar.gz" +sha512sums="8dfc0e87bd640bd30aa9a92118f77305565dee2441f95c7e9f311b517c07573e3a0e977ea348eaf879dfafe6edc3c0d89625f28b5f3f0f2bff789178cd513802 Specio-0.46.tar.gz" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index 40c898c4a..43799221e 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Template-Toolkit _author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.29 +pkgver=3.009 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5b1bfeaf600a5628b6441e54de5c4af1cf4e01296792a79290d4bf2a698be47112e94a05fe3f47bf9ac64c4d8b9340aa6ef8738560fb1f96510d7d1c9f647a65 Template-Toolkit-2.29.tar.gz" +sha512sums="940992d7e3059a64c273c2f0441a81e095560c35f4bb9ab75afb9eeeb58d043cc5ac9785e2eb79a6635480ade12771c75c632c755977124dbe7cbfae399f9972 Template-Toolkit-3.009.tar.gz" diff --git a/user/perl-test-deep/APKBUILD b/user/perl-test-deep/APKBUILD index b41b1e20a..36feb7f8b 100644 --- a/user/perl-test-deep/APKBUILD +++ b/user/perl-test-deep/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Deep _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.128 +pkgver=1.130 pkgrel=0 pkgdesc="Extremely flexible deep comparison" url="https://metacpan.org/pod/Test::Deep" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d4642b3268a10d8e882beabfbb3b3bf891a57aa7ebb74bc4919a4368df9c9acd2351498401538ae50299071f99e06b4443686d20f8c9f95f5fd588309ccee302 Test-Deep-1.128.tar.gz" +sha512sums="de34197c97d44c68dd43372fa5a4d905a2ad636b5503c5f1443476a85b921f42cd07d475af8901dfee9deff1f29deef440c1783cdcc7f93c5f5030c4548ff9cf Test-Deep-1.130.tar.gz" diff --git a/user/perl-test-most/APKBUILD b/user/perl-test-most/APKBUILD index 7d6895596..e089952da 100644 --- a/user/perl-test-most/APKBUILD +++ b/user/perl-test-most/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Most _author=OVID _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.35 +pkgver=0.37 pkgrel=0 pkgdesc="Most commonly needed Perl test functions and features" url="https://metacpan.org/release/Test-Most" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291 Test-Most-0.35.tar.gz" +sha512sums="133dbb9815884fbecd65520dd2f2d43a761439c33f7d32ffdfc80ed3d3e05fb563dca420cf5445e61382735a048c467b35b5c160b1013b5f5c7616be00aa328d Test-Most-0.37.tar.gz" diff --git a/user/perl-test-utf8/APKBUILD b/user/perl-test-utf8/APKBUILD index 408a847be..020aaa9fe 100644 --- a/user/perl-test-utf8/APKBUILD +++ b/user/perl-test-utf8/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-utf8 _author=MARKF _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.01 +pkgver=1.02 pkgrel=0 pkgdesc="Handy UTF8 tests" url="https://metacpan.org/pod/Test::utf8" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="07dcd5ed98a63f7d96bb0fc629b168773d02bb4c93c5bc44ec60738fc29669794547dfde5913f9de682cd583cf85f4d82b6151398aaebcfec9278525447b9c4e Test-utf8-1.01.tar.gz" +sha512sums="f544174ad570c5e027acf66dcf335ddc4be3727488559933a389dbd7f2214e66490f96d0e816677310468076719d891fa3da80524b2b10345d8be8eebf4a1469 Test-utf8-1.02.tar.gz" diff --git a/user/perl-test-warnings/APKBUILD b/user/perl-test-warnings/APKBUILD index 978cdc674..69f8ee727 100644 --- a/user/perl-test-warnings/APKBUILD +++ b/user/perl-test-warnings/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Warnings _author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.028 +pkgver=0.030 pkgrel=0 pkgdesc="Test for warnings and the lack of them" url="https://metacpan.org/pod/Test::Warnings" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6e8c1012eeebd3260d36ef0bf731a6351ce704a400e24709009bc72b07a4411d6725ea612e19ad55edca6d985e0ea8d9da3a51713b4c655e5783f3d9e6e39ab0 Test-Warnings-0.028.tar.gz" +sha512sums="bb9fe480263b700d499fb6bff4321711807f63c0c96d1dd9b27fa8ee1d8a629fe23c46f37125a4c569c5bf784ff35fccce5815dfa93af55b2dfdcc99311fb40b Test-Warnings-0.030.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 9e3765505..1230f2449 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test2-Suite _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.000129 +pkgver=0.000130 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0d72ab6998f741ba016e1398a45b751930a016488b7b02117d476d6e8d6656a4de0f2ceae379260472d0eba7e8ca00e6bfa59240ee09c71ed9963be3dfd249da Test2-Suite-0.000129.tar.gz" +sha512sums="fbfa6d708de5e5e0d55221b53e86409db034eea1b6d5279cbc5b3a20a8156c959efb5cecdea4057f38525fd451655314ea4048620d4c17ae2df138a39c2816e5 Test2-Suite-0.000130.tar.gz" diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index 7afc5ca1d..ff4bb9b8d 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Text-Template _author=MSCHOUT _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.58 +pkgver=1.59 pkgrel=0 pkgdesc="Perl module for expanding embedded Perl in templates" url="https://metacpan.org/pod/Text::Template" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="23bf03529c7607806c16573b5c0d08ba0b87cf7eb859538d1944bc13952741a88c15588e8de173053a51640c5bdad99c5cc246a67cc05be7eff32853887fbb11 Text-Template-1.58.tar.gz" +sha512sums="18c56dfe10aa3e7af7ea4821c1d8002d89eb7fdf46917877e7e132cfee59783a91953255f79a355f435eff16304ae206e59557328ef51593745ae6c50e3acab7 Text-Template-1.59.tar.gz" diff --git a/user/perl-text-unidecode/APKBUILD b/user/perl-text-unidecode/APKBUILD new file mode 100644 index 000000000..e96572aa2 --- /dev/null +++ b/user/perl-text-unidecode/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-text-unidecode +_pkgreal=Text-Unidecode +_author=SBURKE +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=1.30 +pkgrel=0 +pkgdesc="Transliterate Unicode text to ASCII" +url="https://metacpan.org/release/Text-Unidecode" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="194f8aba0dcdc7a53338b86370b7cfb6c60d4a8982ada6084f0eb0ccd66ce461b831b6daf04932f039ff1b983dc3cd0c0ced1e8b455955d2699c36120b41a526 Text-Unidecode-1.30.tar.gz" diff --git a/user/perl-timedate/APKBUILD b/user/perl-timedate/APKBUILD index 65704784a..fe49a5df0 100644 --- a/user/perl-timedate/APKBUILD +++ b/user/perl-timedate/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=TimeDate _author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.31 +pkgver=2.33 pkgrel=0 pkgdesc="Date and time handling routines for Perl" url="https://metacpan.org/release/TimeDate" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="abee40d77ce4a57e251575b450406b1d26ac369d05899c1630f996b6f3c0c5ac222b84ff04d6fdf4c0763eb0a5bc45a59edadcfb15c73982787c8c17e0ee2a2a TimeDate-2.31.tar.gz" +sha512sums="a3a20a0d9439e68bf621c66fad0598e6257345727be79c87c7cc99994b3a58eb738787fedb720beb069e9758ad1347c15313f64411806dd0f4dfbcca5061c820 TimeDate-2.33.tar.gz" diff --git a/user/perl-xs-object-magic/APKBUILD b/user/perl-xs-object-magic/APKBUILD index f708427dd..179caa8ed 100644 --- a/user/perl-xs-object-magic/APKBUILD +++ b/user/perl-xs-object-magic/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xs-object-magic _pkgreal=XS-Object-Magic -_author=FLORA +_author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.04 +pkgver=0.05 pkgrel=0 pkgdesc="Opaque, extensible XS pointer backed objects using sv_magic" url="https://metacpan.org/pod/XS::Object::Magic" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="315288496c0bab79f16d010f7f140dc1483bb3a1053a7fc41a048308aa1f9ae01b03795be28f132c856360176372d2251315ae62db950e377be88ff222a441dd XS-Object-Magic-0.04.tar.gz" +sha512sums="8927ab903f95d4f14a1602b3b4040dc9351f3348249a37e93dbf5cc2417bbde3b5c9a7512436e58b6a16fa48f6f4b55a300951560971d457814e8ef5044e6469 XS-Object-Magic-0.05.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 25e153a20..32d2058c0 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=YAML-LibYAML _author=TINITA _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.81 +pkgver=0.82 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="469ac568f5b7562cb4e58150121f7dbaaf129ce2ae72690e94c644da980a43fb0e1b372c4d674ca5413741af1d2756971341631f03c51bd99479cfe775b7c6e2 YAML-LibYAML-0.81.tar.gz" +sha512sums="b4535ab4d19ea8a9c4aaa9683937bc822c59f80439fa1da0a02e057ce5d95f271ab06ce58346c58eeacd99d29bf276f5a1289992ca569f63d65ceff9b833da0c YAML-LibYAML-0.82.tar.gz" diff --git a/user/picmi/APKBUILD b/user/picmi/APKBUILD new file mode 100644 index 000000000..951b92ec4 --- /dev/null +++ b/user/picmi/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=picmi +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Single-player logic/pattern game" +url="https://kde.org/applications/games/org.kde.picmi" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtsvg-dev cmake extra-cmake-modules + qt5-qtdeclarative-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdeclarative-dev kdoctools-dev ki18n-dev kio-dev knewstuff-dev + kxmlgui-dev libkdegames-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/picmi-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="d64b73880fcee4ec7f98d70787e7418da9df30eb26f3f136da8773d75589a44e0508c4e5a26d33d7e59e8b56bf2502a44553d0872ce5797b01dcbb03049e7def picmi-20.04.3.tar.xz" diff --git a/user/pidgin-otr/APKBUILD b/user/pidgin-otr/APKBUILD index 6d713b2ee..ee3d24c82 100644 --- a/user/pidgin-otr/APKBUILD +++ b/user/pidgin-otr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin-otr pkgver=4.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Enables encrypted, secure messaging in Pidgin IM" url="https://otr.cypherpunks.ca/" arch="all" diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD index 83ee02c14..4a041097e 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin -pkgver=2.13.0 -pkgrel=1 +pkgver=2.14.1 +pkgrel=0 pkgdesc="Multi-protocol instant messaging client" url="http://pidgin.im/" arch="all" @@ -10,9 +10,9 @@ depends="gst-plugins-base" makedepends="gtk+2.0-dev perl-dev libsm-dev startup-notification-dev libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev - gst-plugins-base-dev farstream-dev" + gst-plugins-base-dev farstream-dev libgnt-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" -source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/pidgin/$pkgname-$pkgver.tar.bz2" build() { LIBS="-lX11 -ltinfo" ./configure \ @@ -27,7 +27,6 @@ build() { --disable-meanwhile \ --disable-nm \ --enable-perl \ - --disable-python \ --disable-schemas-install \ --disable-screensaver \ --enable-tcl \ @@ -51,9 +50,7 @@ package() { finch() { pkgdesc="Text-based multi-protocol instant messaging client" mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/lib/gnt "$pkgdir"/usr/lib/libgnt.so.* \ - "$pkgdir"/usr/lib/finch \ - "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/finch "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/bin/finch "$subpkgdir"/usr/bin/ } @@ -65,4 +62,4 @@ libpurple() { "$subpkgdir"/usr/share/ } -sha512sums="68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 pidgin-2.13.0.tar.bz2" +sha512sums="6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030 pidgin-2.14.1.tar.bz2" diff --git a/user/pimcommon/APKBUILD b/user/pimcommon/APKBUILD new file mode 100644 index 000000000..abe9de1df --- /dev/null +++ b/user/pimcommon/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=pimcommon +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Common files for KDE PIM software" +url="https://kontact.kde.org/" +arch="all" +license="LGPL-2.0+ AND GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qttools-dev cmake extra-cmake-modules boost-dev + karchive-dev kauth-dev kbookmarks-dev kcodecs-dev kcompletion-dev + kconfig-dev kconfigwidgets-dev kcontacts-dev kcoreaddons-dev ki18n-dev + kimap-dev kio-dev kitemmodels-dev kitemviews-dev kjobwidgets-dev + kmime-dev knewstuff-dev kpimtextedit-dev kservice-dev ktextwidgets-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev libkdepim-dev + purpose-dev solid-dev sonnet-dev + akonadi-dev akonadi-contacts-dev attica-dev libxslt-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/pimcommon-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="63396ba86cbcd6a8e53981cac79f30ead57dbe06eb1772274a185726117b2bbcb52f8c8f0dc9a8d9534f147615d985ed0d6812e466989b6968944b775ca2dd31 pimcommon-20.04.3.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index b66828fe1..b65eaf0b5 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -14,7 +14,7 @@ depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2 # shell/QML dependencies depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap" # Good Ideas™ to have -depends="$depends consolekit2 kdeclarative polkit-kde-agent-1" +depends="$depends elogind kdeclarative polkit-kde-agent-1" makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index fb047de4e..0668873b2 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4e0ef5fff99518061f79f7eb03fe8048fa8c5d863e8092f05f98dfa0fec8cb1f097d042ffb417434a1b0bd424c0997c4a2c38068bcae30e39324d001ea3ffd0 plasma-framework-5.68.0.tar.xz" +sha512sums="b120ff92f6adec4b08993004bda3eecb84afcb038155407850810d7c6b0bb33357730e4784525da3eb249368a97b893c1587e0411286c0455ab6b35caa116a7a plasma-framework-5.72.0.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index bc65648cb..bc48295b7 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.9 +pkgver=3.4.14 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" @@ -92,6 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991 postfix-3.4.9.tar.gz +sha512sums="520ec509dbf83390b480e4db5320b78162bb4d16e58b8a63de08c8012555150145ac3630931ab6bfd36e7ff82e75749ead8e0dce3fe645bc58ac1ec709e7dfd3 postfix-3.4.14.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 2fa79cc16..11fe97d84 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -44,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="dc3606bf25ec07f3702b9c5cb51fbb29c410d864349ca65fc5f86d26619be24ce42a14e969a2db4a11b8f1f57dca8705a0bd163e5bea468fe5edfa06a409f1c3 prison-5.68.0.tar.xz" +sha512sums="5f3021a23f4724de77bcbe942b023561dadcf39966d170ebb04885aced86fe6196b88bf5ed7f3cee1235d8fb5d2d1bef6c9e5b46eaa3e646ec44acd38a070f7d prison-5.72.0.tar.xz" diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD index 1ae2b8691..1cbf72a67 100644 --- a/user/purple-plugin-pack/APKBUILD +++ b/user/purple-plugin-pack/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purple-plugin-pack pkgver=2.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Collection of plugins to enhance Pidgin and Finch" url="https://bitbucket.org/rekkanoryo/purple-plugin-pack/" arch="all" diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD index dbad62201..a48d698cc 100644 --- a/user/purpose/APKBUILD +++ b/user/purpose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purpose -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE context menu framework" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8103026b5b7bef1dd4fd28912eaefbace466c39967a474a7b8abf1e074be58c5b3d68527c132fa79adf2785a059ae8a09537735b6a51b53aa553113b6d48aad purpose-5.68.0.tar.xz" +sha512sums="64359268f82d35e0c4a79f9a3b3472ea06217b719f73f145263598fe8f4df3e0025bcec4baf28a3dd5a7f86e2bb9ed1f2f46027a12c1c55235de349e22cd1284 purpose-5.72.0.tar.xz" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 56681055b..408ed4ab5 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-cffi _pkgname=cffi _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=0 pkgdesc="Interface for Python to call in to C code" url="https://cffi.readthedocs.io/" @@ -29,4 +29,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253 py3-cffi-1.14.0.tar.gz" +sha512sums="bf000904e3d1ece122f49b8c166636c67987e9bf2e34b613d8e013692ed319581f393cd9570d7f050e5c492a8bc1c4cb5bb56eb50c68f9feea973c1e56c951c0 py3-cffi-1.14.1.tar.gz" diff --git a/user/py3-cparser/APKBUILD b/user/py3-cparser/APKBUILD index 4f076a744..49f9ce944 100644 --- a/user/py3-cparser/APKBUILD +++ b/user/py3-cparser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cparser -pkgver=2.19 +pkgver=2.20 pkgrel=0 pkgdesc="C99 parser in pure Python" url="https://github.com/eliben/pycparser" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="88fe63c1a7a344c564dfd3b4f99735a4159c8a3f5738bab839943ea7fcbf1f5340f67326550b7e66508ea5862897e5bcdf363c2a8d47eccb50890573a2640a98 py3-cparser-2.19.tar.gz" +sha512sums="d2dc48727750ec0a80d5e3b0c9fba390c3647416a3e18cad59429edb9f55d043c7695c52301b037c93af5d96ffc85fcba7cd54d376abdb89e973759c59fa189d py3-cparser-2.20.tar.gz" diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index a2f3c0091..9268e3edb 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-cryptography _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8 +pkgver=2.9.2 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.org/project/cryptography" @@ -32,4 +32,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7 cryptography-2.8.tar.gz" +sha512sums="a8cb7ba229cddfa15bf4ed00d40e76e2ece57958203b9c50c3f782c7977e1c725fa147a1eebc31d50684a622d53e73f97864e1a935753472ea4b2d89eb6ffb6a cryptography-2.9.2.tar.gz" diff --git a/user/py3-dbus-python/APKBUILD b/user/py3-dbus-python/APKBUILD new file mode 100644 index 000000000..d45fa91b7 --- /dev/null +++ b/user/py3-dbus-python/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-dbus-python +_pkgname=${pkgname##py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.2.16 +pkgrel=0 +pkgdesc="D-Bus bindings for Python 3" +url="https://dbus.freedesktop.org/doc/dbus-python/" +arch="all" +options="!check" +license="MIT" +depends="python3" +makedepends="dbus-dev glib-dev python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c dbus-python-1.2.16.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 9fb5b7b0b..5c0807786 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-distutils-extra -pkgver=2.43 +pkgver=2.45 pkgrel=0 pkgdesc="Python distutils extras for gettext, themed icons, and scrollkeepr docs" url="https://launchpad.net/python-distutils-extra" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a0a3ba147403e0096fd1c9f56eb898282edc7a1caf460128245730bf683d97af8706390127f2e997256b2ee50bc267125b2071b47e2eeac70ca0e2d58fa84176 python-distutils-extra-2.43.tar.bz2" +sha512sums="04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1 python-distutils-extra-2.45.tar.bz2" diff --git a/user/py3-freezegun/APKBUILD b/user/py3-freezegun/APKBUILD index 398e20971..4c5bd8624 100644 --- a/user/py3-freezegun/APKBUILD +++ b/user/py3-freezegun/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-freezegun _pkgname=freezegun _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.3.12 +pkgver=0.3.15 pkgrel=0 pkgdesc="Let your Python tests travel through time" url="https://pypi.python.org/pypi/freezegun" @@ -30,4 +30,4 @@ package() { } -sha512sums="f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4 py3-freezegun-0.3.12.tar.gz" +sha512sums="9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba py3-freezegun-0.3.15.tar.gz" diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index 4cc48bb0b..d29a050a7 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-josepy _pkgname=${pkgname#py3-} -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="JOSE protocol implementation in Python" url="https://github.com/jezdez/josepy" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz" +sha512sums="93d8ca09243ed273c532e1c5c413f356dca3e85db45614b88d82665a947088950d3c4d6304fec51bdc502a25722955a9fac47b7bc608a69cc1226a512f69c229 josepy-1.3.0.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 9237e12b9..548082a92 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-lxml _pkgname=lxml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.5.0 +pkgver=4.5.2 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7cb957b2ab9931c32984ad0808f51e650e82e2d9b14df3fd8df2dd8f2c5c261d26ebf2c672b723e89b00b867a0a8dbb9130023e48a5f302fd02d5409e1c8cd6c lxml-4.5.0.tar.gz" +sha512sums="58d287fc9533605117ffb391edbfe94a2abd0db9be11eb54c9f78ff348c8567d10874cc047e7ae099ef5ce4403ef3d5e5bd5e64aad158ce3c621f106e4c1df63 lxml-4.5.2.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index af088ee11..cb8ab79a5 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-mako _pkgname=Mako _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7 Mako-1.1.1.tar.gz" +sha512sums="a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952 Mako-1.1.3.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index cf6a22b2a..5fbdbb8de 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-markdown _pkgname=Markdown _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=3.1.1 +pkgver=3.2.2 pkgrel=0 pkgdesc="A Python implementation of Markdown" url="https://python-markdown.github.io/" @@ -25,4 +25,4 @@ package() { python3 setup.py install --root="$pkgdir" } -sha512sums="78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090 Markdown-3.1.1.tar.gz" +sha512sums="72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c Markdown-3.2.2.tar.gz" diff --git a/user/py3-parsedatetime/APKBUILD b/user/py3-parsedatetime/APKBUILD index 4e8698bc0..8f50cf353 100644 --- a/user/py3-parsedatetime/APKBUILD +++ b/user/py3-parsedatetime/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-parsedatetime _pkgname=parsedatetime -pkgver=2.5 +pkgver=2.6 pkgrel=0 pkgdesc="Parse human-readable date/time strings" url="https://github.com/bear/parsedatetime" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="f729c32a3e5ee94fe39322be4772dffacb0608753e106e64d79818a6be3febc36f37e0eeac73190f1510f5e88aa0755eb0fb85fab19aa53f4643619907b245bf parsedatetime-2.5.tar.gz" +sha512sums="ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543 parsedatetime-2.6.tar.gz" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index a8885c816..7f831dbf8 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pbr _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=0 pkgdesc="Python Build Reasonableness" url="https://pypi.org/project/pbr" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="da2c6c3020692215e02770ab5a31f2eccb489375e78ac2d796e3a413446c849699537d1188f0f5f83b4c8eea420af05c46cc6e2059b62ac530009ba4934e151f pbr-5.4.4.tar.gz" +sha512sums="b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654 pbr-5.4.5.tar.gz" diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD index 3b58a225f..082b0fd9e 100644 --- a/user/py3-psutil/APKBUILD +++ b/user/py3-psutil/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-psutil _pkgname=${pkgname#py3-} -pkgver=5.7.0 +pkgver=5.7.2 pkgrel=0 pkgdesc="Process and system utilities" url="https://pypi.org/project/psutil/" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 psutil-5.7.0.tar.gz +sha512sums="b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320 psutil-5.7.2.tar.gz 5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" diff --git a/user/py3-psycopg2/APKBUILD b/user/py3-psycopg2/APKBUILD index 2e75817d4..3893ee0ab 100644 --- a/user/py3-psycopg2/APKBUILD +++ b/user/py3-psycopg2/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-psycopg2 _pkgname=psycopg2 _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=0 pkgdesc="PostgreSQL adapter for python" url="http://initd.org/psycopg" # No HTTPS @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28 psycopg2-2.8.4.tar.gz" +sha512sums="d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e psycopg2-2.8.5.tar.gz" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 9bfe39936..da51a4136 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -6,7 +6,7 @@ pkgname=py3-pygments _pkgname=Pygments _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.5.2 +pkgver=2.6.1 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" url="https://pygments.org/" @@ -37,4 +37,4 @@ doc() { install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1 } -sha512sums="d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859 Pygments-2.5.2.tar.gz" +sha512sums="0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932 Pygments-2.6.1.tar.gz" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index aa822053a..c72cef87c 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pygobject -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="e07375e758d1ca0aefa7f12c9af739301371a857154577b62a17f3179adf1d9d37889d4f432cb6ac7804fb4c23f68a05d3ac5446df2800ecbca6fa27ed9b783d pygobject-3.36.0.tar.xz" +sha512sums="5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f pygobject-3.36.1.tar.xz" diff --git a/user/py3-pyparsing/APKBUILD b/user/py3-pyparsing/APKBUILD index 071bc3710..41331a9ff 100644 --- a/user/py3-pyparsing/APKBUILD +++ b/user/py3-pyparsing/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-pyparsing _pkgname=pyparsing _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.4.2 +pkgver=2.4.7 pkgrel=0 pkgdesc="Python parsing module" url="https://pypi.python.org/pypi/pyparsing" @@ -30,4 +30,4 @@ package() { } -sha512sums="27e5959eb1cf0c4d899746d2d32f5f000c3753278bdbbb670d24a077053e5c08caf8429f684186c502f6d9bf358702e0a8b3fea40cd2b50807cf02ea38c750dd py3-pyparsing-2.4.2.tar.gz" +sha512sums="0b9f8f18907f65cb3af1b48ed57989e183f28d71646f2b2f820e772476f596ca15ee1a689f3042f18458206457f4683d10daa6e73dfd3ae82d5e4405882f9dd2 py3-pyparsing-2.4.7.tar.gz" diff --git a/user/py3-python-dateutil/APKBUILD b/user/py3-python-dateutil/APKBUILD index 833c61ed2..f205ebfc5 100644 --- a/user/py3-python-dateutil/APKBUILD +++ b/user/py3-python-dateutil/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-python-dateutil _pkgname=python-dateutil _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=0 pkgdesc="Extensions to the standard Python datetime module" url="https://pypi.python.org/pypi/python-dateutil" @@ -13,8 +13,7 @@ license="Apache-2.0 AND BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-hypothesis py3-freezegun" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz - scm.patch" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -33,5 +32,4 @@ package() { } -sha512sums="ec7da86203572582f883a4686acf8a732a2de4f396d809057eb51b2c60dbca5623a7fa90c2c0618c281a2282c60841739bd837731a51cc876f4ff369297f2f81 py3-python-dateutil-2.8.0.tar.gz -992434700d9dd1d048e69c3e5a80489f2e45e43e865935542a04b4749ef42e5716c0dc17157bd6f1b3cd4fd6436aa7cb3707edbe587d5b873b55a4eb1000bd54 scm.patch" +sha512sums="337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c py3-python-dateutil-2.8.1.tar.gz" diff --git a/user/py3-python-dateutil/scm.patch b/user/py3-python-dateutil/scm.patch deleted file mode 100644 index 287b5269d..000000000 --- a/user/py3-python-dateutil/scm.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- python-dateutil-2.8.0/setup.py 2019-02-05 08:50:00.000000000 -0500 -+++ python-dateutil-2.8.0/setup.py 2019-07-24 15:40:41.520063790 -0400 -@@ -49,9 +49,6 @@ README = README() # NOQA - - - setup(name="python-dateutil", -- use_scm_version={ -- 'write_to': 'dateutil/_version.py', -- }, - description="Extensions to the standard Python datetime module", - author="Gustavo Niemeyer", - author_email="gustavo@niemeyer.net", -@@ -65,7 +62,7 @@ setup(name="python-dateutil", - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*", - package_data={"dateutil.zoneinfo": ["dateutil-zoneinfo.tar.gz"]}, - zip_safe=True, -- setup_requires=['setuptools_scm'], -+ setup_requires=[], - install_requires=["six >=1.5"], - classifiers=[ - 'Development Status :: 5 - Production/Stable', diff --git a/user/py3-pyyaml/APKBUILD b/user/py3-pyyaml/APKBUILD index e2ce44251..afbf6f336 100644 --- a/user/py3-pyyaml/APKBUILD +++ b/user/py3-pyyaml/APKBUILD @@ -2,11 +2,12 @@ # Maintainer: pkgname=py3-pyyaml _pkgname=pyyaml -pkgver=5.1.2 +pkgver=5.3.1 pkgrel=0 pkgdesc="YAML parser and emitter for Python" url="https://pyyaml.org/wiki/PyYAML" arch="noarch" +# Certified net clean license="MIT" depends="python3 yaml" makedepends="python3-dev yaml yaml-dev" @@ -14,6 +15,10 @@ subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/yaml/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +# secfixes: +# 5.3.1-r0: +# - CVE-2020-1747 + build() { # Seems like they need Cython to build the C extension now, so it falls back to pure Python. # Once we ship Cython we can probably change this. @@ -28,4 +33,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7bc3dceadcfd512ede67581625887d00822464f20d3b646904f4a73afce8cf3b9766829c6004b626c31757edf8e2eedc27e60d96bee13afa68d3296a8a7f33bb py3-pyyaml-5.1.2.tar.gz" +sha512sums="27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 py3-pyyaml-5.3.1.tar.gz" diff --git a/user/py3-roman/APKBUILD b/user/py3-roman/APKBUILD index 068e00963..899f7e622 100644 --- a/user/py3-roman/APKBUILD +++ b/user/py3-roman/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-roman _pkgname=roman -pkgver=3.2 +pkgver=3.3 pkgrel=0 pkgdesc="Python library to convert integers to Roman numerals" url="https://pypi.org/project/roman/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab py3-roman-3.2.tar.gz" +sha512sums="8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49 py3-roman-3.3.tar.gz" diff --git a/user/py3-sortedcontainers/APKBUILD b/user/py3-sortedcontainers/APKBUILD index b14785965..86b3330b7 100644 --- a/user/py3-sortedcontainers/APKBUILD +++ b/user/py3-sortedcontainers/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sortedcontainers _pkgname=sortedcontainers _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.1.0 +pkgver=2.2.2 pkgrel=0 pkgdesc="Sorted container objects for Python 3" url="https://pypi.python.org/pypi/sortedcontainers" @@ -31,4 +31,4 @@ package() { } -sha512sums="6fe2b6e7d030b67aa990d62160079852feaee7828164eae03a6477dc1704863f6ed0daadb44dc919653c66996d51f833b5858351a8fd5ad28998f8010a8ca1a4 py3-sortedcontainers-2.1.0.tar.gz" +sha512sums="4a7da8d76111b56bda432b211c11ef48ac8af25ddf7fd961cf72628c18f878a6c2a22e272e108f3e5ad88a333b8f646b54c8dd11c9c642349c9da001140abd16 py3-sortedcontainers-2.2.2.tar.gz" diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD index eebdeb272..d22b3c48a 100644 --- a/user/py3-sphinxcontrib-applehelp/APKBUILD +++ b/user/py3-sphinxcontrib-applehelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-applehelp _pkgname=sphinxcontrib-applehelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="A Sphinx extension to output Apple help books" url="https://pypi.python.org/pypi/sphinxcontrib-applehelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603 py3-sphinxcontrib-applehelp-1.0.1.tar.gz" +sha512sums="1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da py3-sphinxcontrib-applehelp-1.0.2.tar.gz" diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD index 474ec4928..aa36c4377 100644 --- a/user/py3-sphinxcontrib-devhelp/APKBUILD +++ b/user/py3-sphinxcontrib-devhelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-devhelp _pkgname=sphinxcontrib-devhelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="A sphinx extension to output Devhelp documents" url="https://pypi.python.org/pypi/sphinxcontrib-devhelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984 py3-sphinxcontrib-devhelp-1.0.1.tar.gz" +sha512sums="83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1 py3-sphinxcontrib-devhelp-1.0.2.tar.gz" diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD index abfc54ec8..c7098fc01 100644 --- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD +++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-htmlhelp _pkgname=sphinxcontrib-htmlhelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="A sphinx extension to output HtmlHelp" url="https://pypi.python.org/pypi/sphinxcontrib-htmlhelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de py3-sphinxcontrib-htmlhelp-1.0.2.tar.gz" +sha512sums="f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4 py3-sphinxcontrib-htmlhelp-1.0.3.tar.gz" diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD index 3740f30ff..eb2953251 100644 --- a/user/py3-sphinxcontrib-qthelp/APKBUILD +++ b/user/py3-sphinxcontrib-qthelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-qthelp _pkgname=sphinxcontrib-qthelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="A Sphinx extension to output QtHelp documents." url="https://pypi.python.org/pypi/sphinxcontrib-qthelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864 py3-sphinxcontrib-qthelp-1.0.2.tar.gz" +sha512sums="29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa py3-sphinxcontrib-qthelp-1.0.3.tar.gz" diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD index 35b6bc979..fec38ab4e 100644 --- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD +++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-serializinghtml _pkgname=sphinxcontrib-serializinghtml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="A Sphinx extension to output serialized HTML (json and pickle)" url="https://pypi.python.org/pypi/sphinxcontrib-serializinghtml" @@ -30,4 +30,4 @@ package() { } -sha512sums="984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55 py3-sphinxcontrib-serializinghtml-1.1.3.tar.gz" +sha512sums="d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0 py3-sphinxcontrib-serializinghtml-1.1.4.tar.gz" diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index 1c9545f24..ed4b36ff3 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-tz _pkgname=pytz -pkgver=2019.3 +pkgver=2020.1 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -27,6 +27,6 @@ package() { mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af pytz-2019.3.tar.gz +sha512sums="4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce pytz-2020.1.tar.gz be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch 7629da5d76056789e7c29a4f047d25fe77586d4a78e8a1ce7ad7c513507d286098666edb24ee5cadc9b0a4d5623336bba8a6b0f786072ce741177022201fdc54 zoneinfo-fix.patch" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index 23b590532..a981d5655 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.25.6 +pkgver=1.25.10 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 py3-urllib3-1.25.6.tar.gz" +sha512sums="7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1 py3-urllib3-1.25.10.tar.gz" diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index 2704aa053..c75daac07 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-zope-proxy _pkgname=zope.proxy -pkgver=4.3.2 +pkgver=4.3.5 pkgrel=0 pkgdesc="Zope module for class and function proxies" url="https://github.com/zopefoundation/zope.proxy" @@ -23,4 +23,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4a42a4989775f01f1b663d71058aae9852690d713269b5d58c6e10784ed2ca6ca056be5261bb009f230e198818b92d4e1014961f1144dcfacb47202064a8a666 zope.proxy-4.3.2.tar.gz" +sha512sums="08b48cd284b07ddbceebd689ca8c96c0e9ec3521c8984ab37443d2fb48f9ddcae415ce6cfcc2415f29016e1825c4f5178b90637961e265993731000d450debc9 zope.proxy-4.3.5.tar.gz" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 0586a751d..fc15db669 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qastools -pkgver=0.22.0 +pkgver=0.23.0 pkgrel=0 pkgdesc="ALSA mixer and utilities for Qt" url="https://gitlab.com/sebholt/qastools" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f4c845df00e00236d61ad1009fc6aa529996e02a03aeb92211a12facf9bdce5e1626f4c97d96d88827dfe689bd961d1a2fd3f9164dca6947c08b4fc1d78483d qastools-v0.22.0.tar.bz2" +sha512sums="543e2f6407ba36f7cb0ce811ee1ceac14652960c58636671fabeaca25d154db263b654d07795ec2a81232b1e177469cbb45617099d40af47d6ab1148443582fb qastools-v0.23.0.tar.bz2" diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index bc3744541..3398b6537 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -454,7 +454,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55 c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch -87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch +44db77cab330075da601cc6083678c5f3ed1528936a8fd81148875bc67ed53332b21466c79ac6e5cf2b2e7d3824392dd7a52d0aaed03689be9b2dfddd5abba06 time64.patch d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7 MAP_SYNC-fix.patch 0ea3745c45507c00c3c036241992d594b5f7e9aa1f0fa9b425dd222390066e1ea2d0aa4923bde0e7f27b7cc2f759a122ae4b600c2fa682a5aad509e7d03ccad9 CVE-2020-1711.patch 5d9e7e065c6716024eab4984331071f42dcd5363c5456023f81a3ef0329ae578348d0f875868f85c9e1fee5e435d86e2eb7e342a957c36cd099cb5d5d9f3a78d CVE-2020-11102.patch diff --git a/user/qemu/time64.patch b/user/qemu/time64.patch index 8ec9f45df..342231146 100644 --- a/user/qemu/time64.patch +++ b/user/qemu/time64.patch @@ -18,3 +18,23 @@ evdev.type = le16_to_cpu(event->type); evdev.code = le16_to_cpu(event->code); evdev.value = le32_to_cpu(event->value); +--- qemu-4.2.0/contrib/vhost-user-input/main.c.old 2019-12-12 18:20:47.000000000 +0000 ++++ qemu-4.2.0/contrib/vhost-user-input/main.c 2020-06-15 04:46:15.198762807 +0000 +@@ -115,13 +115,16 @@ + static void vi_handle_status(VuInput *vi, virtio_input_event *event) + { + struct input_event evdev; ++ struct timeval tv; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tv, NULL)) { + perror("vi_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tv.tv_sec; ++ evdev.input_event_usec = tv.tv_usec; + evdev.type = le16toh(event->type); + evdev.code = le16toh(event->code); + evdev.value = le32toh(event->value); diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index ec708c3c0..5f884fb45 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qps -pkgver=2.0.0 +pkgver=2.1.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based task manager" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxrender-dev lxqt-build-tools>=$_lxqt_build + liblxqt-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz qps-1.10.17-compile-fixes.patch @@ -39,5 +41,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019 qps-2.0.0.tar.xz +sha512sums="e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2 qps-2.1.0.tar.xz 32c154f1d3c9e74dda3eabfd2e3b9e9f3c1d77f808dfacc9dd05c904066832d92d361ca56ef9d784d945fad60cf67d6c909cbb730a0ffed1fea3bf44c3aad5a2 qps-1.10.17-compile-fixes.patch" diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD index 2281459a7..3045ff7a5 100644 --- a/user/qqc2-desktop-style/APKBUILD +++ b/user/qqc2-desktop-style/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qqc2-desktop-style -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6f3a9c54715140971b92d88822e00fca2d84ab61819e60be8819629b2ab78444aa5215f3bcf4470d572691230e9ff9589788e313b9b439aa92b38e78b3a41605 qqc2-desktop-style-5.68.0.tar.xz" +sha512sums="641e7c1fb3a367eb17afb841fadf7c506ad4e7898d2cf595c2cdebffcac82672b9fd0ab9aafd7ab742b00d529b998b68e2621b6fbfcb0891dcf3701f8332ba23 qqc2-desktop-style-5.72.0.tar.xz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 3ed606043..dbe83e008 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator -pkgver=4.11.0 +pkgver=4.12.4 pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="29e5c72d4002cdddecbdea689dd5048aa8d0b74c980a6b8096b03c3c39f4868e4490c4516ba287a4082eaaa4ec412309c1d498a4f97754720c88ae4ab53d30b8 qt-creator-opensource-src-4.11.0.tar.gz" +sha512sums="137fda4882bce31b2844c6a4c1d54f5628f0812611266b2d7f74d6c155bec97809f50dca4a253c5d9686e7d0838ee568d054e5102333c63c30ca430f50370013 qt-creator-opensource-src-4.12.4.tar.gz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 4cb68524d..8e51ff124 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -2,7 +2,7 @@ pkgname=qt5-qtbase _pkgname=qtbase-everywhere-src pkgver=5.12.6 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" @@ -29,6 +29,7 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu time64.patch CVE-2020-0569.patch CVE-2020-0570.patch + section-header.patch " # secfixes: qt @@ -182,4 +183,5 @@ ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd43 e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch 436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch ddeb0a59cf0901b38669314fd2f14dffba63c6cbd06a3d864cd329081cc2b10323ec52053a6ffe7baf5ee8a1e137331acfe5d874c03596660630dd151828da56 CVE-2020-0569.patch -b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch" +b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch +47b2973561965e3ef906f03480b3877ad0018f32d31fecb4c410abe22c68ccad7d232cfe68804b70111616e15b979fb26642225b984d8fdbfc6cf6899ad63a0d section-header.patch" diff --git a/user/qt5-qtbase/section-header.patch b/user/qt5-qtbase/section-header.patch new file mode 100644 index 000000000..20664104a --- /dev/null +++ b/user/qt5-qtbase/section-header.patch @@ -0,0 +1,95 @@ +From ba6e0e4aac4d06782325c7032c8ea475f2d3eab0 Mon Sep 17 00:00:00 2001 +From: David Faure <david.faure@kdab.com> +Date: Sat, 13 Apr 2019 19:37:37 +0200 +Subject: [PATCH 1/1] QHeaderView: fix assert when restoring section sizes over + less columns +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +If columns are removed and we get notified via layoutChanged, the code +tries to restore old section sizes, and went out of bounds, leading to +an assert in QVector. Simply add an if() to skip restoring out-of-bounds columns. + +This comes from https://bugs.kde.org/show_bug.cgi?id=395181, +which translates into the unittest that is part of this commit. + +Change-Id: Ide42176a758f87b21957c40508127d67f1d5a2d9 +Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> +Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> +--- + src/widgets/itemviews/qheaderview.cpp | 16 +++++++++------- + .../widgets/itemviews/qheaderview/tst_qheaderview.cpp | 17 +++++++++++++++++ + 2 files changed, 26 insertions(+), 7 deletions(-) + +diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp +index 62abf567511..99309633a7b 100644 +--- a/src/widgets/itemviews/qheaderview.cpp ++++ b/src/widgets/itemviews/qheaderview.cpp +@@ -2283,13 +2283,15 @@ void QHeaderViewPrivate::_q_sectionsChanged(const QList<QPersistentModelIndex> & + : index.row()); + // the new visualIndices are already adjusted / reset by initializeSections() + const int newVisualIndex = visualIndex(newLogicalIndex); +- auto &newSection = sectionItems[newVisualIndex]; +- newSection = item.section; +- +- if (newSection.isHidden) { +- // otherwise setSectionHidden will return without doing anything +- newSection.isHidden = false; +- q->setSectionHidden(newLogicalIndex, true); ++ if (newVisualIndex < sectionItems.count()) { ++ auto &newSection = sectionItems[newVisualIndex]; ++ newSection = item.section; ++ ++ if (newSection.isHidden) { ++ // otherwise setSectionHidden will return without doing anything ++ newSection.isHidden = false; ++ q->setSectionHidden(newLogicalIndex, true); ++ } + } + } + +diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +index eaf75e74945..1b3e1e1f34e 100644 +--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp ++++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +@@ -248,6 +248,7 @@ private slots: + void sizeHintCrash(); + void testResetCachedSizeHint(); + void statusTips(); ++ void testRemovingColumnsViaLayoutChanged(); + + protected: + void setupTestData(bool use_reset_model = false); +@@ -353,6 +354,7 @@ public: + + void cleanup() + { ++ emit layoutAboutToBeChanged(); + cols = 3; + rows = 3; + emit layoutChanged(); +@@ -3489,5 +3491,20 @@ void tst_QHeaderView::statusTips() + QCOMPARE(headerView.statusTipText, QLatin1String("[0,1,0] -- Header")); + } + ++void tst_QHeaderView::testRemovingColumnsViaLayoutChanged() ++{ ++ const int persistentSectionSize = 101; ++ ++ QtTestModel model; ++ model.rows = model.cols = 5; ++ view->setModel(&model); ++ for (int i = 0; i < model.cols; ++i) ++ view->resizeSection(i, persistentSectionSize + i); ++ model.cleanup(); // down to 3 via layoutChanged (not columnsRemoved) ++ for (int j = 0; j < model.cols; ++j) ++ QCOMPARE(view->sectionSize(j), persistentSectionSize + j); ++ // The main point of this test is that the section-size restoring code didn't go out of bounds. ++} ++ + QTEST_MAIN(tst_QHeaderView) + #include "tst_qheaderview.moc" +-- +2.16.3 + diff --git a/user/qt5-qtnetworkauth/APKBUILD b/user/qt5-qtnetworkauth/APKBUILD new file mode 100644 index 000000000..59ace6b90 --- /dev/null +++ b/user/qt5-qtnetworkauth/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtnetworkauth +_pkgname=qtnetworkauth-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Network authentication module for Qt" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="qt5-qtbase-dev" +subpackages="$pkgname-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="d66aac84310e8afa734613f8baf3bba830ed3562336f00f143cbb13dc831f58108da95a1a5c09ec5d26efb653c98ffedc83b62a2f0ec01ff14f6fc51b7c8f6ed qtnetworkauth-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD new file mode 100644 index 000000000..daea318a5 --- /dev/null +++ b/user/qt5-qtwayland/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtwayland +_pkgname=qtwayland-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Unstable Qt platform module for experimental Wayland display system" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" +subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +client() { + pkgdesc="Qt client library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandClient* "$subpkgdir"/usr/lib/ +} + +compositor() { + pkgdesc="Unstable Qt compositor library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandCompositor* "$subpkgdir"/usr/lib/ +} + +tools() { + pkgdesc="Tools for Qt integration with experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib/qt5 + mv "$pkgdir"/usr/lib/qt5/bin "$subpkgdir"/usr/lib/qt5/ +} + +sha512sums="6d066d2f65f2727b9a1c7e71b973c81f8a8d2e6210c4c998403fcbb9e4cca2543fa11160b573c0646967a3351d33504c9f44ed98b1bb282735bf17e82808a4f4 qtwayland-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index f54023654..462e54241 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qt5ct -pkgver=0.41 +pkgver=1.1 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -21,4 +21,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009 qt5ct-0.41.tar.bz2" +sha512sums="0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7 qt5ct-1.1.tar.bz2" diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index 2ccd6bdf2..d9704ad7d 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qterminal -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build qtermwidget-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf qterminal-0.14.1.tar.xz" +sha512sums="03c690fd090fc87e0475f5a34e19ff1d5aeaea146fe5c62aa09540b6abfa0363506c44c3e82c5d3957e351b883ac9fdd014da66ce7d44e7d3e5fecc8fcd7bcac qterminal-0.15.0.tar.xz" diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 916d2e1f4..3af12cbca 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qtermwidget -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal widget, used in QTerminal" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" depends_dev="libutempter-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0 $depends_dev" + lxqt-build-tools>=$_lxqt_build $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz fix-linking.patch @@ -41,5 +42,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 qtermwidget-0.14.1.tar.xz +sha512sums="95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7 qtermwidget-0.15.0.tar.xz f2d43f12479a3a3a01be9ebee9ce349b0f4e60b07dfc79e8666ed913d5682987f81b08a397ee8ca628c36f5770ddfe63f5abafa94dff6c1c1e090adc1637af35 fix-linking.patch" diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index f8a5f8b8a..cb9dc25cf 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.4c +pkgver=0.0.9.4e _pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/') pkgrel=0 pkgdesc="Qt5-based Matrix chat client" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="405b8e6fae4bd4b2d6a08e582ae7451d080f0de2d993103d90cb2c613a7a9ab4e53c3bbcc298f0a6aedc6ff3da84ced763580c4806e1d5d59f08af131dc8b102 quaternion-0.0.9.4c.tar.gz" +sha512sums="5478892b7dce96a60f1429ee6dff9dd0b4fbb89bf45ecc2e499ee90f615af4de12d1de0002804420a85a21a6ba533e4799c94d2411067cb7d7aacca183d9d981 quaternion-0.0.9.4e.tar.gz" diff --git a/user/quazip/APKBUILD b/user/quazip/APKBUILD index f6afd9948..875541002 100644 --- a/user/quazip/APKBUILD +++ b/user/quazip/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quazip -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=0 pkgdesc="Qt ZIP archive library" url="https://stachenov.github.io/quazip/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb quazip-0.8.1.tar.gz" +sha512sums="db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 quazip-0.9.1.tar.gz" diff --git a/user/re2c/APKBUILD b/user/re2c/APKBUILD index d039a5baf..aad7b839e 100644 --- a/user/re2c/APKBUILD +++ b/user/re2c/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=re2c pkgver=1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Fast lexer generator for C and C++" url="http://re2c.org/" arch="all" @@ -11,7 +11,13 @@ depends="" checkdepends="bash" makedepends="" subpackages="$pkgname-doc" -source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.xz + CVE-2020-11958.patch + " + +# secfixes: +# 1.3-r1: +# - CVE-2020-11958 build() { ./configure \ @@ -32,4 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e re2c-1.3.tar.xz" +sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e re2c-1.3.tar.xz +f4376b8e0724d500f665fa60dfd6fb35685a281af50c500d2ff90d781a829fb78f21e8c93c5745a4519acd55a62ec48a570dbfacf0a9ee977502e06f3e2e474a CVE-2020-11958.patch" diff --git a/user/re2c/CVE-2020-11958.patch b/user/re2c/CVE-2020-11958.patch new file mode 100644 index 000000000..b982b87e6 --- /dev/null +++ b/user/re2c/CVE-2020-11958.patch @@ -0,0 +1,37 @@ +From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001 +From: Ulya Trofimovich <skvadrik@gmail.com> +Date: Fri, 17 Apr 2020 22:47:14 +0100 +Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo). + +The crash happened in a rare case of a very long lexeme that doen't fit +into the buffer, forcing buffer reallocation. + +The crash was caused by an incorrect calculation of the shift offset +(it was smaller than necessary). As a consequence, the data from buffer +start and up to the beginning of the current lexeme was not discarded +(as it should have been), resulting in less free space for new data than +expected. +--- + src/parse/scanner.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/parse/scanner.cc b/src/parse/scanner.cc +index 1d6e9efa..bd651314 100644 +--- a/src/parse/scanner.cc ++++ b/src/parse/scanner.cc +@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need) + if (!buf) fatal("out of memory"); + + memmove(buf, tok, copy); +- shift_ptrs_and_fpos(buf - bot); ++ shift_ptrs_and_fpos(buf - tok); + delete [] bot; + bot = buf; + + free = BSIZE - copy; + } + ++ DASSERT(lim + free <= bot + BSIZE); + if (!read(free)) { + eof = lim; + memset(lim, 0, YYMAXFILL); diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD index 274706d9a..a1bf83b93 100644 --- a/user/recode/APKBUILD +++ b/user/recode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=recode -pkgver=3.7.6 +pkgver=3.7.7 pkgrel=0 pkgdesc="Character set conversion utilities" url=" " @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f recode-3.7.6.tar.gz" +sha512sums="2d07f86992ddc449d6895510cfc4b0abfc6f5052804a13eab91fa1b103352c2a801e0cc5113cfe519db53c0e328b7f2b9bc666fdbfd8e9ac6748aced7809179a recode-3.7.7.tar.gz" diff --git a/user/rinutils/APKBUILD b/user/rinutils/APKBUILD index 9abfd0fc3..5f0ab0047 100644 --- a/user/rinutils/APKBUILD +++ b/user/rinutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rinutils -pkgver=0.2.0 +pkgver=0.4.1 pkgrel=0 pkgdesc="C11 utilities library" url=" " @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3 rinutils-0.2.0.tar.xz" +sha512sums="e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7 rinutils-0.4.1.tar.xz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 4d17de4ea..f1c70ae01 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -10,13 +10,11 @@ options="!check" # All tests require X11. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev - grantlee-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev - karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev - ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev" + grantlee-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev + kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev ki18n-dev + kitemviews-dev ktexteditor-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz - webkit.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984 rocs-19.12.3.tar.xz -0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch" +sha512sums="b561e8864a700c832d36ce8fb645d29c09c4c9dcf34a01649ad6448b9d00a25945134821753ebeef56a607c3c66424a59d8a2372ae5561185fd37691709bfd5d rocs-20.04.3.tar.xz" diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch deleted file mode 100644 index 87ba9e747..000000000 --- a/user/rocs/webkit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rocs-19.12.0/src/CMakeLists.txt.old 2019-12-05 19:44:59.000000000 +0000 -+++ rocs-19.12.0/src/CMakeLists.txt 2020-01-05 05:05:52.820317770 +0000 -@@ -103,7 +103,7 @@ - Qt5::Core - Qt5::Quick - Qt5::QuickWidgets -- Qt5::WebKit -+ Qt5::WebKitLegacy - Qt5::WebKitWidgets - Qt5::XmlPatterns - ) diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD index 1f875bafc..713240eeb 100644 --- a/user/rpcsvc-proto/APKBUILD +++ b/user/rpcsvc-proto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rpcsvc-proto -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=0 pkgdesc="RPC service protocol definitions and compiler" url=" " @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="02d08c2e53dd02923a470be4243fa8458ebe73c74dcb755b36c001bfb128747359c5b7c2ba76ea7b12cd4eaa6916edc60849e8ec4b43d2c462751038ba0205fc rpcsvc-proto-1.4.1.tar.xz" +sha512sums="631fbfc00af94c5d7def0759f27e97dc14d400b4468c906719ae18ecef74815730798c882d1aaa4f90359224e7b829019b786baddc3097905b54f940ca85a714 rpcsvc-proto-1.4.2.tar.xz" diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD index c03e0e033..90f955653 100644 --- a/user/ruby-diff-lcs/APKBUILD +++ b/user/ruby-diff-lcs/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-diff-lcs _gemname=${pkgname#ruby-} -pkgver=1.3 -pkgrel=2 +pkgver=1.4.4 +pkgrel=0 pkgdesc="Generate difference sets between Ruby sequences" url="http://halostatue.github.io/diff-lcs/" arch="noarch" @@ -45,4 +45,4 @@ tools() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="b455f86ab006cbb823c2f8ed7fcde16c432e3783b6408ec305e57b7f4d0cf98bad586786947414ec3dc27e885b1485e534d26df19eaa9972874d78a8829b501e ruby-diff-lcs-1.3.tar.gz" +sha512sums="52fc0501516299396f570be7f35d856ddeed9637430019ca831759467474cecff72be0dace2fed020dacb5f551febef047e3f1928affa0ac0f18b636ee94baa7 ruby-diff-lcs-1.4.4.tar.gz" diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD index eb5431649..7a1781581 100644 --- a/user/ruby-rake-compiler/APKBUILD +++ b/user/ruby-rake-compiler/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rake-compiler _gemname=${pkgname#ruby-} -pkgver=1.1.0 -pkgrel=1 +pkgver=1.1.1 +pkgrel=0 pkgdesc="Provide a standard and simplified way to build and package Ruby extensions" url="https://github.com/rake-compiler/rake-compiler" arch="noarch" @@ -39,5 +39,5 @@ package() { rm -r cache build_info doc } -sha512sums="77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60 ruby-rake-compiler-1.1.0.tar.gz +sha512sums="e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d ruby-rake-compiler-1.1.1.tar.gz 21feda7887b7fe0978f906d407ecd44d7f25e334e7ee8ff27f73e71d494bd10af4174d7373652b29b1a8eaf95f53f2c8581879088f343e7f045fc265eecf7eac gemfile-remove-unwanted-files.patch" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 9749114a6..33fb1a78a 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.9.1 -pkgrel=1 +pkgver=3.9.2 +pkgrel=0 pkgdesc="RSpec runner and formatters" url="https://relishapp.com/rspec/rspec-core" arch="noarch" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a ruby-rspec-core-3.9.1.tar.gz +sha512sums="19c88cc73bcdd5be1136cc2d9e0fdb665c5b1c0a2ed92feb2c225264816387d2cbef2ff3555aab90a3921e39b05f30619acdcf20f92f4abf8e4eccd7fcb329f5 ruby-rspec-core-3.9.2.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index c465c5c4b..68c6dc95e 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.9.1 +pkgver=3.9.2 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572 ruby-rspec-expectations-3.9.1.tar.gz +sha512sums="d3ae1c93e936acc2278b5beaded9255ef78e3e9d0fed1cc9a14010930a396841bf4937cade164d0c9f4f2e4cafad86ab511309156e45387b624907365e7e611a ruby-rspec-expectations-3.9.2.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index 5f8457dd0..929134ede 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.9.2 -pkgrel=1 +pkgver=3.9.3 +pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" arch="noarch" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1 ruby-rspec-support-3.9.2.tar.gz +sha512sums="ae66620f0a62bd0c0feea33ec45a0dc1029fa75efd399fe4fb10e53bea6652b93b84beb60e44003eeea9c8e374b403c39233842e55d6a3685347f740b9734481 ruby-rspec-support-3.9.3.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index b738b4c16..01a984414 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.2 +pkgver=2.2.2.4 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2 s6-portable-utils-2.2.2.2.tar.gz" +sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" diff --git a/user/sane-airscan/APKBUILD b/user/sane-airscan/APKBUILD new file mode 100644 index 000000000..1694d3d0f --- /dev/null +++ b/user/sane-airscan/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sane-airscan +pkgver=0.99.10 +pkgrel=0 +pkgdesc="Universal scanner driver for AirScan (eSCL) scanners" +url=" " +arch="all" +license="unknown" +depends="" +makedepends="avahi-dev glib-dev libjpeg-turbo-dev libpng-dev libsoup-dev + libxml2-dev meson ninja sane-dev" +subpackages="$pkgname-doc" +source="sane-airscan-$pkgver.tar.gz::https://github.com/alexpevzner/sane-airscan/archive/$pkgver.tar.gz" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install + mv "$pkgdir"/usr/etc "$pkgdir"/etc + rm "$pkgdir"/etc/sane.d/dll.conf +} + +sha512sums="7a3d98e01ad883856eb79c522aff50243b399717a6ba2db07eec66e49a83d365ad4db6d3f87718592f3b85832a2098e86ae094d9f06ed951ebc23887cddb75b7 sane-airscan-0.99.10.tar.gz" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 6a3e19a8c..d9f618013 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sane _pkgname=sane-backends -pkgver=1.0.29 +pkgver=1.0.30 pkgrel=0 pkgdesc="Scanner access library" url="http://www.sane-project.org/" @@ -37,13 +37,14 @@ done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch $pkgname-lang" -source="https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz +source="https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-1.0.30.tar.gz saned.initd endian.patch include.patch network.patch pidfile.patch check.patch + BTS-304.patch " builddir="$srcdir"/$_pkgname-$pkgver @@ -138,10 +139,11 @@ _backend() { fi } -sha512sums="9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54 sane-backends-1.0.29.tar.gz +sha512sums="e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5 sane-backends-1.0.30.tar.gz 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1 saned.initd c7523b2684726cf35c0b251fe2e1863120284ff6ea3f93b53feb5dfa020c1e383910ecdd1a0c77a2289912ac4fd355cb3c743ea3706dab1bcf0a3412e1d0fbcc endian.patch 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6 include.patch -9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029 network.patch +dfeaef3c94c3e66b1cfb27348b8e1f3620143fd9a41e3c0b33d9c16f9bc4af2b20e40c83fec385c5765e8c3a812a00508bccdf8f27d571cfc0d8fac9dee41205 network.patch 8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea pidfile.patch -4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c check.patch" +4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c check.patch +de2bd02d02e9a2d061d7c5783d3e4e64e9a68e83b15adc122946efff369ad5e382bd918a9585f5fe99ede546f002bb3db0f1b54306f4409fde38b2e26c008162 BTS-304.patch" diff --git a/user/sane/BTS-304.patch b/user/sane/BTS-304.patch new file mode 100644 index 000000000..64b7dca02 --- /dev/null +++ b/user/sane/BTS-304.patch @@ -0,0 +1,30 @@ +diff --git a/backend/genesys/image_pixel.cpp b/backend/genesys/image_pixel.cpp +index 1b83e127d..1ebba7fe0 100644 +--- a/backend/genesys/image_pixel.cpp ++++ b/backend/genesys/image_pixel.cpp +@@ -46,6 +46,7 @@ + #include "image.h" + + #include <array> ++#include <cmath> + + namespace genesys { + +@@ -207,7 +208,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma + float val = (pixel.r >> 8) * 0.3f; + val += (pixel.g >> 8) * 0.59f; + val += (pixel.b >> 8) * 0.11f; +- data[x] = static_cast<std::uint16_t>(val); ++ data[x] = static_cast<std::uint16_t>(roundf(val)); + return; + } + case PixelFormat::I16: { +@@ -215,7 +216,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma + float val = pixel.r * 0.3f; + val += pixel.g * 0.59f; + val += pixel.b * 0.11f; +- auto val16 = static_cast<std::uint16_t>(val); ++ auto val16 = static_cast<std::uint16_t>(roundf(val)); + data[x] = val16 & 0xff; + data[x + 1] = (val16 >> 8) & 0xff; + return; diff --git a/user/sane/network.patch b/user/sane/network.patch index 4e422e28d..845bf9913 100644 --- a/user/sane/network.patch +++ b/user/sane/network.patch @@ -1,23 +1,22 @@ -diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c -index a57d7c7..d0a1e92 100644 ---- a/sanei/sanei_tcp.c -+++ b/sanei/sanei_tcp.c -@@ -45,6 +45,7 @@ - #include <unistd.h> +--- sane-backends-1.0.30/sanei/sanei_tcp.c 2020-05-17 06:54:18.000000000 -0500 ++++ sane-backends-1.0.30/sanei/sanei_tcp.c 2020-06-10 14:10:06.980398975 -0500 +@@ -46,6 +46,7 @@ #include <stdlib.h> #include <string.h> + #include <limits.h> +#include <time.h> - #ifdef HAVE_WINSOCK2_H - #include <winsock2.h> -@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count) - ssize_t - sanei_tcp_read(int fd, u_char * buf, int count) + #ifndef SSIZE_MAX + #define SSIZE_MAX LONG_MAX +@@ -130,6 +131,7 @@ sanei_tcp_read(int fd, u_char * buf, siz { -- ssize_t bytes_recv = 0, rc = 1; -+ ssize_t bytes_recv = 0, rc = 1; + size_t bytes_recv = 0; + ssize_t rc = 1; + int retry = 5; + if (count > SSIZE_MAX) { + errno = EINVAL; +@@ -139,9 +141,21 @@ sanei_tcp_read(int fd, u_char * buf, siz while (bytes_recv < count && rc > 0) { rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); diff --git a/user/schismtracker/APKBUILD b/user/schismtracker/APKBUILD index 6392b0e6b..6e09d6af0 100644 --- a/user/schismtracker/APKBUILD +++ b/user/schismtracker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=schismtracker -pkgver=20190805 +pkgver=20200412 pkgrel=0 pkgdesc="A highly portable Impulse Tracker clone" url="http://schismtracker.org/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d schismtracker-20190805.tar.gz" +sha512sums="f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b schismtracker-20200412.tar.gz" diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index 2418064f5..ab52075ea 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=screengrab -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=0 pkgdesc="Cross-platform Qt-based software for taking screenshots" url="https://github.com/lxqt/screengrab" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - kwindowsystem-dev libqtxdg-dev>=3.3.1" + kwindowsystem-dev libqtxdg-dev>=3.5.0" subpackages="$pkgname-doc" source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 screengrab-2.0.0.tar.xz" +sha512sums="f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02 screengrab-2.0.1.tar.xz" diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index fa2eef17d..9aaa10397 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -2,22 +2,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm pkgver=0.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" pkgusers="sddm" pkggroups="sddm" arch="all" license="GPL-2.0+" -depends="consolekit2 dbus-x11" +depends="dbus-x11 elogind" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev - consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev + elogind-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev utmps-dev" subpackages="$pkgname-lang $pkgname-openrc" install="sddm.post-install" langdir="/usr/share/sddm/translations" source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz - ck2-support.patch pam-path-fix.patch sddm.initd utmpx.patch @@ -56,7 +55,6 @@ openrc() { } sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz -075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch -10cac48b821ff7ad39ece4cbc45a8e814d00251b0f8d02f9e42888ad97f465438320f078663be98c5b39630a0bbb26f4f0d76b44574c87a76b4871872add8b9f sddm.initd +d603934552bad47edda458d7a4df2310e98bde74bdb3bf8588f5171b2a5d68814192b8dc8f5599b35402f9a747d519d985d4976e7aa50dabed445f99a112594c sddm.initd c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch" diff --git a/user/sddm/ck2-support.patch b/user/sddm/ck2-support.patch deleted file mode 100644 index f073877fc..000000000 --- a/user/sddm/ck2-support.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp -index 79c7031..4ccfeb5 100644 ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -18,6 +18,7 @@ public: - QString sessionIfaceName; - QString seatIfaceName; - QString userIfaceName; -+ QString newSeatSignalName; - }; - - LogindPathInternal::LogindPathInternal() -@@ -55,18 +56,20 @@ LogindPathInternal::LogindPathInternal() - seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session"); - userIfaceName = QStringLiteral("org.freedesktop.login1.User"); -+ newSeatSignalName = QStringLiteral("SeatNew"); - return; - } - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { -- qDebug() << "Console kit interface found"; -+ qDebug() << "ConsoleKit interface found"; - available = true; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session"); - userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User"); -+ newSeatSignalName = QStringLiteral("SeatAdded"); - return; - } - qDebug() << "No session manager found"; -@@ -109,3 +112,8 @@ QString Logind::userIfaceName() - { - return s_instance->userIfaceName; - } -+ -+QString Logind::newSeatSignalName() -+{ -+ return s_instance->newSeatSignalName; -+} -diff --git a/src/daemon/LogindDBusTypes.h b/src/daemon/LogindDBusTypes.h -index f1e8dd4..028879a 100644 ---- a/src/daemon/LogindDBusTypes.h -+++ b/src/daemon/LogindDBusTypes.h -@@ -13,6 +13,7 @@ struct Logind - static QString sessionIfaceName(); - static QString seatIfaceName(); - static QString userIfaceName(); -+ static QString newSeatSignalName(); - }; - - -diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp -index c5afc57..6281ea8 100644 ---- a/src/daemon/SeatManager.cpp -+++ b/src/daemon/SeatManager.cpp -@@ -26,6 +26,7 @@ - #include <QDBusMessage> - #include <QDBusPendingReply> - #include <QDBusContext> -+#include <QDebug> - - #include "LogindDBusTypes.h" - -@@ -59,6 +60,12 @@ namespace SDDM { - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply); - connect(watcher, &QDBusPendingCallWatcher::finished, this, [=]() { - watcher->deleteLater(); -+ if (Logind::serviceName().contains(QStringLiteral("ConsoleKit"))) { -+ m_canGraphical = true; -+ emit canGraphicalChanged(m_canGraphical); -+ return; -+ } -+ - if (!reply.isValid()) - return; - -@@ -113,7 +120,7 @@ namespace SDDM { - } - }); - -- QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath))); -+ QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), Logind::newSeatSignalName(), this, SLOT(logindSeatAdded(QString,QDBusObjectPath))); - QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath))); - } - diff --git a/user/sddm/sddm.initd b/user/sddm/sddm.initd index cf5c1af79..8113454cf 100644 --- a/user/sddm/sddm.initd +++ b/user/sddm/sddm.initd @@ -4,7 +4,7 @@ depends() { needs localmount after bootmisc consolefont modules netmount keymaps - use consolekit dbus + use dbus elogind } description="Simple Desktop Display Manager" diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index a3361af07..0e670e51f 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,33 +1,30 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.15 +pkgver=2.0 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" +options="!check" # Requires unpackaged dependency xdgmime. license="GPL-2.0+" depends="" -makedepends="glib-dev itstool libxml2-dev libxml2-utils" +makedepends="glib-dev itstool libxml2-dev libxml2-utils meson ninja xmlto" subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-1.15.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz" build() { - ac_cv_func_fdatasync=no ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-update-mimedb - make -j1 + meson -Dprefix=/usr build + ninja -C build } check() { - make check + ninja -C build check } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2 shared-mime-info-1.15.tar.xz" +sha512sums="f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085 shared-mime-info-2.0.tar.xz" diff --git a/user/skanlite/APKBUILD b/user/skanlite/APKBUILD index b639bc7a8..3aef76bc0 100644 --- a/user/skanlite/APKBUILD +++ b/user/skanlite/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=skanlite -pkgver=2.1.0.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Simple image scanning application" url="https://www.kde.org/applications/graphics/skanlite/" @@ -12,8 +12,8 @@ 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" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/skanlite/2.1/skanlite-$pkgver.tar.xz - fix-version.patch +source="https://download.kde.org/stable/skanlite/2.2/skanlite-$pkgver.tar.xz + build.patch " build() { @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658 skanlite-2.1.0.1.tar.xz -91ce7a1f9a2796be511f20978fdea9e19c9eb6415ae5d407fbc855675d2e6809ddc85546b4e018ca0d72262d86104292c81e490613ae9045d10257e646da8732 fix-version.patch" +sha512sums="cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20 skanlite-2.2.0.tar.xz +38c2bd0f30af6a553840394fc341fff05d83af16db8b2c6385417d0b0759dd4fdacbe20d191b4bc3f65605e3c2e4101589c647986baabf2455ec33689289e5f2 build.patch" diff --git a/user/skanlite/build.patch b/user/skanlite/build.patch new file mode 100644 index 000000000..21d0e73bf --- /dev/null +++ b/user/skanlite/build.patch @@ -0,0 +1,27 @@ +From b110846fadeb4f8fab48e0f488a335de7e16a7be Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +Date: Wed, 15 Jul 2020 09:11:43 +0000 +Subject: [PATCH] Fix compilation with Qt before 5.14 + +This line has been forgotten to be changed in commit 823abcd2, resulting +in a compiler error when e.g. building with Qt 5.12 LTS. +--- + src/SaveLocation.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/SaveLocation.cpp b/src/SaveLocation.cpp +index 9709d49..d210be8 100644 +--- a/src/SaveLocation.cpp ++++ b/src/SaveLocation.cpp +@@ -42,7 +42,7 @@ SaveLocation::SaveLocation(QWidget *parent) + connect(m_ui->u_urlRequester, &KUrlRequester::textChanged, this, &SaveLocation::updateGui); + connect(m_ui->u_imgPrefix, &QLineEdit::textChanged, this, &SaveLocation::updateGui); + #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +- connect(u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); ++ connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); + #else + connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::textActivated), this, &SaveLocation::updateGui); + #endif +-- +GitLab + diff --git a/user/skanlite/fix-version.patch b/user/skanlite/fix-version.patch deleted file mode 100644 index e5afa0be2..000000000 --- a/user/skanlite/fix-version.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 by KDE based on libksane."), // shortDescription - KAboutLicense::GPL, // licenseType - i18n("(C) 2008-2016 Kåre Särs"), // copyrightStatement diff --git a/user/snappy/APKBUILD b/user/snappy/APKBUILD index 3662d501e..c03bf7054 100644 --- a/user/snappy/APKBUILD +++ b/user/snappy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=snappy -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Fast compression and decompression library" url="https://google.github.io/snappy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf snappy-1.1.7.tar.gz" +sha512sums="efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c snappy-1.1.8.tar.gz" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index 994c3bb6f..cf8661073 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df0a7520b698c28324c1881585d551aac885f43edb6e2dda4e95dc3a9fbb6d7609807a64042acf02bae72c55d6081205033228a1e250ada06b61ede5c3f544b7 solid-5.68.0.tar.xz" +sha512sums="f6474541e90af822353f15093ee11eafda1e135059e35219284e8a2ab7a5a606bd9df31ccb491d72c9dacd40ffb0ad87a697aaa47108a94c57c955734f4b3df0 solid-5.72.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 74ac2fd11..6b41e300f 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -47,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="add681532d2cfe371662306376da07bd337446f67d2b375a878bf53355e08407d24e1e63155f313e31b737a70014a052c19a1d120bbc67aeffd6be525f0aada3 sonnet-5.68.0.tar.xz" +sha512sums="8c5f552d9676d9be3cef0c69e986fbdd8b523d343e2a71e866a745ff555e5bb83829ab7a0ef7c1460104f91395ac912308c14c8c29da79e5d021d0401ce211d4 sonnet-5.72.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 00793ced6..95170e3cc 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=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766 spectacle-19.12.3.tar.xz -36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch" +sha512sums="ba2fdcf4c57efe213e79638a0b81c3061e2df432a4702b2d4830dfb3ed9c2f10cd6573b678b153a95414fee4807320345001f416db348a2b6633afbc5b93c546 spectacle-20.04.3.tar.xz +4bade3af7f06a1b2eb9568eee2905db04d8aa8647fa9414ba1da32cc2ea5e7029b9db2ad121381a04754b1abea36508b82e68a326db726759943aac5206fb455 no-wayland.patch" diff --git a/user/spectacle/no-wayland.patch b/user/spectacle/no-wayland.patch index 554e64d34..50c7cc8b7 100644 --- a/user/spectacle/no-wayland.patch +++ b/user/spectacle/no-wayland.patch @@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3395c1b..06009f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -68,7 +68,6 @@ find_package( +@@ -67,7 +67,6 @@ find_package( NewStuff GlobalAccel XmlGui @@ -31,7 +31,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ff1b30..80e50dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -84,7 +84,6 @@ target_link_libraries( +@@ -87,7 +87,6 @@ target_link_libraries( KF5::NewStuff KF5::GlobalAccel KF5::XmlGui @@ -52,7 +52,7 @@ index 41e5858..92ced06 100644 #include <QGuiApplication> #include <QScreen> #include <QtCore/qmath.h> -@@ -52,7 +50,7 @@ const int QuickEditor::magZoom = 5; +@@ -53,7 +51,7 @@ const int QuickEditor::magZoom = 5; const int QuickEditor::magPixels = 16; const int QuickEditor::magOffset = 32; @@ -61,7 +61,7 @@ index 41e5858..92ced06 100644 QWidget(parent), mMaskColor(QColor::fromRgbF(0, 0, 0, 0.15)), mStrokeColor(palette().highlight().color()), -@@ -91,19 +89,7 @@ QuickEditor::QuickEditor(const QPixmap &thePixmap, KWayland::Client::PlasmaShell +@@ -91,18 +89,6 @@ dprI = 1.0 / devicePixelRatioF(); setGeometry(0, 0, static_cast<int>(mPixmap.width() * dprI), static_cast<int>(mPixmap.height() * dprI)); @@ -70,18 +70,16 @@ index 41e5858..92ced06 100644 - using namespace KWayland::Client; - winId(); - auto surface = Surface::fromWindow(windowHandle()); -- if (!surface) { -- return; +- if (surface) { +- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); +- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); +- plasmashellSurface->setPanelTakesFocus(true); +- plasmashellSurface->setPosition(geometry().topLeft()); - } -- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); -- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); -- plasmashellSurface->setPanelTakesFocus(true); -- plasmashellSurface->setPosition(geometry().topLeft()); - } -+ - if (config->rememberLastRectangularRegion()) { - QRect cropRegion = config->cropRegion(); - if (!cropRegion.isEmpty()) { + if (Settings::rememberLastRectangularRegion() || Settings::alwaysRememberRegion()) { + auto savedRect = Settings::cropRegion(); + QRect cropRegion = QRect(savedRect[0], savedRect[1], savedRect[2], savedRect[3]); diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h index 8dd6586..8187995 100644 --- a/src/QuickEditor/QuickEditor.h @@ -182,11 +180,10 @@ index 3e90a99..8994995 100644 using MainWindowPtr = std::unique_ptr<KSMainWindow>; using EditorPtr = std::unique_ptr<QuickEditor>; -@@ -98,4 +92,3 @@ class SpectacleCore: public QObject +@@ -93,4 +87,3 @@ class SpectacleCore: public QObject bool mIsGuiInited; bool mCopyToClipboard; - KWayland::Client::PlasmaShell *mWaylandPlasmashell; }; -- 2.22.1 - diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 651311cdf..e52d25653 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=spectrwm -pkgver=3.3.0 +pkgver=3.4.1 _pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Small dynamic tiling window manager" @@ -32,4 +32,4 @@ package() { done } -sha512sums="743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc spectrwm-3.3.0.tar.gz" +sha512sums="94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6 spectrwm-3.4.1.tar.gz" diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD index fb44cc0ec..e8a558036 100644 --- a/user/spice-gtk/APKBUILD +++ b/user/spice-gtk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=spice-gtk pkgver=0.38 -pkgrel=0 +pkgrel=1 pkgdesc="A GTK+ widget for SPICE clients" url="https://www.spice-space.org/" arch="all" @@ -13,7 +13,7 @@ depends="gst-plugins-good" depends_dev="gobject-introspection-dev gtk+3.0-dev" makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev gst-plugins-base-dev gstreamer-dev gstreamer-tools gtk-doc - json-glib-dev libjpeg-turbo-dev libucontext-dev + json-glib-dev libjpeg-turbo-dev libxrandr-dev lz4-dev meson openssl-dev opus-dev polkit-dev py3-pyparsing py3-six spice-protocol zlib-dev" @@ -24,8 +24,6 @@ source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz " build() { - export CFLAGS="$CFLAGS -lucontext" - # Note: pulseaudio support is disabled because it's deprecated. # Audio is still supported through gstreamer. # @@ -41,6 +39,7 @@ build() { -Dcelt051=disabled \ -Dpulse=disabled \ -Dusbredir=disabled \ + -Dcoroutine=gthread \ . output ninja -C output } diff --git a/user/spice-protocol/APKBUILD b/user/spice-protocol/APKBUILD index 1fb5b5c3c..d7782af72 100644 --- a/user/spice-protocol/APKBUILD +++ b/user/spice-protocol/APKBUILD @@ -1,31 +1,29 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spice-protocol -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Spice protocol header files" url="https://www.spice-space.org/" arch="noarch" +options="!check" # No test suite. license="BSD-3-Clause AND LGPL-2.1+" depends="" -makedepends="" +makedepends="meson ninja" subpackages="" -source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2" +source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make + meson -Dprefix=/usr -Ddatadir=lib build + ninja -C build } check() { - make check + ninja -C build check } package() { - make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482 spice-protocol-0.14.1.tar.bz2" +sha512sums="181015f0f56d679ebfdbd6dbed37b50b1c0be550a714e8faf70624631d9a246fe68454eb44a1bae1765e1739f2d7469ab767c44f49776751826a4919ec88160e spice-protocol-0.14.2.tar.xz" diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index aa902f9bc..bf47f1b0c 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spleen -pkgver=1.5.0 +pkgver=1.8.1 pkgrel=0 pkgdesc="Monospace bitmap typeface from OpenBSD" url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" @@ -20,4 +20,4 @@ package() { done } -sha512sums="0d03ea534f872c3509c1ab7f2947e4a6e2edf4436daa65db23f83622599c820c59c373f1fd97edebfaa728606109736de09a173443054f84259f7c09175d81df spleen-1.5.0.tar.gz" +sha512sums="c9ea684bd1b9b9d5c121aad4658d4ce13a3b086df8bd473c001b79238f953af51ce2fcda01eab53a4e5b578433b947b44aa5924f2b14ebf7ccd2ce1681cf6fb2 spleen-1.8.1.tar.gz" diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD index 85003c4b9..a42f9b93e 100644 --- a/user/sprunge/APKBUILD +++ b/user/sprunge/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=sprunge -pkgver=0.6 +pkgver=0.7 pkgrel=0 pkgdesc="Helper script to paste things to http://sprunge.us" url="http://sprunge.us" @@ -20,10 +20,10 @@ package() { } tpaste() { - url="http://tpaste.us" + url="https://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" > \ + printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' https://tpaste.us" > \ "$subpkgdir"/usr/bin/tpaste chmod 755 "$subpkgdir"/usr/bin/tpaste } diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 08fb2ce0e..76b564d60 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1 step-19.12.3.tar.xz" +sha512sums="1df12a6994a0f3e62bff837fc8e0ff8fc9b4afb651f51ee1e14e4cdc80905fc21d7a9af540433e0f97a7040e2ed4968d9a81a4f868bb46b07c0c7ad1efb21f96 step-20.04.3.tar.xz" diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index d933c0639..299f89908 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=strongswan -pkgver=5.8.2 +pkgver=5.8.4 pkgrel=0 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="https://www.strongswan.org/" @@ -89,6 +89,6 @@ package() { install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon" } -sha512sums="423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d strongswan-5.8.2.tar.bz2 +sha512sums="15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103 strongswan-5.8.4.tar.bz2 8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9 strongswan.initd 7182bed917585bce9749b4495ad64d3052d2999dbb505c34d568acd6df7b151232ec10c8efe12f0a07d0555ddfe01aad4e3b767b08f17a55ffcbedc57dc9d934 charon.initd" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 4e8c89514..4305b9766 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.13.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" @@ -89,5 +89,5 @@ pl() { mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/ } -sha512sums="36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 subversion-1.13.0.tar.bz2 +sha512sums="af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b subversion-1.14.0.tar.bz2 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/supertux/APKBUILD b/user/supertux/APKBUILD new file mode 100644 index 000000000..583293327 --- /dev/null +++ b/user/supertux/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=supertux +pkgver=0.6.2 +pkgrel=0 +pkgdesc="Platform game featuring Tux the Penugin" +url="https://www.supertux.org/" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="boost-dev cmake curl-dev glew-dev libogg-dev libvorbis-dev zlib-dev + mesa-dev openal-soft-dev physfs-dev sdl2-dev sdl2_image-dev doxygen + freetype-dev libpng-dev" +subpackages="$pkgname-doc" +source="https://github.com/SuperTux/supertux/releases/download/v$pkgver/SuperTux-v$pkgver-Source.tar.gz" +builddir="$srcdir"/SuperTux-v$pkgver-Source + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74 SuperTux-v0.6.2-Source.tar.gz" diff --git a/user/swig/APKBUILD b/user/swig/APKBUILD index 91e1c5aa3..5107a0299 100644 --- a/user/swig/APKBUILD +++ b/user/swig/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=swig -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=0 pkgdesc="Tool for integrating C and C++ code with other languages" url="http://www.swig.org/" @@ -32,4 +32,4 @@ package() { install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES } -sha512sums="595ef01cb83adfa960ceed9c325a9429192549e8d1e9aa3ab35a4301512a61d82e2e89a8c7939c2a5a0811254ea1832a443bd387e11459eb2b0bafc563ad1308 swig-4.0.1.tar.gz" +sha512sums="05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed swig-4.0.2.tar.gz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 5716c32c0..735783ba0 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffb4b1e57bd912ed76c93b8ea074af3fd8343cd094a584647bef42870366cd089c6ba2070670a57e4997ba6ac122775af5066d5bae4891f3533e4b7bfecf1fee syntax-highlighting-5.68.0.tar.xz" +sha512sums="cbeb375a0c5af7646848f6d2df112f5ded5cb8614ab8054fae4133ff5420624879bb3db57928d5528731f100497ccb30b348555444eded5a87b95be49e747c23 syntax-highlighting-5.72.0.tar.xz" diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index f39d5c9d5..d2d2ec909 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump pkgver=4.9.3 -pkgrel=0 +pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -10,9 +10,7 @@ license="BSD-3-Clause" depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" -source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz - CVE-2018-19519.patch - " +source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz" # secfixes: # 4.9.2-r1: @@ -67,5 +65,4 @@ package() { rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz -eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch" +sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz" diff --git a/user/tcpdump/CVE-2018-19519.patch b/user/tcpdump/CVE-2018-19519.patch deleted file mode 100644 index ac3293927..000000000 --- a/user/tcpdump/CVE-2018-19519.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tcpdump-4.9.2/print-hncp.c.old 2017-09-03 23:17:14.000000000 +0000 -+++ tcpdump-4.9.2/print-hncp.c 2018-12-07 19:31:24.360000000 +0000 -@@ -228,6 +228,7 @@ - snprintf(buf, sizeof(buf), "%s/%d", ipaddr_string(ndo, &addr), plen); - plenbytes += 1 + IPV4_MAPPED_HEADING_LEN; - } else { -+ buf[0] = '\0'; - plenbytes = decode_prefix6(ndo, prefix, max_length, buf, sizeof(buf)); - } - diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 65f658c29..a683848a4 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.2.3 +pkgver=3.3.1 pkgrel=0 pkgdesc="Collection manager" url="https://tellico-project.org/" @@ -48,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7 tellico-3.2.3.tar.xz +sha512sums="12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74 tellico-3.3.1.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/testdisk/APKBUILD b/user/testdisk/APKBUILD new file mode 100644 index 000000000..8dfe19a0a --- /dev/null +++ b/user/testdisk/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=testdisk +pkgver=7.1 +pkgrel=0 +pkgdesc="A data recovery suite" +url="https://www.cgsecurity.org/wiki/TestDisk" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="e2fsprogs-dev ntfs-3g-dev ncurses-dev zlib-dev libjpeg-turbo-dev" +subpackages="$pkgname-doc" +source="https://www.cgsecurity.org/testdisk-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 testdisk-7.1.tar.bz2" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index cd127de65..46bf456ac 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.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1473867df5d5143e69f076899159016f489df40b898be79f41e4ea35f4e1b95feab5f145dbabf17af50516a6301db0c8dc9813b9f48f2cb26149c8c09b158a8 threadweaver-5.68.0.tar.xz" +sha512sums="83f3e1893bc7273ad70dc300bde77247b6fcde6b63c478b12fd150b0dc5e514acca2448cd7a3a9f42eaa7d95a8243ce5ece1e55a4176c1069cd62b7466cb195a threadweaver-5.72.0.tar.xz" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index fd25092a2..664fbef09 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=thunar -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6da526e6378ffc90686f6ae25e56109e8af7d0c592345aca3de4603f4c5b3d089255bc313f2a60ee454cc3f0af52106584663c72ecd542a9c92769559c6787 thunar-1.8.14.tar.bz2" +sha512sums="50020084105daf5d5464cdcd29827fa212b121b0f6a385b6e2820fd120b6880cffafe63f51e737bc33d13f174f83de5c165f2ce155ff6aae74cc1b285cbdc8db thunar-1.8.15.tar.bz2" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 1270dcbc3..fc2887d63 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=68.7.0 +pkgver=68.9.0 pkgrel=0 pkgdesc="Email client from Mozilla" url="https://www.thunderbird.net/" @@ -36,7 +36,6 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun fix-mutex-build.patch fix-seccomp-bpf.patch mozilla-build-arm.patch - rust-config.patch shut-up-warning.patch skia-sucks1.patch skia-sucks2.patch @@ -70,6 +69,12 @@ ldpath="$_mozappdir" # - CVE-2020-6821 # - CVE-2020-6822 # - CVE-2020-6825 +# 68.9.0-r0: +# - CVE-2020-6831 +# - CVE-2020-12387 +# - CVE-2020-12392 +# - CVE-2020-12395 +# - CVE-2020-12397 unpack() { default_unpack @@ -164,7 +169,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f thunderbird-68.7.0.source.tar.xz +sha512sums="891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0 thunderbird-68.9.0.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz 5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -172,7 +177,6 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch -45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch 9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch diff --git a/user/thunderbird/rust-config.patch b/user/thunderbird/rust-config.patch deleted file mode 100644 index eab72a0e4..000000000 --- a/user/thunderbird/rust-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urw firefox-68.0-old/build/moz.configure/rust.configure firefox-68.0/build/moz.configure/rust.configure ---- firefox-68.0-old/build/moz.configure/rust.configure 2019-07-07 15:56:29.345963800 +0000 -+++ firefox-68.0/build/moz.configure/rust.configure 2019-07-07 16:19:25.990645334 +0000 -@@ -193,12 +193,16 @@ - ambiguous = set() - per_raw_os = {} - for t in out: -+ if 'fuchsia' in t: continue - t = split_triplet(t, allow_unknown=True) - endianness = t.endianness - if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): - endianness = 'little' - key = (t.cpu, endianness, t.os) - if key in per_os: -+ # hax to allow Adélie toolchains to work -+ if 'foxkit' in per_os[key].alias: -+ continue - previous = per_os[key] - per_raw_os[(previous.cpu, previous.endianness, - previous.raw_os)] = previous diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD index 007ff7b69..8e98bc621 100644 --- a/user/tk/APKBUILD +++ b/user/tk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=tk -pkgver=8.6.9.1 +pkgver=8.6.10 pkgrel=0 pkgdesc="GUI toolkit for the Tcl scripting language" url="http://tcl.sourceforge.net/" @@ -13,7 +13,7 @@ makedepends="$depends_dev libpng-dev" subpackages="$pkgname-doc $pkgname-dev" source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz" _major=8.6 -builddir="$srcdir"/tk8.6.9/unix +builddir="$srcdir"/tk$pkgver/unix build() { ./configure \ @@ -50,4 +50,4 @@ dev() { done } -sha512sums="b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 tk8.6.9.1-src.tar.gz" +sha512sums="d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5 tk8.6.10-src.tar.gz" diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 9e71972d1..14e56deca 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=trigger-rally pkgver=0.6.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Fast-paced rally racing game" url="http://trigger-rally.sourceforge.net/" arch="all" diff --git a/user/ttf-jetbrains-mono/APKBUILD b/user/ttf-jetbrains-mono/APKBUILD new file mode 100644 index 000000000..54857a62a --- /dev/null +++ b/user/ttf-jetbrains-mono/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Jonas Vautherin <jonas.vautherin@protonmail.ch> +# Maintainer: Jonas Vautherin <jonas.vautherin@protonmail.ch> +pkgname=ttf-jetbrains-mono +pkgver=1.0.6 +pkgrel=0 +pkgdesc="A typeface for developers" +url="https://www.jetbrains.com/lp/mono" +arch="noarch" +options="!check" # No test suite +license="Apache-2.0" +depends="fontconfig" +makedepends="" +source="https://github.com/JetBrains/JetBrainsMono/releases/download/v${pkgver}/JetBrainsMono-${pkgver}.zip" +builddir="$srcdir/JetBrainsMono-$pkgver" + +package() { + mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} + + cd ttf + for i in *.ttf; do + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} + done +} + +sha512sums="c7d980f8aa16f0773510d71c1b96bdf0d6adc73bef188a50b789517eb4c5eae98fa4feffc0d75f504a31b913d5531f03a709cb87584171f37af662e3c88e4561 JetBrainsMono-1.0.6.zip" diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 23d44cdb2..6c200fa5c 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ttf-sudo -pkgver=0.40 +pkgver=0.50 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://www.kutilek.de/sudo-font/" @@ -9,9 +9,9 @@ arch="noarch" options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" -makedepends="" -source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo.zip" -builddir="$srcdir/sudo" +makedepends="unzip" +source="$pkgname-$pkgver.tar.gz::https://github.com/jenskutilek/sudo-font/archive/v${pkgver}.tar.gz" +builddir="$srcdir/sudo-font-$pkgver/sudo" package() { mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} @@ -20,4 +20,4 @@ package() { done } -sha512sums="c585866ff72bf94ed4bd452a238bfd7d603c813b9105d0d57f1c91dc5c14d5bbee6f8707497a1644b5be1657d81f6a337fc4f16a79ddad519d208c7c03a2f045 sudo.zip" +sha512sums="d48020d5261f9b968ad2fc92f88ce4b1482e3b752b33b50452875951b09cd7472d520b60380321af49404de7986b06d6e653017a07e6a8687792f333a96e8532 ttf-sudo-0.50.tar.gz" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 723a1b2ff..a1946e12d 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=tumbler -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb tumbler-0.2.8.tar.bz2" +sha512sums="df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f tumbler-0.2.9.tar.bz2" diff --git a/user/twm/APKBUILD b/user/twm/APKBUILD index de08c9b46..ec7ea903c 100644 --- a/user/twm/APKBUILD +++ b/user/twm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=twm -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=0 pkgdesc="Tom's/Tab Window Manager for the X Window System" url="https://www.X.Org" @@ -11,9 +11,9 @@ options="!check" # No test suite. license="MIT AND X11" depends="" makedepends="bison util-macros libxext-dev libx11-dev libxt-dev - libice-dev libxmu-dev" + libice-dev libxmu-dev libxrandr-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e twm-1.0.10.tar.bz2" +sha512sums="948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d twm-1.0.11.tar.xz" diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index 153dfc63b..c25bc1baf 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=uchardet -pkgver=0.0.6 +pkgver=0.0.7 pkgrel=0 pkgdesc="Universal character encoding detection library" url="https://www.freedesktop.org/wiki/Software/uchardet/" @@ -10,7 +10,8 @@ license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+" depends="" makedepends="cmake" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz" +source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz + no-debug-suffix.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,4 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" +sha512sums="ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f uchardet-0.0.7.tar.xz +2e6f9d34daa6ba7dab07843368017448a17162d4d55bbc01665d00afa61a36f8b44fd6149706b806c8980632bdf33d073e0a93559d809852e18460551f330ecb no-debug-suffix.patch" diff --git a/user/uchardet/no-debug-suffix.patch b/user/uchardet/no-debug-suffix.patch new file mode 100644 index 000000000..f12bb565e --- /dev/null +++ b/user/uchardet/no-debug-suffix.patch @@ -0,0 +1,14 @@ +diff -Nurd uchardet-0.0.7/CMakeLists.txt uchardet-0.0.7.new/CMakeLists.txt +--- uchardet-0.0.7/CMakeLists.txt 2020-04-23 09:48:58.000000000 +0000 ++++ uchardet-0.0.7.new/CMakeLists.txt 2020-06-13 08:26:38.946585352 +0000 +@@ -12,10 +12,6 @@ + set (UCHARDET_VERSION_MINOR 0) + set (UCHARDET_VERSION_REVISION 7) + +-if (CMAKE_BUILD_TYPE MATCHES Debug) +- set (version_suffix .debug) +-endif (CMAKE_BUILD_TYPE MATCHES Debug) +- + set ( + UCHARDET_VERSION + ${UCHARDET_VERSION_MAJOR}.${UCHARDET_VERSION_MINOR}.${UCHARDET_VERSION_REVISION}${version_suffix} diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 02118dcd5..41fc57eb4 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 -pkgver=2.8.4 -pkgrel=1 +pkgver=2.9.0 +pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -51,6 +51,6 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c udisks-2.8.4.tar.bz2 +sha512sums="314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c udisks-2.9.0.tar.bz2 e2b2cc10868ca341603c3403631b9962c9c776bf96f4ac2c764425363ffdbe1cd9c35233e568f84b276a1f6702b1ac5b9a14b4a62983067c44c433b58d1b7175 50-udisks2.rules 4352d63458ca51b362844d60109948ebeeecdc492a93443b391c0d75b6fff0c0af5018c8a8e441fb37bffd59c734298eaa936fcb0cd4c42ac55c1298b398b1dc O_CLOEXEC.patch" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index ae1798e8e..e5660e0ab 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a umbrello-19.12.3.tar.xz +sha512sums="dd85330578a8c9a9568ce40758d76848fee76fa4ac16a44faeeb064480910038d734876ef9e2475e01e75a13f3d0b8d444fbf78542c9648ee6a8f59b4dc9b83c umbrello-20.04.3.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD index 799b9fd2c..42ec0b956 100644 --- a/user/unicode-data/APKBUILD +++ b/user/unicode-data/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=unicode-data -pkgver=12.1.0 +pkgver=13.0.0 pkgrel=0 pkgdesc="Unicode data files" url="https://unicode.org" @@ -29,9 +29,9 @@ package() { "$srcdir"/Unihan.zip } -sha512sums="2cd8a92ec3feabd77ddd48f7553287c057b9ff968244a91a29754837fe4e02175a0fd9d848bdab946fc44bd249442fe5862bb892d0e714ee3dadd571f1f7b77c Blocks.txt -999db016b6a0bc3628cbdff22f027019f88f00383eff77a6ee0a1eeb92ddc29a30a2c9ab0568f22b412e11598b5953d3d91bd5dadea457d1721b9bf79f637264 DerivedAge.txt -feed2bc6c95042c480ddca92ad2515277314e1937a15603f8a3e816e021adad0662e1fe0d5149d7dbb14f54b13ef9bf433a0306dd63daf7c2fc0907ba4ae4bbd NamesList.txt -17678d900ac545641c214436b36489962be3566d355e2fe08ac30be5759bf68851e34c44100bf3d5dc72833a9a679745829c7772f48a59786cbd87973acfd4ef Scripts.txt -09be79ddcc2e019584522635f7c134bcd0ca50baf3517b6eb8ef76e5ce8109a6a8b20f3af593e7e8ab94e5bec1b98ebf43d79de53890d6bac3f33b9abb0e35c6 UnicodeData.txt -7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 Unihan.zip" +sha512sums="a4407867ac3721e608d193786d4f7882aa3b42c61a9f83f207a74196888339b2f0cacc357bd15e25632c805d8a7c29f635c1bdcd6998b703763071622541b56c Blocks.txt +c4697aac5e447e37c79f0cd0f35f70d9c717eff7328c4b706c9e938ead0fc60292998374a63b3f06d5c134788e9b9e2762948ac4a6b58cc38455adf95705c8fe DerivedAge.txt +97a22d75146b15e5c671efca5fe6caec23b4f516846bd4018dde7363cd6c5a4e1ea567d520c86a000955a753f71c91e3a0b1b39d306cb77946071fbb9e522412 NamesList.txt +c747fde612b0d500175db6495985ab14d33f98a5a9f0851d1102a30e0b6d1fc75283bd014c9aa11bb4382b7a9d1ecedf57a58bdcaafe9473a87cafa316ede04c Scripts.txt +1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055 UnicodeData.txt +87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be Unihan.zip" diff --git a/user/unifont/APKBUILD b/user/unifont/APKBUILD index cfbacb7ff..b7949f605 100644 --- a/user/unifont/APKBUILD +++ b/user/unifont/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Breno Leitao <breno.leitao@gmail.com> # Maintainer: pkgname=unifont -pkgver=12.1.03 +pkgver=13.0.03 pkgrel=0 pkgdesc="GNU font package with all Unicode 11 characters" url="http://unifoundry.com/unifont.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4826095b3d5ab164a16a27d27334ab2ba62f39db46f164ceb31dccae14c8c0f2a1ea4d2141167c9328b699ab987bb094900d7d7af98a3c0b8d2260430d62200a unifont-12.1.03.tar.gz" +sha512sums="5dd6576bbc158e5dac4f8812a724c4fc8ed2702b7ea22d4b2d9265d9d58bfddc4d4607eacdb7053896559b218986bec3709cbe734656a7cf9daa328de4a21bee unifont-13.0.03.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD index a8f216aa3..340d86175 100644 --- a/user/uwsgi/APKBUILD +++ b/user/uwsgi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=uwsgi -pkgver=2.0.18 -pkgrel=2 +pkgver=2.0.19.1 +pkgrel=0 pkgdesc="Web application server" url="https://projects.unbit.it/uwsgi" arch="all" @@ -83,4 +83,4 @@ rack() { _plugpack rack "Ruby Rack" } -sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 uwsgi-2.0.18.tar.gz" +sha512sums="e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf uwsgi-2.0.19.1.tar.gz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 78b7a4e36..01de5b36a 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vala -pkgver=0.48.3 +pkgver=0.48.8 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e73eade8b0cfa312d896c81b76e045bc9b8b71bd89298c0f8d78b2f596eebf64dc0eea8d1e266b2c17a774105560ed47590fbe00d65b1fda8db6823ac3ba4bb4 vala-0.48.3.tar.xz" +sha512sums="a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99 vala-0.48.8.tar.xz" diff --git a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch index 5d7dbe29c..247657759 100644 --- a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch +++ b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch @@ -302,12 +302,13 @@ diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c index df842aa..de37070 100644 --- a/coregrind/m_machine.c +++ b/coregrind/m_machine.c -@@ -2073,7 +2073,8 @@ void* VG_(fnptr_to_fnentry)( void* f ) +@@ -2073,8 +2073,9 @@ void* VG_(fnptr_to_fnentry)( void* f ) || defined(VGP_ppc32_linux) || defined(VGP_ppc64le_linux) \ || defined(VGP_s390x_linux) || defined(VGP_mips32_linux) \ || defined(VGP_mips64_linux) || defined(VGP_arm64_linux) \ -- || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) -+ || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) \ + || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) \ +- || defined(VGP_nanomips_linux) ++ || defined(VGP_nanomips_linux) \ + || (defined(VGP_ppc64be_linux) && !defined(VG_PLAT_USES_PPCTOC)) return f; # elif defined(VGP_ppc64be_linux) diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index 4bcc705b9..ff9c64d49 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=valgrind -pkgver=3.15.0 +pkgver=3.16.1 pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" @@ -62,8 +62,8 @@ package() { fi } -sha512sums="5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f valgrind-3.15.0.tar.bz2 -250177c3f50940560de9ad885cf5d9d7aa060ac832ced04875e1109b9114ec34e358a5c2309c8548f657e293cf50d980306d47b2cdf5e429aeabd10ffe666104 0001-Ensure-ELFv2-is-supported-on-PPC64.patch +sha512sums="2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950 valgrind-3.16.1.tar.bz2 +f90aa3cef5d3561d4602ff63b8f355b8427cbe6bb2ecd6bfc2e2bb063915fa40a70d923dbc60a643ee3fb7bcfbbddac049c6f6133c541189dd82b891f7ad9dbc 0001-Ensure-ELFv2-is-supported-on-PPC64.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 6c9a23c97..13fefc76c 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.8 +pkgver=3.0.11 pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" @@ -205,14 +205,14 @@ libs() { default_libs } -sha512sums="5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70 vlc-3.0.8.tar.xz +sha512sums="8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444 vlc-3.0.11.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch 35f83e38a6a0dd1e3c37e3dc6d63b1406d2f9454ed246854c1408d6f35ad74b743c5b0dbc19442bab65aad4268707ffa85bfda9e72b2d711c1d3412d955bf150 lua.patch e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch -a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch +3557686d76ab26fd401cb8758944b23173e6983f55b34d923d6808a2cc1f8efa9d0de58ab3b1664c713a579d1a94c4fcd8d731327eebd23c599bf037571e5406 tar-compat.patch c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch 55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd" diff --git a/user/vlc/tar-compat.patch b/user/vlc/tar-compat.patch index 34169ef56..6cbfb88ce 100644 --- a/user/vlc/tar-compat.patch +++ b/user/vlc/tar-compat.patch @@ -1,9 +1,9 @@ ---- vlc-3.0.1/share/Makefile.am.old 2018-02-06 18:41:06.000000000 +0000 -+++ vlc-3.0.1/share/Makefile.am 2018-04-05 23:19:37.081889895 +0000 -@@ -94,7 +94,7 @@ - $(AM_V_at)rm -f -- skins2/default.vlt.tmp - $(AM_V_GEN)GZIP=--no-name \ +--- vlc-3.0.11/share/Makefile.am.old 2020-04-05 13:46:34.000000000 +0000 ++++ vlc-3.0.11/share/Makefile.am 2020-07-07 20:50:05.832207915 +0000 +@@ -97,7 +97,7 @@ + GZIP=--no-name \ tar cvvzf skins2/default.vlt.tmp \ + --format=ustar $$tarsort \ - --owner=root --group=root --directory="$(srcdir)/skins2" \ + --uid=0 --gid=0 --directory="$(srcdir)/skins2" \ default/ diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index d55cd91b5..88a7cfb4b 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vte -pkgver=0.60.1 +pkgver=0.60.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -27,5 +27,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="123a8fcc14f4dba450411f95f43eb60108fee95c328d0e7331c9366d96ba2caa548dece3e95a8b779dda19d322d6879d02abc6ac68e36450e4e72f17a0963c30 vte-0.60.1.tar.xz +sha512sums="3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 vte-0.60.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 357476211..d4f4097f5 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,7 +2,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=weechat -pkgver=2.8 +pkgver=2.9 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -61,4 +61,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="3071fc6c5d88d4e388fc22f23242cf264b9533b389668914fc25e71e9939b739ba63a4e182445222ed0a7470dc0b1d958828b56d2c82ac47e9dfce6513c70d80 weechat-2.8.tar.gz" +sha512sums="975f5b7b6ed44be1ccd5b9b157c38ce5a3ce7319e873d7913b80b23d619351fd8edb35a29e6d488e31ae67b5ad70c1933dcea1dfd914ab8c1a10b7810723bd78 weechat-2.9.tar.gz" diff --git a/user/wimlib/APKBUILD b/user/wimlib/APKBUILD new file mode 100644 index 000000000..97b72cdda --- /dev/null +++ b/user/wimlib/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=wimlib +pkgver=1.13.2 +pkgrel=0 +pkgdesc="Windows Imaging (WIM) archive manipulation library and tools" +url="https://wimlib.net/" +arch="all" +license="(GPL-2.0 OR LGPL-2.1) AND CC0" +depends="" +makedepends="libxml2-dev fuse-dev ntfs-3g ntfs-3g-dev" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="https://wimlib.net/downloads/wimlib-$pkgver.tar.gz" + +build() { + ./configure \ + --prefix=/usr + make +} + +check() { + PATH="/usr/sbin:${PATH}" make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="8d70a737724bec7591977de5b772b708864ce7548cfe79ebee7508de1013a9915aca356d2b73e6b2959bce671be0a275463546503b616f61833724c5bb75faba wimlib-1.13.2.tar.gz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 7fac2165c..3ac5683cf 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> _kver="5.4.5-mc0" -pkgver=1.0.20200401 +pkgver=1.0.20200506 pkgrel=0 _pkgname="wireguard-module" pkgname="$_pkgname-$_kver" @@ -39,4 +39,4 @@ _patch() { "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" } -sha512sums="894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0 wireguard-linux-compat-1.0.20200401.tar.xz" +sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074 wireguard-linux-compat-1.0.20200506.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index db64e132e..219a91836 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20200319 +pkgver=1.0.20200513 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41 wireguard-tools-1.0.20200319.tar.xz" +sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c wireguard-tools-1.0.20200513.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 7b46e7f29..43e059bd3 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: pkgname=wireless-regdb -pkgver=2019.06.03 +pkgver=2020.04.29 pkgrel=0 pkgdesc="Database of regulatory radio restrictions" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" @@ -19,4 +19,4 @@ package() { install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" db.txt } -sha512sums="73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb wireless-regdb-2019.06.03.tar.xz" +sha512sums="736b1dabfa35bd2639ec8b50c12aa1f04ed7cd5cd9c4db2b4cfc58fbbe21713196bf6d92e4bdb46e328ddcef220e0737fe34fc41370b2327786bb5d93d7ba2e9 wireless-regdb-2020.04.29.tar.xz" diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 25f20db92..254d32057 100644 --- a/user/wxwidgets/APKBUILD +++ b/user/wxwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wxwidgets -pkgver=3.1.3 +pkgver=3.1.4 pkgrel=0 pkgdesc="C++ library for creating applications" url="https://www.wxwidgets.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d19305c96f1a382ec74549f69d6a7c61ecd0abac383623c308c45f0168c670c15262efc4fb64c14fa9d1fdb3579f19abdb5c8247ead72dc926342e586d7b4532 wxWidgets-3.1.3.tar.bz2" +sha512sums="aabb257fa222eb819f1e16086977b0ecfd3eb3406d695e0e642ffdb8b4dc586a9721404916be4756a2d92a1a8dc41b661b54717a64e03850a8a92d32d45ece14 wxWidgets-3.1.4.tar.bz2" diff --git a/user/xabacus/APKBUILD b/user/xabacus/APKBUILD index 6ab2e4f8b..fed80b979 100644 --- a/user/xabacus/APKBUILD +++ b/user/xabacus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=xabacus -pkgver=8.2.4 +pkgver=8.2.8 pkgrel=0 pkgdesc="Simple X11 abacus widget" url="http://www.sillycycle.com/abacus.html" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install install-png install-xpm } -sha512sums="6a65e36c678cbb39d95932da265d40c61afb21eccc87264e07e80fb98b75c4e4a4777ee2bce458eb2e811b720656732e7c780e61e436287f91df83015c7e58c0 xabacus-8.2.4.tar.bz2" +sha512sums="83f758df19a2b28af27ef6eeceb4e3f879a43cf96017b13e22138f86707d61e9f569abced907b7ae9d1478811e11f362cb45d76c860ae76d149f378c584d8a2d xabacus-8.2.8.tar.bz2" diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index 20005d338..a7c352fa3 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.14 +pkgver=1.4.16 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -46,5 +46,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b xapian-core-1.4.14.tar.xz +sha512sums="3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 xapian-core-1.4.16.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD index ba8aafedd..e7fbf8ba2 100644 --- a/user/xev/APKBUILD +++ b/user/xev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xev -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X11 input event monitor" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2" +sha512sums="383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca xev-1.2.4.tar.bz2" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index 2aa771d80..529661f8e 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-libinput -pkgver=0.29.0 +pkgver=0.30.0 pkgrel=0 pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b xf86-input-libinput-0.29.0.tar.bz2" +sha512sums="823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380 xf86-input-libinput-0.30.0.tar.bz2" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 0aa0fdd1f..9025a7fa0 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-notifyd -pkgver=0.4.4 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,7 +11,7 @@ depends="" makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" build() { LIBS="-lintl -lX11" ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5 xfce4-notifyd-0.4.4.tar.bz2" +sha512sums="d48752cd4e02e515e4c5d147b7bce678a56f47f0bd336e3b9db4e14fc2b0355e0582816957fc43c313a5779b5495c836ee5da4f0cb83616a0164d692a169415f xfce4-notifyd-0.6.1.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index ef98510e3..35644eab4 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-taskmanager -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="670e8fd09bdaa85dc822dd5a7b055f898941e8079315843344e4dae12e2c0a14049b58241fb58f170461e7b8829bc479bea1a488b756210ef91ef8a4d7ff3348 xfce4-taskmanager-1.2.2.tar.bz2" +sha512sums="e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3 xfce4-taskmanager-1.2.3.tar.bz2" diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 607bdf263..7af85df23 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-time-out-plugin -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="Forced computer break plugin for the XFCE panel" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03d27d98a3968daf93357556a5ca63641ceee3ce9f53db5287ce27a282d3f4a068a2c9be14d7690d4188901245521c03b68bb3fe39e1ed0e1f6a95eecc1dc846 xfce4-time-out-plugin-1.1.0.tar.bz2" +sha512sums="463d210eb6cfaa79c3470b44e7fb42ab44ce8fec0e403d8c71344a5bbc68af29e0da0fe759471ed873637114adf947699ecbaea1129f36e2dd6dc56db0c2ca87 xfce4-time-out-plugin-1.1.1.tar.bz2" diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index eb420718a..c4a52b993 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-timer-plugin -pkgver=1.7.0 -pkgrel=1 +pkgver=1.7.1 +pkgrel=0 pkgdesc="Timer plugin for the XFCE panel" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e xfce4-timer-plugin-1.7.0.tar.bz2" +sha512sums="4887dc2c524a8b749a20449dd491dc8f12f8babb26c64cecf33ae56b45d2446128cb65c25f11d534278ad39a2adf7ab718714e1bfa613fd39713e44642030c16 xfce4-timer-plugin-1.7.1.tar.bz2" diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 7800f5703..986789d40 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-whiskermenu-plugin -pkgver=2.4.3 +pkgver=2.4.6 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32 xfce4-whiskermenu-plugin-2.4.3.tar.bz2" +sha512sums="9e947b73735549d81110323bfd7d6f29c91653b12e1aa616b9ca6f0ff99c8a7948ca383422d7b2aa0ac35297488fda6edc699ae4f72883539d6311672818b62c xfce4-whiskermenu-plugin-2.4.6.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index c211fb629..f5b5b681b 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfconf -pkgver=4.14.1 +pkgver=4.14.3 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808 xfconf-4.14.1.tar.bz2" +sha512sums="e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713 xfconf-4.14.3.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index b6c907d50..92564c92e 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfwm4 -pkgver=4.14.0 +pkgver=4.14.3 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939 xfwm4-4.14.0.tar.bz2" +sha512sums="eb27c9d540a4b1d773f31c16dd8e7e4cd8fb833514ecc62251c68b53e88440beccb4923c49c66a29b387c77e2e69cb36e83d0a3d457ef8e7fdd5d2b925fdfda6 xfwm4-4.14.3.tar.bz2" diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index 8ede47ac1..e685ff22c 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.29 +pkgver=2.30 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" @@ -32,4 +32,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670 xkeyboard-config-2.29.tar.bz2" +sha512sums="2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4 xkeyboard-config-2.30.tar.bz2" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index 5c71b8f19..1bbd3abb7 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec -pkgver=1.2.29 +pkgver=1.2.30 _pkgname="$pkgname${pkgver%%.*}" pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" @@ -68,4 +68,4 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d xmlsec1-1.2.29.tar.gz" +sha512sums="07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98 xmlsec1-1.2.30.tar.gz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 989c75152..8eae501e0 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xterm -pkgver=353 +pkgver=358 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611 xterm-353.tgz +sha512sums="fa4769e1ab967b753ac349f968d6240c2eac1fc4f01ee7dace999492e221c6283af0bea0a72289760653cd4f833d08168e613beb3c89ac78dece8eb702d1ab3b xterm-358.tgz 6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch" diff --git a/user/xvidcore/APKBUILD b/user/xvidcore/APKBUILD index 6908df902..6d200463b 100644 --- a/user/xvidcore/APKBUILD +++ b/user/xvidcore/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=xvidcore -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=0 pkgdesc="Open source MPEG-4 video codec" url="https://labs.xvid.com/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de319e28c656c8105fa596eb69984b7176e004f617d9e21cb9014e2b26d23e68fe558c69685dd550d891261d79c21d2226cbbaae55e5486255e2089e9f61e6a5 xvidcore-1.3.6.tar.bz2" +sha512sums="e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed xvidcore-1.3.7.tar.bz2" diff --git a/user/xxhash/APKBUILD b/user/xxhash/APKBUILD index 6d8140994..ff9328e9f 100644 --- a/user/xxhash/APKBUILD +++ b/user/xxhash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xxhash -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=0 pkgdesc="Fast non-cryptographic hashing algorithm" url="https://cyan4973.github.io/xxHash/" @@ -31,4 +31,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664 xxHash-0.7.3.tar.gz" +sha512sums="9dbf8424b355d6551c18cff7ed7dbd26d4e5735b9a07fe54911b7438d6ffed3a3c2429ac09b616de630ea16cf32ff73529b6c3fad4af78ae0cb2b06155086aea xxHash-0.7.4.tar.gz" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index b57f1a969..a2e5a84ef 100644 --- a/user/yakuake/APKBUILD +++ b/user/yakuake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yakuake -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7 yakuake-19.12.3.tar.xz" +sha512sums="a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658 yakuake-20.04.3.tar.xz" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index 424f883b1..343603636 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2020.03.24 +pkgver=2020.07.28 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -66,5 +66,5 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369 youtube-dl-2020.03.24.tar.gz +sha512sums="be18cd53577a1e750a9610d481225b5683414ee4a095aa90b1a9ef150e9009bec4c2188f19f13505c88ac0179872751a07f5fb4b591beca3cefd11ccf071132d youtube-dl-2020.07.28.tar.gz 5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index adac93a71..1fadaf24b 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.7 +pkgver=4.8.8 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -13,6 +13,10 @@ subpackages="$pkgname-dev py3-$pkgname:py3:noarch" source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" builddir="$srcdir/z3-z3-$pkgver" +case "$CARCH" in +pmmx) options="$options textrels";; +esac + build() { PYTHON=python3 ./configure \ --prefix=/usr \ @@ -37,4 +41,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" +sha512sums="a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f z3-4.8.8.tar.gz" |