diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'user')
1962 files changed, 18852 insertions, 16525 deletions
diff --git a/user/a52dec/APKBUILD b/user/a52dec/APKBUILD index 9296f3ad0..73419f6c7 100644 --- a/user/a52dec/APKBUILD +++ b/user/a52dec/APKBUILD @@ -6,15 +6,15 @@ pkgdesc="Library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch="all" license="GPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" +depends="" makedepends="autoconf automake libtool linux-headers" +subpackages="$pkgname-dev $pkgname-doc" source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz automake.patch $pkgname-$pkgver-build.patch " prepare() { - cd "$builddir" default_prepare update_config_sub libtoolize --force && \ @@ -22,7 +22,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/ } diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD index 76ae5ea08..a76ef2557 100644 --- a/user/abiword/APKBUILD +++ b/user/abiword/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abiword -pkgver=3.0.2 +pkgver=3.0.4 pkgrel=0 pkgdesc="A fully-featured word processor" url="https://www.abisource.com" arch="all" options="!check" # Test suite requires valgrind, etc license="GPL-2.0+" +depends="" makedepends="bzip2-dev enchant-dev fribidi-dev goffice-dev gtk+3.0-dev libgsf-dev libjpeg-turbo-dev librsvg-dev libxslt-dev pcre-dev popt-dev wv-dev" @@ -21,9 +22,7 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ latex loadbindings mht mif mswrite openwriter openxml opml paint \ passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \ xslfo" -source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz - fix-black-drawing-regression.patch - " +source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -40,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 abiword-3.0.2.tar.gz -cae9a08047cd97d11acea25a2f0b0ca4e8e4556b462eb476507fa178a7412221839febfeb36bebf491bb94d53525c4584d86230f96c403a7ceb2dec4223be8fe fix-black-drawing-regression.patch" +sha512sums="121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 abiword-3.0.4.tar.gz" diff --git a/user/abiword/fix-black-drawing-regression.patch b/user/abiword/fix-black-drawing-regression.patch deleted file mode 100644 index dbce8c696..000000000 --- a/user/abiword/fix-black-drawing-regression.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere <hub@figuiere.net> -Date: Thu, 8 Dec 2016 02:03:10 +0000 -Subject: [PATCH] Bug 13815 - draw event should return TRUE - -This fix the black drawing regression with Gtk3.22 - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 ---- - src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- - src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..10f8e00 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else --gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) -+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); -@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..a0ff57f 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else -- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); -+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif - static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); - static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/user/accountsservice/APKBUILD b/user/accountsservice/APKBUILD index 2cee00a05..f6eaa260d 100644 --- a/user/accountsservice/APKBUILD +++ b/user/accountsservice/APKBUILD @@ -16,7 +16,6 @@ source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pk " build() { - cd "$builddir" CPPFLAGS="-D_PATH_WTMPX=\\\"/run/utmps/wtmp\\\"" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -36,12 +35,10 @@ build() { } check() { - cd "$builddir" ninja -C output test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } diff --git a/user/acpi/APKBUILD b/user/acpi/APKBUILD index 8d2b49412..9dc1c2977 100644 --- a/user/acpi/APKBUILD +++ b/user/acpi/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD index 4a46b0c93..e9bff1952 100644 --- a/user/acpid/APKBUILD +++ b/user/acpid/APKBUILD @@ -5,7 +5,6 @@ # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us> # Contributor: multiplexd <multi@in-addr.xyz> - pkgname=acpid pkgver=2.0.32 pkgrel=0 diff --git a/user/adelie-kde-theme/APKBUILD b/user/adelie-kde-theme/APKBUILD index 5eb3e9509..9cc8badd5 100644 --- a/user/adelie-kde-theme/APKBUILD +++ b/user/adelie-kde-theme/APKBUILD @@ -9,6 +9,8 @@ arch="noarch" options="!check" # No test suite. license="NCSA" depends="adelie-wallpapers papirus-icons" +makedepends="" +subpackages="" source="kdeglobals kscreenlockerrc adelie-kde-theme.js @@ -16,7 +18,6 @@ source="kdeglobals builddir="$srcdir/" package() { - cd "$builddir" install -D -m644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals install -m644 kscreenlockerrc "$pkgdir"/etc/xdg/kscreenlockerrc install -D -m644 adelie-kde-theme.js \ diff --git a/user/adelie-wallpapers/APKBUILD b/user/adelie-wallpapers/APKBUILD index dc66e9e5f..5462ef837 100644 --- a/user/adelie-wallpapers/APKBUILD +++ b/user/adelie-wallpapers/APKBUILD @@ -14,9 +14,8 @@ subpackages="" source="https://distfiles.adelielinux.org/source/adelie-wallpapers-$pkgver.tar.xz" package() { - cd "$builddir" mkdir -p "$pkgdir" - cp -r usr "$pkgdir"/ + mv "$builddir"/usr "$pkgdir"/ } sha512sums="3815145eaf92524eb848ec179cefecd66b43873a9f17133b62baf2ce894d7f629585f6670e5e499d7d5779377c1819627256d7812bb4318b0bfd68466c9b1cff adelie-wallpapers-1.0.tar.xz" diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD index d5964e80d..dbed574fe 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.34.0 +pkgver=3.34.3 pkgrel=0 pkgdesc="GNOME system icon set" url="https://www.gnome.org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc47e9448f498710fb9abf4c839918630f64cee189a0dec60672784bfdf6d350e6fc06d13732fb206380523507d1d3c3ca7609f68438d4b5b76d888b172d3072 adwaita-icon-theme-3.34.0.tar.xz" +sha512sums="77d8fa2cd0a82a7d539b5f9c8c1ed0dc8727de4975a8a770b05f78e4df9dda36aa40232a3ec71f87e24cd1fd6c6a369bcb20c909c1367b89b5327cf3771b48b5 adwaita-icon-theme-3.34.3.tar.xz" diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD index 19535f00f..e23ca23a7 100644 --- a/user/ae_fonts/APKBUILD +++ b/user/ae_fonts/APKBUILD @@ -15,12 +15,8 @@ source="https://downloads.sourceforge.net/arabeyes/ae_fonts_$pkgver.tar.bz2" builddir="$srcdir"/${pkgname}_$pkgver package() { - cd "$builddir" - local _fontdir for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do - cd $_fontdir - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf - cd "$OLDPWD" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/$_fontdir/*.ttf done } diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 1be4e8974..8681e7991 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.3 +pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" arch="all" @@ -14,10 +14,9 @@ depends_dev="qt5-qtbase-dev akonadi-dev kcontacts-dev kcoreaddons-dev makedepends="$depends_dev cmake extra-cmake-modules akonadi-mime-dev kio-dev kmime-dev prison-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="dba40ec470d8b34b38d69470128708580a0581dcf1a88191da1b6bfedb426a13c964117eea1d266d1cb2224006a4b26f1f8ccc39e79eac67653aa808c5d81fb0 akonadi-contacts-18.12.3.tar.xz" +sha512sums="23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2 akonadi-contacts-19.12.3.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 6ff117f02..013d8e49c 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,22 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.3 +pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" arch="all" -options="!check" # regression? license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev akonadi-dev kio-dev kmime-dev" makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev kdbusaddons-dev kconfig-dev kitemmodels-dev kxmlgui-dev shared-mime-info" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-mime-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +25,21 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # The mailserializerplugintest test requires kdepim-runtime to be + # present on the system. Otherwise, Akonadi does not know how to + # convert a QByteArray of message/rfc822 to KMime::Message. This + # is a circular dependency, because kdepim-runtime requires amime + # so we must skip this test. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'mailserializerplugintest' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ecda52f1d41c7b7925b9e71f55f2dca14f38308185a9bdd528f53b109758f79a653b52a2bbb91c138dfc432c798fa9d83307c8652b14269e5d6969a38130ee13 akonadi-mime-18.12.3.tar.xz" +sha512sums="d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251 akonadi-mime-19.12.3.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 349967d5a..2b8ba158a 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.3 +pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" arch="all" @@ -16,13 +16,11 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev kdesignerplugin-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc - attributes.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,17 +31,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/config/akonadi @@ -51,6 +47,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="f97e716be612001a8176f20afbe80a1cf4c78c6d348d92e542307ea951e1ff74189d2f0847675ed44ad65845b52a5180346b3866f5a8d82b55ed613d107ac346 akonadi-18.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc -63a26cf5c20583a372146d11050f5003242997743fe9470fb2b7556d5aebb58c06dfeefc0c14c86a435f7172126dac0d52b1701c6bd872f10531bf1d99625e93 attributes.patch" +sha512sums="d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 akonadi-19.12.3.tar.xz +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/akonadi/attributes.patch b/user/akonadi/attributes.patch deleted file mode 100644 index a49db7f37..000000000 --- a/user/akonadi/attributes.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> -Date: Thu, 21 Mar 2019 13:22:58 +0100 -Subject: Fix a regression when updating attributes - -This fixes a regression introduced in 3a062e6a and 6054e42d where some -attributes were not sent to the Akonadi server in update job even though -they were modified. This was due to a bad API design which returns a -non-const pointer to an attribute from a const method, so callers sometimes -modify the returned attribute on a const object. Since the method itself -is const though, it did not mark the attribute as modified. - -Proper fix is to introduce a purely const and non-const overloads for -the attribute accessors, unfortunatelly this requires fixing a lot of our code -in many places first to not abuse the non-constness of the returned -attribute. - -Note that since the code is in an inlined method, all clients should be -recompiled. - -CCMAIL: faure@kde.org ---- - src/core/collection.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/core/collection.h b/src/core/collection.h -index 50c0926..b5a496c 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - template <typename T> - inline T *Akonadi::Collection::attribute() const - { -- const T dummy; -- if (hasAttribute(dummy.type())) { -- T *attr = dynamic_cast<T *>(attribute(dummy.type())); -+ const QByteArray type = T().type(); -+ if (hasAttribute(type)) { -+ T *attr = dynamic_cast<T *>(attribute(type)); - if (attr) { -+ // FIXME: This method returns a non-const pointer, so callers may still modify the -+ // attribute. Unfortunately, just making this function return a const pointer and -+ // creating a non-const overload does not work, as many users of this function abuse the -+ // non-const pointer and modify the attribute even on a const object. -+ const_cast<Collection*>(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 -- qWarning() << "Found attribute of unknown type" << dummy.type() -+ qWarning() << "Found attribute of unknown type" << type - << ". Did you forget to call AttributeFactory::registerAttribute()?"; - } - --- -cgit v1.1 - -From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Thu, 21 Mar 2019 23:37:36 +0100 -Subject: Fix collection detaching at the wrong time in attribute() - -Summary: -Found in FatCRM where changes to collection attributes were not stored -anymore. - -Test Plan: -New unittest to ensure that we get the attribute from the -detached collection, not from the original one. - -Reviewers: dvratil - -Reviewed By: dvratil - -Subscribers: kde-pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D19741 ---- - autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++ - autotests/libs/collectionattributetest.h | 1 + - src/core/collection.h | 8 ++------ - 3 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp -index e264a37..9c46561 100644 ---- a/autotests/libs/collectionattributetest.cpp -+++ b/autotests/libs/collectionattributetest.cpp -@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute() - QCOMPARE(parsed.identifier(), id); - QCOMPARE(parsed.collectionNamespace(), ns); - } -+ -+void CollectionAttributeTest::testDetach() -+{ -+ // GIVEN a collection with an attribute -+ Collection col; -+ col.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); -+ Collection col2 = col; // and a copy, so that non-const access detaches -+ -+ // WHEN -+ TestAttribute *attr = col2.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); -+ TestAttribute *attr2 = col2.attribute<TestAttribute>(); -+ -+ // THEN -+ QCOMPARE(attr, attr2); -+} -diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h -index 420df78..2afa9eb 100644 ---- a/autotests/libs/collectionattributetest.h -+++ b/autotests/libs/collectionattributetest.h -@@ -32,6 +32,7 @@ private Q_SLOTS: - void testDefaultAttributes(); - void testCollectionRightsAttribute(); - void testCollectionIdentificationAttribute(); -+ void testDetach(); - }; - - #endif -diff --git a/src/core/collection.h b/src/core/collection.h -index b5a496c..9c19cc9 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - Q_UNUSED(option); - - const T dummy; -+ markAttributesChanged(); - if (hasAttribute(dummy.type())) { - T *attr = dynamic_cast<T *>(attribute(dummy.type())); - if (attr) { -- markAttributesChanged(); - return attr; - } - //Reuse 5250 -@@ -585,14 +585,10 @@ template <typename T> - inline T *Akonadi::Collection::attribute() const - { - const QByteArray type = T().type(); -+ const_cast<Collection*>(this)->markAttributesChanged(); - if (hasAttribute(type)) { - T *attr = dynamic_cast<T *>(attribute(type)); - if (attr) { -- // FIXME: This method returns a non-const pointer, so callers may still modify the -- // attribute. Unfortunately, just making this function return a const pointer and -- // creating a non-const overload does not work, as many users of this function abuse the -- // non-const pointer and modify the attribute even on a const object. -- const_cast<Collection*>(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 --- -cgit v1.1 diff --git a/user/alegreya-sans/APKBUILD b/user/alegreya-sans/APKBUILD index f14a5f467..1f731cc63 100644 --- a/user/alegreya-sans/APKBUILD +++ b/user/alegreya-sans/APKBUILD @@ -15,8 +15,7 @@ source="Alegreya-Sans-$pkgver.tar.gz::https://github.com/huertatipografica/Alegr builddir="$srcdir/Alegreya-Sans-$pkgver" package() { - cd "$builddir"/fonts/otf - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/fonts/otf/*.otf } sha512sums="8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4 Alegreya-Sans-2.008.tar.gz" diff --git a/user/alegreya/APKBUILD b/user/alegreya/APKBUILD index 354b8c276..0c035efc2 100644 --- a/user/alegreya/APKBUILD +++ b/user/alegreya/APKBUILD @@ -15,7 +15,6 @@ source="Alegreya-$pkgver.tar.gz::https://github.com/huertatipografica/Alegreya/a builddir="$srcdir/Alegreya-$pkgver" package() { - cd "$builddir" install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ fonts/otf/*.otf } diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index b864f1105..fa4d4c35d 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -14,7 +14,9 @@ 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" +source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz + webkit.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz" +sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz +0a9db2efedb01bcd31a3d15890b00f2186d4ff1fc37426f09bd659ae757afca15f996a52f4b6cc64b6b8dfd7010683bbb6e72c8e89a3332b37f4c85828e2de76 webkit.patch" diff --git a/user/alkimia/webkit.patch b/user/alkimia/webkit.patch new file mode 100644 index 000000000..224ac2e8b --- /dev/null +++ b/user/alkimia/webkit.patch @@ -0,0 +1,32 @@ +--- 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 189057dea..6023176f3 100644 --- a/user/alpine/APKBUILD +++ b/user/alpine/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=alpine -pkgver=2.21 +pkgver=2.22 pkgrel=0 pkgdesc="Terminal-based email client" url="http://alpine.x10host.com/alpine/" @@ -9,19 +9,18 @@ arch="all" license="Apache-2.0" depends="" makedepends="aspell-dev krb5-dev linux-pam-dev ncurses-dev openldap-dev - openssl-dev" + openssl-dev autoconf automake libtool" subpackages="$pkgname-doc" source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz - support-musl.patch" + support-musl.patch + " prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,14 +32,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 alpine-2.21.tar.xz -cdf827b5947fd14b6a6c1ad86df4ff1b8be1ffd51279aaa02376b2b60f3de742c54364e18d73d9a75c5c87ed3c8668a3f0c9eb59733f8da195e85833b4364782 support-musl.patch" +sha512sums="7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1 alpine-2.22.tar.xz +f26aaac4f81762227254e913f15c18b444e89d92b6885d62755d673d1f3097a126d297dc655b619d91b83bf5645ed0b4d5454c74a95cc142cd5fe3cb391e81cd support-musl.patch" diff --git a/user/alpine/support-musl.patch b/user/alpine/support-musl.patch index ab3c2d857..a63a351d9 100644 --- a/user/alpine/support-musl.patch +++ b/user/alpine/support-musl.patch @@ -1,6 +1,6 @@ --- ./configure.ac.orig +++ ./configure.ac -@@ -723,7 +723,7 @@ +@@ -726,7 +726,7 @@ else dnl preload c-client default locations/options case $host in @@ -9,7 +9,7 @@ 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 -@@ -1059,7 +1059,7 @@ +@@ -1070,7 +1070,7 @@ dnl build from c-client. Most of this will go away when c-client dnl adopts configure case "$host" in diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD index 94add5098..49f14066e 100644 --- a/user/alsa-lib/APKBUILD +++ b/user/alsa-lib/APKBUILD @@ -1,23 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alsa-lib -pkgver=1.1.9 +pkgver=1.2.2 pkgrel=0 pkgdesc="Linux sound support system" url="https://www.alsa-project.org/wiki/Main_Page" arch="all" license="LGPL-2.0+" -subpackages="$pkgname-dev $pkgname-dbg" +depends="" makedepends="linux-headers" +subpackages="$pkgname-dev $pkgname-dbg" source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 ucm_add_limits_h.patch remove-test.patch + type_compat.patch " -prepare() { - rm src/compat/hsearch_r.c && touch src/compat/hsearch_r.c - default_prepare -} - build() { ./configure \ --build=$CBUILD \ @@ -31,6 +28,10 @@ build() { --enable-aload \ --disable-dependency-tracking \ --without-versioned + rm -rf "$builddir"/include/sound + mkdir "$builddir"/include/sound + printf "all:\ncheck:\ninstall:\n" > "$builddir"/include/sound/Makefile + make } @@ -42,6 +43,7 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49 alsa-lib-1.1.9.tar.bz2 +sha512sums="d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033 alsa-lib-1.2.2.tar.bz2 3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352 ucm_add_limits_h.patch -388443e7d9c90339b273a40205c5cbb14033ec16d357b52b0eaeb97e2f074fab100439f8cb2972011ac1580712448a4861ab2dec26653b55badf1caaaf207a59 remove-test.patch" +0ce3c2b8a0a70e2dffb6d633b95c4aae74504cd694fe1507cbc409d931b5f733935b22de45e4adcf5a507587c9f80c60a6f0e798aac2ca2fbf0cbcdef0080079 remove-test.patch +bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch" diff --git a/user/alsa-lib/remove-test.patch b/user/alsa-lib/remove-test.patch index ba0d78498..92059b0f2 100644 --- a/user/alsa-lib/remove-test.patch +++ b/user/alsa-lib/remove-test.patch @@ -19,7 +19,7 @@ client_event_filter_LDADD=../src/libasound.la --- alsa-lib-1.1.4.1/test/Makefile.in.old 2017-06-01 01:28:25.000000000 -0500 +++ alsa-lib-1.1.4.1/test/Makefile.in 2017-09-27 00:58:29.668332253 -0500 -@@ -52,7 +52,7 @@ +@@ -90,7 +90,7 @@ check_PROGRAMS = control$(EXEEXT) pcm$(EXEEXT) pcm_min$(EXEEXT) \ latency$(EXEEXT) seq$(EXEEXT) playmidi1$(EXEEXT) \ timer$(EXEEXT) rawmidi$(EXEEXT) midiloop$(EXEEXT) \ @@ -28,7 +28,7 @@ client_event_filter$(EXEEXT) chmap$(EXEEXT) \ audio_time$(EXEEXT) user-ctl-element-set$(EXEEXT) \ pcm-multi-thread$(EXEEXT) -@@ -96,9 +96,6 @@ +@@ -136,9 +136,6 @@ namehint_SOURCES = namehint.c namehint_OBJECTS = namehint.$(OBJEXT) namehint_DEPENDENCIES = ../src/libasound.la @@ -38,7 +38,7 @@ pcm_SOURCES = pcm.c pcm_OBJECTS = pcm.$(OBJEXT) pcm_DEPENDENCIES = ../src/libasound.la -@@ -173,11 +170,11 @@ +@@ -223,11 +219,11 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = audio_time.c chmap.c client_event_filter.c control.c \ @@ -52,7 +52,7 @@ pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \ rawmidi.c seq.c timer.c user-ctl-element-set.c RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -@@ -366,7 +363,6 @@ +@@ -439,7 +436,6 @@ timer_LDADD = ../src/libasound.la rawmidi_LDADD = ../src/libasound.la midiloop_LDADD = ../src/libasound.la @@ -60,7 +60,7 @@ queue_timer_LDADD = ../src/libasound.la namehint_LDADD = ../src/libasound.la client_event_filter_LDADD = ../src/libasound.la -@@ -444,9 +440,6 @@ +@@ -524,9 +520,6 @@ @rm -f namehint$(EXEEXT) $(AM_V_CCLD)$(LINK) $(namehint_OBJECTS) $(namehint_LDADD) $(LIBS) @@ -70,7 +70,7 @@ pcm$(EXEEXT): $(pcm_OBJECTS) $(pcm_DEPENDENCIES) $(EXTRA_pcm_DEPENDENCIES) @rm -f pcm$(EXEEXT) -@@ -488,7 +481,6 @@ +@@ -577,7 +570,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@ # am--include-marker diff --git a/user/alsa-lib/type_compat.patch b/user/alsa-lib/type_compat.patch new file mode 100644 index 000000000..4236d11d4 --- /dev/null +++ b/user/alsa-lib/type_compat.patch @@ -0,0 +1,23 @@ +Since we force the use of the uapi headers from linux-headers instead of +using the vendored copy, type_compat.h never gets put in the place it +should be for it to be seen in sound/. + +However, the only reason it was included here anyway was to replace a +definition that was never used: + +https://github.com/alsa-project/alsa-lib/commit/ae564665ec261cf104de499b1cdda3564070fc65#diff-5e0b4d8ecf374a31036ffc7b224d5e7fL21 + + -#define __packed __attribute__((__packed__)) + - + +#include <sound/type_compat.h> + +--- alsa-lib-1.2.2/src/topology/tplg_local.h 2020-02-19 03:35:39.000000000 -0600 ++++ alsa-lib-1.2.2/src/topology/tplg_local.h 2020-03-17 01:26:25.159548858 -0500 +@@ -18,7 +18,6 @@ + #include "list.h" + #include "topology.h" + +-#include <sound/type_compat.h> + #include <sound/asound.h> + #include <sound/asoc.h> + #include <sound/tlv.h> diff --git a/user/alsa-plugins/APKBUILD b/user/alsa-plugins/APKBUILD index 1dee01738..ebf39a4cb 100644 --- a/user/alsa-plugins/APKBUILD +++ b/user/alsa-plugins/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-plugins -pkgver=1.1.9 +pkgver=1.2.2 pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) plugins" url="https://www.alsa-project.org/main/index.php/Main_Page" arch="all" options="!check" # No test suite. license="GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause AND MIT" +depends="" makedepends="linux-headers alsa-lib-dev speexdsp-dev ffmpeg-dev libsamplerate-dev pulseaudio-dev" subpackages="$pkgname-lavcrate $pkgname-pulse $pkgname-a52" @@ -59,4 +60,4 @@ a52() { "$subpkgdir"/usr/share/alsa/alsa.conf.d/ } -sha512sums="1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9 alsa-plugins-1.1.9.tar.bz2" +sha512sums="25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb alsa-plugins-1.2.2.tar.bz2" diff --git a/user/alsa-utils/APKBUILD b/user/alsa-utils/APKBUILD index 057e77cc1..569e8d6a4 100644 --- a/user/alsa-utils/APKBUILD +++ b/user/alsa-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-utils -pkgver=1.1.9 -pkgrel=1 +pkgver=1.2.2 +pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities" url="https://www.alsa-project.org/wiki/Main_Page" arch="all" @@ -36,7 +36,7 @@ package() { install -Dm644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa } -sha512sums="92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970 alsa-utils-1.1.9.tar.bz2 +sha512sums="30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 alsa-utils-1.2.2.tar.bz2 817215be6e9f103a8a187df5b1142c4d2e952f547a64579a9b8cfa58bd762d6a55bde75c0f66f018c0597744d07ccdb08216f7b368db464e36667cecedcc00f3 alsaconf.patch 7bf743024d7c5caed2fbf8af5cee73bcc569a7bab0bd6459541d3704cc6a7456d588b600b690e7406e122deaf0316dd1f67219a267bec4dff3f6c0f120edaae4 alsa.initd 6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index d63b3acbd..f4e12d964 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev eigen-dev qt5-qtsvg-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/analitza-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,19 +25,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 - ${CMAKE_CROSSOPTS} + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(export|curve|plots|surface)' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cab6796e0b2e6223ad59b9754add045277834c6b4ae2ed4a498d116d9daec158543a8d1276db65a5f34c41064094ee4534f7fd87d3dc991825731f87a151eb87 analitza-19.08.2.tar.xz" +sha512sums="3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9 analitza-19.12.3.tar.xz" diff --git a/user/anonymous-pro/APKBUILD b/user/anonymous-pro/APKBUILD index 33466e792..2ea302452 100644 --- a/user/anonymous-pro/APKBUILD +++ b/user/anonymous-pro/APKBUILD @@ -17,9 +17,8 @@ source="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-$_prev.zi builddir="$srcdir/AnonymousPro-1.002.001" package() { - cd "$srcdir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousPro-1.002.001/*.ttf - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousProMinus-$pkgver/*.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousPro-1.002.001/*.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousProMinus-$pkgver/*.ttf } sha512sums="7606d520ad79fbf4e13d676c1aff61b764dce74e170f8783b8e606f7907c4b8db0871e5568504d15aa23ca26e925ada4eb6b60fcf27171dccee0d3d32d9a92a1 AnonymousPro-1.002.zip diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD index 8afaf5929..ea5d40f04 100644 --- a/user/ant/APKBUILD +++ b/user/ant/APKBUILD @@ -9,12 +9,14 @@ pkgdesc="Java-based build tool" url="http://ant.apache.org/" arch="noarch" license="Apache-2.0" -makedepends="" depends="openjdk8" +makedepends="" +subpackages="" source="https://www-eu.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz ant.sh imageio_fix_java_test.patch - imageio_fix_test.patch" + imageio_fix_test.patch + " builddir="$srcdir/apache-$pkgname-$pkgver" _anthome="/usr/lib/java/$pkgname" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 1588b844b..6488ffa9f 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.41 @@ -21,7 +21,7 @@ subpackages="$pkgname-dev $pkgname-ldap $pkgname-openrc" provides="apache2 apache2-ssl" -source="$pkgname-$pkgver.tar.gz::https://github.com/apache/httpd/archive/$pkgver.tar.gz +source="https://www-us.apache.org/dist//httpd/httpd-$pkgver.tar.gz adelie.layout apache-httpd.confd apache-httpd.initd @@ -143,7 +143,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="447310a625c0aaff10777c70d178853536c010a376b7e27a137461e5b83e438bc0548b90f47c21f1d047f685d082db84920bc6b1365f6e1f16698ba059df927a apache-httpd-2.4.41.tar.gz +sha512sums="02807a576ea29bd93e648c68e3ad853d5e4971177a0881d6a4873e9c4c5afd6d56877454b666429e70732488a258e0333a0f354d9dbbfd89fc3b38f12f0a0dce httpd-2.4.41.tar.gz c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd diff --git a/user/appres/APKBUILD b/user/appres/APKBUILD index 49dcb6115..c0d655348 100644 --- a/user/appres/APKBUILD +++ b/user/appres/APKBUILD @@ -4,17 +4,15 @@ pkgname=appres pkgver=1.0.5 pkgrel=0 pkgdesc="list X application resource database" -url="https://xorg.freedesktop.org/" +url="https://www.X.org/" arch="all" license="X11" depends="" makedepends="libx11-dev libxt-dev xproto" -install="" subpackages="$pkgname-doc" -source="https://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/apr-util/APKBUILD b/user/apr-util/APKBUILD index 36a8f4a59..6dd56ef3e 100644 --- a/user/apr-util/APKBUILD +++ b/user/apr-util/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=apr-util pkgver=1.6.1 pkgrel=0 @@ -6,16 +6,15 @@ pkgdesc="The Apache Portable Runtime Utility Library" url="http://apr.apache.org/" arch="all" license="Apache-2.0" -depends= -subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql - $pkgname-dbd_sqlite3 $pkgname-ldap" +depends="" depends_dev="db-dev expat-dev openldap-dev openssl-dev postgresql-dev sqlite-dev" makedepends="$depends_dev apr-dev bash chrpath openssl" +subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql + $pkgname-dbd_sqlite3 $pkgname-ldap" source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" # testxlate fails because UTF-7 is unsupported make check || return 0 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/*.exp chrpath -d "$pkgdir"/usr/lib/*.so.* @@ -48,7 +45,7 @@ package() { _mv_mod() { pkgdesc="The Apache Portable Runtime Utility Library - $2 driver" depends= - local _moddir="usr/lib/apr-util-1" + _moddir="usr/lib/apr-util-1" mkdir -p "$subpkgdir"/$_moddir mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/ } diff --git a/user/apr/APKBUILD b/user/apr/APKBUILD index 5b973eeec..b527b73e4 100644 --- a/user/apr/APKBUILD +++ b/user/apr/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=apr pkgver=1.7.0 pkgrel=0 @@ -15,7 +15,6 @@ source="http://www.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2 " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index dc31e30d4..f6240a428 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -12,12 +12,11 @@ depends="lzop shared-mime-info unzip zip" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kitemmodels-dev kio-dev kservice-dev kparts-dev kpty-dev libarchive-dev - kwidgetsaddons-dev xz-dev" + kwidgetsaddons-dev libzip-dev xz-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ark-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ark-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c4ae42a68a9f00238de4dcfef066c3e20f9a896fe00473b4db4ca4aadc8db1f63c876a98833799c533962283fe3f64be36e563e5624e0dae1978452438392788 ark-19.08.2.tar.xz" +sha512sums="0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a ark-19.12.3.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index f114f16bb..a66845948 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -12,9 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev karchive-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev kirigami2-dev knewstuff-dev kxmlgui-dev qt5-qtmultimedia-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz - inappropriate-qt.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/artikulate-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -28,7 +26,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="72e4d0bfaa88b4133964f07fe2e20d9f2cc0bee718388fe56f1f1518f75acf31b4068fa87e652c370e18e6b53addce3414430ee43c9118782925c55bb2536dc6 artikulate-19.08.2.tar.xz -dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8 inappropriate-qt.patch" +sha512sums="aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32 artikulate-19.12.3.tar.xz" diff --git a/user/artikulate/inappropriate-qt.patch b/user/artikulate/inappropriate-qt.patch deleted file mode 100644 index fe88499bd..000000000 --- a/user/artikulate/inappropriate-qt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- artikulate-19.08.0/CMakeLists.txt.old 2019-08-09 00:13:40.000000000 +0000 -+++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:16:43.965261084 +0000 -@@ -42,7 +42,7 @@ - include(FeatureSummary) - include(GenerateExportHeader) - --find_package(Qt5 5.10 REQUIRED COMPONENTS -+find_package(Qt5 5.9.7 REQUIRED COMPONENTS - Widgets - Sql - XmlPatterns ---- artikulate-19.08.0/CMakeLists.txt.old 2019-08-15 12:17:13.502105634 +0000 -+++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:17:51.957997353 +0000 -@@ -51,7 +51,7 @@ - QuickWidgets - Test - ) --find_package(KF5 5.57 REQUIRED COMPONENTS -+find_package(KF5 5.54 REQUIRED COMPONENTS - Archive - Config - Crash diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD index b06ffd33f..4aa8979d1 100644 --- a/user/aspell-dict-af/APKBUILD +++ b/user/aspell-dict-af/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-af pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Afrikaans dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="LGPL-2.1-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2" builddir="$srcdir/aspell-af-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD index a4be5ad68..79e44d947 100644 --- a/user/aspell-dict-am/APKBUILD +++ b/user/aspell-dict-am/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-am pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Amharic dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="Public-Domain" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-am-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD index 34ffabad4..6880ae201 100644 --- a/user/aspell-dict-ar/APKBUILD +++ b/user/aspell-dict-ar/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ar pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Arabic dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-ar-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD index c8fdd5708..9e7c0320c 100644 --- a/user/aspell-dict-ast/APKBUILD +++ b/user/aspell-dict-ast/APKBUILD @@ -1,26 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ast pkgver=0.01 pkgrel=0 pkgdesc="Asturian dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="LGPL-2.1-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2" builddir="$srcdir/aspell6-ast-$pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD index 62cc4508d..9854bcc48 100644 --- a/user/aspell-dict-az/APKBUILD +++ b/user/aspell-dict-az/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-az pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Azerbaijani dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-az-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD index a25306568..8c0c67349 100644 --- a/user/aspell-dict-be/APKBUILD +++ b/user/aspell-dict-be/APKBUILD @@ -1,26 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-be pkgver=0.01 pkgrel=0 pkgdesc="Belarusian dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="LGPL-2.1-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2" builddir="$srcdir/aspell5-be-$pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD index 3af15fa3a..809c98aab 100644 --- a/user/aspell-dict-bg/APKBUILD +++ b/user/aspell-dict-bg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-bg pkgver=4.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Bulgarian dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-bg-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD index a2a9c9eac..92b006733 100644 --- a/user/aspell-dict-bn/APKBUILD +++ b/user/aspell-dict-bn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-bn pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Bengali dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-bn-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD index 60204987a..0cc1b2057 100644 --- a/user/aspell-dict-br/APKBUILD +++ b/user/aspell-dict-br/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-br pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Breton dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2" builddir="$srcdir/aspell-br-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD index 9facc23cf..74a2c7a6d 100644 --- a/user/aspell-dict-ca/APKBUILD +++ b/user/aspell-dict-ca/APKBUILD @@ -1,28 +1,25 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ca -pkgver=2.1.5.1 -_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgver=2.5.0 pkgrel=0 pkgdesc="Catalan dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$_pkgver.tar.bz2" -builddir="$srcdir/aspell6-ca-$_pkgver" +source="https://www.softcatala.org/pub/softcatala/aspell/$pkgver/aspell6-ca-$pkgver.tar.bz2" +builddir="$srcdir/aspell6-ca-$pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a aspell6-ca-2.1.5-1.tar.bz2" +sha512sums="70eee12b026d6d0b5f710593f4d1759190596e7b7db651b804cc4d724d2c567911ef8d370873ac7ab4506f6555b8dde046f3277c3cd072e0d7b76047cdd5b1b2 aspell6-ca-2.5.0.tar.bz2" diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD index 768829bb9..31a59210c 100644 --- a/user/aspell-dict-cs/APKBUILD +++ b/user/aspell-dict-cs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-cs pkgver=20040614.1 _pkgver=${pkgver%.*}-${pkgver#*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Czech dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-cs-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD index c2ceff90b..8e4be27dc 100644 --- a/user/aspell-dict-csb/APKBUILD +++ b/user/aspell-dict-csb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-csb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,21 +7,19 @@ pkgrel=0 pkgdesc="Kashubian dictionaries for aspell" url="http://aspell.net" arch="noarch" +options="!check" # No test suite. license="GPL-2.0-only" -options="!check" # no tests depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-csb-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD index 4cdd1a287..e1f64d6c7 100644 --- a/user/aspell-dict-cy/APKBUILD +++ b/user/aspell-dict-cy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-cy pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Welsh dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2" builddir="$srcdir/aspell-cy-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b aspell-cy-0.50-3.tar.bz2" diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD index 230fabcdd..db515b3b9 100644 --- a/user/aspell-dict-da/APKBUILD +++ b/user/aspell-dict-da/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-da pkgver=1.4.42.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Danish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-da-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="d431464b254670b56179ed19a03efe91e65e4dad3e3132f264830cde35f3da200179b39bd1ac21565287bbc1143fd74079c9082f2639fbc4573f2dfffbbecbc6 aspell5-da-1.4.42-1.tar.bz2" diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD index 0d8effa19..8140d5f0a 100644 --- a/user/aspell-dict-de-alt/APKBUILD +++ b/user/aspell-dict-de-alt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-de-alt pkgver=2.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="German (Old Spelling) dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-de-alt-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4 aspell6-de-alt-2.1-1.tar.bz2" diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD index 080984aa3..7c0f5f834 100644 --- a/user/aspell-dict-de/APKBUILD +++ b/user/aspell-dict-de/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-de pkgver=20161207 pkgrel=0 pkgdesc="German dictionaries for aspell" url="http://j3e.de/ispell/igerman98/index.html" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -15,17 +15,17 @@ builddir="$srcdir/igerman98-$pkgver" _langs="de_DE de_AT de_CH" build() { - cd "$builddir" - for i in $_langs; do - make aspell/${i}.rws - done + for i in $_langs; do + make aspell/${i}.rws + done } package() { - cd "$builddir"/aspell - mkdir -p "$pkgdir"/usr/share/aspell - for i in $_langs; do - install -m644 ${i}.alias ${i}.dat ${i}_affix.dat ${i}.multi ${i}.rws "$pkgdir"/usr/share/aspell - done + mkdir -p "$pkgdir"/usr/share/aspell + cd aspell + for i in $_langs; do + install -m644 ${i}.alias ${i}.dat ${i}_affix.dat ${i}.multi ${i}.rws "$pkgdir"/usr/share/aspell + done } + sha512sums="62be84ac76fd2a0acc25439aa4c04339e54a1c7a2f619d76e0e01cfb53eeeca263c5cc335e315f9adeee9bab5cc392d4c473ca55cbed371c04c123d6fa2272aa igerman98-20161207.tar.bz2" diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD index 37149af35..e0a194d90 100644 --- a/user/aspell-dict-el/APKBUILD +++ b/user/aspell-dict-el/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-el pkgver=0.08.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Greek dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-el-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="ea4ca962afc552e5525bbb84c7a8f980a2cc07265de748c68fb322c1dbfc52b0ba07b4a561966bb89e850ec60b11a3f21befa6ca8b66501e9ad8b5314ddd1f47 aspell6-el-0.08-0.tar.bz2" diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD index c3a848440..bd3e44e93 100644 --- a/user/aspell-dict-en/APKBUILD +++ b/user/aspell-dict-en/APKBUILD @@ -1,28 +1,26 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-en -pkgver=2018.04.16.0 +pkgver=2019.10.06.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} pkgrel=0 pkgdesc="English dictionaries for aspell" url="http://aspell.net/" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause AND Public-Domain" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-en-$_pkgver" build() { - cd "$builddir" ./configure --vars DESTDIR="$pkgdir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2 aspell6-en-2018.04.16-0.tar.bz2" +sha512sums="e16c76bd2da4515af6f1e3dbbc1c5f26fc3be550e022cbb5b741b867be2acc1359a8902af1b359f6c8cff38de01b9aa43a02153a5a6bc618296e75bf86020a6e aspell6-en-2019.10.06-0.tar.bz2" diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD index a03d2b2c8..cefd65d6d 100644 --- a/user/aspell-dict-eo/APKBUILD +++ b/user/aspell-dict-eo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-eo pkgver=2.1.20000225.a2 _pkgver=${pkgver%.*}${pkgver#*.*.*.} @@ -8,20 +8,20 @@ pkgrel=0 pkgdesc="Esperanto dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-eo-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda aspell6-eo-2.1.20000225a-2.tar.bz2" diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD index 9216f3bec..80a8b2848 100644 --- a/user/aspell-dict-es/APKBUILD +++ b/user/aspell-dict-es/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-es pkgver=1.11.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Spanish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-es-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8 aspell6-es-1.11-2.tar.bz2" diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD index d352e745e..4e84a1f9c 100644 --- a/user/aspell-dict-et/APKBUILD +++ b/user/aspell-dict-et/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-et pkgver=0.1.21.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Estonian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-et-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae aspell6-et-0.1.21-1.tar.bz2" diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD index d08a32657..93def9869 100644 --- a/user/aspell-dict-fa/APKBUILD +++ b/user/aspell-dict-fa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-fa pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Persian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-fa-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="1ed97d3bf8397fe9b3c9215ca3ca6630a06ae5fa1c47b2bbdf9821fbe069b9c097d1e145a6303202cec85047f9cd50bef2bde3adbca0caeb05625932c5f3bfe4 aspell6-fa-0.11-0.tar.bz2" diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD index 6a4666ded..78a4fa207 100644 --- a/user/aspell-dict-fi/APKBUILD +++ b/user/aspell-dict-fi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-fi pkgver=0.7.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Finnish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-fi-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7 aspell6-fi-0.7-0.tar.bz2" diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD index eef2193a8..d9631bffd 100644 --- a/user/aspell-dict-fo/APKBUILD +++ b/user/aspell-dict-fo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-fo pkgver=0.2.16.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Faroese dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-fo-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="7e99f105cff0e682e2761ba1f91646a3ce657858be819cc598775303d6c08f2c5bd524f72bc0c0b52383aeaf591af56e910e19796732be627d8ab11ad6149126 aspell5-fo-0.2.16-1.tar.bz2" diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD index 0685c068f..bb0a14d2b 100644 --- a/user/aspell-dict-fr/APKBUILD +++ b/user/aspell-dict-fr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-fr pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="French dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2" builddir="$srcdir/aspell-fr-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b aspell-fr-0.50-3.tar.bz2" diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD index 6eee693fe..7331a46f9 100644 --- a/user/aspell-dict-fy/APKBUILD +++ b/user/aspell-dict-fy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-fy pkgver=0.12.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Frisian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-fy-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="f63b5436c78a5c0ebec3be1d3c24dced09a264c68e8ad39716e0e9e6bd984aca627bdc875f88b521f87b7f4d147edfce3fc0f4dc4b22fc8ef8d1aa5090fb9bda aspell6-fy-0.12-0.tar.bz2" diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD index 7ade44261..3ccdb1272 100644 --- a/user/aspell-dict-ga/APKBUILD +++ b/user/aspell-dict-ga/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ga pkgver=5.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -8,7 +8,7 @@ pkgrel=0 pkgdesc="Irish dictionaries for aspell" url="https://cadhan.com/gaelspell/" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -16,12 +16,12 @@ source="https://github.com/kscanne/gaelspell/releases/download/v$_pkgver2/aspell builddir="$srcdir/aspell5-ga-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="15c4e3d85c1ad589300f7288af054d0574e849163816e5e5aec56d464a71fcd02eba129ed74ed7ec341bb19ad2578091c6701b36ac23cc5a7972026742e9bb57 aspell5-ga-5.0-0.tar.bz2" diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD index fa14b77b8..aff399a6b 100644 --- a/user/aspell-dict-gd/APKBUILD +++ b/user/aspell-dict-gd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-gd pkgver=0.1.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Scottish Gaelic dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-gd-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="d388bf3476f440c7773a69a0758b8e9cdddf01b64579f6d92fde38e7363c5c3b321a76c7a4e4587b0810159a35eec8d33d1cd2de49068d73f9e0e4dfa60fbc5c aspell5-gd-0.1.1-1.tar.bz2" diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD index e586b4682..4001fd9cb 100644 --- a/user/aspell-dict-gl/APKBUILD +++ b/user/aspell-dict-gl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-gl pkgver=0.5.a2 _pkgver=${pkgver%.*}${pkgver#*.*.} @@ -8,20 +8,20 @@ pkgrel=0 pkgdesc="Galician dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-gl-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714 aspell6-gl-0.5a-2.tar.bz2" diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD index 39bd4b1b8..c5016e224 100644 --- a/user/aspell-dict-grc/APKBUILD +++ b/user/aspell-dict-grc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-grc pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Ancient Greek dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-grc-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="17999e20621efc67ab42d83b0e149d19b18bcfd20966da35d217a3e5682c0728287bec4bce28af34f4e343943a1dac49f85077693ca30bd1ff7cbaaeda453ddd aspell6-grc-0.02-0.tar.bz2" diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD index 04fac1de1..feeadf574 100644 --- a/user/aspell-dict-gu/APKBUILD +++ b/user/aspell-dict-gu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-gu pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Gujarati dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-gu-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="0cc252bd1112b8f06cb4ea9000b00d036dc405d8fbb9c380beff949ea138903b5807afa8f1419f4d8f57329a7bb1a4b7f4bd733170e5f09ac7786ac39beb87c6 aspell6-gu-0.03-0.tar.bz2" diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD index a2aa1779e..513a9491d 100644 --- a/user/aspell-dict-gv/APKBUILD +++ b/user/aspell-dict-gv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-gv pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Manx Gaelic dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2" builddir="$srcdir/aspell-gv-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="6ec0893bb853c9600b49958802572edfed2127b749b2e4ee5ce051863526fefbae367cf2686ccae2f3c27fa168a8c3a8611eae3561853553594fb097fd78e37d aspell-gv-0.50-0.tar.bz2" diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD index 99166d52a..cac888171 100644 --- a/user/aspell-dict-he/APKBUILD +++ b/user/aspell-dict-he/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-he pkgver=1.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Hebrew dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-he-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88 aspell6-he-1.0-0.tar.bz2" diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD index 26223d8df..789b77dc2 100644 --- a/user/aspell-dict-hi/APKBUILD +++ b/user/aspell-dict-hi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hi pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Hindi dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-hi-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="298743e1e5988e26081d89ee6cdea3b2f3185ad81b3449b5fa3f644a2beaf488320f9468fbeeb7e6c7bcb3ae4b7116bd02f64c4e6f4c60f80c1a7c3b84946a93 aspell6-hi-0.02-0.tar.bz2" diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD index bc4d3af07..f634034b9 100644 --- a/user/aspell-dict-hil/APKBUILD +++ b/user/aspell-dict-hil/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hil pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Hiligaynon dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-hil-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="274c353f48da1a769a454cff0fa54d0e5cfd84a2da7ed979693335aa8e45c5c562b0f92cc5bdeb77a5ff54d0f79f747e792ff4e3f8a0427bbd131879659af432 aspell5-hil-0.11-0.tar.bz2" diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD index 917f599cb..c4bc01e03 100644 --- a/user/aspell-dict-hr/APKBUILD +++ b/user/aspell-dict-hr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hr pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Croatian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2" builddir="$srcdir/aspell-hr-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad aspell-hr-0.51-0.tar.bz2" diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD index 95fc32a90..8c8c85b1b 100644 --- a/user/aspell-dict-hsb/APKBUILD +++ b/user/aspell-dict-hsb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hsb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Upper Sorbian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-hsb-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b8e49bf6d85e149365378a33b56ab61767c34ddfd4545eedeedad012b2b396dff54bb3dcba56fb4d3c0a92a0c3e13fddf0548591568295709d91f18c45ca1274 aspell6-hsb-0.02-0.tar.bz2" diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD index 690fa6841..a118ce6a9 100644 --- a/user/aspell-dict-hu/APKBUILD +++ b/user/aspell-dict-hu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hu pkgver=0.99.4.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Hungarian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-hu-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320 aspell6-hu-0.99.4.2-0.tar.bz2" diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD index 892165847..33e998e30 100644 --- a/user/aspell-dict-hus/APKBUILD +++ b/user/aspell-dict-hus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hus pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Huastec Tenek dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-hus-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="2d1f8458f04bda64068ddd3c5017ed129c2b7549e2474acdcc39f76283dae1a0fe557ab67526fa31ce300f615bd5d2ded4aa0414f3a5b6ee8e59389c8ac20c70 aspell6-hus-0.03-1.tar.bz2" diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD index 6cd26a147..a88dbb382 100644 --- a/user/aspell-dict-hy/APKBUILD +++ b/user/aspell-dict-hy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-hy pkgver=0.10.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Armenian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-hy-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3 aspell6-hy-0.10.0-0.tar.bz2" diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD index 722c08f15..fb8d26f62 100644 --- a/user/aspell-dict-ia/APKBUILD +++ b/user/aspell-dict-ia/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ia pkgver=0.50.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Interlingua dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2" builddir="$srcdir/aspell-ia-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="5cdd7b91393043d7b537166c1df100aa76e911cf1c389b34b916839e907abc3cdbdc368f2876a5ecfbd625414b67858950e9d79af184560b9ddd667030dc608d aspell-ia-0.50-1.tar.bz2" diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD index cda3e6217..75b2839b9 100644 --- a/user/aspell-dict-id/APKBUILD +++ b/user/aspell-dict-id/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-id pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Indonesian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-id-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="bc33c5d6c68027304b0dc299454f8dd221e0138b079bcc423e287fda5e9204b0d6dc14a5a0617b4d018259e011c979453ee13b9050be5516d2379e86ac9cb86a aspell5-id-1.2-0.tar.bz2" diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD index 1bdaab2f5..83d58f2bc 100644 --- a/user/aspell-dict-is/APKBUILD +++ b/user/aspell-dict-is/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-is pkgver=0.51.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Icelandic dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2" builddir="$srcdir/aspell-is-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2 aspell-is-0.51.1-0.tar.bz2" diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD index 639d81c27..23b5cc043 100644 --- a/user/aspell-dict-it/APKBUILD +++ b/user/aspell-dict-it/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-it pkgver=2.4.20070901.0 _pkgver=${pkgver%.*.*}-${pkgver#*.*.} @@ -8,7 +8,7 @@ pkgrel=0 pkgdesc="Italian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -16,12 +16,12 @@ source="https://downloads.sourceforge.net/linguistico/aspell6-it-$_pkgver.tar.bz builddir="$srcdir/aspell6-it-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9 aspell6-it-2.4-20070901-0.tar.bz2" diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD index 560e222c3..6eefab144 100644 --- a/user/aspell-dict-kn/APKBUILD +++ b/user/aspell-dict-kn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-kn pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Kannada dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-kn-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="892f93c0ed33f4aedb240d8c673d7888318760ccb2ca0cfb8377a2770f757c5410583a7c18314f3fb7cd58704a531e8931bc8be44d9de80b1421d2238e4229c3 aspell6-kn-0.01-1.tar.bz2" diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD index 5770b2ebb..042c91bca 100644 --- a/user/aspell-dict-ku/APKBUILD +++ b/user/aspell-dict-ku/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ku pkgver=0.20.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Kurdi dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-ku-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b1aadc13e4cc494bb7b8bdb1ef96215abb72dfe2ec398d4c383984a2540323117d18a940c675ed0266cbbdf14958525975083a9fe35e93b7885c8f0216362d84 aspell5-ku-0.20-1.tar.bz2" diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD index 86cb8c757..0ec8c8552 100644 --- a/user/aspell-dict-ky/APKBUILD +++ b/user/aspell-dict-ky/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ky pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Kirghiz dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-ky-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="94389905505ffc0c469dd5f4ea31e2e76fed695e8cb7b903e248a57a8677e45311e525a07c43da0be87bfdc7825b1af4ae8dd1993d35948dd1ace4b1af9fa307 aspell6-ky-0.01-0.tar.bz2" diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD index b2d3473b0..257624e08 100644 --- a/user/aspell-dict-la/APKBUILD +++ b/user/aspell-dict-la/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-la pkgver=20020503.0 _pkgver=${pkgver%.*}-${pkgver#*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Latin dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2" builddir="$srcdir/aspell6-la-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f aspell6-la-20020503-0.tar.bz2" diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD index 8d31a0a30..1f0f0c657 100644 --- a/user/aspell-dict-lt/APKBUILD +++ b/user/aspell-dict-lt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-lt pkgver=1.3 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Lithuanian dictionaries for aspell" url="https://launchpad.net/ispell-lt" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -15,12 +15,12 @@ source="https://launchpad.net/ispell-lt/main/$pkgver/+download/aspell6-lt-$pkgve builddir="$srcdir/aspell6-lt-$pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="dd19994f703b78b1296644699df18ddcdfdcb2441003ed9edee03ee18601ff2e15e9b4ed8fbf844d72b31f0c0313a6755c89b67c44eea35485c30f2abc3b206f aspell6-lt-1.3.tar.bz2" diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD index bd102c589..1640813f6 100644 --- a/user/aspell-dict-lv/APKBUILD +++ b/user/aspell-dict-lv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-lv pkgver=0.5.5.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Latvian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-lv-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="94a9c6da3fd29f17fbe5d02cd4764bf24379abef526725bb34c0726f7ff385fcb876df24b741bc66518295c3bb75c800aa6010130454c6dc1d6372d12d2eb98e aspell6-lv-0.5.5-1.tar.bz2" diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD index 0a1963250..a93c2b691 100644 --- a/user/aspell-dict-mg/APKBUILD +++ b/user/aspell-dict-mg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mg pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Malagasy dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-mg-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a9c0861b925b40bf9bba5e1d02f3e225a516f929a2e72c6760ec5bedbc513e18e8bda0205e83e17c09b6a37256877e54576c8085e6000f67783147d4cd9ec6df aspell5-mg-0.03-0.tar.bz2" diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD index dbcd853e0..aa6db01e1 100644 --- a/user/aspell-dict-mi/APKBUILD +++ b/user/aspell-dict-mi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mi pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Maori dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2" builddir="$srcdir/aspell-mi-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="cba0a646612f6cd24d1e1d91326dcf1c7a6ec01c04ad0661a95fcd745b4d1a3bb50aef84c382d3a6c9108d4e9589ee7661f4988930c7198950396eeb029062a0 aspell-mi-0.50-0.tar.bz2" diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD index f620067e3..324ab0c10 100644 --- a/user/aspell-dict-mk/APKBUILD +++ b/user/aspell-dict-mk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mk pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Macedonian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2" builddir="$srcdir/aspell-mk-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="6bcd57338ce76b7daf22a4be28a2f583c6c1d73ff2d8d5db2e3d5122d89c41617d44a40019dfe647c8e1e07509bee20be6ba136e872710bd77871adbac29e947 aspell-mk-0.50-0.tar.bz2" diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD index 8cd3ee5fc..03562f30c 100644 --- a/user/aspell-dict-ml/APKBUILD +++ b/user/aspell-dict-ml/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ml pkgver=0.04.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Malayalam dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -15,12 +15,12 @@ source="http://gnu.mirrors.pair.com/savannah/savannah/smc/Spellchecker/aspell6-m builddir="$srcdir/aspell6-ml-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a9b6e522f9a4b4d9034f9cd2e1546e0cdfc9bad9f9c7515c8144efb186fb164ab55d422e93da89f0cf7c2b7e6f7b5d439747cc8b7e211c5b09a3638573765563 aspell6-ml-0.04-1.tar.bz2" diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD index cbaad148f..f71c509d1 100644 --- a/user/aspell-dict-mn/APKBUILD +++ b/user/aspell-dict-mn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mn pkgver=0.06.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Mongolian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-mn-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="c0cf603169eaf8b4b858fd7573374d1ec47b9794e2514cb241b8fc3b053bce715dad6a15bd73eeef443f0d6a4308ffb384acae825d33315ee983a69ceacf9201 aspell6-mn-0.06-2.tar.bz2" diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD index 029d4001a..583a1fb49 100644 --- a/user/aspell-dict-mr/APKBUILD +++ b/user/aspell-dict-mr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mr pkgver=0.10.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Marathi dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-mr-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="4137a9d6f3dc67db81479a2df628c33c3989214a629f48fc9bb6421e4ce723bdf559eb2f0981c2172315ec140ccd160a10b9556a6618f2fd3383dec184352732 aspell6-mr-0.10-0.tar.bz2" diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD index a8187eb00..25a29a229 100644 --- a/user/aspell-dict-ms/APKBUILD +++ b/user/aspell-dict-ms/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ms pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Malay dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2" builddir="$srcdir/aspell-ms-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="270a6ad18d9b317588e781eab84b59c83450383d703fab815856b3afa58a19ffa0eec3c7cbc418993302703d586cb92678878aea51fff753733f7583d8c2b0e9 aspell-ms-0.50-0.tar.bz2" diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD index e7c3cef1c..5d22c27c3 100644 --- a/user/aspell-dict-mt/APKBUILD +++ b/user/aspell-dict-mt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-mt pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Maltese dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2" builddir="$srcdir/aspell-mt-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="aadcc59b0dbbfdf4d715bfe6735bfa2a91e6fae382634a25c0cdf8367710050b2daeac1db18df3a71184720ff9339a852983c8a266f8c97e0ffba1e8be50eaa1 aspell-mt-0.50-0.tar.bz2" diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD index 7dd694e35..6db6e6fb5 100644 --- a/user/aspell-dict-nb/APKBUILD +++ b/user/aspell-dict-nb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-nb pkgver=0.50.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Norwegian (Bokmal) dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2" builddir="$srcdir/aspell-nb-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="e30dcf7e757ab1ceb5de349927f9cfa4d9de4015bd9cc9449739fd2f17f6f033f698e71da0270b4e1ebd76be2195c42422630266ad9cadd2173184706d651c13 aspell-nb-0.50.1-0.tar.bz2" diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD index 688ce1c4e..9e4e26201 100644 --- a/user/aspell-dict-nds/APKBUILD +++ b/user/aspell-dict-nds/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-nds pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Low Saxon dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-nds-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="88ef6f6773e8699a5200ff8ae3ef9935fee21958fa35868bc10d37c22b55ea721ad9c59ab4843fdc6fedbf5a9ed10c7ea144548713742b8094b99c3c46a552a5 aspell6-nds-0.01-0.tar.bz2" diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD index 3d288aa76..87ffadacf 100644 --- a/user/aspell-dict-nl/APKBUILD +++ b/user/aspell-dict-nl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-nl pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Dutch dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2" builddir="$srcdir/aspell-nl-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152 aspell-nl-0.50-2.tar.bz2" diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD index 14be7c042..cf8a0aa21 100644 --- a/user/aspell-dict-nn/APKBUILD +++ b/user/aspell-dict-nn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-nn pkgver=0.50.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Norwegian (Nynorsk) dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2" builddir="$srcdir/aspell-nn-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a4db6fe937a62758f51d713e246f70ea6e0b2726c8ddb23af084925394a2d8168442fccbd74378f4773db121f0d506d848c01573138e974efc79f295f3ebe551 aspell-nn-0.50.1-1.tar.bz2" diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD index 258dcd0a7..f8f15a08d 100644 --- a/user/aspell-dict-ny/APKBUILD +++ b/user/aspell-dict-ny/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ny pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Chichewa dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-ny-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="52f4526d605a2f0577217af1dc8e44da20484fe7f725ceee1f8fdf9ba0fc1457910d55567ea9287465cbf37955af9a11b2caba084cece59aec29755cb147cb05 aspell5-ny-0.01-0.tar.bz2" diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD index 97703ffa8..4717c0f76 100644 --- a/user/aspell-dict-or/APKBUILD +++ b/user/aspell-dict-or/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-or pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Oriya dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-or-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="4f5c13e37054266a782cc9d9aa6a03de77ca383907ce05f23ab5812581b815276f4d79a2f8626226f30a59f8ab9ecf0f0186835f7f30881e4a358f99a75b708a aspell6-or-0.03-1.tar.bz2" diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD index 83d4ae61f..67fc9ca9f 100644 --- a/user/aspell-dict-pa/APKBUILD +++ b/user/aspell-dict-pa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pa pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Punjabi dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-pa-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="6a0d2d7f1b1a935b6ac4b373963e525083d16c26953cce5d7a29d391aaed36f5430d27ea69efe59f081230822830dc4d4143bc155049bb5384580ffd66b5ee61 aspell6-pa-0.01-1.tar.bz2" diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index e7c364f02..a3bade532 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pl pkgver=20190107 pkgrel=0 pkgdesc="Polish dictionaries for aspell" url="https://sjp.pl/slownik/ort/" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -14,12 +14,12 @@ source="https://distfiles.adelielinux.org/source/sjp-aspell6-pl-6.0_$pkgver-0.ta builddir="$srcdir/aspell6-pl-6.0_$pkgver-0" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a898462495e4797173141f2f82ce74fadb80dfc469e7c4b44871f2622137d5958fad30fd0525ac9cf7a07c31b74d805bb789f022ccbcacadd0d4d1f172986665 sjp-aspell6-pl-6.0_20190107-0.tar.bz2" diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD index 5ac5dc4e8..e83fb61b4 100644 --- a/user/aspell-dict-pt_BR/APKBUILD +++ b/user/aspell-dict-pt_BR/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pt_BR pkgver=20090702.0 _pkgver=${pkgver%.*}-${pkgver#*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Brazilian Portuguese dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-pt_BR-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1 aspell6-pt_BR-20090702-0.tar.bz2" diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD index 72c92641b..e21621b72 100644 --- a/user/aspell-dict-pt_PT/APKBUILD +++ b/user/aspell-dict-pt_PT/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pt_PT pkgver=20070510.0 _pkgver=${pkgver%.*}-${pkgver#*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Portuguese dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2" builddir="$srcdir/aspell6-pt_PT-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="eab60bfed51e4b044519e8e91fa2a4abb45d02431372310a45334c80abafd2022982331f3c0d39294d5029674d75536ad153877c23db01971f4b3d54b7b90cd6 aspell6-pt_PT-20070510-0.tar.bz2" diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD index 4641181d7..10010ba13 100644 --- a/user/aspell-dict-qu/APKBUILD +++ b/user/aspell-dict-qu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-qu pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Quechua dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-qu-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="aac1caea88e9bd896ec5a9a2e7fa4a569626fa5e6f6bf1188614db10ca2b34196b589c496027b3bc562ef9435245e215b428a49e91a8d0eb215801ae8c9bb512 aspell6-qu-0.02-0.tar.bz2" diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD index f80bc913f..449bf9276 100644 --- a/user/aspell-dict-ro/APKBUILD +++ b/user/aspell-dict-ro/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ro pkgver=3.3.10 pkgrel=0 pkgdesc="Romanian dictionaries for aspell" url="https://sourceforge.net/projects/rospell/" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -14,12 +14,12 @@ source="https://download.sourceforge.net/rospell/aspell5-ro-$pkgver.tar.bz2" builddir="$srcdir/aspell5-ro-$pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="c535894d11ee168311a2cc0f799005639b21f3284a2a51db25d513d3e0494cf6d2fb7517bc79bc76f2d9ae89bb43c8bcbac7f451195ee22a7cce361aa09914ba aspell5-ro-3.3.10.tar.bz2" diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD index cd2b6d5f5..29dbbf43e 100644 --- a/user/aspell-dict-ru/APKBUILD +++ b/user/aspell-dict-ru/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ru pkgver=0.99f7.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Russian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2" builddir="$srcdir/aspell6-ru-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430 aspell6-ru-0.99f7-1.tar.bz2" diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD index accb77d6c..e9a28d063 100644 --- a/user/aspell-dict-rw/APKBUILD +++ b/user/aspell-dict-rw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-rw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Kinyarwanda dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2" builddir="$srcdir/aspell-rw-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a987fe90b091c5f8d4c28713ad50ca917d2a8fd120df55bd413e3112913cb7e9e8fdc740994aa881bbfdd9ac38fa5ebe728c9e62e25a0e7cc8eac13c2380c56a aspell-rw-0.50-0.tar.bz2" diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD index 8e447c831..8649e338f 100644 --- a/user/aspell-dict-sc/APKBUILD +++ b/user/aspell-dict-sc/APKBUILD @@ -1,25 +1,25 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sc pkgver=1.0 pkgrel=0 pkgdesc="Sardinian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2" builddir="$srcdir/aspell5-sc-$pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="3cad49510894645b9bc97bbae877641e64af0440a2abcb6f96197da95390d4dd59d1374008c0ade9dc17772a32c367b9b03e6be65e7f190268365f25069d2a23 aspell5-sc-1.0.tar.bz2" diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD index ac036cc6e..466ee7cb7 100644 --- a/user/aspell-dict-sk/APKBUILD +++ b/user/aspell-dict-sk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sk pkgver=2.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Slovak dictionaries for aspell" url="http://www.sk-spell.sk.cx/aspell-sk" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="http://www.sk-spell.sk.cx/file_download/103/aspell6-sk-$_pkgver.tar.bz2" +source="https://distfiles.adelielinux.org/source/aspell6-sk-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-sk-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="fcdf5c043168c887f93dfad5b9c6e07d9edd0c6194139e61bee2ba3928798792d8e8b446754bc55a67acc6d333034ebed9655cc3c15ad638f834b5a9efcc63cd aspell6-sk-2.02-0.tar.bz2" diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD index ab8dc8621..2665c4a17 100644 --- a/user/aspell-dict-sl/APKBUILD +++ b/user/aspell-dict-sl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sl pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Slovenian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2" builddir="$srcdir/aspell-sl-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f aspell-sl-0.50-0.tar.bz2" diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD index 601515fcb..3535a244c 100644 --- a/user/aspell-dict-sr/APKBUILD +++ b/user/aspell-dict-sr/APKBUILD @@ -1,25 +1,25 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sr pkgver=0.02 pkgrel=0 pkgdesc="Serbian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2" builddir="$srcdir/aspell6-sr-$pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395 aspell6-sr-0.02.tar.bz2" diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD index cbdf4dfc8..05c6da187 100644 --- a/user/aspell-dict-sv/APKBUILD +++ b/user/aspell-dict-sv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sv pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Swedish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2" builddir="$srcdir/aspell-sv-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c aspell-sv-0.51-0.tar.bz2" diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD index d904ac81a..b6da8032d 100644 --- a/user/aspell-dict-sw/APKBUILD +++ b/user/aspell-dict-sw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-sw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Swahili dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2" builddir="$srcdir/aspell-sw-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="5d89a68c292b45a188f611a14bc355c955810f79c32c7784b2e3ba5a4307b48d572e5a7ca882a344b7635eabe6aa6c2f5d789e9506f3a3f4e69c93fd3675e423 aspell-sw-0.50-0.tar.bz2" diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD index 50cbf030c..d9afb81d6 100644 --- a/user/aspell-dict-ta/APKBUILD +++ b/user/aspell-dict-ta/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-ta pkgver=20040424.1 _pkgver=${pkgver%.*}-${pkgver#*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Tamil dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-ta-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="8809948f25bf197207c3cbd865bf4c7e73cee552fd1518533d48fcabdc79c95765df253d9ef6c7f904748f24898f04acdeb64800ce9856ced8ccab086ddb664e aspell6-ta-20040424-1.tar.bz2" diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD index fbd2bbef9..9544673a1 100644 --- a/user/aspell-dict-te/APKBUILD +++ b/user/aspell-dict-te/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-te pkgver=0.01.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Telugu dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-te-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="09566d44de03e3e990f575d8e665bad9079f7bafec2474a6aa4a430a1ff71641dd4989d24bc5ecf3b19ca8c4f61b9365ea792b16f271c89bffaab159e8ed0129 aspell6-te-0.01-2.tar.bz2" diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD index 392c24a62..fb58477b8 100644 --- a/user/aspell-dict-tet/APKBUILD +++ b/user/aspell-dict-tet/APKBUILD @@ -1,25 +1,25 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-tet pkgver=0.1.1 pkgrel=0 pkgdesc="Tetum dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2" builddir="$srcdir/aspell5-tet-$pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="6dc691b40cedd054a677197219f97ae5afc21bcf4820bf452d23963ae04a716bf7e38d1cff0eb050e13fd24fd2e8f3b0d24f9b19e7de3868faeca8aa16881802 aspell5-tet-0.1.1.tar.bz2" diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD index f02b20fd0..11e465c99 100644 --- a/user/aspell-dict-tk/APKBUILD +++ b/user/aspell-dict-tk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-tk pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Turkmen dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-tk-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="0a4a0c3be9b9322187677d47f56c091f6c3ae2662b8d6831e9fa2e18720277f76c79e9e0c65ee37474459a19dc5a99519af8492645b241cdc076775afc4a700f aspell5-tk-0.01-0.tar.bz2" diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD index fefaf89ff..5e35eb565 100644 --- a/user/aspell-dict-tl/APKBUILD +++ b/user/aspell-dict-tl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-tl pkgver=0.4.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Tagalog dictionaries for aspell" url=" " # no suitable website arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" @@ -15,12 +15,12 @@ source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.goo builddir="$srcdir/aspell6-tl-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="e9ad3e7e619ed19ffde923a07553c4930c60292a0e5592a68cf0e09d6f6d3b3b7ff74adb8f53e9255528c319c12ef442eff4e3b2ce169156d1664b5d565a7f5a aspell6-tl-0.4-0.tar.bz2" diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD index 4a404b4da..ae25e480b 100644 --- a/user/aspell-dict-tn/APKBUILD +++ b/user/aspell-dict-tn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-tn pkgver=1.0.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Setswana dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-tn-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="ff3258c3eec392f45b34ba7754bbd6af7ffa0ac812fc1743985fec301755be81387a3e567b36ff145a7a3f9b906e991efde8b4fafc33be14f07a581f4af111dc aspell5-tn-1.0.1-0.tar.bz2" diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD index 6e32881a1..6bbb12b99 100644 --- a/user/aspell-dict-tr/APKBUILD +++ b/user/aspell-dict-tr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-tr pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Turkish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2" builddir="$srcdir/aspell-tr-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="0054eef2089a916695b7501676d9cedb1d14defdea76deb01656a6a644b4e646db46470040227814f750e0d69dcc72b1023967eb7924b42ddcefd3d604709059 aspell-tr-0.50-0.tar.bz2" diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD index d812753ad..d53c59b7c 100644 --- a/user/aspell-dict-uk/APKBUILD +++ b/user/aspell-dict-uk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-uk pkgver=1.4.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Ukrainian dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-uk-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799 aspell6-uk-1.4.0-0.tar.bz2" diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD index cc9e0b28a..801711845 100644 --- a/user/aspell-dict-uz/APKBUILD +++ b/user/aspell-dict-uz/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-uz pkgver=0.6.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Uzbek dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-uz-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="0542a83c149ad761d8bb964be556bfb2387404fce21e0e38d3c0fa8efef2d1587db0fa80140cf7de72da7f08bbb807ff931a95bb63c2a84771a197f5841e545b aspell6-uz-0.6-0.tar.bz2" diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD index 12a23ae79..680cdd9c0 100644 --- a/user/aspell-dict-vi/APKBUILD +++ b/user/aspell-dict-vi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-vi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Vietnamese dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-vi-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5 aspell6-vi-0.01.1-1.tar.bz2" diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD index 35ed79b6b..8ac0dc480 100644 --- a/user/aspell-dict-wa/APKBUILD +++ b/user/aspell-dict-wa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-wa pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Walloon dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2" builddir="$srcdir/aspell-wa-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="67e8fbb80a2622b921e28a37b978fc998713f7e281beccc921afd8e289ac76094f589e905da2e9386c585fcfae53179ca1e9b24a39c8a021cb3f2685461e3a8c aspell-wa-0.50-0.tar.bz2" diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD index f3b55aaaa..59f2eb444 100644 --- a/user/aspell-dict-yi/APKBUILD +++ b/user/aspell-dict-yi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-yi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Yiddish dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-yi-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="a8d96ba192e61193469596ce1bf6e808bbb03e3fa3a75e545bdee4b6cfa607b681d0a9631465d004ce6e0e25453af732391e76b134138acc7c28991a3664f346 aspell6-yi-0.01.1-1.tar.bz2" diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD index 6beb5fb89..7e4846103 100644 --- a/user/aspell-dict-zu/APKBUILD +++ b/user/aspell-dict-zu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-zu pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} @@ -7,20 +7,20 @@ pkgrel=0 pkgdesc="Zulu dictionaries for aspell" url="http://aspell.net" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2" builddir="$srcdir/aspell-zu-$_pkgver" build() { - cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + ./configure --vars DESTDIR="$pkgdir" + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } + sha512sums="c79679a41e8aa1b80532c9eea0cf49c3a4bcdaa00f3d0d9e9f6eb7f4037992e40eaad0af711e5d5c29935afe6d0a2fb1c7b49dfdb2add07526a64cb2efac6ea9 aspell-zu-0.50-0.tar.bz2" diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 7177dfbad..0ca0f7cc1 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.0 +pkgver=2.34.1 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="515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04 at-spi2-atk-2.34.0.tar.xz" +sha512sums="d30c07a37e42d33ac0658f55e881ab2ca6faa45c251acbd99433ec0f119466f41bb2b6f4b953a7830dd120959aa7f1ee86a763881784e42ea9454f19893a6576 at-spi2-atk-2.34.1.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 92c017b61..4e7ea3109 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -8,15 +8,13 @@ url="https://wiki.linuxfoundation.org/accessibility/d-bus" arch="all" options="!check" # Requires running at-spi2 daemon. license="LGPL-2.0+" -depends="" -depends_dev="libxtst-dev" -makedepends="$depends_dev dbus-dev glib-dev intltool gobject-introspection-dev - dbus meson ninja" +depends="gobject-introspection" +makedepends="dbus-dev glib-dev gobject-introspection-dev libxtst-dev meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz" build() { - meson --prefix=/usr builddir/ + meson -Dprefix=/usr builddir/ ninja -C builddir/ } diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD index cbf9d21de..448b2c8bb 100644 --- a/user/atkmm/APKBUILD +++ b/user/atkmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=atkmm pkgver=2.28.0 pkgrel=0 @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/atkmm/${pkgver%.*}/atkmm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index d36e45f69..ac1897170 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=atril -pkgver=1.22.2 +pkgver=1.22.3 pkgrel=0 pkgdesc="Document viewer for the MATE desktop environment" url="https://mate-desktop.org" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99ff55f84649dfb8de931ff2506ff0339852fbb7ed368cee1f6632ba243d2b0384cd0bd649d16c30317fbf786612f54c2404da43d14141e6f9c0944e64c34653 atril-1.22.2.tar.xz +sha512sums="f4a83702818e1fb32279c67f1727c01480d27fe756f3fc0ff9dcd42584ce74ce10ac7ee81c0149f3756b6eb08f2a011ede28706ab54ff16a51c544a1af3b103f atril-1.22.3.tar.xz ba4ec4b0e10d87f44f189a16cfe2419906e3776edc9bc14f7da9356a8953683e3f7efc441691df131497b08b892d3b291aab416310f259ee6bc0706cc4f02880 CVE-2019-11459.patch" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index c3a1bc8f6..7688326f4 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,22 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" arch="all" license="LGPL-2.1-only" depends="" -depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz +makedepends="cmake extra-cmake-modules doxygen graphviz qt5-qtbase-dev qt5-qttools-dev" -install="" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/attica-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +25,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f278423e5bcbd1899d6c41caceee740e3caee01dd1af20303827ec5a807e262e560b068dcb6619f5410ebe815b71b1244ccc453c49956c3bfd1452a88ecf5b18 attica-5.54.0.tar.xz" +sha512sums="225bec1c0e54ce1c13273aeb8ea2350c15f147c0d68c6a4427b5da381f72dfb5817eabb5f2a798cece49d14b111ca205b21576222ed8eeb8000b7fa760a1d30d attica-5.68.0.tar.xz" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index bd65db3b5..6a53e2d56 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -10,14 +10,14 @@ arch="all" options="!check" # No test suite license="ISC" depends="audacious" -install_if="audacious=$pkgver" -makedepends="audacious-dev>=${pkgver%.*} +makedepends="audacious-dev>=${pkgver%.*} autoconf automake alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev qt5-qtmultimedia-dev sdl-dev wavpack-dev" +install_if="audacious=$pkgver" subpackages="$pkgname-lang" source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD index d671e395d..42e37fd98 100644 --- a/user/audacious/APKBUILD +++ b/user/audacious/APKBUILD @@ -9,6 +9,7 @@ url="https://audacious-media-player.org/" arch="all" options="!check" # No test suite. license="ISC" +depends="" depends_dev="qt5-qtbase-dev dbus-glib-dev" makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/audiofile/APKBUILD b/user/audiofile/APKBUILD index 4744d3297..66b00d0c7 100644 --- a/user/audiofile/APKBUILD +++ b/user/audiofile/APKBUILD @@ -12,7 +12,8 @@ depends_dev="flac-dev" makedepends="$depends_dev alsa-lib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://audiofile.68k.org/audiofile-$pkgver.tar.gz - tests-unsigned-gcc6.patch" + tests-unsigned-gcc6.patch + " prepare() { default_prepare @@ -20,7 +21,6 @@ prepare() { } build() { - cd "$builddir" export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure \ --build=$CBUILD \ @@ -33,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/autoconf-archive/APKBUILD b/user/autoconf-archive/APKBUILD new file mode 100644 index 000000000..8a87a30fa --- /dev/null +++ b/user/autoconf-archive/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: +# Maintainer: +pkgname=autoconf-archive +pkgver=2019.01.06 +pkgrel=0 +pkgdesc="GNU Autoconf Macro Archive" +url="https://www.gnu.org/software/autoconf-archive/" +arch="noarch" +license="GPL-3.0+" +subpackages="$pkgname-dev $pkgname-doc" +source="https://ftpmirror.gnu.org/$pkgname/$pkgname-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-$pkgver/" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb autoconf-archive-2019.01.06.tar.xz" diff --git a/user/autoconf2.13/APKBUILD b/user/autoconf2.13/APKBUILD index bd5b533a9..29222ea87 100644 --- a/user/autoconf2.13/APKBUILD +++ b/user/autoconf2.13/APKBUILD @@ -3,35 +3,33 @@ pkgname=autoconf2.13 pkgver=2.13 pkgrel=2 pkgdesc="A GNU tool for automatically configuring source code" +url="https://www.gnu.org/software/autoconf" arch="noarch" license="GPL-2.0" -url="https://www.gnu.org/software/autoconf" depends="m4 perl" checkdepends="dejagnu flex gfortran" -source="ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz +makedepends="" +subpackages="$pkgname-doc" +source="https://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz getloadavg.patch " -subpackages="$pkgname-doc" - builddir="$srcdir"/autoconf-$pkgver + prepare() { default_prepare update_config_sub # Required for AC_F77_LIBRARY_LDFLAGS } build() { - cd "$builddir" M4=/usr/bin/m4 ./configure --prefix=/usr --program-suffix=-2.13 make } check() { - cd "$builddir" F77=gfortran make check } package() { - cd "$builddir" make prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install rm -f "$pkgdir"/usr/share/info/dir diff --git a/user/awesome/APKBUILD b/user/awesome/APKBUILD index d3236b714..d6b140452 100644 --- a/user/awesome/APKBUILD +++ b/user/awesome/APKBUILD @@ -8,39 +8,35 @@ pkgrel=0 pkgdesc="lua-configurable window manager framework" url="http://awesome.naquadah.org/" arch="all" -license="GPL-2.0+" options="!check" # Tests require X and D-Bus +license="GPL-2.0+" depends="imagemagick lua-lgi cairo-gobject pango" +checkdepends="xorg-server-xephyr" makedepends="lua5.3 lua5.3-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev dbus-dev gdk-pixbuf-dev xcb-util-cursor-dev libxkbcommon-dev xcb-util-xrm-dev libexecinfo-dev xmlto" -checkdepends="xorg-server-xephyr" subpackages="$pkgname-doc" source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz" build() { # Awesome does not support in-tree builds - mkdir -p "$builddir/build" - cd "$builddir/build" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ -DLUA_LIBRARIES=/usr/lib/lua5.3/liblua.so \ - .. - make + -Bbuild + make -C build } check() { - cd "$builddir/build" - make check + make -C build check } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 awesome-4.3.tar.xz" diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD index dea352c42..fd0aaf9db 100644 --- a/user/ayatana-ido/APKBUILD +++ b/user/ayatana-ido/APKBUILD @@ -1,27 +1,27 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ayatana-ido pkgver=0.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="Indicator display object library for the Gnome desktop environment" url="https://ayatanaindicators.github.io/" arch="all" license="GPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0+" depends="" makedepends="glib-dev gobject-introspection-dev gtest-dev gtk+3.0-dev - mate-common-dev vala-dev xorg-gtest-dev" + mate-common-dev vala-dev xorg-gtest-dev autoconf automake" subpackages="$pkgname-dev" source="ayatana-ido-$pkgver.tar.gz::https://github.com/AyatanaIndicators/ayatana-ido/archive/$pkgver.tar.gz - gtk-doc-fix.patch" + gtk-doc-fix.patch + remove-private.patch + " prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,14 +33,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" DESTDIR="$pkgdir" make install } sha512sums="ef04b0b6c959d209e88b1de322ac64ea33fdd043a73980bf3b043380603b6a448ea7bf43ba8e2750e1a0a9bef704a7099f7ae9b92a97d3ce0be2e9f48ba16703 ayatana-ido-0.4.4.tar.gz -92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch" +92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch +a28c4cbfb5f386a9ee42ec50011bce603191b901760e6f9799a58b9ff2b223d03c15df00bd6fab6e13b9b9d5b70ecedef245665ebf4e240df1f1321e658b38fa remove-private.patch" diff --git a/user/ayatana-ido/remove-private.patch b/user/ayatana-ido/remove-private.patch new file mode 100644 index 000000000..848b1b026 --- /dev/null +++ b/user/ayatana-ido/remove-private.patch @@ -0,0 +1,2295 @@ +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/baekmuk-ttf/APKBUILD b/user/baekmuk-ttf/APKBUILD index 28b840f6b..2f885f9eb 100644 --- a/user/baekmuk-ttf/APKBUILD +++ b/user/baekmuk-ttf/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="http://kldp.net/baekmuk/release/865-baekmuk-ttf-$pkgver.tar.gz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ ttf/*.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/ttf/*.ttf } sha512sums="779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b 865-baekmuk-ttf-2.2.tar.gz" diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index e3004a553..dcdb6d85e 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -13,10 +13,7 @@ depends_dev="qt5-qtbase-dev baloo-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kfilemetadata-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz - frameworks.patch - revert.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/baloo-widgets-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -29,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,6 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="08cd7e6ed8655fed179d6ff0f7b9981c386baa914e9b5d0f48ced74eee95fd41cc7b339e831310eba0bb563bed636b0869f4f121a5f413f1d525f2f05aa8f513 baloo-widgets-19.08.2.tar.xz -4a89ef01e6b8cbea694745e99b53c9d85a0d4da05e33dd77603312df36e6ee058a9d551e99de831a7e3099699b376cf2caccffd3339a21acc6a8b8170aaaeb05 frameworks.patch -291f7f99ad6b9d98dafe5e35c9e18ef46d45d5e3b5a5e9aaefa96983519db7306c73815e1ef80b51f69f56802b6fac39532718eb2867a3faee7f1bdfa2c7f64f revert.patch" +sha512sums="99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f baloo-widgets-19.12.3.tar.xz" diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch deleted file mode 100644 index f0f993bb5..000000000 --- a/user/baloo-widgets/frameworks.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- baloo-widgets-19.04.0/CMakeLists.txt.old 2019-04-12 00:13:39.000000000 +0000 -+++ baloo-widgets-19.04.0/CMakeLists.txt 2019-04-19 07:30:31.523838076 +0000 -@@ -8,7 +8,7 @@ - project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION}) - - set(QT_MIN_VERSION "5.8.0") --set(KF5_MIN_VERSION "5.58.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH}) ---- baloo-widgets-19.08.0/CMakeLists.txt.old 2019-08-15 12:25:44.456788542 +0000 -+++ baloo-widgets-19.08.0/CMakeLists.txt 2019-08-15 15:26:31.843791794 +0000 -@@ -28,8 +28,6 @@ - include(ECMAddTests) - include(CMakePackageConfigHelpers) - --add_definitions(-DQT_NO_FOREACH) -- - ecm_setup_version(PROJECT - VARIABLE_PREFIX BALOO_WIDGETS - SOVERSION 5 ---- baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp.old 2019-08-09 00:09:30.000000000 +0000 -+++ baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp 2019-08-15 15:37:50.301115034 +0000 -@@ -53,7 +53,8 @@ - #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - struct stat fileStat; - struct utimbuf newTimes; -- const QByteArray file = QFile::encodeName(filePath); -+ const QByteArray q_file = QFile::encodeName(filePath); -+ const char *file = q_file.constData(); - stat(file, &fileStat); - - newTimes.actime = fileStat.st_atime; diff --git a/user/baloo-widgets/revert.patch b/user/baloo-widgets/revert.patch deleted file mode 100644 index cc54adf6f..000000000 --- a/user/baloo-widgets/revert.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- baloo-widgets-19.08.0/src/filemetadatautil.cpp.old 2019-08-09 00:09:30.000000000 +0000 -+++ baloo-widgets-19.08.0/src/filemetadatautil.cpp 2019-08-15 15:31:58.938750148 +0000 -@@ -58,30 +58,10 @@ - QVariantMap toNamedVariantMap(const KFileMetaData::PropertyMap& propMap) - { - QVariantMap map; -- if (propMap.isEmpty()) { -- return map; -- } -- -- using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>; -- -- auto begin = propMap.constKeyValueBegin(); -- -- while (begin != propMap.constKeyValueEnd()) { -- auto key = (*begin).first; -- KFileMetaData::PropertyInfo property(key); -- auto rangeEnd = std::find_if(begin, propMap.constKeyValueEnd(), -- [key](const entry& e) { return e.first != key; }); -- -- auto distance = std::distance(begin, rangeEnd); -- if (distance > 1) { -- QVariantList list; -- list.reserve(static_cast<int>(distance)); -- std::for_each(begin, rangeEnd, [&list](const entry& s) { list.append(s.second); }); -- map.insert(property.name(), list); -- } else { -- map.insert(property.name(), (*begin).second); -- } -- begin = rangeEnd; -+ KFileMetaData::PropertyMap::const_iterator it = propMap.constBegin(); -+ for (; it != propMap.constEnd(); it++) { -+ KFileMetaData::PropertyInfo pi(it.key()); -+ map.insertMulti(pi.name(), it.value()); - } - - return map; diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index b0a147dd0..4f84cbb32 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -27,10 +27,10 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz ki18n-dev kidletime-dev kio-dev lmdb-dev solid-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/baloo-$pkgver.tar.xz - initialise-variable.patch" + initialise-variable.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -42,19 +42,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ec610aa2ab6409cf206623e08eb78d7ccc3b278ca94d6f8ba79d6d705459eb5cb9d74ed9ffc4cc20c337582b12517fb59da1570aa689111c0f105746234333de baloo-5.54.0.tar.xz -5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e initialise-variable.patch" +sha512sums="54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 baloo-5.68.0.tar.xz +a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/baloo/initialise-variable.patch b/user/baloo/initialise-variable.patch index 836e26ff0..c50c110b1 100644 --- a/user/baloo/initialise-variable.patch +++ b/user/baloo/initialise-variable.patch @@ -1,6 +1,6 @@ --- baloo-5.38.0/src/engine/postingdb.cpp.old 2017-09-03 02:58:12.000000000 -0500 +++ baloo-5.38.0/src/engine/postingdb.cpp 2017-10-04 21:44:30.019139903 -0500 -@@ -274,7 +274,7 @@ +@@ -278,7 +278,7 @@ mdb_cursor_open(m_txn, m_dbi, &cursor); MDB_val key = {0, nullptr}; diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 535db976b..44df1d5b1 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=bash-completion @@ -10,8 +10,8 @@ url="https://github.com/scop/bash-completion" arch="noarch" license="GPL-2.0+" depends="bash" -makedepends="" checkdepends="py3-pexpect py3-pytest" +makedepends="" subpackages="$pkgname-doc" source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz fix-tests.patch diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD new file mode 100644 index 000000000..c1f6e0b04 --- /dev/null +++ b/user/bcnm/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bcnm +pkgver=0.0.1.0 +pkgrel=0 +pkgdesc="Client network manager" +url="https://www.skarnet.org/software/bcnm/" +arch="all" +options="!check" # No test suite. +license="ISC" +depends="" +makedepends="skalibs-dev" +subpackages="$pkgname-dev" +source="https://www.skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="abe37c2629baa3c583734c7f783565c52f376ff553c503b5666e081cce042efa2e4d2a219b4911b23ea1c437f1ab0d9d1a928cc5126d8efb65e2981b86b220e1 bcnm-0.0.1.0.tar.gz" diff --git a/user/bdftopcf/APKBUILD b/user/bdftopcf/APKBUILD index 5e7282cca..438a2d8a2 100644 --- a/user/bdftopcf/APKBUILD +++ b/user/bdftopcf/APKBUILD @@ -12,7 +12,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/bdftopcf-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/bearssl/APKBUILD b/user/bearssl/APKBUILD index ad6e8b20a..868c043af 100644 --- a/user/bearssl/APKBUILD +++ b/user/bearssl/APKBUILD @@ -1,5 +1,5 @@ -# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> # Contributor: Laurent Bercot <ska-adelie@skarnet.org> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bearssl pkgver=0.6 pkgrel=1 @@ -7,18 +7,25 @@ pkgdesc="The BearSSL implementation of the SSL/TLS protocol" url="https://bearssl.org/" arch="all" license="MIT" -builddir="$srcdir/$pkgname-$pkgver" +depends="" +makedepends="" subpackages="$pkgname-dev" -source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch" +source="https://bearssl.org/$pkgname-$pkgver.tar.gz + bearssl-brssl-dynamic.patch + " build() { - cd "$builddir" make \ - CC=gcc \ - LD=gcc \ - LDDLL=gcc \ - LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \ - D=".so.$pkgver" + CC=gcc \ + LD=gcc \ + LDDLL=gcc \ + LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \ + D=".so.$pkgver" +} + +check() { + build/testx509 + build/testcrypto all } package() { @@ -31,10 +38,5 @@ package() { ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so" } -check() { - cd "$builddir/build" - ./testx509 && ./testcrypto all -} - sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch" diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD index 88fef1821..4cb502c9d 100644 --- a/user/beforelight/APKBUILD +++ b/user/beforelight/APKBUILD @@ -13,14 +13,12 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/bengali-fonts/APKBUILD b/user/bengali-fonts/APKBUILD index 974e0971a..1a2b7590a 100644 --- a/user/bengali-fonts/APKBUILD +++ b/user/bengali-fonts/APKBUILD @@ -19,14 +19,12 @@ source="https://savannah.nongnu.org/download/freebangfont/Akaash-0.8.5.tar.gz builddir="$srcdir" prepare() { - cd "$builddir" default_prepare # don't capitalise extension mv Ani/mitra.TTF Ani/mitra.ttf } package() { - cd "$builddir" install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF \ $(find . -name *.ttf) } diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 4945c0222..5135228af 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.7 +pkgver=9.14.10 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -24,9 +24,10 @@ options="!check" license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause" pkgusers="named" pkggroups="named" +depends="" makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply" -install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools" +install="$pkgname.pre-install" source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz bind.so_bsdcompat.patch named.initd @@ -40,6 +41,8 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.14.9-r0: +# - CVE-2019-6477 # 9.14.7-r0: # - CVE-2019-6475 # - CVE-2019-6476 @@ -150,7 +153,7 @@ tools() { done } -sha512sums="e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740 bind-9.14.7.tar.gz +sha512sums="81d453c4e90fea3a21b2485bea2f5321ca8a7ef58eb9a9bc1eaa1463989aefa439e4e45c9a43b1ec6a62c52f0e73d82ebd91cd084ad6ef2a67b705736e9e8d00 bind-9.14.10.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD new file mode 100644 index 000000000..c8774acd6 --- /dev/null +++ b/user/bitlbee/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=bitlbee +pkgver=3.6 +pkgrel=0 +pkgdesc="IRC gateway server to IM services" +url="https://www.bitlbee.org" +arch="all" +options="!check" # Tests are not compatible with new check. +license="GPL-2.0+ AND LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0-only AND ISC" +depends="" +checkdepends="check-dev" +makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3" +subpackages="$pkgname-dev $pkgname-doc" +source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz" + +build() { + PYTHON=python3 ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --pam=1 + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install install-dev +} + +sha512sums="ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d bitlbee-3.6.tar.gz" diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 11c679c00..1ec66b771 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev ki18n-dev kxmlgui-dev kguiaddons-dev kdoctools-dev kdbusaddons-dev kcrash-dev phonon-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/blinken-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/blinken-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5a78e8677aa0f2796b6177e60b387bdb0af580f4a1231f89c90c8e58b224c7d7162c6f2d0830005fb6059cdb2a5463cb51a8c7162e1bb54c2d52dcd81e22850a blinken-19.08.2.tar.xz" +sha512sums="2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938 blinken-19.12.3.tar.xz" diff --git a/user/bluedevil/APKBUILD b/user/bluedevil/APKBUILD new file mode 100644 index 000000000..8aff8e5ea --- /dev/null +++ b/user/bluedevil/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bluedevil +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Bluetooth framework for KDE" +url="https://userbase.kde.org/Bluedevil" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0+" +depends="kded shared-mime-info" +makedepends="bluez-qt-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev + kded-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kpackage-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev plasma-framework-dev qt5-qtbase-dev + qt5-qtdeclarative-dev solid-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/bluedevil-$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="d8c6b43eb62ab8e72b97d0288fdab26f159eae770cfdd5e1235fbfd46273b0d83ca886af434c143413527680b1b8cb76960671165354d0540b4b0a4322e90e30 bluedevil-5.18.3.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD new file mode 100644 index 000000000..2f4fc80a2 --- /dev/null +++ b/user/bluez-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bluez-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt integration with BlueZ" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires running D-Bus server. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +makedepends="cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qtdeclarative-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/bluez-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" \ + -DBUILD_QCH:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c11a43b29f1c04fc67abf2c7f5a2e53e098cdeeddde84ed88a46a15d1dce537442d24422c245f23506840aef2d84d5d828b4c7951362537725b59d31a9a402c7 bluez-qt-5.68.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index 35e98e08b..af4f09ba8 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,43 +1,63 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.51 -pkgrel=0 +pkgver=5.53 +pkgrel=1 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" license="GPL-2.0+" depends="consolekit2 dbus" makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev - linux-headers" + linux-headers ncurses-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd $pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci - $pkgname-obexd $pkgname-openrc" + $pkgname-obexd $pkgname-openrc $pkgname-tools" source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz + https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz bluetooth.initd rfcomm.initd rfcomm.confd - 001-bcm43xx-Add-bcm43xx-3wire-variant.patch - 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch - 003-Increase-firmware-load-timeout-to-30s.patch - 004-Move-the-43xx-firmware-into-lib-firmware.patch - bluez-5.40-obexd_without_systemd-1.patch + 001-bcm43xx-Add-bcm43xx-3wire-variant.patch + 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch + 003-Increase-firmware-load-timeout-to-30s.patch + 004-Move-the-43xx-firmware-into-lib-firmware.patch + dbus-without-systemd.patch + mesh-without-systemd.patch + obex-without-systemd.patch disable-lock-test.patch fix-endianness.patch + time64.patch " -build() { +prepare() { + default_prepare + + cd "$srcdir"/readline-8.0 ./configure \ --build=$CBUILD \ --host=$CHOST \ + --prefix="$srcdir"/readline \ + --enable-static \ + --disable-shared + make install +} + +build() { + CFLAGS="$CFLAGS -I$srcdir/readline/include -L$srcdir/readline/lib" \ + CPPFLAGS="$CPPFLAGS -I$srcdir/readline/include" LIBS="-ltinfo" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --libexecdir=/usr/lib \ --disable-systemd \ - --disable-client \ + --enable-client \ --enable-library \ - --enable-deprecated + --enable-deprecated \ + --enable-experimental \ + --enable-tools make } @@ -56,33 +76,33 @@ package() { } bccmd() { - pkgdesc="Bluez utility for the CSR BCCMD interface" + pkgdesc="BlueZ utility for the CSR BCCMD interface" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/ } btmon() { - pkgdesc="Bluez bluetooth monitor" + pkgdesc="BlueZ Bluetooth monitor" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/ } cups() { - pkgdesc="Bluez backend for CUPS" + pkgdesc="BlueZ backend for CUPS" depends="cups" mkdir -p "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/ } hid2hci() { - pkgdesc="Put HID proxying bluetooth HCI's into HCI mode" + pkgdesc="Put HID proxying Bluetooth HCIs into HCI mode" replaces="bluez" mkdir -p "$subpkgdir" mv "$pkgdir"/lib "$subpkgdir"/ } deprecated() { - pkgdesc="Deprecated bluetooth tools" + pkgdesc="Deprecated Bluetooth tools" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/ciptool \ "$pkgdir"/usr/bin/hciattach \ @@ -95,12 +115,21 @@ deprecated() { } obexd() { - pkgdesc="Bluez OBEX daemon" + pkgdesc="BlueZ OBEX daemon" mkdir -p "$subpkgdir"/usr/lib/bluetooth mv "$pkgdir"/usr/lib/bluetooth/obexd "$subpkgdir"/usr/lib/bluetooth } -sha512sums="8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f bluez-5.51.tar.xz +tools() { + pkgdesc="Bluetooth tools" + mkdir -p "$subpkgdir"/usr/bin + for _tool in bluetooth-player mpris-proxy; do + install -Dm755 "$builddir"/tools/$_tool "$subpkgdir"/usr/bin/$_tool + done +} + +sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74 bluez-5.53.tar.xz +41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -108,6 +137,9 @@ a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b34841 d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch 784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch 42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch -b7640a78cb33b3628564ebb2d8bcaf4255bddf5a25068838a9cc5fbd26d5d8dbf51e4b6b6fd2137fccae593482b2927ba13cb166be255be02d72a245ea60c3ff bluez-5.40-obexd_without_systemd-1.patch +a681a98178f9374ab882984058559752d1e1f3261412f450b38f1a06c3dfb5ce45e2cce35aa152f3c5761a9f7695fb0990cfdcc394706304470e6d1a8dbef682 dbus-without-systemd.patch +59fa8b90d5b8ac5922b730b01fbeb8a237075cd537705fe2665f15c7626bc6a8bd8128a3e899b0c620b6cb4f86862c2a416b2af8c2575d0724b26c8132aff251 mesh-without-systemd.patch +9aa78fdd9a84dd2a20cd6a4f5105e88af16896ae81a76a9a9f86902a9988d58af1102948c2d87397df36d747ce206d06a7bf1795c3ceb6a4617d95a26be3526f obex-without-systemd.patch 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch -118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch" +118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch +da2ca90b0de1afb90914370dbc482f78ab9a270e60142ed7901eff408d02611d7fe423ae4677bce49fe829d59aa9aa971f9d0039d6e9134d3346aeb51b62ba9c time64.patch" diff --git a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch b/user/bluez/bluez-5.40-obexd_without_systemd-1.patch deleted file mode 100644 index 17433fccd..000000000 --- a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -Submitted By: Armin K. <krejzi at email dot com> -Date: 2013-04-29 -Initial Package Version: 5.17 -Upstream Status: unknown -Origin: Arch Linux (Giovanni Campagna) -Description: Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -1,12 +1,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/user/bluez/dbus-without-systemd.patch b/user/bluez/dbus-without-systemd.patch new file mode 100644 index 000000000..5b9c7dc70 --- /dev/null +++ b/user/bluez/dbus-without-systemd.patch @@ -0,0 +1,34 @@ +From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:57:09 +0700 +Subject: [PATCH 1/9] enable dbus without systemd + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 404e6a460..0884156fa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,14 +40,14 @@ conf_DATA = + + statedir = $(localstatedir)/lib/bluetooth + state_DATA = ++ ++dbussystembusdir = $(DBUS_SYSTEMBUSDIR) ++dbussystembus_DATA = src/org.bluez.service + endif + + if SYSTEMD + systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR) + systemdsystemunit_DATA = src/bluetooth.service +- +-dbussystembusdir = $(DBUS_SYSTEMBUSDIR) +-dbussystembus_DATA = src/org.bluez.service + endif + + EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service +-- +2.23.0 + diff --git a/user/bluez/mesh-without-systemd.patch b/user/bluez/mesh-without-systemd.patch new file mode 100644 index 000000000..2cf6f7344 --- /dev/null +++ b/user/bluez/mesh-without-systemd.patch @@ -0,0 +1,29 @@ +From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:58:18 +0700 +Subject: [PATCH 3/9] allow mesh on non-systemd system + +--- + Makefile.mesh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.mesh b/Makefile.mesh +index 90979cbc0..9e6e2c2ca 100644 +--- a/Makefile.mesh ++++ b/Makefile.mesh +@@ -2,11 +2,11 @@ if MESH + + if DATAFILES + dbus_DATA += mesh/bluetooth-mesh.conf ++dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + if SYSTEMD + systemdsystemunit_DATA += mesh/bluetooth-mesh.service +-dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + mesh_sources = mesh/mesh.h mesh/mesh.c \ +-- +2.23.0 + diff --git a/user/bluez/obex-without-systemd.patch b/user/bluez/obex-without-systemd.patch new file mode 100644 index 000000000..c011d2307 --- /dev/null +++ b/user/bluez/obex-without-systemd.patch @@ -0,0 +1,54 @@ +From 5f27d3887b60c95cbcdefaeae5dea38f020c390e Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:57:55 +0700 +Subject: [PATCH 2/8] allow obexd on non-systemd system + +--- + Makefile.obexd | 6 +++--- + .../{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%) + +diff --git a/Makefile.obexd b/Makefile.obexd +index de59d297b..cb04bb1e2 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -1,12 +1,12 @@ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + if OBEX + +@@ -107,6 +107,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ + +-CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service ++CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service + + EXTRA_DIST += obexd/src/genbuiltin +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in +similarity index 74% +rename from obexd/src/org.bluez.obex.service +rename to obexd/src/org.bluez.obex.service.in +index a53808884..543d7bc07 100644 +--- a/obexd/src/org.bluez.obex.service ++++ b/obexd/src/org.bluez.obex.service.in +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.bluez.obex +-Exec=/bin/false ++Exec=@pkglibexecdir@/obexd + SystemdService=dbus-org.bluez.obex.service +-- +2.23.0 + diff --git a/user/bluez/time64.patch b/user/bluez/time64.patch new file mode 100644 index 000000000..782255817 --- /dev/null +++ b/user/bluez/time64.patch @@ -0,0 +1,82 @@ +--- bluez-5.53/monitor/packet.c.old 2020-02-15 18:33:56.000000000 +0000 ++++ bluez-5.53/monitor/packet.c 2020-02-25 09:24:09.629224611 +0000 +@@ -364,7 +364,7 @@ + } + + if (filter_mask & PACKET_FILTER_SHOW_TIME) { +- n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06lu", ++ n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06"PRIu64, + tm.tm_hour, tm.tm_min, tm.tm_sec, tv->tv_usec); + if (n > 0) { + ts_pos += n; +@@ -373,7 +373,7 @@ + } + + if (filter_mask & PACKET_FILTER_SHOW_TIME_OFFSET) { +- n = sprintf(ts_str + ts_pos, " %lu.%06lu", ++ n = sprintf(ts_str + ts_pos, " %"PRIu64".%06"PRIu64, + tv->tv_sec - time_offset, tv->tv_usec); + if (n > 0) { + ts_pos += n; +--- bluez-5.53/tools/parser/parser.h.old 2015-10-30 03:30:13.000000000 +0000 ++++ bluez-5.53/tools/parser/parser.h 2020-02-25 09:26:51.471579651 +0000 +@@ -26,6 +26,7 @@ + #define __PARSER_H + + #include <time.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <netinet/in.h> + +@@ -133,11 +134,11 @@ + struct tm tm; + time_t t = f->ts.tv_sec; + localtime_r(&t, &tm); +- printf("%04d-%02d-%02d %02d:%02d:%02d.%06lu ", ++ printf("%04d-%02d-%02d %02d:%02d:%02d.%06"PRIu64" ", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, f->ts.tv_usec); + } else +- printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec); ++ printf("%8"PRIu64".%06"PRIu64" ", f->ts.tv_sec, f->ts.tv_usec); + } + printf("%c ", (f->in ? '>' : '<')); + parser.state = 1; +--- bluez-5.53/tools/rctest.c.old 2019-09-19 18:51:03.000000000 +0000 ++++ bluez-5.53/tools/rctest.c 2020-02-25 09:24:56.994060632 +0000 +@@ -36,6 +36,7 @@ + #include <getopt.h> + #include <syslog.h> + #include <signal.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/socket.h> +@@ -513,7 +514,7 @@ + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +- sprintf(ts, "[%ld.%ld] ", ++ sprintf(ts, "[%"PRId64".%"PRId64"] ", + tv.tv_sec, tv.tv_usec); + } + } +--- bluez-5.53/tools/l2test.c.old 2019-09-19 18:51:03.000000000 +0000 ++++ bluez-5.53/tools/l2test.c 2020-02-25 09:27:47.325490145 +0000 +@@ -38,6 +38,7 @@ + #include <getopt.h> + #include <syslog.h> + #include <signal.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <poll.h> + #include <sys/ioctl.h> +@@ -915,7 +916,7 @@ + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +- sprintf(ts, "[%ld.%ld] ", ++ sprintf(ts, "[%"PRId64".%"PRId64"] ", + tv.tv_sec, tv.tv_usec); + } + } diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD new file mode 100644 index 000000000..b14289263 --- /dev/null +++ b/user/bolt/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bolt +pkgver=0.8 +pkgrel=0 +pkgdesc="Thunderbolt 3 device manager" +url=" " +arch="all" +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 + " + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 bolt-0.8.tar.gz +487f2c7824edba318692d40ffc4e55f893602587b1380b18877d9dca3b5b22b14e27001b3547369a8ec1a6c5fe7a5facc1fa97e92b3a5011a67ec967afce25ea wakeup.patch" diff --git a/user/bolt/wakeup.patch b/user/bolt/wakeup.patch new file mode 100644 index 000000000..a10d420c4 --- /dev/null +++ b/user/bolt/wakeup.patch @@ -0,0 +1,50 @@ +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 a2f0760c8..029cb84a2 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -12,9 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev ki18n-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/bomber-$pkgver.tar.xz - ridiculous-qt.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/bomber-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,5 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="242b4f7485f023bbb73dbfcd1077393d623f584f7c0d33af77f55fda36d59fbed3f74f9ef5c7883a7c86fb409f65794742dd002200f9a7ddbf2400595b5037c5 bomber-19.08.2.tar.xz -160ae239dae8ad3504b622660bb92a3b08dd1abf37161ce2d1c23ada5558f763a64a8fd9cbc25fd4a8946e274bde97df91fcb39742ba9a551ea397e1f81c51d4 ridiculous-qt.patch" +sha512sums="09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb bomber-19.12.3.tar.xz" diff --git a/user/bomber/ridiculous-qt.patch b/user/bomber/ridiculous-qt.patch deleted file mode 100644 index bad38045a..000000000 --- a/user/bomber/ridiculous-qt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bomber-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:09.000000000 +0000 -+++ bomber-19.08.0/CMakeLists.txt 2019-08-15 13:01:55.633395788 +0000 -@@ -7,7 +7,7 @@ - cmake_minimum_required (VERSION 3.5 FATAL_ERROR) - project(bomber VERSION ${KDE_APPLICATIONS_VERSION}) - --set (QT_MIN_VERSION "5.10.0") -+set (QT_MIN_VERSION "5.9.7") - set (KF5_MIN_VERSION "5.46.0") - - find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/boost/APKBUILD b/user/boost/APKBUILD index 31045eea4..619f65577 100644 --- a/user/boost/APKBUILD +++ b/user/boost/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=boost -pkgver=1.69.0 +pkgver=1.72.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Free peer-reviewed portable C++ source libraries" @@ -65,16 +65,11 @@ prepare() { } case "$CARCH" in - armhf|armv7|aarch64) _boostarch=arm ;; - ppc64*) _boostarch=ppc ;; - s390x) _boostarch=s390 ;; - pmmx) _boostarch=x86 ;; - *) _boostarch=$CARCH ;; + s390x) + _options_s390="--without-coroutine --without-coroutine2" ;; esac _enginedir=tools/build/src/engine -_bjam="${builddir}/$_enginedir/bin.linux${_boostarch}/bjam" -[ "$_boostarch" = "s390" ] && _bjam="${builddir}/$_enginedir/bin.linux390/bjam" && \ - _options_s390="--without-coroutine --without-coroutine2" +_bjam="${builddir}/$_enginedir/bjam" # context is broken on at least s390 and sparc _options="--user-config=\"$builddir/user-config.jam\" @@ -98,7 +93,7 @@ build() { msg "Building bjam" cd "$builddir"/$_enginedir - CC= ./build.sh cc + CC= ./build.sh gcc msg "Building bcp" cd "$builddir"/tools/bcp @@ -141,6 +136,6 @@ _pyversion() { $1 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' } -sha512sums="d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552 boost_1_69_0.tar.bz2 +sha512sums="63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 boost_1_72_0.tar.bz2 d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 90019442b..4f98235e9 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/bovo-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/bovo-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c6072b2a86135bb6eac6e654e3af82cf783a602bb9b9e45ac8aea9de6479e5ba0958ecff42172ab9c356f5d7ea8a7b4805e3a11094b3cafb887d947347216529 bovo-19.08.2.tar.xz" +sha512sums="a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855 bovo-19.12.3.tar.xz" diff --git a/user/breeze-grub/APKBUILD b/user/breeze-grub/APKBUILD new file mode 100644 index 000000000..68b623813 --- /dev/null +++ b/user/breeze-grub/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=breeze-grub +pkgver=5.18.3 +pkgrel=0 +pkgdesc="KDE Breeze theme for GRUB boot screen" +url="https://www.kde.org/" +arch="noarch" +options="!check" # Theme files, no code. +license="GPL-3.0+" +depends="grub" +makedepends="" +subpackages="" +install_if="grub breeze" +source="https://download.kde.org/stable/plasma/$pkgver/breeze-grub-$pkgver.tar.xz" + +package() { + mkdir -p "$pkgdir"/usr/share/grub/themes + cp -r breeze "$pkgdir"/usr/share/grub/themes/ +} + +sha512sums="496a9f44cd26b7932578398339af64be4fb7d69b194de110dd60b65e36335cfa2efdd3975f04d3ddecd01928e1d375bbf78b153710cab3824799d4d937247d28 breeze-grub-5.18.3.tar.xz" diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index 431553cb6..41475a175 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze-gtk -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" -arch="all" +arch="noarch" license="LGPL-2.1-only" -depends="gtk+2.0" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev" +depends="breeze gtk+2.0" +makedepends="breeze-dev cmake extra-cmake-modules py3-pycairo qt5-qtbase-dev sassc" # XXX should be installed if breeze and gtk+3.0 are installed, as well install_if="breeze~$pkgver gtk+2.0" source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7c9602161cf77e263a84e7fd5f5780a8bc84b4b747356eace7c05768c9cb6a7a39691ba800db654ea1a058209906b1ed762f211a063f8d05596d32fd1dbc867f breeze-gtk-5.12.8.tar.xz" +sha512sums="adabcfba59970b36830fe9a1060517c17fdb233e849fceaecd7b64a98171996c21ff2d3cbea711d2a4377e116a66b2ae9894bade5cade8b3a36f3cb21f3bcabb breeze-gtk-5.18.3.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 7a57ede78..2142678a6 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -9,13 +9,12 @@ arch="noarch" options="!check" # 8,753 failures because it can't tell symlink from file. license="LGPL-3.0+" depends="" -makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev" checkdepends="fdupes" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev" subpackages="breeze-icons-dark:dark" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/breeze-icons-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,18 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} - make + ${CMAKE_CROSSOPTS} \ + -B build \ + . + make -C build } check() { - cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } dark() { @@ -46,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="60a2f07bcf3e8ce59b3860d4e74411e3b52af16c08ff3213ecdbebca8d1e9a2918ec5b24f67af0dcee0673108a3f2c8f8b6c04d2a829bdaeac300383fdd6dad5 breeze-icons-5.54.0.tar.xz" +sha512sums="d66ee651d8d69e5e162cf2f74f1f84255db121e90e8a2150813a06a918af8642b41a23b3b5885b8b10d23ec0a3bdb654affca78790b6d2158833a34e7bc1d7d3 breeze-icons-5.68.0.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index e040ec01e..68bad2d60 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="135c431c979cfb82833c6525f72167e0e334519b8c10c57e97e96f8a15a8b2b141c4b94c37985a5a53f1ccc19ab3be9121e55bfe3412fad06122b2927e9e3cbc breeze-5.12.8.tar.xz" +sha512sums="c17f570469d92414ce034f245dae022fa0a9c383c9ccf595443a6c51b278b2c97ea0480a00ec873aecd871e65f15d62e9e497774eba2d807823ff85b99798d91 breeze-5.18.3.tar.xz" diff --git a/user/bsdwhois/APKBUILD b/user/bsdwhois/APKBUILD index d5222238d..7fe28519f 100644 --- a/user/bsdwhois/APKBUILD +++ b/user/bsdwhois/APKBUILD @@ -15,13 +15,10 @@ source="http://utenti.gufi.org/~drizzt/codes/bsdwhois-$pkgver.tar.bz2" builddir="$srcdir/$pkgname" build() { - cd "$builddir" make } package() { - cd "$builddir" - install -D -m755 "$builddir"/whois "$pkgdir"/usr/bin/whois install -D -m644 "$builddir"/whois.1 "$pkgdir"/usr/share/man/man1/whois.1 } diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index ffc0d10e7..079282295 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.2.2 +pkgver=5.4.1 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c btrfs-progs-v5.2.2.tar.xz" +sha512sums="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz" diff --git a/user/bugzilla/APKBUILD b/user/bugzilla/APKBUILD index 5e0f6f31d..9217601b0 100644 --- a/user/bugzilla/APKBUILD +++ b/user/bugzilla/APKBUILD @@ -10,7 +10,7 @@ options="!check" # "Cannot determine your time zone"; all other tests pass license="MPL-2.0" # First section are required deps. Second section are optional features we use. depends="perl-cgi perl-datetime perl-datetime-timezone perl-dbi perl-email-mime - perl-email-sender perl-json-xs perl-list-moreutils + perl-email-sender perl-json-xs perl-list-moreutils perl perl-math-random-isaac perl-template-toolkit perl-timedate perl-uri patchutils perl-authen-sasl perl-chart perl-encode-detect @@ -24,20 +24,17 @@ subpackages="" source="https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-$pkgver.tar.gz" build() { - cd "$builddir" perl Build.PL installdirs=vendor ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$srcdir" mkdir -p "$pkgdir"/usr/share/webapps - mv bugzilla-$pkgver "$pkgdir"/usr/share/webapps/ + mv "$srcdir"/bugzilla-$pkgver "$pkgdir"/usr/share/webapps/ } sha512sums="8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de bugzilla-5.0.6.tar.gz" diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD index 3e4b8be76..41ebe01f6 100644 --- a/user/bzflag/APKBUILD +++ b/user/bzflag/APKBUILD @@ -11,10 +11,10 @@ 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" + defineAddrLen.patch + " build() { - cd "$builddir" LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index bfb290d7b..84ef072a3 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -7,7 +7,7 @@ url="https://cairographics.org/" arch="all" options="!check" # Recursive dependency on gtk+2.0 for check. license="LGPL-2.0+ AND MPL-1.1" -depends= +depends="" depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev xcb-util-dev libxext-dev $pkgname-tools" makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD index f79d27580..7e22d21fd 100644 --- a/user/cairomm/APKBUILD +++ b/user/cairomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cairomm pkgver=1.12.2 pkgrel=0 @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD index 938d76160..7f32ac1ab 100644 --- a/user/caja-dropbox/APKBUILD +++ b/user/caja-dropbox/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=caja-dropbox -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="DropBox extension for Caja" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-dropbox-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/caja/extensions-2.0/libcaja-dropbox.a } -sha512sums="e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c caja-dropbox-1.22.1.tar.xz" +sha512sums="64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf caja-dropbox-1.24.0.tar.xz" diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD index 6eadf0f67..43dd48cbe 100644 --- a/user/caja-extensions/APKBUILD +++ b/user/caja-extensions/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=caja-extensions -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Extensions for the Caja file manager" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-extensions-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4c0fb47a251d4118c83a985732d8a549355907519b746a68eb8843c84328d868eec1535b68484c46e3d0bf4b42f0e0340fe178714f50b5f7cc8434c0e1883906 caja-extensions-1.22.1.tar.xz" +sha512sums="f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf caja-extensions-1.24.0.tar.xz" diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD index a4ffe1c01..a29500eb0 100644 --- a/user/caja/APKBUILD +++ b/user/caja/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=caja -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="File manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -11,12 +11,10 @@ license="GPL-2.0+ AND LGPL-2.0+" depends="" makedepends="gobject-introspection-dev intltool libexif-dev libnotify-dev libxml2-dev mate-desktop-dev" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-$pkgver.tar.xz" -builddir="$srcdir/caja-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install for i in icons globs globs2 XMLnamespaces magic aliases subclasses types treemagic mime.cache version generic-icons; do @@ -41,4 +37,4 @@ package() { done } -sha512sums="2c537344c87d929918202b357363b7cfa0b302c410028ea218a78750a376b3da82557750ab76329aeab9c5c32b1ce30af8d3cdb98beb3582d0c3af38b73d311c caja-1.22.2.tar.xz" +sha512sums="a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548 caja-1.24.0.tar.xz" diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index fdaf6e4fe..60d8a0e8e 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" @@ -25,31 +25,34 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev qca-dev - kcalcore-dev kcontacts-dev kdiagram-dev" + 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 " prepare() { - default_prepare - - cd "$builddir" + # 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 - mkdir build } build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -64,25 +67,29 @@ build() { -DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \ -DBUILD_UNMAINTAINED=True \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make 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" +8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch +354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch +b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch +440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch" diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch new file mode 100644 index 000000000..8124192db --- /dev/null +++ b/user/calligra/kcalcore.patch @@ -0,0 +1,74 @@ +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 new file mode 100644 index 000000000..1a424ef98 --- /dev/null +++ b/user/calligra/kf5.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 000000000..c8f8c91fb --- /dev/null +++ b/user/calligra/plan.patch @@ -0,0 +1,48 @@ +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-81.patch b/user/calligra/poppler-81.patch new file mode 100644 index 000000000..3211b7b8e --- /dev/null +++ b/user/calligra/poppler-81.patch @@ -0,0 +1,70 @@ +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 new file mode 100644 index 000000000..e158ac4ff --- /dev/null +++ b/user/calligra/poppler-83.patch @@ -0,0 +1,102 @@ +--- 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/qt5.patch b/user/calligra/qt5.patch new file mode 100644 index 000000000..a40d92127 --- /dev/null +++ b/user/calligra/qt5.patch @@ -0,0 +1,293 @@ +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/cantarell-fonts/APKBUILD b/user/cantarell-fonts/APKBUILD index b5fec057f..16b5ef3f6 100644 --- a/user/cantarell-fonts/APKBUILD +++ b/user/cantarell-fonts/APKBUILD @@ -15,8 +15,7 @@ replaces="ttf-cantarell" source="https://download.gnome.org/sources/cantarell-fonts/$pkgver/cantarell-fonts-$pkgver.tar.xz" package() { - cd "$builddir"/prebuilt - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/prebuilt/*.otf } sha512sums="638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e cantarell-fonts-0.111.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index 5814e9cfc..e7e1a9b11 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -9,18 +9,18 @@ arch="all" options="!check" # Tests require X11. license="GPL-2.0-only" depends="r" +depends_dev="libspectre-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev kcompletion-dev kconfig-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev kparts-dev kpty-dev ktexteditor-dev - ktextwidgets-dev kxmlgui-dev libspectre-dev + ktextwidgets-dev kxmlgui-dev $depends_dev poppler-dev poppler-qt5-dev analitza-dev gfortran libqalculate-dev python3-dev r r-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/cantor-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,18 +31,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f9a089297c288bd4013da68b9388407f990aa20f508b759bd1839a85a714728fe2322daa198c522869285b64c02b84a587f605b4f1e8cc22b9c0aafc3138fd35 cantor-19.08.2.tar.xz" +sha512sums="83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a cantor-19.12.3.tar.xz" diff --git a/user/cardo/APKBUILD b/user/cardo/APKBUILD index 7af7e9f04..9f057c246 100644 --- a/user/cardo/APKBUILD +++ b/user/cardo/APKBUILD @@ -15,8 +15,7 @@ source="http://scholarsfonts.net/cardo104.zip" builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf } sha512sums="559d91528dfebba1c0668ab0116e7cc8d481c88727cf01848978d920d625ee32c893d6abff3170e5365e136fa6f603c4f34390e17383409bc3db01611c42eefb cardo104.zip" diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD index 9a18b7b29..2f098cba8 100644 --- a/user/catcodec/APKBUILD +++ b/user/catcodec/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz" build() { - cd "$builddir" make } package() { - cd "$builddir" make prefix=/usr DESTDIR="$pkgdir" install } diff --git a/user/catdoc/APKBUILD b/user/catdoc/APKBUILD index 4296c8167..e5fdbb52d 100644 --- a/user/catdoc/APKBUILD +++ b/user/catdoc/APKBUILD @@ -19,7 +19,6 @@ source="http://ftp.wagner.pp.ru/pub/catdoc/catdoc-$pkgver.tar.gz # - CVE-2017-11110 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,7 +31,6 @@ build() { } package() { - cd "$builddir" make -j1 install } diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD index eacc0772b..a04ef7f61 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=catfish -pkgver=1.4.10 +pkgver=1.4.13 pkgrel=0 pkgdesc="File-searching application for the XFCE desktop environment" url="https://xfce.org" @@ -10,7 +10,7 @@ license="GPL-2.0-only" depends="python3 py3-pygobject py3-pexpect" makedepends="py3-distutils-extra intltool" subpackages="$pkgname-doc $pkgname-lang" -source="http://archive.xfce.org/src/apps/catfish/1.4/catfish-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/catfish/1.4/catfish-$pkgver.tar.bz2" build() { python3 setup.py build @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29 catfish-1.4.10.tar.bz2" +sha512sums="a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886 catfish-1.4.13.tar.bz2" diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index f0093accf..2a735e5ce 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -3,59 +3,51 @@ # Contributor: Samuel Holland <samuel@sholland.org> # Maintainer: Molly Miller <adelie@m-squa.red> pkgname=cbindgen -pkgver=0.9.1 +pkgver=0.12.1 pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" arch="all" license="MPL-2.0" +depends="" makedepends="cargo" source="" # dependencies taken from Cargo.lock cargo_deps="$pkgname-$pkgver ansi_term-0.11.0 -atty-0.2.11 -autocfg-0.1.4 -bitflags-1.1.0 -cfg-if-0.1.9 +atty-0.2.13 +bitflags-1.2.1 +c2-chacha-0.2.3 +cfg-if-0.1.10 clap-2.33.0 -cloudabi-0.0.3 -fuchsia-cprng-0.1.1 +getrandom-0.1.13 itoa-0.4.4 -libc-0.2.58 -log-0.4.6 -numtoa-0.1.0 -proc-macro2-1.0.0 -quote-1.0.0 -rand-0.6.5 -rand_chacha-0.1.1 -rand_core-0.3.1 -rand_core-0.4.0 -rand_hc-0.1.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -redox_syscall-0.1.54 -redox_termios-0.1.1 +libc-0.2.66 +log-0.4.8 +ppv-lite86-0.2.6 +proc-macro2-1.0.6 +quote-1.0.2 +rand-0.7.2 +rand_chacha-0.2.1 +rand_core-0.5.1 +rand_hc-0.2.0 +redox_syscall-0.1.56 remove_dir_all-0.5.2 -ryu-0.2.8 -serde-1.0.93 -serde_derive-1.0.99 -serde_json-1.0.39 +ryu-1.0.2 +serde-1.0.104 +serde_derive-1.0.104 +serde_json-1.0.44 strsim-0.8.0 -syn-1.0.1 -tempfile-3.0.8 -termion-1.5.3 +syn-1.0.11 +tempfile-3.1.0 textwrap-0.11.0 -toml-0.5.1 -unicode-width-0.1.5 +toml-0.5.5 +unicode-width-0.1.7 unicode-xid-0.2.0 vec_map-0.8.1 -winapi-0.3.7 +wasi-0.7.0 +winapi-0.3.8 winapi-i686-pc-windows-gnu-0.4.0 winapi-x86_64-pc-windows-gnu-0.4.0 " @@ -110,48 +102,39 @@ package() { } -sha512sums="0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b cbindgen-0.9.1.tar.gz +sha512sums="851f82cfdd4304dc57dab1a145f78a05a6c5f05ad607d27e0ae909920a5d99013ffb7f7e87950541bda98462f73f0c338d9761b94a96c3073f39163c2ddacf08 cbindgen-0.12.1.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz -9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz -811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz -e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz -45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz +4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz +ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz +302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538 c2-chacha-0.2.3.tar.gz +9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz -691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz -ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 getrandom-0.1.13.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz -9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz -3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz -41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz -8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727 proc-macro2-1.0.0.tar.gz -64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0 quote-1.0.0.tar.gz -2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz -200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz -5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz -f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz -808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz -9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz -fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz -01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz -6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz -3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz -6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz -38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz -201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz +5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz +0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz +b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d ppv-lite86-0.2.6.tar.gz +d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853 proc-macro2-1.0.6.tar.gz +67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz +d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c rand-0.7.2.tar.gz +30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 rand_chacha-0.2.1.tar.gz +4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz +bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 rand_hc-0.2.0.tar.gz +17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz -15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz -ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309 serde-1.0.93.tar.gz -6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e serde_derive-1.0.99.tar.gz -7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz +c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64 ryu-1.0.2.tar.gz +638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a serde-1.0.104.tar.gz +303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e serde_derive-1.0.104.tar.gz +ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4 serde_json-1.0.44.tar.gz 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz -10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f syn-1.0.1.tar.gz -88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz -1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz +6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c syn-1.0.11.tar.gz +a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz -4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz -bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.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 -6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 wasi-0.7.0.tar.gz +5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz" diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index e8df804e5..9076bbb09 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,14 +2,15 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.4 +pkgver=3.7.7 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" arch="all" license="GPL-3.0+" -makedepends="zlib-dev" +depends="" checkdepends="bash perl" +makedepends="zlib-dev" subpackages="$pkgname-doc" source="https://github.com/ccache/ccache/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" @@ -46,4 +47,4 @@ package() { done } -sha512sums="cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 ccache-3.7.4.tar.xz" +sha512sums="f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816 ccache-3.7.7.tar.xz" diff --git a/user/cdparanoia/APKBUILD b/user/cdparanoia/APKBUILD index 28a37e944..f8f567ba5 100644 --- a/user/cdparanoia/APKBUILD +++ b/user/cdparanoia/APKBUILD @@ -8,6 +8,7 @@ url="https://xiph.org/paranoia" arch="all" options="!check" # Build system has test suite commented out. license="LGPL-2.0+" +depends="" makedepends="libtool autoconf automake linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.tgz @@ -18,7 +19,6 @@ builddir="$srcdir/cdparanoia-III-$pkgver" prepare() { default_prepare - cd "$builddir" mv configure.guess config.guess mv configure.sub config.sub update_config_sub @@ -28,7 +28,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -40,7 +39,6 @@ build() { } package() { - cd "$builddir" make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install } diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index 052386d04..20e59ff00 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=certbot -pkgver=0.39.0 +pkgver=1.0.0 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -17,6 +17,7 @@ _depends_acme="python3 py3-cryptography py3-josepy py3-mock py3-openssl py3-requ makedepends="python3-dev $_depends_acme" subpackages="py3-acme:acme" source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz" +builddir="$srcdir"/$pkgname-$pkgver/$pkgname build() { python3 setup.py build @@ -33,9 +34,9 @@ package() { acme() { pkgdesc="ACME protocol implementation for Python" depends="$_depends_acme" - cd "$builddir"/acme + cd "$builddir"/../acme python3 setup.py build python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0 certbot-0.39.0.tar.gz" +sha512sums="649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912 certbot-1.0.0.tar.gz" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index eda8e62b4..9a3be5d89 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -3,13 +3,14 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=cgit -pkgver=1.2.1 -pkgrel=1 -_gitver=2.18.0 +pkgver=1.2.2 +pkgrel=0 +_gitver=2.25.0 pkgdesc="A fast Web interface for Git" url="https://git.zx2c4.com/cgit/" arch="all" license="GPL-2.0-only" +depends="" makedepends="openssl-dev zlib-dev lua5.3-libs lua5.3-dev asciidoctor gettext-tiny-dev" subpackages="$pkgname-doc" source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz @@ -27,8 +28,6 @@ _makeopts="NO_CURL=1 prefix=/usr" prepare() { - cd "$builddir" - # check that upstream git ver corresponds with ours local _ver="$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)" if [ "$_ver" != "$_gitver" ]; then @@ -43,23 +42,20 @@ prepare() { } build() { - cd "$builddir" sed -i -e 's:a2x -f:asciidoctor -b:' Makefile make $_makeopts all doc-man } check() { - cd "$builddir" make $_makeopts test } package() { - cd "$builddir" make $_makeopts DESTDIR="$pkgdir" \ CGIT_SCRIPT_PATH=/usr/share/webapps/cgit \ install install-man ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit } -sha512sums="c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36 cgit-1.2.1.tar.xz -db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz" +sha512sums="ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9 cgit-1.2.2.tar.xz +8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz" diff --git a/user/cgmanager/APKBUILD b/user/cgmanager/APKBUILD index 3074679fd..f4cad0309 100644 --- a/user/cgmanager/APKBUILD +++ b/user/cgmanager/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index 60ca163eb..26345d0ac 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=checkbashisms -pkgver=2.19.6 +pkgver=2.19.7 pkgrel=0 pkgdesc="Check shell scripts for POSIX compliance" url="https://tracker.debian.org/pkg/devscripts" arch="noarch" license="GPL-2.0+" -makedepends="" depends="perl" checkdepends="shunit2" +makedepends="" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://cdn-aws.deb.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz" builddir="$srcdir/devscripts-$pkgver" @@ -33,9 +33,8 @@ bashcomp() { depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - cd "$builddir" - install -Dm644 "scripts/$pkgname.bash_completion" \ + install -Dm644 "$builddir/scripts/$pkgname.bash_completion" \ "$subpkgdir/usr/share/bash-completion/completions/$pkgname" } -sha512sums="9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422 devscripts_2.19.6.tar.xz" +sha512sums="6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7 devscripts_2.19.7.tar.xz" diff --git a/user/chelf/APKBUILD b/user/chelf/APKBUILD index 6e7aff4c0..cf3b34228 100644 --- a/user/chelf/APKBUILD +++ b/user/chelf/APKBUILD @@ -14,12 +14,10 @@ subpackages="" source="$pkgname-$pkgver.tar.xz::https://distfiles.adelielinux.org/source/$pkgname-$pkgver.txz" build() { - cd "$builddir" make } package() { - cd "$builddir" install -D -m755 chelf "$pkgdir"/usr/bin/chelf } diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index 01f3a13b7..e267926a7 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -4,17 +4,18 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony pkgver=3.5 -pkgrel=1 +pkgrel=2 pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" pkgusers="$pkgname" pkggroups="$pkgname" arch="all" +options="!check" # Test suite no longer functions after 2020-01-01. license="GPL-2.0-only" -install="$pkgname.pre-install $pkgname.pre-upgrade" depends="" -makedepends="asciidoctor libcap-dev libedit-dev texinfo" checkdepends="bash" +makedepends="asciidoctor libcap-dev libedit-dev texinfo" +install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-doc $pkgname-openrc" source="https://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.gz fix-tests.patch @@ -41,7 +42,6 @@ prepare() { } build() { - cd "$builddir" CPPFLAGS="$CPPFLAGS -I./pps-tools/" ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -55,12 +55,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/etc/logrotate.d @@ -93,5 +91,5 @@ b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de chronyd.confd 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate -41dca08064abb7ea1c54ca3587f4a614ab1fdecd98ef77b39d10ac23366772860aacce2a12c647331199dbfe3e242834e70aa5643b24b773e6fe266ad4125007 chrony.conf +a0fc89a742217f623d3dbd878dce57d994185d65f7a16b4c2b54a131c9d78b981d67aaa67dc87d978bb82e53798a492dac58b93bf94d378d858eb29fc2113e67 chrony.conf eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h" diff --git a/user/chrony/chrony.conf b/user/chrony/chrony.conf index 98ae0d32b..e24db5c93 100644 --- a/user/chrony/chrony.conf +++ b/user/chrony/chrony.conf @@ -1,7 +1,7 @@ # default config # TODO: update pools to adelie vendor zone when it is assigned -pool pool.ntp.org iburst -initstepslew 10 pool.ntp.org +pool 2.pool.ntp.org iburst +initstepslew 10 2.pool.ntp.org driftfile /var/lib/chrony/chrony.drift rtcsync diff --git a/user/chrpath/APKBUILD b/user/chrpath/APKBUILD index 9eed07b26..7bdb44c39 100644 --- a/user/chrpath/APKBUILD +++ b/user/chrpath/APKBUILD @@ -6,11 +6,12 @@ pkgdesc="Modify rpath of compiled programs" url="https://github.com/jwilk-mirrors/chrpath" arch="all" license="GPL-2.0-only" +depends="" +makedepends="" subpackages="$pkgname-doc" source="https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \ install } diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD index 436e0d909..798bb8a1e 100644 --- a/user/cifs-utils/APKBUILD +++ b/user/cifs-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=cifs-utils -pkgver=6.9 +pkgver=6.10 pkgrel=0 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -9,17 +9,22 @@ arch="all" options="!check suid" # No test suite. license="GPL-3.0+ AND GPL-2.0+ AND LGPL-3.0+" depends="" -makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev - py3-docutils talloc-dev" +makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev py3-docutils + talloc-dev autoconf automake" subpackages="$pkgname-doc $pkgname-dev" source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 musl-fix-includes.patch - xattr_size_max.patch" + respect-destdir.patch + xattr_size_max.patch + " + +prepare() { + default_prepare + autoreconf -vif +} build() { # --enable-cifsidmap and --enable-cifsacl require libwbclient (samba) - - autoreconf -i ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,6 +48,7 @@ package() { chmod u+s "$pkgdir"/sbin/mount.cifs } -sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a cifs-utils-6.9.tar.bz2 +sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc cifs-utils-6.10.tar.bz2 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch +f3acb4f7873628d67c7dfb2378135c302fe382e314277829ea5569710bac0ddb43684aa6d143327d735aec641997084eaa567823b534138ed884bd74044b652a respect-destdir.patch 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/user/cifs-utils/respect-destdir.patch b/user/cifs-utils/respect-destdir.patch new file mode 100644 index 000000000..6330efc38 --- /dev/null +++ b/user/cifs-utils/respect-destdir.patch @@ -0,0 +1,18 @@ +--- cifs-utils-6.10/Makefile.am.old 2019-12-16 23:34:56.000000000 +0000 ++++ cifs-utils-6.10/Makefile.am 2020-01-09 07:28:27.635229782 +0000 +@@ -119,11 +119,11 @@ + SUBDIRS = contrib + + install-exec-hook: +- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) ++ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) + + install-data-hook: +- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) ++ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) + + uninstall-hook: +- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) +- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) ++ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) ++ (cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 1194f3c0e..880f8fafb 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail -pkgver=3.17.4 -pkgrel=1 +pkgver=3.17.5 +pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" arch="all" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz" +sha512sums="a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f claws-mail-3.17.5.tar.xz" diff --git a/user/clearsans/APKBUILD b/user/clearsans/APKBUILD index 2f8f486d0..82c7a7291 100644 --- a/user/clearsans/APKBUILD +++ b/user/clearsans/APKBUILD @@ -15,8 +15,7 @@ source="https://01.org/sites/default/files/downloads/clear-sans/clearsans-$pkgve builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/TTF/*.ttf } sha512sums="83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d clearsans-1.00.zip" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index 86ddd5c59..c05fdc470 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cloc pkgver=1.84 pkgrel=0 @@ -9,22 +9,20 @@ arch="noarch" license="GPL-2.0+" depends="perl perl-regexp-common perl-algorithm-diff" checkdepends="perl-parallel-forkmanager" +makedepends="" subpackages="$pkgname-doc" source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz" build() { - cd Unix - make DESTDIR="$pkgdir" doc + make DESTDIR="$pkgdir" -C Unix doc } check() { - cd Unix - make DESTDIR="$pkgdir" test-perl + make DESTDIR="$pkgdir" -C Unix test-perl } package() { - cd Unix - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C Unix install } sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD index 2c5e047e4..c76e42c3c 100644 --- a/user/clucene/APKBUILD +++ b/user/clucene/APKBUILD @@ -21,14 +21,12 @@ builddir="$srcdir/$pkgname-core-$pkgver" prepare() { default_prepare - cd "$builddir" # Do not use bundled zlib or boost sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt rm -rf src/ext } build() { - cd "$builddir" cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_CONTRIBS_LIB=BOOL:ON \ @@ -39,8 +37,6 @@ build() { } check() { - cd "$builddir" - # clucene is not smart enough to delete files between successive checks, # so let's remove them for it. Otherwise, if check is run a second time # without clearing the files beforehand, a lot of tests will fail. @@ -56,7 +52,6 @@ check() { } package() { - cd "$builddir" make install/fast DESTDIR="$pkgdir" rm -r "$pkgdir"/usr/lib/CLuceneConfig.cmake } diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD index d2a53b372..962fcf3e7 100644 --- a/user/clutter/APKBUILD +++ b/user/clutter/APKBUILD @@ -1,20 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=clutter pkgver=1.26.2 pkgrel=0 pkgdesc="OpenGL-based interactive canvas library" url="https://gnome.org" arch="all" -options="!check" # testsuite skipped all tests +options="!check" # Test suite skipped all tests. license="LGPL-2.0+ AND MIT AND LGPL-2.1+ AND GPL-2.0+" +depends="" makedepends="glib-dev mesa-dev cogl-dev cairo-dev pango-dev json-glib-dev atk-dev vala gobject-introspection-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/clutter/1.26/clutter-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/cm-unicode/APKBUILD b/user/cm-unicode/APKBUILD index 30a09c8a0..26e26d477 100644 --- a/user/cm-unicode/APKBUILD +++ b/user/cm-unicode/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="https://downloads.sourceforge.net/cm-unicode/cm-unicode-$pkgver-ttf.tar.xz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="6340b7c6b220c8c887a4b77e77a01a43bedf13d08dd1d62570de70866d0bff908adf3fcb7907149ab2f5ab060650b39eaad3c01c1e8d028bbeb879b058190e70 cm-unicode-0.7.0-ttf.tar.xz" diff --git a/user/cmocka/APKBUILD b/user/cmocka/APKBUILD new file mode 100644 index 000000000..302249363 --- /dev/null +++ b/user/cmocka/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cmocka +pkgver=1.1.5 +pkgrel=0 +pkgdesc="Unit testing framework for C" +url="https://cmocka.org/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="cmake" +subpackages="$pkgname-dev" +source="https://cmocka.org/files/1.1/cmocka-$pkgver.tar.xz + uintptr_t.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_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="cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd cmocka-1.1.5.tar.xz +8f928bc6bf4bbe43f461b6387d63ba9c63ef97496e93a13fd28b423767ced8c6935ea40f1a054145bb8efbf2c9b88c4b130a49d55e498da7aab0624fae4e1e44 uintptr_t.patch" diff --git a/user/cmocka/uintptr_t.patch b/user/cmocka/uintptr_t.patch new file mode 100644 index 000000000..2950e3933 --- /dev/null +++ b/user/cmocka/uintptr_t.patch @@ -0,0 +1,25 @@ +--- cmocka-1.1.5/include/cmocka.h.old 2019-03-28 12:33:50.000000000 +0000 ++++ cmocka-1.1.5/include/cmocka.h 2020-01-14 10:59:11.716464203 +0000 +@@ -123,21 +123,7 @@ + # elif defined(_WIN64) + typedef unsigned long int uintptr_t; + # else /* _WIN32 */ +- +-/* ILP32 and LP64 platforms */ +-# ifdef __WORDSIZE /* glibc */ +-# if __WORDSIZE == 64 +- typedef unsigned long int uintptr_t; +-# else +- typedef unsigned int uintptr_t; +-# endif /* __WORDSIZE == 64 */ +-# else /* __WORDSIZE */ +-# if defined(_LP64) || defined(_I32LPx) +- typedef unsigned long int uintptr_t; +-# else +- typedef unsigned int uintptr_t; +-# endif +-# endif /* __WORDSIZE */ ++# include <stdint.h> + # endif /* _WIN32 */ + + # define _UINTPTR_T diff --git a/user/cmus/APKBUILD b/user/cmus/APKBUILD index 9f7d13a0a..936cfbff2 100644 --- a/user/cmus/APKBUILD +++ b/user/cmus/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=cmus pkgver=2.8.0 pkgrel=1 pkgdesc="An ncurses based music player with plugin support for many formats" url="https://cmus.github.io/" arch="all" -options="!check" # no test suite +options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev @@ -14,10 +14,10 @@ makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev opusfile-dev pulseaudio-dev wavpack-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz - ppc-libatomic.patch" + ppc-libatomic.patch + " build() { - cd "$builddir" ./configure prefix=/usr \ CONFIG_AAC=y \ CONFIG_ALSA=y \ @@ -57,7 +57,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" PREFIX=/usr install } diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index f7e7b699c..988e85e8f 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,20 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cogl pkgver=1.22.4 pkgrel=0 pkgdesc="GObject-based GL/GLES abstraction library" url="https://gnome.org" arch="all" -options="!check" # broken testsuite, no logs/messages to determine why +options="!check" # broken testsuite, no logs/messages to determine why license="MIT AND SGI-B-2.0 AND BSD-3-Clause AND Public-Domain AND LGPL-2.0+ AND Apache-2.0" +depends="" makedepends="glib-dev libxcomposite-dev libxrandr-dev mesa-dev cairo-dev pango-dev vala gobject-introspection-dev gdk-pixbuf-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/comfortaa/APKBUILD b/user/comfortaa/APKBUILD index cca3023f9..98118e63f 100644 --- a/user/comfortaa/APKBUILD +++ b/user/comfortaa/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=comfortaa -pkgver=3.001 +pkgver=3.101 pkgrel=0 pkgdesc="Stylish, modern, free TrueType font" url="https://www.deviantart.com/aajohan/art/Comfortaa-font-105395949" @@ -11,13 +11,11 @@ license="OFL-1.1" depends="fontconfig" makedepends="" subpackages="" -source="https://distfiles.adelielinux.org/source/comfortaa-$pkgver.zip" -builddir="$srcdir/$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/alexeiva/comfortaa/archive/3.101.tar.gz" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/ - install -D -m644 *.ttf "$pkgdir"/usr/share/fonts/X11/TTF/ + install -D -m644 "$builddir"/fonts/TTF/*.ttf "$pkgdir"/usr/share/fonts/X11/TTF/ } -sha512sums="caf998f9a1dd994f790a2ace1fcc8bf5632f21a61d849e6b5590d808d646556115ec08142397817d9dcfc1bb507d62ca52caf061e5c6048f89bc77f6e74c1f4b comfortaa-3.001.zip" +sha512sums="0411960f72729513c234de753271e311465968ea62975201e1d54125aee16520a065f983b37e588f91cf7e5d0f439e7f1095ea02ea13f94b605b4b72ff626b7f comfortaa-3.101.tar.gz" diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD index dc12db220..6becb4de9 100644 --- a/user/comic-neue/APKBUILD +++ b/user/comic-neue/APKBUILD @@ -15,8 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p builddir="$srcdir/comicneue-$pkgver" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ OTF/*.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf } sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8 comic-neue-2.4.zip" diff --git a/user/command-not-found/APKBUILD b/user/command-not-found/APKBUILD index 96cd1127d..ed9919343 100644 --- a/user/command-not-found/APKBUILD +++ b/user/command-not-found/APKBUILD @@ -11,13 +11,12 @@ license="MIT" depends="apk-tools" makedepends="" subpackages="$pkgname-bash $pkgname-zsh" -source="$pkgname-$pkgver.tar.gz::https://git.dereferenced.org/kaniini/command-not-found/archive/v$pkgver.tar.gz +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz explicit-apk-path.patch " builddir="$srcdir/$pkgname" package() { - cd "$builddir" install -d -D -m755 "$pkgdir"/usr/libexec install -m755 command-not-found.sh "$pkgdir"/usr/libexec/command-not-found } @@ -25,17 +24,15 @@ package() { bash() { pkgdesc="$pkgdesc (Bash shell support)" install_if="$pkgname=$pkgver-r$pkgrel bash" - cd "$builddir" install -d -D -m755 "$subpkgdir"/etc/profile.d/ - install -m755 profiles/command-not-found.ash "$subpkgdir"/etc/profile.d/command-not-found.sh + install -m755 "$builddir"/profiles/command-not-found.ash "$subpkgdir"/etc/profile.d/command-not-found.sh } zsh() { pkgdesc="$pkgdesc (Z shell support)" install_if="$pkgname=$pkgver-r$pkgrel zsh" - cd "$builddir" install -d -D -m755 "$subpkgdir"/etc/zprofile.d/ - install -m755 profiles/command-not-found.zsh "$subpkgdir"/etc/zprofile.d/command-not-found.zsh + install -m755 "$builddir"/profiles/command-not-found.zsh "$subpkgdir"/etc/zprofile.d/command-not-found.zsh } sha512sums="a9fc6cf063195abf4bbf015f770b93fb23e2afc0efbed10a54adc1e0d38d7f9a57ab5817a52e483dd01aa21888e76f5aaefdbf89c835f227be2f150848ddb7ad command-not-found-0.3.tar.gz diff --git a/user/compface/APKBUILD b/user/compface/APKBUILD index 0c742f166..6cc0b4c03 100644 --- a/user/compface/APKBUILD +++ b/user/compface/APKBUILD @@ -9,13 +9,11 @@ arch="all" options="!check" # No test suite. license="MIT" depends="" -depends_dev="" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.xemacs.org/pub/xemacs/aux/compface-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +25,6 @@ build() { } package() { - cd "$builddir" make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install } diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 1753aff6c..3899919dd 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=compton-conf pkgver=0.14.1 pkgrel=0 @@ -15,11 +15,9 @@ subpackages="" source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -27,13 +25,12 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="76cacb0960112ab3d0b7a05fba3ac2418c2bd37f4273fc20383b49ce035fd045a2a8e8a1ae5a8a5dc116f46ab6ccd7a5764dd2c3ec64822d930c7dd268533db4 compton-conf-0.14.1.tar.xz" diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD index 338f123de..82b9cc638 100644 --- a/user/compton/APKBUILD +++ b/user/compton/APKBUILD @@ -1,20 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=compton pkgver=4 pkgrel=0 pkgdesc="Lightweight compositor for X11" url="https://github.com/yshui/compton" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="MIT AND MPL-2.0" +depends="" makedepends="meson libx11-dev libxext-dev libev-dev xcb-util-renderutil-dev xcb-util-image-dev pixman-dev libconfig-dev pcre-dev mesa-dev dbus-dev" -source="compton-$pkgver.tar.gz::https://github.com/yshui/compton/archive/v$pkgver.tar.gz" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -26,7 +26,6 @@ build() { } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD index 3fe8f33b4..efc38ab5c 100644 --- a/user/confuse/APKBUILD +++ b/user/confuse/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=confuse pkgver=3.2.2 pkgrel=0 pkgdesc="Small configuration file parser library for C" -url="https://github.com/martinh/libconfuse" +url=" " arch="all" -options="!checkroot" license="ISC" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/consolekit2/APKBUILD b/user/consolekit2/APKBUILD index 3c7e5035b..084504191 100644 --- a/user/consolekit2/APKBUILD +++ b/user/consolekit2/APKBUILD @@ -5,16 +5,14 @@ pkgname=consolekit2 pkgver=1.2.1 pkgrel=1 pkgdesc="Framework for defining and tracking users, login sessions, and seats" -provides="consolekit=$pkgver" -replaces="consolekit" -arch="all" 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" -checkdepends="libxml2-utils" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" source="https://github.com/ConsoleKit2/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.bz2 consolekit2.initd @@ -24,7 +22,6 @@ source="https://github.com/ConsoleKit2/$pkgbase/releases/download/$pkgver/$pkgba builddir="$srcdir"/$pkgbase-$pkgver build() { - cd "$builddir" XMLTO_FLAGS='--skip-validation' ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -40,12 +37,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -m 755 "$srcdir"/pam-foreground-compat.ck \ "$pkgdir"/usr/lib/ConsoleKit/run-session.d/ diff --git a/user/convertlit/APKBUILD b/user/convertlit/APKBUILD index 49cce0d46..19bea9b84 100644 --- a/user/convertlit/APKBUILD +++ b/user/convertlit/APKBUILD @@ -11,19 +11,17 @@ license="GPL-2.0" depends="" makedepends="libtommath-dev" subpackages="" -source="http://www.convertlit.com/${pkgname}${pkgver/./}src.zip +source="http://www.convertlit.com/${pkgname}$(echo $pkgver | sed s/\\.//)src.zip lib.patch " builddir="$srcdir/" build() { - cd "$builddir" make -C lib make -C clit18 } package() { - cd "$builddir" install -D -m755 clit18/clit "$pkgdir"/usr/bin/clit } diff --git a/user/corindon-red/APKBUILD b/user/corindon-red/APKBUILD deleted file mode 100644 index e099c5de9..000000000 --- a/user/corindon-red/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=corindon-red -pkgver=1.0 -pkgrel=0 -pkgdesc="Corindon theme for Aurorae (Red)" -url="https://store.kde.org/p/1002602/" -arch="noarch" -license="GPL-2.0+" -options="!check" # No test suite. -depends="" -makedepends="" -source="https://dl.opendesktop.org/api/files/downloadfile/id/1460740699/s/90b6b780028e72203f2a0fba41edf43a/t/1520219138/u//122445-corindon-red.tar.gz" -builddir="$srcdir/" - -build() { - cd "$builddir" -} - -package() { - cd "$builddir" - mkdir -p "$pkgdir"/usr/share/aurorae/themes - - mv "$builddir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/ -} - -sha512sums="9be72e3404eac6c7f0093038b1f873064883ed62ab81486133ef1d9ce50a9ede43d68ed61ebc3280289433abf8a794ca6591c906f51636dec5c1fa197626a630 122445-corindon-red.tar.gz" diff --git a/user/courier-prime/APKBUILD b/user/courier-prime/APKBUILD index 94cdce083..950e88c1f 100644 --- a/user/courier-prime/APKBUILD +++ b/user/courier-prime/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="https://dev.gentoo.org/~jstein/dist/courier-prime-$pkgver.tar.xz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda courier-prime-1.203.tar.xz" diff --git a/user/coverage/APKBUILD b/user/coverage/APKBUILD index 1cea3561d..adbca0392 100644 --- a/user/coverage/APKBUILD +++ b/user/coverage/APKBUILD @@ -8,23 +8,20 @@ url="https://coverage.readthedocs.io/" arch="all" license="Apache-2.0" depends="python3" -makedepends="python3-dev" checkdepends="py3-tox" +makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/c/coverage/coverage-$pkgver.tar.gz" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix="/usr" --root="$pkgdir" } diff --git a/user/cppunit/APKBUILD b/user/cppunit/APKBUILD index f334d23f1..4efda7916 100644 --- a/user/cppunit/APKBUILD +++ b/user/cppunit/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=cppunit -pkgver=1.14.0 +pkgver=1.15.1 pkgrel=0 pkgdesc="C++ unit testing framework" url="https://www.freedesktop.org/wiki/Software/cppunit/" arch="all" license="LGPL-2.1+" +depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" LIBS="-ldl" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e cppunit-1.14.0.tar.gz" +sha512sums="0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 cppunit-1.15.1.tar.gz" diff --git a/user/cram/APKBUILD b/user/cram/APKBUILD index 73bb7c8cc..505e64ef8 100644 --- a/user/cram/APKBUILD +++ b/user/cram/APKBUILD @@ -8,26 +8,23 @@ url="https://bitheap.org/cram/" arch="noarch" license="GPL-2.0-only" depends="python3" -makedepends="cmd:which" checkdepends="coverage" +makedepends="cmd:which" subpackages="" source="https://bitheap.org/cram/cram-$pkgver.tar.gz die-py2-die.patch " build() { - cd "$builddir" make PYTHON=python3 } check() { - cd "$builddir" # tests are not 100% coverage make PYTHON=python3 check || true } package() { - cd "$builddir" # we can't use make because there's no --root option python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/ctags/APKBUILD b/user/ctags/APKBUILD index bdc83ed14..135c0326d 100644 --- a/user/ctags/APKBUILD +++ b/user/ctags/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://prdownloads.sourceforge.net/ctags/ctags-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" install -D -m755 ctags "$pkgdir"/usr/bin/ctags install -D -m644 ctags.1 "$pkgdir"/usr/share/man/man1/ctags.1 } diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 9a484828f..efb5baccc 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -7,10 +7,10 @@ url="https://wiki.linuxfoundation.org/openprinting/cups-filters" arch="all" license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT" depends="gnu-ghostscript poppler-utils bc ttf-freefont" +checkdepends="ttf-dejavu" makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers coreutils gnutls-dev python3" -checkdepends="ttf-dejavu" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz" diff --git a/user/cve-check-tool/APKBUILD b/user/cve-check-tool/APKBUILD index 879cdcada..055d49fe2 100644 --- a/user/cve-check-tool/APKBUILD +++ b/user/cve-check-tool/APKBUILD @@ -9,9 +9,9 @@ url="https://code.foxkit.us/sroracle/cve-check-tool" arch="all" license="GPL-2.0+" depends="" -makedepends="bash curl-dev glib-dev gobject-introspection-dev - jansson-dev libxml2-dev openssl-dev sqlite-dev" checkdepends="check-dev" +makedepends="autoconf automake bash curl-dev glib-dev gobject-introspection-dev + jansson-dev libtool libxml2-dev openssl-dev sqlite-dev" subpackages="$pkgname-doc" source="https://dev.sick.bike/dist/cve-check-tool-$_pkgver.tar.gz" builddir="$srcdir/$pkgname-$_pkgver" diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD index cbf824ce4..be7505b82 100644 --- a/user/cyrus-sasl/APKBUILD +++ b/user/cyrus-sasl/APKBUILD @@ -8,12 +8,11 @@ url="https://www.cyrusimap.org/sasl/" arch="all" options="!check" # No test suite. license="BSD-4-Clause" +depends="" +makedepends="db-dev openssl-dev krb5-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-gssapi $pkgname-gs2 $pkgname-scram $pkgname-ntlm $pkgname-crammd5 $pkgname-digestmd5 libsasl $pkgname-openrc" -depends="" -makedepends="db-dev openssl-dev krb5-dev - autoconf automake libtool" source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz saslauthd.initd " @@ -23,7 +22,6 @@ source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver # - CVE-2013-4122 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -47,7 +45,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING @@ -57,7 +54,7 @@ package() { _plugindir=usr/lib/sasl2 _plugin() { - depends= + depends="" replaces="libsasl" pkgdesc="Cyrus SASL plugin for $2" mkdir -p "$subpkgdir"/$_plugindir @@ -72,7 +69,7 @@ crammd5() { _plugin crammd5 CRAM-MD5; } digestmd5() { _plugin digestmd5 DIGEST-MD5; } libsasl() { - depends= + depends="" pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library" mkdir -p "$subpkgdir"/usr mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ diff --git a/user/dbus-glib/APKBUILD b/user/dbus-glib/APKBUILD index c2c581928..6187e395f 100644 --- a/user/dbus-glib/APKBUILD +++ b/user/dbus-glib/APKBUILD @@ -5,16 +5,14 @@ pkgrel=0 pkgdesc="GLib bindings for D-Bus" url="https://www.freedesktop.org/wiki/Software/DBusBindings" arch="all" -options="!checkroot" license="AFL-2.1 OR GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" -depends= -makedepends="dbus-dev expat-dev glib-dev" +depends="" checkdepends="dbus" -source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" +makedepends="dbus-dev expat-dev glib-dev" +source="https://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 88160df56..3495c4f93 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=dconf pkgver=0.34.0 pkgrel=0 @@ -12,7 +12,9 @@ depends="dbus" makedepends="meson ninja bash-completion dbus-dev docbook-xsl libxslt-dev python3-dev vala-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz" +source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz + meson.patch + " build() { meson \ @@ -30,4 +32,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz" +sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz +be807b17c20c829b307da2df23252893f99f47845825328a0b1880aad9d97f85fe1d66be3903e8c1cc62bb6daa2baf1462bc09daf397c31394e7159ede07d58c meson.patch" diff --git a/user/dconf/meson.patch b/user/dconf/meson.patch new file mode 100644 index 000000000..77d980e31 --- /dev/null +++ b/user/dconf/meson.patch @@ -0,0 +1,35 @@ +From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001 +From: Diego Escalante Urrelo <diegoe@gnome.org> +Date: Thu, 31 Oct 2019 05:51:22 -0500 +Subject: [PATCH] build: Update use of link_whole for meson-0.52 + +A regression in meson-0.52 caused uses of link_whole to expose scenarios +where duplicate symbols issues could appear. In particular +libdconf_client_dep was being link_whole'd to itself, which recursively +already included libdconf_common which was also a link_whole. + +This change does not modify the available symbols in libdconf.so, and is +compatible with meson-0.52 and 0.51. + +See: https://github.com/mesonbuild/meson/pull/6030 +Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59 +--- + client/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/meson.build b/client/meson.build +index f3b7122..de6387e 100644 +--- a/client/meson.build ++++ b/client/meson.build +@@ -28,7 +28,7 @@ libdconf_client = static_library( + + libdconf_client_dep = declare_dependency( + dependencies: gio_dep, +- link_whole: libdconf_client, ++ link_with: libdconf_client, + ) + + libdconf = shared_library( +-- +2.24.1 + diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD index 6fd0c0a02..a62b71c5e 100644 --- a/user/ddrescue/APKBUILD +++ b/user/ddrescue/APKBUILD @@ -5,13 +5,14 @@ pkgver=1.24 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="https://www.gnu.org/s/ddrescue/ddrescue.html" -license="GPL-3.0+" arch="all !aarch64" +license="GPL-3.0+" +depends="" +makedepends="" subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" build() { - cd "$builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -20,17 +21,10 @@ build() { } check() { - cd "$builddir" - - # XXX: Some tests fail on s390x, but only on builder, so ignore it for now. - case "$CARCH" in - s390x) make check || true;; - *) make check;; - esac + make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/dev86/APKBUILD b/user/dev86/APKBUILD new file mode 100644 index 000000000..a17deec0f --- /dev/null +++ b/user/dev86/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=dev86 +pkgver=0.16.21 +pkgrel=0 +pkgdesc="Standalone 8086 assembler and linker" +url="https://github.com/lkundrak/dev86/" +arch="pmmx x86 x86_64" +options="!check" # Just compiles stuff with bcc which we don't build +license="GPL-2.0 AND LGPL-2.0" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/lkundrak/dev86/archive/v$pkgver.tar.gz" + +build() { + make -j1 as ld \ + GCCFLAG="$CFLAGS" \ + NATIVE='-DA_OUT_INCL=\"../libc/include/a.out.h\"' +} + +package() { + install -Dm755 as/as86 "$pkgdir"/usr/bin/as86 + install -Dm755 ld/ld86 "$pkgdir"/usr/bin/ld86 + + install -Dm644 man/as86.1 "$pkgdir"/usr/share/man/man1/as86.1 + install -Dm644 man/ld86.1 "$pkgdir"/usr/share/man/man1/ld86.1 +} + +sha512sums="e51d94cecc298f860c1dcbc225d5c77a18769eb7a51f888853ca3bdb3cc6596c07d67cd9b403f7d52155716eb1708396461dc596cd02728d762d0ed5e87d054f dev86-0.16.21.tar.gz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index 8c9ed8bc0..19b63bc1a 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.0.6 +pkgver=8.1.6 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -18,8 +18,6 @@ source="https://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.xz " build() { - cd "$builddir" - CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M" ./configure \ --build=$CBUILD \ @@ -35,18 +33,15 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/dhcpcd.initd \ "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 dhcpcd-8.0.6.tar.xz +sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index 9f0264df8..0c077d307 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dialog -pkgver=1.3.20190808 +pkgver=1.3.20191210 _realver="${pkgver%.*}-${pkgver##*.}" pkgrel=0 pkgdesc="Script interpreter providing curses widgets" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86 dialog-1.3-20190808.tgz" +sha512sums="4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d dialog-1.3-20191210.tgz" diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD new file mode 100644 index 000000000..7d512cb13 --- /dev/null +++ b/user/digikam/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=digikam +pkgver=6.4.0 +pkgrel=0 +pkgdesc="Professional photo management and digital camera import" +url="https://www.digikam.org/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev + qt5-qtsvg-dev kconfig-dev kwindowsystem-dev kxmlgui-dev ki18n-dev + karchive-dev kio-dev qt5-qtwebkit-dev kcoreaddons-dev kservice-dev + solid-dev kiconthemes-dev kfilemetadata-dev threadweaver-dev libpng-dev + knotifyconfig-dev knotifications-dev akonadi-contacts-dev x265-dev + libjpeg-turbo-dev tiff-dev zlib-dev boost-dev lcms2-dev expat-dev + exiv2-dev flex bison libxml2-dev libxslt-dev eigen-dev libgphoto2-dev + libksane-dev libkipi-dev glu-dev qt5-qtx11extras-dev jasper-dev + opencv opencv-dev imagemagick-dev kcalendarcore-dev marble-dev" +# YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/digikam/$pkgver/digikam-$pkgver.tar.xz + opencv42.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" \ + -DENABLE_APPSTYLES=ON \ + -DENABLE_FACESENGINE_DNN=OFF \ + -DENABLE_MYSQLSUPPORT=OFF \ + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + -DENABLE_OPENCV3=ON \ + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} . + make +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 digikam-6.4.0.tar.xz +55b61bd67a25a4a1ec149205fd66c234a283a57f80c0070f95f085ae5e8f6cf5b9b5ed0a85a427ef58bd0f471d784555293b7fc61cf98eeb2ab84789da1979b1 opencv42.patch" diff --git a/user/digikam/digikam6.patch b/user/digikam/digikam6.patch new file mode 100644 index 000000000..58c0f0d28 --- /dev/null +++ b/user/digikam/digikam6.patch @@ -0,0 +1,36 @@ +diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD +index 3cdf9c37..bfffed9f 100644 +--- a/user/digikam/APKBUILD ++++ b/user/digikam/APKBUILD +@@ -1,7 +1,7 @@ + # Contributor: A. Wilcox <awilfox@adelielinux.org> + # Maintainer: A. Wilcox <awilfox@adelielinux.org> + pkgname=digikam +-pkgver=5.9.0 ++pkgver=6.0.0 + pkgrel=0 + pkgdesc="Professional photo management and digital camera import" + url="https://www.digikam.org/" +@@ -20,7 +20,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev + opencv opencv-dev" + # YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv + subpackages="$pkgname-doc $pkgname-lang" +-source="https://download.kde.org/stable/digikam/digikam-$pkgver.tar.xz" ++source="https://download.kde.org/stable/digikam/$pkgver/digikam-$pkgver.tar.xz" + + build() { + cd "$builddir" +@@ -37,7 +37,6 @@ build() { + -DENABLE_APPSTYLES=ON \ + -DENABLE_MYSQLSUPPORT=OFF \ + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ +- -DENABLE_OPENCV3=ON \ + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} + make +@@ -48,4 +47,4 @@ package() { + make DESTDIR="$pkgdir" install + } + +-sha512sums="f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63 digikam-5.9.0.tar.xz" ++sha512sums="b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb digikam-6.0.0.tar.xz" diff --git a/user/digikam/opencv42.patch b/user/digikam/opencv42.patch new file mode 100644 index 000000000..d4d80a85f --- /dev/null +++ b/user/digikam/opencv42.patch @@ -0,0 +1,11 @@ +--- digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp.old 2019-11-03 09:04:00.000000000 +0000 ++++ digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp 2020-02-08 12:43:42.707340488 +0000 +@@ -166,7 +166,7 @@ + * of the region of interest of this cascade (still relative to whole image). + * For frontal face cascades, returns the given parameter unchanged. + */ +- cv::Rect faceROI(const CvRect& faceRect) const ++ cv::Rect faceROI(const cv::Rect& faceRect) const + { + return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width), + lround(faceRect.y + roi.y() * faceRect.height), diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD index 628675765..0bce275b4 100644 --- a/user/dina/APKBUILD +++ b/user/dina/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=dina pkgver=2.93 pkgrel=0 @@ -8,7 +8,7 @@ url="https://www.dcmembers.com/jibsen/download/61/" arch="noarch" options="!check" # No tests license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf" source="$pkgname-$pkgver.zip::https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61&refresh=5c64600776bf51550082055" builddir="$srcdir/BDF" diff --git a/user/diskdev_cmds/APKBUILD b/user/diskdev_cmds/APKBUILD index 1b071453c..59e8f58ab 100644 --- a/user/diskdev_cmds/APKBUILD +++ b/user/diskdev_cmds/APKBUILD @@ -6,11 +6,10 @@ pkgrel=0 pkgdesc="HFS+ utilities ported from OS X 10.8.4 (fsck/mkfs)" url="https://opensource.apple.com/release/mac-os-x-10411ppc.html" arch="all" +options="!check" # No test suite. license="APSL-2.0" depends="" makedepends="bsd-compat-headers openssl-dev" -install="" -options="!check" subpackages="$pkgname-doc" source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver.tar.gz linux.patch @@ -19,12 +18,10 @@ source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver. builddir="$srcdir/diskdev_cmds-$pkgver" build() { - cd "$builddir" make -f Makefile.lnx } package() { - cd "$builddir" install -D -m755 "$builddir"/fsck_hfs.tproj/fsck_hfs "$pkgdir"/sbin/fsck_hfs install -m755 "$builddir"/newfs_hfs.tproj/newfs_hfs "$pkgdir"/sbin/newfs_hfs ln -s fsck_hfs "$pkgdir"/sbin/fsck.hfs diff --git a/user/djvulibre/APKBUILD b/user/djvulibre/APKBUILD index 2b4a3ed0e..fa2ce6059 100644 --- a/user/djvulibre/APKBUILD +++ b/user/djvulibre/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=djvulibre pkgver=3.5.27 -pkgrel=1 +pkgrel=2 pkgdesc="Format for distributing documents and images" url="http://djvu.sourceforge.net/" arch="all" @@ -15,7 +15,9 @@ source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz CVE-2019-15142.patch CVE-2019-15143.patch CVE-2019-15144.patch - CVE-2019-15145.patch" + CVE-2019-15145.patch + CVE-2019-18804.patch + " # secfixes: # 3.5.27-r1: @@ -23,6 +25,8 @@ source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz # - CVE-2019-15143 # - CVE-2019-15144 # - CVE-2019-15145 +# 3.5.27-r2: +# - CVE-2019-18804 build() { ./configure \ @@ -48,4 +52,5 @@ sha512sums="62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252 d9e4301fb98a35b8c2f1854eb4be53611f98b3fc9fdd357dd5502b5b189bdf61957a48b220f3ab7465bbf1df8606ce04513e10df74643a9e289c349f94721561 CVE-2019-15142.patch 3527e1c84f7c7d36f902cb3d7e9ddb6866acbdd4b47675ce3ffd164accf2e2931a4c6bbaae2ea775b4710d88ae34dd4dcd39a5846fce13bef2c82a99d608b8c1 CVE-2019-15143.patch f8f1abf328a97d69514b2626e4c6449c0c7b7e2b5518d56bba6a61a944aaf4b7fffd1371c26396353728f6a1399c6d87492af5c17e6b623dae7751b81eac11f9 CVE-2019-15144.patch -790ef1e05874635c762600c990ecbd3e29e2eb01c59e25a0f8b2a15dbadbd3673d9dbb651d9dcb53fd3e5f4cb6bded47c3eefaaef8b4ccac39bd28f8bbec2068 CVE-2019-15145.patch" +790ef1e05874635c762600c990ecbd3e29e2eb01c59e25a0f8b2a15dbadbd3673d9dbb651d9dcb53fd3e5f4cb6bded47c3eefaaef8b4ccac39bd28f8bbec2068 CVE-2019-15145.patch +e5d6cd98f208db49880c6237f7cd8ab097d02f9771936c04a5acc48d9d18876d5cf48bcc61b14f1affc501ee63e8d6337fa83af259485ef35d4faa5086f06d10 CVE-2019-18804.patch" diff --git a/user/djvulibre/CVE-2019-18804.patch b/user/djvulibre/CVE-2019-18804.patch new file mode 100644 index 000000000..7c66c3989 --- /dev/null +++ b/user/djvulibre/CVE-2019-18804.patch @@ -0,0 +1,39 @@ +From c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Mon Sep 17 00:00:00 2001 +From: Leon Bottou <leon@bottou.org> +Date: Thu, 17 Oct 2019 22:20:31 -0400 +Subject: [PATCH] Fixed bug 309 + +--- + libdjvu/IW44EncodeCodec.cpp | 2 +- + tools/ddjvu.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 00752a0..f81eaeb 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale) + int y = 0; + int s = scale*rowsize; + int s3 = s+s+s; +- h = ((h-1)/scale)+1; ++ h = (h>0) ? ((h-1)/scale)+1 : 0; + y += 1; + p += s; + while (y-3 < h) +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 6d0df3b..7109952 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno) + prect.h = (ih * 100) / dpi; + } + /* Process aspect ratio */ +- if (flag_aspect <= 0) ++ if (flag_aspect <= 0 && iw>0 && ih>0) + { + double dw = (double)iw / prect.w; + double dh = (double)ih / prect.h; +-- +2.20.1 + diff --git a/user/dmenu/APKBUILD b/user/dmenu/APKBUILD deleted file mode 100644 index ec90c9934..000000000 --- a/user/dmenu/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Eivind Uggedal <eivind@uggedal.com> -# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: Dan Theisen <djt@hxx.in> -pkgname=dmenu -pkgver=4.9 -pkgrel=0 -pkgdesc="Dynamic menu for X" -url="https://tools.suckless.org/dmenu/" -arch="all" -license="MIT OR X11" -depends="" -makedepends="libx11-dev libxinerama-dev libxft-dev" -options="!check" # This package has no testsuite -subpackages="$pkgname-doc" -source="https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" - -prepare() { - default_prepare - sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \ - -e '/LDFLAGS/{s/-s//;s/=/+=/}' \ - "$builddir"/config.mk -} - -build() { - make X11INC=/usr/include/X11 \ - X11LIB=/usr/lib/X11 \ - FREETYPEINC=/usr/include/freetype2 \ - -C "$builddir" -} - -package() { - make DESTDIR=$pkgdir PREFIX=/usr \ - -C "$builddir" install -} - -sha512sums="c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 dmenu-4.9.tar.gz" diff --git a/user/dmidecode/APKBUILD b/user/dmidecode/APKBUILD index 811c0a361..0d6ff8ac4 100644 --- a/user/dmidecode/APKBUILD +++ b/user/dmidecode/APKBUILD @@ -7,17 +7,16 @@ url="http://www.nongnu.org/dmidecode" arch="all" options="!check" # No test suite. license="GPL-2.0-only" +depends="" +makedepends="" subpackages="$pkgname-doc" -source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz - " +source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz" build() { - cd "$builddir" make prefix=/usr } package() { - cd "$builddir" make prefix=/usr DESTDIR="${pkgdir}" install } diff --git a/user/dmraid/APKBUILD b/user/dmraid/APKBUILD index 7f5b953d4..71545ecda 100644 --- a/user/dmraid/APKBUILD +++ b/user/dmraid/APKBUILD @@ -19,13 +19,11 @@ source="https://people.redhat.com/~heinzm/sw/$pkgname/src/$pkgname-$_realver-$pk builddir="$srcdir/$pkgname/$_realver-$pkgrel/$pkgname" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --prefix=/usr \ --build=$CBUILD \ @@ -34,7 +32,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD index 463e60300..24f2fb23e 100644 --- a/user/docbook2x/APKBUILD +++ b/user/docbook2x/APKBUILD @@ -20,7 +20,6 @@ source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz builddir="$srcdir/docbook2X-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir"/test/refentry - make check + make -C test/refentry check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index 732b54a1f..c7ffa7108 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -16,10 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev baloo-widgets-dev ruby-test-unit" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz - baloo.patch - frameworks.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/dolphin-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -32,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -44,6 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97ba07fc6e5f7295297149b8377620c0fb9dedec33833671f29e39f8cb4fb78051bd21d7d63b1dfc48126b03195b3eecc831c3882346a86fbb6ff1122996cbbc dolphin-19.08.2.tar.xz -9c61e0fd899d172f1a5e67f9621099c69ce673a1c66cc948dcf3bd74278c8fc206a029d33c56934fb7b42a91191c1259d966d4b39e4208226e9830c9f27ec411 baloo.patch -08801b4ae25e1f64eeb2b574bc09eed526f0fa570a6c12982db55aa5aa26498191c1a15c73bdb37664204cadd84abe80c9168f298558861010183af9e6c30368 frameworks.patch" +sha512sums="d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 dolphin-19.12.3.tar.xz" diff --git a/user/dolphin/baloo.patch b/user/dolphin/baloo.patch deleted file mode 100644 index 48efb30ed..000000000 --- a/user/dolphin/baloo.patch +++ /dev/null @@ -1,53 +0,0 @@ -Subject: Revert "handle maps with multiple or single entries from Baloo" - -This reverts commit 36b61838a27df32824c58f383453bb94b730b52c. - -diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp -index 469f079..f367154 100644 ---- a/src/kitemviews/private/kbaloorolesprovider.cpp -+++ b/src/kitemviews/private/kbaloorolesprovider.cpp -@@ -56,34 +56,18 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f - { - QHash<QByteArray, QVariant> values; - -+ QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties()); -+ while (it.hasNext()) { -+ it.next(); -- using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>; -- -- const auto& propMap = file.properties(); -- auto rangeBegin = propMap.constKeyValueBegin(); -- -- while (rangeBegin != propMap.constKeyValueEnd()) { -- auto key = (*rangeBegin).first; -- const KFileMetaData::PropertyInfo propertyInfo(key); -- const QByteArray role = roleForProperty(propertyInfo.name()); -- -- auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(), -- [key](const entry& e) { return e.first != key; }); - -+ const KFileMetaData::PropertyInfo pi(it.key()); -+ const QString property = pi.name(); -+ const QByteArray role = roleForProperty(property); - if (role.isEmpty() || !roles.contains(role)) { -- rangeBegin = rangeEnd; - continue; - } - -+ values.insert(role, pi.formatAsDisplayString(it.value())); -- auto distance = std::distance(rangeBegin, rangeEnd); -- if (distance > 1) { -- QVariantList list; -- list.reserve(static_cast<int>(distance)); -- std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); }); -- values.insert(role, propertyInfo.formatAsDisplayString(list)); -- } else { -- values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second)); -- } -- rangeBegin = rangeEnd; - } - - KFileMetaData::UserMetaData md(file.path()); --- -cgit v1.1 - diff --git a/user/dolphin/frameworks.patch b/user/dolphin/frameworks.patch deleted file mode 100644 index af57972c0..000000000 --- a/user/dolphin/frameworks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dolphin-19.04.0/CMakeLists.txt.old 2019-04-12 00:02:11.000000000 +0000 -+++ dolphin-19.04.0/CMakeLists.txt 2019-04-18 20:17:53.396872289 +0000 -@@ -8,7 +8,7 @@ - project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) - - set(QT_MIN_VERSION "5.8.0") --set(KF5_MIN_VERSION "5.57.0") -+set(KF5_MIN_VERSION "5.54.0") - - # ECM setup - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/user/dos2unix/APKBUILD b/user/dos2unix/APKBUILD new file mode 100644 index 000000000..4b80f6265 --- /dev/null +++ b/user/dos2unix/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=dos2unix +pkgver=7.4.1 +pkgrel=0 +pkgdesc="Convert line endings in plain text files" +url="https://sourceforge.net/projects/dos2unix/" +arch="all" +license="BSD-2-Clause-FreeBSD" +depends="" +makedepends="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/dos2unix/dos2unix-$pkgver.tar.gz" + +build() { + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4 dos2unix-7.4.1.tar.gz" diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD index e8674b531..e811aa22c 100644 --- a/user/dosbox/APKBUILD +++ b/user/dosbox/APKBUILD @@ -9,7 +9,8 @@ arch="all !s390x" options="!check" # dosbox does not ship tests license="GPL-2.0-only" depends="" -makedepends="ncurses-dev zlib-dev libxkbfile-dev libpng-dev libpcap-dev fluidsynth-dev sdl2-dev alsa-lib-dev" +makedepends="ncurses-dev zlib-dev libxkbfile-dev libpng-dev libpcap-dev + fluidsynth-dev sdl2-dev alsa-lib-dev autoconf automake libtool" source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513-1316.tar.gz porttalk-fix.patch asmfix.patch @@ -20,7 +21,6 @@ source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513 builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316" build() { - cd "$builddir" ./autogen.sh ./configure \ --build=$CBUILD \ @@ -33,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/dosfstools/APKBUILD b/user/dosfstools/APKBUILD index 0ee614c94..a45803e24 100644 --- a/user/dosfstools/APKBUILD +++ b/user/dosfstools/APKBUILD @@ -7,13 +7,12 @@ url="https://github.com/dosfstools/dosfstools" arch="all" license="GPL-3.0+" depends="" -makedepends="linux-headers" checkdepends="vim" +makedepends="linux-headers" subpackages="$pkgname-doc" source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/dotconf/APKBUILD b/user/dotconf/APKBUILD index 54f08fa92..5ea71278f 100644 --- a/user/dotconf/APKBUILD +++ b/user/dotconf/APKBUILD @@ -9,17 +9,15 @@ arch="all" license="LGPL-2.1-only" depends="" makedepends="" -subpackages="$pkgname-dev $pkgname-doc" -source="https://distfiles.gentoo.org/distfiles/dotconf-$pkgver.tar.gz" +subpackages="$pkgname-doc $pkgname-dev" +source="http://distfiles.gentoo.org/distfiles/dotconf-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD index 881e6156d..eefc391ce 100644 --- a/user/doxygen/APKBUILD +++ b/user/doxygen/APKBUILD @@ -3,7 +3,7 @@ pkgname=doxygen pkgver=1.8.16 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${pkgver#*.*.} -pkgrel=0 +pkgrel=1 pkgdesc="A documentation system for C++, C, Java, IDL, and PHP" url="http://www.doxygen.org/" arch="all" @@ -13,6 +13,7 @@ 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" @@ -30,7 +31,7 @@ build() { check() { # Remove test that use bibtex rm -f ./testing/012_cite.dox - make test + CTEST_OUTPUT_ON_FAILURE=true make test } package() { @@ -38,4 +39,5 @@ package() { } sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz -725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch" +725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch +92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch" diff --git a/user/doxygen/time64.patch b/user/doxygen/time64.patch new file mode 100644 index 000000000..ee06d6e03 --- /dev/null +++ b/user/doxygen/time64.patch @@ -0,0 +1,19 @@ +--- doxygen-Release_1_8_16/qtools/qdatetime.cpp.old 2019-08-08 13:36:52.000000000 +0000 ++++ doxygen-Release_1_8_16/qtools/qdatetime.cpp 2020-01-19 19:14:24.204239898 +0000 +@@ -35,7 +35,6 @@ + ** + **********************************************************************/ + +-#define gettimeofday __hide_gettimeofday + #include "qdatetime.h" + #include "qdatastream.h" + #include <stdio.h> +@@ -55,8 +54,6 @@ + #elif defined(_OS_UNIX_) || defined(_OS_MAC_) + #include <sys/time.h> + #include <unistd.h> +-#undef gettimeofday +-extern "C" int gettimeofday( struct timeval *, struct timezone * ); + #endif + + static const uint FIRST_DAY = 2361222; // Julian day for 1752/09/14 diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 71b016945..f0d269483 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -13,11 +13,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev ki18n-dev kjobwidgets-dev kio-dev kparts-dev solid-dev phonon-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/dragon-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/dragon-$pkgver.tar.xz" builddir="$srcdir"/dragon-$pkgver build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d40019da9e6d4bcad52bcac5e7adaaacca140276e9fd8e4e24bff3a22d12fb00e259b7d3e88fda0620a6b46bcccb648a680631c053a253a1d71df99b85695c3d dragon-19.08.2.tar.xz" +sha512sums="29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8 dragon-19.12.3.tar.xz" diff --git a/user/drkonqi/APKBUILD b/user/drkonqi/APKBUILD new file mode 100644 index 000000000..89580059e --- /dev/null +++ b/user/drkonqi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=drkonqi +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Crash diagnostic system for KDE" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11 +license="GPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND BSD-2-Clause" +depends="" +makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev + kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev kidletime-dev + kio-dev kitemviews-dev kjobwidgets-dev knotifications-dev kservice-dev + kwallet-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev + qt5-qtbase-dev qt5-qtx11extras-dev solid-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/drkonqi-$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="56f5cabe28681f218341aa4900f3dfc61d08bdacb5976ef34460b7663535d34a6e9ae05ff238a83337634b577aca36e795ee39d1968dfc39c7aa9a39c02f7cbc drkonqi-5.18.3.tar.xz" diff --git a/user/dtach/APKBUILD b/user/dtach/APKBUILD index d94502928..79751667a 100644 --- a/user/dtach/APKBUILD +++ b/user/dtach/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="dtach-$pkgver.tar.gz::https://github.com/crigler/dtach/archive/v$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/dumb-init/APKBUILD b/user/dumb-init/APKBUILD index e500cb008..541b964d4 100644 --- a/user/dumb-init/APKBUILD +++ b/user/dumb-init/APKBUILD @@ -8,6 +8,8 @@ url="https://github.com/Yelp/dumb-init" arch="all" options="!check" # Check requires Python 3.7 and will not function correctly within chroots. license="MIT" +depends="" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/Yelp/$pkgname/archive/v$pkgver.tar.gz" build() { diff --git a/user/ebgaramond/APKBUILD b/user/ebgaramond/APKBUILD index f1f071a67..4db1ce2c0 100644 --- a/user/ebgaramond/APKBUILD +++ b/user/ebgaramond/APKBUILD @@ -15,8 +15,7 @@ source="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-$pkgver.zi builddir="$srcdir/EBGaramond-0.016" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ otf/*.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/otf/*.otf } sha512sums="f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955 EBGaramond-0.016.zip" diff --git a/user/ebook-tools/APKBUILD b/user/ebook-tools/APKBUILD index 6c33ad3d5..6eeeb3cdb 100644 --- a/user/ebook-tools/APKBUILD +++ b/user/ebook-tools/APKBUILD @@ -8,12 +8,11 @@ url="https://sourceforge.net/projects/ebook-tools/" arch="all" license="MIT" depends="convertlit cmd:which" -makedepends="libxml2-dev libzip-dev" +makedepends="cmake libxml2-dev libzip-dev" subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/ebook-tools/ebook-tools-$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -22,17 +21,15 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD index f0f7bd1d8..a22c2d68a 100644 --- a/user/editres/APKBUILD +++ b/user/editres/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/editres-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD index 0cde72c5a..5f2149b22 100644 --- a/user/efibootmgr/APKBUILD +++ b/user/efibootmgr/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl" } package() { - cd "$builddir" make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl" DESTDIR="$pkgdir" install } diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD index bcfcc3a2a..13b1b64bd 100644 --- a/user/efivar/APKBUILD +++ b/user/efivar/APKBUILD @@ -17,12 +17,10 @@ source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$p " build() { - cd "$builddir" make prefix="/usr" libdir="/usr/lib" } package() { - cd "$builddir" make DESTDIR="$pkgdir" prefix="/usr" libdir="/usr/lib" install } diff --git a/user/eggdbus/APKBUILD b/user/eggdbus/APKBUILD index ddceb9066..96ba02a34 100644 --- a/user/eggdbus/APKBUILD +++ b/user/eggdbus/APKBUILD @@ -7,18 +7,17 @@ pkgdesc="Experimental D-Bus bindings for GObject" url="https://cgit.freedesktop.org/~david/eggdbus" arch="all" license="LGPL-2.0+" +depends="" makedepends="dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD index a1db01ae7..87a2da365 100644 --- a/user/emacs/APKBUILD +++ b/user/emacs/APKBUILD @@ -4,9 +4,9 @@ pkgname=emacs pkgver=26.3 pkgrel=0 pkgdesc="The extensible, customizable, self-documenting real-time display editor" +url="https://www.gnu.org/software/emacs/" arch="all" options="!check !dbg" -url="https://www.gnu.org/software/emacs/" license="GPL-3.0+" depends="emacs-nox" makedepends="autoconf automake linux-headers @@ -16,7 +16,8 @@ makedepends="autoconf automake linux-headers ncurses-libs gnutls-dev libxaw-dev" subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2" source="https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz - gamedir.patch" + gamedir.patch + " prepare() { default_prepare diff --git a/user/encfs/APKBUILD b/user/encfs/APKBUILD new file mode 100644 index 000000000..a20e1c888 --- /dev/null +++ b/user/encfs/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=encfs +pkgver=1.9.5 +pkgrel=0 +pkgdesc="Encrypted filesystem for FUSE" +url="https://vgough.github.io/encfs/" +arch="all" +license="LGPL-3.0+ AND GPL-3.0+ AND MIT AND Zlib" +depends="" +makedepends="cmake fuse-dev openssl-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://github.com/vgough/encfs/releases/download/v$pkgver/encfs-$pkgver.tar.gz + cmake.patch + length.patch + shell.patch + typos.patch + utimensat.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 \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + make -C build unittests + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 encfs-1.9.5.tar.gz +4810156ba2d61aef2f5c0c4cf8528596752309aacba5930aa6becfc6160b3c897df7570408b6431d5f09d6f85cd0fc41bd9127d47bdc9da6eb2e6321a9bda2f6 cmake.patch +fa94088ad23ca9bdc2127f3025dc27fbf148ce94aad0378601cf0e0831039f654d74f2b3259d18ab448df3e3e63e96c59c73275abe0463504f91345d495f4375 length.patch +c25a8c0a65c163ce87c3275261f0dae01df8d382a31a97efdc074a746cc8e8e2564e19568ca84e49c8c0c209406257dcd161784f47ec9fc78251e2c3175a3a82 shell.patch +432199fddc361a8ace6c09a883261d07dc3aead6450584c52e98ddfaf310e5621fc9f3c3da48f012104690cc036a251919100c5d0ad17143e68ba07e826dafd9 typos.patch +2e44c9808e065424c62d81f58798c25f5d749a5f12aa46d62385e610aff563a8730100035ac044d9ea00430cd275ced33184682d1d1b55a46ef8e22d821cc635 utimensat.patch" diff --git a/user/encfs/cmake.patch b/user/encfs/cmake.patch new file mode 100644 index 000000000..4e564d996 --- /dev/null +++ b/user/encfs/cmake.patch @@ -0,0 +1,72 @@ +From 4328178788c1adcdf431952b2723770607f3cbec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rogelio=20Dom=C3=ADnguez=20Hern=C3=A1ndez?= + <rogelio.dominguez@gmail.com> +Date: Fri, 21 Feb 2020 15:48:12 -0600 +Subject: [PATCH] Remove "SYSTEM" from the include_directories() CMakeLists.txt + entries (#561) + +--- + CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62a2ad0d..e90ce0c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,7 @@ endif() + + # Check for FUSE. + find_package (FUSE REQUIRED) +-include_directories (SYSTEM ${FUSE_INCLUDE_DIR}) ++include_directories (${FUSE_INCLUDE_DIR}) + add_definitions (-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=29) + if (CYGWIN) + # Cygwin build is intended to use WinFsp +@@ -105,7 +105,7 @@ endif() + + # Check for OpenSSL. + find_package (OpenSSL REQUIRED) +-include_directories (SYSTEM ${OPENSSL_INCLUDE_DIR}) ++include_directories (${OPENSSL_INCLUDE_DIR}) + + find_program (POD2MAN pod2man) + +@@ -187,7 +187,7 @@ include_directories (${CMAKE_CURRENT_LIST_DIR}) + if (ENABLE_NLS) + find_package (Intl) + if (Intl_FOUND) +- include_directories (SYSTEM ${Intl_INCLUDE_DIRS}) ++ include_directories (${Intl_INCLUDE_DIRS}) + endif() + + add_subdirectory(po) +@@ -236,11 +236,11 @@ if (USE_INTERNAL_TINYXML) + endif () + set(BUILD_TESTS OFF CACHE BOOL "build tests") + add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL) +- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) ++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) + link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}) + else () + find_package (TinyXML REQUIRED) +- include_directories (SYSTEM ${TINYXML_INCLUDE_DIR}) ++ include_directories (${TINYXML_INCLUDE_DIR}) + endif () + + if (USE_INTERNAL_EASYLOGGING) +@@ -248,13 +248,13 @@ if (USE_INTERNAL_EASYLOGGING) + set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp) + set(build_static_lib ON CACHE BOOL "build static libs") + add_subdirectory(${EASYLOGGING_DIR} EXCLUDE_FROM_ALL) +- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src) ++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src) + link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR}) + set(EASYLOGGINGPP_LIBRARY easyloggingpp) + else () + set(EASYLOGGINGPP_USE_SHARED_LIBS ON CACHE BOOL "look for shared lib") + find_package (EASYLOGGINGPP REQUIRED) +- include_directories (SYSTEM ${EASYLOGGINGPP_INCLUDE_DIR}) ++ include_directories (${EASYLOGGINGPP_INCLUDE_DIR}) + endif () + + set(SOURCE_FILES diff --git a/user/encfs/length.patch b/user/encfs/length.patch new file mode 100644 index 000000000..be3f373c3 --- /dev/null +++ b/user/encfs/length.patch @@ -0,0 +1,22 @@ +From dafeb556d27076b0c6fa23e44e523bdd84598838 Mon Sep 17 00:00:00 2001 +From: Ben RUBSON <ben.rubson@gmail.com> +Date: Sun, 9 Dec 2018 11:28:42 +0100 +Subject: [PATCH] Correct block filename max length (#540) + +--- + encfs/encfs.pod | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/encfs/encfs.pod b/encfs/encfs.pod +index 6cb5b8f5..d3831296 100644 +--- a/encfs/encfs.pod ++++ b/encfs/encfs.pod +@@ -490,7 +490,7 @@ filenames for some reason. + + Based on an underlying filesystem supporting a maximum of 255 characters in + filenames, here is the maximum possible filename length depending on the choosen +-encoding scheme : stream (189), block (176), block32 (143). Note that we should ++encoding scheme : stream (189), block (175), block32 (143). Note that we should + rather talk about bytes, when filenames contain special (multi-bytes) characters. + + Prior to version 1.1, only stream encoding was supported. diff --git a/user/encfs/shell.patch b/user/encfs/shell.patch new file mode 100644 index 000000000..40876ca9f --- /dev/null +++ b/user/encfs/shell.patch @@ -0,0 +1,22 @@ +From 4f21701c1aaeb3e5b9822231e011ac3224026a4c Mon Sep 17 00:00:00 2001 +From: Daniel Santana <daniel@santana.tech> +Date: Sun, 9 Dec 2018 08:37:12 -0200 +Subject: [PATCH] Use /bin/sh as a fallback to SHELL in encfssh (#538) + +--- + encfs/encfssh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/encfs/encfssh b/encfs/encfssh +index fe7b502e..d9566f7d 100755 +--- a/encfs/encfssh ++++ b/encfs/encfssh +@@ -77,7 +77,7 @@ fuse_umount() { + } + + # Honor the SHELL environment variable to select a shell to run +-"$SHELL"; retval=$? ++"${SHELL:-/bin/sh}"; retval=$? + + # ensure that this shell isn't itself holding the mounted directory open + # ...but avoid terminating on failure, *or* causing a shellcheck warning for diff --git a/user/encfs/typos.patch b/user/encfs/typos.patch new file mode 100644 index 000000000..8809d8a1d --- /dev/null +++ b/user/encfs/typos.patch @@ -0,0 +1,44 @@ +From 24af76d0d9503e1bd0725f6b448c8fecb603ab56 Mon Sep 17 00:00:00 2001 +From: Vasiliy Glazov <vascom2@gmail.com> +Date: Tue, 3 Jul 2018 08:57:09 +0300 +Subject: [PATCH] Correct typo in russian translate (#528) + +--- + po/ru.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/ru.po b/po/ru.po +index 33ad129b..c0793cc8 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -448,7 +448,7 @@ msgstr "" + "Выберите одну из следующих букв:\n" + " введите \"x\" для режима эксперта,\n" + " введите \"p\" для режима максимальной секретности,\n" +-" любой другая буква для выбора стандартного режима.\n" ++" любая другая буква для выбора стандартного режима.\n" + "?> " + + #, c-format +From ce200c83f0d9b5309f3e8fae7283c4cad598f637 Mon Sep 17 00:00:00 2001 +From: Shohei Kusakata <shohei@kusakata.com> +Date: Thu, 18 Jul 2019 19:29:16 +0900 +Subject: [PATCH] Fix typo in japanese translation (#553) + +--- + po/ja.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/ja.po b/po/ja.po +index eccefb44..b089aadf 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -608,7 +608,7 @@ msgid "" + " - invalid options -- see usage message\n" + msgstr "" + "fuse が失敗しました。一般的な原因としては:\n" +-" - fuse カーネルモジュールがインストールされていない (modeprobe fuse)\n" ++" - fuse カーネルモジュールがインストールされていない (modprobe fuse)\n" + " - 無効なオプション -- 使い方を参照してください\n" + + #, c-format diff --git a/user/encfs/utimensat.patch b/user/encfs/utimensat.patch new file mode 100644 index 000000000..93c5378e1 --- /dev/null +++ b/user/encfs/utimensat.patch @@ -0,0 +1,22 @@ +From 3d060783eea3790b8d6ea9920db8a0dc6e73d184 Mon Sep 17 00:00:00 2001 +From: Russell Yanofsky <russ@yanofsky.org> +Date: Sun, 16 Sep 2018 15:41:11 -0400 +Subject: [PATCH] Fix setting nanosecond times + +utimensat function was never being called due to missing cmake define +--- + config.h.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.h.cmake b/config.h.cmake +index 8548d706..32ddf2bb 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -6,6 +6,7 @@ + #cmakedefine XATTR_LLIST + + #cmakedefine HAVE_LCHMOD ++#cmakedefine HAVE_UTIMENSAT + #cmakedefine HAVE_FDATASYNC + + #cmakedefine HAVE_DIRENT_D_TYPE diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD index c535aba6a..b8ed52b7b 100644 --- a/user/encodings/APKBUILD +++ b/user/encodings/APKBUILD @@ -8,6 +8,7 @@ arch="noarch" license="Public-Domain" depends="" makedepends="cmd:gzip mkfontscale util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/encodings-$pkgver.tar.bz2" build() { diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD index a9332f56a..1656f8a25 100644 --- a/user/engrampa/APKBUILD +++ b/user/engrampa/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=engrampa -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Archive manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/engrampa-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7d57d863a7e6236fdff8c9925647438056474cc7fed32a4ba6a2ba6121a856aa070b47292edb0db447369082cddff9b40978c7c92aecc3d8c2ebc17a4cf3ea99 engrampa-1.22.2.tar.xz" +sha512sums="b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce engrampa-1.24.0.tar.xz" diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD index bc53bc9b7..d7ed3dfd1 100644 --- a/user/eom/APKBUILD +++ b/user/eom/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=eom -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Image viewer for the MATE desktop environment" url="https://mate-desktop.org" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe eom-1.22.2.tar.xz" +sha512sums="17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab eom-1.24.0.tar.xz" diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD index c4fe28bb2..5fdc774fd 100644 --- a/user/erl-rebar/APKBUILD +++ b/user/erl-rebar/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="Legacy Erlang build tool" url="https://github.com/rebar/rebar" arch="noarch" -license="Apache-2" options="!tracedeps" +license="Apache-2.0" depends="erlang" makedepends="erlang-dev" source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver" diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD index a37633ae8..689c82cc7 100644 --- a/user/erl-rebar3/APKBUILD +++ b/user/erl-rebar3/APKBUILD @@ -4,10 +4,10 @@ pkgname=erl-rebar3 pkgver=3.11.1 pkgrel=0 pkgdesc="Erlang build tool" -url="http://www.rebar3.org/" +url="https://www.rebar3.org/" arch="noarch" -license="Apache-2" options="!tracedeps" +license="Apache-2.0" depends="erlang" makedepends="erlang-dev" subpackages="$pkgname-doc" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index befef61d9..733fcae80 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.1.1 +pkgver=22.2.7 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" @@ -33,7 +33,6 @@ build() { } check() { - local _header export ERL_TOP=$builddir make release_tests @@ -51,5 +50,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39 erlang-22.1.1.tar.gz -91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch" +sha512sums="1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b erlang-22.2.7.tar.gz +4331f4b9a8cd0787d79f26304415604118cf2f750cb2e98f3d0bb16dbf9e2b5e230b4b4b15fed4ac207a0ae83a0963adebd3f5e9423b98f0b7f733334669709d fix-wx-linking.patch" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch index e1e8d4333..234da77fb 100644 --- a/user/erlang/fix-wx-linking.patch +++ b/user/erlang/fix-wx-linking.patch @@ -1,6 +1,6 @@ --- otp-OTP-22.0.7/lib/wx/configure.in.old 2019-07-10 16:05:15.000000000 +0000 +++ otp-OTP-22.0.7/lib/wx/configure.in 2019-08-07 01:00:20.532799505 +0000 -@@ -650,7 +650,7 @@ +@@ -630,7 +630,7 @@ // it isn't in too old wxWidgets versions wxString test = wxString::FromUTF8((const char *)"foo"); wxStyledTextCtrl * foo = new wxStyledTextCtrl(); diff --git a/user/ers-symbols/APKBUILD b/user/ers-symbols/APKBUILD index 652acc95f..7cf4173e6 100644 --- a/user/ers-symbols/APKBUILD +++ b/user/ers-symbols/APKBUILD @@ -15,8 +15,7 @@ source="https://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip" builddir="$srcdir"/ersSymbolsVersion0202/ersV2sym package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf } sha512sums="f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717 ers_v220.zip" diff --git a/user/essays1743/APKBUILD b/user/essays1743/APKBUILD index 930050ba1..0c0ce7654 100644 --- a/user/essays1743/APKBUILD +++ b/user/essays1743/APKBUILD @@ -15,7 +15,6 @@ source="https://www.thibault.org/fonts/essays/essays1743-$pkgver-1.ttc" builddir="$srcdir/" package() { - cd "$builddir" install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ essays1743-$pkgver-1.ttc } diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD index be9d4e369..984066d58 100644 --- a/user/ethtool/APKBUILD +++ b/user/ethtool/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=ethtool -pkgver=5.3 +pkgver=5.4 pkgrel=0 pkgdesc="Utility for controlling network drivers and hardware" url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/" arch="all" license="GPL-2.0-only AND GPL-2.0+" +depends="" makedepends="linux-headers" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz" @@ -39,4 +40,4 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/ } -sha512sums="ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0 ethtool-5.3.tar.xz" +sha512sums="c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b ethtool-5.4.tar.xz" diff --git a/user/eudev/APKBUILD b/user/eudev/APKBUILD index 9e28545fe..16858e1f5 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=eudev -pkgver=3.2.8 -pkgrel=1 +pkgver=3.2.9 +pkgrel=0 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" arch="all" @@ -99,7 +99,7 @@ openrc() { "$subpkgdir"/usr/share/openrc/runlevels/sysinit/udev-trigger } -sha512sums="13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 eudev-3.2.8.tar.gz +sha512sums="09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f eudev-3.2.9.tar.gz 683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 0b33539d5..6811c1bef 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.34.0 +pkgver=3.34.2 pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" @@ -75,4 +75,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="41e59cca65003e6abca934f770b0504af13644222e88223b1b713aafd6b3335873422e914775f79182fe45de4d7fda3767cbb41c6088ff47fa8560e97b19bde2 evince-3.34.0.tar.xz" +sha512sums="51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12 evince-3.34.2.tar.xz" diff --git a/user/exfat-utils/APKBUILD b/user/exfat-utils/APKBUILD index 552d1bfe6..cfdabc42c 100644 --- a/user/exfat-utils/APKBUILD +++ b/user/exfat-utils/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://github.com/relan/exfat/releases/download/v$pkgver/exfat-utils-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 82aa2a958..fb710b602 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,19 +1,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 pkgver=0.27.2 -pkgrel=1 +pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="https://www.exiv2.org/" arch="all" license="GPL-2.0+" depends="" depends_dev="expat-dev zlib-dev" -makedepends="$depends_dev bash cmake" checkdepends="python3 libxml2 cmd:which" +makedepends="$depends_dev bash cmake" subpackages="$pkgname-dev $pkgname-doc" source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz - https://dev.sick.bike/dist/exiv2-0.27.2-POC-file_issue_1019 - CVE-2019-17402.patch" + https://dev.sick.bike/dist/exiv2-$pkgver-POC-file_issue_1019 + https://dev.sick.bike/dist/exiv2-$pkgver-Jp2Image_readMetadata_loop.poc + CVE-2019-17402.patch + CVE-2019-20421.patch + " builddir="$srcdir/$pkgname-$pkgver-Source" # secfixes: @@ -86,34 +89,38 @@ builddir="$srcdir/$pkgname-$pkgver-Source" # - CVE-2019-13114 # 0.27.2-r1: # - CVE-2019-17402 +# 0.27.2-r2: +# - CVE-2019-20421 prepare() { default_prepare - mkdir build # Remove #1019 POC after >= 0.27.2 mv "$srcdir/$pkgname-$pkgver-POC-file_issue_1019" \ test/data/POC-file_issue_1019 + + # Ditto + mv "$srcdir/$pkgname-$pkgver-Jp2Image_readMetadata_loop.poc" \ + test/data/Jp2Image_readMetadata_loop.poc } build() { - cd "$builddir/build" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo .. - make + -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild + make -C build } check() { - cd "$builddir/build" - make tests + make -C build tests } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 exiv2-0.27.2-Source.tar.gz cfe0b534c29c37e7b6e5a00e8ec320cb57eb17187813fe30677a097e930655f1b097ce77806e0124affbdc423b48d9910560158eed9d2d03418a824244dafba9 exiv2-0.27.2-POC-file_issue_1019 -623232624f5382c7261a8b7e66063954c37555b7812e4f2e9af8433c4d8a1f141feafbfd2c5081395208cf1c65307ce1b39e5e34f689c558dce82f78030b29dd CVE-2019-17402.patch" +d2c0f59e9e2daf00066b0ad73253bb7bb09b3319606813f16478ef5717751e4cbb93d12f5c9339dae2965dcf6a63138bdb4205b698aeab57a75f97ddf458d4f7 exiv2-0.27.2-Jp2Image_readMetadata_loop.poc +623232624f5382c7261a8b7e66063954c37555b7812e4f2e9af8433c4d8a1f141feafbfd2c5081395208cf1c65307ce1b39e5e34f689c558dce82f78030b29dd CVE-2019-17402.patch +c819f06a194b8465c66ccd91b8373cb2a359e59bab7583a8abb873c2001efe6188ac8fa4717c6382d2f2396d25e79e7b397c5ebf000d35c4a7dae547db7bc77b CVE-2019-20421.patch" diff --git a/user/exiv2/CVE-2019-20421.patch b/user/exiv2/CVE-2019-20421.patch new file mode 100644 index 000000000..bdc5449f2 --- /dev/null +++ b/user/exiv2/CVE-2019-20421.patch @@ -0,0 +1,116 @@ +From 1b917c3f7dd86336a9f6fda4456422c419dfe88c Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Tue, 1 Oct 2019 17:39:44 +0100 +Subject: [PATCH] Fix #1011 fix_1011_jp2_readmetadata_loop + +--- + src/jp2image.cpp | 25 +++++++++++++++---- + tests/bugfixes/github/test_CVE_2017_17725.py | 4 +-- + tests/bugfixes/github/test_issue_1011.py | 13 ++++++++++ + 4 files changed, 35 insertions(+), 7 deletions(-) + create mode 100755 test/data/Jp2Image_readMetadata_loop.poc + create mode 100644 tests/bugfixes/github/test_issue_1011.py + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index d5cd1340a..0de088d62 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -18,10 +18,6 @@ + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. + */ + +-/* +- File: jp2image.cpp +-*/ +- + // ***************************************************************************** + + // included header files +@@ -197,6 +193,16 @@ namespace Exiv2 + return result; + } + ++static void boxes_check(size_t b,size_t m) ++{ ++ if ( b > m ) { ++#ifdef EXIV2_DEBUG_MESSAGES ++ std::cout << "Exiv2::Jp2Image::readMetadata box maximum exceeded" << std::endl; ++#endif ++ throw Error(kerCorruptedMetadata); ++ } ++} ++ + void Jp2Image::readMetadata() + { + #ifdef EXIV2_DEBUG_MESSAGES +@@ -219,9 +225,12 @@ namespace Exiv2 + Jp2BoxHeader subBox = {0,0}; + Jp2ImageHeaderBox ihdr = {0,0,0,0,0,0,0,0}; + Jp2UuidBox uuid = {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; ++ size_t boxes = 0 ; ++ size_t boxem = 1000 ; // boxes max + + while (io_->read((byte*)&box, sizeof(box)) == sizeof(box)) + { ++ boxes_check(boxes++,boxem ); + position = io_->tell(); + box.length = getLong((byte*)&box.length, bigEndian); + box.type = getLong((byte*)&box.type, bigEndian); +@@ -251,8 +260,12 @@ namespace Exiv2 + + while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox) && subBox.length ) + { ++ boxes_check(boxes++, boxem) ; + subBox.length = getLong((byte*)&subBox.length, bigEndian); + subBox.type = getLong((byte*)&subBox.type, bigEndian); ++ if (subBox.length > io_->size() ) { ++ throw Error(kerCorruptedMetadata); ++ } + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Exiv2::Jp2Image::readMetadata: " + << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl; +@@ -308,7 +321,9 @@ namespace Exiv2 + } + + io_->seek(restore,BasicIo::beg); +- io_->seek(subBox.length, Exiv2::BasicIo::cur); ++ if ( io_->seek(subBox.length, Exiv2::BasicIo::cur) != 0 ) { ++ throw Error(kerCorruptedMetadata); ++ } + restore = io_->tell(); + } + break; +diff --git a/tests/bugfixes/github/test_CVE_2017_17725.py b/tests/bugfixes/github/test_CVE_2017_17725.py +index 1127b9806..670a75d8d 100644 +--- a/tests/bugfixes/github/test_CVE_2017_17725.py ++++ b/tests/bugfixes/github/test_CVE_2017_17725.py +@@ -11,7 +11,7 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): + filename = "$data_path/poc_2017-12-12_issue188" + commands = ["$exiv2 " + filename] + stdout = [""] +- stderr = ["""$exiv2_overflow_exception_message """ + filename + """: +-$addition_overflow_message ++ stderr = ["""$exiv2_exception_message """ + filename + """: ++$kerCorruptedMetadata + """] + retval = [1] +diff --git a/tests/bugfixes/github/test_issue_1011.py b/tests/bugfixes/github/test_issue_1011.py +new file mode 100644 +index 000000000..415861188 +--- /dev/null ++++ b/tests/bugfixes/github/test_issue_1011.py +@@ -0,0 +1,13 @@ ++# -*- coding: utf-8 -*- ++ ++from system_tests import CaseMeta, path ++ ++class Test_issue_1011(metaclass=CaseMeta): ++ ++ filename = path("$data_path/Jp2Image_readMetadata_loop.poc") ++ commands = ["$exiv2 " + filename] ++ stdout = [""] ++ stderr = ["""$exiv2_exception_message """ + filename + """: ++$kerCorruptedMetadata ++"""] ++ retval = [1] +\ No newline at end of file diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 99e6f9994..d3d135619 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,12 +1,13 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=exo -pkgver=0.12.8 +pkgver=0.12.11 pkgrel=0 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ AND GPL-2.0+" +depends="" makedepends="intltool glib-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libice-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5b96f1e3ba7112d349ee7d986288996c52210304d0aa54594fdc8c85ec0b12e13791f320f28e91bd25afda5f1046f402ba4fcf2eca5df5d8fc0c3515cd6b98a3 exo-0.12.8.tar.bz2" +sha512sums="ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533 exo-0.12.11.tar.bz2" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 40bff86ff..37a599524 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,44 +1,41 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" -arch="all" -license="BSD-3-Clause" +arch="noarch" options="!dbg" +license="BSD-3-Clause" depends="" makedepends="cmake qt5-qtbase-dev qt5-qttools-dev qt5-qtdeclarative-dev - qt5-qtquickcontrols" -subpackages="" + qt5-qtquickcontrols py3-sphinx" +subpackages="$pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/extra-cmake-modules-$pkgver.tar.xz - posix.patch" + posix.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE \ - ctest -E '(relative_or_absolute_|KDEFetchTranslations|ECMToolchainAndroidTest|ECMPoQmToolsTest)' + ctest -E '(relative_or_absolute_|KDEFetchTranslations)' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2c592ab659dc2c1167111d394b976f7d008b9c3e8e18aea06001f4852f93d6a0e61c2ea5f6add2680e11f76da9f5f8c437afd350c5d3224cf1e9adba2dd765e1 extra-cmake-modules-5.54.0.tar.xz -0af703a9d4696080bc52032d1d341e86fd142bef91f3c1afa9cf180e1cf2ff3bba2ea47fd36b8f52135f056a202c58a08e7c7525f671d6993839865ce6aef0f6 posix.patch" +sha512sums="0e3d7d9c6fd58dbf87923ec35709bbf11386d65038f698461de51bdb65a9f05c84fe9902184f97f47b133dfb88118d6306f30f6eeee912f89b9c41a3e30ffac1 extra-cmake-modules-5.68.0.tar.xz +a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/extra-cmake-modules/posix.patch b/user/extra-cmake-modules/posix.patch index 4ed301d5e..9e0b5474a 100644 --- a/user/extra-cmake-modules/posix.patch +++ b/user/extra-cmake-modules/posix.patch @@ -17,7 +17,7 @@ diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSett index dfa29f7..f50911c 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake -@@ -140,6 +140,9 @@ if (UNIX) +@@ -157,6 +157,9 @@ if (UNIX) # implementation recognize it? _kde_add_platform_definitions(-D_LARGEFILE64_SOURCE) diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index 970d16f7e..679d7831e 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=faad2 -pkgver=2.9.0 +pkgver=2.9.1 _pkgver="$(printf '%s' "$pkgver" | tr . _)" pkgrel=0 pkgdesc="ISO AAC audio decoder" @@ -8,9 +8,9 @@ url="https://www.audiocoding.com/" arch="all" options="!check" # No test suite. license="GPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="autoconf automake libtool" +subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/knik0/faad2/archive/$_pkgver.tar.gz" builddir="$srcdir/$pkgname-$_pkgver" @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc faad2-2.9.0.tar.gz" +sha512sums="1015f5b49baebf6c9404cfcd7b9d524cc76a57abcd1a46bb851463ae5226bfd8b80155b661708f66548466422855cd7aeec5676463cd1346c5fb1dc0821621ce faad2-2.9.1.tar.gz" diff --git a/user/fantasque-sans-mono/APKBUILD b/user/fantasque-sans-mono/APKBUILD index 5fc591222..3d4712524 100644 --- a/user/fantasque-sans-mono/APKBUILD +++ b/user/fantasque-sans-mono/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fantasque-sans-mono -pkgver=1.7.2 +pkgver=1.8.0 pkgrel=0 pkgdesc="Monospace typeface with unique accents, designed for programming" url="https://fontlibrary.org/en/font/fantasque-sans-mono" @@ -15,8 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/belluzj/fantasque-sans/relea builddir="$srcdir"/OTF package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/*.otf } -sha512sums="f854de5a5e0464d7f69b484c4ae0f59cfdcaa65d357b9935eda1df8cb90781f78c6b6ab0a96ac5099a6464a52de14cf26630d3db5dad8228e86e44033b32c228 fantasque-sans-mono-1.7.2.tar.gz" +sha512sums="3afbd441d192769ea44fd7730e728844d13c15b0dd52e3968e6e1659ffa11a173d21891c09ceb7465b83a0b8c923129df2554e159620c9611ee9bb6ff35c90c6 fantasque-sans-mono-1.8.0.tar.gz" diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD index f0d45c176..c5a6f422e 100644 --- a/user/farstream/APKBUILD +++ b/user/farstream/APKBUILD @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fastjar/APKBUILD b/user/fastjar/APKBUILD index b821b2419..249f3a9b1 100644 --- a/user/fastjar/APKBUILD +++ b/user/fastjar/APKBUILD @@ -17,13 +17,11 @@ source="https://download.savannah.nongnu.org/releases/fastjar/fastjar-$pkgver.ta " prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/lib/charset.alias } diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD index 1cd4e02b3..944256215 100644 --- a/user/fdupes/APKBUILD +++ b/user/fdupes/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz" build() { - cd "$builddir" make PREFIX=/usr } package() { - cd "$builddir" make PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index 8df9c0bff..2d9bf4be6 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=featherpad -pkgver=0.11.1 +pkgver=0.12.1 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="d5c3a6b1505c89498d04ca90aff5824611e63ac01f68830c8715c3c5dc7029c6b1779215b69726190875791941e57c694d0716089f117470f8a84ab6d2679b10 FeatherPad-0.11.1.tar.gz +sha512sums="fdeb20574e265f5cae36f97b1993b83afc7dfc3c5dc24aa8482adb972e1bd7624e343b15a5996fee31f8fd1815c072f89e8d97910def560e99301586442c67e5 FeatherPad-0.12.1.tar.gz 471714eec9a376b138cc4c6c7b7d1339c9767091309c95b11ef2a8536250c796367b1544dca9610cc10babdbd08ac1436784d71292680b9da90e681dd855aaf0 hunspell-link.patch" diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index ad6703b80..899461202 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=feh -pkgver=3.2.1 +pkgver=3.3 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="https://feh.finalrewind.org/" arch="all" license="MIT-feh" depends="" +checkdepends="perl-test-command" makedepends="curl-dev imlib2-dev libexif-dev libjpeg-turbo-dev libpng-dev libxinerama-dev libxt-dev" -checkdepends="perl-test-command" subpackages="$pkgname-doc" source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2" @@ -31,4 +31,4 @@ package() { install } -sha512sums="11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a feh-3.2.1.tar.bz2" +sha512sums="0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 feh-3.3.tar.bz2" diff --git a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch index 93e3ac995..9cc6fdfcf 100644 --- a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch @@ -15,7 +15,7 @@ diff --git a/libavutil/internal.h b/libavutil/internal.h index 61784b5..69d63d5 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h -@@ -177,34 +177,6 @@ +@@ -187,34 +187,6 @@ #endif /** diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 06d9db55c..b6de0597c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,21 +3,22 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" -license="GPL-2.0-only" options="!check textrels" # Test suite requires proper licensing headers on all files, # which upstream does not provide. -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +license="GPL-2.0-only" +depends="" makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev libxfixes-dev opus-dev perl-dev pulseaudio-dev sdl2-dev speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev xz-dev yasm zlib-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 " @@ -38,7 +39,7 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz # - CVE-2017-14225 build() { - local _asm="" + _asm="" case "$CARCH" in ppc64) _asm="--cpu=G5" ;; @@ -85,7 +86,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } @@ -97,5 +97,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz -32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" +sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz +1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD index 8a3049363..b8f5f02a2 100644 --- a/user/ffmpegthumbnailer/APKBUILD +++ b/user/ffmpegthumbnailer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ffmpegthumbnailer pkgver=2.2.2 pkgrel=0 @@ -7,12 +7,12 @@ pkgdesc="Thumbnail generator based on FFMPEG" url="https://github.com/dirkvdb/ffmpegthumbnailer" arch="all" license="GPL-2.0+" -makedepends="ffmpeg-dev libjpeg-turbo-dev libpng-dev" +depends="" +makedepends="cmake ffmpeg-dev libjpeg-turbo-dev libpng-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$pkgver/ffmpegthumbnailer-$pkgver.tar.bz2" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,17 +25,15 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_GIO=True \ -DENABLE_THUMBNAILER=True \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 5ae37a61f..82d7730c7 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev ffmpeg-dev kconfig-dev ki18n-dev kio-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ffmpegthumbs-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ffmpegthumbs-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b708034ac4b8541f84ce6b806f8e914f656fde260c24b5a4e1d957fe01ec145e62a41545e535821122b1b26e590caba74bd192b309fe295fb0b7fb423f3550b9 ffmpegthumbs-19.08.2.tar.xz" +sha512sums="4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191 ffmpegthumbs-19.12.3.tar.xz" diff --git a/user/fifth-leg/APKBUILD b/user/fifth-leg/APKBUILD index c80ecb5a6..43cf5b2b3 100644 --- a/user/fifth-leg/APKBUILD +++ b/user/fifth-leg/APKBUILD @@ -15,8 +15,7 @@ source="https://api.opensuse.org/public/source/openSUSE:Factory/fifth-leg-font/o builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf } sha512sums="7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9 opensuse-font-fifth-leg-0.6.tar.bz2" diff --git a/user/figlet/APKBUILD b/user/figlet/APKBUILD index 1d44369c4..da4121dc4 100644 --- a/user/figlet/APKBUILD +++ b/user/figlet/APKBUILD @@ -11,20 +11,18 @@ depends="" makedepends="" subpackages="$pkgname-doc" source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz - musl-fix-cplusplus-decls.patch" + musl-fix-cplusplus-decls.patch + " build() { - cd "$builddir" make DEFAULTFONTDIR=/usr/share/figlet/fonts all } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \ DEFAULTFONTDIR=/usr/share/figlet/fonts install install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/user/fira-code/APKBUILD b/user/fira-code/APKBUILD index faf3b214b..6f6808256 100644 --- a/user/fira-code/APKBUILD +++ b/user/fira-code/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fira-code -pkgver=1.207 +pkgver=2 pkgrel=0 pkgdesc="Monospace typeface with ligatures for programming" url="https://patreon.com/tonsky" @@ -18,4 +18,4 @@ package() { install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf } -sha512sums="29615bba3b70641e8f78ca865f8325a3d8dbeb7a8c72288d1e520d4c82e749118f30980b847d35d3fd120914cf4ca1a9c4f57725c8791ba6291a13e8c52dd1d0 FiraCode_1.207.zip" +sha512sums="c6bc3229acab8874e8d0f4709d7ed25cb9153996d85cba5c19aa6a472d1c22e9d2c1e9b4d580787f212f87e9aaa4059503ab38dc675fe914fc0537fbf91d7774 FiraCode_2.zip" diff --git a/user/fira/APKBUILD b/user/fira/APKBUILD index 8d0b68e9b..15770d162 100644 --- a/user/fira/APKBUILD +++ b/user/fira/APKBUILD @@ -14,7 +14,7 @@ depends="fontconfig" makedepends="" subpackages="" source="https://bboxtype.com/downloads/Fira/Download_Folder_FiraSans_$_pkgver.zip - https://bboxtype.com/downloads/Fira/Fira_Mono_${_monover/./_}.zip" + https://bboxtype.com/downloads/Fira/Fira_Mono_$(echo $_monover | sed s/\\./_/).zip" package() { cd "$srcdir"/Download_Folder_FiraSans_$_pkgver/Fonts/Fira_Sans_OTF_$_pkgver diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 3d0594f99..649a95029 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.2.0 +pkgver=68.6.0 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" url="https://www.mozilla.org/firefox/" @@ -15,7 +15,7 @@ depends="" # actual deps makedepends=" autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev - perl rust rust-stdlib cmd:which + perl rust rust-std cmd:which ncurses-dev openssl-dev @@ -43,9 +43,11 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f rust-32bit.patch rust-config.patch shut-up-warning.patch + skia-sucks1.patch + skia-sucks2.patch + skia-sucks3.patch stackwalk-x86-ppc.patch webrtc-broken.patch - yuv-be.patch firefox.desktop firefox-safe.desktop @@ -84,6 +86,35 @@ ldpath="$_mozappdir" # - CVE-2019-11762 # - CVE-2019-11763 # - CVE-2019-11764 +# 68.3.0-r0: +# - CVE-2019-11745 +# - CVE-2019-13722 +# - CVE-2019-17005 +# - CVE-2019-17008 +# - CVE-2019-17009 +# - CVE-2019-17010 +# - CVE-2019-17011 +# - CVE-2019-17012 +# 68.4.1-r0: +# - CVE-2019-17016 +# - CVE-2019-17017 +# - CVE-2019-17022 +# - CVE-2019-17024 +# - CVE-2019-17026 +# 68.5.0-r0: +# - CVE-2020-6796 +# - CVE-2020-6797 +# - CVE-2020-6798 +# - CVE-2020-6799 +# 68.6.0-r0: +# - CVE-2019-20503 +# - CVE-2020-6805 +# - CVE-2020-6806 +# - CVE-2020-6807 +# - CVE-2020-6811 +# - CVE-2020-6812 +# - CVE-2020-6814 + unpack() { default_unpack @@ -113,16 +144,11 @@ unpack() { } prepare() { - cd "$builddir" default_prepare cp "$srcdir"/mozconfig "$builddir"/mozconfig echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig - # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then - JOBS=32 - fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig case "$CARCH" in @@ -133,6 +159,9 @@ prepare() { echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig; export LDFLAGS="$LDFLAGS -latomic" ;; + s390x) + echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -142,8 +171,6 @@ prepare() { } build() { - cd "$builddir" - export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 @@ -156,9 +183,6 @@ build() { export UNIXCONFDIR="$srcdir" - local extra_flags="" - [ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache" - export PATH="$srcdir/python/bin:$PATH" ./mach build } @@ -170,14 +194,12 @@ run() { } package() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" DESTDIR="$pkgdir" ./mach install install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - local png for png in browser/branding/official/default*.png; do local i="${_png%.png}" i=${i##*/default} @@ -208,7 +230,7 @@ package() { EOF } -sha512sums="f6522ca6b9efa3fdeb866912ab9cb904eaace5806c606d5721cba23aebd679885670011c743ca8d381b579b728077182dc766f9b6d3b31ccf51c3eb583c547ee firefox-68.2.0esr.source.tar.xz +sha512sums="84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3 firefox-68.6.0esr.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -221,8 +243,10 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1 7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch +e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch +9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch +7a1fa27e060b2f025eaebbd39fb5c62960b62450241437e6d057d58cef9faf1cd1a85efe3b6a37b865d686ff18e90605ebea3089b26243f2d14876c2107106a6 skia-sucks3.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch -2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2 yuv-be.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/user/firefox-esr/skia-sucks1.patch b/user/firefox-esr/skia-sucks1.patch new file mode 100644 index 000000000..a02c3b775 --- /dev/null +++ b/user/firefox-esr/skia-sucks1.patch @@ -0,0 +1,84 @@ +# HG changeset patch +# Parent 548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9 + +diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp +--- a/gfx/2d/ConvolutionFilter.cpp Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/2d/ConvolutionFilter.cpp Thu Jul 25 14:27:59 2019 +0200 +@@ -35,9 +35,38 @@ + return true; + } + ++static void ByteSwapArray(uint8_t *u8Array, int32_t size) { ++ uint32_t *array = reinterpret_cast<uint32_t*>(u8Array); ++ for (int pxl = 0; pxl < size; ++pxl) { ++ // Use an endian swap to move the bytes, i.e. BGRA -> ARGB. ++ uint32_t rgba = array[pxl]; ++ array[pxl] = NativeEndian::swapToLittleEndian(rgba); ++ } ++} ++ + void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst, + bool aHasAlpha) { ++#ifdef MOZ_BIG_ENDIAN ++ int outputSize = mFilter->numValues(); ++ ++ // Input size isn't handed in, so we have to calculate it quickly ++ int inputSize = 0; ++ for (int xx = 0; xx < outputSize; ++xx) { ++ // Get the filter that determines the current output pixel. ++ int filterOffset, filterLength; ++ mFilter->FilterForValue(xx, &filterOffset, &filterLength); ++ inputSize = std::max(inputSize, filterOffset + filterLength); ++ } ++ ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++#endif ++ + SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++ ByteSwapArray(aDst, outputSize); ++#endif + } + + void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst, +@@ -49,8 +78,26 @@ + int32_t filterLength; + auto filterValues = + mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength); ++ ++#ifdef MOZ_BIG_ENDIAN ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ // Skia only knows LE, so we have to swizzle the input ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++#endif ++ + SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst, + aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ // After skia is finished, we swizzle back to BE, in case ++ // the input is used again somewhere else ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++ // The destination array as well ++ ByteSwapArray(aDst, aRowSize); ++#endif + } + + /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's +diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h +--- a/gfx/skia/skia/include/core/SkPreConfig.h Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/skia/skia/include/core/SkPreConfig.h Thu Jul 25 14:27:59 2019 +0200 +@@ -73,7 +73,7 @@ + defined(__ppc__) || defined(__hppa) || \ + defined(__PPC__) || defined(__PPC64__) || \ + defined(_MIPSEB) || defined(__ARMEB__) || \ +- defined(__s390__) || \ ++ defined(__s390__) || defined(__s390x__) || \ + (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ + (defined(__ia64) && defined(__BIG_ENDIAN__)) + #define SK_CPU_BENDIAN diff --git a/user/firefox-esr/skia-sucks2.patch b/user/firefox-esr/skia-sucks2.patch new file mode 100644 index 000000000..1a498f871 --- /dev/null +++ b/user/firefox-esr/skia-sucks2.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 +For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the +right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). + +diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h +--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +@@ -238,7 +238,18 @@ + AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } + AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } + ++ // On Big endian the commented out variant doesn't work, ++ // and honestly, I have no idea why it exists in the first place. ++ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() ++ // which gets a 64-bit integer, and FromBits returns 32-bit, ++ // cutting off the wrong half again. ++ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). ++ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) ++#ifdef SK_CPU_BENDIAN ++ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } ++#else + AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } ++#endif + AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } + AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } + +diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h +--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +@@ -203,7 +203,13 @@ + // ~~~> + // a = 1*aa + d(1-1*aa) = aa + d(1-aa) + // c = 0*aa + d(1-1*aa) = d(1-aa) ++ ++ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 ++#ifdef SK_CPU_BENDIAN ++ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) ++#else + return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) ++#endif + + d.approxMulDiv255(aa.inv()); + }; + while (h --> 0) { diff --git a/user/firefox-esr/skia-sucks3.patch b/user/firefox-esr/skia-sucks3.patch new file mode 100644 index 000000000..9d2ffc410 --- /dev/null +++ b/user/firefox-esr/skia-sucks3.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec +Problem description: Tab-titles that are too long to fit into a tab get faded out. + On big endian this is broken and instead of fading out, the + tab gets white and the font transparent, leading to an unreadable + tab-title +Solution: This is not a real solution, but a hack. The real solution would have been + to byte-swap the correct buffer, but I could not find it. + So the next best thing is to deactivate the fading-effect. Now all tab-titles + are readable, albeit not as pretty to look at as they could be. +Side-effects: I have not yet found an unwanted side-effect. + +diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp +--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +@@ -1861,6 +1861,14 @@ + SkCanvas::kPreserveLCDText_SaveLayerFlag | + (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); + ++#if MOZ_BIG_ENDIAN ++ // Pushing a layer where an aMask is defined produces wrong output. ++ // We _should_ endian swap the data, but I couldn't find a workable way to do so ++ // Therefore I deactivate those layers in the meantime. ++ // The result is: Tab-titles that are longer than the available space should be faded out. ++ // The fading doesn't work, so we deactivate the fading-effect here. ++ if (!aMask) ++#endif + mCanvas->saveLayer(saveRec); + + SetPermitSubpixelAA(aOpaque); diff --git a/user/firefox-esr/yuv-be.patch b/user/firefox-esr/yuv-be.patch deleted file mode 100644 index ccb0c2fd8..000000000 --- a/user/firefox-esr/yuv-be.patch +++ /dev/null @@ -1,48 +0,0 @@ -# HG changeset patch -# User A. Wilcox <AWilcox@Wilcox-Tech.com> -# Date 1543674229 0 -# Sat Dec 01 14:23:49 2018 +0000 -# Node ID 0309ff19e46b126c527e633518d7de8570442114 -# Parent 53107afbc21ec78e7ac46d37af212505f2032d5d -Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines - -diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp ---- a/gfx/ycbcr/YCbCrUtils.cpp Wed Nov 07 04:50:21 2018 +0000 -+++ b/gfx/ycbcr/YCbCrUtils.cpp Sat Dec 01 14:23:49 2018 +0000 -@@ -3,7 +3,9 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#include "mozilla/EndianUtils.h" - #include "gfx2DGlue.h" -+#include "mozilla/gfx/Swizzle.h" - - #include "YCbCrUtils.h" - #include "yuv_convert.h" -@@ -236,6 +238,13 @@ - yuvtype, - srcData.mYUVColorSpace); - } -+#if MOZ_BIG_ENDIAN -+ // libyuv makes endian-correct result, which needs to be swapped to BGRX -+ if (aDestFormat != SurfaceFormat::R5G6B5_UINT16) -+ gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8, -+ aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8, -+ srcData.mPicSize); -+#endif - } - - void -@@ -257,6 +266,12 @@ - aSrcStrideYA, - aSrcStrideUV, - aDstStrideARGB); -+#if MOZ_BIG_ENDIAN -+ // libyuv makes endian-correct result, which needs to be swapped to BGRA -+ gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8, -+ aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8, -+ IntSize(aWidth, aHeight)); -+#endif - } - - } // namespace gfx diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 8c0ff4bc6..9754c4a0b 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,12 +1,12 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=fish pkgver=3.0.2 pkgrel=0 pkgdesc="Modern interactive commandline shell" url="http://www.fishshell.com" arch="all" -options="!check" # no tests +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_dev="$pkgname-tools" diff --git a/user/flac/APKBUILD b/user/flac/APKBUILD index 5f8bd2adb..1bbe98ccd 100644 --- a/user/flac/APKBUILD +++ b/user/flac/APKBUILD @@ -5,11 +5,10 @@ pkgrel=0 pkgdesc="Free Lossless Audio Codec" url="https://xiph.org/flac/" arch="all" -options="!checkroot" license="BSD-3-Clause AND GPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libogg-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz" # secfixes: diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD index 5ae3ea67a..dcd9d98f2 100644 --- a/user/flite/APKBUILD +++ b/user/flite/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=flite pkgver=2.1 pkgrel=0 pkgdesc="Small, fast text-to-speech synthesizer based on Festival" url="http://www.festvox.org/flite/" arch="all" -options="!check" # testsuite refuses to cooperate +options="!check" # Test suite refuses to cooperate. license="MIT AND Apache-2.0 AND BSD-3-Clause AND Public-Domain AND BSD-2-Clause" depends="" makedepends="alsa-lib-dev" @@ -15,7 +15,6 @@ source="http://www.festvox.org/flite/packed/flite-$pkgver/flite-$pkgver-release. builddir="$srcdir/flite-$pkgver-release" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index d08281f80..7f061b427 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.0.7 +pkgver=2.1.1 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" arch="all" license="LGPL-2.1+" depends="" -makedepends="alsa-lib-dev dbus-dev glib-dev libsndfile-dev pulseaudio-dev" +makedepends="alsa-lib-dev cmake dbus-dev glib-dev libsndfile-dev pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="fluidsynth-$pkgver.tar.gz::https://github.com/FluidSynth/fluidsynth/archive/v$pkgver.tar.gz" @@ -22,7 +22,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e fluidsynth-2.0.7.tar.gz" +sha512sums="f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8 fluidsynth-2.1.1.tar.gz" diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD index 73c076d15..c45ce0ec9 100644 --- a/user/fluxbox/APKBUILD +++ b/user/fluxbox/APKBUILD @@ -6,8 +6,8 @@ pkgrel=1 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" arch="all" +options="!check" # This package has a broken test suite. license="MIT" -options="!check" # This package has a broken testsuite depends="gxmessage" makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" # TODO: Enable NLS when we get 'gencat' ./configure \ --build=$CBUILD \ @@ -27,7 +26,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD index 4547cee87..e141b606b 100644 --- a/user/font-adobe-100dpi/APKBUILD +++ b/user/font-adobe-100dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Adobe" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD index 8f3f7ac0c..5ef4fe5a8 100644 --- a/user/font-adobe-75dpi/APKBUILD +++ b/user/font-adobe-75dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Adobe" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD index ffd9eb443..7f7b77dd7 100644 --- a/user/font-adobe-utopia-100dpi/APKBUILD +++ b/user/font-adobe-utopia-100dpi/APKBUILD @@ -13,19 +13,17 @@ arch="noarch" # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec license="Utopia" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD index da04ba89e..02e746ddf 100644 --- a/user/font-adobe-utopia-75dpi/APKBUILD +++ b/user/font-adobe-utopia-75dpi/APKBUILD @@ -13,19 +13,17 @@ arch="noarch" # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec license="Utopia" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD index 12443931b..ee684a79e 100644 --- a/user/font-adobe-utopia-type1/APKBUILD +++ b/user/font-adobe-utopia-type1/APKBUILD @@ -13,19 +13,17 @@ arch="noarch" # [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts # [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec license="Utopia" -depends="encodings font-alias fontconfig mkfontdir mkfontscale" +depends="encodings font-alias fontconfig mkfontscale" makedepends="util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + find "$pkgdir" -name fonts.scale -exec rm {} + diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD index dee7f9487..e995fa571 100644 --- a/user/font-alias/APKBUILD +++ b/user/font-alias/APKBUILD @@ -8,16 +8,15 @@ arch="noarch" license="MIT" depends="" makedepends="util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD index e36be36a0..66e7cb372 100644 --- a/user/font-arabic-misc/APKBUILD +++ b/user/font-arabic-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Arabic X11 fonts" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD index 507bd19cc..2dff87e24 100644 --- a/user/font-bh-100dpi/APKBUILD +++ b/user/font-bh-100dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Bigelow & Holmes" url="https://www.X.Org/" arch="noarch" license="Lucida" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD index 6a1287b10..619f8ce0c 100644 --- a/user/font-bh-75dpi/APKBUILD +++ b/user/font-bh-75dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Bigelow & Holmes" url="https://www.X.Org/" arch="noarch" license="Lucida" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD index afa5b8a83..118787f42 100644 --- a/user/font-bh-lucidatypewriter-100dpi/APKBUILD +++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes" url="https://www.X.Org/" arch="noarch" license="Lucida" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD index e1e9508dc..67d155853 100644 --- a/user/font-bh-lucidatypewriter-75dpi/APKBUILD +++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes" url="https://www.X.Org/" arch="noarch" license="Lucida" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD index 27c9f4848..491e7622b 100644 --- a/user/font-bitstream-100dpi/APKBUILD +++ b/user/font-bitstream-100dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Bitstream" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD index a456b9bd6..fa6149d10 100644 --- a/user/font-bitstream-75dpi/APKBUILD +++ b/user/font-bitstream-75dpi/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Bitstream" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-bitstream-speedo/APKBUILD b/user/font-bitstream-speedo/APKBUILD index dcee83640..a9e76bed9 100644 --- a/user/font-bitstream-speedo/APKBUILD +++ b/user/font-bitstream-speedo/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Speedo X11 fonts from Bitstream" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir mkfontscale" +depends="encodings font-alias fontconfig mkfontscale" makedepends="util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bitstream-speedo-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + find "$pkgdir" -name fonts.scale -exec rm {} + diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD index 328b0f874..cf4d86d6d 100644 --- a/user/font-bitstream-type1/APKBUILD +++ b/user/font-bitstream-type1/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Type 1 X11 fonts from Bitstream" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="fontconfig mkfontdir mkfontscale" +depends="fontconfig mkfontscale" makedepends="util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + find "$pkgdir" -name fonts.scale -exec rm {} + diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD index ee537b55b..38765a4a3 100644 --- a/user/font-cronyx-cyrillic/APKBUILD +++ b/user/font-cronyx-cyrillic/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts from Cronyx" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD index fe6d4610b..f5b870917 100644 --- a/user/font-cursor-misc/APKBUILD +++ b/user/font-cursor-misc/APKBUILD @@ -1,24 +1,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-cursor-misc pkgver=1.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="X11 cursor fonts" url="https://www.X.Org/" arch="noarch" license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD index a71dba0aa..0e75b5af6 100644 --- a/user/font-daewoo-misc/APKBUILD +++ b/user/font-daewoo-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Daewoo" url="https://www.X.Org/" arch="noarch" license="X11" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD index 36045bbca..6f6189efd 100644 --- a/user/font-dec-misc/APKBUILD +++ b/user/font-dec-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Digital" url="https://www.X.Org/" arch="noarch" license="X11" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD index 6dd2a8b08..9acfa2cb3 100644 --- a/user/font-isas-misc/APKBUILD +++ b/user/font-isas-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Chinese X11 fonts from Academia Sinica" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD index 67cad5057..1b047736a 100644 --- a/user/font-jis-misc/APKBUILD +++ b/user/font-jis-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Japanese Industrial Standard X11 fonts" url="https://www.X.Org/" arch="noarch" license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD index 7c72642fe..8eae0a5a4 100644 --- a/user/font-micro-misc/APKBUILD +++ b/user/font-micro-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Smol X11 font" url="https://www.X.Org/" arch="noarch" license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD index e66c9ccd8..ffe4760e6 100644 --- a/user/font-misc-cyrillic/APKBUILD +++ b/user/font-misc-cyrillic/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts" url="https://www.X.Org/" arch="noarch" license="MIT AND Public-Domain" -depends="encodings font-alias fontconfig mkfontdir" -makedepends="bdftopcf mkfontdir util-macros" +depends="encodings font-alias fontconfig mkfontscale" +makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD index e04621e66..41b13186e 100644 --- a/user/font-misc-ethiopic/APKBUILD +++ b/user/font-misc-ethiopic/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Ethiopic X11 fonts" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir mkfontscale" +depends="encodings font-alias fontconfig mkfontscale" makedepends="util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + find "$pkgdir" -name fonts.scale -exec rm {} + diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD index 1a7cf7b53..66f55e2ad 100644 --- a/user/font-misc-misc/APKBUILD +++ b/user/font-misc-misc/APKBUILD @@ -1,24 +1,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-misc pkgver=1.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous X11 fonts included with X.Org" url="https://www.X.Org/" arch="noarch" license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir mkfontscale" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD index 62a4437ff..575ad7e2e 100644 --- a/user/font-mutt-misc/APKBUILD +++ b/user/font-mutt-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="MUTT X11 font family" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD index 4b3008fe5..d8a3bfb90 100644 --- a/user/font-schumacher-misc/APKBUILD +++ b/user/font-schumacher-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Dale Schumacher" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD index 8dc59ebe6..4e0d72cd6 100644 --- a/user/font-screen-cyrillic/APKBUILD +++ b/user/font-screen-cyrillic/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD index 7ce54a805..2d5a256ff 100644 --- a/user/font-sony-misc/APKBUILD +++ b/user/font-sony-misc/APKBUILD @@ -6,19 +6,17 @@ pkgdesc="X11 fonts from Sony" url="https://www.X.Org/" arch="noarch" license="MIT" -depends="encodings font-alias fontconfig mkfontdir mkfontscale" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD index e004d9738..e3134ef91 100644 --- a/user/font-sun-misc/APKBUILD +++ b/user/font-sun-misc/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Sun Microsystems" url="https://www.X.Org/" arch="noarch" license="X11" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD index 03e93b01f..09853fc30 100644 --- a/user/font-winitzki-cyrillic/APKBUILD +++ b/user/font-winitzki-cyrillic/APKBUILD @@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts from Serge Winitzki" url="https://www.X.Org/" arch="noarch" license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir" +depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + } diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD index f82b76bcf..308217e65 100644 --- a/user/font-xfree86-type1/APKBUILD +++ b/user/font-xfree86-type1/APKBUILD @@ -13,13 +13,11 @@ subpackages="" source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" -name fonts.dir -exec rm {} + find "$pkgdir" -name fonts.scale -exec rm {} + diff --git a/user/fontawesome/APKBUILD b/user/fontawesome/APKBUILD index 996198dd2..9837e1f00 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.10.1 +pkgver=5.11.2 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="94af5211b5d84cd9fdd6292236193e15951f1f253340ca27d04dad994410d5d1c3548e239ac5ad26121de15cd4c05f4391f61dd91ae962e8304175955237db2f fontawesome-free-5.10.1-desktop.zip" +sha512sums="c9896d1c6c0e47d3a42702a65b73e168fd0998850011dca05129bfc2413d21c540a9704c6c05ceff4f74ac52b729f14609af28407f6f8e76fd3dd2fbf75c20df fontawesome-free-5.11.2-desktop.zip" diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD index c07bf8073..aeae4256d 100644 --- a/user/fontconfig/APKBUILD +++ b/user/fontconfig/APKBUILD @@ -11,11 +11,10 @@ license="MIT" depends="" makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev" triggers="$pkgname.trigger=/usr/share/fonts/*" -subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" +subpackages="$pkgname-dev $pkgname-lang" source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz" build() { - cd "$builddir" # regenerate hash functions rm -f src/fcobjshash.h @@ -31,15 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install - - install -m644 -D COPYING "$pkgdir"/usr/share/licenses/"${pkgname}"/COPYING } sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz" diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD index 949fb702c..960232ba5 100644 --- a/user/fontforge/APKBUILD +++ b/user/fontforge/APKBUILD @@ -8,16 +8,15 @@ url="https://fontforge.github.io/en-US/" arch="all" license="GPL-3.0+ AND BSD-3-Clause" depends="desktop-file-utils shared-mime-info" -makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev +makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev libtool libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev python3-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz +source="https://github.com/fontforge/fontforge/releases/download/${pkgver#2.0.}/fontforge-dist-${pkgver#2.0.}.tar.xz python3.patch " build() { - cd "$builddir" PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,13 +28,11 @@ build() { } check() { - cd "$builddir" # skip test 53; it doesn't work. make check TESTSUITEFLAGS="1-52 54" } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD index 62d1ddcae..c8c4c8739 100644 --- a/user/fonttosfnt/APKBUILD +++ b/user/fonttosfnt/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/fonttosfnt-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fortune-mod/APKBUILD b/user/fortune-mod/APKBUILD index f3be67c18..7d3ba823c 100644 --- a/user/fortune-mod/APKBUILD +++ b/user/fortune-mod/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fortune-mod -pkgver=2.10.0 +pkgver=2.12.0 pkgrel=0 pkgdesc="Display random messages or quotations" url="https://www.shlomifish.org/humour/fortunes/" @@ -11,7 +11,7 @@ license="BSD-4-Clause" depends="" checkdepends="perl-file-find-object perl-io-all perl-test-differences perl-test-runvalgrind valgrind" -makedepends="cmake recode-dev" +makedepends="cmake recode-dev rinutils" subpackages="$pkgname-doc" source="https://github.com/shlomif/fortune-mod/archive/$pkgname-$pkgver.tar.gz" builddir="$srcdir/fortune-mod-fortune-mod-$pkgver/$pkgname" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f5776d3afc52859b8959b0a51fc0dd57665b7d35b046958e6a08f29f9ad7915957ec4fec6b38d08a797a05163cc20a47e62a4e3d65034084e2003b8a69cc90e1 fortune-mod-2.10.0.tar.gz" +sha512sums="e3feca02b33bcae3c7113432af5d200d7c8701338c1d778c5dd893e4541969146185393c952f19f1b2f17077c4f171cdacbd9b6ba3cb0581117b8aa569cc652f fortune-mod-2.12.0.tar.gz" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index abaeb67b4..8b7f57f3f 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/frameworkintegration-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9bb0c8a10b342976c21f8840e04f4b9ac60931c804fc0debbddf24b710e97804a2b8d357019840534c4fb4b4b816565a49682b0b09b4fb4d82d7d3467af1bb1f frameworkintegration-5.54.0.tar.xz" +sha512sums="3aa3c8cd7d5c1b7d444be504fbf1d3ff3cabdd4c043d98436e82d57415c8d9f99158f90065cf3f06b007585dfd2d4a5a8ee978795f4f7285f0e50c52dc74e372 frameworkintegration-5.68.0.tar.xz" diff --git a/user/freealut/APKBUILD b/user/freealut/APKBUILD index c249d9d21..035d254fe 100644 --- a/user/freealut/APKBUILD +++ b/user/freealut/APKBUILD @@ -6,20 +6,14 @@ pkgrel=0 pkgdesc="Free software implementation of OpenAL ALUT" url="https://github.com/vancegroup/freealut" arch="all" +options="!check" # No test suite. license="LGPL-2.0-only" depends="" -makedepends="openal-soft-dev" +makedepends="cmake openal-soft-dev" subpackages="$pkgname-dev" source="https://distfiles.adelielinux.org/source/freealut-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +23,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="218f52ddc5f26aa6744d4209bb2ec6963e423dccec642ba96f9b6d0c1ee0972b9b86cd2fc4c81e21ba2fce7b6ff5e5150d23083b76602d0704a7e65b52f2cc45 freealut-1.1.0_git20140626.tar.xz" diff --git a/user/freecell-solver/APKBUILD b/user/freecell-solver/APKBUILD index 78c1eadb5..57ebc05a2 100644 --- a/user/freecell-solver/APKBUILD +++ b/user/freecell-solver/APKBUILD @@ -8,15 +8,14 @@ url="https://fc-solve.shlomifish.org/" arch="all" license="MIT" depends="python3" -makedepends="gperf perl perl-task-freecellsolver-testing python3 py3-random2 - py3-six" checkdepends="gmp-dev libtap-dev perl-dev py3-cffi py3-pycotap the_silver_searcher valgrind" +makedepends="cmake gperf perl perl-task-freecellsolver-testing python3 + py3-random2 py3-six" subpackages="$pkgname-dev $pkgname-doc" source="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,19 +25,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . # The build system generates header files; jobs >1 may cause failures # because .h don't exist yet. make -j1 } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index 34b38ebf2..184882c91 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -15,10 +15,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { cmake . \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DFREEGLUT_BUILD_STATIC_LIBS=0 + -DFREEGLUT_BUILD_STATIC_LIBS=0 \ + . make } diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 16a305b18..3687b3cdc 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -3,7 +3,7 @@ pkgname=freetds pkgver=1.1.6 pkgrel=0 -pkgdesc="Tabular Datastream Library" +pkgdesc="Library for accessing Sybase and MS SQL Server databases" url="https://www.freetds.org/" arch="all" license="LGPL-2.0+" diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index 5f93a4ee3..cc04fd333 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -37,9 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -doc() { - gzip "$pkgdir/usr/share/man/man1/freetype-config.1" - default_doc -} - sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz" diff --git a/user/frei0r-plugins/APKBUILD b/user/frei0r-plugins/APKBUILD index bbfd1c2ca..989dcc871 100644 --- a/user/frei0r-plugins/APKBUILD +++ b/user/frei0r-plugins/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=frei0r-plugins -pkgver=1.6.1 +pkgver=1.7.0 pkgrel=0 pkgdesc="A minimalistic plugin API for video sources and filters" url=" " @@ -12,19 +12,15 @@ depends="" makedepends="opencv-dev gavl-dev file cairo-dev doxygen automake autoconf libtool" subpackages="$pkgname-dev $pkgname-doc" -source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz - facebl0r-opencv-3.4.3.patch - " +source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" - touch README AUTHORS ChangeLog TODO + touch README.md AUTHORS ChangeLog TODO autoreconf -i } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,9 +29,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac frei0r-plugins-1.6.1.tar.gz -785ff3459f371620780f274b82702c8f6625d78fcd6000fddca0585e3aeaa0af57fd9d9444c4d0f1ca47e84b47b8a2fca4b86fa44ebe93487948eb8f4a193503 facebl0r-opencv-3.4.3.patch" +sha512sums="8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce frei0r-plugins-1.7.0.tar.gz" diff --git a/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch b/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch deleted file mode 100644 index f3d4f46bb..000000000 --- a/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b0a06d52e39438fae2afbf98bafe6c794d13b83e Mon Sep 17 00:00:00 2001 -From: Christoph Willing <chris.willing@linux.com> -Date: Sat, 14 Jul 2018 21:34:03 +1000 -Subject: [PATCH] Include opencv2/imgproc.hpp for CV_RGB() - -Signed-off-by: Christoph Willing <chris.willing@linux.com> ---- - src/filter/facebl0r/facebl0r.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp -index 6d6e8f2..823462a 100644 ---- a/src/filter/facebl0r/facebl0r.cpp -+++ b/src/filter/facebl0r/facebl0r.cpp -@@ -19,6 +19,7 @@ - #include <stdlib.h> - #include <opencv/cv.h> - #include <opencv/highgui.h> -+#include <opencv2/imgproc.hpp> - - #include <frei0r.hpp> - #include <frei0r_math.h> diff --git a/user/fribidi/APKBUILD b/user/fribidi/APKBUILD index 97f2ebbe7..39523b2db 100644 --- a/user/fribidi/APKBUILD +++ b/user/fribidi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fribidi -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Free Implementation of the Unicode Bidirectional algorithm" url="http://fribidi.org" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0 fribidi-1.0.7.tar.bz2" +sha512sums="d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2 fribidi-1.0.8.tar.bz2" diff --git a/user/fslsfonts/APKBUILD b/user/fslsfonts/APKBUILD index 5734d3301..d910a5664 100644 --- a/user/fslsfonts/APKBUILD +++ b/user/fslsfonts/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/fslsfonts-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fstobdf/APKBUILD b/user/fstobdf/APKBUILD index 0c39dcfba..ad6ffdb18 100644 --- a/user/fstobdf/APKBUILD +++ b/user/fstobdf/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/fstobdf-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ftmenu/APKBUILD b/user/ftmenu/APKBUILD index 3f8e2d157..b5c291a24 100644 --- a/user/ftmenu/APKBUILD +++ b/user/ftmenu/APKBUILD @@ -9,13 +9,17 @@ arch="all" options="!check" # there is currently no testsuite to run license="GPL-3.0-only" depends="" -makedepends="gtk+2.0-dev" +makedepends="autoconf automake gtk+2.0-dev libtool" source="https://downloads.sourceforge.net/project/ftmenu/ftmenu/ftmenu-0.4/ftmenu-$pkgver.tar.gz - include-stdlib.patch" + include-stdlib.patch + " -build() { - cd "$builddir" +prepare() { + default_prepare autoreconf -if +} + +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fts/APKBUILD b/user/fts/APKBUILD index 2864ee250..d75403d6a 100644 --- a/user/fts/APKBUILD +++ b/user/fts/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Provides the fts(3) functions, which are missing in musl libc" url="https://github.com/pullmoll/musl-fts/" arch="all" license="BSD-3-Clause" +depends="" makedepends="automake autoconf libtool" subpackages="$pkgname-dev" source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip" @@ -14,12 +15,10 @@ builddir="$srcdir/musl-$pkgname-$pkgver" prepare() { default_prepare - cd "$builddir" ./bootstrap.sh } build() { - cd "$builddir" CFLAGS=-fPIC ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/lib/pkgconfig diff --git a/user/fuse-exfat/APKBUILD b/user/fuse-exfat/APKBUILD index 21848f057..66a02e572 100644 --- a/user/fuse-exfat/APKBUILD +++ b/user/fuse-exfat/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://github.com/relan/exfat/releases/download/v$pkgver/fuse-exfat-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index 20a76707d..821be29db 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.7.0 +pkgver=3.9.0 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -10,14 +10,15 @@ arch="all" options="suid !check" # Requires fuse kernel module to be loaded license="GPL-2.0-only AND LGPL-2.1-only AND BSD-2-Clause" depends="fuse-common" +#checkdepends="py3-pytest cmd:which" makedepends="linux-headers meson eudev-dev python3 py3-six py3-pluggy py3-attrs py3-py" -#checkdepends="py3-pytest cmd:which" subpackages="$pkgname-dev $pkgname-doc $_pkgname-common:common:noarch $_pkgname-openrc:openrc:noarch" source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz fix-realpath.patch - fuse.initd" + fuse.initd + " builddir="$srcdir/$_pkgname-$pkgver" # secfixes: @@ -71,6 +72,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="512ac1fff38fa3fbe768ac02a6b138bb5c58ae9c0c898fde237faab9ecb48dafcb063879942d3845cd85af1f5fbe068626401e7da9afbd7ef2f0820757393585 fuse-3.7.0.tar.xz +sha512sums="0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7 fuse-3.9.0.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/gamin/APKBUILD b/user/gamin/APKBUILD index b7d0461fc..140e44fc7 100644 --- a/user/gamin/APKBUILD +++ b/user/gamin/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="Library for file and directory monitoring" url="http://www.gnome.org/~veillard/gamin" arch="all" license="LGPL-2.0+" -subpackages="$pkgname-dev" depends="" makedepends="glib-dev" +subpackages="$pkgname-dev" source="https://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz fix-deprecated-const.patch fix-pthread-mutex.patch diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index c712903ee..476a1ecf5 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=garcon pkgver=0.6.4 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+" +depends="" makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/gavl/APKBUILD b/user/gavl/APKBUILD index bc81e1a5b..8e97e7407 100644 --- a/user/gavl/APKBUILD +++ b/user/gavl/APKBUILD @@ -12,7 +12,8 @@ depends="" makedepends="doxygen" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/sourceforge/gmerlin/gavl-$pkgver.tar.gz - musl-sched_h.patch" + musl-sched_h.patch + " prepare() { default_prepare @@ -20,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,7 +32,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD index 39e3cbdfd..76d95fce0 100644 --- a/user/gc/APKBUILD +++ b/user/gc/APKBUILD @@ -3,9 +3,10 @@ pkgname=gc pkgver=8.0.4 pkgrel=0 pkgdesc="A garbage collector for C and C++" -url="http://hboehm.info/gc/" +url="https://hboehm.info/gc/" arch="all" license="MIT" +depends="" makedepends="libatomic_ops-dev linux-headers" subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp" source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index e6b142f84..bbc4eedc9 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -25,12 +25,10 @@ ppc64*) _ld="ld64.so.2" ;; esac build() { - cd "$builddir" make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease } package() { - cd "$builddir" make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } diff --git a/user/gcompris-qt/APKBUILD b/user/gcompris-qt/APKBUILD index 9240e9af7..6b53bd372 100644 --- a/user/gcompris-qt/APKBUILD +++ b/user/gcompris-qt/APKBUILD @@ -17,9 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="http://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz" build() { - cd "$builddir" - mkdir build - cd build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +28,12 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda gcompris-qt-0.91.tar.xz" diff --git a/user/gdbm/APKBUILD b/user/gdbm/APKBUILD index 230f62e28..351236639 100644 --- a/user/gdbm/APKBUILD +++ b/user/gdbm/APKBUILD @@ -11,10 +11,9 @@ license="GPL-2.0+ AND GPL-3.0+" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz" +source="https://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index a12334d2e..7377083bb 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdk-pixbuf -pkgver=2.38.2 +pkgver=2.40.0 pkgrel=0 pkgdesc="GTK+ image loading library" url="https://www.gtk.org/" @@ -13,9 +13,7 @@ makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz - " -replaces="gtk+" +source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz" # secfixes: # 2.36.6-r1: @@ -24,10 +22,11 @@ replaces="gtk+" # - CVE-2017-6314 build() { - mkdir build - cd build - meson -Dprefix=/usr -Dinstalled_tests=false - ninja + meson \ + -Dprefix=/usr \ + -Dinstalled_tests=false \ + build + ninja -C build } check() { @@ -38,4 +37,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1 gdk-pixbuf-2.38.2.tar.xz" +sha512sums="6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa gdk-pixbuf-2.40.0.tar.xz" diff --git a/user/genmenu/APKBUILD b/user/genmenu/APKBUILD index 2e34c5192..098f47e30 100644 --- a/user/genmenu/APKBUILD +++ b/user/genmenu/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Menu generator for Enlightenment, Blackbox, Openbox, Fluxbox, and WindowMaker" url="https://f00l.de/genmenu/" arch="noarch" -options="!check" # this is just a bash script, no tests +options="!check" # This is just a bash script, no tests license="GPL-2.0+" depends="bash" makedepends="" @@ -14,8 +14,7 @@ subpackages="" source="https://f00l.de/$pkgname/$pkgname-$pkgver.tar.bz2" package() { - cd "$builddir" - install -D -m755 -t $pkgdir/usr/bin/ genmenu + install -D -m755 -t $pkgdir/usr/bin/ "$builddir"/genmenu } sha512sums="eb87db30f6787570ffe844c7b9b25542652e485296ec061ab1da8f2b1bae40942630c9ca141cf8c7b55ce4d99d1b173511850247a5e07243256eb71588515e54 genmenu-1.1.0.tar.bz2" diff --git a/user/giblib/APKBUILD b/user/giblib/APKBUILD index 22f125ef3..85f255925 100644 --- a/user/giblib/APKBUILD +++ b/user/giblib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=giblib pkgver=1.2.4 -pkgrel=10 +pkgrel=11 pkgdesc="Graphics library built atop Imlib2" url="http://linuxbrit.co.uk/details.html" arch="all" @@ -10,16 +10,15 @@ subpackages="$pkgname-doc $pkgname-dev" depends="" depends_dev="freetype-dev imlib2-dev libx11-dev libxext-dev zlib-dev" makedepends="$depends_dev" +subpackages="$pkgname-doc" source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/user/gidole/APKBUILD b/user/gidole/APKBUILD index f20bf594f..2cfa018ec 100644 --- a/user/gidole/APKBUILD +++ b/user/gidole/APKBUILD @@ -15,8 +15,7 @@ source="https://dev.gentoo.org/~jstein/dist/gidole-$pkgver.zip" builddir="$srcdir/GidoleFont" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf } sha512sums="adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727 gidole-2.0.2.zip" diff --git a/user/glass-tty-vt220/APKBUILD b/user/glass-tty-vt220/APKBUILD index 54b89f38c..12d39dda5 100644 --- a/user/glass-tty-vt220/APKBUILD +++ b/user/glass-tty-vt220/APKBUILD @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf" -builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF Glass_TTY_VT220.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$srcdir"/Glass_TTY_VT220.ttf } sha512sums="0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023 Glass_TTY_VT220.ttf" diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD new file mode 100644 index 000000000..65271ea38 --- /dev/null +++ b/user/gleam/APKBUILD @@ -0,0 +1,299 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=gleam +pkgver=0.6.0 +pkgrel=0 +pkgdesc="Compiler for the Gleam language" +url="https://gleam.run" +arch="all" +license="Apache-2.0" +depends="erl-rebar3" +makedepends="cargo erlang-dev rust" +source="$pkgname-$pkgver.tar.gz::https://github.com/gleam-lang/gleam/archive/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +aho-corasick-0.7.6 +ansi_term-0.11.0 +arrayref-0.3.5 +arrayvec-0.5.1 +ascii-canvas-2.0.0 +atty-0.2.13 +autocfg-0.1.7 +backtrace-0.3.40 +backtrace-sys-0.1.32 +base64-0.10.1 +bit-set-0.5.1 +bit-vec-0.5.1 +bitflags-1.2.1 +bitmaps-2.0.0 +blake2b_simd-0.5.9 +block-buffer-0.7.3 +block-padding-0.1.5 +byte-tools-0.3.1 +byteorder-1.3.2 +cc-1.0.48 +cfg-if-0.1.10 +clap-2.33.0 +cloudabi-0.0.3 +codespan-0.3.0 +codespan-reporting-0.3.0 +constant_time_eq-0.1.4 +crossbeam-utils-0.6.6 +ctor-0.1.12 +diff-0.1.12 +difference-2.0.0 +digest-0.8.1 +dirs-1.0.5 +docopt-1.1.0 +either-1.5.3 +ena-0.13.1 +failure-0.1.6 +failure_derive-0.1.6 +fake-simd-0.1.2 +fixedbitset-0.1.9 +fuchsia-cprng-0.1.1 +generic-array-0.12.3 +heck-0.3.1 +im-14.1.0 +itertools-0.8.2 +lalrpop-0.17.2 +lalrpop-util-0.17.2 +lazy_static-1.4.0 +libc-0.2.66 +log-0.4.8 +memchr-2.2.1 +new_debug_unreachable-1.0.3 +opaque-debug-0.2.3 +ordermap-0.3.5 +output_vt100-0.1.2 +petgraph-0.4.13 +phf_generator-0.7.24 +phf_shared-0.7.24 +precomputed-hash-0.1.1 +pretty_assertions-0.6.1 +proc-macro-error-0.2.6 +proc-macro2-1.0.6 +quote-1.0.2 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.2 +rand_core-0.5.1 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.4 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rand_xoshiro-0.4.0 +rdrand-0.4.0 +redox_syscall-0.1.56 +redox_users-0.3.1 +regex-1.3.1 +regex-syntax-0.6.12 +rust-argon2-0.5.1 +rustc-demangle-0.1.16 +same-file-1.0.5 +serde-1.0.104 +serde_derive-1.0.104 +sha2-0.8.0 +siphasher-0.2.3 +sized-chunks-0.5.1 +string_cache-0.7.5 +string_cache_codegen-0.4.4 +string_cache_shared-0.3.0 +strsim-0.8.0 +strsim-0.9.3 +structopt-0.3.5 +structopt-derive-0.3.5 +strum-0.17.1 +strum_macros-0.17.1 +syn-1.0.11 +synstructure-0.12.3 +term-0.5.2 +termcolor-1.0.5 +textwrap-0.11.0 +thread_local-0.3.6 +toml-0.5.5 +typenum-1.11.2 +unicode-segmentation-1.6.0 +unicode-width-0.1.7 +unicode-xid-0.1.0 +unicode-xid-0.2.0 +vec_map-0.8.1 +version_check-0.9.1 +walkdir-2.2.9 +winapi-0.3.8 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.2 +winapi-x86_64-pc-windows-gnu-0.4.0 +wincolor-1.0.2 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $cargo_deps; do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build --release -j $JOBS + export PATH="$PATH:$builddir/gleam/target/release" +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + export PATH="$PATH:$srcdir/$pkgname-$pkgver/gleam/target/release" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --path . --root="$pkgdir/usr" + rm "$pkgdir/usr/.crates.toml" +} + + +sha512sums="c47d711064a586070704c1ca6566e309df189c96ad26bbfe4d4b7c785ea1e196131829bb50f1665ae00f66f2a55660b9f6f108a1bf4a5621b104d93405fb0af0 gleam-0.6.0.tar.gz +120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1 aho-corasick-0.7.6.tar.gz +a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz +6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8 arrayref-0.3.5.tar.gz +53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043 arrayvec-0.5.1.tar.gz +814f1709d6863b904ba014025b01b3764592eed280df2500f8eaed9c150998315b4ae1de87d9c5d5c179f73cd0c110756e2a4515f04dba9b259f61522ef1cf57 ascii-canvas-2.0.0.tar.gz +4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz +667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925 autocfg-0.1.7.tar.gz +8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27 backtrace-0.3.40.tar.gz +199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3 backtrace-sys-0.1.32.tar.gz +674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz +1b58b9a1e6dc33483f302415e0a77544dab288c819ed5d899f6ef3969750a17227c5aeb1b563aef41e77e06e665cfa995e358a566f5783a2d3af0087d5fc65c1 bit-set-0.5.1.tar.gz +c0d57ec2c07ea660919ab7e17881b544496de0d6ee51cc8008b7da0bb39a2dd1ca680cc07051e007d6efaa91b25335e13a799e11a7a9d9a8084cc47525742cc7 bit-vec-0.5.1.tar.gz +ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz +6e89076a6ebe8256b99054a62e5112e8aba12f4393905bb4f6577f8cb19179a566df4fac01533aa83e3ae25950b9818828a9526ad370936355b8e5f761b6c81c bitmaps-2.0.0.tar.gz +cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e blake2b_simd-0.5.9.tar.gz +74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf block-buffer-0.7.3.tar.gz +acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a block-padding-0.1.5.tar.gz +18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa byte-tools-0.3.1.tar.gz +2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz +4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165 cc-1.0.48.tar.gz +9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz +f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +c19fb68a06e4fdec291b172b94a2689b46a4605c7dfef4c33ae5639236f7c3b6ec8f9cecbaabcd72e12adf0d53446696972cc069a50bf54041c2f4a6b908de58 codespan-0.3.0.tar.gz +22706026b13aec1a212e375ea665630154288c9ce056b3cd030b840c5b3ea16aa359678dc8378ca7b75189ff08c8e3faf3c695729f10209f5213021bcca88a0e codespan-reporting-0.3.0.tar.gz +65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96 constant_time_eq-0.1.4.tar.gz +771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 crossbeam-utils-0.6.6.tar.gz +b73f9b9470c75aab8368accf179dbc42ccc0530f5e18ceceef6f2206bf1d9016862d578f720ddc97dac9a52cdae6da019599cacf06a44a13817d1cc0390a4b75 ctor-0.1.12.tar.gz +0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 diff-0.1.12.tar.gz +cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482 difference-2.0.0.tar.gz +186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 digest-0.8.1.tar.gz +12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416 dirs-1.0.5.tar.gz +f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81 docopt-1.1.0.tar.gz +5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 either-1.5.3.tar.gz +73b1ba85df436ab0ea7bc19e3540af90b4d55de49b0c639c8cc83a9be2019dd56594530e6826dafbdcb5da673d1645a49a8f64207d6680ee16d7356d5283637f ena-0.13.1.tar.gz +9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8 failure-0.1.6.tar.gz +5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3 failure_derive-0.1.6.tar.gz +d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 fake-simd-0.1.2.tar.gz +07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964 fixedbitset-0.1.9.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 generic-array-0.12.3.tar.gz +134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz +003e3e6c8d1ba50f12ae119eed83e48e0c89db473714397ed81479440affd5b699c9de004a5454207fac2c23783a798079d5381a1a383203a64f9ccbe046237f im-14.1.0.tar.gz +325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 itertools-0.8.2.tar.gz +257d72cd455153aab1c619d05ff9bf55c010957728d582f77f05c665203fd54337024a6670ecd5fe66243b3e0b1bb82af55ed3797cfbb8de1e5a57492de495c3 lalrpop-0.17.2.tar.gz +bc11b32ed4adbd5414645e3758b4baea17c90035bf3195d91181adcba2c0e703a56e503967d12c8e154ba6c208d39e122af333042e7143e34cd9445799bf09b3 lalrpop-util-0.17.2.tar.gz +e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz +5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz +0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz +0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d memchr-2.2.1.tar.gz +d12686d789b0c37ae0b05881223b61737fd04092f10217caf4e6c9b8604e0a7734c9ff81b01ac204966c687481758b4dfaebf3b4947736ff90291a0dbfed3caa new_debug_unreachable-1.0.3.tar.gz +7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 opaque-debug-0.2.3.tar.gz +4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd ordermap-0.3.5.tar.gz +b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036 output_vt100-0.1.2.tar.gz +670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b petgraph-0.4.13.tar.gz +793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7 phf_generator-0.7.24.tar.gz +5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca phf_shared-0.7.24.tar.gz +a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz +10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71 pretty_assertions-0.6.1.tar.gz +7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d proc-macro-error-0.2.6.tar.gz +d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853 proc-macro2-1.0.6.tar.gz +67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e rand_xoshiro-0.4.0.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz +086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5 redox_users-0.3.1.tar.gz +6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7 regex-1.3.1.tar.gz +671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec regex-syntax-0.6.12.tar.gz +80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c rust-argon2-0.5.1.tar.gz +36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063 rustc-demangle-0.1.16.tar.gz +33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc same-file-1.0.5.tar.gz +638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a serde-1.0.104.tar.gz +303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e serde_derive-1.0.104.tar.gz +6d95888b40c7f84b245864891d4a3e8c06ed3e0cde1aaeacde2ef75c969e00b524fe6045aa9b978d0036b315cc74502f88aab0da67c6708b2450efa9119abdad sha2-0.8.0.tar.gz +7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0 siphasher-0.2.3.tar.gz +31fcaeba18cae9ac1e9d6a994619249affe42a4c9a3dbbcafeefce809fbdb778972ae4bc222d7cf2d3b3a0c8d163edd99dcc859806b6e50b9a3d8066b8cad5ab sized-chunks-0.5.1.tar.gz +b712043a5aff20ca197eae5e9e1ad50ea164631e6c8be25549e67c4c2b83e3bd7b2fce9def410dce585d8aca682ad17ce51d61b5c2bbdf10404f3114dbb8b139 string_cache-0.7.5.tar.gz +59a92121f4e0967da13c6a2f40cfefb0451c734af6555f014dfd885ef8b478a803253f0c36c7ec95cd78032f2f50d3614daa3828cdc85e28acb6f588472aca44 string_cache_codegen-0.4.4.tar.gz +1ccae53f80c250bcb715c3276133295f3543d0a8708fe4a990c1ac81a5c783c23d9e7e080fa7bd159397d0908f90cf1eb3453975750c121c1c36c80d3fd3cca3 string_cache_shared-0.3.0.tar.gz +1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz +8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51 strsim-0.9.3.tar.gz +a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2 structopt-0.3.5.tar.gz +cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe structopt-derive-0.3.5.tar.gz +8e22d02ad05c1718b013fb27b63f2d09c631c037e1fa6e27d78cb5e1b8b11bb2dbbcaff49a76dc795a6de9629765c36fb04e3c9549e4c01ad88ed1df474899e9 strum-0.17.1.tar.gz +4ce42a7ca81c1ff57df782c4bfda0bd20b33e8ef181d1fea58fb145166979c4252c60b64351fe305aeda2e05e972e4e65c61a9fdcc5cd6e1fa44322f9c98f1a1 strum_macros-0.17.1.tar.gz +6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c syn-1.0.11.tar.gz +919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59 synstructure-0.12.3.tar.gz +421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6 term-0.5.2.tar.gz +d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz +f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz +cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz +8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz +c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a typenum-1.11.2.tar.gz +80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e unicode-segmentation-1.6.0.tar.gz +39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz +cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz +026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz +b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf version_check-0.9.1.tar.gz +43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b walkdir-2.2.9.tar.gz +5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10 wincolor-1.0.2.tar.gz" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 365b7e906..f07a9d235 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.0 +pkgver=2.62.1 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -28,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="2b9b0414baba307d35f8f6539fcbf0cf224da1970c532b130718deeeaa85f5601b8285ce822888273afed7fa643b62310bf306bbfa22f465134af345f3cd0e9d glib-networking-2.62.0.tar.xz" +sha512sums="6f9064d42d28b674dea0fb4ffcc954210aae92b7fcb7bcaae7a28a600b4a8782aed9077e61dd2a55ff0a8ade060c9a5556ba2e3bd2e697521f8d80bfdd241195 glib-networking-2.62.1.tar.xz" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 480e596ff..f0c35dca1 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.62.1 +pkgver=2.62.5 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" arch="all" options="!check" # Now requires D-Bus running. license="LGPL-2.1+" -depends="" +depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" checkdepends="tzdata shared-mime-info" -makedepends="$depends_dev meson ninja pcre-dev xmlto zlib-dev" +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" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-gquark-fix-initialization-with-c-constructors.patch @@ -75,11 +75,11 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="098e59d0da4cdd282156c2941c52127d33f1749802b23901efd6b760db99f6944b5cef445d76660a159ad4b912bc9d03dbf8c24b7f15b28e9770f37ca082a57c glib-2.62.1.tar.xz +sha512sums="2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371 glib-2.62.5.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch 34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch 56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -d788005bc92ed1510235b77a9a26eecd78840a3e915a64e53e1e93cd1efaaeb1b9b5edb115f41352fcbdab10006b91b4aae7af20184c904e869a0d6893080368 meson-sucks-and-i-hate-you-so-much-right-now.patch" +dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch index ba38bdec2..1e63ac0f4 100644 --- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch +++ b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch @@ -1,8 +1,8 @@ --- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000 +++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000 -@@ -6,4 +6,5 @@ +@@ -1,4 +1,5 @@ charset_lib = static_library('charset', 'localcharset.c', include_directories : configinc, pic : true, + install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(charsetalias_dir) ] + glib_hidden_visibility_args) + c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index a0bac403d..f499efc9d 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=glibmm pkgver=2.62.0 pkgrel=0 diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index c1edaaa02..659a0d1b1 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gmime -pkgver=3.2.4 +pkgver=3.2.6 pkgrel=0 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" @@ -10,7 +10,7 @@ license="LGPL-2.1+" depends="" depends_dev="gpgme-dev libidn2-dev zlib-dev" checkdepends="gnupg" -makedepends="$depends_dev" +makedepends="$depends_dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 3.2.3-broken-tests.patch @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b gmime-3.2.4.tar.xz +sha512sums="a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d gmime-3.2.6.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 0c09a5aa9..583194c4b 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -18,7 +18,6 @@ source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" soinstall install -D -m644 base/*.h "$pkgdir"/usr/include/ghostscript diff --git a/user/gnucobol/APKBUILD b/user/gnucobol/APKBUILD index c95083a7f..1173da988 100644 --- a/user/gnucobol/APKBUILD +++ b/user/gnucobol/APKBUILD @@ -11,13 +11,15 @@ license="GPL-3.0+ AND LGPL-3.0+ AND GFDL-1.3" # Since it compiles to C as an intermediate, the headers / libraries must # always be present and thus there is no -dev subpackage. depends="db-dev gmp-dev ncurses-dev" -makedepends="help2man texinfo" +makedepends="autoconf automake help2man libtool texinfo" subpackages="$pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/project/open-cobol/gnu-cobol/3.0/$pkgname-$_pkgver.tar.xz https://dev.sick.bike/dist/newcob.val.Z keep-debug-flags.patch big-endian.patch - tests-are-fatal.patch" + tests-are-fatal.patch + dash-compat.patch + " builddir="$srcdir/$pkgname-$_pkgver" prepare() { @@ -51,5 +53,6 @@ package() { sha512sums="da669f7bef0c6664723dc88c20e28236ea31d5c933d9129b0132e929eb66f723995d3428b056164cf105bc22b38b8bc5fbf9d0d5b76df4ce6c08045837930fa0 gnucobol-3.0-rc1.tar.xz eb784866d1a335834074fbe103b5c5f5da810d847ae14a64316ecbb2c0f95ef751d2f2ec609b8fa21ef0b775817dc61115a574608ec89750d779ae0afbb95379 newcob.val.Z f45611c1298680b0c763094af662b3d1925d32379d33faff77862d7eaa3bf6225f68d5160a39a0822f54b570c923a53bc72dec54cff4f04f1162515834a40be2 keep-debug-flags.patch -f7c1249db9d0f8d3a4eda732db93970f73fe649d1725b0b73c92af4885bc816d8727dbbcb8e9a1fb998997f3beed7de2812202749f05bbe1471b907737645648 big-endian.patch -ca5ba1e19e5ff8740008b45ffcea4c1e8e34fc62246f3e635424ae1ec374c5cd9d7cc94d371690c021ccf82e293db7235143ebcaadb20ae5e4fc258749ff56c4 tests-are-fatal.patch" +f8f8bb395e3f2e0e993df5133d1ed459dc7f03f148d76ddbbe4820f7674300c8c9a8d024785124444ca71a18a0d917e816ab852e0b5e9ebbfa5ed35f12a80b0f big-endian.patch +ca5ba1e19e5ff8740008b45ffcea4c1e8e34fc62246f3e635424ae1ec374c5cd9d7cc94d371690c021ccf82e293db7235143ebcaadb20ae5e4fc258749ff56c4 tests-are-fatal.patch +376af9b264b679388722b4d489a834cfb24b47fbdb6cd9bd9c239894741ffc265c2f83d770b0a820f48b3668b3596544183b48bee319186e4ed5c9c60bad4e77 dash-compat.patch" diff --git a/user/gnucobol/big-endian.patch b/user/gnucobol/big-endian.patch index 848300e15..65e5243d2 100644 --- a/user/gnucobol/big-endian.patch +++ b/user/gnucobol/big-endian.patch @@ -14,7 +14,7 @@ diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at index 2ef4a86..173ac48 100644 --- a/tests/testsuite.src/run_misc.at +++ b/tests/testsuite.src/run_misc.at -@@ -6185,6 +6185,10 @@ AT_CLEANUP +@@ -5918,6 +5918,10 @@ AT_CLEANUP AT_SETUP([MF FIGURATIVE to NUMERIC]) AT_KEYWORDS([MOVE]) @@ -25,7 +25,7 @@ index 2ef4a86..173ac48 100644 AT_DATA([prog.cob], [ IDENTIFICATION DIVISION. PROGRAM-ID. prog. -@@ -6230,12 +6234,16 @@ AT_DATA([prog.cob], [ +@@ -5963,12 +5967,16 @@ AT_DATA([prog.cob], [ DISPLAY "MOVE HIGH-VALUES TO BIGFLT" MOVE HIGH-VALUES TO BIGFLT. PERFORM SHOW-BIG. @@ -42,7 +42,7 @@ index 2ef4a86..173ac48 100644 DISPLAY "MOVE ALL '21' TO BIGFLT" MOVE ALL '21' TO BIGFLT. PERFORM SHOW-BIG. -@@ -6244,7 +6252,6 @@ AT_DATA([prog.cob], [ +@@ -5977,7 +5985,6 @@ AT_DATA([prog.cob], [ CALL "dump" USING MYFLD. SHOW-BIG. DISPLAY "BIGFLT is " BIGFLT. @@ -50,7 +50,7 @@ index 2ef4a86..173ac48 100644 ]) AT_DATA([cmod.c], [[ -@@ -6303,10 +6310,8 @@ BIGFLT is 2.1973164E-18 +@@ -6033,10 +6040,8 @@ BIGFLT is 2.1973164E-18 22222222 . MOVE ALL * TO BIGFLT BIGFLT is 5.4312347E+12 @@ -77,7 +77,7 @@ diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at index 173ac48..51f4b84 100644 --- a/tests/testsuite.src/run_misc.at +++ b/tests/testsuite.src/run_misc.at -@@ -6275,7 +6275,7 @@ prog.cob:28: warning: numeric value is expected +@@ -6005,7 +6005,7 @@ prog.cob:28: warning: numeric value is expected prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4) prog.cob:34: warning: numeric value is expected prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4) @@ -105,7 +105,7 @@ diff --git a/libcob/common.c b/libcob/common.c index 5262282..d99c533 100644 --- a/libcob/common.c +++ b/libcob/common.c -@@ -5275,9 +5275,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo +@@ -5138,9 +5138,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo COB_CHK_PARMS (CBL_GC_GETOPT, 6);
@@ -116,7 +116,7 @@ index 5262282..d99c533 100644 if (COB_MODULE_PTR->cob_procedure_params[1]) {
lo_size = COB_MODULE_PTR->cob_procedure_params[1]->size;
}
-@@ -5288,9 +5286,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5151,9 +5149,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
opt_val_size = COB_MODULE_PTR->cob_procedure_params[5]->size;
}
@@ -127,7 +127,7 @@ index 5262282..d99c533 100644 if (lo_size % sizeof (longoption_def) == 0) {
lo_amount = (int)lo_size / sizeof (longoption_def);
longoptions_root = (struct option*) cob_malloc (sizeof (struct option) * (lo_amount + 1U));
-@@ -5305,9 +5301,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo +@@ -5168,9 +5164,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo }
longind = cob_get_int (COB_MODULE_PTR->cob_procedure_params[2]);
@@ -138,7 +138,7 @@ index 5262282..d99c533 100644 shortoptions = cob_malloc (so_size + 1U);
if (COB_MODULE_PTR->cob_procedure_params[0]) {
cob_field_to_string (COB_MODULE_PTR->cob_procedure_params[0], shortoptions, so_size);
-@@ -5333,9 +5327,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo +@@ -5196,9 +5190,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo longoptions = longoptions + 1;
}
@@ -149,7 +149,7 @@ index 5262282..d99c533 100644 longoptions->name = NULL;
longoptions->has_arg = 0;
longoptions->flag = NULL;
-@@ -5348,17 +5340,42 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo +@@ -5211,17 +5203,42 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo return_value = cob_getopt_long_long (cob_argc, cob_argv, shortoptions, longoptions, &longind, long_only);
temp = (char *) &return_value;
@@ -218,7 +218,7 @@ diff --git a/libcob/fileio.c b/libcob/fileio.c index 885cd48..521e245 100644 --- a/libcob/fileio.c +++ b/libcob/fileio.c -@@ -5633,6 +5633,22 @@ cob_sys_open_file (unsigned char *file_name, unsigned char *file_access, +@@ -5559,6 +5559,22 @@ cob_sys_open_file (unsigned char *file_name, unsigned char *file_access, COB_CHK_PARMS (CBL_OPEN_FILE, 5);
@@ -241,7 +241,7 @@ index 885cd48..521e245 100644 return open_cbl_file (file_name, file_access, file_handle, 0);
}
-@@ -5647,6 +5663,24 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access, +@@ -5573,6 +5589,24 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access, * @param: file_dev : not implemented, set 0
*/
@@ -266,7 +266,7 @@ index 885cd48..521e245 100644 if (*file_lock != 0) {
cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_lock: %d"), *file_lock);
}
-@@ -5654,8 +5688,6 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
+@@ -5580,8 +5614,6 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_dev: %d"), *file_dev);
}
@@ -300,7 +300,7 @@ index 7c3c660..5ddbd58 100644 ## Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart ## ## This file is part of GnuCOBOL. -@@ -4254,7 +4254,7 @@ AT_CLEANUP +@@ -4145,7 +4145,7 @@ AT_CLEANUP AT_SETUP([UDF with recursion]) AT_KEYWORDS([functions LOCAL-STORAGE]) diff --git a/user/gnucobol/dash-compat.patch b/user/gnucobol/dash-compat.patch new file mode 100644 index 000000000..e2d7f6006 --- /dev/null +++ b/user/gnucobol/dash-compat.patch @@ -0,0 +1,29 @@ +--- gnucobol-3.0-rc1/tests/testsuite.src/listings.at.old 2018-04-22 19:55:50.000000000 +0000 ++++ gnucobol-3.0-rc1/tests/testsuite.src/listings.at 2020-01-14 09:08:26.488668118 +0000 +@@ -2185,7 +2185,7 @@ + + AT_CHECK([$UNIFY_LISTING prog.lst prog.lis once], [0], [], []) + +-AT_CHECK([test "$COB_HAS_64_BIT_POINTER" == "yes"], [0], [], [], ++AT_CHECK([test "$COB_HAS_64_BIT_POINTER" = "yes"], [0], [], [], + + # Previous test "failed" --> 32 bit + +@@ -5761,4 +5761,4 @@ + AT_CHECK([$UNIFY_LISTING prog.lst prog.lis once], [0], [], []) + AT_CHECK([diff prog1.lst prog.lis], [0], [], []) + +-AT_CLEANUP +\ No newline at end of file ++AT_CLEANUP +--- gnucobol-3.0-rc1/tests/testsuite.src/data_pointer.at.old 2018-04-22 19:55:46.000000000 +0000 ++++ gnucobol-3.0-rc1/tests/testsuite.src/data_pointer.at 2020-01-14 09:08:48.226341564 +0000 +@@ -40,7 +40,7 @@ + + AT_CHECK([$COMPILE prog.cob], [0], [], []) + +-AT_CHECK([test "$COB_HAS_64_BIT_POINTER" == "yes"], [0], [], [], ++AT_CHECK([test "$COB_HAS_64_BIT_POINTER" = "yes"], [0], [], [], + + # Previous test "failed" --> 32 bit + diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index 283227674..f847f2914 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.45 -pkgrel=1 +pkgver=1.12.46 +pkgrel=0 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" arch="all" @@ -11,12 +11,10 @@ options="!check" # Fails with: # no clue. license="GPL-2.0-only OR GPL-3.0-only" depends="" -makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool +makedepends="byacc gobject-introspection-dev goffice-dev>=0.10.46 gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz - cs.patch - " +source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz" build() { LIBS="-lintl" YACC=yacc ./configure \ @@ -38,5 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="08933ce52abc15e3e690ceea4e617618db65936a482312af8d9e37f3eaec9946950f97f3967357668c7f66ca3cc568d4492e94aa17fe8432ca42adb8bbcd2508 gnumeric-1.12.45.tar.xz -24d74cec5a19f3f79a049b02b43369324fbb1432be4945988034a38d813cceeab54da67d3d9eb2eff49d248e449212d0877b20b593a8c1f70cecbdbd635cb517 cs.patch" +sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea gnumeric-1.12.46.tar.xz" diff --git a/user/gnumeric/cs.patch b/user/gnumeric/cs.patch deleted file mode 100644 index b61f242c2..000000000 --- a/user/gnumeric/cs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnumeric-1.12.44/doc/cs/cs.po.old 2018-11-03 17:22:50.000000000 +0000 -+++ gnumeric-1.12.44/doc/cs/cs.po 2019-01-10 01:35:07.770000000 +0000 -@@ -24824,7 +24824,7 @@ - msgstr "" - "Můžete nastavit i několik doplňujících voleb. Jestli chcete omezit počet " - "iterací optimalizačního algoritmu, tak to můžete udělat v poli " --"<guilabel>Max. iterací<guilabel> na kartě <guilabel>Volby</guilabel>. " -+"<guilabel>Max. iterací</guilabel> na kartě <guilabel>Volby</guilabel>. " - "Obdobně můžete omezit maximální dobu běhu optimalizace v poli <guilabel>Max. " - "čas (sekundy)</guilabel>. Pokud je některé z těchto nastavení při " - "optimalizaci překročeno, optimalizace se přeruší a zobrazí se chybové " diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index e8d3ff2f4..3056c30a3 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,24 +1,26 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.17 +pkgver=2.2.19 pkgrel=0 -pkgdesc="GNU Privacy Guard 2 - PGP replacement" +pkgdesc="Complete and free implementation of the OpenPGP standard" url="https://www.gnupg.org/" arch="all" license="GPL-3.0+ AND GPL-2.0+ AND LGPL-2.1+ AND LGPL-3.0+ AND MIT AND BSD-3-Clause AND Public-Domain" depends="pinentry" -pkggroups="gnupg" makedepends="bzip2-dev gnutls-dev libassuan-dev libgcrypt-dev libgpg-error-dev libksba-dev libusb-dev npth-dev openldap-dev sqlite-dev zlib-dev" +pkggroups="gnupg" +install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-doc $pkgname-lang" source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 0001-Include-sys-select.h-for-FD_SETSIZE.patch fix-i18n.patch 60-scdaemon.rules" -install="$pkgname.pre-install $pkgname.pre-upgrade" # secfixes: +# 2.2.19-r0: +# - CVE-2019-14855 # 2.2.17-r0: # - CVE-2019-13050 @@ -50,7 +52,7 @@ package() { install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d gnupg-2.2.17.tar.bz2 +sha512sums="d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd gnupg-2.2.19.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 2ca589cae..616793f57 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.9 -pkgrel=1 +pkgver=3.6.11.1 +pkgrel=0 pkgdesc="A TLS protocol implementation" url="http://www.gnutls.org/" arch="all" @@ -24,7 +24,6 @@ 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" -builddir="$srcdir/$pkgname-$_v2" # secfixes: # 3.5.13-r0: @@ -80,5 +79,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07 gnutls-3.6.9.tar.xz +sha512sums="55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489 gnutls-3.6.11.1.tar.xz abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 4eff26b6b..6a60b2ce1 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice -pkgver=0.10.45 +pkgver=0.10.46 pkgrel=0 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" arch="all" license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND MIT" +depends="" makedepends="librsvg-dev intltool gtk+2.0-dev libtool gtk-doc libxslt-dev gobject-introspection-dev glib-dev libgsf-dev cairo-dev libxml2-dev gtk+3.0-dev" @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="72400d1cc9e4ca8b6562773879180651b6404e0c8dd8fcdcd7f6491dc42e12ee57f30f8f0c2f788d25bd2397dc4bdf95af7b875356a03d5981a7e311cfd7e132 goffice-0.10.45.tar.xz" +sha512sums="23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3 goffice-0.10.46.tar.xz" diff --git a/user/gperf/APKBUILD b/user/gperf/APKBUILD index b11af06da..84297a740 100644 --- a/user/gperf/APKBUILD +++ b/user/gperf/APKBUILD @@ -12,9 +12,7 @@ depends="" makedepends="" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" -build () -{ - cd "$builddir" +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +21,11 @@ build () } check() { - cd "$builddir" make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } + sha512sums="855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 gperf-3.1.tar.gz" diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD index 46cd8f81d..4ffe06950 100644 --- a/user/gprbuild/APKBUILD +++ b/user/gprbuild/APKBUILD @@ -9,10 +9,12 @@ url="https://github.com/AdaCore/gprbuild" arch="all" options="!check" # No test suite. license="GPL-3.0+" +depends="" makedepends="gcc-gnat" -source="$pkgname-$_pkgver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 - xmlada-$_xmlver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 - foxkit.xml" +source="https://distfiles.adelielinux.org/source/$pkgname-$_pkgver-src.tar.gz + https://distfiles.adelielinux.org/source/xmlada-$_xmlver-src.tar.gz + foxkit.xml + " builddir="$srcdir/$pkgname-$_pkgver-src" build() { diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD index 265d5f8c3..65f372d39 100644 --- a/user/gptfdisk/APKBUILD +++ b/user/gptfdisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gptfdisk -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Utility for manipulating GUID Partition Tables (GPT)" url="https://www.rodsbooks.com/gdisk/index.html" @@ -11,20 +11,20 @@ license="GPL-2.0-only" depends="" makedepends="icu-dev ncurses-dev popt-dev util-linux-dev" subpackages="$pkgname-doc" -source="https://www.rodsbooks.com/gdisk/gptfdisk-$pkgver.tar.gz" +source="https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$pkgver/gptfdisk-$pkgver.tar.gz + ncurses.patch + " build() { - cd "$builddir" make LDFLAGS="$LDFLAGS -ltinfo" } package() { - cd "$builddir" - local _app for _app in cgdisk fixparts gdisk sgdisk; do install -D -m755 $_app "$pkgdir"/usr/sbin/$_app install -D -m644 $_app.8 "$pkgdir"/usr/share/man/man8/$_app.8 done } -sha512sums="2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf gptfdisk-1.0.4.tar.gz" +sha512sums="3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703 gptfdisk-1.0.5.tar.gz +052dab1640dcceceace0a147af4853ba3f1210880bdd9519b151d9c8f17b6dbc339828fa83d73314af022aa27b9e2b8eabfd81460b0a7e3d3485697323c62760 ncurses.patch" diff --git a/user/gptfdisk/ncurses.patch b/user/gptfdisk/ncurses.patch new file mode 100644 index 000000000..6d8589309 --- /dev/null +++ b/user/gptfdisk/ncurses.patch @@ -0,0 +1,14 @@ +--- gptfdisk-1.0.5/gptcurses.cc.old 2020-02-17 22:34:11.000000000 +0000 ++++ gptfdisk-1.0.5/gptcurses.cc 2020-02-26 02:16:16.836739330 +0000 +@@ -23,11 +23,7 @@ + #include <iostream> + #include <string> + #include <sstream> +-#ifdef __APPLE__ + #include <ncurses.h> +-#else +-#include <ncursesw/ncurses.h> +-#endif + #include "gptcurses.h" + #include "support.h" + diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 59e7264f8..d4973d5ff 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kxmlgui-dev knewstuff-dev kdoctools-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/granatier-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/granatier-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="20e7b88ffc6e326f4c0000d7b6a9992141f7c2f2236d235e96aea513be257ec29873d7156da4a12b52bef0d49dd54cd9a07942b6463fcb38273e40640aadd6b7 granatier-19.08.2.tar.xz" +sha512sums="efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5 granatier-19.12.3.tar.xz" diff --git a/user/grantlee/APKBUILD b/user/grantlee/APKBUILD index ddf639728..b76b2d792 100644 --- a/user/grantlee/APKBUILD +++ b/user/grantlee/APKBUILD @@ -1,9 +1,9 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grantlee -pkgver=5.1.0 -pkgrel=1 -pkgdesc="Libraries for text templating with Qt" +pkgver=5.2.0 +pkgrel=0 +pkgdesc="Qt string template engine based on the Django template system" url="https://github.com/steveire/grantlee/" arch="all" license="LGPL-2.1+" @@ -11,10 +11,9 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="cmake $depends_dev qt5-qtscript-dev doxygen graphviz" subpackages="$pkgname-dev $pkgname-doc" -source="grantlee-$pkgver.tar.gz::https://github.com/steveire/grantlee/archive/v$pkgver.tar.gz" +source="http://downloads.grantlee.org/grantlee-5.2.0.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -24,21 +23,19 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make all docs } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E buildertest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/doc/grantlee mv "$builddir"/apidox "$pkgdir"/usr/share/doc/grantlee/ } -sha512sums="8a4906979f160abf21481d364f0318789c8b5340c62bff06cc62e6714dbf2c52cbfe577a24490052ac25d94f4cc59e11764204236bc7532bd7f1fd5188baa41a grantlee-5.1.0.tar.gz" +sha512sums="94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd grantlee-5.2.0.tar.gz" diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 6ad455474..74e5b7032 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -12,7 +12,6 @@ license="LGPL-2.1+ OR MPL-2.0+ OR GPL-2.0+" depends="" depends_dev="freetype-dev" makedepends="$depends_dev cmake" -install="" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz graphite2-1.2.0-cmakepath.patch @@ -20,8 +19,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$ builddir="$srcdir/$_realname-$pkgver" build() { - cd "$builddir" - # Fix linking error on 32-bit platforms sed -i -e 's/\-nodefaultlibs//g' src/CMakeLists.txt @@ -31,8 +28,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DGRAPHITE2_COMPARE_RENDERER=OFF \ - -DGRAPHITE2_NFILEFACE=ON \ - -DGRAPHITE2_NSEGCACHE=ON + -DGRAPHITE2_NFILEFACE=ON # fix unwanted -O3 cflag (taken from Debian) find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \; @@ -40,8 +36,7 @@ build() { } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" -C build install } sha512sums="8e2c6047a66b4d8873842de6b9b1909d326512b47a04f483b3a6113b97fd0d47e0da7cf9ecf96e060ca06e5288b49f1300e2fd7165d2d82d6a8eb8cb7d53d33f graphite2-1.3.13.tar.gz diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index 73aebef87..f02cec944 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=graphviz -pkgver=2.40.1 -pkgrel=2 +pkgver=2.42.3 +pkgrel=0 pkgdesc="Graph visualization software" url="http://www.graphviz.org/" arch="all" @@ -13,27 +13,18 @@ depends="" depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev librsvg-dev gmp-dev freetype-dev" -makedepends="$depends_dev flex swig guile-dev m4 libtool - bison gtk+2.0-dev libltdl tcl tcl-dev" +makedepends="$depends_dev flex swig m4 libtool guile-dev + bison gtk+2.0-dev libltdl perl-dev python3-dev tcl tcl-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" -subpackages="$pkgname-dev $pkgname-doc - $pkgname-gtk $pkgname-graphs guile-$pkgname:guile" -source="$pkgname-$pkgver.tar.gz::https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz +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 $pkgname.trigger 0001-clone-nameclash.patch " -prepare() { - default_prepare - - cd "$builddir" - ./autogen.sh NOCONFIG -} - build() { - cd "$builddir" - LIBPOSTFIX=/ \ ./configure \ --build=$CBUILD \ @@ -66,7 +57,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" \ pkgconfigdir=/usr/lib/pkgconfig \ install @@ -76,11 +66,17 @@ package() { "$pkgdir"/usr/share/doc/graphviz } -guile() { - pkgdesc="Guile bindings for graphviz" +_lang() { + pkgdesc="$2 bindings for graphviz" + depends="$3" mkdir -p "$subpkgdir"/usr/lib/graphviz - mv "$pkgdir"/usr/lib/graphviz/guile* \ + mv "$pkgdir"/usr/lib/graphviz/$1* \ "$subpkgdir"/usr/lib/graphviz/ + mv "$pkgdir"/usr/lib/$1* "$subpkgdir"/usr/lib/ || true +} + +guile() { + _lang guile Guile guile } gtk() { @@ -98,6 +94,18 @@ graphs() { "$subpkgdir"/usr/share/graphviz/ } -sha512sums="a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 graphviz-2.40.1.tar.gz +_pl() { + _lang perl Perl +} + +_py3() { + _lang python3 "Python 3" +} + +_tcl() { + _lang tcl "Tcl/Tk" +} + +sha512sums="e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 graphviz-2.42.3.tar.gz 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD index 7ca60e872..b80f73c3d 100644 --- a/user/grfcodec/APKBUILD +++ b/user/grfcodec/APKBUILD @@ -16,12 +16,10 @@ source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-sou " build() { - cd "$builddir" make } package() { - cd "$builddir" make prefix=/usr DESTDIR="$pkgdir" install } diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 06e574c8d..2c0cfdbc9 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=1 +pkgrel=3 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -10,11 +10,12 @@ arch="all !s390x" options="!check !strip" # Cannot test boot loader. license="GPL-3.0+" depends="" -makedepends="bison flex freetype-dev linux-headers lvm2-dev python3 xz unifont +makedepends="bison flex freetype-dev fuse-dev linux-headers lvm2-dev python3 + unifont xz automake autoconf libtool" # [22:02] <@awilfox> [[sroracle]]: grub breaks without its locale files present # [22:02] <@awilfox> it cannot be split -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-mount" # currently grub only builds on x86*, aarch64 and ppc* systems flavors="" @@ -138,42 +139,49 @@ package() { bios() { pkgdesc="$pkgdesc (BIOS version)" depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-pc $subpkgdir/usr/lib/grub/ + mkdir -p "$subpkgdir"/usr/lib/grub + mv "$pkgdir"/usr/lib/grub/*-pc "$subpkgdir"/usr/lib/grub/ } efi() { pkgdesc="$pkgdesc (EFI version)" depends="$pkgname efibootmgr efivar" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-efi $subpkgdir/usr/lib/grub/ + mkdir -p "$subpkgdir"/usr/lib/grub + mv "$pkgdir"/usr/lib/grub/*-efi "$subpkgdir"/usr/lib/grub/ } xenhost() { - pkgdesc="$pkgdesc (XEN host version)" - mkdir -p $subpkgdir/usr/lib/grub-xen - mv $pkgdir/*-xen.bin $subpkgdir/usr/lib/grub-xen/ + pkgdesc="$pkgdesc (Xen host version)" + mkdir -p "$subpkgdir"/usr/lib/grub-xen + mv "$pkgdir"/*-xen.bin "$subpkgdir"/usr/lib/grub-xen/ } ieee1275() { - pkgdesc="$pkgdesc (IEEE1275 version)" + pkgdesc="$pkgdesc (IEEE-1275 OpenFirmware version)" depends="$pkgname powerpc-utils" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-ieee1275 $subpkgdir/usr/lib/grub/ + mkdir -p "$subpkgdir"/usr/lib/grub + mv "$pkgdir"/usr/lib/grub/*-ieee1275 "$subpkgdir"/usr/lib/grub/ } emu() { pkgdesc="$pkgdesc (EMU version)" depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ + mkdir -p "$subpkgdir"/usr/lib/grub + mv "$pkgdir"/usr/lib/grub/*-emu "$subpkgdir"/usr/lib/grub/ +} + +mount() { + pkgdesc="Utility to mount filesystems using GRUB modules" + depends="$pkgname" + mkdir -p "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/grub-mount "$subpkgdir"/usr/bin/ } sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb grub-2.04.tar.xz -f8c9af848c14abc3e4cc749b3ec80432d1d69bf945c8e48f1650ec35d2442450dc0436a02a4737d5d06f21d5fdef54a91120a393e8d77a6b55aeb897aa1fe85c adelie-branding.patch +4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439 adelie-branding.patch f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch 6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub +1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub 78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode" diff --git a/user/grub/adelie-branding.patch b/user/grub/adelie-branding.patch index 606c1e6e9..463d4bcf5 100644 --- a/user/grub/adelie-branding.patch +++ b/user/grub/adelie-branding.patch @@ -13,7 +13,7 @@ +case "x${GRUB_DISTRIBUTOR}" in + x) + OS=GNU/Linux;; -+ xAdélie|xAdelie) ++ xAdélie|xAdelie|xadelie) + OS="Adélie Linux"; + CLASS="--class adelie";; + *) diff --git a/user/grub/default-grub b/user/grub/default-grub index 3fb754c7e..ca5656224 100644 --- a/user/grub/default-grub +++ b/user/grub/default-grub @@ -6,6 +6,7 @@ GRUB_DEFAULT="Adélie" GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="Adélie" GRUB_CMDLINE_LINUX_DEFAULT="ro" +GRUB_DISABLE_LINUX_PARTUUID=false # Uncomment the following line if you do *not* want /boot/grub/grub.cfg to be # automatically regenerated when easy-kernel is upgraded. diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 47bf9ddf4..eaf6b74a3 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -6,6 +6,7 @@ pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" arch="noarch" license="LGPL-2.0+" +depends="" makedepends="glib-dev gobject-introspection-dev intltool meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" diff --git a/user/gsl/APKBUILD b/user/gsl/APKBUILD index 4d2a5d929..a16ec413e 100644 --- a/user/gsl/APKBUILD +++ b/user/gsl/APKBUILD @@ -20,7 +20,6 @@ source="https://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz # https://github.com/SciRuby/rb-gsl/issues/40 build() { - cd "$builddir" [ $CTARGET_ARCH != "ppc" ] || export ac_cv_c_ieee_interface=unknown ./configure \ --build=$CBUILD \ @@ -30,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gsm/APKBUILD b/user/gsm/APKBUILD index 17ff21e6f..493eac0a3 100644 --- a/user/gsm/APKBUILD +++ b/user/gsm/APKBUILD @@ -19,13 +19,11 @@ source="http://www.quut.com/gsm/gsm-$pkgver.tar.gz builddir="$srcdir"/gsm-${pkgver%.*}-pl${pkgver##*.} build() { - cd "$builddir" export RPM_OPT_FLAGS="$CFLAGS -fPIC" make all } package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/bin \ "$pkgdir"/usr/include/gsm \ "$pkgdir"/usr/lib \ diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 8788400ab..e9a0796ec 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.16.1 +pkgver=1.16.2 pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" @@ -48,4 +48,4 @@ doc() { replaces="${pkgname}1-doc" } -sha512sums="ce65b5d63d3ac6c20b051d477d09515bfb1c2e4b10c58346180265bdc4ae44dd9833727b5eea5fe9c409a3cd8874429be23654c7a5c23e881c0e8f9e89fb32c9 gst-plugins-base-1.16.1.tar.xz" +sha512sums="f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42 gst-plugins-base-1.16.2.tar.xz" diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index c9147e89e..0bda3806f 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.16.1 +pkgver=1.16.2 pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" +options="!check" # elements/souphttpsrc fails due to attempt to listen on :443 license="LGPL-2.1+" depends="" checkdepends="orc-compiler cmd:which" @@ -29,7 +30,6 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-introspection \ --with-package-origin="${DISTRO_NAME:-Adélie Linux} (${DISTRO_URL:-https://www.adelielinux.org/})" make } @@ -52,5 +52,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="06dc1887626864c30248df53d48e85ffdf0d1660d74f70f23c325c0844e9ca390556846cbae77fe9a4a90cb992e9a55117c15a9031b44a48d45dc07a61b18da4 gst-plugins-good-1.16.1.tar.xz +sha512sums="ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4 gst-plugins-good-1.16.2.tar.xz 1cecf260cfeb19675a819f9858426aaed3b9627ed90b8facb6cb12dfc0b265232639b1888d7cc03edb87025e3eddab6e3606f16b5f7ca261a6b1c39b0dbdc6f7 endian-test.patch" diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index d781a46a8..f443c5954 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.16.1 +pkgver=1.16.2 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" @@ -11,7 +11,6 @@ depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -replaces="gstreamer1" source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz " @@ -46,4 +45,4 @@ doc() { default_doc replaces="${pkgname}1-doc" } -sha512sums="30abcf20fa16cdedbacbecabef66367e614c9c5865311238397afbbe30fe6588909ddd7e917c4ec0749c4095c6f73b4de2e57a93ff2c1b97629206b05fc06173 gstreamer-1.16.1.tar.xz" +sha512sums="a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f gstreamer-1.16.2.tar.xz" diff --git a/user/gtest/APKBUILD b/user/gtest/APKBUILD index 14d16d8c9..46f396c03 100644 --- a/user/gtest/APKBUILD +++ b/user/gtest/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtest -pkgver=1.8.1 +pkgver=1.10.0 pkgrel=0 pkgdesc="C++ testing framework based on xUnit (like JUnit)" url="https://github.com/google/googletest" @@ -15,7 +15,6 @@ source="https://github.com/google/googletest/archive/release-$pkgver.tar.gz" builddir="$srcdir"/googletest-release-${pkgver} build() { - cd "$builddir" rm -rf build mkdir build cd build @@ -26,12 +25,11 @@ build() { } package() { - cd "$builddir" for dir in usr/lib usr/include/gtest/internal/custom usr/share/licenses/gtest\ usr/src/gtest/cmake usr/src/gtest/src; do install -d -m 0755 "$pkgdir"/"$dir" done - install -m 0644 build/googlemock/gtest/libgtest*.so "$pkgdir"/usr/lib + install -m 0644 build/lib/libgtest*.so "$pkgdir"/usr/lib install -m 0644 googletest/include/gtest/*.h "$pkgdir"/usr/include/gtest install -m 0644 googletest/include/gtest/internal/*.h \ @@ -43,4 +41,4 @@ package() { install -m 0644 googletest/cmake/* "$pkgdir"/usr/src/gtest/cmake/ } -sha512sums="e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 release-1.8.1.tar.gz" +sha512sums="bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9 release-1.10.0.tar.gz" diff --git a/user/gtk+/APKBUILD b/user/gtk+/APKBUILD deleted file mode 100644 index 157afe4e7..000000000 --- a/user/gtk+/APKBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: -pkgname=gtk+ -pkgver=2.24.32 -pkgrel=0 -pkgdesc="Metapackage for GTK+ runtime and development" -url="https://www.gtk.org/" -arch="all" -license="LGPL-2.0+" -options="!check !dbg" -depends="gtk+2.0>=$pkgver" -makedepends="$depends_dev" -subpackages="$pkgname-dev" - -dev() { - depends="gtk+2.0-dev" - mkdir -p "$subpkgdir" -} - -package() { - mkdir -p "$pkgdir" -} - diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 78da2678b..1f8b5e082 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,14 +1,12 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.12 +pkgver=3.24.13 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" arch="all" options="!check" # Test suite is known to fail upstream license="LGPL-2.1+" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="adwaita-icon-theme shared-mime-info gtk-update-icon-cache" makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev fontconfig-dev gdk-pixbuf-dev glib-dev gnutls-dev @@ -16,9 +14,8 @@ makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev pango-dev tiff-dev zlib-dev" -replaces="gtk+" -replaces_dev="gtk+-dev" -replaces_doc="gtk+-doc" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" builddir="$srcdir"/gtk+-$pkgver @@ -51,4 +48,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="97554657d83db71ff8b3ea5f650ad38b1ffcc3e8d620be876b5ca435f693e229dffc7341a84bde71bdae13293f2c1d3b2ab1b80a02791132c8a7693cdc21f612 gtk+-3.24.12.tar.xz" +sha512sums="9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406 gtk+-3.24.13.tar.xz" diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD index 52d4d8073..b99643f50 100644 --- a/user/gtk-doc/APKBUILD +++ b/user/gtk-doc/APKBUILD @@ -10,8 +10,8 @@ arch="noarch" options="!check" license="GFDL" depends="docbook-xsl perl python3 py3-pygments py3-six pkgconf glib-dev highlight" -makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool" checkdepends="bc" +makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool" source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" build() { diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD index 84c2727c1..e2ed4bb8a 100644 --- a/user/gtkmm+3.0/APKBUILD +++ b/user/gtkmm+3.0/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gtkmm+3.0 -pkgver=3.24.1 +pkgver=3.24.2 pkgrel=0 pkgdesc="C++ interfaces for GTK+ 3" url="https://gnome.org" @@ -15,7 +15,6 @@ source="https://download.gnome.org/sources/gtkmm/${pkgver%.*}/gtkmm-$pkgver.tar. builddir="$srcdir/gtkmm-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed gtkmm-3.24.1.tar.xz" +sha512sums="c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689 gtkmm-3.24.2.tar.xz" diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD index 23f34a3c2..82ae71d56 100644 --- a/user/gtksourceview-3.0/APKBUILD +++ b/user/gtksourceview-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gtksourceview-3.0 pkgver=3.24.11 pkgrel=0 @@ -8,14 +8,14 @@ url="https://gnome.org" arch="all" options="!check" # testsuite requires X license="LGPL-2.1+" -makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev" +depends="" checkdepends="libxml2-utils" +makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-$pkgver.tar.xz" builddir="$srcdir/gtksourceview-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD index e76b7f813..df4d65932 100644 --- a/user/gtkspell/APKBUILD +++ b/user/gtkspell/APKBUILD @@ -6,7 +6,8 @@ pkgdesc="Highlighting and replacement of misspelled words in Gtk software" url="http://gtkspell.sourceforge.net/" arch="all" license="GPL-2.0-only" -makedepends="gtk+2.0-dev enchant-dev intltool" +depends="" +makedepends="autoconf automake enchant-dev gtk+2.0-dev gtk-doc intltool libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz enchant-2.patch @@ -15,13 +16,15 @@ source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz prepare() { default_prepare update_config_sub + autoreconf -vif } build() { LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr + --prefix=/usr \ + --disable-gtk-doc make } diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index 9a3d7bfcf..b3575c955 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gucharmap pkgver=12.0.1 -_unicode=12.0.0 +_unicode=12.1.0 pkgrel=0 pkgdesc="Unicode utility for the Gnome desktop environment" url="https://gnome.org" @@ -12,10 +12,11 @@ depends="" makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev intltool itstool libxml2-utils unicode-data" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz + unicode-12.1.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +29,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz" +sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz +aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f unicode-12.1.patch" diff --git a/user/gucharmap/unicode-12.1.patch b/user/gucharmap/unicode-12.1.patch new file mode 100644 index 000000000..60dbb7af5 --- /dev/null +++ b/user/gucharmap/unicode-12.1.patch @@ -0,0 +1,25 @@ +diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h +--- gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h 2019-03-07 21:21:27.000000000 +0100 ++++ gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h 2019-11-14 17:43:55.007583238 +0100 +@@ -51,7 +51,8 @@ + GUCHARMAP_UNICODE_VERSION_10_0, + GUCHARMAP_UNICODE_VERSION_11_0, + GUCHARMAP_UNICODE_VERSION_12_0, +- GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_0 /* private, will move forward with each revision */ ++ GUCHARMAP_UNICODE_VERSION_12_1, ++ GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_1 /* private, will move forward with each revision */ + } GucharmapUnicodeVersion; + + /* return values are read-only */ +diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c gucharmap-12.0.1/gucharmap/gucharmap-window.c +--- gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c 2019-03-07 21:21:27.000000000 +0100 ++++ gucharmap-12.0.1/gucharmap/gucharmap-window.c 2019-11-14 17:45:11.145809820 +0100 +@@ -454,7 +454,7 @@ + gtk_show_about_dialog (GTK_WINDOW (guw), + "program-name", _("GNOME Character Map"), + "version", VERSION, +- "comments", _("Based on the Unicode Character Database 12.0.0"), ++ "comments", _("Based on the Unicode Character Database 12.1.0"), + "copyright", "Copyright © 2004 Noah Levitt\n" + "Copyright © 1991–2019 Unicode, Inc.\n" + "Copyright © 2007–2019 Christian Persch\n" diff --git a/user/guile20/APKBUILD b/user/guile20/APKBUILD index ceafb8a28..c088637e0 100644 --- a/user/guile20/APKBUILD +++ b/user/guile20/APKBUILD @@ -17,7 +17,6 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/charset.alias } diff --git a/user/gutenprint/APKBUILD b/user/gutenprint/APKBUILD index 42198e73d..e3f0d111d 100644 --- a/user/gutenprint/APKBUILD +++ b/user/gutenprint/APKBUILD @@ -9,13 +9,13 @@ arch="all" options="!check" # Times out even on 64-thread POWER9. license="GPL-2.0-only" depends="" -makedepends="cups-dev" +makedepends="bash cups-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" install="$pkgname.post-install $pkgname.post-upgrade" source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz" build() { - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 55dd9d703..f54b81265 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gvim _pkgreal=vim -pkgver=8.1.2131 +pkgver=8.2.0255 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -71,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="4f4a1a748c58796dcdcb5c48562cf71372bd7b104c66b49470613da0b6de461a2f749eb06dca4c02c1e0fffb699f8fddcda3561b02c52c44f779b7f9f044c160 vim-8.1.2131.tar.gz" +sha512sums="347df5903c95753610eb48c85696d47df5fbfe1179544b4220cd3430dd228810d2639466ef4beaacf91b7ebf0ec9f7e029963af1f2a6b69b1d4bbff33d2db1bb vim-8.2.0255.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index eb0de9064..a9a767f1a 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.08.2 -pkgrel=2 +pkgver=19.12.3 +pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" arch="all" @@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev libkipi-dev libjpeg-turbo-dev libpng-dev lcms2-dev zlib-dev exiv2-dev baloo-dev libkdcraw-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/gwenview-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/gwenview-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="089bb97a79b2f6853710805d19084334972c86f8c89ddb2e80c7bf30d5a82c8edd5a0be5b68a7ad9e63c1a2b86d75dbd20dccfefe2859a660cd60cfbcbb5d843 gwenview-19.08.2.tar.xz" +sha512sums="a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0 gwenview-19.12.3.tar.xz" diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index 8c8ea466e..f621148bd 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.5.3 +pkgver=2.6.4 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="a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff harfbuzz-2.5.3.tar.xz" +sha512sums="d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f harfbuzz-2.6.4.tar.xz" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD index 489f85cb5..c3e631de2 100644 --- a/user/haveged/APKBUILD +++ b/user/haveged/APKBUILD @@ -3,17 +3,19 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=haveged -pkgver=1.9.8 +pkgver=1.9.8c pkgrel=0 pkgdesc="Entropy harvesting daemon using CPU timings" url="http://www.issihosts.com/haveged/" arch="all" license="GPL-3.0+" -subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" +depends="" makedepends="linux-headers" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz haveged.initd - haveged.confd" + haveged.confd + " build() { ./configure \ @@ -39,6 +41,6 @@ package() { "$pkgdir"/etc/conf.d/haveged } -sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db haveged-1.9.8.tar.gz +sha512sums="24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa haveged-1.9.8c.tar.gz 5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd 58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/hdparm/APKBUILD b/user/hdparm/APKBUILD index f6e5a8f8e..f1ab5fe96 100644 --- a/user/hdparm/APKBUILD +++ b/user/hdparm/APKBUILD @@ -6,11 +6,12 @@ pkgrel=0 pkgdesc="Utility for manipulating IDE device parameters" url="https://sourceforge.net/projects/hdparm" arch="all" +options="!check" # This application has no tests. license="BSD-2-clause OR GPL-2.0-or-later" +depends="" makedepends="linux-headers" -options="!check" # this application has no tests subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" prepare() { default_prepare @@ -18,13 +19,11 @@ prepare() { } build() { - cd "$builddir" export CFLAGS="$CFLAGS -D_GNU_SOURCE" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m755 contrib/idectl "$pkgdir"/sbin install -D -m755 contrib/ultrabayd "$pkgdir"/sbin diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD index e2b1002d4..c36f6fe1c 100644 --- a/user/hermit/APKBUILD +++ b/user/hermit/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=hermit pkgver=2.0 pkgrel=0 @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz" -builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf } sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz" diff --git a/user/heuristica-otf/APKBUILD b/user/heuristica-otf/APKBUILD index 728909071..e0438bd67 100644 --- a/user/heuristica-otf/APKBUILD +++ b/user/heuristica-otf/APKBUILD @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="https://downloads.sourceforge.net/heuristica/heuristica-otf-$pkgver.tar.xz" -builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf } sha512sums="d3336c6fcfd5ab5bfb041230659c41ecbaa9e2d2f92d5c1c8c0dc8dff89a777ac87d8713467c94b065febde30c131cd05376573308f69d698d63e18eee433783 heuristica-otf-1.0.2.tar.xz" diff --git a/user/hexchat/APKBUILD b/user/hexchat/APKBUILD new file mode 100644 index 000000000..8ba05d268 --- /dev/null +++ b/user/hexchat/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=hexchat +pkgver=2.14.3 +pkgrel=0 +pkgdesc="GTK-based IRC client" +url="https://hexchat.org" +arch="all" +options="!check" # no tests +license="GPL-2.0+ AND Custom:Expat AND LGPL-2.0+ AND LGPL-2.1+" +depends="" +makedepends="meson ninja + openssl-dev libproxy-dev libcanberra-dev dbus-glib-dev libnotify-dev + iso-codes-dev + lua5.3-dev perl-dev python3-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://dl.hexchat.net/hexchat/hexchat-$pkgver.tar.xz" +builddir="$srcdir/hexchat-$pkgver" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dwith-lua=lua \ + . output + ninja -C output +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5 hexchat-2.14.3.tar.xz" diff --git a/user/hicolor-icon-theme/APKBUILD b/user/hicolor-icon-theme/APKBUILD index ffcc38651..fa6f71bd0 100644 --- a/user/hicolor-icon-theme/APKBUILD +++ b/user/hicolor-icon-theme/APKBUILD @@ -7,10 +7,11 @@ url="https://www.freedesktop.org/wiki/Software/icon-theme/" arch="noarch" options="!check" # Just icon set, no tests. license="GPL-2.0-only" +depends="" +makedepends="" source="https://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -19,7 +20,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 8ceb16c85..4670ecd7f 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.53 +pkgver=3.54 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" arch="all" options="!check" # No test suite. 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" @@ -20,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b25340aa881e5188fb9862d4858fab17627a80329835723a75de95bbf523f2453f42fa4e6ed842345b5e2842d66a40f16b03c19fbbbea4a226e247a93130a5e3 highlight-3.53.tar.bz2" +sha512sums="c5a0982e9cd5c48d1ffa3ce2286020c1285eacf32928b08e3718582f4d131b05726920156c4357e595403474d4c389fc70e2aff789e17962963b9d8d23ac6488 highlight-3.54.tar.bz2" diff --git a/user/htop/APKBUILD b/user/htop/APKBUILD index 2dc87cfa7..25b992f1a 100644 --- a/user/htop/APKBUILD +++ b/user/htop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=htop pkgver=2.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="Interactive process viewer" url="http://hisham.hm/htop" arch="all" @@ -12,10 +12,11 @@ depends="" makedepends="ncurses-dev python3" subpackages="$pkgname-doc" source="http://hisham.hm/htop/releases/$pkgver/$pkgname-$pkgver.tar.gz - fix-python-path.patch" + correctness.patch + fix-python-path.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,9 +30,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e htop-2.2.0.tar.gz +010ca1d42caeea133ba3d0383373a8eca849c73c95bb98fe3222c458c44320d1e2a3aee9431213721f1ccfcbd5af54eb1e54fafd6e0e5ca3b87499ee6d04b49a correctness.patch 16358bcd6d83181cc04dd8a7971f7cc0804dc49995208bad2042bcca7962f562bbd008c2185f24aa6186c58896e94e4ec02e2053dc46ed14789889d64836b679 fix-python-path.patch" diff --git a/user/htop/correctness.patch b/user/htop/correctness.patch new file mode 100644 index 000000000..51a9848d2 --- /dev/null +++ b/user/htop/correctness.patch @@ -0,0 +1,78 @@ +From: Jonathan Currier <dullfire@yahoo.com> + +diff --git a/MainPanel.h b/MainPanel.h +index 8849659..471870b 100644 +--- a/MainPanel.h ++++ b/MainPanel.h +@@ -12,6 +12,7 @@ in the source distribution for its full text. + #include "Panel.h" + #include "Action.h" + #include "Settings.h" ++#include "union-arg.h" + + typedef struct MainPanel_ { + Panel super; +@@ -21,11 +22,6 @@ typedef struct MainPanel_ { + pid_t pidSearch; + } MainPanel; + +-typedef union { +- int i; +- void* v; +-} Arg; +- + typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg); + + #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar) +diff --git a/Process.c b/Process.c +index 471f529..ae617a6 100644 +--- a/Process.c ++++ b/Process.c +@@ -548,7 +548,9 @@ bool Process_changePriorityBy(Process* this, int delta) { + return Process_setPriority(this, this->nice + delta); + } + +-void Process_sendSignal(Process* this, int sgn) { ++ ++void Process_sendSignal(Process* this, Arg arg) { ++ int sgn = arg.i; + CRT_dropPrivileges(); + kill(this->pid, (int) sgn); + CRT_restorePrivileges(); +diff --git a/Process.h b/Process.h +index f702ca0..3011845 100644 +--- a/Process.h ++++ b/Process.h +@@ -29,6 +29,7 @@ in the source distribution for its full text. + #include "Object.h" + + #include <sys/types.h> ++#include "union-arg.h" + + #define PROCESS_FLAG_IO 0x0001 + +@@ -199,7 +200,7 @@ bool Process_setPriority(Process* this, int priority); + + bool Process_changePriorityBy(Process* this, int delta); + +-void Process_sendSignal(Process* this, int sgn); ++void Process_sendSignal(Process* this, Arg arg); + + long Process_pidCompare(const void* v1, const void* v2); + +diff --git a/union-arg.h b/union-arg.h +new file mode 100644 +index 0000000..5c8a094 +--- /dev/null ++++ b/union-arg.h +@@ -0,0 +1,9 @@ ++#ifndef UNION_ARG_HEADER ++#define UNION_ARG_HEADER ++ ++typedef union { ++ int i; ++ void* v; ++} Arg; ++ ++#endif + diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index 8dace78cd..af90a5f0e 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.2 +pkgver=2.9.3 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -25,4 +25,4 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023 http-parser-2.9.2.tar.gz" +sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b http-parser-2.9.3.tar.gz" diff --git a/user/humor-sans/APKBUILD b/user/humor-sans/APKBUILD index af9ba8484..476f85c72 100644 --- a/user/humor-sans/APKBUILD +++ b/user/humor-sans/APKBUILD @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="http://antiyawn.com/uploads/Humor-Sans-$pkgver.ttf" -builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ Humor-Sans-$pkgver.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/Humor-Sans-$pkgver.ttf } sha512sums="f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd Humor-Sans-1.0.ttf" diff --git a/user/hunkyfonts/APKBUILD b/user/hunkyfonts/APKBUILD index c8c2411a5..714812e7b 100644 --- a/user/hunkyfonts/APKBUILD +++ b/user/hunkyfonts/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="https://downloads.sourceforge.net/hunkyfonts/hunkyfonts-$pkgver.tar.bz2" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/TTF/*.ttf } sha512sums="0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375 hunkyfonts-0.3.1.tar.bz2" diff --git a/user/hunspell/APKBUILD b/user/hunspell/APKBUILD index 6222d58a5..ec63c5414 100644 --- a/user/hunspell/APKBUILD +++ b/user/hunspell/APKBUILD @@ -1,23 +1,27 @@ -# Maintainer: +# Maintainer: pkgname=hunspell pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Spell checker and morphological analyzer library and program" url="https://hunspell.github.io/" arch="all" license="GPL-2.0+ AND LGPL-2.0+ AND MPL-1.1" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +depends="" makedepends="ncurses-dev autoconf automake libtool" -source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz + CVE-2019-16707.patch" + +# secfixes: +# 1.7.0-r1: +# - CVE-2019-16707 prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,13 +33,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 hunspell-1.7.0.tar.gz" +sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 hunspell-1.7.0.tar.gz +e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d CVE-2019-16707.patch" diff --git a/user/hunspell/CVE-2019-16707.patch b/user/hunspell/CVE-2019-16707.patch new file mode 100644 index 000000000..649eef5b2 --- /dev/null +++ b/user/hunspell/CVE-2019-16707.patch @@ -0,0 +1,22 @@ +From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Tue, 12 Nov 2019 20:03:15 +0000 +Subject: [PATCH] invalid read memory access #624 + +--- + src/hunspell/suggestmgr.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx +index dba084e9..c23f165a 100644 +--- a/src/hunspell/suggestmgr.cxx ++++ b/src/hunspell/suggestmgr.cxx +@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( + int l2 = su2.size(); + // decapitalize dictionary word + if (complexprefixes) { +- if (su1[l1 - 1] == su2[l2 - 1]) ++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) + return 1; + } else { + unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 02221d9c8..17760d3c6 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20190818 +pkgver=20200204 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" arch="noarch" options="!check" # No test suite, just databases. license="BSD-3-Clause OR GPL-2.0+" -makedepends="eudev-dev" subpackages="$pkgname-net $pkgname-pci $pkgname-udev $pkgname-usb" depends="$subpackages" +makedepends="eudev-dev" subpackages="$subpackages $pkgname-doc" source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" builddir="$srcdir/hwids-hwids-$pkgver" @@ -65,4 +65,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2 hwids-20190818.tar.gz" +sha512sums="1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741 hwids-20200204.tar.gz" diff --git a/user/hyphen/APKBUILD b/user/hyphen/APKBUILD index a4d891e72..ba0947e7c 100644 --- a/user/hyphen/APKBUILD +++ b/user/hyphen/APKBUILD @@ -12,10 +12,10 @@ depends="" depends_dev="perl" makedepends="$depends_dev" source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz - mawk.patch" + mawk.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # The en_US dictionary that comes with has an unacceptable license # and it isn't really needed anyway since libreoffice has its own diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD index 422c1dfd4..64a2a2f3f 100644 --- a/user/i3status/APKBUILD +++ b/user/i3status/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=i3status pkgver=2.13 pkgrel=1 @@ -10,11 +10,12 @@ options="!check" # No test suite license="MIT" depends="" makedepends="alsa-lib-dev asciidoctor confuse-dev libnl3-dev pkgconf - pulseaudio-dev yajl-dev" + pulseaudio-dev yajl-dev autoconf automake" subpackages="$pkgname-doc" source="$url/$pkgname-$pkgver.tar.bz2 asciidoctor.patch - glob_tilde.patch" + glob_tilde.patch + " prepare() { default_prepare @@ -36,6 +37,7 @@ build() { package() { make -C build DESTDIR="$pkgdir" install } + sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2 i3status-2.13.tar.bz2 26527b9a0053d363f2b2991f9be3a15cb5fbf5553dca9498a9cff1c1a65e887f392215b60a484e329e6ef8efd63f9b67727826fb6ccfe1033c653feef34aaab8 asciidoctor.patch 765a5b64d79f61cd68280d77a7316e7f571a3c2e385d9a227885cde5fc057b1a892e92a65c0fc54832bfdda30743df6e9f82a847b55c9e7389575c7fbad9e0d4 glob_tilde.patch" diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index ccbb5f9e5..7cf320dd9 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -7,13 +7,14 @@ pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" arch="all" -license="BSD-3-Clause" options="!check" # The test suite requires X +license="BSD-3-Clause" +depends="" +checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run + perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr" makedepends="bison flex libxcb-dev xcb-util-cursor-dev xcb-util-keysyms-dev xcb-util-wm-dev libev-dev pango-dev cairo-dev yajl-dev startup-notification-dev pcre-dev libxkbcommon-dev xcb-util-xrm-dev" -checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run - perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr" subpackages="$pkgname-doc" source="https://i3wm.org/downloads/i3-$pkgver.tar.bz2 i3wm-musl-glob-tilde.patch diff --git a/user/iceauth/APKBUILD b/user/iceauth/APKBUILD index 5f59f51ce..5700b0b24 100644 --- a/user/iceauth/APKBUILD +++ b/user/iceauth/APKBUILD @@ -3,16 +3,15 @@ pkgname=iceauth pkgver=1.0.8 pkgrel=0 pkgdesc="X.Org ICE authority file utility" -url="http://xorg.freedesktop.org" +url="https://www.X.org/" arch="all" license="MIT" -subpackages="$pkgname-doc" +depends="" makedepends="libice-dev util-macros" +subpackages="$pkgname-doc" source="http://www.x.org/releases/individual/app/iceauth-$pkgver.tar.bz2" - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index d57231f43..0149ef2d6 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,29 +1,21 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=icewm -pkgver=1.5.5 +pkgver=1.6.4 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="LGPL-2.0-only AND MirOS" depends="" makedepends="libxft-dev libxinerama-dev libxpm-dev libjpeg-turbo-dev libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev librsvg-dev - alsa-lib-dev libsndfile-dev libao-dev asciidoctor $depends_dev" -install="" + alsa-lib-dev libsndfile-dev libao-dev asciidoctor libxcomposite-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.xz" - -prepare() { - default_prepare - cd "$builddir" - autoreconf -vif -} +source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.lz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,13 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e icewm-1.5.5.tar.xz" +sha512sums="6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000 icewm-1.6.4.tar.lz" diff --git a/user/ico/APKBUILD b/user/ico/APKBUILD index 8f6c2d7dd..8be9ae00c 100644 --- a/user/ico/APKBUILD +++ b/user/ico/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/ico-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/icon-naming-utils/APKBUILD b/user/icon-naming-utils/APKBUILD index 1d41aef6b..863107041 100644 --- a/user/icon-naming-utils/APKBUILD +++ b/user/icon-naming-utils/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make pkgconfigdir="/usr/lib/pkgconfig" DESTDIR="$pkgdir" install } diff --git a/user/id3lib/APKBUILD b/user/id3lib/APKBUILD index 957ed5eb0..78b50ae07 100644 --- a/user/id3lib/APKBUILD +++ b/user/id3lib/APKBUILD @@ -28,7 +28,6 @@ prepare() { } build() { - cd "$builddir" export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" ./configure \ @@ -42,12 +41,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD index 9f858605e..329b48ddd 100644 --- a/user/ido/APKBUILD +++ b/user/ido/APKBUILD @@ -1,43 +1,46 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ido -pkgver=12.10.2 +pkgver=13.10.0 pkgrel=0 pkgdesc="Library for indicator display objects" url="https://launchpad.net/ido" arch="all" options="!check" # broken testsuite license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only AND LGPL-2.0+" -makedepends="gtk+3.0-dev" +depends="" +makedepends="gtk+3.0-dev autoconf automake libtool gobject-introspection-dev + gtk-doc vala xorg-gtest-dev" subpackages="$pkgname-dev" -source="https://launchpad.net/ido/12.10/$pkgver/+download/ido-$pkgver.tar.gz" +source="http://archive.ubuntu.com/ubuntu/pool/universe/i/ido/ido_$pkgver+17.04.20161028.orig.tar.gz + ubuntu-private.patch + " +builddir="$srcdir" prepare() { - cd "$builddir" default_prepare - update_config_sub + autoreconf -vif } build() { - cd "$builddir" CFLAGS="-Wno-error" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --disable-ubuntu-private-api make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f745380bbc8b97c739691ae4f0dc27d5903ff078e92aaa2280d2c830c77ea2ad29b3abb4a49ffc7cc928b32e3a60ad64de20087980e02e5d5233eeb22978d2dc ido-12.10.2.tar.gz" +sha512sums="867157c9e316eb5ed69ebdf1017ed86990aabf7a885ba26acab36782f0f27e10b4621a7db15ac90335e808022490a98560d5ff443e6f697c578eed5868385ebd ido_13.10.0+17.04.20161028.orig.tar.gz +1894f82bd8c2daa25cf41a0c401979941894ec2be165ddbe40eb5b2bc2a4272b22d19a1710e80c975c33bf4f1a6ff91920bf569e536851e65d702f1267fdc367 ubuntu-private.patch" diff --git a/user/ido/ubuntu-private.patch b/user/ido/ubuntu-private.patch new file mode 100644 index 000000000..04aa31ac7 --- /dev/null +++ b/user/ido/ubuntu-private.patch @@ -0,0 +1,70 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -140,6 +140,16 @@ dnl = GTK Doc Check ==================== + + GTK_DOC_CHECK([1.8]) + ++dnl = GTK+ Ubuntu Private API ================================================= ++ ++AC_ARG_ENABLE([ubuntu-private-api], ++ [AS_HELP_STRING([--enable-ubuntu-private-api=@<:@no/yes@:>@], ++ [Use Ubuntu GTK+ Private API @<:@default=yes@:>@])], ++ [enable_ubuntu_private_api="$enableval"], ++ [enable_ubuntu_private_api=yes]) ++ ++AM_CONDITIONAL([USE_UBUNTU_PRIVATE_API], [test "x$enable_ubuntu_private_api" != xno]) ++ + dnl =========================================================================== + + AC_CONFIG_FILES([ +@@ -160,6 +170,7 @@ echo "" + echo " Prefix : ${prefix}" + echo " gcov : ${use_gcov}" + echo " introspection: ${enable_introspection}" ++echo " ubuntu gtk+ : ${enable_ubuntu_private_api}" + echo "" + echo " Documentation: ${enable_gtk_doc}" + echo "" +--- a/src/idomenuitemfactory.c ++++ b/src/idomenuitemfactory.c +@@ -17,6 +17,7 @@ + * Lars Uebernickel <lars.uebernickel@canonical.com> + */ + ++#ifdef USE_UBUNTU_PRIVATE_API + #include <gtk/gtk.h> + #include <gtk/ubuntu-private.h> + +@@ -117,3 +118,4 @@ static void + ido_menu_item_factory_init (IdoMenuItemFactory *factory) + { + } ++#endif +--- a/src/libido.c ++++ b/src/libido.c +@@ -28,9 +28,11 @@ + void + ido_init (void) + { ++#ifdef USE_UBUNTU_PRIVATE_API + GType ido_menu_item_factory_get_type (void); + + /* make sure this extension point is registered so that gtk calls it + * when finding custom menu items */ + g_type_ensure (ido_menu_item_factory_get_type ()); ++#endif + } +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -68,6 +68,10 @@ AM_CPPFLAGS = \ + $(MAINTAINER_CFLAGS) \ + -Wall -Werror -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations + ++if USE_UBUNTU_PRIVATE_API ++AM_CPPFLAGS += -DUSE_UBUNTU_PRIVATE_API ++endif ++ + AM_CFLAGS = \ + $(COVERAGE_CFLAGS) + + diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD index db1fd9f55..d2092acd9 100644 --- a/user/imake/APKBUILD +++ b/user/imake/APKBUILD @@ -4,23 +4,22 @@ pkgname=imake pkgver=1.0.8 pkgrel=0 pkgdesc="X Windows make utility" -url="https://www.x.org" +url="https://www.X.Org/" arch="all" +options="!check" # No test suite. license="X11" -options="!check" # No testsuite depends="" makedepends="util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="http://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.bz2" +source="https://www.X.org/releases/individual/util/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure --prefix=/usr + ./configure \ + --prefix=/usr make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/imlib2/APKBUILD b/user/imlib2/APKBUILD index 2984ea32a..09733a11b 100644 --- a/user/imlib2/APKBUILD +++ b/user/imlib2/APKBUILD @@ -1,19 +1,19 @@ # Maintainer: pkgname=imlib2 -pkgver=1.5.1 -pkgrel=0 +pkgver=1.6.1 +pkgrel=2 pkgdesc="Image manipulation library" url="https://sourceforge.net/projects/enlightenment" arch="all" license="Imlib2" -subpackages="$pkgname-dev" +depends="" depends_dev="freetype-dev libxext-dev libsm-dev" makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev" +subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +26,6 @@ build() { --with-x \ --with-bzip2 \ --with-gif \ - --with-id3 \ --with-jpeg \ --with-png \ --with-tiff \ @@ -35,13 +34,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR=$pkgdir install } -sha512sums="f9d971674887d4af067c6921e34b6fe598db0317052bc864b676c526b36373ce021d9d49cad95aa64dbbd8e74f1831ddf3ed105900e3df2b66a6b53f7f27c732 imlib2-1.5.1.tar.bz2" +sha512sums="ecdbdbfe8767ec2b1f22ce664cbab5e1d3f75be7a3c8f37488f5243b3c31dbc433414b8d50d2d1b70c67a80e31e42cc5398161991ce3955e991c114c82ddd58f imlib2-1.6.1.tar.bz2" diff --git a/user/inconsolata-lgc/APKBUILD b/user/inconsolata-lgc/APKBUILD index f8d3de1a6..c4748657c 100644 --- a/user/inconsolata-lgc/APKBUILD +++ b/user/inconsolata-lgc/APKBUILD @@ -15,8 +15,7 @@ source="https://github.com/MihailJP/Inconsolata-LGC/releases/download/LGC-$pkgve builddir="$srcdir/InconsolataLGC-OT" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf } sha512sums="3e985618b0c067d981620a461655d176a41bbef3d225d7d609b8dc9d5c04361b1df322eefab58f9620cfdff323e2bd7127c7e4f5f21f291b173a769cefa93ece InconsolataLGC-OT-1.3.0.tar.xz" diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD index 35f39ccb6..ef31cd0be 100644 --- a/user/intlfonts/APKBUILD +++ b/user/intlfonts/APKBUILD @@ -14,7 +14,6 @@ subpackages="" source="https://ftp.gnu.org/gnu/intlfonts/intlfonts-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +29,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \ "$pkgdir"/usr/share/fonts/X11/TTF diff --git a/user/intltool/APKBUILD b/user/intltool/APKBUILD index 0fa53ea6c..76a0439da 100644 --- a/user/intltool/APKBUILD +++ b/user/intltool/APKBUILD @@ -7,12 +7,12 @@ url="https://freedesktop.org/wiki/Software/intltool" arch="noarch" license="GPL-2.0+" depends="file perl perl-xml-parser" +makedepends="" subpackages="$pkgname-doc" source="http://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz intltool-perl-regexp.patch" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,12 +21,10 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ipaexfont/APKBUILD b/user/ipaexfont/APKBUILD index f76922b9a..fd3fb85d5 100644 --- a/user/ipaexfont/APKBUILD +++ b/user/ipaexfont/APKBUILD @@ -12,12 +12,11 @@ license="IPA" depends="fontconfig" makedepends="" subpackages="" -source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont$_pkgver.zip" +source="https://distfiles.adelielinux.org/source/IPAexfont$_pkgver.zip" builddir="$srcdir/IPAexfont$_pkgver" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="fe639ded0a25eed66df8cc1e9d5e965b501574a25fab542a749b3cb8464690448e44343ff5845aecd3224ec481c4089ee56e64880cbbc9211a260b22d4cc68cd IPAexfont00401.zip" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index 906d8cd30..f167ef0c3 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -11,17 +11,16 @@ arch="all" license="BSD-3-Clause" depends="" makedepends="" -install="" subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgname-$pkgver.tar.gz $_pkgname.initd $_pkgname.confd - build-fixes.patch" + build-fixes.patch + " builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \ --build=$CBUILD \ @@ -35,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/$_pkgname.initd \ diff --git a/user/ipmiutil/APKBUILD b/user/ipmiutil/APKBUILD index b77f2889a..56172ac63 100644 --- a/user/ipmiutil/APKBUILD +++ b/user/ipmiutil/APKBUILD @@ -1,17 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ipmiutil -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=0 pkgdesc="IPMI Management Utilities" url="http://ipmiutil.sourceforge.net/" arch="all" options="!check" # No test suite shipped. license="BSD-2-Clause AND BSD-3-Clause AND GPL-2.0+" +depends="" depends_dev="openssl-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/project/ipmiutil/ipmiutil-$pkgver.tar.gz - ipmiutil-3.0.7-fix-sha256.patch" + ipmiutil-3.0.7-fix-sha256.patch + " prepare() { default_prepare @@ -38,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e76f3efbd5a15882607f9f141fe1298bfc80a3bc04f616bb0525c4546f19846616ce5aecc4aba658bcd01678724c05f770f893ba3dac91f5fe9c6cabd2acd579 ipmiutil-3.1.4.tar.gz +sha512sums="a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010 ipmiutil-3.1.5.tar.gz 74e8951bccd004f765b99de87dc5f04834e594b3e14ba885148fb971eaf15164ccac2de880e409f201a38cba5c0948a0fabc04e1e34fb396f50b1ecddb6b305b ipmiutil-3.0.7-fix-sha256.patch" diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD index 1d34a1ce3..3c470fda1 100644 --- a/user/iptables/APKBUILD +++ b/user/iptables/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Molly Miller <adelie@m-squa.red> - pkgname=iptables -pkgver=1.8.3 -pkgrel=1 +pkgver=1.8.4 +pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="https://www.netfilter.org/projects/iptables/index.html" arch="all" -options="!check" # no test suite +options="!check" # No test suite. license="GPL-2.0+" +depends="" depends_dev="linux-headers" # extra functionality may be enabled in the future if libmnl and # libnetfilter_conntrack are packaged. @@ -60,7 +60,7 @@ package() { install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables } -sha512sums="84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d iptables-1.8.3.tar.bz2 +sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2 726dfa1aa598d9dff802b99347138c861703b3dd28b2721a6b79b12f87d988369d3b4b9daee7cb2f9a930daac8921600de1e5342a347b3eae3791f0b9f0acbeb iptables.initd cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD index f3cca0f7e..1d625f8f7 100644 --- a/user/iputils/APKBUILD +++ b/user/iputils/APKBUILD @@ -8,9 +8,9 @@ url="https://github.com/iputils/iputils/" arch="all" options="suid" license="BSD-3-Clause AND GPL-2.0-or-later" +depends="" makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson openssl-dev" -replaces="bbsuid" subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc" source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz" builddir="$srcdir/$pkgname-s$pkgver" diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 1d63fd4b2..3e6319e30 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=irssi pkgver=1.2.2 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Text-based IRC client" url="https://irssi.org" arch="all" license="GPL-2.0+ AND ISC" +depends="" makedepends="ncurses-dev glib-dev openssl-dev perl-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-perl" source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index 19c801b6e..5b922eb90 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=isync pkgver=1.3.1 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" arch="all" +options="!check" # No test suite. license="GPL-2.0+" -options="!check" # No test suite depends="" makedepends="db-dev cyrus-sasl-dev openssl-dev zlib-dev" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/isync/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD index 7936887b7..c4fee9e06 100644 --- a/user/itstool/APKBUILD +++ b/user/itstool/APKBUILD @@ -7,13 +7,12 @@ url="http://itstool.org/" arch="noarch" license="GPL-3.0+" depends="py3-libxml2 python3" +makedepends="" subpackages="$pkgname-doc" source="http://files.itstool.org/itstool/$pkgname-$pkgver.tar.bz2 fix-segfault.patch" build() { - cd "$builddir" - PYTHON="/usr/bin/python3" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } check() { - cd "$builddir" make check # verify that the shebang is correct chmod +x itstool @@ -34,7 +32,6 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/iw/APKBUILD b/user/iw/APKBUILD index a8330799b..4ada251aa 100644 --- a/user/iw/APKBUILD +++ b/user/iw/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=iw -pkgver=5.3 +pkgver=5.4 pkgrel=0 pkgdesc="CLI configuration utility for wireless devices" url="https://wireless.wiki.kernel.org/en/users/Documentation/iw" arch="all" -options="!check" # no usable test suite +options="!check" # No usable test suite. license="ISC" depends="" makedepends="libnl3-dev linux-headers pkgconfig" @@ -21,4 +21,4 @@ package() { make V=1 DESTDIR="$pkgdir" install } -sha512sums="986fb7cf37cc3cab7b4058b5b73fadf1dc101fa764a144c9e4fc400d2327429df53fefbd4ea9ee63821e793a4118d468012a857800521ecf9973a7b9428229c9 iw-5.3.tar.xz" +sha512sums="84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2 iw-5.4.tar.xz" diff --git a/user/jasper/APKBUILD b/user/jasper/APKBUILD index 321969aa3..006a2f7eb 100644 --- a/user/jasper/APKBUILD +++ b/user/jasper/APKBUILD @@ -5,8 +5,8 @@ pkgrel=0 pkgdesc="Library implementing JPEG-2000" url="http://www.ece.uvic.ca/~mdadams/jasper/" arch="all" -license="custom:JasPer2.0" -depends= #"libjpeg>=8 freeglut libxi libxmu mesa" +license="JasPer-2.0" +depends="" makedepends="libjpeg-turbo-dev cmake" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="$pkgname-$pkgver.tar.gz::https://github.com/mdadams/jasper/archive/version-$pkgver.tar.gz" @@ -17,26 +17,22 @@ builddir="$srcdir/$pkgname-version-$pkgver" # - CVE-2017-1000050 build() { - mkdir "$builddir"/obj - cd "$builddir"/obj # default of 16 causes stack overflow export CFLAGS="${CFLAGS} -DJPC_QMFB_COLGRPSIZE=6" - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ + cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib - - make + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -Bbuild + make -C build } check() { - cd "$builddir"/obj - make test + make -C build test } package() { - cd "$builddir"/obj - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } libs() { diff --git a/user/java-cacerts/APKBUILD b/user/java-cacerts/APKBUILD index b096f7795..c8d2dc7e6 100644 --- a/user/java-cacerts/APKBUILD +++ b/user/java-cacerts/APKBUILD @@ -11,11 +11,9 @@ depends="p11-kit p11-kit-trust ca-certificates" makedepends="" subpackages="" source="java-cacerts" - builddir="$srcdir" package() { - cd "$builddir" install -D -m755 "$srcdir"/java-cacerts \ "$pkgdir"/etc/ca-certificates/update.d/java-cacerts mkdir -p "$pkgdir"/etc/ssl/certs/java diff --git a/user/java-common/APKBUILD b/user/java-common/APKBUILD index da94e271c..f285c9960 100644 --- a/user/java-common/APKBUILD +++ b/user/java-common/APKBUILD @@ -10,8 +10,8 @@ license="Public-Domain" depends="nss" # for TLS, needed by all OpenJDKs. makedepends="" subpackages="" -source="java.profd" triggers="java-common.trigger=/usr/lib/jvm" +source="java.profd" package() { mkdir -p "$pkgdir"/usr/bin diff --git a/user/jomolhari/APKBUILD b/user/jomolhari/APKBUILD index 566e5db55..2ddb69497 100644 --- a/user/jomolhari/APKBUILD +++ b/user/jomolhari/APKBUILD @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="https://collab.its.virginia.edu/access/content/group/26a34146-33a6-48ce-001e-f16ce7908a6a/Tibetan%20fonts/Tibetan%20Unicode%20Fonts/Jomolhari-alpha003.zip" -builddir="$srcdir" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf } sha512sums="d3dd179c84c5cfb5cdc4a82ea1356b594973ef056cbc8fa4e23e37f21573b138eded19ef7370803dbe796e80a0d2c72a0866eb9f36e4b511627c770a00e08270 Jomolhari-alpha003.zip" diff --git a/user/jpegoptim/APKBUILD b/user/jpegoptim/APKBUILD index d86c9c7f8..1556f8552 100644 --- a/user/jpegoptim/APKBUILD +++ b/user/jpegoptim/APKBUILD @@ -14,13 +14,11 @@ subpackages="$pkgname-doc" source="https://www.kokkonen.net/tjko/src/jpegoptim-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,7 +30,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD index a297939df..cdc3df7ab 100644 --- a/user/json-glib/APKBUILD +++ b/user/json-glib/APKBUILD @@ -1,19 +1,19 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=json-glib pkgver=1.4.4 pkgrel=0 pkgdesc="GObject-based library for JSON (de)serialization" url="https://live.gnome.org/JsonGlib" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="LGPL-2.1+" +depends="" makedepends="glib-dev gobject-introspection-dev meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/json-glib/1.4/json-glib-$pkgver.tar.xz" build() { - cd "$builddir" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -25,7 +25,6 @@ build() { } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 3789a3829..ed6cdf89f 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev kwindowsystem-dev taglib-dev phonon-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/juk-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1de7d1840eb41e47e29001e1031ad9f31942b0663ba76e83ece84534ca88a22ad03b5482276aa40259a72282e73241b872ff27ef81c1f777e31265564635592b juk-19.08.2.tar.xz" +sha512sums="39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb juk-19.12.3.tar.xz" diff --git a/user/kacst_fonts/APKBUILD b/user/kacst_fonts/APKBUILD index c933369c9..e54b7c35f 100644 --- a/user/kacst_fonts/APKBUILD +++ b/user/kacst_fonts/APKBUILD @@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/arabeyes/${pkgname}_$pkgver.tar.bz2" builddir="$srcdir"/KacstArabicFonts-$pkgver package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="9db8181a4b9db18f648628c10c4c1228aa38186f7ea414887e66fa430ce441b0d0130dd81955ae664558edd46653a290e053b8b126ce4ff7b6e9e1a7169ba4a8 kacst_fonts_2.0.tar.bz2" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 1a286e967..5c8cc99c9 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -9,20 +9,13 @@ arch="all" options="!check" # No test suite. license="LGPL-2.1-only OR LGPL-3.0-only" depends="" -depends_dev="qt5-qtbase-dev kactivities-dev" -makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen - graphviz boost-dev kconfig-dev qt5-qtdeclarative-dev" +depends_dev="kactivities-dev" +makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev boost-dev + qt5-qtdeclarative-dev qt5-qttools-dev doxygen graphviz kconfig-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kactivities-stats-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,13 +27,12 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="142a8e92bef7069eae70187e1c04a29f65ab4bc12b7e146d21e8da3c4818941af59844e702e9682d8bcd64d6e76b30f012db2cdd1476962b59e0b27c1114c311 kactivities-stats-5.54.0.tar.xz" +sha512sums="ba4241d0aa0b76639d7d7231ef3cf6f38db710dc6df8d9553242c1faac40839853437710cfcfb1f246c68e7e26a4fe887eb5b058421798e885b43777b0360be9 kactivities-stats-5.68.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 6a35fd7e4..cbe2c27f1 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,28 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" arch="all" license="GPL-2.0+ AND LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="kactivitymanagerd" -depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz boost-dev - qt5-qttools-dev qt5-qtdeclarative-dev kconfig-dev kcoreaddons-dev - kwindowsystem-dev" +makedepends="cmake extra-cmake-modules doxygen graphviz boost-dev + qt5-qtbase-dev qt5-qttools-dev qt5-qtdeclarative-dev kconfig-dev + kcoreaddons-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kactivities-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - make test + make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="d397c087f740e044a14f02bca47da2c267b4c9d9ab8231e240addf41eec6d716fc6d2a85bc3760636a69be55a058ba8d380c4555aa16ba43fff7fd2dfcb20a64 kactivities-5.54.0.tar.xz" +sha512sums="1490834305965cff0c8ddc4e38be4960a88266f10806478e41cd976f0461a83ae4b6a4e9f3566fd90d5afcf3f38a291609179bea0781b939831ce8f788acc552 kactivities-5.68.0.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index c4a6cb641..3d205f05e 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="b2c0a65eebd680c3652ee76ced11c6103ddf96ab9d5c6a8b7a15f56b64d2370f55e9f93bb4c73544c46d0822f4f31bb6b2d858eb76a3c9b5fb93223969c0f966 kactivitymanagerd-5.12.8.tar.xz" +sha512sums="99ff54c95aaa2755bf2597ec98f234ee227182f5296560714b593cee63a4968a40223aee126bbd3d4f15ef7dc4d82dd8372822ded3e23255bcd078f3ecab4585 kactivitymanagerd-5.18.3.tar.xz" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index 737246458..40c15bb0a 100644 --- a/user/kaffeine/APKBUILD +++ b/user/kaffeine/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kaffeine/kaffeine-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,17 +25,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 96b93cf37..319d4fec1 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev analitza-dev ncurses-dev ki18n-dev kdoctools-dev kio-dev kconfigwidgets-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kalgebra-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kalgebra-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4cb1013dd20b806a7fcd629328662a8b1c6efa81c685d4bd6b1940a8142dd6fd7ac5ad46636743e26d17b37c283fa51f94203878ae1f255720da71a2e8810654 kalgebra-19.08.2.tar.xz" +sha512sums="9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab kalgebra-19.12.3.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 47f9a7770..9d5e3cb16 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kparts-dev kplotting-dev solid-dev kunitconversion-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kalzium-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kalzium-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f6956b846345e986f2c5c939e3996effd524804f166edaedaf3c21fe35f529815cdec5674f67bd52bd30fcacd03409262bf592fa6240a2bcafb3bb695830965f kalzium-19.08.2.tar.xz" +sha512sums="fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b kalzium-19.12.3.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD new file mode 100644 index 000000000..649746130 --- /dev/null +++ b/user/kamera/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kamera +pkgver=19.12.3 +pkgrel=0 +pkgdesc="Digital camera support for KDE" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules libgphoto2-dev qt5-qtbase-dev kio-dev + kconfig-dev kconfigwidgets-dev kdoctools-dev ki18n-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kamera-$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="9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da kamera-19.12.3.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index cd45ba733..d2d98aa08 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kcoreaddons-dev kdeclarative-dev kdoctools-dev knewstuff-dev libkeduvocdocument-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kanagram-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kanagram-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="963f15391452bd78c16360f3f8616143a83e9c3123fa6b74449724bcaaca7bbd2ea113f9a6b17c88904de1b95963571bb6baec39646838e1024f7b3f3e972a09 kanagram-19.08.2.tar.xz" +sha512sums="cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0 kanagram-19.12.3.tar.xz" diff --git a/user/kanjistrokeorders/APKBUILD b/user/kanjistrokeorders/APKBUILD index f73660b2c..b5f88df2e 100644 --- a/user/kanjistrokeorders/APKBUILD +++ b/user/kanjistrokeorders/APKBUILD @@ -11,12 +11,10 @@ license="BSD-3-Clause" depends="fontconfig" makedepends="" subpackages="" -source="KanjiStrokeOrders_v$pkgver.ttf::https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${pkgver}.ttf?attredirects=0" -builddir="$srcdir/" +source="https://distfiles.adelielinux.org/source/KanjiStrokeOrders_v${pkgver}.ttf" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf } sha512sums="7382be90761ec63f01fb715154955a76fb78acf1a50a6c3abc3b5b753ebb8bb01d1884e154dce6b15284ac2d7600d1276b098705ee925ee86c42d4194c688721 KanjiStrokeOrders_v4.002.ttf" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index fff213623..cc65b5056 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kconfigwidgets-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kapman-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kapman-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0ecad2073517849449017e6b816a90fc0fc696126d9c736f8b69d64a98f751274f1e25ed5f8edeecd12bb35e2019a460a08dad2e7842a33043ac020d34333fbe kapman-19.08.2.tar.xz" +sha512sums="c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34 kapman-19.12.3.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 872442029..6760b73cf 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/karchive-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="89172761f5d54967ed72ccf73c3bfff79600f803a31bdb4e1684516e506f57f3b28778b598cfbd6b594b4cbe3af92984c7150ea6837d9a612bcd28db4dbc8657 karchive-5.54.0.tar.xz" +sha512sums="c0d14773c4eb27281178d5f00f789256cc44aab057bc20239237a0031750d82765a7afae7cd804b200f713a8f93cd95f5a78828641a748e9b38a6d3c84aff3cc karchive-5.68.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 84e79c8d3..d9df73288 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -16,10 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev python3 plasma-framework-dev" subpackages="kwrite kwrite-doc:kwrite_doc kwrite-lang:kwrite_lang $pkgname-doc $pkgname-lang $pkgname-project" -source="https://download.kde.org/stable/applications/$pkgver/src/kate-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kate-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,17 +29,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -66,8 +63,6 @@ kwrite() { } kwrite_doc() { - local _langpath - pkgdesc="Simple GUI text editor (documentation)" install_if="docs kwrite=$pkgver-r$pkgrel" for _langpath in "$pkgdir"/usr/share/doc/HTML/*; do @@ -80,8 +75,6 @@ kwrite_doc() { } kwrite_lang() { - local _langpath - pkgdesc="Simple GUI text editor (translations)" for _langpath in "$pkgdir"/usr/share/locale/*/LC_MESSAGES; do local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" @@ -92,4 +85,4 @@ kwrite_lang() { done } -sha512sums="3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a kate-19.08.2.tar.xz" +sha512sums="aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817 kate-19.12.3.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index f8fc04aad..24acd289a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev kconfig-dev kcrash-dev kwidgetsaddons-dev kxmlgui-dev knewstuff-dev kdoctools-dev kdbusaddons-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/katomic-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/katomic-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="75b4c1d2a3ca709c639d2cb1aad61ef145c6fbc00141c26ad0ddd3db4dd7d9a07b705b9875b5b84e8c95b28cbad62b7fbcd304abe07bfdc22af82d15f9251fdd katomic-19.08.2.tar.xz" +sha512sums="32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411 katomic-19.12.3.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 351d00f50..525a86fd4 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.54.0 -pkgrel=1 +pkgver=5.68.0 +pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" arch="all" @@ -11,8 +11,7 @@ depends="" depends_dev="polkit-qt-1-dev qt5-qtbase-dev kcoreaddons-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kauth-$pkgver.tar.xz - CVE-2019-7443.patch" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kauth-$pkgver.tar.xz" # secfixes: # 5.54.0-r1: @@ -30,7 +29,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -42,5 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f75c6f019d708409817a5b64d88033326a7d627cdee00e61280043d5cd8f65731f08d48405f50c7240f18670b25abfeea4b2af5966ebb2ee7e0f56669b5551c2 kauth-5.54.0.tar.xz -9cb0e37eedb5cee82c5e6d1b316f92f014c8850c9274a8d0c728f306ceabc35cbbec81b0057ebaf904bd48f3e07d6f83d91b0ef12602a0c1ba66b39a04bb45e4 CVE-2019-7443.patch" +sha512sums="006ed4eb03276546f99525ede235e721ea4092da3b00735afe2f06f35c146d6a75b64e3e1b872feb6f1a986680ae6415f0d4a3dbdf4ecad07d94aaac1061d605 kauth-5.68.0.tar.xz" diff --git a/user/kauth/CVE-2019-7443.patch b/user/kauth/CVE-2019-7443.patch deleted file mode 100644 index 5b11cd8f5..000000000 --- a/user/kauth/CVE-2019-7443.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fc70fb0161c1b9144d26389434d34dd135cd3f4a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sat, 2 Feb 2019 14:35:25 +0100 -Subject: Remove support for passing gui QVariants to KAuth helpers - -Supporting gui variants is very dangerous since they can end up triggering -image loading plugins which are one of the biggest vectors for crashes, which -for very smart people mean possible code execution, which is very dangerous -in code that is executed as root. - -We've checked all the KAuth helpers inside KDE git and none seems to be using -gui variants, so we're not actually limiting anything that people wanted to do. - -Reviewed by security@kde.org and Aleix Pol - -Issue reported by Fabian Vogt ---- - src/backends/dbus/DBusHelperProxy.cpp | 9 +++++++++ - src/kauthaction.h | 2 ++ - 2 files changed, 11 insertions(+) - -diff --git a/src/backends/dbus/DBusHelperProxy.cpp b/src/backends/dbus/DBusHelperProxy.cpp -index 10c14c6..8f0d336 100644 ---- a/src/backends/dbus/DBusHelperProxy.cpp -+++ b/src/backends/dbus/DBusHelperProxy.cpp -@@ -31,6 +31,8 @@ - #include "kf5authadaptor.h" - #include "kauthdebug.h" - -+extern Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper; -+ - namespace KAuth - { - -@@ -229,10 +231,17 @@ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArra - return ActionReply::HelperBusyReply().serialized(); - } - -+ // Make sure we don't try restoring gui variants, in particular QImage/QPixmap/QIcon are super dangerous -+ // since they end up calling the image loaders and thus are a vector for crashing → executing code -+ auto origMetaTypeGuiHelper = qMetaTypeGuiHelper; -+ qMetaTypeGuiHelper = nullptr; -+ - QVariantMap args; - QDataStream s(&arguments, QIODevice::ReadOnly); - s >> args; - -+ qMetaTypeGuiHelper = origMetaTypeGuiHelper; -+ - m_currentAction = action; - emit remoteSignal(ActionStarted, action, QByteArray()); - QEventLoop e; -diff --git a/src/kauthaction.h b/src/kauthaction.h -index c67a70a..01f3ba1 100644 ---- a/src/kauthaction.h -+++ b/src/kauthaction.h -@@ -298,6 +298,8 @@ public: - * This method sets the variant map that the application - * can use to pass arbitrary data to the helper when executing the action. - * -+ * Only non-gui variants are supported. -+ * - * @param arguments The new arguments map - */ - void setArguments(const QVariantMap &arguments); --- -cgit v1.1 - diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 47ba07a92..1dd52516e 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev karchive-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kdbusaddons-dev ktextwidgets-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kblackbox-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kblackbox-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ddaba772eb57a8f3fe1d585d997ba6ea50d7a3af1933ee6afd972edda9530001665210e2436bd8a8f6f2887c58e20a2d486ba11ac057d33f0e3710cd2815f86b kblackbox-19.08.2.tar.xz" +sha512sums="a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43 kblackbox-19.12.3.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 49da3c3ba..e89b067ee 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kdbusaddons-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kblocks-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kblocks-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="369d447665908bbdf47e7363d47312cd916bfcd89cb0354be6c15e9a749632d229bce3d8084a2b497cc7dcdd49e4b35cc313a3c8dabd82d93a994e43612e4cf2 kblocks-19.08.2.tar.xz" +sha512sums="ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6 kblocks-19.12.3.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 267954234..396ce7df1 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kbookmarks-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f7c18ee6a0135ac93bbd4034b2c11b6142404a9b5c5872374ee2dc2d5f0cf70288793df4da4be980c0e1bf757ccbfc6ca8a83c490691e80308ec7133eb49c3ba kbookmarks-5.54.0.tar.xz" +sha512sums="56712cd6312d534f33459c18b05f12141546df82a1c1a822a74ddfbde515fc4c67b7d66a6dbd0b7221808d714e2d8c0f72d18f6857ea624bb6a768b9ffffde7e kbookmarks-5.68.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index ded0218f2..88d847de4 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcompletion-dev kxmlgui-dev kio-dev kdoctools-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kbounce-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kbounce-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="745836150ecca4937cac66ff69da813c1b06bc92ae8a20198857362abeb156ceb809fd2a83429c9f8f4bbdba23261751ebdf921a768d3c0be27493e0a423167f kbounce-19.08.2.tar.xz" +sha512sums="0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79 kbounce-19.12.3.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 764af168b..f416cc759 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdbusaddons-dev kconfigwidgets-dev kxmlgui-dev kdoctools-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kbreakout-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kbreakout-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c1d05077716c02a6741bad3e482808e285498139d5abe615fcdfdb048dcfd55b156c7c229b0019359a05f339202e6acdc18f3d3441041299ac4bf52cc2025387 kbreakout-19.08.2.tar.xz" +sha512sums="983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d kbreakout-19.12.3.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 6695744d6..927ebda72 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kbruch-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kbruch-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4bbe24de8767b1d449ac2b253569b88e8c3d7a7021c78daf057da5b1d153dcb717c03df9dcd416cf787274fda5d6c4825e8d396848da39d585317a472f30f809 kbruch-19.08.2.tar.xz" +sha512sums="b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61 kbruch-19.12.3.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index d3b5c81f6..8c547e6d5 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev karchive-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcachegrind-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcachegrind-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7e2c7dc247e5adce6b68097ae265bbd449634efff581a68a18c725635ac8e976c9e5c92e8dbcde519d57b4fbb904e97afee85407992c8e5b2ab4a9fb04b28208 kcachegrind-19.08.2.tar.xz" +sha512sums="c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013 kcachegrind-19.12.3.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index df2832969..da3c019b0 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev ki18n-dev kconfigwidgets-dev kdoctools-dev kguiaddons-dev kinit-dev kxmlgui-dev knotifications-dev gmp-dev mpfr-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcalc-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcalc-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="966e1239c11f77c162d5698708e96e8172bc99bc195df0ceff9b5867b7fd9f452091cc4d39286b8bf2febf9a75ee119d3f5282090d6bf8b02783ff8d0ed75424 kcalc-19.08.2.tar.xz" +sha512sums="7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb kcalc-19.12.3.tar.xz" diff --git a/user/kcalcore/APKBUILD b/user/kcalendarcore/APKBUILD index 62764c297..23cf88fa2 100644 --- a/user/kcalcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=kcalcore -pkgver=18.12.3 +pkgname=kcalendarcore +pkgver=5.68.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -9,14 +9,14 @@ arch="all" license="LGPL-2.0+" depends="" depends_dev="qt5-qtbase-dev attica-dev kparts-dev" -makedepends="$depends_dev cmake extra-cmake-modules bison libical-dev - kconfig-dev kdelibs4support-dev" checkdepends="tzdata" -subpackages="$pkgname-dev" -source="https://download.kde.org/stable/applications/$pkgver/src/kcalcore-$pkgver.tar.xz" +makedepends="$depends_dev cmake extra-cmake-modules libical-dev + doxygen qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +replaces="kcalcore" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcalendarcore-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +27,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" - TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'Compat-libical3' + TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(Compat-libical3|testicaltimezones)' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c347bfba365cb8d88fe11f743f5e5870e31a2d526f0cecda3bdebccadbf8e1ae5d19586d1c7120327e47e30a7a21931ed1e084fbfbdc41c82516e803893effae kcalcore-18.12.3.tar.xz" +sha512sums="256bcd4bbc0c3f2d53d05503955de505d937011fcc88006e1c52aaec9b8780e52ec18d229a4ce751df41c7ca2ddac07ba56cb5b743807a034fe7fb3f62dd7d0e kcalendarcore-5.68.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 3334acea7..4d903a763 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kcrash-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcharselect-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcharselect-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4d618a691d1153952b04ad172dc8bd1d87b56f530f05c88c91af3844eacf24ccd0123aec8978bc623009f68dc84b56d917dc4766376ae78115de73b3bff66b92 kcharselect-19.08.2.tar.xz" +sha512sums="85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006 kcharselect-19.12.3.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index f8650aa17..8d3e41c5c 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcmutils-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="dbb8e24a86378ab283cb934fc27caa4dc3a91e3f90d70a12d64bb08dc669427e64469720507265c2cc2276133bbfe4f57c48c7a7498b5f020d503d0fcba9c3ea kcmutils-5.54.0.tar.xz" +sha512sums="d930874680c489465e72fd4fc7d0d920dfccccbe6e05213c654055d726bea8add2745ffe230ba2a3895dca860c4d93b0039ebe7db6397fb8c53b3c5f6edb7812 kcmutils-5.68.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 5bfa7eed2..446bcca99 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -14,8 +14,11 @@ makedepends="$depends_dev cmake extra-cmake-modules gperf qt5-qttools-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" +# secfixes: +# 5.68.0-r0: +# - CVE-2013-0779 + build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +30,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="75e8d3800c0906a437d8d0d957c91d00b423ecb513f1f62d08dcffb1ddf70c65b78f430fc8519334a75f77b15fcb9869d7761ac87fa5936b7a8af88ecaac60ae kcodecs-5.54.0.tar.xz" +sha512sums="1edf80355d7d986338adfaff3067b0acd80d0fca47c7c81db0c510b1d32acb6ba8dcea33bd577a8ff0da60c4b4e8812c6981948a1eda84ce1acd8a05c87cd67d kcodecs-5.68.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index ae86d1eb3..2dc03be53 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -10,10 +10,9 @@ license="MIT" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kxmlgui-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcolorchooser-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcolorchooser-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -24,18 +23,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a522900c1e849f875f13064400759f698a6c7aa9988e865ba1b645d735ded3910682cc00945b1a99b02c5c8b2473a5ecdf9d2b3597d96f921532221fb47ffba9 kcolorchooser-19.08.2.tar.xz" +sha512sums="ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca kcolorchooser-19.12.3.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index dc4fb6a3f..d0363ad66 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcompletion-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,19 +25,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # All other tests require X11. CTEST_OUTPUT_ON_FAILURE=TRUE ctest -R ksortablelisttest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="af813411090d25f85d1b409bd971d9f610cc7c1ce01463f70cf57791af9dafe88957d74be0b63c4ca8f7d2a790c48d34613a03bed03552cae30346576849f654 kcompletion-5.54.0.tar.xz" +sha512sums="05c434549610404a8a9972fa88dd33245ec9b6e9b402a3602e2081b3ca3692127993307ceb56f8790b91d0a990a2241cf1258a54e316dedef1980b72741cb62e kcompletion-5.68.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 93e221ccc..6e118e487 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" arch="all" -options="!checkroot" +options="!check" # Tests require running D-Bus. license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfig-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest -R kconfigcore } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a35d635db47e3b1e4fa3919ec73190a8d0bb9e82c4a8487ae7b87ba73cb54659e97124c9761de4dc303d8697f8f17b3d27d30b43e47bb870a052be87c843de7 kconfig-5.54.0.tar.xz" +sha512sums="f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670 kconfig-5.68.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index 558358620..ab6e3b9c8 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.54.0 -pkgrel=1 +pkgver=5.68.0 +pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" arch="all" @@ -13,12 +13,9 @@ depends_dev="qt5-qtbase-dev kauth-dev kcodecs-dev kconfig-dev kguiaddons-dev ki18n-dev kwidgetsaddons-dev kdoctools-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz - languagename.patch - " +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,20 +26,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DBUILD_QCH:BOOL=ON - ${CMAKE_CROSSOPTS} + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz -3b1abbd9b5cef4400a8a962cef4f8a3614f49700fdf9df25e709a8105d9e59429102aa94b8a47fa35e7dcb9d39ba5bbfd8485743fa6f64155bef3aa1afb4bb9e languagename.patch" +sha512sums="db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6 kconfigwidgets-5.68.0.tar.xz" diff --git a/user/kconfigwidgets/languagename.patch b/user/kconfigwidgets/languagename.patch deleted file mode 100644 index d3eb89f54..000000000 --- a/user/kconfigwidgets/languagename.patch +++ /dev/null @@ -1,716 +0,0 @@ -From 91077def022a999ce46c91347f1167626266f460 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Mon, 7 Jan 2019 11:42:28 +0100 -Subject: Add KLanguageName - -Summary: KLanguageName is a helper namespace that returns the name of a given language code. - -Reviewers: apol - -Reviewed By: apol - -Subscribers: hein, kde-frameworks-devel, sitter, markg, apol - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D10446 ---- - autotests/CMakeLists.txt | 27 ++++++ - .../kf5_entry_data.cmake/locale/ca/kf5_entry.cmake | 98 ++++++++++++++++++++++ - .../kf5_entry_data.cmake/locale/de/kf5_entry.cmake | 98 ++++++++++++++++++++++ - .../locale/en_US/kf5_entry.cmake | 44 ++++++++++ - autotests/kf5_entry_data.cmake/locale/es/.keep | 0 - .../kf5_entry_data.cmake/locale/fr/kf5_entry.cmake | 2 + - .../kf5_entry_data.cmake/locale/pt/kf5_entry.cmake | 98 ++++++++++++++++++++++ - autotests/klanguagenametest.cpp | 92 ++++++++++++++++++++ - src/CMakeLists.txt | 2 + - src/klanguagename.cpp | 67 +++++++++++++++ - src/klanguagename.h | 63 ++++++++++++++ - 11 files changed, 591 insertions(+) - create mode 100644 autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake - create mode 100644 autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake - create mode 100644 autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake - create mode 100644 autotests/kf5_entry_data.cmake/locale/es/.keep - create mode 100644 autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake - create mode 100644 autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake - create mode 100644 autotests/klanguagenametest.cpp - create mode 100644 src/klanguagename.cpp - create mode 100644 src/klanguagename.h - -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index 1917ecb..37caaf9 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -9,5 +9,32 @@ set(kconfigdialog_unittest_SRCS kconfigdialog_unittest.cpp) - kconfig_add_kcfg_files(kconfigdialog_unittest_SRCS GENERATE_MOC signaltest.kcfgc) - ecm_add_test(${kconfigdialog_unittest_SRCS} TEST_NAME "kconfigdialog_unittest" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) - -+set(lang_entries -+ ca -+ de -+ en_US -+ es # must not have file! -+ fr -+ pt -+) -+ -+# scripty would mangle all *.desktop files, since that'd have potential of -+# breaking the test we'll need to bypass scripty by not having our files called -+# .desktop! -+# Do note that we pop these into CMAKE_LIBRARY_OUTPUT_DIRECTORY so QFINDTESTDATA -+# is able to find the fixtures in the bin dir as KDECMakeSettings sets a special -+# output dir. -+foreach(lang ${lang_entries}) -+ set(src_dir "${CMAKE_CURRENT_SOURCE_DIR}/kf5_entry_data.cmake/locale/${lang}") -+ set(src_file "${src_dir}/kf5_entry.cmake") -+ set(bin_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf5_entry_data/locale/${lang}") -+ set(bin_file "${bin_dir}/kf5_entry.desktop") -+ file(MAKE_DIRECTORY ${bin_dir}) -+ if(EXISTS ${src_file}) # not all languages have entries -+ configure_file(${src_file} ${bin_file} COPYONLY) -+ endif() -+endforeach() -+ -+ecm_add_test(klanguagenametest.cpp LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) - - ecm_add_test(krecentfilesactiontest.cpp TEST_NAME "krecentfilesaction_test" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) -diff --git a/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake -new file mode 100644 -index 0000000..a81564c ---- /dev/null -+++ b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake -@@ -0,0 +1,98 @@ -+[KCM Locale] -+Name=Catalan -+Name[af]=Katelaans -+Name[ar]=الكاتالانيّة -+Name[as]=কাটালান -+Name[be]=Каталонская -+Name[be@latin]=Katalanskaja -+Name[bg]=Каталонски -+Name[bn]=ক্যাটালান -+Name[bn_IN]=ক্যাটালান -+Name[br]=Katalaneg -+Name[bs]=katalonski -+Name[ca]=Català -+Name[ca@valencia]=Català -+Name[cs]=Katalánský -+Name[csb]=Katalońsczi -+Name[cy]=Catalaneg -+Name[da]=Catalansk -+Name[de]=Katalanisch -+Name[el]=Καταλανικά -+Name[en_GB]=Catalan -+Name[eo]=Kataluna -+Name[es]=Catalán -+Name[et]=Katalaani -+Name[eu]=Katalaniera -+Name[fa]=کاتالان -+Name[fi]=Katalaani -+Name[fr]=Catalan -+Name[fy]=Katalaansk -+Name[ga]=Catalóinis -+Name[gd]=Catalanais -+Name[gl]=Catalán -+Name[gu]=કેટેલાન -+Name[he]=קטלונית -+Name[hi]=केटेलन -+Name[hne]=केटेलन -+Name[hr]=Katalonski -+Name[hsb]=Katalansce -+Name[hu]=Katalán -+Name[ia]=Catalan -+Name[id]=Catalan -+Name[is]=Katalónska -+Name[it]=Catalano -+Name[ja]=カタロニア語 -+Name[kk]=Каталанша -+Name[km]=កាតាឡាន -+Name[kn]=ಕ್ಯಾಟಲಾನ್ -+Name[ko]=카탈루냐어 -+Name[ku]=Katalan -+Name[lb]=Katalanesch -+Name[lt]=Katalonų -+Name[lv]=Kataloņu -+Name[mai]=केटालान -+Name[mk]=Каталонски -+Name[ml]=കറ്റാലന് -+Name[mr]=केटेलन -+Name[ms]=Catalan -+Name[nb]=Katalansk -+Name[nds]=Katalaansch -+Name[ne]=कातालान -+Name[nl]=Catalaans -+Name[nn]=Katalansk -+Name[oc]=Catalan -+Name[or]=କେଟାଲାନ -+Name[pa]=ਕਾਟਾਲਾਨ -+Name[pl]=Kataloński -+Name[ps]=کېټېلېن -+Name[pt]=Catalão -+Name[pt_BR]=Catalão -+Name[ro]=Catalană -+Name[ru]=Каталонский -+Name[se]=Katalánagiella -+Name[si]=කැටලන් -+Name[sk]=Katalánčina -+Name[sl]=Katalonščina -+Name[sq]=Katalanisht -+Name[sr]=каталонски -+Name[sr@ijekavian]=каталонски -+Name[sr@ijekavianlatin]=katalonski -+Name[sr@latin]=katalonski -+Name[sv]=Katalanska -+Name[ta]=கெடலான் -+Name[te]=కెటలన్ -+Name[tg]=Каталанӣ -+Name[th]=ภาษาคาตาลัน -+Name[tr]=Katalanca -+Name[tt]=Каталон -+Name[ug]=كاتالانچە -+Name[uk]=Каталанська -+Name[uz]=Katalancha -+Name[uz@cyrillic]=Каталанча -+Name[vi]=Catalan -+Name[wa]=Catalan -+Name[xh]=Catalan -+Name[x-test]=xxCatalanxx -+Name[zh_CN]=加泰罗尼亚语 -+Name[zh_HK]=加泰隆尼亞語 -+Name[zh_TW]=加泰羅尼亞語 -diff --git a/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake -new file mode 100644 -index 0000000..e8146cb ---- /dev/null -+++ b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake -@@ -0,0 +1,98 @@ -+[KCM Locale] -+Name=German -+Name[af]=Duits -+Name[ar]=الألمانيّة -+Name[as]=জাৰ্মান -+Name[be]=Нямецкая -+Name[be@latin]=Niamieckaja -+Name[bg]=Немски -+Name[bn]=জার্মান -+Name[bn_IN]=জার্মান -+Name[br]=Alamaneg -+Name[bs]=njemački -+Name[ca]=Alemany -+Name[ca@valencia]=Alemany -+Name[cs]=Německý -+Name[csb]=Miemiecczi -+Name[cy]=Almaeneg -+Name[da]=Tysk -+Name[de]=Deutsch -+Name[el]=Γερμανικά -+Name[en_GB]=German -+Name[eo]=Germana -+Name[es]=Alemán -+Name[et]=Saksa -+Name[eu]=Alemana -+Name[fa]=آلمانی -+Name[fi]=Saksa -+Name[fr]=Allemand -+Name[fy]=Dútsk -+Name[ga]=Gearmáinis -+Name[gd]=Gearmailtis -+Name[gl]=Alemán -+Name[gu]=જર્મન -+Name[he]=גרמנית -+Name[hi]=जर्मन -+Name[hne]=जर्मन -+Name[hr]=Njemački -+Name[hsb]=Němsce -+Name[hu]=Német -+Name[ia]=Germano -+Name[id]=Jerman -+Name[is]=Þýska -+Name[it]=Tedesco -+Name[ja]=ドイツ語 -+Name[kk]=Немісше -+Name[km]=អាល្លឺម៉ង់ -+Name[kn]=ಜರ್ಮನ್ -+Name[ko]=독일어 -+Name[ku]=Almanî -+Name[lb]=Däitsch -+Name[lt]=Vokiečių -+Name[lv]=Vācu -+Name[mai]=जर्मन -+Name[mk]=Германски -+Name[ml]=ജര്മ്മന് -+Name[mr]=जर्मन -+Name[ms]=Jerman -+Name[nb]=Tysk -+Name[nds]=Hoochdüütsch -+Name[ne]=जर्मनी -+Name[nl]=Duits -+Name[nn]=Tysk -+Name[oc]=Aleman -+Name[or]=ଜର୍ମାନ -+Name[pa]=ਜਰਮਨ -+Name[pl]=Niemiecki -+Name[ps]=جرمني -+Name[pt]=Alemão -+Name[pt_BR]=Alemão -+Name[ro]=Germană -+Name[ru]=Немецкий -+Name[se]=Duiskkagiella -+Name[si]=ජර්මානු -+Name[sk]=Nemčina -+Name[sl]=Nemščina -+Name[sq]=Gjermanisht -+Name[sr]=немачки -+Name[sr@ijekavian]=њемачки -+Name[sr@ijekavianlatin]=njemački -+Name[sr@latin]=nemački -+Name[sv]=Tyska -+Name[ta]=ஜெர்மன் -+Name[te]=జెర్మన్ -+Name[tg]=Олмонӣ -+Name[th]=ภาษาเยอรมัน -+Name[tr]=Almanca -+Name[tt]=Алман -+Name[ug]=گېرمانچە -+Name[uk]=Німецька -+Name[uz]=Olmoncha -+Name[uz@cyrillic]=Олмонча -+Name[vi]=Đức -+Name[wa]=Almand -+Name[xh]=German -+Name[x-test]=xxGermanxx -+Name[zh_CN]=德语 -+Name[zh_HK]=德語 -+Name[zh_TW]=德語 -diff --git a/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake -new file mode 100644 -index 0000000..6033ad4 ---- /dev/null -+++ b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake -@@ -0,0 +1,44 @@ -+[KCM Locale] -+Name=US English -+Name[ar]=الإنجليزية الأمريكية -+Name[bs]=Američki engleski -+Name[ca]=Anglès US -+Name[ca@valencia]=Anglés US -+Name[cs]=US Angličtina -+Name[da]=US Engelsk -+Name[de]=US-Englisch -+Name[el]=US English -+Name[en_GB]=US English -+Name[es]=Inglés de EE. UU. -+Name[et]=USA inglise -+Name[eu]=AEBtako ingelesa -+Name[fi]=Amerikanenglanti -+Name[fr]=Anglais (États-Unis) -+Name[gd]=Beurla (SA) -+Name[gl]=Inglés americano -+Name[he]=אנגלית ארה"ב -+Name[hu]=Angol (amerikai) -+Name[ia]=Anglese de S.U.A. -+Name[id]=Inggris US -+Name[it]=Inglese US -+Name[ko]=미국 영어 -+Name[lt]=JAV anglų -+Name[nb]=Engelsk (USA) -+Name[nl]=VS Engels -+Name[nn]=Engelsk (USA) -+Name[pl]=Angielski amerykański -+Name[pt]=Inglês dos EUA -+Name[pt_BR]=Inglês dos EUA -+Name[ru]=Английский (США) -+Name[sk]=Americká angličtina -+Name[sl]=ameriško angleško -+Name[sr]=амерички енглески -+Name[sr@ijekavian]=амерички енглески -+Name[sr@ijekavianlatin]=američki engleski -+Name[sr@latin]=američki engleski -+Name[sv]=Amerikansk engelska -+Name[tr]=ABD İngilizcesi -+Name[uk]=Англійська (США) -+Name[x-test]=xxUS Englishxx -+Name[zh_CN]=美国英语 -+Name[zh_TW]=美式英文 -diff --git a/autotests/kf5_entry_data.cmake/locale/es/.keep b/autotests/kf5_entry_data.cmake/locale/es/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake -new file mode 100644 -index 0000000..4f248b9 ---- /dev/null -+++ b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake -@@ -0,0 +1,2 @@ -+[KCM Locale] -+Name=French -diff --git a/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake -new file mode 100644 -index 0000000..6e555d0 ---- /dev/null -+++ b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake -@@ -0,0 +1,98 @@ -+[KCM Locale] -+Name=Portuguese -+Name[af]=Portugese -+Name[ar]=البرتغاليّة -+Name[as]=প'ৰ্টুগিছ্ -+Name[be]=Партугальская -+Name[be@latin]=Partuhalskaja -+Name[bg]=Португалски -+Name[bn]=পর্তুগীজ -+Name[bn_IN]=পোর্তুগিজ -+Name[br]=Portugaleg -+Name[bs]=portugalski -+Name[ca]=Portuguès -+Name[ca@valencia]=Portugués -+Name[cs]=Portugalský -+Name[csb]=Pòrtugalsczi -+Name[cy]=Portiwgaleg -+Name[da]=Portugisisk -+Name[de]=Portugiesisch -+Name[el]=Πορτογαλικά -+Name[en_GB]=Portuguese -+Name[eo]=Portugala -+Name[es]=Portugués -+Name[et]=Portugali -+Name[eu]=Portugesa -+Name[fa]=پرتغالی -+Name[fi]=Portugali -+Name[fr]=Portugais -+Name[fy]=Portugeesk -+Name[ga]=Portaingéilis -+Name[gd]=Portagailis -+Name[gl]=Portugués -+Name[gu]=પોર્ટુગીઝ -+Name[he]=פורטוגזית -+Name[hi]=पुर्तगाली -+Name[hne]=पुर्तगाली -+Name[hr]=Portugalski -+Name[hsb]=Portugalsce -+Name[hu]=Portugál -+Name[ia]=Portugese -+Name[id]=Portugis -+Name[is]=Portúgalska -+Name[it]=Portoghese -+Name[ja]=ポルトガル語 -+Name[kk]=Португалша -+Name[km]=ព័រទុយហ្គាល់ -+Name[kn]=ಪೋರ್ಚುಗೀಸ್ -+Name[ko]=포르투갈어 -+Name[ku]=Portûgalî -+Name[lb]=Portugisesch -+Name[lt]=Portugalų -+Name[lv]=Portugāļu -+Name[mai]=पुर्तगाली -+Name[mk]=Португалски -+Name[ml]=പോര്ച്ചുഗീസ് -+Name[mr]=पोर्तुगीज -+Name[ms]=Portugis -+Name[nb]=Portugisisk -+Name[nds]=Portugeesch -+Name[ne]=पोर्तुगाली -+Name[nl]=Portugees -+Name[nn]=Portugisisk -+Name[oc]=Portugués -+Name[or]=ପର୍ତ୍ତୁଗିଜ -+Name[pa]=ਪੁਰਤਗਾਲੀ -+Name[pl]=Portugalski -+Name[ps]=پورټګيز -+Name[pt]=Português -+Name[pt_BR]=Português -+Name[ro]=Portugheză -+Name[ru]=Португальский -+Name[se]=Portugálagiella -+Name[si]=පෘතුගීසි -+Name[sk]=Portugalčina -+Name[sl]=Portugalščina -+Name[sq]=Portugalisht -+Name[sr]=португалски -+Name[sr@ijekavian]=португалски -+Name[sr@ijekavianlatin]=portugalski -+Name[sr@latin]=portugalski -+Name[sv]=Portugisiska -+Name[ta]=போர்த்துக்கீசிய -+Name[te]=పొర్ట్యుగీస్ -+Name[tg]=Португалӣ -+Name[th]=ภาษาโปรตุเกส -+Name[tr]=Portekizce -+Name[tt]=Португал -+Name[ug]=پورتۇگالچە -+Name[uk]=Португальська -+Name[uz]=Portugalcha -+Name[uz@cyrillic]=Португалча -+Name[vi]=Bồ Đào Nha -+Name[wa]=Portuguès -+Name[xh]=Portuguese -+Name[x-test]=xxPortuguesexx -+Name[zh_CN]=葡萄牙语 -+Name[zh_HK]=葡萄牙語 -+Name[zh_TW]=葡萄牙語 -diff --git a/autotests/klanguagenametest.cpp b/autotests/klanguagenametest.cpp -new file mode 100644 -index 0000000..bb2b3d9 ---- /dev/null -+++ b/autotests/klanguagenametest.cpp -@@ -0,0 +1,96 @@ -+/* -+ Copyright (c) 2018 Harald Sitter <sitter@kde.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) version 3, or any -+ later version accepted by the membership of KDE e.V. (or its -+ successor approved by the membership of KDE e.V.), which shall -+ act as a proxy defined in Section 6 of version 3 of the license. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library. If not, see <http://www.gnu.org/licenses/>. -+*/ -+ -+#include <QObject> -+#include <QtTest> -+ -+#include "klanguagename.h" -+ -+static void setEnvironment() -+{ -+ qputenv("LANG", "C.UTF-8"); -+ qputenv("LANGUAGE", "en"); -+ qputenv("XDG_DATA_DIRS", qUtf8Printable(QFINDTESTDATA("kf5_entry_data"))); -+ // There is a distinct chance of the envionrment setup being to late and -+ // causing flakey results based on the execution env. -+ // Make sure we definitely default to english. -+ QLocale::setDefault(QLocale::English); -+ -+ // NOTE -+ // - fr has no translations -+ // - es has no kf5_entry at all -+ // - other languages under testing are complete -+} -+ -+class KLanguageNameTest : public QObject -+{ -+ Q_OBJECT -+ -+private Q_SLOTS: -+ void testNameForCode() -+ { -+ // This is somewhat wrong, it should not say US. -+ QCOMPARE(KLanguageName::nameForCode("en"), QString("US English")); -+ -+ QCOMPARE(KLanguageName::nameForCode("de"), QString("German")); -+ QCOMPARE(KLanguageName::nameForCode("pt"), QString("Portuguese")); -+ QCOMPARE(KLanguageName::nameForCode("ca"), QString("Catalan")); -+ } -+ -+ void testNameForCodeInLocale() -+ { -+ // This is somewhat wrong, it should not say US. -+ QCOMPARE(KLanguageName::nameForCodeInLocale("en", "de"), QString("US-Englisch")); -+ -+ QCOMPARE(KLanguageName::nameForCodeInLocale("de", "de"), QString("Deutsch")); -+ QCOMPARE(KLanguageName::nameForCodeInLocale("pt", "de"), QString("Portugiesisch")); -+ QCOMPARE(KLanguageName::nameForCodeInLocale("ca", "de"), QString("Katalanisch")); -+ } -+ -+ void testNoTranslation() -+ { -+ // This has an entry file but no translation => QLocale. -+ QCOMPARE(KLanguageName::nameForCode("fr"), QString("French")); -+ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "de"), QString("French")); -+ // When in the same language, use the native name. -+ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "fr"), QString("français")); -+ } -+ -+ void testNoEntry() -+ { -+ // This has no entry file => QLocale. -+ QCOMPARE(KLanguageName::nameForCode("es"), QString("Spanish")); -+ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "de"), QString("Spanish")); -+ // When in the same language, use the native name. -+ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "es"), QString("español de España")); -+ } -+ -+ void testNoString() -+ { -+ // Qt doesn't have za support, we have no test fixture, so no string. -+ QCOMPARE(KLanguageName::nameForCode("za"), QString()); -+ } -+}; -+ -+Q_COREAPP_STARTUP_FUNCTION(setEnvironment) -+ -+QTEST_GUILESS_MAIN(KLanguageNameTest) -+ -+#include "klanguagenametest.moc" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a35cf3c..09fe50b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -8,6 +8,7 @@ set(kconfigwidgets_SRCS - kcmodule.cpp - khelpclient.cpp - klanguagebutton.cpp -+ klanguagename.cpp - kpastetextaction.cpp - krecentfilesaction.cpp - kstandardaction.cpp -@@ -52,6 +53,7 @@ ecm_generate_headers(KConfigWidgets_HEADERS - KCModule - KHelpClient - KLanguageButton -+ KLanguageName - KPasteTextAction - KRecentFilesAction - KViewStateMaintainer -diff --git a/src/klanguagename.cpp b/src/klanguagename.cpp -new file mode 100644 -index 0000000..6e1a519 ---- /dev/null -+++ b/src/klanguagename.cpp -@@ -0,0 +1,67 @@ -+/* -+ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org> -+ * (c) 2007 David Jarvie <software@astrojar.org.uk> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public License -+ * along with this library; see the file COPYING.LIB. If not, write to -+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ */ -+ -+#include "klanguagename.h" -+#include "kconfigwidgets_debug.h" -+ -+#include <kconfig.h> -+#include <kconfiggroup.h> -+ -+QString KLanguageName::nameForCode(const QString &code) -+{ -+ const QStringList parts = QLocale().name().split(QChar('_')); -+ return nameForCodeInLocale(code, parts.at(0)); -+} -+ -+QString KLanguageName::nameForCodeInLocale(const QString &code, const QString &outputCode) -+{ -+ const QString realCode = code == QStringLiteral("en") ? QStringLiteral("en_US") : code; -+ const QString realOutputCode = outputCode == QStringLiteral("en") ? QStringLiteral("en_US") : outputCode; -+ -+ const QString entryFile = -+ QStandardPaths::locate(QStandardPaths::GenericDataLocation, -+ QStringLiteral("locale") + QLatin1Char('/') + realCode + QStringLiteral("/kf5_entry.desktop")); -+ if (!entryFile.isEmpty()) { -+ KConfig entry(entryFile, KConfig::SimpleConfig); -+ entry.setLocale(realOutputCode); -+ const KConfigGroup group(&entry, "KCM Locale"); -+ const QString name = group.readEntry("Name"); -+ -+ // KConfig doesn't have a way to say it didn't find the entry in -+ // realOutputCode and returned the english version so we check for the -+ // english version, if it's equal to the "non-english" version we'll use -+ // otherwise we defer to QLocale. -+ entry.setLocale("en_US"); -+ const QString englishName = group.readEntry("Name"); -+ if (name != englishName || realOutputCode == QStringLiteral("en_US")) { -+ return name; -+ } -+ } -+ -+ const QLocale locale(realCode); -+ if (locale != QLocale::c()) { -+ if (realCode == realOutputCode) { -+ return locale.nativeLanguageName(); -+ } -+ return QLocale::languageToString(locale.language()); -+ } -+ -+ return QString(); -+} -diff --git a/src/klanguagename.h b/src/klanguagename.h -new file mode 100644 -index 0000000..51dc6dd ---- /dev/null -+++ b/src/klanguagename.h -@@ -0,0 +1,63 @@ -+/* -+ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org> -+ * (c) 2001 Martijn Klingens <klingens@kde.org> -+ * (c) 2007 David Jarvie <software@astrojar.org.uk> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public License -+ * along with this library; see the file COPYING.LIB. If not, write to -+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ */ -+ -+#ifndef KLANGUAGENAME_H -+#define KLANGUAGENAME_H -+ -+#include "kconfigwidgets_export.h" -+ -+class QString; -+ -+/** -+ * @class KLanguageName klanguagename.h KLanguageName -+ * -+ * KLanguageName is a helper namespace that returns the name of a given language code. -+ * -+ * @since 5.55 -+ * -+ */ -+namespace KLanguageName -+{ -+ /** -+ * Returns the name of the given language code in the current locale. -+ * -+ * If it can't be found in the current locale it returns the name in English. -+ * -+ * It it can't be found in English either it returns an empty QString. -+ * -+ * @param code code (ISO 639-1) of the language whose name is wanted. -+ */ -+ KCONFIGWIDGETS_EXPORT QString nameForCode(const QString &code); -+ -+ /** -+ * Returns the name of the given language code in the other given locale code. -+ * -+ * If it can't be found in the given locale it returns the name in English. -+ * -+ * It it can't be found in English either it returns an empty QString. -+ * -+ * @param code code (ISO 639-1) of the language whose name is wanted. -+ * @param outputLocale code (ISO 639-1) of the language in which we want the name in. -+ */ -+ KCONFIGWIDGETS_EXPORT QString nameForCodeInLocale(const QString &code, const QString &outputLocale); -+} -+ -+#endif --- -cgit v1.1 - diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index cf1efe711..1fe5bd35c 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=18.12.3 +pkgver=5.68.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -10,12 +10,11 @@ license="LGPL-2.1-only" depends="iso-codes" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev - ki18n-dev kcodecs-dev iso-codes-dev" + ki18n-dev kcodecs-dev iso-codes-dev doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcontacts-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcontacts-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,20 +25,19 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # addresstest requires the library to already be installed. # picturetest requires X11 running. CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(address|picture)test" } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3afdc0f3fb304329f0dec37f7db1d4cf457eda726a9276d440d9ada83f946c28806d5a3e69f0c711fb398567a7e3566b7c043b1dfc4ec59eae0b9ed0aa08689a kcontacts-18.12.3.tar.xz" +sha512sums="59734f680473ba97bae3406c04f9859997ddb29233d1870865c7f147b7271b7a3dde6ed05bf4cc8ebabd7639c8492bae1f8bab38437c3947495f3bc50190341f kcontacts-5.68.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index a94b25c34..f6c1ce99e 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -13,10 +13,11 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcoreaddons-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcoreaddons-$pkgver.tar.xz + utf8.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +29,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8e4a2cd59a0ecdf09317e67aa20b96f37562035beb744d189856094bcb06944e175c78515374a8a090446e63c8174b2a949b744dff36f0e21c455a2cb5df5df9 kcoreaddons-5.54.0.tar.xz" +sha512sums="a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8 kcoreaddons-5.68.0.tar.xz +d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcoreaddons/utf8.patch b/user/kcoreaddons/utf8.patch new file mode 100644 index 000000000..3fee25313 --- /dev/null +++ b/user/kcoreaddons/utf8.patch @@ -0,0 +1,17 @@ +Use UTF-8 for parsing /etc/os-release. + +diff --git a/src/lib/util/kosrelease.cpp b/src/lib/util/kosrelease.cpp +index 0469aba..1d74f2a 100644 +--- a/src/lib/util/kosrelease.cpp ++++ b/src/lib/util/kosrelease.cpp +@@ -134,9 +134,9 @@ public: + QStringList parts; + while (!file.atEnd()) { + // Trimmed to handle indented comment lines properly +- line = QString::fromLatin1(file.readLine()).trimmed(); ++ line = QString::fromUtf8(file.readLine()).trimmed(); + + if (line.startsWith(QLatin1Char('#'))) { + // Comment line + // Lines beginning with "#" shall be ignored as comments. + continue; diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 46275a105..04bbc7458 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -11,14 +11,13 @@ license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev libx11-dev libxext-dev libice-dev kcoreaddons-dev kwindowsystem-dev" +checkdepends="xkeyboard-config" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz qt5-qttools-dev" -checkdepends="xkeyboard-config" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcrash-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,18 +29,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1dae5de58b8f91e463af8bf745a474472f2d53d2c2ea3bdbff2477c9220a720df1c7f97400e58a3060f891120ced85bb37f9458a7b17b6c1af1be765c9fea671 kcrash-5.54.0.tar.xz" +sha512sums="a26607886537a2d6259c624907e0e5db133f58f0a55ea47845a83e4aa07c86be7f8030a21afddddef58cdac82ca42bed0c288737aaf57d424c6bf67916782811 kcrash-5.68.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index 145f56cb1..d4d6a1ede 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdbusaddons-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3ed4e8d3861aa894ba895fbec1c792f1f6c35a4d1c1617b367b772076ed1417bceed427e1b9046158cc1f85c0fd0d14b23093f8c3804cae9b5b93508a43deab2 kdbusaddons-5.54.0.tar.xz" +sha512sums="e9d8be0a886037ce4804cbf6a3603350d08f805fac04b5ec5a5007e8ae01300e7cef7161ea13715e87bba544bf32062cc15f77a7890c3ca5699a59b7c5f11bd7 kdbusaddons-5.68.0.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index 229cb371e..741213579 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -9,10 +9,11 @@ arch="all" options="!check" # MIME types for some reason think .doc == .txt license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND GPL-2.0-only AND LGPL-2.1-only" depends="" +checkdepends="shared-mime-info" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtx11extras-dev kactivities-dev kcmutils-dev kconfig-dev - kdelibs4support-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev - kinit-dev kio-dev kwindowsystem-dev" + kdeclarative-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev + kinit-dev kio-dev kservice-dev kwindowsystem-dev libkworkspace-dev" subpackages="$pkgname-lang $pkgname-doc" source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz" @@ -27,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="54bed8cd64fb59abdfcea0a346e76cbc79f35b4d7c23e8a072e30b2489d636d47f119c8dc9f254c15b26c3bb69098a864589088ab4e2a1c2669375d1810276c3 kde-cli-tools-5.12.8.tar.xz" +sha512sums="66128d713a9dfe649d8a7e3f5969e60b2030ec9ce1d07076af537861d848c45eec987b1c64419158785c97f898929e82eb281dcb245b08ee3cbf0f3b02797823 kde-cli-tools-5.18.3.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 1c4ebcc34..dbeb83fc9 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" @@ -11,7 +11,7 @@ license="NCSA" # gcompris-qt is removed until it works with gettext-tiny. depends="artikulate blinken cantor kalgebra kalzium kanagram kbruch kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz - labplot marble minuet rocs step" + 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 42135b2c0..764bea813 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 12bd0b039..891f92179 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index 4890f6185..49e1f47b8 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -11,7 +11,7 @@ depends="gsettings-desktop-schemas" makedepends="cmake extra-cmake-modules qt5-qtbase-dev gtk+2.0-dev gtk+3.0-dev karchive-dev kcmutils-dev kconfigwidgets-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev gsettings-desktop-schemas-dev" -subpackages="$pkgname-lang" +subpackages="" source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz" build() { @@ -25,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ed8dd86ed2f0e5e3ac7ee6010b8ef4441380eab5425e2e98fbdfbf6f756c295956f9fbff61524d55961edd66e212a0f2004aed70be2f97a04634751e3553ebd kde-gtk-config-5.12.8.tar.xz" +sha512sums="eb722da6041de041a9c3bfbe69374193d65fc16302bea423ab01eb9b9abbca74a8a04b6a3c181ec8f95783c54d6097886572327bc9458f32d6a53711dbc024c7 kde-gtk-config-5.18.3.tar.xz" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 142e010fd..186b142e1 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.08.1 +pkgver=19.12.3 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index f04d4de34..9f9c2802b 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.08.2 +pkgver=19.12.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 a30c4f7a2..55833148a 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.08.2 +pkgver=19.12.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 dbb054a1e..2f5538124 100644 --- a/user/kde/APKBUILD +++ b/user/kde/APKBUILD @@ -1,15 +1,17 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde pkgver=5 -pkgrel=1 +pkgrel=3 pkgdesc="The K Desktop Environment" url="https://www.kde.org/" arch="noarch" -license="NCSA" options="!check" # Metapacakge +license="NCSA" subpackages="" depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia - kde-system kde-utilities plasma-desktop + kde-system kde-utilities plasma-desktop plasma-meta + + kcachegrind kget krdc ktorrent umbrello kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers user-manager" diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index 877ddaae8..b31caeb3c 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdeclarative-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="57a042a3c9be486b9582f133a0d6688758d1ae2dd4079168d3830cbd6b2d656b22d7b1fa321f77c1d14e216e2714984303db943df623b71d29c87d7c410871c2 kdeclarative-5.54.0.tar.xz" +sha512sums="2c3253b1374e66c59436e4c88b8fd296dc60f7a19ef64fa750663afaf86f144b16323cde5af79c0a55d6f5e780085d671deac923d84410d6c31c2b88564ad363 kdeclarative-5.68.0.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 596214fbf..363115674 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdecoration -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -10,8 +10,8 @@ options="!check" # Requires running X11 display license="LGPL-2.1" depends="" depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake extra-cmake-modules" -subpackages="$pkgname-dev" +makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz" build() { @@ -25,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee93718d25ebf51a61fd8fab8be7138b3bddcbc87422e88e9500c40b72a0211abfa3df168277e7d1cee759bb995ea993d618024979a4d4127729a40b3e910f61 kdecoration-5.12.8.tar.xz" +sha512sums="607abf1a66260f7855545ea75ad6a7fcc402f2b8f3defa63d17c2601953465a60907b40fa6427fc11e8362e7dbfe7c3dbb1d7519489872c75c47e4f8c0b58d47 kdecoration-5.18.3.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index ccd6935d7..b22a075ac 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -10,12 +10,11 @@ license="LGPL-2.1-only AND LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev - kcrash-dev kdbusaddons-dev kdoctools-dev kinit-dev kservice-dev" + kcrash-dev kdbusaddons-dev kdoctools-dev kservice-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kded-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="696f98b222616200a308c97c04d3fcc1f941bd46bf4ff8913d5d3e95c46f385906dc71c43e55d44938aab21a572786130370b5a1210a811390c356a50a2ccc77 kded-5.54.0.tar.xz" +sha512sums="f0f1073ea2e57ae6fdd615a496c213393881f29193bd0904bdef752eec3d74463ac775c20b9c90c55f03e2aed34a86988833848b78835b52115fa46d99dbe999 kded-5.68.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index b38d29ac8..0cc01f082 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kio-dev libkdcraw-dev libkexiv2-dev" subpackages="" -source="https://download.kde.org/stable/applications/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="72360eac57b541858e6dbaf34036452ace5776f371773194be4b83defb0e512f856430221c83b3a063c532a6181faa2a8821abb16143de1d3aa44b23eda8037d kdegraphics-thumbnailers-19.08.2.tar.xz" +sha512sums="515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470 kdegraphics-thumbnailers-19.12.3.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 40da9c4ab..57d2eb9b4 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -19,7 +19,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdelibs4support-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,18 +29,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="860c2de36c1a1587c423eaa8f770be254d0458f3c223592ac07f116015ee2f597b913039180bf832e892cfc1060eb3830fe45c786466771441e3a1815a6a5065 kdelibs4support-5.54.0.tar.xz" +sha512sums="9862e320f028e4a80f33db4532b9e865a8b8d642d434e064988fc1f72d9270e3f5883c17caca61f307b86dbf24b4a070bf27ddf12f1777d84a742749d0b8dc42 kdelibs4support-5.68.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index b9903e868..39c3b74f5 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.08.1 +pkgver=19.12.3 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -20,10 +20,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev kdeclarative-dev qt5-qtmultimedia-dev rttr-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,18 +33,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="74f007ecdfe2368a1dee9d7b2331e45a56adc157a4d20127659b833e3f045a6edce680593232b9be43e50d16a5222e275af61a4c3a7e4c420ad6721b2e93b502 kdenlive-19.08.1.tar.xz" +sha512sums="f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad kdenlive-19.12.3.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index 4bd1c3710..915b30494 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -11,8 +11,8 @@ depends="qt5-qtquickcontrols qt5-qtquickcontrols2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev kactivities-dev kconfig-dev kconfigwidgets-dev kcmutils-dev kcoreaddons-dev kdoctools-dev ki18n-dev knewstuff-dev - kross-dev krunner-dev kservice-dev kunitconversion-dev - kdelibs4support-dev plasma-framework-dev plasma-workspace-dev" + kross-dev krunner-dev kservice-dev kunitconversion-dev kholidays-dev + plasma-framework-dev plasma-workspace-dev" subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz" @@ -41,4 +41,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="3b0a92a90770c718de4065ad9e6f2e7937aa047ecea32ba7c28bf2324d9ad2cd2c825e6bc21a37d494b1d2e5409ba2b4efeaae2be811bee09c9ece2cc3a6941f kdeplasma-addons-5.12.8.tar.xz" +sha512sums="6e2e4ea22099198de39b24292d906f50a54bff43f5c5d2dbda7229ab9ca9186a1d8a5b5fb13b48d2d5d1d2687c69bfc8189f86957c1b61a5fac10e45488f6ddd kdeplasma-addons-5.18.3.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 0e0fd39e9..755c94066 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev kio-dev kdoctools-dev kiconthemes-dev kitemviews-dev kplotting-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev sonnet-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdesignerplugin-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdesignerplugin-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ac566101b0b991376d31612033a86a8db6bce30734fed3a6022f6d6cfde812b6df6a65f73578ebd6fa31b3954a1af7b134e38bf795b512cf5aa4af684b87c1a7 kdesignerplugin-5.54.0.tar.xz" +sha512sums="b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef kdesignerplugin-5.68.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index bd1f01af5..a0a2c23d2 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdesu-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6491ec9b13d802fa78917cb95aad80cd3de746fbb37f1fb9bef56a53021be95adb15156352cfc96664fcee0c5ef90a9045e1b2086d2af9b2c657ecc50146285f kdesu-5.54.0.tar.xz" +sha512sums="cd31b83be237adb2b13896714ee07af659780b1028149e04ce797edf737d03dd0a7e1f2733c2ae28786c38e382806b558725f1f424910747df13719d35fad5f2 kdesu-5.68.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index 9d00ce5d9..b980489f7 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -10,12 +10,11 @@ license="LGPL-2.1+" depends="" depends_dev="qt5-qtwebkit-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev - kio-dev kparts-dev kwallet-dev" + kio-dev kparts-dev kwallet-dev qt5-qttools-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdewebkit-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdewebkit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6d4a5cede572653db64826d29470e7f2f1ecded97547c4ee49f5ca51e218c22ffeb84dbd0f0953e4e55d993aff617d262cc6f974902c5dc0219642dffb1611f1 kdewebkit-5.54.0.tar.xz" +sha512sums="be885bc7234551adf38faadd03f863fec60588f46bb710558702570bb1a40dff44ea35155c2cf30624c2f9f7ae13dfe57cdc2f088538c35e11157189ba803594 kdewebkit-5.68.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 61226463a..214475d1b 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kio-dev kcmutils-dev knotifications-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kdf-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdf-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5f3a38e815862e4390191ad9ec23f287aac93c31fcf866d3e1d0ec3828269e9e090c714ed72580d91a311531b9bfd73c397c5ef05eb08647f37f6d89f6d3902a kdf-19.08.2.tar.xz" +sha512sums="46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a kdf-19.12.3.tar.xz" diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD index 3896e76c4..5c5b7e882 100644 --- a/user/kdiagram/APKBUILD +++ b/user/kdiagram/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,17 +25,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 9e938ea76..fe347e5db 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev kconfigwidgets-dev kxmlgui-dev knotifications-dev knotifyconfig-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kdiamond-$pkgver.tar.xz - ridiculous-qt.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kdiamond-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -28,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,5 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3626805431c7acf3a00ed0d3a8c1d3e6f0cf7fe5cd4712235e916d06697a61e1433e97deea5a6eb96411ce08df660cbf008a22fe98c2e0489c9f28c2f9755f76 kdiamond-19.08.2.tar.xz -b29c091b45376fa83192b0cd2876de7323648caa597e610c3d13d883ee0df269e9aa9e5367469e0d787a147ade590e6cd1b2c04162da0e8405220067d4e44129 ridiculous-qt.patch" +sha512sums="7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268 kdiamond-19.12.3.tar.xz" diff --git a/user/kdiamond/ridiculous-qt.patch b/user/kdiamond/ridiculous-qt.patch deleted file mode 100644 index 8e042f59a..000000000 --- a/user/kdiamond/ridiculous-qt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdiamond-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:58.000000000 +0000 -+++ kdiamond-19.08.0/CMakeLists.txt 2019-08-15 12:36:41.785854337 +0000 -@@ -1,7 +1,7 @@ - cmake_minimum_required (VERSION 3.5 FATAL_ERROR) - project(kdiamond) - --set (QT_MIN_VERSION "5.10.0") -+set (QT_MIN_VERSION "5.9.0") - set (KF5_MIN_VERSION "5.46.0") - - find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 5f9341b3e..49398a2b0 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdnssd-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="984277624e5ecca308101bff788c1dccb7b257801aa16f6430aa8d5e349ff71752081a689c8d10ec316e57c8a37df83bd5a43940c73fb46206cb201cee6c2722 kdnssd-5.54.0.tar.xz" +sha512sums="ada02627e705fabfa50ccbd7221969d123f0b9bdf51edb390c78a6cfaef545f1237fed91dad868d17800b85d677597df9e4d7906156a0816cb54f744ded89857 kdnssd-5.68.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index 126b3eda5..ec2771be6 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.54.0 -pkgrel=1 +pkgver=5.68.0 +pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" arch="all" @@ -10,12 +10,12 @@ license="LGPL-2.1-only OR LGPL-3.0-only" depends="libxml2-utils docbook-xml docbook-xsl" depends_dev="qt5-qtbase-dev karchive-dev libxml2-dev ki18n-dev libxslt-dev perl-uri-escape" -makedepends="$depends_dev cmake extra-cmake-modules python3" +makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz python3 + qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdoctools-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,19 +26,18 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DBUILD_QCH=ON \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # Requires catalogue files to be already installed CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'kdoctools_install' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b389fd1a7b2ea32d13ddca128ed2cb6375856f1c40f83c29a46e9ed1713de6e28e4415743403de37cf1f8a4ddcba4d7cc1e295e5c50443c4faf02939854f72cb kdoctools-5.54.0.tar.xz" +sha512sums="5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b kdoctools-5.68.0.tar.xz" diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD index 2e58efa7f..4aa4ecff3 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.4.3 +pkgver=2.5.3 pkgrel=0 pkgdesc="A community revival of the KeePassX password manager" url="https://keepassxc.org" @@ -14,27 +14,24 @@ makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev libsodium-dev subpackages="$pkgname-doc" source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" -prepare() { - default_prepare - mkdir build -} - build() { - cd "$builddir/build" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo .. - make + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_XC_BROWSER=bool:ON \ + -DWITH_XC_FDOSECRETS=bool:ON \ + -DWITH_XC_SSHAGENT=bool:ON \ + -Bbuild + make -C build } check() { - cd "$builddir/build" - make test + make -C build test } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d keepassxc-2.4.3-src.tar.xz" +sha512sums="8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6 keepassxc-2.5.3-src.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 560ae3b07..89f47bb2c 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kemoticons-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3b76a6e92cdc0db08179e35c2728f8729c0b1e15d54d17ccec2f265266535f5bf8edc791530d3e65a1ab2b645fd898cb0dba4dade95490f4a73b90c804719886 kemoticons-5.54.0.tar.xz" +sha512sums="44ef3ec99997ae99d90bd0c4318930db0ca2805f812ad8fd18166b801424d940a40a499266bfa20f6f9169cdd4608a42a206069e72af015956e16d95b9b5e731 kemoticons-5.68.0.tar.xz" diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD index 8340209fb..63d1a84ca 100644 --- a/user/keybinder-3.0/APKBUILD +++ b/user/keybinder-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=keybinder-3.0 pkgver=0.3.2 pkgrel=0 @@ -7,12 +7,12 @@ pkgdesc="GTK+ library for managing global keybindings" url="https://github.com/kupferlauncher/keybinder" arch="all" license="Public-Domain AND MIT" +depends="" makedepends="gtk+3.0-dev vala gobject-introspection-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$pkgver/keybinder-3.0-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/keychain/APKBUILD b/user/keychain/APKBUILD index e3dc1306b..114843930 100644 --- a/user/keychain/APKBUILD +++ b/user/keychain/APKBUILD @@ -6,22 +6,18 @@ pkgrel=0 pkgdesc="Agent manager for OpenSSH and GnuPG" url="https://funtoo.org/Keychain" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="" makedepends="perl" -install="" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/funtoo/$pkgname/archive/$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" make } package() { - cd "$builddir" install -Dm755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "./${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1" } diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index b3437d091..5c5e7374c 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.54.0 -pkgrel=3 +pkgver=5.68.0 +pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" arch="all" @@ -11,11 +11,10 @@ depends="catdoc" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qtmultimedia-dev qt5-qttools-dev exiv2-dev karchive-dev ki18n-dev - poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev" + poppler-dev poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz - add-formatting-fn.patch - add-mimeutils.patch + test-mimetype.patch " build() { @@ -30,7 +29,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -42,6 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz -f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch -c94c57b7dacfdf35c19db10f6a4b2724673fc542adac3dde57ac34cb4f09d063fd37404343d265075a88a397d3543da038b6b5832f481de3b05640279ef19a8c add-mimeutils.patch" +sha512sums="a8e10b45b6c2790f1f0e41ea8f0a474d6a6b4e6c6bc73d53d26887b24b06f7c95c1fc3a81fc9096759c8506e64fd30f6b7f822ea6dc238ea787b812ba685f8bf kfilemetadata-5.68.0.tar.xz +17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch" diff --git a/user/kfilemetadata/add-formatting-fn.patch b/user/kfilemetadata/add-formatting-fn.patch deleted file mode 100644 index 5c3a1db91..000000000 --- a/user/kfilemetadata/add-formatting-fn.patch +++ /dev/null @@ -1,479 +0,0 @@ -From 4bedfd6609c6efe5dc327d305feac8985d4658e3 Mon Sep 17 00:00:00 2001 -From: Alexander Stippich <a.stippich@gmx.net> -Date: Sat, 9 Feb 2019 17:41:46 +0100 -Subject: Add string formatting function to property info - -Summary: -Adds the ability to format the metadata value -for displaying purposes individually for each -property. Currently, users of KFileMetaData -must implement their own custom formatting -functions. -All custom formatting functions from -Baloo-Widgets and Dolphin are copied into -KFileMetaData. This can be extended later. - -This adds a dependency on KCoreAddons to -KFileMetaData. - -FEATURE: 398581 - -Test Plan: tests pass - -Reviewers: broulik, bruns, mgallien, #frameworks - -Reviewed By: bruns - -Subscribers: ngraham, kde-frameworks-devel, #baloo - -Tags: #frameworks, #baloo - -Differential Revision: https://phabricator.kde.org/D17245 ---- - CMakeLists.txt | 5 +++ - autotests/propertyinfotest.cpp | 29 ++++++++++++++ - autotests/propertyinfotest.h | 1 + - src/CMakeLists.txt | 2 + - src/formatstrings.cpp | 86 ++++++++++++++++++++++++++++++++++++++++++ - src/formatstrings_p.h | 50 ++++++++++++++++++++++++ - src/propertyinfo.cpp | 27 +++++++++++++ - src/propertyinfo.h | 7 ++++ - 8 files changed, 207 insertions(+) - create mode 100644 src/formatstrings.cpp - create mode 100644 src/formatstrings_p.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa481a9..7ef0a40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,6 +40,11 @@ set_package_properties(KF5Archive PROPERTIES DESCRIPTION "KDE Frameworks 5: Arch - URL "https://download.kde.org/stable/frameworks/" TYPE OPTIONAL - PURPOSE "Archive is needed to build ODF and OOXML 2007 extractors") - -+find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS CoreAddons) -+set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDE Frameworks 5: Core Addons Framework" -+ URL "https://download.kde.org/stable/frameworks/" TYPE REQUIRED -+ PURPOSE "Needed for the formatting of properties for display purposes") -+ - find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n) - - find_package(Poppler 0.12.1 COMPONENTS Qt5) -diff --git a/autotests/propertyinfotest.cpp b/autotests/propertyinfotest.cpp -index ae8b1b8..e203dcd 100644 ---- a/autotests/propertyinfotest.cpp -+++ b/autotests/propertyinfotest.cpp -@@ -45,4 +45,33 @@ void PropertyInfoTest::testNameIdMapping() - } - } - -+void PropertyInfoTest::testFormatAsDisplayString() -+{ -+ auto emptyProperty = PropertyInfo::fromName(QStringLiteral("no valid property name")); -+ QCOMPARE(emptyProperty.formatAsDisplayString(QVariant("empty")), QStringLiteral("empty")); -+ -+ PropertyInfo year(Property::DiscNumber); -+ QCOMPARE(year.formatAsDisplayString(QVariant(2018)), QStringLiteral("2018")); -+ -+ QStringList artistList = {"Artist1", "Artist2"}; -+ PropertyInfo artist(Property::Artist); -+ QCOMPARE(artist.formatAsDisplayString(QVariant(artistList)), QStringLiteral("Artist1, Artist2")); -+ -+ QStringList authorList = {"Author1"}; -+ PropertyInfo author(Property::Author); -+ QCOMPARE(artist.formatAsDisplayString(QVariant(authorList)), QStringLiteral("Author1")); -+ -+ PropertyInfo duration(Property::Duration); -+ QCOMPARE(duration.formatAsDisplayString(QVariant(1800)), QStringLiteral("0:30:00")); -+ -+ PropertyInfo sampleRate(Property::SampleRate); -+ QCOMPARE(sampleRate.formatAsDisplayString(QVariant(44100)), QString(QLocale().toString(44.1) + QStringLiteral(" kHz"))); -+ -+ PropertyInfo bitRate(Property::BitRate); -+ QCOMPARE(bitRate.formatAsDisplayString(QVariant(128000)), QStringLiteral("128 kB/s")); -+ -+ PropertyInfo orientation(Property::ImageOrientation); -+ QCOMPARE(orientation.formatAsDisplayString(QVariant(5)), QStringLiteral("Transposed")); -+} -+ - QTEST_GUILESS_MAIN(PropertyInfoTest) -diff --git a/autotests/propertyinfotest.h b/autotests/propertyinfotest.h -index 677ade1..15e6a10 100644 ---- a/autotests/propertyinfotest.h -+++ b/autotests/propertyinfotest.h -@@ -30,6 +30,7 @@ class PropertyInfoTest : public QObject - Q_OBJECT - private Q_SLOTS: - void testNameIdMapping(); -+ void testFormatAsDisplayString(); - }; - - } -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 52fa8e5..c3cbe8c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -13,6 +13,7 @@ set(KF5FileMetaData_SRCS - writerplugin.cpp - writercollection.cpp - externalwriter.cpp -+ formatstrings.cpp - ) - ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata) - -@@ -34,6 +35,7 @@ target_link_libraries(KF5FileMetaData - Qt5::Core - PRIVATE - KF5::I18n -+ KF5::CoreAddons - ) - - if(TAGLIB_FOUND) -diff --git a/src/formatstrings.cpp b/src/formatstrings.cpp -new file mode 100644 -index 0000000..b0bfdf8 ---- /dev/null -+++ b/src/formatstrings.cpp -@@ -0,0 +1,86 @@ -+/* -+ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#include "formatstrings_p.h" -+ -+#include <QDateTime> -+#include <KLocalizedString> -+ -+using namespace KFileMetaData; -+ -+QString FormatStrings::toStringFunction(const QVariant& value) -+{ -+ return value.toString(); -+} -+ -+QString FormatStrings::joinStringListFunction(const QVariant& value) -+{ -+ return value.toStringList().join(i18nc("Separation between multiple entries in a list", ", ")); -+} -+ -+QString FormatStrings::formatDate(const QVariant& value) -+{ -+ KFormat form; -+ QDateTime dt; -+ if (value.type() == QVariant::DateTime) { -+ dt = value.toDateTime(); -+ } else { -+ dt = QDateTime::fromString(value.toString(), Qt::ISODate); -+ } -+ if (dt.isValid()) { -+ return form.formatRelativeDateTime(dt, QLocale::LongFormat); -+ } -+ return QString(); -+} -+ -+QString FormatStrings::formatDuration(const QVariant& value) -+{ -+ KFormat form; -+ return form.formatDuration(value.toInt() * 1000); -+} -+ -+QString FormatStrings::formatBitRate(const QVariant& value) -+{ -+ KFormat form; -+ return i18nc("@label bitrate (per second)", "%1/s", form.formatByteSize(value.toInt(), 0, KFormat::MetricBinaryDialect)); -+} -+ -+QString FormatStrings::formatSampleRate(const QVariant& value) -+{ -+ return i18nc("@label samplerate in kilohertz", "%1 kHz", QLocale().toString(value.toDouble() / 1000)); -+} -+ -+QString FormatStrings::formatOrientationValue(const QVariant& value) -+{ -+ QString string; -+ switch (value.toInt()) { -+ case 1: string = i18nc("Description of image orientation", "Unchanged"); break; -+ case 2: string = i18nc("Description of image orientation", "Horizontally flipped"); break; -+ case 3: string = i18nc("Description of image orientation", "180° rotated"); break; -+ case 4: string = i18nc("Description of image orientation", "Vertically flipped"); break; -+ case 5: string = i18nc("Description of image orientation", "Transposed"); break; -+ case 6: string = i18nc("Description of image orientation, counter clock-wise rotated", "90° rotated CCW "); break; -+ case 7: string = i18nc("Description of image orientation", "Transversed"); break; -+ case 8: string = i18nc("Description of image orientation, counter clock-wise rotated", "270° rotated CCW"); break; -+ default: -+ break; -+ } -+ return string; -+} -+ -diff --git a/src/formatstrings_p.h b/src/formatstrings_p.h -new file mode 100644 -index 0000000..125c31e ---- /dev/null -+++ b/src/formatstrings_p.h -@@ -0,0 +1,50 @@ -+/* -+ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#ifndef KFILEMETADATA_FORMATSTRINGS_P_H -+#define KFILEMETADATA_FORMATSTRINGS_P_H -+ -+#include <QString> -+#include <QVariant> -+#include <KFormat> -+ -+namespace KFileMetaData { -+ -+class Q_DECL_HIDDEN FormatStrings -+{ -+public: -+ static QString toStringFunction(const QVariant& value); -+ -+ static QString joinStringListFunction(const QVariant& value); -+ -+ static QString formatDate(const QVariant& value); -+ -+ static QString formatDuration(const QVariant& value); -+ -+ static QString formatBitRate(const QVariant& value); -+ -+ static QString formatSampleRate(const QVariant& value); -+ -+ static QString formatOrientationValue(const QVariant& value); -+ -+}; -+ -+} -+ -+#endif -diff --git a/src/propertyinfo.cpp b/src/propertyinfo.cpp -index 5439a58..56fc596 100644 ---- a/src/propertyinfo.cpp -+++ b/src/propertyinfo.cpp -@@ -24,6 +24,8 @@ - - #include <KLocalizedString> - -+#include "formatstrings_p.h" -+ - using namespace KFileMetaData; - - class Q_DECL_HIDDEN PropertyInfo::Private -@@ -34,6 +36,7 @@ public: - QString displayName; - QVariant::Type valueType; - bool shouldBeIndexed; -+ QString (*formatAsString)(const QVariant& value) = nullptr; - }; - - PropertyInfo::PropertyInfo(Property::Property property) -@@ -41,6 +44,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - { - d->prop = property; - d->shouldBeIndexed = true; -+ d->formatAsString = &FormatStrings::toStringFunction; - - switch (property) { - case Property::Album: -@@ -53,12 +57,14 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("albumArtist"); - d->displayName = i18nc("@label", "Album Artist"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::Artist: - d->name = QStringLiteral("artist"); - d->displayName = i18nc("@label", "Artist"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::AspectRatio: -@@ -71,12 +77,14 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("author"); - d->displayName = i18nc("@label", "Author"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::BitRate: - d->name = QStringLiteral("bitRate"); - d->displayName = i18nc("@label", "Bitrate"); - d->valueType = QVariant::Int; -+ d->formatAsString = &FormatStrings::formatBitRate; - break; - - case Property::Channels: -@@ -117,12 +125,14 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("creationDate"); - d->displayName = i18nc("@label", "Creation Date"); - d->valueType = QVariant::String; -+ d->formatAsString = &FormatStrings::formatDate; - break; - - case Property::Duration: - d->name = QStringLiteral("duration"); - d->displayName = i18nc("@label", "Duration"); - d->valueType = QVariant::Int; -+ d->formatAsString = &FormatStrings::formatDuration; - break; - - case Property::Empty: -@@ -147,6 +157,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("genre"); - d->displayName = i18nc("@label music genre", "Genre"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - d->shouldBeIndexed = false; - break; - -@@ -160,6 +171,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("imageDateTime"); - d->displayName = i18nc("@label EXIF", "Image Date Time"); - d->valueType = QVariant::DateTime; -+ d->formatAsString = &FormatStrings::formatDate; - break; - - case Property::ImageMake: -@@ -180,12 +192,14 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("imageOrientation"); - d->displayName = i18nc("@label EXIF", "Image Orientation"); - d->valueType = QVariant::Int; -+ d->formatAsString = &FormatStrings::formatOrientationValue; - break; - - case Property::Keywords: - d->name = QStringLiteral("keywords"); - d->displayName = i18nc("@label", "Keywords"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - d->shouldBeIndexed = false; - break; - -@@ -206,6 +220,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("lyricist"); - d->displayName = i18nc("@label", "Lyricist"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - d->shouldBeIndexed = false; - break; - -@@ -225,6 +240,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("photoDateTimeOriginal"); - d->displayName = i18nc("@label EXIF", "Photo Original Date Time"); - d->valueType = QVariant::DateTime; -+ d->formatAsString = &FormatStrings::formatDate; - break; - - case Property::PhotoExposureBiasValue: -@@ -345,6 +361,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("sampleRate"); - d->displayName = i18nc("@label", "Sample Rate"); - d->valueType = QVariant::Int; -+ d->formatAsString = &FormatStrings::formatSampleRate; - break; - - case Property::Subject: -@@ -382,6 +399,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("performer"); - d->displayName = i18nc("@label", "Performer"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::Ensemble: -@@ -394,12 +412,14 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->name = QStringLiteral("arranger"); - d->displayName = i18nc("@label", "Arranger"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::Conductor: - d->name = QStringLiteral("conductor"); - d->displayName = i18nc("@label", "Conductor"); - d->valueType = QVariant::StringList; -+ d->formatAsString = &FormatStrings::joinStringListFunction; - break; - - case Property::Compilation: -@@ -503,6 +523,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->displayName = i18nc("@label translations last update", "Last Update"); - d->valueType = QVariant::String; - d->shouldBeIndexed = false; -+ d->formatAsString = &FormatStrings::formatDate; - break; - - case Property::TranslationTemplateDate: -@@ -510,6 +531,7 @@ PropertyInfo::PropertyInfo(Property::Property property) - d->displayName = i18nc("@label date of template creation8", "Template Creation"); - d->valueType = QVariant::String; - d->shouldBeIndexed = false; -+ d->formatAsString = &FormatStrings::formatDate; - break; - - case Property::OriginUrl: -@@ -600,6 +622,11 @@ bool PropertyInfo::shouldBeIndexed() const - return d->shouldBeIndexed; - } - -+QString PropertyInfo::formatAsDisplayString(const QVariant &value) const -+{ -+ return (d->formatAsString)(value); -+} -+ - PropertyInfo PropertyInfo::fromName(const QString& name) - { - static QHash<QString, Property::Property> propertyHash = { -diff --git a/src/propertyinfo.h b/src/propertyinfo.h -index c1767c4..3c426e8 100644 ---- a/src/propertyinfo.h -+++ b/src/propertyinfo.h -@@ -85,6 +85,13 @@ public: - */ - static PropertyInfo fromName(const QString& name); - -+ /** -+ * Returns the value of the property as a QString with added formatting, -+ * added units if needed, and translated enums. -+ * @since 5.56 -+ */ -+ QString formatAsDisplayString(const QVariant& value) const; -+ - private: - class Private; - Private* d; --- -cgit v1.1 - diff --git a/user/kfilemetadata/add-mimeutils.patch b/user/kfilemetadata/add-mimeutils.patch deleted file mode 100644 index 5ea2cef37..000000000 --- a/user/kfilemetadata/add-mimeutils.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 69c25514cf6a08ceaaacbc4092cc02ff40853228 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Mon, 25 Mar 2019 17:40:41 +0100 -Subject: Add helper function to determine mime type based on content and - extension - -Summary: -The QMimeDatabase::MatchDefault only falls back to content matching -if the extension is not known. This fails for e.g. Matroska files, where -the content allows to distinguish between audio and video files. - -CCBUG: 403902 - -Reviewers: #baloo, #frameworks, astippich, ngraham, poboiko - -Reviewed By: #baloo, astippich, ngraham - -Subscribers: kde-frameworks-devel - -Tags: #frameworks, #baloo - -Differential Revision: https://phabricator.kde.org/D20045 ---- - src/CMakeLists.txt | 1 + - src/mimeutils.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/mimeutils.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 106 insertions(+) - create mode 100644 src/mimeutils.cpp - create mode 100644 src/mimeutils.h - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c3cbe8c..fc4ce19 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,6 +14,7 @@ set(KF5FileMetaData_SRCS - writercollection.cpp - externalwriter.cpp - formatstrings.cpp -+ mimeutils.cpp - ) - ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata) - -diff --git a/src/mimeutils.cpp b/src/mimeutils.cpp -new file mode 100644 -index 0000000..7ea4dc8 ---- /dev/null -+++ b/src/mimeutils.cpp -@@ -0,0 +1,50 @@ -+/* -+ * This file is part of KFileMetaData -+ * Copyright (C) 2019 Stefan Brüns <stefan.bruens@rwth-aachen.de> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#include "mimeutils.h" -+ -+namespace KFileMetaData { -+namespace MimeUtils { -+ -+QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db) -+{ -+ auto extensionMimes = db.mimeTypesForFileName(filePath); -+ auto contentMime = db.mimeTypeForFile(filePath, QMimeDatabase::MatchContent); -+ -+ if (extensionMimes.contains(contentMime)) { -+ // content based mime type is one of the types for the file extension, e.g.: -+ // *.ogg -> [ audio/ogg, audio/x-vorbis+ogg, ...] -+ // content -> audio/x-vorbis+ogg -+ return contentMime; -+ } -+ -+ for (auto mime : extensionMimes) { -+ // check if the content is generic and the extension is more specific, e.g.: -+ // *.mkv -> [ video/matroska ] -+ // content -> application/matroska -+ if (mime.inherits(contentMime.name())) { -+ return mime; -+ } -+ } -+ // content mime type does not match the extension, trust the content -+ return contentMime; -+} -+ -+}} // namespace KFileMetaData::MimeUtils -diff --git a/src/mimeutils.h b/src/mimeutils.h -new file mode 100644 -index 0000000..f33e100 ---- /dev/null -+++ b/src/mimeutils.h -@@ -0,0 +1,55 @@ -+/* -+ * This file is part of KFileMetaData -+ * Copyright (C) 2019 Stefan Brüns <stefan.bruens@rwth-aachen.de> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#ifndef KFILEMETADATA_MIMEUTILS -+#define KFILEMETADATA_MIMEUTILS -+ -+#include <QMimeDatabase> -+#include "kfilemetadata_export.h" -+ -+namespace KFileMetaData -+{ -+namespace MimeUtils -+{ -+ -+/** -+ * Returns the mimetype for a file -+ * -+ * The function uses both content and filename to determine the -+ * \c QMimeType. In case the extension mimetype is more specific -+ * than the content mimetype, and the first inherits the latter, -+ * the extension mimetype is preferred. -+ * If the extension does not match the content, the content has -+ * higher priority. -+ * The file must exist and be readable. -+ * -+ * @since 5.57 -+ * -+ * \sa QMimeDatabase::mimeTypesForFileName -+ * \sa QMimeType::inherits -+ */ -+KFILEMETADATA_EXPORT -+QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db); -+ -+ -+} // namespace MimeUtils -+} // namespace KFileMetaData -+ -+#endif // KFILEMETADATA_MIMEUTILS --- -cgit v1.1 - -From b56d0cb5b90baeef2ada6ba0cbaea91506df1270 Mon Sep 17 00:00:00 2001 -From: Alexander Stippich <a.stippich@gmx.net> -Date: Wed, 27 Mar 2019 20:41:49 +0100 -Subject: Generate header for new MimeUtils - ---- - src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fc4ce19..73bf7d0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -75,6 +75,7 @@ ecm_generate_headers(KF5FileMetaData_CamelCase_HEADERS - WriterPlugin - WriterCollection - EmbeddedImageData -+ MimeUtils - - PREFIX kfilemetadata - REQUIRED_HEADERS KF5FileMetaData_HEADERS --- -cgit v1.1 - diff --git a/user/kfilemetadata/test-mimetype.patch b/user/kfilemetadata/test-mimetype.patch new file mode 100644 index 000000000..87b994920 --- /dev/null +++ b/user/kfilemetadata/test-mimetype.patch @@ -0,0 +1,13 @@ +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 @@ + 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.dot", "text/vnd.graphviz"}, + { "test.eps", "image/x-eps"}, diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index d32ebcd9f..e2da48d02 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev karchive-dev kdoctools-dev kfilemetadata-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kfind-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kfind-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="36cc81a744e4bf81015e5611c6811034a1c236ce8603ed3c3fa2e0d8acf6cb38e86a0e92a55a726a96043805be91dc4e10e7c12be960a22b97f43928a089fa70 kfind-19.08.2.tar.xz" +sha512sums="a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5 kfind-19.12.3.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index f487c3871..0c30fd2cc 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcoreaddons-dev kcompletion-dev kdoctools-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kfloppy-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kfloppy-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3da10bcc6b47fd846e20f300b63a114e2742294f9031463bdbcd0d6bae0cef8469bfa477d0e04f3719c639ead81bc97c7617456d8b6b4753b0a508ef55ab2536 kfloppy-19.08.2.tar.xz" +sha512sums="26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba kfloppy-19.12.3.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 67d3db187..12c8a62f9 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdnssd-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kfourinline-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kfourinline-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8fc1e224d2f0b3daf9745172607aa75c6257043928dd2193576e161c019f0f9bba746fee45ce3822e364359eab6c8e0786a7739a0118341c38a50741d1e3629f kfourinline-19.08.2.tar.xz" +sha512sums="8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df kfourinline-19.12.3.tar.xz" diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index bd2d6cbb9..ec998aa32 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kgamma5 -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Control monitor gamma from KDE 5" url="https://www.KDE.org/" @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fdb359cb5b4b48df023657ffbd919421f45f938a7b430f20d0fad6b27d060b9aeaf886cab411d143b8698f041ffa273bc2a5ce4ab468e5e0b3d46bdbe7f6a65d kgamma5-5.12.8.tar.xz" +sha512sums="ccfff99df665b13b61752378e4fa5d1c3dbdc7cf0f7c24c8556404be6a6ec64583ac1243fce2ac9517143a6d52e203d78151dd96705682e8121cffa2d13951a5 kgamma5-5.18.3.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 6af6620a6..a536493d7 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kcrash-dev kwidgetsaddons-dev kcoreaddons-dev kconfigwidgets-dev ki18n-dev kitemviews-dev kiconthemes-dev kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kgeography-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kgeography-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7eba48bf95972a4733ece313f3553af8e76bb3ff2de29c0154ee98e75e1561191f2b1d0d5c53ce7c7cb8ed11f74cedb28fb1c68a6c25aaf96ac8324dec5c9ca0 kgeography-19.08.2.tar.xz" +sha512sums="fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3 kgeography-19.12.3.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 18ac5f9c8..033ab8603 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -15,9 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev solid-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev kwindowsystem-dev gpgme-dev qca-dev boost-dev libktorrent-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz - kf5.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kget-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -30,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -42,5 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aec147c2f4e7927b85e660b84d082de4a2ef9d3345cc9e8246da80f46f9eca5a098afc12e3d5c8c5fa14db81decd6087d87002bdce14fc393964bdf3d9d1ea0d kget-19.08.2.tar.xz -d66fb3988aa26c2cb9e243ef446679e715cb3bd10ee8cb1b0b39a68d424ab9fca71428fa0c6004a1671093201e71e371331b069d6bb0325d0e7b936a9b95a73c kf5.patch" +sha512sums="67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887 kget-19.12.3.tar.xz" diff --git a/user/kget/kf5.patch b/user/kget/kf5.patch deleted file mode 100644 index 0630603d3..000000000 --- a/user/kget/kf5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kget-19.08.0/CMakeLists.txt.old 2019-08-09 00:42:54.000000000 +0000 -+++ kget-19.08.0/CMakeLists.txt 2019-08-15 15:24:02.319818769 +0000 -@@ -8,7 +8,7 @@ - - project(kget VERSION ${KDE_APPLICATIONS_VERSION}) - --set(KF5_VERSION "5.55.0") -+set(KF5_VERSION "5.54.0") - set(REQUIRED_QT_VERSION "5.7.0") - - find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE) diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 7d64695f4..03f2be72a 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kglobalaccel-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="aaab8ba98ea7229ccd31da07efd21d16e1bd44da9534e05fee73473becc3a7098857335be00c30aa247f15454cb83cc2a0b11ab1c1385c8b682aebf06e0d6fce kglobalaccel-5.54.0.tar.xz" +sha512sums="66929e86dd09acca739e71a88dff5818bf6602417fe257b6f195f2a194f1bb030ca44e25b37d9383f4bc4960da95ddcaa7330f3c2cfceb1772be50d80763796e kglobalaccel-5.68.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index e5d23e1b2..e10b5e835 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdbusaddons-dev kdoctools-dev ki18n-dev kio-dev kxmlgui-dev phonon-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kgoldrunner-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kgoldrunner-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1d6d875d2d660dbac12daa2e04111a590bf3cd5e5e4d9cc14ee433e7d1ddec0d4186560f765ae783423afee0b346a1d403ac8fc78326d5a44127bddca500c0dd kgoldrunner-19.08.2.tar.xz" +sha512sums="af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3 kgoldrunner-19.12.3.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 82fa032b7..c815bf81a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev ktextwidgets-dev kxmlgui-dev kwidgetsaddons-dev kwindowsystem-dev akonadi-contacts-dev kcontacts-dev gpgme-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kgpg-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c6dd268fc3e007d4e4fb93317b64606e2b87299352a460f9c2889f61d9828dda93c6c2767e4a1b787fb62fd3b0288eccb466f0e08fb89af6fae845d2bff38654 kgpg-19.08.2.tar.xz" +sha512sums="465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109 kgpg-19.12.3.tar.xz" diff --git a/user/kgraphviewer/APKBUILD b/user/kgraphviewer/APKBUILD index 58b1dc410..db2f22ca1 100644 --- a/user/kgraphviewer/APKBUILD +++ b/user/kgraphviewer/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kgraphviewer/$pkgver/kgraphviewer-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,17 +25,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 63a3e5070..9b0559805 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kguiaddons-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="660bc3ddb7f9c9ddfd042473b4f7783bc603be72a584f2e180f2060cb4ebacd2644e058595474c5a04fe61570cdac54e65335a4e780b0cfeda2015be140a29e1 kguiaddons-5.54.0.tar.xz" +sha512sums="9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00 kguiaddons-5.68.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 1e5023f9c..2db471d89 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kcoreaddons-dev kconfigwidgets-dev kdeclarative-dev kdoctools-dev knewstuff-dev knotifications-dev kxmlgui-dev libkeduvocdocument-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/khangman-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/khangman-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="03aa4e4de1042c433205a51f187f115b3648580e47337ff84cba6de2dffbec0fdb031231b8195330a0b572853b775be78b5cf354ce45a07df70051c7b589de41 khangman-19.08.2.tar.xz" +sha512sums="d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526 khangman-19.12.3.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 8d84d1afb..a332d276c 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev xapian-core-dev libxml2-dev" subpackages="$pkgname-doc $pkgname-lang" install_if="plasma-desktop docs" -source="https://download.kde.org/stable/applications/$pkgver/src/khelpcenter-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/khelpcenter-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="902276720c1b7366fab2cd88091c0baa06a66814a2bcc0360c87a3a2137d65a3482348c351dcc729bdcb674d92351791c9a46bcf36962c52bd190ee1749799f9 khelpcenter-19.08.2.tar.xz" +sha512sums="d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6 khelpcenter-19.12.3.tar.xz" diff --git a/user/khmeros-fonts/APKBUILD b/user/khmeros-fonts/APKBUILD index 4eca9227a..2b2b992aa 100644 --- a/user/khmeros-fonts/APKBUILD +++ b/user/khmeros-fonts/APKBUILD @@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/khmer/All_KhmerOS_$pkgver.zip" builddir="$srcdir/All_KhmerOS_$pkgver" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="5fded88a9149d0fd59a377f08d9e1ea63ecffede58cde42e28504a48b12b35dec699b1ea0e0bbb95465c281d5b19ddfbe808a3c4ef40cd46295aaa069bd9127f All_KhmerOS_5.0.zip" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index 1f19194a9..f3af735bc 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kholidays-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,19 +24,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # Requires *actual* *locale* *support*! CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E testholidayregion } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="709b229c31cb59692d979d8dc36574997e05d674b2cd14913c620a968b243bbcd88f14e9f488f6aec6615102f713c1b4d34f6b817111396cdfedd470d358a675 kholidays-5.54.0.tar.xz" +sha512sums="ad4ab73880862104cc7aa1fff2dd91c5b9fe36f8f8ee0fb1f217a0e159ca4184984767ba5bebbb3ef0bd6a1fd6cbff09a019fe3c26826ab4df5cfabcb80ce9a3 kholidays-5.68.0.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD index 0d53161a8..c171ad246 100644 --- a/user/khotkeys/APKBUILD +++ b/user/khotkeys/APKBUILD @@ -1,21 +1,18 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=khotkeys -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Hot key mapping for KDE Plasma 5" url="https://www.KDE.org/" arch="all" license="LGPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev libx11-dev kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev - kxmlgui-dev libice-dev libx11-dev plasma-framework-dev - plasma-workspace-dev" + kxmlgui-dev libice-dev libkworkspace-dev plasma-framework-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz - cmake-fixes.patch - " +source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -28,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,5 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df60c9d9be901cfeb6cc41e006015b98f373493362c10cf54bc479eb60a3d7ef33aca557497cdae32e351fd413a615620bbc04d53b42bd7ff7de458c36f8c170 khotkeys-5.12.8.tar.xz -1c2558d8b142bc1de236e35b8f55a825f55d4c38c2b5cb2fbf02dcae1128325f45b15246f9c9d874d1afd2a4483df8501877121c6052b6d067892c5fbeca1dc5 cmake-fixes.patch" +sha512sums="874f21eb10f6297c7defef6e646947afbfa8e07b695e734dffcfb36484ecec757f20e5cb1d7c080834d869c71d10d5ce64c9e05b6d5078ce3ed651a0989a2811 khotkeys-5.18.3.tar.xz" diff --git a/user/khotkeys/cmake-fixes.patch b/user/khotkeys/cmake-fixes.patch deleted file mode 100644 index 6f6bfcc5d..000000000 --- a/user/khotkeys/cmake-fixes.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ae5743738245437332b1bb670b9a3f8c429211e2 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Feb 2019 20:26:25 +0100 -Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01. - ---- - CMakeLists.txt | 1 + - config-X11.h.cmake | 2 +- - libkhotkeysprivate/conditions/existing_window_condition.h | 1 - - 3 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a96e3b..0955f4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,6 +37,7 @@ find_package(LibKWorkspace CONFIG REQUIRED) - if(X11_FOUND) - find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras ) - set(HAVE_XTEST ${X11_XTest_FOUND}) -+ set(HAVE_X11 1) - endif() - - configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/libkhotkeysprivate/conditions/existing_window_condition.h b/libkhotkeysprivate/conditions/existing_window_condition.h -index 92815eb..b6a4278 100644 ---- a/libkhotkeysprivate/conditions/existing_window_condition.h -+++ b/libkhotkeysprivate/conditions/existing_window_condition.h -@@ -26,7 +26,6 @@ - - #include <KConfig> // Needed because of some Qt Status redefinitions - #include <KConfigGroup> // Needed because of some Qt Status redefinitions --#include <config-kwindowsystem.h> // Needed for HAVE_X11 - #include <config-X11.h> - #include <kdemacros.h> - --- -cgit v1.1 - diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 981e56cf2..747a25921 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -19,7 +19,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/khtml-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,18 +29,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="622b4c3de23ae3424c9d15651479a7c23fd2011fc81256eba56b9e4b7f7b405b57710903f098475dd46771aaf865b973253a7a16b6074c6aed211c2567d3ff83 khtml-5.54.0.tar.xz" +sha512sums="a306f5da7bf03f77111af4f3e4d4a2b21e483861e7e5d4265941e914f788e58079fce11ab2667bb802d512d7c84fa70653a94a16cdb14221ce1aebbe300ce2ee khtml-5.68.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index e5a5b1f7f..e2cd6c3b9 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -12,12 +12,10 @@ depends="" depends_dev="qt5-qtbase-dev qt5-qtscript-dev qt5-qtdeclarative-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz qt5-qttools-dev" -install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ki18n-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1c974a8445cac7474b989b641b154c131f6231d97979d3c54e04b6182b10f87d3412d9e75503ead09499e83d30e2eafeeff9ddd8683fd2005889e675311a5bb6 ki18n-5.54.0.tar.xz" +sha512sums="2256e06a40761b7f948cd83caf527e8533035afd2ecda266535b67dab9030571154a6eab75744db94da4c13c27bcc67d1d2dcdfb3b9de92e75abcf3f517e52e7 ki18n-5.68.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index e4046ea52..126088b51 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kiconthemes-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a2f053cb2cc1cdab4dc30f42e51431e205a75406079df583c97f2ca39911cc39f9dbb6f56b44138242d7a9e54234dc36280b48859bf3867b805d66da16e4454 kiconthemes-5.54.0.tar.xz" +sha512sums="9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b kiconthemes-5.68.0.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index 062d63afc..f7769d45d 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kidletime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="accb3192afa4a13b0d545442e89d0875c6a056dca53581a41c6a51dfe6d775eaa6d5e7cd6d75407b882c94a52fe1e38cf4f97636745bb6a15a7dc9b00f7f4693 kidletime-5.54.0.tar.xz" +sha512sums="c803de25cf6f26b2d320ec7e35ba598f134e75575dd8f1c06b41461975c99a6b46e7d60bb34b09ed2d799837cf7682bc3d09ba720b2b7dbb1b1bee668fdb1b01 kidletime-5.68.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 7af219b7c..707245af9 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=19.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" -url=" https://www.kde.org/applications/education/kig/" +url="https://www.kde.org/applications/education/kig/" arch="all" license="GPL-2.0+" depends="" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kparts-dev qt5-qtxmlpatterns-dev ki18n-dev ktexteditor-dev kiconthemes-dev kconfigwidgets-dev karchive-dev kxmlgui-dev kcrash-dev kcoreaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kig-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kig-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="643fa3c0a737420ce269f1c191cba75b6f15576c72b43fdabe74d6a2196eeb099071bfa94cf61174e7e41945cd8785c8198aba36cd7878ec9b5b82b3cfcc80f1 kig-19.08.2.tar.xz" +sha512sums="554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109 kig-19.12.3.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index b92e9c234..b458397ef 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev ktextwidgets-dev kxmlgui-dev kio-dev knewstuff-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kigo-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kigo-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="dd7eab7f721646e6324637c19ef504491a34fbda110195c96e5bb7f2c6e357628d695b208d00527abc7d32889e2b84233ff1f586dc657b2dd6c522735c442051 kigo-19.08.2.tar.xz" +sha512sums="ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce kigo-19.12.3.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index f60c0ade6..706c3efe2 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kxmlgui-dev kcompletion-dev kdoctools-dev kdbusaddons-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/killbots-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/killbots-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e2891b1fa00f57bd2fbc2308dd4df7625e43ecbf089644bebf47923c5c8c1cf2aa57ce4b3f584371b4c5f22953f0ba4fb331277a5d9ef2a7df051f7d3f22bc11 killbots-19.08.2.tar.xz" +sha512sums="7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514 killbots-19.12.3.tar.xz" diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index b757698dd..5d4f24b7c 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kinfocenter -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Information about the running computer" -url="https://www.kde.org/applications/system/kinfocenter/" +url="https://userbase.kde.org/KInfoCenter" arch="all" license="GPL-2.0-only" depends="" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kio-dev kdoctools-dev kiconthemes-dev kcmutils-dev kdelibs4support-dev glu-dev kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev - kpackage-dev libraw1394-dev pciutils-dev kwayland-dev" + kpackage-dev libraw1394-dev pciutils-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3c473afa486b80a679d6f78c8000b115b65465b7fc5a6c95af35899f6cb50971422203fc28149b534ad6107e1a78b646b96e60fa5be0182fa5cd0b92a2c6da71 kinfocenter-5.12.8.tar.xz" +sha512sums="e91dc288079dad21191591f14295c8f16c625fa34461690562d8354e82c98824d8d3dbc4c0665a861d9133dc5aa76391cba148dcde4780ead90f02f01f39bace kinfocenter-5.18.3.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 2fa0519a0..b80261ce0 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kinit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,13 +26,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ad7fa0228a4595cce754e65227ab979859827e1773148dd00de95e95ad25d78dae80a4cf04106a1bba5953c6c0acdcaea5e966c83de2f402be33dcc588106ecb kinit-5.54.0.tar.xz" +sha512sums="66d39c7bb330e7237ba4334938451ba5d1faad3f38e1c577036061cd75e2770c858c897317543222b208f8a694e29c30eb142483f4617e30954a34813e941530 kinit-5.68.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index c95ecc194..8fdc83304 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -13,13 +13,15 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev - taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-dev" + taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-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/applications/$pkgver/src/kio-extras-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz + D17205-nfs-tirpc.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,20 +30,19 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DCMAKE_CXX_FLAGS="$CXXFLAGS -I/usr/include/tirpc" \ + -DCMAKE_C_FLAGS="$CFLAGS -I/usr/include/tirpc" \ + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a7a7e9c0ef5e9539b810484027ef7febf81487ea258d5e2e857b2cfa1d59ba1fed52245a0f18fabf9c79c67b3ec3825e32ee1415b818a0ef942067d9516f39fc kio-extras-19.08.2.tar.xz" +sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz +dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch new file mode 100644 index 000000000..b12c0a2c5 --- /dev/null +++ b/user/kio-extras/D17205-nfs-tirpc.patch @@ -0,0 +1,143 @@ +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 b2ae829ce..8f56f536e 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -14,13 +14,12 @@ depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev solid-dev" makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3 qt5-qttools-dev doxygen graphviz karchive-dev kdbusaddons-dev ki18n-dev - knotifications-dev kwallet-dev acl-dev" + knotifications-dev kwallet-dev acl-dev krb5-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz strcpy-ppc.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,19 +31,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d kio-5.54.0.tar.xz -280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch" +sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz +a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kio/strcpy-ppc.patch b/user/kio/strcpy-ppc.patch index 95f2deb9c..119f0a71f 100644 --- a/user/kio/strcpy-ppc.patch +++ b/user/kio/strcpy-ppc.patch @@ -1,10 +1,10 @@ --- kio-5.43.0/src/ioslaves/file/sharefd_p.h.old 2018-03-09 01:13:49.473808589 -0600 +++ kio-5.43.0/src/ioslaves/file/sharefd_p.h 2018-03-09 01:35:33.903523248 -0600 -@@ -21,6 +21,7 @@ +@@ -24,6 +24,7 @@ #include <sys/un.h> #include <iostream> #include <unistd.h> +#include <cstring> #include <sys/socket.h> - - // fix SOCK_NONBLOCK for e.g. macOS + #include <string.h> + #include <stddef.h> diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index c0062c189..4c0ec71dc 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -16,14 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kirigami2-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="c85dbc8790faed84e7b59f703966f4404fe6a7c7d7e83ba4ae6d6469cd01d2a594aa7b5fbda460839df504a23a38b1881748c9a21071cc68de050e3760f25406 kirigami2-5.54.0.tar.xz" +sha512sums="f9f84893dec3298066e7dd3f283a118a488403d23895992875b9229d26d3b3ad14ff14bdd7a5afc79591d96ac431556ea15fcb65dffe23c42a3144f1fbe88f21 kirigami2-5.68.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 1974b3aaa..8c1a5bbc1 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kconfigwidgets-dev kiconthemes-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kiriki-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kiriki-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="042645213bf8fa3e32ea7dca5fbdb3a54663a202ae70131a3f2f75702bdf2a80b09ca1449ac9ac8e4f9200158f465819fc81a4c9d9e1006cda50ac548c28fd63 kiriki-19.08.2.tar.xz" +sha512sums="1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece kiriki-19.12.3.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index f6d21c093..b329016d1 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kitemmodels-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fc2941ef7e48a72a6c08cbbe78b1cf16c4b0e6f06c692386d8ce6ea7ec323b067b051d3489aa8fb0c0f02e5d92a8937f6b5013c04211851f6507da30e5811475 kitemmodels-5.54.0.tar.xz" +sha512sums="dcdb8ad9783f84b8838d7c87516f4813b0a257eca4af83cbb2225d4d5f5d17eb21b25ce35afb7a4e5dc1471f56ffd8e2c5598d797cf21eb4baf613e5b132c421 kitemmodels-5.68.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 43800c932..1c340843c 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kitemviews-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2e664c0a05ae9e52fae93ecb509a64e1996a286c91083aed61f367dc0b4d0d51f2929ba10288be9a08dacae9c3f36953836812ef9097e3dce970830ed22fc794 kitemviews-5.54.0.tar.xz" +sha512sums="59d744473ddb697e89adc54cd74c4b5688b7244b0ddb17bb26cb6bc762faf8b39018b4d4498c89a9c8df05e241d75bffe00d01c02bb0d70a8f9b1f64b7d9c313 kitemviews-5.68.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index c091eb686..ed9df5a20 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev kdoctools-dev khtml-dev knotifications-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kiten-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kiten-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5b897cba7a38e6d18241e1f7e4670500c0f9cd696ebcd8fc584e5456caa168c735011e7de5856e069978d0aecb8c841a02b32a9377e9f4c9f9c4d794a017dd04 kiten-19.08.2.tar.xz" +sha512sums="74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526 kiten-19.12.3.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 1594c3e07..f1d68af28 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kjobwidgets-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2b5eb64557611f400c4d5cc12c5e062a2ea2bd84e17fdceb34c4fa16d746fa04443bde5961f1c01713ca2a61e1b39172723ca58b6c45888d13650ee752be9701 kjobwidgets-5.54.0.tar.xz" +sha512sums="e1db735d465b3df1081bdde0eeefecbe6c86d20e520ef18842375f7c583abdfd8ee9017688de2ec193b220712f4c9742b379492612b55bc3495aea3996fed015 kjobwidgets-5.68.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index 2cf5f49de..ff7755686 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kjs-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="22ad1133cfe8f5186cfdc517a8bf07eba8ac3f19dea62e2f77d1ba9d34d655d26d195d2929a40180d755efcb7814339fb976090373bdc393fbf5ef6cab8d5d32 kjs-5.54.0.tar.xz" +sha512sums="0daf43ef5fb1c50114e3df6cdff19d162fb8d53b13188a201250c3e7fe1e1b72691389ae73ffaa5b2880343492f5f7efdd3f85245673edf2d6cf9b12b34e27f4 kjs-5.68.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 639f955c8..2e3c29afd 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kjsembed-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d6aa8a20eabbb918ead0388be23701cbcbce87eb72a4048064d7f6d1137dc9cd618cb53dd5a756bda0a143ae8423cf9167901a5dbc3acba312d3257e873c4713 kjsembed-5.54.0.tar.xz" +sha512sums="2fcab72f43bf66f69f8b5a2463ca50baaacf239d84f9d99ba75f8e9661b30303cb8e2601d53280b54743436481a32d9294b97d3b4a9eaceb401274d0169bf1c0 kjsembed-5.68.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 505696c59..76e54d98d 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kconfigwidgets-dev kcrash-dev kdbusaddons-dev kio-dev kdoctools-dev ki18n-dev kxmlgui-dev kwidgetsaddons-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kjumpingcube-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kjumpingcube-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f00be92f4a4e4b014962b9b767f2dc174272059db81aa257033424d3150076896a72d9a9260d9f57ed33bad6196413c8e30bc5288d077b1a3337fed1318d1213 kjumpingcube-19.08.2.tar.xz" +sha512sums="e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca kjumpingcube-19.12.3.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index f8ed88504..ecfead943 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -12,12 +12,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev libassuan-dev kitemmodels-dev kmime-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz - qt5.9.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,19 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d2eb5a02e937a93a1c8c20e418203e580f37548e4dcc2ba9519dec244a04f355a32e9daa9acecfc51e6b63f7f1274882a7eb4ac23e6c73f67d5c292d05a50027 kleopatra-19.08.2.tar.xz -4f1330881b582d3b730ee8001eedd6cd18ba14d21d7e80056c8bec1052691f580fd055fa762565449e2c820dbdcd133077ab61f98de8215f88459e32afd609bd qt5.9.patch" +sha512sums="e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a kleopatra-19.12.3.tar.xz" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch deleted file mode 100644 index b6f182029..000000000 --- a/user/kleopatra/qt5.9.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001 -Date: Mon, 17 Dec 2018 08:12:46 +0100 -Subject: Revert "Remove QT_CHECK" - ---- - src/commands/certifycertificatecommand.cpp | 4 ++++ - src/commands/importcertificatescommand.cpp | 4 ++++ - src/dialogs/certificateselectiondialog.cpp | 4 ++++ - 3 files changed, 12 additions(+) - -diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp -index 524b5a6..5577f2f 100644 ---- a/src/commands/certifycertificatecommand.cpp -+++ b/src/commands/certifycertificatecommand.cpp -@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart() - cmd->setParentWidget(d->parentWidgetOrView()); - cmd->setProtocol(GpgME::OpenPGP); - loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); -+#endif - loop.exec(); - } else { - Q_EMIT(canceled()); -diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp -index 49294b6..89542cc 100644 ---- a/src/commands/importcertificatescommand.cpp -+++ b/src/commands/importcertificatescommand.cpp -@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import & - auto cmd = new Commands::CertifyCertificateCommand(key); - cmd->setParentWidget(parentWidgetOrView()); - loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); -+#endif - loop.exec(); - } - return true; -diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp -index 003872e..020310d 100644 ---- a/src/dialogs/certificateselectiondialog.cpp -+++ b/src/dialogs/certificateselectiondialog.cpp -@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i - QItemSelectionModel *const sm = view->selectionModel(); - Q_ASSERT(sm); - sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection); -+#endif - } - - void CertificateSelectionDialog::accept() --- -cgit v1.1 - ---- kleopatra-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:10.000000000 +0000 -+++ kleopatra-19.04.0/CMakeLists.txt 2019-04-19 06:34:58.511578506 +0000 -@@ -11,10 +11,10 @@ - option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF) - - # Standalone build. Find / include everything necessary. --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - set(KMIME_VERSION "5.12.1") - set(LIBKLEO_VERSION "5.12.1") --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - set(GPGME_REQUIRED_VERSION "1.8.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) ---- kleopatra-19.08.0/CMakeLists.txt.old 2019-08-15 15:07:20.717152888 +0000 -+++ kleopatra-19.08.0/CMakeLists.txt 2019-08-15 15:09:48.141370261 +0000 -@@ -143,7 +143,7 @@ - add_subdirectory(tests) - add_subdirectory(autotests) - endif() --install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - if(KF5DocTools_FOUND) - add_subdirectory(doc) diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index 49b6f77f4..eb1357a8c 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev kcompletion-dev kcrash-dev kdoctools-dev kemoticons-dev ki18n-dev knewstuff-dev kwidgetsaddons-dev kconfigwidgets-dev kcoreaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/klettres-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/klettres-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="59325fc8df2d71066980b6a44339311603d70dbb55a104f5e549094d38bac84c6a0e180c34aae426d158258104d35101f835df064556a8fccbb4ff248a3caa87 klettres-19.08.2.tar.xz" +sha512sums="1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3 klettres-19.12.3.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 6df9f2be2..70c9f3b30 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kio-dev kconfig-dev kcrash-dev kwidgetsaddons-dev ki18n-dev kconfigwidgets-dev kxmlgui-dev kdoctools-dev kdbusaddons-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/klickety-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/klickety-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="14a21769140889fd45da420d31867c2723b4218b31325e4830a3226a3316aeb89e47130d7c1cbc643ae4dd125932d00f8b9393abee575dc72e82148fa9ae3808 klickety-19.08.2.tar.xz" +sha512sums="d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0 klickety-19.12.3.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 54bbd9d41..1f0f4c0ff 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kconfig-dev kcrash-dev kwidgetsaddons-dev kdbusaddons-dev ki18n-dev kconfigwidgets-dev kxmlgui-dev kdoctools-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/klines-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/klines-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b1bf8d6960f5a48f687574b10abed362cacfdd4b644f9148e913206a809b4a9215b08bd4492be5df3c5e02d76a0894a5c9290f692f74779c476c5d2862c698cb klines-19.08.2.tar.xz" +sha512sums="2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf klines-19.12.3.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index c98936950..f2637de08 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev kio-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmag-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmag-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb3c7b41244af293f2aa81998e234008e30a20d7182fe235cb5e8bf09f080f1369b0fb1ea9dd6c803caa1c0b6a7bf269eed0cd8587d0fc858d5dc5e03344d9fa kmag-19.08.2.tar.xz" +sha512sums="6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3 kmag-19.12.3.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 06779b2f7..33970e576 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdeclarative-dev kxmlgui-dev kdoctools-dev knewstuff-dev libkdegames-dev libkmahjongg-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmahjongg-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmahjongg-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="be220ff401ea1de3ffd18a9db4e3a40ab1d8cf43e016c8c3891f31dc68ed8bfff0df7c5e5fe580afd0818ad23b1248c971d8fc0f2fa2dd044711a2d73cdb06e6 kmahjongg-19.08.2.tar.xz" +sha512sums="5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5 kmahjongg-19.12.3.tar.xz" diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index d3015d199..4d5566cf1 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kmediaplayer-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,19 +24,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # viewtest requires X11 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E viewtest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c49db70a8bc7a27cb49917eb83fa9e15666d25b5e641babc0af424910c73ae646d63767c5c5bef28db60489bfa52456d736e0d6f0ae04b1fd2a4d8d3027e1ba7 kmediaplayer-5.54.0.tar.xz" +sha512sums="ca3cb02ed23492495d2c5e2f8e75d542daae61542fa9dcc3f632b421be82cf4373d01afcba47512c029f03bb0418c09625da56b7090d84e5d3d763cf650652a6 kmediaplayer-5.68.0.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD index f28736562..1bf3caa0f 100644 --- a/user/kmenuedit/APKBUILD +++ b/user/kmenuedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kmenuedit -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Menu editor for Plasma 5" url="https://www.KDE.org/" @@ -9,7 +9,8 @@ arch="all" license="GPL-2.0+ AND GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev - kiconthemes-dev kio-dev kxmlgui-dev sonnet-dev kdelibs4support-dev" + kiconthemes-dev kglobalaccel-dev kinit-dev kio-dev kitemviews-dev kxmlgui-dev + sonnet-dev kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" @@ -24,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1de4301df485237c0c0c855e7d2f8a4774fb3054ee5c458ea2d58acd2899965cf960a1020e157f394c9a0786e47efb9f0dfa1201718d5ccfbedaeca041974ea2 kmenuedit-5.12.8.tar.xz" +sha512sums="9ff340ea66f0b316412df26de55e86778987a9bb20291246cb8414dc5f6643df693927ac2a765dc3c9e2e5072e3b17e986959859707f09c45156c8cbac173fd5 kmenuedit-5.18.3.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index cdb6ce528..bd4858607 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -12,12 +12,9 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 kcodecs-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz - egregious-versions.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,20 +25,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # https://bugs.kde.org/show_bug.cgi?id=385479 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(headertest|messagetest|dateformattertest)' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2c7b4332197c7fec915cedde4faf2726abd5ca1c0ae9c57642b35807cd9e75f1ef549802a71a6fc22515ab914759f3b01bc88ff964591aceb3c50b39de7b6157 kmime-19.08.2.tar.xz -ae8e5836cefbf19f2aa5c775e3189a24b558840799c93fefc4d3863567d152bd14a2597241fcf0967d134cefedcf2c258f75f3c3bda4ec2cd2623f81a9c37c9f egregious-versions.patch" +sha512sums="ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5 kmime-19.12.3.tar.xz" diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch deleted file mode 100644 index 49b8f8024..000000000 --- a/user/kmime/egregious-versions.patch +++ /dev/null @@ -1,24 +0,0 @@ -There is absolutely NO REQUIREMENT on these newer versions by KMime. - -This is only done to keep in sync with the rest of KDE PIM. - ---- kmime-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:19.000000000 +0000 -+++ kmime-19.04.0/CMakeLists.txt 2019-04-19 06:18:49.665558623 +0000 -@@ -4,7 +4,7 @@ - project(KMime VERSION ${PIM_VERSION}) - - # ECM setup --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) -@@ -22,7 +22,7 @@ - - - set(KMIME_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) - - ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 1a6890eb0..34c37429d 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev ki18n-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmines-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmines-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6bd15215023753cd42abcd9564f71ef98f303c9af80417ff9f18792cc10d70de0f84883538e0b22953e100428b8d6679ee253592ed336bd67caf43af09131138 kmines-19.08.2.tar.xz" +sha512sums="a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b kmines-19.12.3.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 93e04c36f..664764ae1 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev plasma-framework-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev alsa-lib-dev libcanberra-dev pulseaudio-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmix-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmix-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="79e6ffc966faa5586c711a1af094b4cddbc18e99531dd2849c79b7d9fa9a3603dfcedd4c375b60a0af30e33533a4317eb2c3f05dde53e81430ae1fd677d6a82b kmix-19.08.2.tar.xz" +sha512sums="bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 kmix-19.12.3.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 38d9f4cf8..b483246a6 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev kdoctools-dev kiconthemes-dev knotifications-dev kxmlgui-dev phonon-dev libxtst-dev libxt-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmousetool-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmousetool-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a77de3d5a5e5601db7a276e4f14d11ac9d4a63a19231606fafcb959db34ce1d8232b3699dba6749fcf6f7f559f008b43e44e1cecf7746a7764695ec1b482f8ad kmousetool-19.08.2.tar.xz" +sha512sums="bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00 kmousetool-19.12.3.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index d71e58346..71ed030d8 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -10,12 +10,11 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev kguiaddons-dev ki18n-dev kparts-dev kwidgetsaddons-dev kdoctools-dev - kdelibs4support-dev kdbusaddons-dev" + kdbusaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmplot-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmplot-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4f6f9f6d5aa3f995ac5d5b9173c90dc02427bdbcab0b825120d6281e6fadb7c3c3730abc347e882e6a854b462fa4dfdc0f807359310495e2c2bdd3124e59cb40 kmplot-19.08.2.tar.xz" +sha512sums="33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95 kmplot-19.12.3.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index e8a63c611..ca553dc8a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kdbusaddons-dev kdnssd-dev kdoctools-dev ki18n-dev ktextwidgets-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/knavalbattle-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/knavalbattle-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9f438467e138594b2d45e426d7a0295c07dc20508e21f0753b51de5394122dad9832bd47c1faa93b13f2d9d88909e7f46f16a9752fd9c4b8d39d9b9b8e6a754a knavalbattle-19.08.2.tar.xz" +sha512sums="01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100 knavalbattle-19.12.3.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index d3bc4df61..e40238805 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdbusaddons-dev ki18n-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/knetwalk-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/knetwalk-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b19c846f0d2c909f0f84d0bc04c10306761ea202ab24f9f11ddc03daede7dd01f182f25e172043d7e65b43027235b255815f4fb0a6709d1d5aee28657c0047d9 knetwalk-19.08.2.tar.xz" +sha512sums="7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e knetwalk-19.12.3.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index 5ec9d7892..ec88617c9 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,13 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" arch="all" license="LGPL-2.1+" -depends="" +depends="kirigami2" 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 @@ -18,7 +18,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +29,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # kmoretoolstest requires X11. CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'kmoretoolstest' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="96fd8100c78e7d4f9c0ca26ad12587f952455b302ae195184e6fb0ae601b2806668cf2b6dca012e08441622fd72e99c30a52fe901d7af60c4b59701d72b1196a knewstuff-5.54.0.tar.xz" +sha512sums="37e4aabd22eddb1ad216bc07d275006215008845af7979ee5aed9123b7fc2b8742cd07259294876b03c04706a417f1f648f26ef6355f8937d8d9b927e9ce6e5d knewstuff-5.68.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index bbf4a5895..5952a53f6 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -12,12 +12,11 @@ depends="" depends_dev="qt5-qtbase-dev qt5-qtx11extras-dev kwindowsystem-dev kconfig-dev kcodecs-dev kcoreaddons-dev phonon-dev libdbusmenu-qt-dev" makedepends="$depends_dev cmake extra-cmake-modules libx11-dev libxext-dev - libice-dev qt5-qttools-dev doxygen graphviz" + libice-dev qt5-qtspeech-dev qt5-qttools-dev doxygen graphviz" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knotifications-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="66098068d707f4b5b5147b2e02dec7b4a11c95af1dcc02ec933d1b5b63d8dab1e7776a34aae80cfb5671ae7e27cfd50dad5566e26152fb94de076384b77cdcfa knotifications-5.54.0.tar.xz" +sha512sums="301b300a6da4631d49c1e0004938872091c857bfbf312ab85aaa8f0ce3ce28425cbcdfa380a7ed46211d6e95776ea91cf9fd2a5521add05d5956de5e97f3958e knotifications-5.68.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 0ef974619..88bb47763 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -10,16 +10,15 @@ options="!check" # No test suite, despite mentioning testing deps... license="LGPL-2.0-only" depends="" depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz - qt5-qttools-dev kcompletion-dev kconfig-dev ki18n-dev kio-dev - knotifications-dev phonon-dev" checkdepends="kconfigwidgets-dev knotifications-dev kwidgetsaddons-dev kxmlgui-dev" +makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz + qt5-qttools-dev kcompletion-dev kconfig-dev ki18n-dev kio-dev + knotifications-dev phonon-dev qt5-qtspeech-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knotifyconfig-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,12 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f9ae7eab977be273ed12a56e903b324986794d286409aed657af22c09ba7e623f3590779916481a4c80f606abeb9ab37cf544e74a9254290b10b89abb43c7573 knotifyconfig-5.54.0.tar.xz" +sha512sums="de9269b4654fec05b7b87aaf91c35158b9fcc7a9afb18d42f7810c493dfdbe6ff82ed6fa044d369186b8fb087d524d6a5597365c3f967e95d93be54a03b13568 knotifyconfig-5.68.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index c97f10a06..44e8fee1b 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -10,13 +10,12 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev - kdbusaddons-dev kdelibs4support-dev kdoctools-dev ki18n-dev kio-dev - kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" + kdbusaddons-dev kdoctools-dev ki18n-dev kio-dev kwidgetsaddons-dev + kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kolf-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kolf-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="456ac17fb28a4bfbb449f31c2400fcfbac5cd5bf0d3596d359eae69b05c89adab517bd2cbbf83358d529bf228ba217f0d8c6fd3648013762dab9cfca1003ecef kolf-19.08.2.tar.xz" +sha512sums="447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee kolf-19.12.3.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index e0a369a0b..9585e0db6 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kollision-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kollision-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3f53ddda075ccc0afb41d2a85db7fd2192fb6c78703b11ea09969f77c8c860efa45a86aafb870d911fd5d5486af280fa235f9ba204f42539d2bbbe61d7dbe921 kollision-19.08.2.tar.xz" +sha512sums="ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141 kollision-19.12.3.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 88c903bda..0b1c2f4b6 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -12,10 +12,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev libksane-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kolourpaint-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kolourpaint-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="beaf80f8cdc13f23ad19e0832fdb7d95d17fa11a84137e0d2c84c8f5fadd57e4c6cfa03583ebfa52d2c55923dfd9802362f63e04e59829ef205947033b47590f kolourpaint-19.08.2.tar.xz" +sha512sums="8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf kolourpaint-19.12.3.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index 2fecc74f3..d91dd1e03 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev kguiaddons-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/konquest-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/konquest-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bb5e0b6c1b17b64f54aa74907a5a47bd15ddeb0c3c10093db0bc80a014e1bf82d70c455728c66fe0e6b34dc2dc776adb68ef48f6a9ee910b3326da41b16f39e3 konquest-19.08.2.tar.xz" +sha512sums="0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7 konquest-19.12.3.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index f7249a682..5b700fe16 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -16,10 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev python3 kwindowsystem-dev kxmlgui-dev kdbusaddons-dev knewstuff-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/konsole-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,18 +29,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b781e1e6a19b81a49722fa04d568a53dda2c22f72ee197ebf7bacb9142d260ce3071a12cfada905d029dc2ab43a047205175cde5906a4033fb8bdd20876c1af5 konsole-19.08.2.tar.xz" +sha512sums="980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 konsole-19.12.3.tar.xz" diff --git a/user/konversation/APKBUILD b/user/konversation/APKBUILD index dd280d582..36e0efe17 100644 --- a/user/konversation/APKBUILD +++ b/user/konversation/APKBUILD @@ -15,10 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kdbusaddons-dev knotifications-dev kwindowsystem-dev kiconthemes-dev kitemviews-dev phonon-dev qca-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz" +source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz + qt5.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +30,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz" +sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz +a407be142c896eeef3edc4b3b6fa9451341b660c80b300573a2029c6a2b3a4340a2b351ee13e9f0f65aeddf1e47e164faf13d81e626e17093d0ec84f35255b6a qt5.patch" diff --git a/user/konversation/qt5.patch b/user/konversation/qt5.patch new file mode 100644 index 000000000..d9d29bbd1 --- /dev/null +++ b/user/konversation/qt5.patch @@ -0,0 +1,24 @@ +From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame <lbeltrame@kde.org> +Date: Sun, 21 Jul 2019 09:14:32 +0200 +Subject: Fix build with Qt 5.13 + +--- + src/irc/outputfilter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp +index f9e6253..45d11fb 100644 +--- a/src/irc/outputfilter.cpp ++++ b/src/irc/outputfilter.cpp +@@ -32,6 +32,7 @@ + + #include <QStringList> + #include <QFile> ++#include <QMetaMethod> + #include <QRegExp> + #include <QTextCodec> + #include <QByteArray> +-- +cgit v1.1 + diff --git a/user/koruri/APKBUILD b/user/koruri/APKBUILD index 95ba170d1..4f6f28ace 100644 --- a/user/koruri/APKBUILD +++ b/user/koruri/APKBUILD @@ -11,7 +11,7 @@ license="Apache-2.0 AND custom:M+-FONTS" depends="fontconfig" makedepends="" subpackages="" -source="https://mirrors.gigenet.com/OSDN//koruri/70038/Koruri-$pkgver.tar.xz" +source="https://distfiles.adelielinux.org/source/Koruri-$pkgver.tar.xz" builddir="$srcdir/Koruri-$pkgver" package() { diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index fa022f0bb..29ad6f8da 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kpackage-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d26f5dad3634a442d55bae94903ec6d781fa1984a780eec4b1f9ea0f9d3ae50b0defd3ddb078d7b0410626250ded1ee1e5ca1f5ea7ecee1ede4a0ef30463a8c8 kpackage-5.54.0.tar.xz" +sha512sums="b77c8656c34a40962eed49e67a8368dcb43a842ad4009505778fefc90be96de2baed382c693eaf3ebf499b6f9e6117584cea839993e14ba94290a2c4f67f70ef kpackage-5.68.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 090f2c44e..37a314abc 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kparts-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="607a9a89b9d3b4434a46fe84fd13588bb2d99a43b6cc7a85abc1c336613834743f0b6ef832f31126cbf3a0ea6260c8e889927d7cc9d7cb0ad61215d1c6c4e272 kparts-5.54.0.tar.xz" +sha512sums="7fa0575ab194e8921b22f54f80f3aa85aa0ec608364d920e0202295f142ee7919fce0f79e1de840be5cc3fa6a2dc99e47e6cb94d95df5c7f151b76dcb713d20b kparts-5.68.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index ed65a4f5b..7205b2642 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev shared-mime-info freecell-solver-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kpat-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kpat-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4ac8068a5f8eb7385245a9accae9652eb8c0b1919f5b96995968f961288e36dcaff3762cfec3e5a307601e3df0b1d31942881d8d90869a8a930c678593b17107 kpat-19.08.2.tar.xz" +sha512sums="c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7 kpat-19.12.3.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index d6db40186..5ac60fc11 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.54.0 +pkgver=5.68.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" @@ -19,7 +19,6 @@ source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kpeople-$pkgver. " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,19 +30,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8f4709cfb256eb7f836d64ee5dcec9962323a8d2d4b362a01fb140af53b7b16db5dd6bd4c8246af67086bee4e2baa9b40e66e877486900c32eb51cb3483a899c kpeople-5.54.0.tar.xz +sha512sums="9f249fa3cc21a378824d13050919554dec6058277e9c737730bedbc2651d1191833dd7f5ecbfb74158c78808504a300861b5463e23058fef522e1ae3f21aa8e1 kpeople-5.68.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index e47058f3d..efb9b4586 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum -pkgver=5.5 -pkgrel=1 +pkgver=5.6.1 +pkgrel=0 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0 kphotoalbum-5.5.tar.xz" +sha512sums="fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7 kphotoalbum-5.6.1.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 686b891b4..40a274b58 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -16,12 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev qt5-qtspeech-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz - qt5.9.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,19 +29,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ef28ec4732fa1322143ded1f4efa27f15111cef2d038d38454b9cd22d32219f63398d764cf1a7cbd29635e9885c2d16463a5b345c22be3b2ea2937727fbff061 kpimtextedit-19.08.2.tar.xz -3cf800dfc537029588a4701faa2dd1fceb9e0b851c7d7675d468414d45dc2c07aadd4eb687a6b8cfeea4068e1e81b2fe2ad3de7c3c183650d43ab13cf20f4645 qt5.9.patch" +sha512sums="116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a kpimtextedit-19.12.3.tar.xz" diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch deleted file mode 100644 index 6ae06c8a0..000000000 --- a/user/kpimtextedit/qt5.9.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6961b54d1c814f2e7aafd7db8256f82688f014a3 Mon Sep 17 00:00:00 2001 -Date: Mon, 17 Dec 2018 07:23:52 +0100 -Subject: Revert "Remove QT_CHECK" - ---- - .../plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -index 8ce0fe9..c07699c 100644 ---- a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -+++ b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -@@ -144,9 +144,13 @@ void PlainTextSyntaxSpellCheckingHighlighter::highlightBlock(const QString &text - - const auto nextBlock = currentBlock().next(); - if (nextBlock.isValid()) { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(this, [this, nextBlock] { - rehighlightBlock(nextBlock); - }, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(this, "rehighlightBlock", Qt::QueuedConnection, Q_ARG(QTextBlock, nextBlock)); -+#endif - } - } - --- -cgit v1.1 - ---- kpimtextedit-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:22.000000000 +0000 -+++ kpimtextedit-19.04.0/CMakeLists.txt 2019-04-19 06:21:56.055556133 +0000 -@@ -4,7 +4,7 @@ - project(KPimTextEdit VERSION ${PIM_VERSION}) - - # ECM setup --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -@@ -36,7 +36,7 @@ - SOVERSION 5 - ) - --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets) - find_package(Grantlee5 "5.1" CONFIG REQUIRED) - set_package_properties(Grantlee5 PROPERTIES ---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:58:32.623688389 +0000 -+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 14:59:20.798530990 +0000 -@@ -114,7 +114,7 @@ - COMPONENT Devel - ) - --install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:59:35.306977776 +0000 -+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 15:00:30.421077488 +0000 -@@ -68,7 +68,6 @@ - add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\") - - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) --add_definitions(-DQT_NO_FOREACH) - - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech) - diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 89f78f698..1661cf6f1 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kplotting-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="85cec93bd25a673bcaed993c9130529c1f16e726b3c40f84395f1c2e4810b85503dc3f015ef5cdc1289b793cc19abd956d54a61c2f8e1626ab73b9112107b61d kplotting-5.54.0.tar.xz" +sha512sums="f4b5158afc2eb4d38278618a475dbc26482682cc77d7ae0e3bb799b25a43f156946791156f73a1fd030b7602fb691364e491bef4686d36bc4f955ac2b8033e1b kplotting-5.68.0.tar.xz" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD index a6fef6476..ea16d434f 100644 --- a/user/kpmcore/APKBUILD +++ b/user/kpmcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpmcore -pkgver=3.3.0 +pkgver=4.1.0 pkgrel=0 pkgdesc="Core routines for KDE Partition Manager" url="https://www.kde.org/applications/system/partitionmanager" @@ -10,12 +10,11 @@ license="LGPL-2.1+" depends="" depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev - kwidgetsaddons-dev util-linux-dev" + kwidgetsaddons-dev util-linux-dev kauth-dev qca-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e kpmcore-3.3.0.tar.xz" +sha512sums="c45b31a41c62a68aee991be0f7954f4bd2136660578cc60f7fa6f05e56716458421e16cd314b3b9a14b56fdc9377db511c1645e5c41f0446d86a8ac5bb66c273 kpmcore-4.1.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index 51989384f..e71c433e1 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,13 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" arch="all" license="LGPL-2.1-only GPL-2.0+" -depends="" +depends="libutempter" depends_dev="qt5-qtbase-dev kcoreaddons-dev ki18n-dev libutempter-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kpty-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ -DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1eb83b3034d950a7561a043f68eea17322f6547a19f399bd500c9ce28bdf02b86d60ed6b4aa976ae4b75cb674ebaa3e4c9c1642601d4470b884ba4ca0ba249c6 kpty-5.54.0.tar.xz" +sha512sums="9ea1452994e66d92a99595f4cbf53f94abe3af4d35f7adb57deb1a2ae7ab6d95524a7e8bd82af90ca7ade39644f6af9002ebbfee751a0395a705e38b1e8b4e23 kpty-5.68.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD new file mode 100644 index 000000000..7adaa073f --- /dev/null +++ b/user/kquickcharts/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kquickcharts +pkgver=5.68.0 +pkgrel=0 +pkgdesc="A QtQuick plugin providing high-performance charts" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11 +license="LGPL-2.1+" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev cmake + extra-cmake-modules" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kquickcharts-$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="90d50f5aa211d97656e3b8c1dcc0c069675e432ebaf0c33b0fa956e69319d670feaaedd38d24e587f3188b8cf8816d1d0fbdb33010447b3c4c1175ab9062f5c7 kquickcharts-5.68.0.tar.xz" diff --git a/user/krb5-conf/APKBUILD b/user/krb5-conf/APKBUILD index 7d9b6b91c..1597688a6 100644 --- a/user/krb5-conf/APKBUILD +++ b/user/krb5-conf/APKBUILD @@ -14,8 +14,6 @@ options="!check" # Single config file. license="MIT" depends="" makedepends="" -install="" -subpackages="" source="" replaces="heimdal krb5-libs" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 37b1ba618..603f52565 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev libvncserver-dev $depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/krdc-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="45ce82235899e6b090fa3c2d015dfd9e80c436317fe3f288276dabad7568ec3caaba7225e2641dbc8084e71e31ee4a633cc91e6bc5dd9d91676fd4f5f7bc9db3 krdc-19.08.2.tar.xz" +sha512sums="f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 krdc-19.12.3.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 422e37922..b2e8a65a9 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdbusaddons-dev kdeclarative-dev ki18n-dev kiconthemes-dev kio-dev kxmlgui-dev kwidgetsaddons-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kreversi-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kreversi-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c32bc80bc05133cbf10c59cba7d661ecdf25d5119857219ff72f3f0e583e1c96995e42256aa784fbe26bb34f060c1782edc8d8071451e9a827ea71cdf19512a5 kreversi-19.08.2.tar.xz" +sha512sums="244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0 kreversi-19.12.3.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 0c447fa07..1c606cb71 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -13,10 +13,9 @@ makedepends="cmake qt5-qtbase-dev qt5-qtx11extras-dev extra-cmake-modules kdbusaddons-dev kdnssd-dev kdoctools-dev knotifications-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev xcb-util-image-dev libvncserver-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/krfb-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/krfb-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="dc1842ce4f3641d29e879f510f42a0fff1b83d2be18fa396fae113f0a3321195b56da2df32102dedaf5588eb57814d8d532a3a15ced889239c667d2220a32f82 krfb-19.08.2.tar.xz" +sha512sums="d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36 krfb-19.12.3.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 448b4561c..0150420b8 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.7.1 +pkgver=4.2.8.2 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -15,9 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev libxcb-dev fftw-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev - libraw-dev quazip-dev" + libraw-dev quazip-dev giflib-dev poppler-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/4.2.7/krita-$pkgver.tar.gz" +source="https://download.kde.org/stable/krita/4.2.8/krita-$pkgver.tar.gz + fix-nullptr-deref.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,12 +40,12 @@ build() { } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="e1ce1eb9e38d4dc9de3fb6d48a6b5364dad8da1782f3e5780949bed4d819ad1c70be62d5d61748bec04e18c7b46279d393e976e8f8209f35587eacd96b1a84ef krita-4.2.7.1.tar.gz" +sha512sums="aab4096bef81a7205a04e3a4080d95ccbd1ba84a0cdb959fca8a0e6e7e8183f79857bde0b301dd9db642bd71042ef43b99768dbb7cd91d32e93df3da391d1a4b krita-4.2.8.2.tar.gz +fd43f21da937c29f550e24d459e83ad9714befe82fe0cae493b28cad6526b11f80a5e3d350be1fa910a62c07284774a6f5fac4bbf4801be378987fbfaef61254 fix-nullptr-deref.patch" diff --git a/user/krita/fix-nullptr-deref.patch b/user/krita/fix-nullptr-deref.patch new file mode 100644 index 000000000..07c1536a0 --- /dev/null +++ b/user/krita/fix-nullptr-deref.patch @@ -0,0 +1,73 @@ +From 97c03e0f3314dae5520deb901dda73d1cf8df201 Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" <lamarque@kde.org> +Date: Sat, 30 Nov 2019 20:12:21 -0300 +Subject: [PATCH] Fix crash when starting Krita with Qt compiled in debug mode. + +This is the backtrace: + +0 0x00007ffff38a11cc in KoColorSet::getGroup(QString const&) () from +/usr/lib64/libkritapigment.so.18 +1 0x00007ffff3d2aa69 in KisPaletteModel::index(int, int, QModelIndex +const&) const () from /usr/lib64/libkritawidgets.so.18 +2 0x00007ffff5812796 in +QAbstractItemView::setModel(QAbstractItemModel*) () from +/usr/lib64/libQt5Widgets.so.5 +3 0x00007ffff582e749 in QHeaderView::setModel(QAbstractItemModel*) () +from /usr/lib64/libQt5Widgets.so.5 +4 0x00007ffff5871493 in QTableView::setModel(QAbstractItemModel*) () +from /usr/lib64/libQt5Widgets.so.5 +5 0x00007ffff3d31e17 in +KisPaletteView::setPaletteModel(KisPaletteModel*) () from +/usr/lib64/libkritawidgets.so.18 +6 0x00007ffff3d2691e in +KisDlgInternalColorSelector::KisDlgInternalColorSelector(QWidget*, +KoColor, KisDlgInternalColorSelector::Config, QString const&, +KoColorDisplayRendererInterface const*) () from +/usr/lib64/libkritawidgets.so.18 +7 0x00007ffff7000d67 in +KoDualColorButton::Private::init(KoDualColorButton*) () from +/usr/lib64/libkritaui.so.18 +8 0x00007ffff7002c5b in KoDualColorButton::KoDualColorButton(KoColor +const&, KoColor const&, KoColorDisplayRendererInterface const*, +QWidget*, QWidget*) () + from /usr/lib64/libkritaui.so.18 +9 0x00007ffff6e2b5b5 in KisControlFrame::setup(QWidget*) () from +/usr/lib64/libkritaui.so.18 +10 0x00007ffff71014ea in KisViewManager::KisViewManager(QWidget*, +KActionCollection*) () from /usr/lib64/libkritaui.so.18 +11 0x00007ffff70cb72b in KisMainWindow::KisMainWindow(QUuid) () from +/usr/lib64/libkritaui.so.18 +12 0x00007ffff70d8352 in KisPart::createMainWindow(QUuid) () from +/usr/lib64/libkritaui.so.18 +13 0x00007ffff70d85de in KisPart::startBlankSession() () from +/usr/lib64/libkritaui.so.18 +14 0x00007ffff70995b9 in KisApplication::start(KisApplicationArguments +const&) () from /usr/lib64/libkritaui.so.18 +15 0x0000555555e4e229 in main () + +The KisPaletteModel::index() call is inside an Q_ASSERT_X in +QAbstractItemView::setModel(), so you have to compile Qt in debug mode +to reproduce this crash. + +m_rowGroupNameMap is empty during the startup. +--- + libs/widgets/KisPaletteModel.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libs/widgets/KisPaletteModel.cpp b/libs/widgets/KisPaletteModel.cpp +index f1c4e71f8b..464c7f0dba 100644 +--- a/libs/widgets/KisPaletteModel.cpp ++++ b/libs/widgets/KisPaletteModel.cpp +@@ -94,6 +94,9 @@ QModelIndex KisPaletteModel::index(int row, int column, const QModelIndex& paren + Q_UNUSED(parent); + Q_ASSERT(m_colorSet); + int groupNameRow = groupNameRowForRow(row); ++ if (groupNameRow == -1) { ++ return {}; ++ } + KisSwatchGroup *group = m_colorSet->getGroup(m_rowGroupNameMap[groupNameRow]); + Q_ASSERT(group); + return createIndex(row, column, group); +-- +2.24.1 + diff --git a/user/kronometer/APKBUILD b/user/kronometer/APKBUILD index 37905401a..e06dcb3e8 100644 --- a/user/kronometer/APKBUILD +++ b/user/kronometer/APKBUILD @@ -25,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index d67379691..f9aa5ceca 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kross-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="eefae897541d4d6c9b1920452a2172c390328a1ecc5a9cf765b8a46f07b8bcf5563727957ed6e3e0da243c4b6550e2aaef78b705af3035be8b6e2d73e193f11b kross-5.54.0.tar.xz" +sha512sums="3e610248a2f6328b805d59fe8007bba02bd7af02edc93756626f5b3449a494207ed73c27ff504b85aa2d03c70f1a78b8a60289f39cdd6afdfe53c5386e429f23 kross-5.68.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index e0faebf2b..b87df305b 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev knotifications-dev kwindowsystem-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kruler-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kruler-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="88d45697d29a887b32a98a577fd438cdc2f73c23483522de3e3ee0ac9ee88977548ee423db827f94d69588ed929e54e1eee073f6a98045e7cabadd9323d740ab kruler-19.08.2.tar.xz" +sha512sums="34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0 kruler-19.12.3.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 9439e4eb9..9d291a1f2 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/krunner-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1ed1590424736d0d38249740435e6a1e289089bdb650b5fc7eaff05c86e296b372a1dc7833f7fbaa8dcf1ca33653d6ff1241929abf8795f87e73ab85ac6299b1 krunner-5.54.0.tar.xz" +sha512sums="0f3c7bb4afbd1b30405d9ab5265804b62e2928249d4334bbbcd1094cf28c8d9c587995182008f0c8fb4eab8a7a0ace5a18b9aa518139481b786cd54e5f081b47 krunner-5.68.0.tar.xz" diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index d518e2996..6ca2b9d4b 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,4 +41,4 @@ package() { } sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz -6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" +2114547837002e76fea1ed68bd47c8db216a7ba292817b2448497c45e8693441750a5e06ce24de188d0f04dc9c765c2cb5b83b04488a0a5247a481084f6091c0 posix-headers.patch" diff --git a/user/krusader/posix-headers.patch b/user/krusader/posix-headers.patch index c52d63656..898c514e7 100644 --- a/user/krusader/posix-headers.patch +++ b/user/krusader/posix-headers.patch @@ -1,6 +1,6 @@ --- krusader-2.6.0/krusader/FileSystem/krpermhandler.h.old 2017-04-11 12:32:08.000000000 -0500 +++ krusader-2.6.0/krusader/FileSystem/krpermhandler.h 2017-10-12 18:55:51.447922274 -0500 -@@ -39,6 +39,7 @@ +@@ -30,6 +30,7 @@ #include <KIO/Global> @@ -10,7 +10,7 @@ #include <unistd.h> --- krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h.old 2017-04-11 12:32:08.000000000 -0500 +++ krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h 2017-10-12 18:56:22.954502133 -0500 -@@ -23,6 +23,7 @@ +@@ -25,6 +25,7 @@ #include <KIO/Global> diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index e566e197e..103148ffc 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,24 +1,26 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 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="linux-pam" +depends="consolekit2 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" + ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev + consolekit2-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz kde.pam - kde-np.pam" + kde-np.pam + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -31,7 +33,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -45,6 +47,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="d389991d1af70c588c6918305649c6a5616a617fb7f010d7d5b3dfb5b97ec878069deef69676dbd8ac97a4f46b97c1a78b8b32980cafb49294e83021acd4c8f7 kscreenlocker-5.12.8.tar.xz +sha512sums="bb7fbf9c42a4fbe970c4953b0a64d95d45c5c1519db21e80907a95d2415b68b8c135f1f0368b9663bd4162cbbe507688f72293f4c7f0c9ed60cc7c222c31b098 kscreenlocker-5.18.3.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/kscreenlocker/optional-wayland.patch b/user/kscreenlocker/optional-wayland.patch new file mode 100644 index 000000000..eee3cb10e --- /dev/null +++ b/user/kscreenlocker/optional-wayland.patch @@ -0,0 +1,448 @@ +--- kscreenlocker-5.12.9/CMakeLists.txt.old 2019-09-10 10:30:52.000000000 +0000 ++++ kscreenlocker-5.12.9/CMakeLists.txt 2019-12-29 16:39:31.945860585 +0000 +@@ -73,16 +73,16 @@ + + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) + +-find_package(KF5Wayland CONFIG REQUIRED) ++find_package(KF5Wayland) + set_package_properties(KF5Wayland PROPERTIES +- TYPE REQUIRED +- PURPOSE "Required for building screenlocker") ++ TYPE OPTIONAL ++ PURPOSE "Required for building Wayland screenlocker") + find_package(WaylandScanner) + find_package(Wayland 1.3 COMPONENTS Client Server) + + set_package_properties(Wayland PROPERTIES +- TYPE REQUIRED +- PURPOSE "Required for building screenlocker") ++ TYPE OPTIONAL ++ PURPOSE "Required for building Wayland screenlocker") + + find_package(loginctl) + set_package_properties(loginctl PROPERTIES +@@ -138,9 +138,7 @@ + interface.cpp + globalaccel.cpp + x11locker.cpp +- waylandlocker.cpp + logind.cpp +- waylandserver.cpp + powermanagement.cpp + powermanagement_inhibition.cpp + ) +@@ -149,10 +147,20 @@ + kconfig_add_kcfg_files(ksld_SRCS kcfg/kscreensaversettings.kcfgc) + qt5_add_dbus_interface(ksld_SRCS ${powerdevilpolicyagent_xml} powerdevilpolicyagent) + ++if(KF5Wayland_FOUND) ++list(APPEND ksld_SRCS ++ waylandlocker.cpp ++ waylandserver.cpp ++) + ecm_add_wayland_server_protocol(ksld_SRCS + PROTOCOL protocols/ksld.xml + BASENAME ksld + ) ++set(OPT_WL_LIBRARIES ++ KF5::WaylandServer ++ Wayland::Server ++) ++endif(KF5Wayland_FOUND) + + add_library(KScreenLocker SHARED ${ksld_SRCS}) + +@@ -171,8 +179,7 @@ + ${X11_LIBRARIES} + XCB::XCB + XCB::KEYSYMS +- KF5::WaylandServer +- Wayland::Server ++ ${OPT_WL_LIBRARIES} + ) + + if (X11_Xinput_FOUND) +--- kscreenlocker-5.12.9/ksldapp.cpp.old 2019-09-10 10:30:16.000000000 +0000 ++++ kscreenlocker-5.12.9/ksldapp.cpp 2019-12-29 17:00:37.930322855 +0000 +@@ -38,9 +38,11 @@ + #include <KNotification> + #include <KGlobalAccel> + ++#ifdef WAYLAND_FOUND + //kwayland + #include <KWayland/Server/display.h> + #include <KWayland/Server/clientconnection.h> ++#endif + + // Qt + #include <QAction> +@@ -84,8 +86,10 @@ + , m_lockState(Unlocked) + , m_lockProcess(NULL) + , m_lockWindow(NULL) ++#ifdef WAYLAND_FOUND + , m_waylandServer(new WaylandServer(this)) + , m_waylandDisplay(nullptr) ++#endif /* WAYLAND_FOUND */ + , m_lockedTimer(QElapsedTimer()) + , m_idleId(0) + , m_lockGrace(0) +@@ -96,8 +100,12 @@ + , m_greeterEnv(QProcessEnvironment::systemEnvironment()) + , m_powerManagementInhibition(new PowerManagementInhibition(this)) + { ++#ifdef WAYLAND_FOUND + m_isX11 = QX11Info::isPlatformX11(); + m_isWayland = QCoreApplication::instance()->property("platformName").toString().startsWith( QLatin1String("wayland"), Qt::CaseInsensitive); ++#else ++ m_isX11 = true; ++#endif + } + + KSldApp::~KSldApp() +@@ -215,9 +223,11 @@ + auto finishedSignal = static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished); + connect(m_lockProcess, finishedSignal, this, + [this](int exitCode, QProcess::ExitStatus exitStatus) { ++#ifdef WAYLAND_FOUND + if (m_isWayland && m_waylandDisplay && m_greeterClientConnection) { + m_greeterClientConnection->destroy(); + } ++#endif /* WAYLAND_FOUND */ + if ((!exitCode && exitStatus == QProcess::NormalExit) || s_graceTimeKill || s_logindExit) { + // unlock process finished successfully - we can remove the lock grab + s_graceTimeKill = false; +@@ -240,7 +250,9 @@ + [this](QProcess::ProcessError error) { + if (error == QProcess::FailedToStart) { + doUnlock(); ++#ifdef WAYLAND_FOUND + m_waylandServer->stop(); ++#endif /* WAYLAND_FOUND */ + qCritical() << "Greeter Process not available"; + } + } +@@ -533,7 +545,9 @@ + m_lockedTimer.invalidate(); + m_greeterCrashedCounter = 0; + endGraceTime(); ++#ifdef WAYLAND_FOUND + m_waylandServer->stop(); ++#endif /* WAYLAND_FOUND */ + KNotification::event(QStringLiteral("unlocked"), + i18n("Screen unlocked"), + QPixmap(), +@@ -553,6 +567,7 @@ + { + QProcessEnvironment env = m_greeterEnv; + ++#ifdef WAYLAND_FOUND + if (m_isWayland && m_waylandDisplay) { + int sx[2]; + if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) { +@@ -576,6 +591,7 @@ + env.insert("WAYLAND_SOCKET", QByteArray::number(socket)); + } + } ++#endif /* WAYLAND_FOUND */ + QStringList args; + if (establishLock == EstablishLock::Immediate) { + args << QStringLiteral("--immediateLock"); +@@ -596,6 +612,7 @@ + env.insert(s_qtQuickBackend, QStringLiteral("software")); + } + ++#ifdef WAYLAND_FOUND + // start the Wayland server + int fd = m_waylandServer->start(); + if (fd == -1) { +@@ -605,10 +622,13 @@ + + args << QStringLiteral("--ksldfd"); + args << QString::number(fd); ++#endif /* WAYLAND_FOUND */ + + m_lockProcess->setProcessEnvironment(env); + m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args); ++#ifdef WAYLAND_FOUND + close(fd); ++#endif + } + + void KSldApp::showLockWindow() +@@ -617,9 +637,11 @@ + if (m_isX11) { + m_lockWindow = new X11Locker(this); + } ++#ifdef WAYLAND_FOUND + if (m_isWayland) { + m_lockWindow = new WaylandLocker(m_waylandDisplay, this); + } ++#endif /* WAYLAND_FOUND */ + if (!m_lockWindow) { + return; + } +@@ -637,7 +659,9 @@ + lockScreenShown(); + } + , Qt::QueuedConnection); ++#ifdef WAYLAND_FOUND + connect(m_waylandServer, &WaylandServer::x11WindowAdded, m_lockWindow, &AbstractLocker::addAllowedWindow); ++#endif /* WAYLAND_FOUND */ + } + m_lockWindow->showLockWindow(); + if (m_isX11) { +@@ -702,12 +726,14 @@ + } + } + ++#ifdef WAYLAND_FOUND + void KSldApp::setWaylandDisplay(KWayland::Server::Display *display) + { + if (m_waylandDisplay != display) { + m_waylandDisplay = display; + } + } ++#endif /* WAYLAND_FOUND */ + + void KSldApp::lockScreenShown() + { +@@ -723,9 +749,11 @@ + void KSldApp::setGreeterEnvironment(const QProcessEnvironment &env) + { + m_greeterEnv = env; ++#ifdef WAYLAND_FOUND + if (m_isWayland) { + m_greeterEnv.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland")); + } ++#endif /* WAYLAND_FOUND */ + } + + bool KSldApp::event(QEvent *event) +--- kscreenlocker-5.12.9/autotests/CMakeLists.txt.old 2019-09-10 10:30:16.000000000 +0000 ++++ kscreenlocker-5.12.9/autotests/CMakeLists.txt 2019-12-29 17:16:10.540254516 +0000 +@@ -55,6 +55,7 @@ + add_test(ksmserver-x11LockerTest x11LockerTest) + ecm_mark_as_test(x11LockerTest) + ++if(KF5Wayland_FOUND) + ####################################### + # NoScreensTest + ####################################### +@@ -67,3 +68,4 @@ + ) + add_test(ksld-noScreensTest noScreensTest) + ecm_mark_as_test(noScreensTest) ++endif() +--- kscreenlocker-5.12.9/greeter/greeterapp.cpp.old 2019-09-10 10:30:16.000000000 +0000 ++++ kscreenlocker-5.12.9/greeter/greeterapp.cpp 2019-12-29 17:14:57.458241696 +0000 +@@ -26,6 +26,7 @@ + #include "lnf_integration.h" + + #include <config-kscreenlocker.h> ++#include <config-workspace.h> + + // KDE + #include <KAuthorized> +@@ -40,12 +41,14 @@ + #include <KPackage/Package> + #include <KPackage/PackageStructure> + #include <KPackage/PackageLoader> ++#ifdef WAYLAND_FOUND + // KWayland + #include <KWayland/Client/connection_thread.h> + #include <KWayland/Client/event_queue.h> + #include <KWayland/Client/plasmashell.h> + #include <KWayland/Client/registry.h> + #include <KWayland/Client/surface.h> ++#endif + // Qt + #include <QClipboard> + #include <QAbstractNativeEventFilter> +@@ -63,9 +66,11 @@ + #include <QQmlExpression> + + #include <QX11Info> ++#ifdef WAYLAND_FOUND + // Wayland + #include <wayland-client.h> + #include <wayland-ksld-client-protocol.h> ++#endif + // X11 + #include <X11/Xatom.h> + #include <X11/Xlib.h> +@@ -137,6 +142,7 @@ + } + qDeleteAll(m_views); + ++#ifdef WAYLAND_FOUND + if (m_ksldInterface) { + org_kde_ksld_destroy(m_ksldInterface); + } +@@ -148,6 +154,7 @@ + m_ksldConnectionThread->quit(); + m_ksldConnectionThread->wait(); + } ++#endif /* WAYLAND_FOUND */ + } + + Authenticator *UnlockApp::createAuthenticator() +@@ -165,7 +172,10 @@ + + void UnlockApp::initialize() + { ++#ifdef WAYLAND_FOUND + initializeWayland(); ++#endif /* WAYLAND_FOUND */ ++ + // set up the request ignore timeout, so that multiple requests to sleep/suspend/shutdown + // are not processed in quick (and confusing) succession) + m_resetRequestIgnoreTimer->setSingleShot(true); +@@ -205,6 +215,7 @@ + if (!platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { + return; + } ++#ifdef WAYLAND_FOUND + using namespace KWayland::Client; + auto *c = ConnectionThread::fromApplication(this); + if (!c) { +@@ -219,6 +230,7 @@ + return; + } + m_plasmaShell = r->createPlasmaShell(i.name, i.version, this); ++#endif /* WAYLAND_FOUND */ + } + + void UnlockApp::loadWallpaperPlugin(KQuickAddons::QuickViewSharedEngine *view) +@@ -281,6 +293,7 @@ + } + } + ++#ifdef WAYLAND_FOUND + if (m_ksldInterface) { + view->create(); + org_kde_ksld_x11window(m_ksldInterface, view->winId()); +@@ -294,6 +307,7 @@ + view->setProperty("plasmaShellSurface", QVariant::fromValue(shellSurface)); + } + } ++#endif /* WAYLAND_FOUND */ + + // engine stuff + QQmlContext* context = view->engine()->rootContext(); +@@ -353,10 +367,14 @@ + + auto screen = QGuiApplication::screens()[i]; + view->setGeometry(screen->geometry()); ++#ifdef WAYLAND_FOUND + KWayland::Client::PlasmaShellSurface *plasmaSurface = view->property("plasmaShellSurface").value<KWayland::Client::PlasmaShellSurface *>(); + if (plasmaSurface) { + plasmaSurface->setPosition(view->geometry().topLeft()); + } ++#else ++ void *plasmaSurface = nullptr; ++#endif /* WAYLAND_FOUND */ + if (auto object = view->property("wallpaperGraphicsObject").value<KDeclarative::QmlObjectSharedEngine*>()) { + //initialize with our size to avoid as much resize events as possible + object->completeInitialization({ +@@ -370,9 +388,11 @@ + view, + [view, plasmaSurface](const QRect &geo) { + view->setGeometry(geo); ++#ifdef WAYLAND_FOUND + if (plasmaSurface) { + plasmaSurface->setPosition(view->geometry().topLeft()); + } ++#endif /* WAYLAND_FOUND */ + } + ); + +@@ -477,6 +497,7 @@ + + void UnlockApp::suspendToRam() + { ++#ifdef WAYLAND_FOUND + if (m_ignoreRequests) { + return; + } +@@ -485,11 +506,12 @@ + m_resetRequestIgnoreTimer->start(); + + org_kde_ksld_suspendSystem(m_ksldInterface); +- ++#endif /* WAYLAND_FOUND */ + } + + void UnlockApp::suspendToDisk() + { ++#ifdef WAYLAND_FOUND + if (m_ignoreRequests) { + return; + } +@@ -498,6 +520,7 @@ + m_resetRequestIgnoreTimer->start(); + + org_kde_ksld_hibernateSystem(m_ksldInterface); ++#endif /* WAYLAND_FOUND */ + } + + void UnlockApp::setTesting(bool enable) +@@ -626,7 +649,7 @@ + m_defaultToSwitchUser = defaultToSwitchUser; + } + +- ++#ifdef WAYLAND_FOUND + static void osdProgress(void *data, org_kde_ksld *org_kde_ksld, const char *icon, int32_t percent, const char *text) + { + Q_UNUSED(org_kde_ksld) +@@ -657,9 +680,11 @@ + canSuspend, + canHibernate + }; ++#endif /* WAYLAND_FOUND */ + + void UnlockApp::setKsldSocket(int socket) + { ++#ifdef WAYLAND_FOUND + using namespace KWayland::Client; + m_ksldConnection = new ConnectionThread; + m_ksldConnection->setSocketFd(socket); +@@ -697,6 +722,7 @@ + m_ksldConnection->moveToThread(m_ksldConnectionThread); + m_ksldConnectionThread->start(); + m_ksldConnection->initConnection(); ++#endif /* WAYLAND_FOUND */ + } + + void UnlockApp::osdProgress(const QString &icon, int percent, const QString &additionalText) +--- kscreenlocker-5.12.9/greeter/CMakeLists.txt.old 2019-09-10 10:30:16.000000000 +0000 ++++ kscreenlocker-5.12.9/greeter/CMakeLists.txt 2019-12-29 17:29:44.832222068 +0000 +@@ -24,10 +24,16 @@ + qt5_add_resources(kscreenlocker_greet_SRCS fallbacktheme.qrc) + kconfig_add_kcfg_files(kscreenlocker_greet_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../kcfg/kscreensaversettings.kcfgc) + ++if(KF5Wayland_FOUND) + ecm_add_wayland_client_protocol(kscreenlocker_greet_SRCS + PROTOCOL ../protocols/ksld.xml + BASENAME ksld + ) ++set(OPT_WL_CLI_LIBRARIES ++ KF5::WaylandClient ++ Wayland::Client ++) ++endif() + + add_executable(kscreenlocker_greet ${kscreenlocker_greet_SRCS}) + +@@ -43,8 +49,7 @@ + Qt5::Qml + Qt5::X11Extras + ${X11_LIBRARIES} +- KF5::WaylandClient +- Wayland::Client ++ ${OPT_WL_CLI_LIBRARIES} + ) + if(HAVE_SECCOMP) + target_link_libraries(kscreenlocker_greet Qt5::DBus Seccomp::Seccomp) diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index 90d2b321a..d8a092326 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -16,13 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kservice-$pkgver.tar.xz" -prepare() { - cd "$builddir" - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -36,13 +30,12 @@ build() { -DBUILD_TESTING=OFF \ -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="df64846676aa7877a34d245adb612b938eaa220e30f58ae9ea7800e97e1278f83b6777a8e65a3841535b450145dce194c45c5d3fad1c366d334f4cdfe8058475 kservice-5.54.0.tar.xz" +sha512sums="3581b7ec51317a0b2b63fac7e0491e89da8ba03cd90ba0ef745fc84792af4cd247c80eeec0396069a26f8bc73b971f8444e80ac7749d05b379c29138df6725ec kservice-5.68.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index b34334731..9015a6e74 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kdoctools-dev kdbusaddons-dev kcrash-dev kxmlgui-dev libkdegames-dev libkmahjongg-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kshisen-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kshisen-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9445b2cc87c483332fbce5f08235185c5f5db34a9ad7e1d30e7c770cad0ba77995b9c967725713e8ce1a8d32db856ac727ca96c171726d44b3d85fa10b1e60bb kshisen-19.08.2.tar.xz" +sha512sums="32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb kshisen-19.12.3.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index b45542d0e..0319102ea 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev knewstuff-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev phonon-dev qca-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksirk-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksirk-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0ea7566e2de52424e568bba254e4380ce64b943fe212f7a877dc054ac871ff0daef8a9d592bd69fef140e2aacbc07c36244f83bde99b5da636452bf8ac3694c6 ksirk-19.08.2.tar.xz" +sha512sums="105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb ksirk-19.12.3.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 4c53a9c91..c8340b11f 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdbusaddons-dev kguiaddons-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksnakeduel-$pkgver.tar.xz - ridiculous-qt.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/ksnakeduel-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -28,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,5 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed410956fd369e5e2a170ba1e9fabc952f7d50ff5d1053cf570d39ce14d356e3da946b975ff3761f54ec50f47de049c48b9fc990795ab92a0f6f32b98a6b0d6e ksnakeduel-19.08.2.tar.xz -8f21639ca5b17f6b0bd5d76c65fb59e29c9e8b6cceb95d2c86795b9f20d6d282926c75e0eaba2b1878a0bd9698c1d7326b549e4a2f8c7802254a1d516672fcbb ridiculous-qt.patch" +sha512sums="d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6 ksnakeduel-19.12.3.tar.xz" diff --git a/user/ksnakeduel/ridiculous-qt.patch b/user/ksnakeduel/ridiculous-qt.patch deleted file mode 100644 index 14cc95264..000000000 --- a/user/ksnakeduel/ridiculous-qt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ksnakeduel-19.08.0/CMakeLists.txt.old 2019-08-09 00:30:10.000000000 +0000 -+++ ksnakeduel-19.08.0/CMakeLists.txt 2019-08-15 13:12:41.473994535 +0000 -@@ -1,7 +1,7 @@ - cmake_minimum_required (VERSION 3.5 FATAL_ERROR) - project(ksnakeduel) - --set (QT_MIN_VERSION "5.10.0") -+set (QT_MIN_VERSION "5.9.0") - set (KF5_MIN_VERSION "5.40.0") - - find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 37b63b1f8..5405515bb 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kspaceduel-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kspaceduel-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="13e7391b50d371569882f599c408b476bfcd4fc6732f31d4e4554a38f82721cafcc94e6bed037dfaa5be33d24a635c1dea11f457db854c30a19001d1597c2633 kspaceduel-19.08.2.tar.xz" +sha512sums="a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1 kspaceduel-19.12.3.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 76fb0c525..847a5a2ab 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksquares-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksquares-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fcab0d15f48f0b72d005828ea014ede23c7ceb1949fada90580a9f83f7f6096a240612019080516c67496a99d1a831858c37a829eec864b90f42a5595bb9a711 ksquares-19.08.2.tar.xz" +sha512sums="c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760 ksquares-19.12.3.tar.xz" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD index 2bf88f6b0..25a8607b4 100644 --- a/user/ksshaskpass/APKBUILD +++ b/user/ksshaskpass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksshaskpass -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Plasma integration for SSH agents" url="https://www.KDE.org/" @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="31181cba266e8fe5bcb7c6ab988a213fefed7e3717af5780e90d69b519b2ef21647d69c60331e9c3745fdb8d9a6b61ae2f02a5573c1d908b8c3fc3cc812580b7 ksshaskpass-5.12.8.tar.xz" +sha512sums="af17ddb2950b0278c3fc6504ac4c40a20952d7748232545fadacb5ca6729b4f8c5e2b69592e1e28e5c57bd00cd6fab31c655cc2d35f8cd143965a836b2100d8a ksshaskpass-5.18.3.tar.xz" diff --git a/user/kst/APKBUILD b/user/kst/APKBUILD index d87b6e693..c47aa32e3 100644 --- a/user/kst/APKBUILD +++ b/user/kst/APKBUILD @@ -12,11 +12,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev gsl-dev" subpackages="$pkgname-doc $pkgname-lang" langdir="/usr/share/kst/locale" source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz - kst-gsl2.patch" + kst-gsl2.patch + qt5.patch + " builddir="$srcdir/Kst-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,19 +30,18 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -Dkst_qt5="YesPlease" \ -Dkst_install_prefix="/usr" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz -1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch" +1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch +63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch" diff --git a/user/kst/qt5.patch b/user/kst/qt5.patch new file mode 100644 index 000000000..64c5d3c40 --- /dev/null +++ b/user/kst/qt5.patch @@ -0,0 +1,47 @@ +From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <christophe@krop.fr> +Date: Sun, 3 Jun 2018 19:43:34 +0200 +Subject: Fix build with Qt 5.11 + +Summary: +- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. +- Add a missing #include + +Subscribers: kde-edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D13339 +--- + cmake/modules/KstMacros.cmake | 2 +- + src/libkstapp/view.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 4ff9c15..bc3d8a6 100644 +--- a/cmake/modules/KstMacros.cmake ++++ b/cmake/modules/KstMacros.cmake +@@ -240,7 +240,7 @@ endmacro() + macro(kst_link) + target_link_libraries(${kst_name} ${ARGV}) + if(kst_qt5) +- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) ++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) + else() + target_link_libraries(${kst_name} + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h +index 95c8c6a..2af5393 100644 +--- a/src/libkstapp/view.h ++++ b/src/libkstapp/view.h +@@ -14,6 +14,7 @@ + #define VIEW_H + + #include <QGraphicsView> ++#include <QMenu> + + #include "kst_export.h" + +-- +cgit v1.1 + diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index d631f8629..3792a7b3b 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.3.6 +pkgver=3.4.1 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="07371c343456d60b3d5e7dd2fb13983926db811dc0ffedb56364c1a02783db501189328c7476762ac0535f43d372ace81d39f90cd0c170ce36385f8e5a185bf3 kstars-3.3.6.tar.xz" +sha512sums="f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af kstars-3.4.1.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 9facccfaa..e6b2ab920 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kio-dev kjobwidgets-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev glu-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksudoku-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksudoku-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e44f94eafe05915529358411f47d13855ce25cd65a6c722827aaf56b96ccb9ba07557047a7c71e1eebf5d00390187bed151877fd5a572bdf98c8864999fbe116 ksudoku-19.08.2.tar.xz" +sha512sums="0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64 ksudoku-19.12.3.tar.xz" diff --git a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch b/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch deleted file mode 100644 index 8828736f3..000000000 --- a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d6fa7c0ab6c3a6b1494ffd12b93ee5cc2e4d3d5c Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 18 Mar 2019 14:34:26 -0500 -Subject: [PATCH] Linux softraid: define _GNU_SOURCE for pipe2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In a strict POSIX compilation environment, pipe2 is not defined. Use -the _GNU_SOURCE FTM to expose it. - -Fixes a failure to build ksysguard on Adélie Linux. ---- - ksysguardd/Linux/softraid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ksysguardd/Linux/softraid.c b/ksysguardd/Linux/softraid.c -index c2123fb7..96eb373e 100644 ---- a/ksysguardd/Linux/softraid.c -+++ b/ksysguardd/Linux/softraid.c -@@ -27,6 +27,7 @@ - #include <sys/types.h> /* for open */ - #include <sys/stat.h> /* for open */ - #include <fcntl.h> /* for open */ -+#define _GNU_SOURCE /* pipe2 */ - #include <unistd.h> /* for read, close, exec, fork */ - #include <stdlib.h> /* for exit */ - #include <sys/wait.h> /* for wait :) */ --- -2.19.2 - diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 54c227779..894fd3810 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksysguard -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -15,7 +15,6 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz ksysguard-5.6.5-rindex-header.patch - 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch " build() { @@ -29,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,6 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ea21ba61866f1b36f15f41011dfcab562ede45cc3403f030184680f6e3b0717fc5ac774089784a3d14015728c3b721887083154b32b786e804dfc1aace89585 ksysguard-5.12.8.tar.xz -13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch -0a424bb5e23f283d0cccfe86c0a6c2915f563a82e27a1dc16be8b4dc4b3d90ce116c4eb448dd1d5dc07602225468880206a5eb70c1b66d1e19e9a405fae7aa88 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch" +sha512sums="db4c9f9ebe17621fad0326504bab88928d417f58bdf6fff2644eb1c446be1c2d2386a4668029905e79021d3c2bb2ba450e686356094ab9af024d892584498993 ksysguard-5.18.3.tar.xz +75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch" diff --git a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch index 423da608c..7b900d751 100644 --- a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch +++ b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch @@ -1,6 +1,6 @@ --- ksysguard-5.6.5/ksysguardd/Linux/diskstat.c.old 2016-06-14 11:09:02.000000000 +0100 +++ ksysguard-5.6.5/ksysguardd/Linux/diskstat.c 2016-08-07 02:51:53.101362572 +0100 -@@ -24,6 +24,7 @@ +@@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index b5d4f4d91..e6616b810 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kconfig-dev kcoreaddons-dev kwidgetsaddons-dev kitemviews-dev kio-dev karchive-dev kdoctools-dev ki18n-dev kcompletion-dev ktextwidgets-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ksystemlog-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksystemlog-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9e97b16fceb7052427a61b22e71cb479c4e470868b263e7fe5747e8bcf69a5e676ae3ea2fde8532edc289bd487e86169625b445c72c1fb3a4771fc195fc254d1 ksystemlog-19.08.2.tar.xz" +sha512sums="88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530 ksystemlog-19.12.3.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index b0589b6f1..9e99e9e6a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev knotifyconfig-dev kxmlgui-dev knotifications-dev ktextwidgets-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kteatime-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kteatime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d0bd3b972ebf0539cf3bc22dc7bb5a0660bb99d75664ff2974a4da92de8bdd4bdc24925e6186e270794e7b4e21c47be71fc53f03b4aeb48d70464056dcb02f55 kteatime-19.08.2.tar.xz" +sha512sums="e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77 kteatime-19.12.3.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index 143405fdc..c1f2a264c 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,13 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" arch="all" options="!check" # Requires running X11 session. -license="LGPL-2.1-only AND LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)" +license="LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtxmlpatterns-dev karchive-dev kconfig-dev kguiaddons-dev ki18n-dev kio-dev kparts-dev @@ -22,7 +22,6 @@ source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkg # - CVE-2018-10361 build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,18 +33,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500 ktexteditor-5.54.0.tar.xz" +sha512sums="88cf4826cd0d0811a1f1d9193fb505e1fd6221192b22b14cca1d491f923dbad1816b9c29d540ff733c2f165c3ac456ac3b425c318a45b9aefd506a2b36e6fb43 ktexteditor-5.68.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index b2cec5cec..a9d90c430 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -12,12 +12,11 @@ depends="" depends_dev="qt5-qtbase-dev kcompletion-dev kconfigwidgets-dev kiconthemes-dev kservice-dev sonnet-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz - qt5-qttools-dev" + qt5-qtspeech-dev qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ktextwidgets-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0a3e12a422bb8aa1c79cf96cbd95d7544ba812e12b9a9b838efc014336e56c3f21bce80084ec9ed3c164b317dd9588db3ef28a729b01bdd05e9ea024d47ce767 ktextwidgets-5.54.0.tar.xz" +sha512sums="75bcf0f0f3ff55770768a95eb3376cf97f6f56cf97dd0223d5615c29bbdf98692db4a1179c802a848a88aeb65a3f1ba2cad0599cf983351cdcf2be555c32bbef ktextwidgets-5.68.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 0ab9de2a3..30d577ba8 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kio-dev kdbusaddons-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ktimer-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ktimer-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="60e2c16b9fa44bbd9e7cca3a487d9a78d572c1cd20e09782735fc30c586b82691736be2a30c21e07a893856b1c9a02f432bcce00a123219bd857e988bc477ea7 ktimer-19.08.2.tar.xz" +sha512sums="da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358 ktimer-19.12.3.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index 0a5a81798..d64205f64 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -29,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 5917a97cc..f54a8937b 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev libx11-dev libxcb-dev libxkbfile-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ktouch-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ktouch-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46438ec9cb3c45dec0156c13fb780b87b3ce7c3f9272435f0d6b634db7955a1f9fb33384333d42c353f2ac1d91bd3adc725b2eb39b9de1345d7a95780c573fa6 ktouch-19.08.2.tar.xz" +sha512sums="1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6 ktouch-19.12.3.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 6f7cd7e68..abf428ce8 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -13,12 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdbusaddons-dev kdelibs4support-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev qt5-qtmultimedia-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz - frameworks.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/ktuberling-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,19 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6a5ae8be1804ca90853a0d56cd86f42bc1f6260066d0c6244b6838eb5a86a2d564adae3f0d8def677001dfe3007b2f74831731b57be4b42911a9eb6d0ed28b31 ktuberling-19.08.2.tar.xz -a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch" +sha512sums="35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f ktuberling-19.12.3.tar.xz" diff --git a/user/ktuberling/frameworks.patch b/user/ktuberling/frameworks.patch deleted file mode 100644 index 7f03b5874..000000000 --- a/user/ktuberling/frameworks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ktuberling-19.04.0/CMakeLists.txt.old 2019-04-12 00:10:28.000000000 +0000 -+++ ktuberling-19.04.0/CMakeLists.txt 2019-04-18 21:18:28.795796335 +0000 -@@ -2,7 +2,7 @@ - - cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) - set (QT_MIN_VERSION "5.3.0") --set (KF5_MIN_VERSION "5.55.0") -+set (KF5_MIN_VERSION "5.54.0") - - find_package(ECM 1.7.0 REQUIRED CONFIG) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 8432052ac..8720725d7 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev kio-dev knewstuff-dev kdoctools-dev ktextwidgets-dev ki18n-dev kcoreaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kturtle-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kturtle-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="91348b26842469ce8287828649f701ca3723048a943837fcb18febef94fbd95a48e9500da0cffd4ff0c8b9e35db5c7d50e10900e0e10e47e2c95bb7d633977cc kturtle-19.08.2.tar.xz" +sha512sums="dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a kturtle-19.12.3.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index a9a5026ac..f8630b026 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kio-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev glu-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kubrick-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kubrick-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="52163d9cfb04033309f5a16c68d92d13be61ecb97f12c2377a3274d4d8ca439b68cae13ee92a45dc2b0b9117e8d450a414e5eb0cecf3ae825c7fe2886af38a5d kubrick-19.08.2.tar.xz" +sha512sums="ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9 kubrick-19.12.3.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index f8ee549b4..5994321cd 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kunitconversion-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="657b13bf4d49fcceab6005ccbbe439f011be5865ac95c3a06317edda8f2fca90cda2dcb8d415235f2edf4af3616ab35e55a9b40b94d29d0dbfc6b5e74fc3fbb5 kunitconversion-5.54.0.tar.xz" +sha512sums="38e26fc71d9080e876db1f458d0f76d4a102cb40d506c721e4f1fd53dcf7a5fe1de963b3c2aeb16e51c903208c976d6455b34787670032e33c88f30a9e5a15b9 kunitconversion-5.68.0.tar.xz" diff --git a/user/kuserfeedback/APKBUILD b/user/kuserfeedback/APKBUILD new file mode 100644 index 000000000..7c0ba2a55 --- /dev/null +++ b/user/kuserfeedback/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kuserfeedback +pkgver=1.0.0 +pkgrel=0 +pkgdesc="User feedback agent for KDE" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11. +license="MIT" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qtsvg-dev qt5-qttools-dev bison flex" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/kuserfeedback/kuserfeedback-$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() { + # Requires OpenGL accelerated desktop. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E openglinfosourcetest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 kuserfeedback-1.0.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 910635c7a..3c1b192f7 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -18,7 +18,6 @@ source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwallet-$pkgver. kwallet-5.22.0-blowfish-endianness.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +29,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f30ceda97180a562853923a0ad1cefbadbed51bbbf4b29405bbe85ccae3dc815053903367ba3638e7a7293eda7fbb7df88f527d6176fc6c2286088c38ce0069a kwallet-5.54.0.tar.xz +sha512sums="a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004 kwallet-5.68.0.tar.xz edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index 4025954ef..ddee7952f 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kauth-dev knotifications-dev kservice-dev ktextwidgets-dev kwallet-dev kcrash-dev kwindowsystem-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kwalletmanager-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kwalletmanager-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2cfcd8d72f686fcc808c15ee84b62ab6ac8b6955c4c194d017e9c76991e96638eceb7f4a6e538eb8b3d5cb9d8df7c0717cbc2e3ce48b244de8a4bbcafd4dbec0 kwalletmanager-19.08.2.tar.xz" +sha512sums="32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e kwalletmanager-19.12.3.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index b17c45774..89664524c 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -15,13 +15,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtmultimedia-dev audiofile-dev libsamplerate-dev alsa-lib-dev pulseaudio-dev flac-dev id3lib-dev libmad-dev opus-dev libvorbis-dev fftw-dev librsvg-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kwave-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/kwave-$pkgver.tar.xz es-doc-fix.patch remove-msgcat.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,20 +32,18 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DWITH_OSS=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f282730973c6568997b732b1dce82c4e0426f460b3f14627a21045bc65a76b190f6da83828280d89f8f727a887dcbd7b3c0f005c77956f32b901724e0de888d0 kwave-19.08.2.tar.xz +sha512sums="33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba kwave-19.12.3.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index 63d5ae8fc..d8df26b71 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -11,12 +11,11 @@ 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" + qt5-qttools-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8b6eaa2f57b09857447f702e2e0f253413edd6938459d407437aac7dddf1313002f6c4c4f32df861c723479fdf4642084a360cd6406729cb42c627f488ac6aa7 kwayland-5.54.0.tar.xz" +sha512sums="384628349c53a92925aa072941821ff153208415ff08fd9d32523a3e0b362d4fbf6539ebc0b3790112a570c70782989daa4cf1bf0ece26621cc8cc2d499654c8 kwayland-5.68.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 3571dbf18..a1ce477e6 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwidgetsaddons-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8 kwidgetsaddons-5.54.0.tar.xz" +sha512sums="64556563d0d45cbffa68b4eecc3c7c31d3597a598a63e713ac29377cf544354c25232cda78973bc15999d3e0b305810b480556a06fba45e811b8b0fe7c97cf23 kwidgetsaddons-5.68.0.tar.xz" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 02c40e3c0..461de81da 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -14,15 +14,15 @@ depends_dev="qt5-qtbase-dev libepoxy-dev libxcb-dev kconfig-dev kcoreaddons-dev makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3 qt5-qtdeclarative-dev qt5-qtscript-dev qt5-qtsensors-dev eudev-dev qt5-qtmultimedia-dev qt5-qtx11extras-dev fontconfig-dev freetype-dev - libdrm-dev libinput-dev libx11-dev libxkbcommon-dev mesa-dev + libdrm-dev libinput-dev libx11-dev libxi-dev libxkbcommon-dev mesa-dev wayland-dev xcb-util-cursor-dev xcb-util-image-dev xcb-util-wm-dev - breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev - kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev + breeze breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev + kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev kirigami2-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kidletime-dev kinit-dev kio-dev knewstuff-dev knotifications-dev kpackage-dev kscreenlocker-dev kservice-dev ktextwidgets-dev kwayland-dev kwidgetsaddons-dev - kxmlgui-dev plasma-framework-dev" + kxmlgui-dev plasma-framework-dev qt5-qtvirtualkeyboard-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz" @@ -37,7 +37,8 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DBUILD_TESTING=OFF \ + ${CMAKE_CROSSOPTS} . make } @@ -49,4 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56b4cb7ffb8df382fbea7c21cff529241e9cf124d97f08ec94dff8d91bcdb8df43c5d1471b63bf608594d23cb430e79ee96ebc25b75233105a3f8750c7f46fd0 kwin-5.12.8.tar.xz" +sha512sums="2eda8f94e095b9941e528e05c9c5720d213eae97c46ff5caff673a94ba4e20826f97a32d53704b422875d26be8eb38101a17ae99b726067dd89c7c62fbaf0bff kwin-5.18.3.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index ed4148241..80a107032 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -10,14 +10,13 @@ options="!check" # Requires X11 running license="MIT AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev libx11-dev libxcb-dev xcb-util-keysyms-dev - qt5-qtx11extras-dev libxrender-dev" + xcb-util-wm-dev qt5-qtx11extras-dev libxrender-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen graphviz" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwindowsystem-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="144181636b5f272a4a248bfa90ebc2410ab4b0adca034b086ce86fc208d63607f00f1b8e2193647d5fc72c696f3b02d5d718a3125d4703c548e7a8a85da47690 kwindowsystem-5.54.0.tar.xz" +sha512sums="1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9 kwindowsystem-5.68.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index e4f1435d6..0d096c2ea 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcrash-dev knotifications-dev kxmlgui-dev kdelibs4support-dev libkeduvocdocument-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kwordquiz-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kwordquiz-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c8eec15289a8c7cbb11896cc3fd6178e113dad105439e0e1040ec0e919a84efc46ca4565a9a50526d7b222ef10022a130d99c4269b7073f4bd5f49dde3c8fda1 kwordquiz-19.08.2.tar.xz" +sha512sums="cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6 kwordquiz-19.12.3.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index dc799c694..55c6b6ac2 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -18,7 +18,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kxmlgui-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,18 +29,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5 kxmlgui-5.54.0.tar.xz" +sha512sums="de98fab8c9a878b24081ec0676fef35da39f44391689ce7087c367d8e54c3122f13214cac8fda3fa9bf59c1515a1328bc704b550bf0c0cc1ca11dc898a01d430 kxmlgui-5.68.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 8480f168c..0586cc70d 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kxmlrpcclient-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="853f1a4c79a1fca278e2eb7d5c53aa47e4998276112428ec9cb3388c73eb9dcc4374510890ffbfc0ad52812622fae73ed4fd871e053dc4663d8ccd1883b76a83 kxmlrpcclient-5.54.0.tar.xz" +sha512sums="89350795c4c3601fca751fc80cf4c331bd4e692d85f672c50bdd1871cfb72809004d4ec0bc0826020c42a21c38d18962481477ac3f95ecbf219f4b88aa586aad kxmlrpcclient-5.68.0.tar.xz" diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index 0e2d99394..468e8f1ab 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=labplot -pkgver=2.6 -pkgrel=1 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Interactive tool for graphing and analysis of scientific data" url="https://www.kde.org/applications/education/labplot2" arch="all" @@ -14,9 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev - cantor-dev docbook-xsl" + cantor-dev docbook-xsl lz4-dev poppler-dev poppler-qt5-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/labplot/$pkgver.0/labplot-$pkgver.0.tar.xz" +source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -29,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af labplot-2.6.0.tar.xz" +sha512sums="73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a labplot-2.7.0.tar.xz" diff --git a/user/lame/APKBUILD b/user/lame/APKBUILD index 71f48fae4..31913a204 100644 --- a/user/lame/APKBUILD +++ b/user/lame/APKBUILD @@ -6,11 +6,11 @@ pkgdesc="MP3 encoder and graphical frame analyzer" url="http://lame.sourceforge.net/" arch="all" license="LGPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" -makedepends="ncurses-dev autoconf automake libtool" +depends="" +makedepends="ncurses-dev" ([ $CBUILD_ARCH != "pmmx" ] && [ $CBUILD_ARCH != "x86_64" ]) || makedepends="$makedepends nasm" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz" -builddir="$srcdir"/$pkgname-$pkgver # secfixes:ss # 3.100-r0: @@ -27,8 +27,6 @@ builddir="$srcdir"/$pkgname-$pkgver # - CVE-2017-11720 prepare() { - cd "$builddir" - default_prepare # fix for parallel builds @@ -36,12 +34,9 @@ prepare() { # fix for pic build with new nasm sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h - - aclocal && automake --force --add-missing } build() { - cd "$builddir" LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -55,13 +50,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install } diff --git a/user/lbxproxy/APKBUILD b/user/lbxproxy/APKBUILD deleted file mode 100644 index f72865a4f..000000000 --- a/user/lbxproxy/APKBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=lbxproxy -pkgver=1.0.3 -pkgrel=0 -pkgdesc="X11 proxy server for the Low Bandwidth extension" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="" -makedepends="libice-dev liblbxutil-dev libx11-dev libxext-dev util-macros - xorgproto-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/lbxproxy-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - chmod a+w config.sub - update_config_sub -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="e025101ba6743f98717958c3ff561df3f0fea7b491b2a41639cb8a84ffe9d82d980dcaaa8f50408e3a1a8ecfbd29fbe599a16a0f5de454b05ff82bc2629f68f2 lbxproxy-1.0.3.tar.bz2" diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD index a70ba2a39..c1df9d6d2 100644 --- a/user/lcms2/APKBUILD +++ b/user/lcms2/APKBUILD @@ -10,17 +10,14 @@ license="MIT" depends="" depends_dev="libjpeg-turbo-dev tiff-dev zlib-dev" makedepends="$depends_dev" -install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="http://www.littlecms.com/lcms2-$pkgver.tar.gz - " +source="http://www.littlecms.com/lcms2-$pkgver.tar.gz" # secfixes: # 2.8-r1: # - CVE-2016-10165 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/lesscpy/APKBUILD b/user/lesscpy/APKBUILD index dba0fced1..00f5933d5 100644 --- a/user/lesscpy/APKBUILD +++ b/user/lesscpy/APKBUILD @@ -13,17 +13,14 @@ subpackages="" source="lesscpy-$pkgver.tar.gz::https://github.com/lesscpy/lesscpy/archive/$pkgver.tar.gz" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/libaacs/APKBUILD b/user/libaacs/APKBUILD index 6278e5c9f..11bb90c18 100644 --- a/user/libaacs/APKBUILD +++ b/user/libaacs/APKBUILD @@ -7,13 +7,12 @@ pkgdesc="Library to decrypt Advanced Access Content System content" url="https://www.videolan.org/developers/libaacs.html" arch="all" license="LGPL-2.1+" +depends="" makedepends="bison flex libgcrypt-dev libgpg-error-dev" subpackages="$pkgname-dev" source="https://download.videolan.org/pub/videolan/libaacs/$pkgver/libaacs-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libao/APKBUILD b/user/libao/APKBUILD index 425116964..581b5c148 100644 --- a/user/libao/APKBUILD +++ b/user/libao/APKBUILD @@ -8,12 +8,11 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="alsa-lib-dev autoconf automake pulseaudio-dev" +makedepends="alsa-lib-dev autoconf automake libtool pulseaudio-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-pulse" source="$pkgname-$pkgver.tar.gz::https://github.com/xiph/libao/archive/$pkgver.tar.gz" build() { - cd "$builddir" ./autogen.sh ./configure \ --build=$CBUILD \ @@ -25,7 +24,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libart-lgpl/APKBUILD b/user/libart-lgpl/APKBUILD index 8eb73fdb3..ac519161e 100644 --- a/user/libart-lgpl/APKBUILD +++ b/user/libart-lgpl/APKBUILD @@ -11,17 +11,14 @@ depends="" makedepends="" subpackages="$pkgname-dev" source="https://download.gnome.org/sources/libart_lgpl/2.3/libart_lgpl-$pkgver.tar.bz2" - builddir="$srcdir"/libart_lgpl-$pkgver prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD index 3b9b22908..f39c95ee3 100644 --- a/user/libass/APKBUILD +++ b/user/libass/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libass pkgver=0.14.0 pkgrel=0 @@ -7,13 +7,12 @@ pkgdesc="Portable library for rendering (Advanced) Substation Alpha subtitles" url="https://github.com/libass/libass" arch="all" license="ISC" +depends="" makedepends="freetype-dev fribidi-dev fontconfig-dev harfbuzz-dev" subpackages="$pkgname-dev" source="https://github.com/libass/libass/releases/download/$pkgver/libass-$pkgver.tar.xz" -sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 libass-0.14.0.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 libass-0.14.0.tar.xz" diff --git a/user/libassuan/APKBUILD b/user/libassuan/APKBUILD index 50c7b4f1f..3ad753051 100644 --- a/user/libassuan/APKBUILD +++ b/user/libassuan/APKBUILD @@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,12 +20,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libatasmart/APKBUILD b/user/libatasmart/APKBUILD index fcc9881f6..da594635a 100644 --- a/user/libatasmart/APKBUILD +++ b/user/libatasmart/APKBUILD @@ -15,13 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://0pointer.de/public/$pkgname-$pkgver.tar.xz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,7 +34,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libatomic_ops/APKBUILD b/user/libatomic_ops/APKBUILD index 2008be5af..b22941f3e 100644 --- a/user/libatomic_ops/APKBUILD +++ b/user/libatomic_ops/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Provides semi-portable access to hardware provided atomic memory operat arch="all" url="https://github.com/ivmai/libatomic_ops" license="GPL-2.0-only" +depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" diff --git a/user/libavc1394/APKBUILD b/user/libavc1394/APKBUILD index 5fd7c7ef6..a76d47301 100644 --- a/user/libavc1394/APKBUILD +++ b/user/libavc1394/APKBUILD @@ -8,22 +8,20 @@ url="https://sourceforge.net/projects/libavc1394/" arch="all" license="LGPL-2.1+" depends="" -makedepends="libraw1394-dev libtool automake autoconf" -[ "$CLIBC" != "eglibc" ] && makedepends="$makedepends argp-standalone" +makedepends="libraw1394-dev libtool automake autoconf argp-standalone" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz automake.patch - argp.patch" + argp.patch + " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub libtoolize && aclocal && autoconf && automake --add-missing } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD index 4372a2b44..b2903c795 100644 --- a/user/libayatana-indicator/APKBUILD +++ b/user/libayatana-indicator/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libayatana-indicator -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Gnome library implementing the StatusNotifierItem specification" url="https://ayatanaindicators.github.io/" @@ -9,18 +9,16 @@ arch="all" options="!check" # incompetent test author license="GPL-3.0-only" depends="" -makedepends="ayatana-ido-dev gtk+3.0-dev" +makedepends="autoconf automake ayatana-ido-dev gtk+3.0-dev libtool" subpackages="$pkgname-dev" source="libayatana-indicator-$pkgver.tar.gz::https://github.com/AyatanaIndicators/libayatana-indicator/archive/$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" DESTDIR="$pkgdir" make -j1 install } -sha512sums="47a89a4f59d547e4aeeeba245ec7df360e18dc9f8a8c256cbeaf2a95e335f2734873457b2b0fdef8c2fdeaf780dda38cfe020c335a3447a2175914d580aeb8de libayatana-indicator-0.6.2.tar.gz" +sha512sums="5cd78d228d7c2afef229fa06dc9b0778b06fc2752dee0192c65d5140afbc28533b9862bc62ddb27f61f9f8fb26dfb736403202b2b4f90622fe892c61d621b888 libayatana-indicator-0.6.3.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index 99d2d0002..4357d589c 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -8,6 +8,7 @@ url="https://www.videolan.org/developers/libbluray.html" arch="all" options="!check" # Test requires an actual BD-ROM to play license="LGPL-2.1+" +depends="" makedepends="fontconfig-dev libxml2-dev" subpackages="$pkgname-dev" source="https://download.videolan.org/pub/videolan/libbluray/$pkgver/libbluray-$pkgver.tar.bz2" diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD index 38116b74f..e6ff9bc25 100644 --- a/user/libburn/APKBUILD +++ b/user/libburn/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libburn -pkgver=1.5.0 +pkgver=1.5.2 pkgrel=0 pkgdesc="Library for CD/DVD burning" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" arch="all" license="(GPL-2.0+ OR BSD-3-Clause) AND GPL-2.0+ AND BSD-3-Clause" +depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://files.libburnia-project.org/releases/libburn-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2 libburn-1.5.0.tar.gz" +sha512sums="a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3 libburn-1.5.2.tar.gz" diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD index 4c80ef88a..c013f2953 100644 --- a/user/libbytesize/APKBUILD +++ b/user/libbytesize/APKBUILD @@ -1,20 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbytesize -pkgver=1.4 +pkgver=2.1 pkgrel=0 pkgdesc="Library for working with sizes in bytes" url="https://github.com/storaged-project/libbytesize/" arch="all" options="!check" # Requires locale(1). license="LGPL-2.1+" -makedepends="gmp-dev mpfr-dev pcre-dev python3" -subpackages="$pkgname-dev $pkgname-lang py3-bytesize:py:noarch" +depends="" +makedepends="gmp-dev mpfr-dev pcre2-dev python3" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-bytesize:py:noarch" source="https://github.com/storaged-project/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz no-msgcat.patch" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -46,5 +44,5 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="54aba1f605ad662ff525c47206e8342e727c807692225361f1fa8d6a66c00f2740fc3d3672978eec2806227d85f146034042a9808e458d8d6271a08934032959 libbytesize-1.4.tar.gz +sha512sums="6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8 libbytesize-2.1.tar.gz 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch" diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD index 756f8e3f7..43480cb26 100644 --- a/user/libcanberra/APKBUILD +++ b/user/libcanberra/APKBUILD @@ -16,13 +16,11 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3 source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,7 +33,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/libcddb/APKBUILD b/user/libcddb/APKBUILD index f28442f59..469bef794 100644 --- a/user/libcddb/APKBUILD +++ b/user/libcddb/APKBUILD @@ -3,7 +3,7 @@ pkgname=libcddb pkgver=1.3.2 pkgrel=5 -pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +pkgdesc="Library to access data on a CDDB server" url="https://sourceforge.net/projects/libcddb/" arch="all" options="!check" # Tests are known broken since 2009: @@ -17,13 +17,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libcdio-paranoia/APKBUILD b/user/libcdio-paranoia/APKBUILD index 4230d8fe0..4fc2e1167 100644 --- a/user/libcdio-paranoia/APKBUILD +++ b/user/libcdio-paranoia/APKBUILD @@ -1,26 +1,19 @@ # Maintainer: pkgname=libcdio-paranoia -pkgver=10.2.2.0.0 -_pkgver="${pkgver/10.2./10.2+}" +pkgver=10.2.2.0.1 +_pkgver="$(printf "$pkgver" | sed 's/10\.2\./10.2+/')" pkgrel=0 pkgdesc="CD paranoia on top of libcdio" url="https://www.gnu.org/software/libcdio/" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="" depends_dev="ncurses-dev" -makedepends="$depends_dev libcdio-dev autoconf automake libtool" +makedepends="$depends_dev libcdio-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$_pkgver.tar.bz2" builddir="$srcdir/$pkgname-$_pkgver" -#prepare() { -# default_prepare -# -# cd "$builddir" -# sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac -# autoreconf -i -#} - build() { ./configure \ --build=$CBUILD \ @@ -42,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2 libcdio-paranoia-10.2+2.0.0.tar.bz2" +sha512sums="c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0 libcdio-paranoia-10.2+2.0.1.tar.bz2" diff --git a/user/libcdr/APKBUILD b/user/libcdr/APKBUILD index d39d55e93..afa20cb70 100644 --- a/user/libcdr/APKBUILD +++ b/user/libcdr/APKBUILD @@ -9,8 +9,8 @@ arch="all" license="MPL-2.0" depends="" depends_dev="boost-dev" -makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev" checkdepends="cppunit-dev" +makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" @@ -20,7 +20,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/libcmis/APKBUILD b/user/libcmis/APKBUILD index bfc58c4d5..4917aab08 100644 --- a/user/libcmis/APKBUILD +++ b/user/libcmis/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libcmis pkgver=0.5.2 -pkgrel=0 +pkgrel=1 pkgdesc="CMIS protocol client library for C/C++" url="https://github.com/tdf/libcmis" arch="all" license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+" depends="" depends_dev="boost-dev" -makedepends="$depends_dev curl-dev libxml2-dev" checkdepends="cppunit-dev" +makedepends="$depends_dev curl-dev libxml2-dev" subpackages="$pkgname-dev cmis-client:client" -source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz + icu.patch + " build() { # Note: manpages require docbook2x to build @@ -42,4 +44,5 @@ client() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="3dac0eed31d1dd3ac4670e501e0677196811f7875e6d1c253c8d874d6903691cbe4f1c27c8468af07bfd7f79b0d6ec4f933b28cb3bb37dcbea18bc2dd8f6e374 libcmis-0.5.2.tar.gz" +sha512sums="3dac0eed31d1dd3ac4670e501e0677196811f7875e6d1c253c8d874d6903691cbe4f1c27c8468af07bfd7f79b0d6ec4f933b28cb3bb37dcbea18bc2dd8f6e374 libcmis-0.5.2.tar.gz +0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd icu.patch" diff --git a/user/libcmis/icu.patch b/user/libcmis/icu.patch new file mode 100644 index 000000000..6ba63ee7f --- /dev/null +++ b/user/libcmis/icu.patch @@ -0,0 +1,17 @@ +--- a/inc/libcmis-c/repository.h 2018-12-27 14:07:55.000000000 +0100 ++++ b/inc/libcmis-c/repository.h 2019-04-21 01:29:46.504373226 +0200 +@@ -28,12 +28,12 @@ + #ifndef _REPOSITORY_H_ + #define _REPOSITORY_H_ + ++#include <libxml/tree.h> ++ + #ifdef __cplusplus + extern "C" { + #endif + +-#include <libxml/tree.h> +- + #include "libcmis-c/libcmis-c-api.h" + #include "libcmis-c/types.h" + diff --git a/user/libconfig/APKBUILD b/user/libconfig/APKBUILD index 8f5939f4e..bb85630e1 100644 --- a/user/libconfig/APKBUILD +++ b/user/libconfig/APKBUILD @@ -12,13 +12,11 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname++:_cxx" source="$pkgname-$pkgver.tar.gz::https://github.com/hyperrealm/$pkgname/archive/v$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir/" install } diff --git a/user/libcroco/APKBUILD b/user/libcroco/APKBUILD index 0ed8d4685..209720aaa 100644 --- a/user/libcroco/APKBUILD +++ b/user/libcroco/APKBUILD @@ -8,7 +8,7 @@ arch="all" options="!check" # Can only test already-installed library license="LGPL-2.1-only" subpackages="$pkgname-dev" -depends= +depends="" makedepends="glib-dev libxml2-dev" checkdepends="cmd:which" source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz" @@ -18,7 +18,6 @@ source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz" # - CVE-2017-7960 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libcue/APKBUILD b/user/libcue/APKBUILD index e989d4e41..13fb38c44 100644 --- a/user/libcue/APKBUILD +++ b/user/libcue/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/lipnitsk/libcue/archive/v$pkgver.tar.gz" build() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD index b91995d28..a6ed9a0ac 100644 --- a/user/libdbusmenu-qt/APKBUILD +++ b/user/libdbusmenu-qt/APKBUILD @@ -17,25 +17,17 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${_realver}.orig.tar.gz" builddir="$srcdir/$pkgname-$_realver" -prepare() { - cd "$builddir" - default_prepare - mkdir -p "$builddir"/build -} - build() { - cd "$builddir"/build cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DUSE_QT5=ON \ - "$builddir" - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9 libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz" diff --git a/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD index d36d55a47..138f14cf7 100644 --- a/user/libdc1394/APKBUILD +++ b/user/libdc1394/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdca/APKBUILD b/user/libdca/APKBUILD index 6ee2be1d5..aa4925405 100644 --- a/user/libdca/APKBUILD +++ b/user/libdca/APKBUILD @@ -8,11 +8,11 @@ url="https://www.videolan.org/developers/libdca.html" arch="all" license="GPL-2.0+" depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://download.videolan.org/pub/videolan/libdca/$pkgver/libdca-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdmtx/APKBUILD b/user/libdmtx/APKBUILD index ce8e9f442..1075dca3f 100644 --- a/user/libdmtx/APKBUILD +++ b/user/libdmtx/APKBUILD @@ -8,18 +8,16 @@ url="http://libdmtx.sourceforge.net/" arch="all" license="BSD-2-Clause" depends="" -makedepends="" +makedepends="autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/dmtx/$pkgname/archive/v$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +30,11 @@ build() { } check() { - cd "$builddir" make CFLAGS="-std=c99" check test/simple_test/simple_test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index f9feee145..59c09b360 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.99 +pkgver=2.4.100 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -10,15 +10,21 @@ options="!check" license="MIT" depends="" depends_dev="linux-headers" +checkdepends="bash cunit-dev" makedepends="$depends_dev bash eudev-dev libpciaccess-dev libpthread-stubs xmlto" -checkdepends="bash cunit-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 ioctl.patch " build() { + case $CARCH in + arm*|aarch64*) _arch_conf="--enable-omap-experimental-api + --enable-exynos-experimental-api + --enable-tegra-experimental-api" ;; + esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,9 +32,9 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-freedreno \ --enable-udev \ - --disable-valgrind + --disable-valgrind \ + $_arch_conf make } @@ -40,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191 libdrm-2.4.99.tar.bz2 +sha512sums="4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2 af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch" diff --git a/user/libdv/APKBUILD b/user/libdv/APKBUILD index e3dfc12f8..a1293771c 100644 --- a/user/libdv/APKBUILD +++ b/user/libdv/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/libdv/libdv-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdvdcss/APKBUILD b/user/libdvdcss/APKBUILD index 25e46df5e..27c8d14b1 100644 --- a/user/libdvdcss/APKBUILD +++ b/user/libdvdcss/APKBUILD @@ -5,13 +5,13 @@ pkgrel=0 pkgdesc="Library for accessing encrypted DVDs like a block device" url="https://www.videolan.org/developers/libdvdcss.html" arch="all" -makedepends="file linux-headers" license="GPL-2.0+" +depends="" +makedepends="file linux-headers" subpackages="$pkgname-dev $pkgname-doc" source="https://download.videolan.org/pub/libdvdcss/$pkgver/libdvdcss-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -21,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libdvdnav/APKBUILD b/user/libdvdnav/APKBUILD index d8350045f..832270be3 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.0 +pkgver=6.0.1 pkgrel=0 pkgdesc="Library for sophisticated DVD navigation features" url="http://dvdnav.mplayerhq.hu/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4 libdvdnav-6.0.0.tar.bz2" +sha512sums="83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f libdvdnav-6.0.1.tar.bz2" diff --git a/user/libdvdread/APKBUILD b/user/libdvdread/APKBUILD index c88455a7a..295c93920 100644 --- a/user/libdvdread/APKBUILD +++ b/user/libdvdread/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdread -pkgver=6.0.1 +pkgver=6.0.2 pkgrel=0 pkgdesc="Library for reading DVD video discs" url="http://dvdnav.mplayerhq.hu/" arch="all" license="GPL-2.0+ AND LGPL-2.1+ AND GPL-2.0-only" +depends="" makedepends="libdvdcss-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b libdvdread-6.0.1.tar.bz2" +sha512sums="e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c libdvdread-6.0.2.tar.bz2" diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD index ee7097969..e1d509302 100644 --- a/user/libe-book/APKBUILD +++ b/user/libe-book/APKBUILD @@ -7,11 +7,13 @@ pkgdesc="Import filter and tools for various ebook formats" url="https://sourceforge.net/projects/libebook/" arch="all" license="MPL-2.0" -depends_dev="boost-dev librevenge-dev liblangtag-dev" -makedepends="$depends_dev icu-dev libxml2-dev zlib-dev doxygen gperf" +depends="" +depends_dev="boost-dev" checkdepends="cppunit-dev" +makedepends="$depends_dev icu-dev liblangtag-dev librevenge-dev libxml2-dev + zlib-dev doxygen gperf" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2" prepare() { default_prepare @@ -19,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD index 03b2e73d7..e9145cd5a 100644 --- a/user/libebml/APKBUILD +++ b/user/libebml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libebml -pkgver=1.3.9 +pkgver=1.3.10 pkgrel=0 pkgdesc="Library to parse Extensible Binary Meta-Language files" url="https://www.matroska.org/" @@ -9,24 +9,23 @@ arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" +makedepends="cmake" subpackages="$pkgname-dev" source="https://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" 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" + -DCMAKE_C_FLAGS="$CFLAGS" . make } package() { - cd "$builddir" make install DESTDIR="$pkgdir" } -sha512sums="a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e libebml-1.3.9.tar.xz" +sha512sums="c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 libebml-1.3.10.tar.xz" diff --git a/user/libepoxy/APKBUILD b/user/libepoxy/APKBUILD index 9de8a24e2..99b1484b4 100644 --- a/user/libepoxy/APKBUILD +++ b/user/libepoxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libepoxy -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=0 pkgdesc="Direct Rendering Manager runtime library" url="https://github.com/anholt/libepoxy" @@ -11,30 +11,20 @@ license="MIT" depends="" depends_dev="libx11-dev" makedepends="$depends_dev mesa-dev meson ninja" -install="" subpackages="$pkgname-dev" source="https://github.com/anholt/libepoxy/releases/download/$pkgver/libepoxy-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="746dfe2a0a91319abd3906c75f81f6b895117f39120e0d8897db1daec1b6d2e91e1318f0dfe588c81907727b0a6dd1a7e4a819ee6b3063a23875312570464720 libepoxy-1.5.3.tar.xz" +sha512sums="7bde6fe7164aaa88b6e476dafb13391c551c530267936a1456e242d2bf648117f319788ba089100b3f773444098a894db6d27326b47dc4ae26db4766308d7510 libepoxy-1.5.4.tar.xz" diff --git a/user/libepubgen/APKBUILD b/user/libepubgen/APKBUILD index c8ac0d749..94ddc961a 100644 --- a/user/libepubgen/APKBUILD +++ b/user/libepubgen/APKBUILD @@ -8,13 +8,12 @@ url="https://sourceforge.net/projects/libepubgen/" arch="all" license="MPL-2.0" depends="" -makedepends="librevenge-dev libxml2-dev doxygen" checkdepends="cppunit-dev" +makedepends="librevenge-dev libxml2-dev doxygen" subpackages="$pkgname-dev $pkgname-doc" source="https://download.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libertine-fonts/APKBUILD b/user/libertine-fonts/APKBUILD index bc202bf17..35845f1ae 100644 --- a/user/libertine-fonts/APKBUILD +++ b/user/libertine-fonts/APKBUILD @@ -12,11 +12,9 @@ depends="fontconfig" makedepends="" subpackages="" source="https://downloads.sourceforge.net/linuxlibertine/LinLibertineOTF_${pkgver}_2012_07_02.tgz" -builddir="$srcdir/" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf } sha512sums="a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7 LinLibertineOTF_5.3.0_2012_07_02.tgz" diff --git a/user/libetonyek/APKBUILD b/user/libetonyek/APKBUILD index 1156482f8..18bed288e 100644 --- a/user/libetonyek/APKBUILD +++ b/user/libetonyek/APKBUILD @@ -7,10 +7,11 @@ pkgdesc="Import filter and tools for Apple iWork documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" arch="all" license="MPL-2.0" +depends="" depends_dev="glm boost-dev" +checkdepends="cppunit-dev" makedepends="$depends_dev librevenge-dev liblangtag-dev zlib-dev libxml2-dev gperf doxygen mdds~1.4" -checkdepends="cppunit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" diff --git a/user/libetpan/APKBUILD b/user/libetpan/APKBUILD index 474c2d67c..3ccfa2679 100644 --- a/user/libetpan/APKBUILD +++ b/user/libetpan/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libetpan -pkgver=1.9.3 +pkgver=1.9.4 pkgrel=0 pkgdesc="Mail library for C" url="https://www.etpan.org/libetpan.html" @@ -34,5 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6 libetpan-1.9.3.tar.gz +sha512sums="7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f libetpan-1.9.4.tar.gz df0ba883c9328b7cab408a54f38e6f9c7f5f603b0f016b7ea2e9fa49aa4118ff6723218bb9942f278028291e1c7e9da0bb1d48ab2c471b0ddf5edc3e78a8a1df missing-header.patch" diff --git a/user/libev/APKBUILD b/user/libev/APKBUILD index 382523aab..eb2a629e6 100644 --- a/user/libev/APKBUILD +++ b/user/libev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=libev -pkgver=4.27 +pkgver=4.31 pkgrel=0 pkgdesc="Event dispatch library" url="http://software.schmorp.de/pkg/libev.html" @@ -21,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,10 +30,9 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install rm "$pkgdir"/usr/include/event.h } -sha512sums="18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82 libev-4.27.tar.gz +sha512sums="c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18 libev-4.31.tar.gz b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch" diff --git a/user/libexecinfo/10-execinfo.patch b/user/libexecinfo/10-execinfo.patch deleted file mode 100644 index 97bd8cd5d..000000000 --- a/user/libexecinfo/10-execinfo.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/execinfo.c -+++ b/execinfo.c -@@ -69,7 +69,8 @@ - char ** - backtrace_symbols(void *const *buffer, int size) - { -- int i, clen, alen, offset; -+ size_t clen, alen; -+ int i, offset; - char **rval; - char *cp; - Dl_info info; -@@ -78,7 +79,6 @@ - rval = malloc(clen); - if (rval == NULL) - return NULL; -- (char **)cp = &(rval[size]); - for (i = 0; i < size; i++) { - if (dladdr(buffer[i], &info) != 0) { - if (info.dli_sname == NULL) -@@ -92,14 +92,14 @@ - 2 + /* " <" */ - strlen(info.dli_sname) + /* "function" */ - 1 + /* "+" */ -- D10(offset) + /* "offset */ -+ 10 + /* "offset */ - 5 + /* "> at " */ - strlen(info.dli_fname) + /* "filename" */ - 1; /* "\0" */ - rval = realloc_safe(rval, clen + alen); - if (rval == NULL) - return NULL; -- snprintf(cp, alen, "%p <%s+%d> at %s", -+ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s", - buffer[i], info.dli_sname, offset, info.dli_fname); - } else { - alen = 2 + /* "0x" */ -@@ -108,12 +108,15 @@ - rval = realloc_safe(rval, clen + alen); - if (rval == NULL) - return NULL; -- snprintf(cp, alen, "%p", buffer[i]); -+ snprintf((char *) rval + clen, alen, "%p", buffer[i]); - } -- rval[i] = cp; -- cp += alen; -+ rval[i] = (char *) clen; -+ clen += alen; - } - -+ for (i = 0; i < size; i++) -+ rval[i] += (long) rval; -+ - return rval; - } - -@@ -155,6 +158,6 @@ - return; - snprintf(buf, len, "%p\n", buffer[i]); - } -- write(fd, buf, len - 1); -+ write(fd, buf, strlen(buf)); - } - } diff --git a/user/libexecinfo/20-define-gnu-source.patch b/user/libexecinfo/20-define-gnu-source.patch deleted file mode 100644 index ac18f6eeb..000000000 --- a/user/libexecinfo/20-define-gnu-source.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/execinfo.c -+++ b/execinfo.c -@@ -26,6 +26,7 @@ - * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $ - */ - -+#define _GNU_SOURCE - #include <sys/types.h> - #include <sys/uio.h> - #include <dlfcn.h> ---- a/stacktraverse.c -+++ b/stacktraverse.c -@@ -1,3 +1,4 @@ -+#define _GNU_SOURCE - #include <stddef.h> - - #include "stacktraverse.h" ---- a/test.c -+++ b/test.c -@@ -1,3 +1,4 @@ -+#define _GNU_SOURCE - #include <stdio.h> - #include <stdlib.h> - diff --git a/user/libexecinfo/30-linux-makefile.patch b/user/libexecinfo/30-linux-makefile.patch deleted file mode 100644 index f832adce7..000000000 --- a/user/libexecinfo/30-linux-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -23,24 +23,25 @@ - # SUCH DAMAGE. - # - # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ -+# -+# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04 - --LIB= execinfo -+CC=cc -+AR=ar -+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c -+EXECINFO_LDFLAGS=$(LDFLAGS) - --SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h -+all: static dynamic - --INCS= execinfo.h -+static: -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -+ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o - --SHLIB_MAJOR= 1 --SHLIB_MINOR= 0 -+dynamic: -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So -+ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So - --NOPROFILE= yes -- --DPADD= ${LIBM} --LDADD= -lm -- --#WARNS?= 4 -- --#stacktraverse.c: gen.py --# ./gen.py > stacktraverse.c -- --.include <bsd.lib.mk> -+clean: -+ rm -rf *.o *.So *.a *.so diff --git a/user/libexecinfo/APKBUILD b/user/libexecinfo/APKBUILD deleted file mode 100644 index 6951797d8..000000000 --- a/user/libexecinfo/APKBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Contributor: Philipp Andronov <filipp.andronov@gmail.com> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=libexecinfo -pkgver=1.1 -pkgrel=1 -pkgdesc="Library for inspecting backtraces" -url="https://www.freshports.org/devel/libexecinfo" -arch="all" -license="BSD-2-Clause" -depends="" -makedepends="" -subpackages="$pkgname-dev" -source="https://pkg.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2 - 10-execinfo.patch - 20-define-gnu-source.patch - 30-linux-makefile.patch - " - -build() { - cd "$builddir" - make -} - -check() { - cd "$builddir" - ${CC:-cc} -I. -L. -ggdb -fno-omit-frame-pointer $CFLAGS -o test test.c -lexecinfo - ./test -} - -package() { - cd "$builddir" - - install -D -m755 "$builddir"/execinfo.h \ - "$pkgdir"/usr/include/execinfo.h - install -D -m755 "$builddir"/stacktraverse.h \ - "$pkgdir"/usr/include/stacktraverse.h - install -D -m755 "$builddir"/libexecinfo.a \ - "$pkgdir"/usr/lib/libexecinfo.a - install -D -m755 "$builddir"/libexecinfo.so.1 \ - "$pkgdir"/usr/lib/libexecinfo.so.1 - ln -s /usr/lib/libexecinfo.so.1 \ - "$pkgdir"/usr/lib/libexecinfo.so -} - -sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c libexecinfo-1.1.tar.bz2 -97dab43979f6bc07deb11b20cc134c7d95619536b108058388856bcc48dc5a7de4ebceebe88e79d92ccbb9307975bb91a630cc569a5ed35a37a0f92f2d7f83d0 10-execinfo.patch -6b1d5ba0a2765fcbcde2d88e85c6ee9fb49ef1878284fd7da15afebed17b8415959233c735574661b0a5e77d4d40c132552477dbbf4432512a32629727ebdbbc 20-define-gnu-source.patch -7d83e3113b93ed9d54a2077d6b9381aa69c6a5d2066dd3cd7c5ec3ce0c93eb7b86fd47481151117f9c8f3790bde6125498a49e32e81d3ff6630b6d8e0ec391d0 30-linux-makefile.patch" diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD index 71c9f7d06..06e1e832a 100644 --- a/user/libexif/APKBUILD +++ b/user/libexif/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libexif pkgver=0.6.21 -pkgrel=3 +pkgrel=4 pkgdesc="Library to parse EXIF metadata" url="https://sourceforge.net/projects/libexif" arch="all" @@ -10,17 +10,23 @@ 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-2018-20030.patch + CVE-2019-9278.patch + " # secfixes: # 0.6.21-r3: # - CVE-2017-7544 # - CVE-2018-20030 +# 0.6.21-r4: +# - CVE-2016-6328 +# - CVE-2019-9278 prepare() { - update_config_sub default_prepare + update_config_sub } build() { @@ -40,5 +46,7 @@ package() { } sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35 libexif-0.6.21.tar.bz2 +c0d4c74207993efc373615ef2c797d720162a2ee6fd7ad026edf2ced4198d9b1165b88790c2af3194f6bb7c2de88d4672c041c2cff8a82c8914700633332b8c5 CVE-2016-6328.patch d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d CVE-2017-7544.patch -0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch" +0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch +c30c03fefea94d175b94c9f0c4d60cbb3aa0ad78b0d29008975fbbb15c17f2907a16fd50970e5fa18d533d0ce291a5ee9b62934210cb40b0f463693460607738 CVE-2019-9278.patch" diff --git a/user/libexif/CVE-2016-6328.patch b/user/libexif/CVE-2016-6328.patch new file mode 100644 index 000000000..0568f27d2 --- /dev/null +++ b/user/libexif/CVE-2016-6328.patch @@ -0,0 +1,60 @@ +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-2019-9278.patch b/user/libexif/CVE-2019-9278.patch new file mode 100644 index 000000000..bd15e8d13 --- /dev/null +++ b/user/libexif/CVE-2019-9278.patch @@ -0,0 +1,85 @@ +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/libexttextcat/APKBUILD b/user/libexttextcat/APKBUILD index 48fb2df18..e5fa3061e 100644 --- a/user/libexttextcat/APKBUILD +++ b/user/libexttextcat/APKBUILD @@ -8,13 +8,12 @@ url="https://wiki.documentfoundation.org/Libexttextcat" arch="all" license="BSD-3-Clause" depends="" -makedepends="" checkdepends="bash" +makedepends="" subpackages="$pkgname-dev" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD index d8221c552..af08c494c 100644 --- a/user/libfakekey/APKBUILD +++ b/user/libfakekey/APKBUILD @@ -1,25 +1,23 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libfakekey pkgver=0.3 pkgrel=0 -pkgdesc="Library for faking X key-presses from character inputs" +pkgdesc="Library for faking X11 key presses from character inputs" url="https://www.yoctoproject.org/software-item/matchbox/" arch="all" license="LGPL-2.0+" depends="" -makedepends="libx11-dev libxtst-dev" +makedepends="autoconf automake libtool libx11-dev libxtst-dev" subpackages="$pkgname-dev" source="http://git.yoctoproject.org/cgit.cgi/libfakekey/snapshot/libfakekey-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" LIBS="-lX11" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libfm-extra/APKBUILD b/user/libfm-extra/APKBUILD index 775b4d322..5a8cb58fb 100644 --- a/user/libfm-extra/APKBUILD +++ b/user/libfm-extra/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Library for generating menu caches" url="https://wiki.lxde.org/en/PCManFM" arch="all" license="GPL-2.0+" +depends="" makedepends="glib-dev intltool" subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz" @@ -14,7 +15,6 @@ source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz" builddir="$srcdir/libfm-$pkgver" build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -24,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 5412fccfc..62110c28a 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libfm-qt pkgver=0.14.1 pkgrel=0 pkgdesc="Qt library for file management and bindings for libfm" url="https://lxqt.org" arch="all" +options="!check" # No test suite. license="LGPL-2.1+" depends="" depends_dev="libfm-dev menu-cache-dev libexif-dev" @@ -15,11 +16,9 @@ subpackages="$pkgname-dev" source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS -O0" \ -DCMAKE_C_FLAGS="$CFLAGS -O0" \ -DPULL_TRANSLATIONS=False \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir/build" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 libfm-qt-0.14.1.tar.xz" diff --git a/user/libfm/APKBUILD b/user/libfm/APKBUILD index ad75ec5d9..a32925320 100644 --- a/user/libfm/APKBUILD +++ b/user/libfm/APKBUILD @@ -7,6 +7,8 @@ pkgdesc="Library for file management" url="https://wiki.lxde.org/en/PCManFM" arch="all" license="GPL-2.0+" +depends="" +depends_dev="libfm-extra-dev" makedepends="dbus-glib-dev glib-dev gtk+2.0-dev intltool libexif-dev libfm-extra-dev menu-cache-dev udisks2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -15,7 +17,6 @@ source="https://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.xz " build() { - cd "$builddir" mv data/libfm.conf data/libfm.conf.sample ./configure \ --prefix=/usr \ @@ -26,13 +27,14 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install + # this symlink breaks installation with -extra-dev, + # and extra is always required anyway + rm "$pkgdir"/usr/include/libfm } sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz diff --git a/user/libfreehand/APKBUILD b/user/libfreehand/APKBUILD index b8371ac74..fc9354ab4 100644 --- a/user/libfreehand/APKBUILD +++ b/user/libfreehand/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libfreehand pkgver=0.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Import filter and tools for Adobe FreeHand documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand" arch="all" license="MPL-2.0 AND Public-Domain" depends="" depends_dev="libxml2-dev lcms2-dev icu-dev" -makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev" checkdepends="cppunit-dev" +makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" +source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz + icu.patch + " prepare() { default_prepare @@ -20,7 +22,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,4 +47,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 libfreehand-0.1.2.tar.xz" +sha512sums="4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 libfreehand-0.1.2.tar.xz +5c72ee92e1b617dd0ece1a17e84c4b063454811aae484a08d2e15a29c6561068d0127222656647bd0ac05afde8c5c2154d382b4289b86e1956bf173ed4694a76 icu.patch" diff --git a/user/libfreehand/icu.patch b/user/libfreehand/icu.patch new file mode 100644 index 000000000..22d118cca --- /dev/null +++ b/user/libfreehand/icu.patch @@ -0,0 +1,11 @@ +--- libfreehand-0.1.2/src/lib/libfreehand_utils.cpp.old 2017-09-16 10:28:50.000000000 +0000 ++++ libfreehand-0.1.2/src/lib/libfreehand_utils.cpp 2020-01-12 04:40:38.492246789 +0000 +@@ -162,7 +162,7 @@ + while (j < length) + { + UChar32 c; +- U16_NEXT(s, j, length, c) ++ U16_NEXT(s, j, length, c); + unsigned char outbuf[U8_MAX_LENGTH+1]; + int i = 0; + U8_APPEND_UNSAFE(&outbuf[0], i, c); diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 27de81126..2a537dfca 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -2,20 +2,22 @@ # Maintainer: pkgname=libgd pkgver=2.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" options="!check" # Upstream bug 201 regression. license="MIT" depends="" -makedepends="bash fontconfig-dev freetype-dev libjpeg-turbo-dev libpng-dev - libwebp-dev zlib-dev" +makedepends="autoconf automake bash fontconfig-dev freetype-dev + libjpeg-turbo-dev libpng-dev libtool libwebp-dev tiff-dev zlib-dev + " subpackages="$pkgname-dev" replaces="gd" source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz CVE-2016-7568.patch CVE-2018-5711.patch + CVE-2018-14553.patch CVE-2018-1000222.patch CVE-2019-6977.patch CVE-2019-6978.patch @@ -27,6 +29,13 @@ source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgna # - CVE-2018-1000222 # - CVE-2019-6977 # - CVE-2019-6978 +# 2.2.5-r2: +# - CVE-2018-14553 + +prepare() { + default_prepare + autoreconf -vif +} build() { ./configure \ @@ -58,6 +67,7 @@ dev() { sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz 8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch +353491fab6c6e0916dca910c9d14f0e0efab6d9d88c48f6f3f2f69e60312489039b25d26980e7c5c2c04ed9e56003b99eae77bd412fbbed1d8eb47d561f7af74 CVE-2018-14553.patch d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch 3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch" diff --git a/user/libgd/CVE-2018-14553.patch b/user/libgd/CVE-2018-14553.patch new file mode 100644 index 000000000..7510101d1 --- /dev/null +++ b/user/libgd/CVE-2018-14553.patch @@ -0,0 +1,99 @@ +From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= <fcabralpacheco@gmail.com> +Date: Fri, 20 Dec 2019 12:03:33 -0300 +Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone() + +--- + src/gd.c | 9 +-------- + tests/gdimageclone/CMakeLists.txt | 1 + + tests/gdimageclone/Makemodule.am | 3 ++- + tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++ + 5 files changed, 35 insertions(+), 9 deletions(-) + create mode 100644 tests/gdimageclone/style.c + +diff --git a/src/gd.c b/src/gd.c +index 592a0286..d564d1f9 100644 +--- a/src/gd.c ++++ b/src/gd.c +@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + } + } + +- if (src->styleLength > 0) { +- dst->styleLength = src->styleLength; +- dst->stylePos = src->stylePos; +- for (i = 0; i < src->styleLength; i++) { +- dst->style[i] = src->style[i]; +- } +- } +- + dst->interlace = src->interlace; + + dst->alphaBlendingFlag = src->alphaBlendingFlag; +@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + + if (src->style) { + gdImageSetStyle(dst, src->style, src->styleLength); ++ dst->stylePos = src->stylePos; + } + + for (i = 0; i < gdMaxColors; i++) { +diff --git a/tests/gdimageclone/CMakeLists.txt b/tests/gdimageclone/CMakeLists.txt +index e6ccc318..662f4e96 100644 +--- a/tests/gdimageclone/CMakeLists.txt ++++ b/tests/gdimageclone/CMakeLists.txt +@@ -1,5 +1,6 @@ + LIST(APPEND TESTS_FILES + bug00300 ++ style + ) + + ADD_GD_TESTS() +diff --git a/tests/gdimageclone/Makemodule.am b/tests/gdimageclone/Makemodule.am +index 4b1b54c0..51abf5c1 100644 +--- a/tests/gdimageclone/Makemodule.am ++++ b/tests/gdimageclone/Makemodule.am +@@ -1,5 +1,6 @@ + libgd_test_programs += \ +- gdimageclone/bug00300 ++ gdimageclone/bug00300 \ ++ gdimageclone/style + + EXTRA_DIST += \ + gdimageclone/CMakeLists.txt +diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c +new file mode 100644 +index 00000000..c2b246ed +--- /dev/null ++++ b/tests/gdimageclone/style.c +@@ -0,0 +1,30 @@ ++/** ++ * Cloning an image should exactly reproduce all style related data ++ */ ++ ++ ++#include <string.h> ++#include "gd.h" ++#include "gdtest.h" ++ ++ ++int main() ++{ ++ gdImagePtr im, clone; ++ int style[] = {0, 0, 0}; ++ ++ im = gdImageCreate(8, 8); ++ gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0])); ++ ++ clone = gdImageClone(im); ++ gdTestAssert(clone != NULL); ++ ++ gdTestAssert(clone->styleLength == im->styleLength); ++ gdTestAssert(clone->stylePos == im->stylePos); ++ gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0]))); ++ ++ gdImageDestroy(clone); ++ gdImageDestroy(im); ++ ++ return gdNumFailures(); ++} diff --git a/user/libgee/APKBUILD b/user/libgee/APKBUILD index b1b90d7f1..3e4653b2d 100644 --- a/user/libgee/APKBUILD +++ b/user/libgee/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgee -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=0 pkgdesc="GObject collection library" url="https://wiki.gnome.org/Projects/Libgee" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d libgee-0.20.2.tar.xz" +sha512sums="c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7 libgee-0.20.3.tar.xz" diff --git a/user/libgeoip/APKBUILD b/user/libgeoip/APKBUILD new file mode 100644 index 000000000..db33d2f11 --- /dev/null +++ b/user/libgeoip/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=libgeoip +pkgver=1.6.12 +pkgrel=0 +pkgdesc="GeoIP legacy C API" +url="https://github.com/maxmind/geoip-api-c" +arch="all" +license="LGPL-2.1-only" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/maxmind/geoip-api-c/releases/download/v$pkgver/GeoIP-$pkgver.tar.gz" +builddir="$srcdir/GeoIP-$pkgver" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a1c8120692a7ba6de5836550917f86f4797dd236a8b7d71b6f92b5389e4b071d89e57036654f5de1d4b762730a2a5c331c31414eab0c889c9befaa097941fee7 GeoIP-1.6.12.tar.gz" diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD index 98b1d68ef..bfa1a39b3 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.27.7 +pkgver=0.28.4 pkgrel=0 pkgdesc="Pure C re-entrant library for custom Git applications" url="https://libgit2.org/" @@ -11,11 +11,9 @@ arch="all" license="GPL-2.0-only" depends="" depends_dev="curl-dev libssh2-dev" -makedepends="$depends_dev python3 cmake zlib-dev openssl-dev" +makedepends="$depends_dev cmake http-parser-dev openssl-dev python3 zlib-dev" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz - test-32bit.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" # secfixes: # 0.27.3-r0: @@ -31,25 +29,19 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$ # - CVE-2016-8569 build() { - cd "$builddir" cmake \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" + -DCMAKE_C_FLAGS="$CFLAGS" . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011 libgit2-0.27.7.tar.gz -83b82b442d34b633d1889863472e51f3b6b68fbd4089d3448d86adeb7ce79eee495fea3c19edb88f563226bd2badb0166b7e41f9d4ffe8304bbf3b2abdf5a22f test-32bit.patch" +sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 libgit2-0.28.4.tar.gz" diff --git a/user/libgit2/libressl.patch b/user/libgit2/libressl.patch deleted file mode 100644 index 967cdc498..000000000 --- a/user/libgit2/libressl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru src.orig/libgit2-0.25.1/src/openssl_stream.h src/libgit2-0.25.1/src/openssl_stream.h ---- libgit2-0.25.1/src/copenssl_stream.h.orig -+++ libgit2-0.25.1/src/openssl_stream.h -@@ -27,7 +27,7 @@ - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { diff --git a/user/libgit2/pkgconfig-do-not-quote-Libs.patch b/user/libgit2/pkgconfig-do-not-quote-Libs.patch deleted file mode 100644 index 86133612e..000000000 --- a/user/libgit2/pkgconfig-do-not-quote-Libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 452ba68cde25423d13ebb36f0a54559f07aa53a2 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko <ignatenko@redhat.com> -Date: Tue, 7 Feb 2017 16:37:47 +0100 -Subject: [PATCH] pkgconfig: do not quote Libs - -It doesn't make sense at all. ---- - libgit2.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgit2.pc.in b/libgit2.pc.in -index 329a560a7..880266a30 100644 ---- a/libgit2.pc.in -+++ b/libgit2.pc.in -@@ -6,7 +6,7 @@ Name: libgit2 - Description: The git library, take 2 - Version: @LIBGIT2_VERSION_STRING@ - --Libs: -L"${libdir}" -lgit2 -+Libs: -L${libdir} -lgit2 - Libs.private: @LIBGIT2_PC_LIBS@ - Requires.private: @LIBGIT2_PC_REQUIRES@ - --- -2.11.0 - diff --git a/user/libgit2/test-32bit.patch b/user/libgit2/test-32bit.patch deleted file mode 100644 index d1240d904..000000000 --- a/user/libgit2/test-32bit.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 415a8ae9c9b6ac18f0524b6af8e58408b426457d Mon Sep 17 00:00:00 2001 -From: Edward Thomson <ethomson@edwardthomson.com> -Date: Thu, 13 Sep 2018 13:27:07 +0100 -Subject: [PATCH] tests: don't run buf::oom on 32-bit systems - -On a 32-bit Linux systems, the value large enough to make malloc -guarantee a failure is also large enough that valgrind considers it -"fishy". Skip this test on those systems entirely. ---- - tests/buf/oom.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/buf/oom.c b/tests/buf/oom.c -index 2741a8ddf2..ec3bad9979 100644 ---- a/tests/buf/oom.c -+++ b/tests/buf/oom.c -@@ -11,12 +11,8 @@ - */ - #if defined(GIT_ARCH_64) && defined(__linux__) - # define TOOBIG 0x0fffffffffffffff --#elif defined(__linux__) --# define TOOBIG 0x0fffffff - #elif defined(GIT_ARCH_64) - # define TOOBIG 0xffffffffffffff00 --#else --# define TOOBIG 0xffffff00 - #endif - - /** -@@ -25,13 +21,18 @@ - * will fail. And because the git_buf_grow() wrapper always - * sets mark_oom, the code in git_buf_try_grow() will free - * the internal buffer and set it to git_buf__oom. -- * -+ * - * We initialized the internal buffer to (the static variable) - * git_buf__initbuf. The purpose of this test is to make sure - * that we don't try to free the static buffer. -+ * -+ * Skip this test entirely on 32-bit platforms; a buffer large enough -+ * to guarantee malloc failures is so large that valgrind considers -+ * it likely to be an error. - */ - void test_buf_oom__grow(void) - { -+#ifdef GIT_ARCH_64 - git_buf buf = GIT_BUF_INIT; - - git_buf_clear(&buf); -@@ -40,6 +41,9 @@ void test_buf_oom__grow(void) - cl_assert(git_buf_oom(&buf)); - - git_buf_free(&buf); -+#else -+ cl_skip(); -+#endif - } - - void test_buf_oom__grow_by(void) diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD index 97d20f603..9b09c9104 100644 --- a/user/libglade/APKBUILD +++ b/user/libglade/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libglade pkgver=2.6.4 pkgrel=0 @@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/libglade/${pkgver%.*}/libglade-$pkgver.tar.bz2" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD index 030194fc5..7ecb68377 100644 --- a/user/libgnome-keyring/APKBUILD +++ b/user/libgnome-keyring/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libgnome-keyring pkgver=3.12.0 pkgrel=0 @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/libgnome-keyring/${pkgver%.*}/libgnome-keyring-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index c1250aabb..aee8693b1 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -10,13 +10,11 @@ license="LGPL-2.1+" depends="" depends_dev="libexif-dev libusb-dev" makedepends="$depends_dev libjpeg-turbo-dev libtool" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" install="$pkgname.pre-install $pkgname.pre-upgrade" -replaces="libgphoto2-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2" build() { - cd "$builddir" udevscriptdir=/lib/udev ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/lib/libgphoto2/*/*.a \ "$pkgdir"/usr/lib/*.a diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index b0916d3da..cd5faf416 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -7,7 +7,7 @@ url="https://www.gnome.org/" arch="all" license="LGPL-2.1-only" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -depends= +depends="" depends_dev="bzip2-dev" makedepends="libxml2-dev glib-dev bzip2-dev intltool python3 zlib-dev gobject-introspection-dev" @@ -18,7 +18,6 @@ source="https://download.gnome.org/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz # - CVE-2016-9888 build() { - cd "$builddir" sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* ./configure \ --build=$CBUILD \ @@ -35,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD index ea17925e3..37b1ef0e2 100644 --- a/user/libgtop/APKBUILD +++ b/user/libgtop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libgtop pkgver=2.40.0 pkgrel=0 @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/libgtop/${pkgver%.*}/libgtop-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libgxps/APKBUILD b/user/libgxps/APKBUILD index 5deb16d48..dac605308 100644 --- a/user/libgxps/APKBUILD +++ b/user/libgxps/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev" source="https://ftp.gnome.org/pub/gnome/sources/libgxps/0.3/libgxps-$pkgver.tar.xz" build() { - cd "$builddir" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" ninja -C output test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index cb6ba3fcd..0adc3e92f 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: pkgname=libical -pkgver=3.0.6 +pkgver=3.0.7 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" arch="all" -#options="!check" # Test suite is very broken. license="MPL-2.0 OR LGPL-2.1-only" depends="" depends_dev="db-dev" @@ -14,23 +13,20 @@ subpackages="$pkgname-dev" source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz" build() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DSHARED_ONLY=true \ - -DENABLE_GTK_DOC=OFF + -DENABLE_GTK_DOC=OFF . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc libical-3.0.6.tar.gz" +sha512sums="4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8 libical-3.0.7.tar.gz" diff --git a/user/libice/APKBUILD b/user/libice/APKBUILD index b1a806e68..1cd3f5fe8 100644 --- a/user/libice/APKBUILD +++ b/user/libice/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="X11 Inter-Client Exchange library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" makedepends="libbsd-dev util-macros xmlto xorgproto-dev xtrans" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" diff --git a/user/libid3tag/APKBUILD b/user/libid3tag/APKBUILD index 0984fc93f..e20e012d5 100644 --- a/user/libid3tag/APKBUILD +++ b/user/libid3tag/APKBUILD @@ -8,11 +8,12 @@ url="http://www.underbit.com/products/mad/" arch="all" license="GPL-2.0+" depends="" -makedepends="zlib-dev" +makedepends="gperf zlib-dev" subpackages="$pkgname-dev" source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz CVE-2004-2779.patch CVE-2017-11550.patch + gperf.patch " # secfixes: @@ -63,4 +64,5 @@ EOF sha512sums="ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3 libid3tag-0.15.1b.tar.gz 4c27e104d45ae34affc1bef8ec613e65c7e4791185d2ef1cb27974ec7025c06c35d30d6278ce7e3107dff959bd55a708246c3c1a9d5ad7b093424cfb93b79f63 CVE-2004-2779.patch -6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535 CVE-2017-11550.patch" +6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535 CVE-2017-11550.patch +3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb gperf.patch" diff --git a/user/libid3tag/gperf.patch b/user/libid3tag/gperf.patch new file mode 100644 index 000000000..a365811c5 --- /dev/null +++ b/user/libid3tag/gperf.patch @@ -0,0 +1,12 @@ +diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h +--- libid3tag-0.15.1b-orig/compat.h 2004-01-23 10:41:32.000000000 +0100 ++++ libid3tag-0.15.1b/compat.h 2017-03-15 01:49:23.808834401 +0100 +@@ -34,7 +34,7 @@ struct id3_compat { + }; + + struct id3_compat const *id3_compat_lookup(register char const *, +- register unsigned int); ++ register size_t); + + int id3_compat_fixup(struct id3_tag *); + diff --git a/user/libidl/APKBUILD b/user/libidl/APKBUILD index b3143333c..4d7322eca 100644 --- a/user/libidl/APKBUILD +++ b/user/libidl/APKBUILD @@ -15,13 +15,11 @@ source="https://download.gnome.org/sources/libIDL/${pkgver%.*}/libIDL-$pkgver.ta builddir="$srcdir"/libIDL-$pkgver prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD index ee0936554..b52ec8ad9 100644 --- a/user/libidn2/APKBUILD +++ b/user/libidn2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libidn2 -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46" url="https://gitlab.com/libidn/libidn2" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/gnu/libidn/libidn2-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8 libidn2-2.2.0.tar.gz" +sha512sums="a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 libidn2-2.3.0.tar.gz" diff --git a/user/libiec61883/APKBUILD b/user/libiec61883/APKBUILD index b84e7b3e4..a88096a54 100644 --- a/user/libiec61883/APKBUILD +++ b/user/libiec61883/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libieee1284/APKBUILD b/user/libieee1284/APKBUILD index 44996cee3..7bf7633a7 100644 --- a/user/libieee1284/APKBUILD +++ b/user/libieee1284/APKBUILD @@ -8,10 +8,12 @@ url="http://cyberelk.net/tim/software/libieee1284/" arch="all" options="!check" # No test suite. license="GPL-2.0+" +depends="" makedepends="file" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - include.patch" + include.patch + " prepare() { default_prepare @@ -19,8 +21,6 @@ prepare() { } build() { - cd "$builddir" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -30,7 +30,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD index 8bae4ffde..3c57d570c 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/APKBUILD @@ -1,25 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libindicator -pkgver=12.10.1 +pkgver=16.10 pkgrel=0 pkgdesc="Library for builidng indicators for applets" url="https://launchpad.net/libindicator" arch="all" options="!check" # broken tests license="GPL-3.0-only" -makedepends="gtk+3.0-dev" +depends="" +makedepends="gtk+3.0-dev ido-dev autoconf automake libtool" subpackages="$pkgname-dev" -source="https://launchpad.net/libindicator/12.10/$pkgver/+download/libindicator-$pkgver.tar.gz" +source="http://unrealize.co.uk/source/libindicator-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare - update_config_sub + autoreconf -vif } build() { - cd "$builddir" CFLAGS="-Wno-error" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" -j1 install } -sha512sums="d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af libindicator-12.10.1.tar.gz" +sha512sums="451aca0a2bd127bb49cc5b01f4cf1a33d85c3618257e822a16f29774f7eba919fbeca9515e5cb6c5e15bf315d20335ad5742d197cf561d2442891c1552de62a3 libindicator-16.10.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 5ed7e4e7b..21aeed83d 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.14.1 +pkgver=1.15.2 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" arch="all" options="!check" # wow, such broken license="MIT" +depends="" +checkdepends="check-dev valgrind" makedepends="doxygen eudev-dev graphviz libevdev-dev libwacom-dev meson mtdev-dev ninja py3-recommonmark py3-sphinx py3-sphinx-rtd-theme" -checkdepends="check-dev valgrind" subpackages="$pkgname-dev $pkgname-doc" replaces="$pkgname-libs" source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" @@ -31,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c libinput-1.14.1.tar.xz" +sha512sums="f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2 libinput-1.15.2.tar.xz" diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD index e754ad0fa..b870b3be7 100644 --- a/user/libisofs/APKBUILD +++ b/user/libisofs/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libisofs -pkgver=1.5.0 +pkgver=1.5.2 pkgrel=0 pkgdesc="Library for creating and managing iso9660-based filesystems" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" arch="all" license="GPL-2.0+ AND Unicode-TOU" +depends="" makedepends="zlib-dev" subpackages="$pkgname-dev" source="http://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8 libisofs-1.5.0.tar.gz" +sha512sums="65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab libisofs-1.5.2.tar.gz" diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 174323bd3..69d394253 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libixion -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" license="MPL-2.0" depends="" -depends_dev="mdds~1.4" -makedepends="$depends_dev boost-dev" +depends_dev="mdds~1.5" +makedepends="$depends_dev boost-dev spdlog" subpackages="$pkgname-dev" -source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz" +source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz + nullptr.patch" build() { ./configure \ @@ -39,4 +40,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3 libixion-0.14.1.tar.xz" +sha512sums="feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543 libixion-0.15.0.tar.xz +1c4c06c1f0d1ef4d34ec7d92a5238dc9ee11cc8cf09262208468d409579696b754d26efc06987c2d66ae47f896b5273fb28cdba08203286265c6ebf85000c3d9 nullptr.patch" diff --git a/user/libixion/nullptr.patch b/user/libixion/nullptr.patch new file mode 100644 index 000000000..27540bf30 --- /dev/null +++ b/user/libixion/nullptr.patch @@ -0,0 +1,25 @@ +From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 23 Aug 2019 08:50:28 -0700 +Subject: [PATCH] Fix build with clang. + +--- + include/ixion/model_context.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp +index 6ff5b678..dc27ed03 100644 +--- a/include/ixion/model_context.hpp ++++ b/include/ixion/model_context.hpp +@@ -61,7 +61,7 @@ public: + } value; + + /** Initializes the cell to be empty. */ +- input_cell(nullptr_t); ++ input_cell(std::nullptr_t); + /** Boolean cell value. */ + input_cell(bool b); + /** The char array must be null-terminated. */ +-- +2.22.0 + diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index b7b048811..ad4a4076a 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" license="IJG AND BSD-3-Clause AND Zlib" depends="" -makedepends="" +makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz" @@ -32,7 +32,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_STATIC=OFF \ -DWITH_JPEG8=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -51,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 libjpeg-turbo-2.0.3.tar.gz" +sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 7995ea116..982cb008a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -11,10 +11,9 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules libraw-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/applications/$pkgver/src/libkdcraw-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkdcraw-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b7f88ebfaa70e4bf1478b8463beea5e0d636704e91d412d973e5b9fadd7e767d8595137b2995f426180c5234f323587c1d1ab67121e71c78026d3b1f6ea59f89 libkdcraw-19.08.2.tar.xz" +sha512sums="9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d libkdcraw-19.12.3.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index a4c0db71a..1d1243c7a 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -18,10 +18,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtsvg-dev kitemviews-dev kjobwidgets-dev knewstuff-dev kservice-dev kxmlgui-dev ktextwidgets-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-lang $pkgname-carddecks::noarch" -source="https://download.kde.org/stable/applications/$pkgver/src/libkdegames-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkdegames-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,17 +31,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # causes crashes in KPat: @@ -63,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="68ffcd6696b903c0d701996ead9f05ea2d35d72871840cb11ed05d9034bd2cc89017e5ef8fb8508452446075ed157dc6cbcda32762ed5d79ff35bf9e070c7b67 libkdegames-19.08.2.tar.xz" +sha512sums="4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b libkdegames-19.12.3.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index e4cc6f7fd..2dde5afba 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev karchive-dev kio-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libkeduvocdocument-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkeduvocdocument-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b367486f5e756ffff6e6e7c96cb4acba95d5e2ea1ecd6f2e0679d2d794582a24ba9944b4d906dda618b945e7e8a9a4064592b7f429c581aba4bb8d3c26f5c0e6 libkeduvocdocument-19.08.2.tar.xz" +sha512sums="f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063 libkeduvocdocument-19.12.3.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 7072e5213..094839e20 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -11,7 +11,7 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules exiv2-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkexiv2-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6e5a9be84daaa556d6450ebecd412b9daa2be37a9f40583c88c8331009349b3092c03e1e974d8bdb435ddfa8c0d1e37dd5d067ab4334763cbdd0f99f0ff1dc55 libkexiv2-19.08.2.tar.xz" +sha512sums="243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644 libkexiv2-19.12.3.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index d87ffe266..67b24bc4f 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -12,10 +12,9 @@ depends="" depends_dev="qt5-qtbase-dev kxmlgui-dev kservice-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/applications/$pkgver/src/libkipi-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkipi-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,13 +26,12 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a0ec6fa7bb16a33bca198cd292b3d5c5ebcf7983979e1bcee7cc4863a50a6b82cc8b0072bbdb2209cb855c87fc039e165dd3deb0a342214f9377998d5d913640 libkipi-19.08.2.tar.xz" +sha512sums="09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9 libkipi-19.12.3.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 51b9470f8..594c36564 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -13,12 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz - egregious-versions.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,19 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2b68d7d6b154bb16638bb5b533f1239cbbcd610eca14b8e346f14d75c3277f5566e4773797612966abd6dc94fd4f20918c581fded790431e572ba51e59ea1e5e libkleo-19.08.2.tar.xz -5a10a4de59fc4e89295488c88f6f21f88f58f47679c666e0909bbd7bb6b3b867091292d807c2786da4864043d22c84e4f7cd7757fc47c9e046bedb8289c3c7b6 egregious-versions.patch" +sha512sums="88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e libkleo-19.12.3.tar.xz" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch deleted file mode 100644 index 27822b608..000000000 --- a/user/libkleo/egregious-versions.patch +++ /dev/null @@ -1,32 +0,0 @@ -libKleo uses no new APIs. - ---- libkleo-19.04.0/CMakeLists.txt.old 2019-04-12 00:16:32.000000000 +0000 -+++ libkleo-19.04.0/CMakeLists.txt 2019-04-19 06:31:09.576149789 +0000 -@@ -3,7 +3,7 @@ - - project(libkleo VERSION ${PIM_VERSION}) - --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -@@ -26,7 +26,7 @@ - - - set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - set(KDEPIMTEXTEDIT_VERSION "5.12.1") - - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) ---- libkleo-19.08.0/CMakeLists.txt.old 2019-08-15 15:03:03.464693272 +0000 -+++ libkleo-19.08.0/CMakeLists.txt 2019-08-15 15:05:18.800204812 +0000 -@@ -92,6 +92,6 @@ - - - add_subdirectory(src) --install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - ki18n_install(po) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 9524cb848..b8645ac60 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev kconfig-dev kconfigwidgets-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtsvg-dev ki18n-dev kcompletion-dev kcoreaddons-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libkmahjongg-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkmahjongg-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="63f2479283756e3d51caf604547565da0fd2edab3737e77faf9148290ddeeb1f0517250988d20a936cee55716acd1e01a536e4b73332685f25f3df5cc235e4e1 libkmahjongg-19.08.2.tar.xz" +sha512sums="90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09 libkmahjongg-19.12.3.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index eae40d780..0430b4e9b 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -12,12 +12,9 @@ depends_dev="sane-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz - frameworks.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/libksane-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,19 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="94418deb33f53e227b9269deb43974fb6add9658e5d894d277e5bd467b8c5b526a78419b0775a175ba28d058bf627d5b129f702c6829aa76c357817234956a99 libksane-19.08.2.tar.xz -60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch" +sha512sums="83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121 libksane-19.12.3.tar.xz" diff --git a/user/libksane/frameworks.patch b/user/libksane/frameworks.patch deleted file mode 100644 index f44ad09db..000000000 --- a/user/libksane/frameworks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libksane-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:29.000000000 +0000 -+++ libksane-19.04.0/CMakeLists.txt 2019-04-18 22:42:00.675733179 +0000 -@@ -26,7 +26,7 @@ - include(KDECMakeSettings) - include(GenerateExportHeader) - --set(KF5_VERSION "5.55.0") -+set(KF5_VERSION "5.54.0") - - ecm_setup_version( - ${KF5_VERSION} diff --git a/user/libksba/APKBUILD b/user/libksba/APKBUILD index 28f152d7a..6592a21ba 100644 --- a/user/libksba/APKBUILD +++ b/user/libksba/APKBUILD @@ -8,12 +8,12 @@ url="https://www.gnupg.org/software/libksba/index.html" arch="all" # tools are GPL 3, libs are LGPL3/GPL2 license="(LGPL-3.0+ OR GPL-2.0+) AND GPL-3.0+" +depends="" makedepends="libgpg-error-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +22,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index 20754ea80..dfe332792 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkscreen -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -11,8 +11,8 @@ license="LGPL-2.1+ AND GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev - kwayland-dev" -subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland" + qt5-qttools-dev kwayland-dev doxygen" +subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-wayland" source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" build() { @@ -26,7 +26,8 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} . make } @@ -52,4 +53,4 @@ wayland() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ } -sha512sums="773b6782cbe7da02b7bcbe889e98d613321d7e80aa3af7643dd0e21776e2a688f31f83c5429a17a956fb9715c788e90aae80f650a11bf80b667eae948169893a libkscreen-5.12.8.tar.xz" +sha512sums="d1e034067c95da830f056186f275c3daf74a9bac9e4903d3837f03c5d98f79e0cdf888d937efa0d700a2e316c49f1cfc9bdeacc8ca1b06eba2f52ff09784601f libkscreen-5.18.3.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index e8a05e1d1..0fe13d9f4 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libksysguard -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -13,7 +13,8 @@ depends_dev="qt5-qtbase-dev kconfig-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev zlib-dev qt5-qtscript-dev ki18n-dev kauth-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kiconthemes-dev plasma-framework-dev kservice-dev - kwindowsystem-dev kwidgetsaddons-dev" + kwindowsystem-dev kwidgetsaddons-dev qt5-qtwebchannel-dev kio-dev + kglobalaccel-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" @@ -28,7 +29,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9913b5491ad8305efa20e933db3a108da93b83323cde33cdef24f3b40beadb166de99cbd5cbde033d82de913c5a66b493860f9d14351a7b20c401bd1a5648039 libksysguard-5.12.8.tar.xz" +sha512sums="7e7e4971008407d763f58260fb06d91eff58aad4380358bda61572b5d8e55bbddcff5155bd1f40f7f8463874013957f7aa7f3a17dcfe2b47f911302218226cd5 libksysguard-5.18.3.tar.xz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index c226584a7..1ab72541a 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -11,7 +11,7 @@ license="LGPL-2.1+" depends="" 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 ki18n-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" @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD new file mode 100644 index 000000000..988d52900 --- /dev/null +++ b/user/libkworkspace/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> +pkgname=libkworkspace +pkgver=5.18.3 +pkgrel=0 +pkgdesc="KDE Plasma 5 workspace library" +url="https://www.kde.org/plasma-desktop" +arch="all" +options="!check" # Test requires X11 accelration. +license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1+ AND GPL-2.0+ AND MIT AND LGPL-2.1-only AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules libice-dev libsm-dev libxau-dev + kcoreaddons-dev ki18n-dev kscreenlocker-dev kwin-dev kwindowsystem-dev + plasma-framework-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz + header-generation.patch + session.patch + standalone.patch + " +builddir="$srcdir"/plasma-workspace-$pkgver/libkworkspace + +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_TESTING=OFF \ + ${CMAKE_CROSSOPTS} . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e plasma-workspace-5.18.3.tar.xz +3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch +1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch +ef80a0ec492332f4763ab99a3f93553df2dc220361eb116e6e0e06c0f5def61989f6aed84f16b609b34a9b2dbe1b03fe863364b97c349725b747eae1d4cea0b7 standalone.patch" diff --git a/user/libkworkspace/header-generation.patch b/user/libkworkspace/header-generation.patch new file mode 100644 index 000000000..c78fad092 --- /dev/null +++ b/user/libkworkspace/header-generation.patch @@ -0,0 +1,17 @@ +[ 26%] Generating consolekit_manager_interface.cpp, consolekit_manager_interface.h +[ 29%] Generating login1_manager_interface.moc +moc: /usr/src/packages/user/libkworkspace/src/plasma-workspace-5.17.90/libkworkspace/login1_manager_interface.h: No such file + +--- libkworkspace/CMakeLists.txt.old 2020-01-26 23:49:13.514087630 +0000 ++++ libkworkspace/CMakeLists.txt 2020-01-26 23:49:50.290062909 +0000 +@@ -79,8 +79,8 @@ + endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" +- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Session.xml" ++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Seat.xml" ++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Session.xml" + PROPERTIES INCLUDE "loginddbustypes.h" ) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" login1_manager_interface) diff --git a/user/libkworkspace/session.patch b/user/libkworkspace/session.patch new file mode 100644 index 000000000..ec29807c1 --- /dev/null +++ b/user/libkworkspace/session.patch @@ -0,0 +1,23 @@ +--- libkworkspace/sessionmanagementbackend.cpp.old 2020-01-16 12:37:11.000000000 +0000 ++++ libkworkspace/sessionmanagementbackend.cpp 2020-01-26 23:48:25.419351063 +0000 +@@ -77,6 +77,11 @@ + + /*********************************************************************************/ + ++bool LogindSessionBackend::exists() ++{ ++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); ++} ++ + LogindSessionBackend::LogindSessionBackend() + { + m_login1 = new OrgFreedesktopLogin1ManagerInterface(QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"), QDBusConnection::systemBus(), this); +@@ -199,7 +204,7 @@ + + bool ConsoleKitSessionBackend::exists() + { +- return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); ++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConosleKit")); + } + + ConsoleKitSessionBackend::ConsoleKitSessionBackend() diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch new file mode 100644 index 000000000..351e7021e --- /dev/null +++ b/user/libkworkspace/standalone.patch @@ -0,0 +1,111 @@ +From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 10 Jul 2019 11:38:44 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++--- + 1 file changed, 66 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c4c47870..53bc780b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++ set(PROJECT_VERSION "5.18.3") ++ set(PROJECT_VERSION_MAJOR 5) ++ ++ cmake_minimum_required(VERSION 3.0) ++ ++ set(QT_MIN_VERSION "5.12.0") ++ set(KF5_MIN_VERSION "5.58.0") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++ include(KDEInstallDirs) ++ include(KDECMakeSettings) ++ include(KDECompilerSettings NO_POLICY_SCOPE) ++ include(ECMMarkNonGuiExecutable) ++ include(CMakePackageConfigHelpers) ++ include(WriteBasicConfigVersionFile) ++ include(CheckIncludeFiles) ++ include(FeatureSummary) ++ include(ECMQtDeclareLoggingCategory) ++ include(KDEPackageAppTemplates) ++ include(ECMMarkAsTest) ++ include(GenerateExportHeader) ++ ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++ find_package(KWinDBusInterface CONFIG REQUIRED) ++ find_package(KScreenLocker 5.13.80 REQUIRED) ++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++ URL "http://www.x.org" ++ TYPE OPTIONAL ++ PURPOSE "Required for X11 support") ++ ++ if(X11_FOUND) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++ set(HAVE_X11 1) ++ endif() ++ ++ if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ endif() ++ ++ check_include_files(unistd.h HAVE_UNISTD_H) ++ ++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" + "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) + +-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) +- +-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +- + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) + + +@@ -101,3 +158,8 @@ if(BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) + endif() ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.22.0 + diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD index 5c97a2aec..674f39560 100644 --- a/user/liblangtag/APKBUILD +++ b/user/liblangtag/APKBUILD @@ -8,8 +8,8 @@ url="https://bitbucket.org/tagoh/liblangtag" arch="all" license="LGPL-3.0+ OR MPL-2.0" depends="" -makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev" checkdepends="check-dev" +makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2" diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD index def4dc83c..2c7f03f5d 100644 --- a/user/liblbxutil/APKBUILD +++ b/user/liblbxutil/APKBUILD @@ -13,14 +13,12 @@ subpackages="$pkgname-dev" source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 24765e4fc..020e173ee 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=liblxqt pkgver=0.14.1 pkgrel=0 @@ -16,25 +16,22 @@ subpackages="$pkgname-dev" source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz" diff --git a/user/libmad/APKBUILD b/user/libmad/APKBUILD index 58da6a323..38f6a0deb 100644 --- a/user/libmad/APKBUILD +++ b/user/libmad/APKBUILD @@ -20,7 +20,6 @@ source="https://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.g " prepare() { - cd "$builddir" update_config_sub default_prepare libtoolize --force && aclocal -I m4 && autoconf \ @@ -28,7 +27,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,7 +37,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/mad.pc "$pkgdir"/usr/lib/pkgconfig/mad.pc } diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD index f7ea8d723..30b8fb665 100644 --- a/user/libmatekbd/APKBUILD +++ b/user/libmatekbd/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libmatekbd -pkgver=1.22.0 +pkgver=1.24.0 pkgrel=0 pkgdesc="Keyboard libraries for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmatekbd-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="79f19455bb6c0df5a50e445907ac12d6bd92a54cd086e0303890bc67350de3d94b2fd665efdaec85f84a42d76af430ad0a1b9639da078179ac25d27c4a325281 libmatekbd-1.22.0.tar.xz" +sha512sums="6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655 libmatekbd-1.24.0.tar.xz" diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD index a3b1fc797..3d668c996 100644 --- a/user/libmatemixer/APKBUILD +++ b/user/libmatemixer/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libmatemixer -pkgver=1.22.0 +pkgver=1.24.0 pkgrel=0 pkgdesc="Sound mixer library for the MATE desktop environment" url="https://mate-desktop.org" @@ -9,11 +9,11 @@ arch="all" license="LGPL-2.0+" depends="" makedepends="alsa-lib-dev intltool pulseaudio-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-alsa $pkgname-pulse" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang + $pkgname-alsa $pkgname-pulse" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmatemixer-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,4 +46,4 @@ pulse() { mv "$pkgdir"/usr/lib/$pkgname/$pkgname-pulse.so "$subpkgdir"/usr/lib/$pkgname } -sha512sums="6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8 libmatemixer-1.22.0.tar.xz" +sha512sums="bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf libmatemixer-1.24.0.tar.xz" diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD index da65670d9..44c7bd1b0 100644 --- a/user/libmateweather/APKBUILD +++ b/user/libmateweather/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libmateweather -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Weather library for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,25 +13,24 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmateweather-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --with-zoneinfo-dir \ + --enable-all-translations-in-one-xml make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c7f5214c14fa3bf6bbb55442ea450c0f3c0a2849e29f72821c22db88baf3763c72dd6d2a27795c23d8ecc69d190a55313f6cfd18dc2a41c233a7e1e5653a0868 libmateweather-1.22.1.tar.xz" +sha512sums="077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300 libmateweather-1.24.0.tar.xz" diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD index 6a8ea1f9d..076e9a9e2 100644 --- a/user/libmatroska/APKBUILD +++ b/user/libmatroska/APKBUILD @@ -8,24 +8,23 @@ url="https://www.matroska.org/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" -makedepends="libebml-dev>=1.3.3" +depends="" +makedepends="cmake libebml-dev>=1.3.3" subpackages="$pkgname-dev" source="https://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" 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" + -DCMAKE_C_FLAGS="$CFLAGS" . make } package() { - cd "$builddir" make install DESTDIR="$pkgdir" } diff --git a/user/libmaxminddb/APKBUILD b/user/libmaxminddb/APKBUILD new file mode 100644 index 000000000..f1762c4ca --- /dev/null +++ b/user/libmaxminddb/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=libmaxminddb +pkgver=1.4.2 +pkgrel=0 +pkgdesc="Library for the MaxMind DB file format" +url="http://maxmind.github.io/libmaxminddb/" +arch="all" +license="Apache-2.0" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/maxmind/libmaxminddb/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 libmaxminddb-1.4.2.tar.gz" diff --git a/user/libmbim/APKBUILD b/user/libmbim/APKBUILD index 8c7142fe8..ab32fba1b 100644 --- a/user/libmbim/APKBUILD +++ b/user/libmbim/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libmbim -pkgver=1.18.2 +pkgver=1.20.4 pkgrel=0 pkgdesc="Library for interfacing with WWAN modems" url="https://www.freedesktop.org/wiki/Software/libmbim/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2da289f60d2fb9678f969b591f8addc724bef8c2780011e62567a9ade2ebc71bc4dd76e54f93335aa475e65c733e3628d9f2f96f81f8797ec809042c046eb828 libmbim-1.18.2.tar.xz" +sha512sums="246f601ddda48b10e8a7b337d6e996dc65f6300e87f13d5260a5c903f95e9035e8a8d1c88540101c22fb3c44eca242451ab75bbfdb6503cfbce279c6d4cf99c8 libmbim-1.20.4.tar.xz" diff --git a/user/libmms/APKBUILD b/user/libmms/APKBUILD index 85cec3b25..f48006114 100644 --- a/user/libmms/APKBUILD +++ b/user/libmms/APKBUILD @@ -16,13 +16,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libmowgli/APKBUILD b/user/libmowgli/APKBUILD index 461075184..777ee35b6 100644 --- a/user/libmowgli/APKBUILD +++ b/user/libmowgli/APKBUILD @@ -12,7 +12,8 @@ depends="" makedepends="openssl-dev" subpackages="$pkgname-dev" source="https://github.com/atheme/libmowgli-2/archive/v$pkgver/libmowgli-$pkgver.tar.gz - cacheline.patch" + cacheline.patch + " builddir="$srcdir"/$pkgname-2-$pkgver build() { diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD index c3ae2be64..c1fa255fd 100644 --- a/user/libmpd/APKBUILD +++ b/user/libmpd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libmpd pkgver=11.8.17 pkgrel=0 @@ -7,18 +7,17 @@ pkgdesc="GObject-based client library for the music player daemon" url="https://gmpclient.org/" arch="all" license="GPL-2.0+ AND BSD-3-Clause" +depends="" makedepends="glib-dev" subpackages="$pkgname-dev" source="http://download.sarine.nl/Programs/gmpc/11.8/libmpd-$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libmpeg2/APKBUILD b/user/libmpeg2/APKBUILD index f24035f54..b2a4a6056 100644 --- a/user/libmpeg2/APKBUILD +++ b/user/libmpeg2/APKBUILD @@ -6,8 +6,10 @@ pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams" url="http://libmpeg2.sourceforge.net/" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="" +makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev + autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc mpeg2dec" -makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev" source="http://distfiles.gentoo.org/distfiles/libmpeg2-$pkgver.tar.gz arm-private-symbols.patch arm-textrel.patch @@ -15,8 +17,8 @@ source="http://distfiles.gentoo.org/distfiles/libmpeg2-$pkgver.tar.gz " prepare() { - update_config_sub default_prepare + update_config_sub autoreconf -vif } diff --git a/user/libmspub/APKBUILD b/user/libmspub/APKBUILD index 746c1a84e..0d528f945 100644 --- a/user/libmspub/APKBUILD +++ b/user/libmspub/APKBUILD @@ -8,13 +8,13 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" arch="all" options="!check" # No test suite. license="MPL-2.0 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+)" -depends_dev="boost-dev librevenge-dev" -makedepends="$depends_dev icu-dev doxygen" +depends="" +depends_dev="boost-dev" +makedepends="$depends_dev doxygen icu-dev librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD index 3f8e07b45..1baa0e7b4 100644 --- a/user/libmtp/APKBUILD +++ b/user/libmtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libmtp -pkgver=1.1.16 +pkgver=1.1.17 pkgrel=0 pkgdesc="Library for accessing MTP (Media Transfer Protocol) devices" url="http://libmtp.sourceforge.net/" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0 libmtp-1.1.16.tar.gz" +sha512sums="f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2 libmtp-1.1.17.tar.gz" diff --git a/user/libmwaw/APKBUILD b/user/libmwaw/APKBUILD index 98bef424d..b3699997f 100644 --- a/user/libmwaw/APKBUILD +++ b/user/libmwaw/APKBUILD @@ -12,7 +12,7 @@ depends="" depends_dev="boost-dev attr-dev zlib-dev" makedepends="$depends_dev librevenge-dev doxygen" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { ./configure \ diff --git a/user/libnfs/APKBUILD b/user/libnfs/APKBUILD index 74aad6e14..d060df361 100644 --- a/user/libnfs/APKBUILD +++ b/user/libnfs/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnfs -pkgver=3.0.0 +pkgver=4.0.0 pkgrel=0 pkgdesc="Client library for accessing NFS shares" url="https://github.com/sahlberg/libnfs" arch="all" license="LGPL-2.1+ AND BSD-2-Clause-FreeBSD AND GPL-3.0+" +depends="" makedepends="autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/sahlberg/libnfs/archive/libnfs-$pkgver.tar.gz @@ -15,7 +16,6 @@ source="https://github.com/sahlberg/libnfs/archive/libnfs-$pkgver.tar.gz builddir="$srcdir"/libnfs-libnfs-$pkgver build() { - cd "$builddir" ./bootstrap ./configure \ --build=$CBUILD \ @@ -29,14 +29,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b libnfs-3.0.0.tar.gz +sha512sums="3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa libnfs-4.0.0.tar.gz 39ff82b5371185172501babbb9b48c019408c21e3c9f8a17a2d8a70f7c35e648704873db368aceb23901a99f7f44d04495d6754c4dba03b5d2e593381ed16c53 unconditional-sys-time.h.patch" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 7301a17b2..b634ff0c2 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,15 +1,19 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=libnftnl -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" arch="all" license="GPL-2.0+" +depends="" makedepends="libmnl-dev" subpackages="$pkgname-dev" -source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2" +source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2 + nft-flowtable-test.patch + " build() { ./configure \ @@ -30,4 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2" +sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 libnftnl-1.1.5.tar.bz2 +0978037a5dec71a96f5713dbc5a4dc8dc30b7b37d79ec7dd6ec8b201740303785c3625c21a2388f8fd5d9d446f8706ac14d0bf5909a48ed3ef3e7417173dd2c8 nft-flowtable-test.patch" diff --git a/user/libnftnl/nft-flowtable-test.patch b/user/libnftnl/nft-flowtable-test.patch new file mode 100644 index 000000000..719c1f2cf --- /dev/null +++ b/user/libnftnl/nft-flowtable-test.patch @@ -0,0 +1,37 @@ +From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Mon, 2 Dec 2019 18:29:56 +0100 +Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE + +Marshalling code around that attribute has been dropped by commit +d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is +lost during the test. + +Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a +later point, leave the test code in place but just comment it out. + +Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") +Signed-off-by: Phil Sutter <phil@nwl.cc> +Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + tests/nft-flowtable-test.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c +index 3edb00d..8ab8d4c 100644 +--- a/tests/nft-flowtable-test.c ++++ b/tests/nft-flowtable-test.c +@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) + print_err("Flowtable use mismatches"); ++#if 0 + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) + print_err("Flowtable size mismatches"); ++#endif + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) + print_err("Flowtable flags mismatches"); +-- +2.24.1 diff --git a/user/libnih/APKBUILD b/user/libnih/APKBUILD index 9636f2a1a..3808dc3a7 100644 --- a/user/libnih/APKBUILD +++ b/user/libnih/APKBUILD @@ -10,8 +10,8 @@ options="!checkroot" license="GPL-2.0-only" depends="" depends_dev="dbus-dev expat-dev" -makedepends="$depends_dev" checkdepends="dbus linux-headers" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz musl-fix-signals.patch @@ -21,13 +21,11 @@ source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname} " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +37,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libnl3/APKBUILD b/user/libnl3/APKBUILD index f5a2e5668..c9a12da3a 100644 --- a/user/libnl3/APKBUILD +++ b/user/libnl3/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: pkgname=libnl3 -pkgver=3.2.28 +pkgver=3.5.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) -pkgrel=2 +pkgrel=0 pkgdesc="Library for applications dealing with netlink sockets" url="http://www.infradead.org/~tgr/libnl/" arch="all" license="LGPL-2.1-only AND GPL-2.0-only" depends="" -makedepends="linux-headers flex bison" checkdepends="check-dev" +makedepends="linux-headers flex bison" subpackages="$pkgname-dev $pkgname-doc $pkgname-cli" source="https://github.com/thom311/libnl/releases/download/libnl$_pkgver/libnl-$pkgver.tar.gz" builddir="$srcdir/libnl-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +44,4 @@ cli() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 libnl-3.2.28.tar.gz" +sha512sums="9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c libnl-3.5.0.tar.gz" diff --git a/user/libnumbertext/APKBUILD b/user/libnumbertext/APKBUILD index 38bbb096c..9d1302bc6 100644 --- a/user/libnumbertext/APKBUILD +++ b/user/libnumbertext/APKBUILD @@ -27,9 +27,7 @@ build() { package() { make DESTDIR="$pkgdir" install - - cd data - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C data install } sha512sums="4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3 libnumbertext-1.0.5.tar.xz" diff --git a/user/libodfgen/APKBUILD b/user/libodfgen/APKBUILD index 64eb49c62..7eeed1f6f 100644 --- a/user/libodfgen/APKBUILD +++ b/user/libodfgen/APKBUILD @@ -8,13 +8,12 @@ url="https://sourceforge.net/p/libwpd/wiki/libodfgen/" arch="all" license="MPL-2.0 OR LGPL-2.1+" depends="" -depends_dev="boost-dev librevenge-dev" -makedepends="$depends_dev doxygen" +depends_dev="boost-dev" +makedepends="$depends_dev doxygen librevenge-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir/test" - make launch_all + make -C test launch_all } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libogg/APKBUILD b/user/libogg/APKBUILD index c452d7890..f8f8e1f7a 100644 --- a/user/libogg/APKBUILD +++ b/user/libogg/APKBUILD @@ -7,12 +7,12 @@ pkgdesc="Ogg bitstream and framing library" url="https://xiph.org/ogg/" arch="all" license="BSD-3-Clause" +depends="" +makedepends="" subpackages="$pkgname-doc $pkgname-dev" source="http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,15 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install - - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9 libogg-1.3.4.tar.gz" diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD index b29becc3f..a03e7c089 100644 --- a/user/libopenraw/APKBUILD +++ b/user/libopenraw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libopenraw pkgver=0.1.3 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Library for decoding RAW camera image formats" url="https://libopenraw.freedesktop.org/" arch="all" license="LGPL-2.1+ AND LGPL-3.0+ AND GPL-2.0+" +depends="" makedepends="boost-dev libjpeg-turbo-dev libxml2-dev glib-dev gdk-pixbuf-dev" subpackages="$pkgname-dev" source="https://libopenraw.freedesktop.org/download/libopenraw-$pkgver.tar.bz2" diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index 3f0434eae..378ff6bbd 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -1,16 +1,19 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liborcus -pkgver=0.14.1 +pkgver=0.15.3 pkgrel=0 pkgdesc="Library for processing spreadsheet documents" url="https://gitlab.com/orcus/orcus" arch="all" license="MPL-2.0 AND MIT" -depends_dev="boost-dev mdds~1.4 libixion-dev~0.14" +depends="" +depends_dev="boost-dev mdds~1.5 libixion-dev~0.15" makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" -source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz" +source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz + sepples-is-a-sin.patch + " build() { ./configure \ @@ -32,4 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f liborcus-0.14.1.tar.xz" +sha512sums="bb5495a64ac5f984e107feb36dfe5c801d2ce7e2fcbee8f8bc779d87001e1fcb1d1f70ee2695eb976f1553c59908a15f887ceeb7ccfc556d4476ea846c5036f2 liborcus-0.15.3.tar.xz +a5eca9d173942926a2c2469b9a40099ae22f42e11c44590045b126c1acca07aedbf27af7ae336ae6f6e1271036f795ead0ca00e77e53c67581ed4c387600f9a9 sepples-is-a-sin.patch" diff --git a/user/liborcus/sepples-is-a-sin.patch b/user/liborcus/sepples-is-a-sin.patch new file mode 100644 index 000000000..210ef2c86 --- /dev/null +++ b/user/liborcus/sepples-is-a-sin.patch @@ -0,0 +1,11 @@ +--- liborcus-0.15.3/src/liborcus/json_map_tree.cpp 2019-08-02 19:31:14.000000000 -0400 ++++ liborcus-0.15.3/src/liborcus/json_map_tree.cpp 2020-02-06 23:35:09.274550724 -0500 +@@ -14,6 +14,8 @@ + + namespace orcus { + ++constexpr json_map_tree::child_position_type json_map_tree::node_child_default_position; ++ + namespace { + + void throw_path_error(const char* file, int line, const pstring& path) diff --git a/user/libotr/APKBUILD b/user/libotr/APKBUILD index 98c18ffff..513c9f47a 100644 --- a/user/libotr/APKBUILD +++ b/user/libotr/APKBUILD @@ -21,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpagemaker/APKBUILD b/user/libpagemaker/APKBUILD index d6194da5d..eab913f3c 100644 --- a/user/libpagemaker/APKBUILD +++ b/user/libpagemaker/APKBUILD @@ -9,13 +9,11 @@ arch="all" options="!check" # No test suite. license="MPL-2.0" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev boost-dev doxygen" +makedepends="boost-dev doxygen librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpaper/APKBUILD b/user/libpaper/APKBUILD index 99f2492c4..28bb47d2c 100644 --- a/user/libpaper/APKBUILD +++ b/user/libpaper/APKBUILD @@ -9,7 +9,7 @@ options="!check" # No test suite. license="GPL-2.0-only" subpackages="$pkgname-dev $pkgname-doc" depends="" -makedepends="" +makedepends="autoconf automake libtool" source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_$pkgver.tar.gz" prepare() { diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD index 714e098f2..17df8ba0f 100644 --- a/user/libpcap/APKBUILD +++ b/user/libpcap/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="System-independent interface for user-level packet capture" url="http://www.tcpdump.org/" arch="all" -options="!check" +options="!check" # No test suite. license="BSD-3-Clause" depends="" makedepends="autoconf bison bluez-dev flex linux-headers" diff --git a/user/libpciaccess/APKBUILD b/user/libpciaccess/APKBUILD index 6e825dfb2..8d7bed86c 100644 --- a/user/libpciaccess/APKBUILD +++ b/user/libpciaccess/APKBUILD @@ -6,6 +6,7 @@ pkgdesc="X11 PCI access library" url="https://www.X.Org/" arch="all" license="MIT AND X11" +depends="" makedepends="util-macros" subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2 diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index ed8bb27f2..9c517e05f 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libpeas -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="GObject-based plugin framework" url="https://gnome.org" @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="b4baa03ded9d787e7a1ee2be943617f5c84564bf299699934c47ded6c60ff62a7f27ab2594cd0ffba2d8979d8b72113d1b5e910eebd80305f3aa538db0d45314 libpeas-1.24.0.tar.xz" +sha512sums="9e2f2f3e7208baa7e72f6b963ad2bca7bf2789ffb2656151bd913be10d45f3e0d40379d69513d2ecf597cc6d211d157c273cc841dfd445829d0cb57d24275e1b libpeas-1.24.1.tar.xz" diff --git a/user/libpfm/APKBUILD b/user/libpfm/APKBUILD index c30624312..9cfe4b7aa 100644 --- a/user/libpfm/APKBUILD +++ b/user/libpfm/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/perfmon2/libpfm4/libpfm-$pkgver.tar.gz" build() { - cd "$builddir" CFLAGS="$CFLAGS -Wno-error=cpp" make } package() { - cd "$builddir" make PREFIX="/usr" DESTDIR="$pkgdir" install } diff --git a/user/libpng/APKBUILD b/user/libpng/APKBUILD index ec109c15a..e22885dbd 100644 --- a/user/libpng/APKBUILD +++ b/user/libpng/APKBUILD @@ -17,7 +17,6 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz " prepare() { - cd "$builddir" gunzip -c "$srcdir"/$pkgname-$pkgver-apng.patch.gz | patch -p1 default_prepare # libpng-fix-arm-neon.patch modifies configure.ac @@ -25,7 +24,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,16 +35,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - rm -f "$pkgdir"/usr/lib/*.la } utils() { diff --git a/user/libproxy/APKBUILD b/user/libproxy/APKBUILD index ffeac9d28..1cdb0c9b5 100644 --- a/user/libproxy/APKBUILD +++ b/user/libproxy/APKBUILD @@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$p " build() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBEXEC_INSTALL_DIR=lib \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD index 38ba69198..66d49e293 100644 --- a/user/libpsl/APKBUILD +++ b/user/libpsl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libpsl pkgver=0.21.0 pkgrel=0 @@ -7,13 +7,14 @@ pkgdesc="C library for examining the Public Suffix List" url="https://rockdaboot.github.io/libpsl" arch="all" 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 - use-python3.patch" + use-python3.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpthread-stubs/APKBUILD b/user/libpthread-stubs/APKBUILD index 02af44664..13ce0a53a 100644 --- a/user/libpthread-stubs/APKBUILD +++ b/user/libpthread-stubs/APKBUILD @@ -7,10 +7,11 @@ url="https://cgit.freedesktop.org/xcb/pthread-stubs" arch="all" options="!dbg" license="X11" +depends="" +makedepends="" source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -19,12 +20,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD index af76e2f49..48e123d7c 100644 --- a/user/libpwquality/APKBUILD +++ b/user/libpwquality/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpwquality -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=0 pkgdesc="Password quality checking library" url=" " @@ -40,4 +40,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257 libpwquality-1.4.1.tar.bz2" +sha512sums="6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879 libpwquality-1.4.2.tar.bz2" diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD index 0a02a5926..6ec80b85b 100644 --- a/user/libqalculate/APKBUILD +++ b/user/libqalculate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqalculate -pkgver=2.8.1 +pkgver=3.6.0 pkgrel=0 pkgdesc="Library implementing a powerful, versatile desktop calculator" url="https://qalculate.github.io/" @@ -12,11 +12,9 @@ depends="" depends_dev="gmp-dev mpfr-dev" makedepends="$depends_dev curl-dev icu-dev intltool libxml2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang qalc" -source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz - " +source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +39,4 @@ qalc() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a libqalculate-2.8.1.tar.gz" +sha512sums="afef26633d28f4c9b018a17056bf9645118b2e8698d4d5ba76a4a7df783503579381db448a5d557059fc7629d175385353d7eabeef3636ec0cad669fd68e5d0f libqalculate-3.6.0.tar.gz" diff --git a/user/libqmi/APKBUILD b/user/libqmi/APKBUILD index 4b0f96ece..f662aa30d 100644 --- a/user/libqmi/APKBUILD +++ b/user/libqmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmi -pkgver=1.24.0 +pkgver=1.24.4 pkgrel=0 pkgdesc="Library for interfacing with Qualcomm modems" url="https://www.freedesktop.org/wiki/Software/libqmi/" @@ -10,9 +10,7 @@ license="LGPL-2.0+" depends="" makedepends="glib-dev libgudev-dev python3" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz - endian.patch - " +source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e899765e67c1db0f758030e78b296015c476f938bb2afa01594b3e71a0b8d5fc2237c8272497aec891d5555523ecf0fecd69c4d0e14165c07072780621b3b502 libqmi-1.24.0.tar.xz -af01895913a66de52a79cb6de63a56025c8ee84ca7d62b91d3798d626b2eb133bc3c933fdac49d7b73874f3f641c158fb466b7567e6224d7d8a0b58e932a14d5 endian.patch" +sha512sums="7850c2754763d3d0addfa6760ed11ba895dd78421a6b3453224b50bd97d09109ccacf16c322d81c8e512321e45fd8e611015796c86a94f30acf8611eb37e8a1a libqmi-1.24.4.tar.xz" diff --git a/user/libqmi/endian.patch b/user/libqmi/endian.patch deleted file mode 100644 index cf84b481b..000000000 --- a/user/libqmi/endian.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 6030b9bb2e0ed9f3824a34cef548feaefceb9e37 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 4 Oct 2019 17:45:10 -0500 -Subject: [PATCH 1/2] libqmi-glib: Fix message creation on BE systems - -Creation of the fake QMUX header wrote the length as a native value, which -caused the wrong value to be written on big endian systems. - -Before, a test run on a ppc64 system gave: - -ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed: (self) - /libqmi-glib/message/new/request: OK - /libqmi-glib/message/new/request-from-data: FAIL - -Adding a g_assert_no_error gave the more helpful message: - -ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed (error == NULL): QMUX length and buffer length don't match (3072 != 12) (qmi_core_error_quark, 4) - -After this commit is applied, all tests pass on a big endian ppc64 system. ---- - src/libqmi-glib/qmi-message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libqmi-glib/qmi-message.c b/src/libqmi-glib/qmi-message.c -index b82069e..41c5b43 100644 ---- a/src/libqmi-glib/qmi-message.c -+++ b/src/libqmi-glib/qmi-message.c -@@ -478,7 +478,7 @@ qmi_message_new_from_data (QmiService service, - /* Set up fake QMUX header */ - buffer = (struct full_message *)(self->data); - buffer->marker = QMI_MESSAGE_QMUX_MARKER; -- buffer->qmux.length = buffer_len - 1; -+ buffer->qmux.length = GUINT16_TO_LE(buffer_len - 1); - buffer->qmux.flags = 0; - buffer->qmux.service = service; - buffer->qmux.client = client_id; --- -2.22.1 - -From e299023094516a5be3ffb05f66ea90c47e966811 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 4 Oct 2019 17:49:07 -0500 -Subject: [PATCH 2/2] libqmi-glib: Add small error test to test-message - -The previous commit was easier to diagnose with the error condition from -qmi_message_new_from_data provided. This change adds g_assert_no_error to -the test_message_new_request_from_data case so that any future issues can -be diagnosed quickly. ---- - src/libqmi-glib/test/test-message.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libqmi-glib/test/test-message.c b/src/libqmi-glib/test/test-message.c -index b6ea711..e41917a 100644 ---- a/src/libqmi-glib/test/test-message.c -+++ b/src/libqmi-glib/test/test-message.c -@@ -292,7 +292,8 @@ test_message_new_request_from_data (void) - qmi = g_byte_array_new (); - g_byte_array_append (qmi, expected_buffer, sizeof (expected_buffer)); - -- self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, NULL); -+ self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, &error); -+ g_assert_no_error (error); - g_assert (self); - - /* check that the QMUX header contains the right values*/ --- -2.22.1 - diff --git a/user/libqrcodegen/APKBUILD b/user/libqrcodegen/APKBUILD new file mode 100644 index 000000000..28b6e890e --- /dev/null +++ b/user/libqrcodegen/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=libqrcodegen +pkgver=1.5.0 +pkgrel=0 +pkgdesc="Multi-language QR code generation library" +url="https://www.nayuki.io/page/qr-code-generator-library" +arch="all" +options="!dbg !check" # No test suite. +license="MIT" +depends="" +makedepends="" +source="libqrcodegen-$pkgver.tar.gz::https://github.com/nayuki/QR-Code-generator/archive/v$pkgver.tar.gz + cxxflags.patch + " +builddir="$srcdir/QR-Code-generator-$pkgver" + +build() { + CXXFLAGS="$CXXFLAGS -fPIC" make -C cpp +} + +package() { + install -Dm644 cpp/libqrcodegen.a "$pkgdir"/usr/lib/libqrcodegencpp.a + for i in QrCode QrSegment BitBuffer; do + install -Dm644 cpp/"$i".hpp \ + "$pkgdir"/usr/include/qrcodegen/"$i".hpp + done +} + +sha512sums="f7887bb1901a7de3f198c7483c35c26552fc51b4a25a5a0e5878562ab9742fc55da33eb01984aab35866b0f092405da3462dc389d125c8c474e4312a57d4183e libqrcodegen-1.5.0.tar.gz +0d0a48eaa084c0ce2ac1acc3c634e5cea4a56864b18aab740ff0f0513b3dc300ec5dfde2e2dd86f3031102de565b849ec11d3fe721862c73bb0df89395103a97 cxxflags.patch" diff --git a/user/libqrcodegen/cxxflags.patch b/user/libqrcodegen/cxxflags.patch new file mode 100644 index 000000000..1007469dd --- /dev/null +++ b/user/libqrcodegen/cxxflags.patch @@ -0,0 +1,13 @@ +--- QR-Code-generator-1.5.0/cpp/Makefile 2019-07-15 23:16:50.000000000 +0000 ++++ QR-Code-generator-1.5.0/cpp/Makefile 2020-02-04 05:42:53.910203051 +0000 +@@ -30,10 +30,6 @@ + + # Mandatory compiler flags + CXXFLAGS += -std=c++11 +-# Diagnostics. Adding '-fsanitize=address' is helpful for most versions of Clang and newer versions of GCC. +-CXXFLAGS += -Wall -fsanitize=undefined +-# Optimization level +-CXXFLAGS += -O1 + + + # ---- Controlling make ---- diff --git a/user/libqrencode/APKBUILD b/user/libqrencode/APKBUILD index 12690b8d7..efd3a54df 100644 --- a/user/libqrencode/APKBUILD +++ b/user/libqrencode/APKBUILD @@ -8,19 +8,18 @@ url="https://fukuchi.org/works/qrencode/index.html" arch="all" options="!check" # No test suite. license="LGPL-2.1+" +depends="" makedepends="libpng-dev libtool" subpackages="$pkgname-dev $pkgname-doc" source="https://fukuchi.org/works/qrencode/qrencode-$pkgver.tar.bz2" builddir="$srcdir/qrencode-$pkgver" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +32,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index e515a1dc4..60f967c06 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libqtxdg -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=0 pkgdesc="Qt5-based library implementing the XDG spec" url="https://lxqt.org" @@ -14,11 +14,9 @@ subpackages="$pkgname-dev" source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,18 +26,16 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTS=True \ -DBUILD_DEV_UTILS=True \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - make test + make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3 libqtxdg-3.3.1.tar.xz" +sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 libqtxdg-3.4.0.tar.xz" diff --git a/user/libquotient/APKBUILD b/user/libquotient/APKBUILD index b954f5c95..003f53e3f 100644 --- a/user/libquotient/APKBUILD +++ b/user/libquotient/APKBUILD @@ -25,7 +25,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD index 89f03aa6f..7876ab2c9 100644 --- a/user/libqxp/APKBUILD +++ b/user/libqxp/APKBUILD @@ -8,8 +8,8 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp" arch="all" license="MPL-2.0" depends="" -makedepends="librevenge-dev icu-dev doxygen" checkdepends="cppunit-dev" +makedepends="librevenge-dev icu-dev doxygen" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" @@ -23,9 +23,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ make - - cd docs - make + make -C docs } check() { diff --git a/user/libraw1394/APKBUILD b/user/libraw1394/APKBUILD index 0c8bb3501..fadd2d415 100644 --- a/user/libraw1394/APKBUILD +++ b/user/libraw1394/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libraw1394 pkgver=2.1.2 pkgrel=2 @@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD index 272f5dc82..d03f54449 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.2.0 +pkgver=1.3.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="7caddeec09bd1556688f0011f5cae49f8b0cde55b8dbc1296b3d2a39879badc42b7f59369bb1938ce7c4c4ff8b0fe4f1973b923c3db603466c10a4c015306522 librdkafka-1.2.0.tar.gz" +sha512sums="94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669 librdkafka-1.3.0.tar.gz" diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD index b6968e4ab..29ec4c2d3 100644 --- a/user/libreoffice/APKBUILD +++ b/user/libreoffice/APKBUILD @@ -6,19 +6,17 @@ # and you definitely don't want "deps" in ERROR_CLEANUP. # Just "abuild clean undeps" once you're completely done. # -# Build requirements: -# * RAM: -# 8 GB with Hulu in Chromium in the background is enough. +# Even with JOBS=4 you're gonna want at least 8 GB of RAM. # # * Disk space: -# * Dependencies: 1131 MiB -# * Downloads: 398 MiB -# * Subtotal: 1529 MiB = 1.5 GiB -# * Complete src: 33970 MiB -# * Complete pkg: 9637 MiB -# * All APKs: 2362 MiB = 2.3 GiB -# * Subtotal: 45969 MiB = 44.9 GiB -# * Grand total: 47498 MiB = 46.4 GiB +# * Dependencies: 1557 MiB = 1.5 GiB +# * Downloads: 515 MiB +# * Subtotal: 2072 MiB = 2.0 GiB +# * Complete src: 34134 MiB +# * Complete pkg: 9399 MiB +# * All APKs: 2282 MiB = 2.2 GiB +# * Subtotal: 45815 MiB = 44.7 GiB +# * Grand total: 47887 MiB = 46.8 GiB # # Build stats: # * Run "abuild deps fetch" first. @@ -29,7 +27,7 @@ # abuild -r 29590.16s user 1077.69s system 340% cpu 2:30:13.12 total pkgname=libreoffice -pkgver=6.2.1.2 +pkgver=6.4.0.3 pkgrel=0 case "$pkgver" in *.*.*.*) _ver="${pkgver%.*}";; @@ -46,30 +44,38 @@ arch="all" options="" license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+) AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2.1 AND LGPL-3.0+ AND BSD-3-Clause AND SISSL AND IJG AND CC-BY-SA-3.0" -depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw - $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" +depends="$pkgname-base=$pkgver-r$pkgrel + $pkgname-calc=$pkgver-r$pkgrel + $pkgname-common=$pkgver-r$pkgrel + $pkgname-draw=$pkgver-r$pkgrel + $pkgname-impress=$pkgver-r$pkgrel + $pkgname-math=$pkgver-r$pkgrel + $pkgname-connector-postgres=$pkgver-r$pkgrel + $pkgname-writer=$pkgver-r$pkgrel + " # 1. Base dependencies # 2. GUIs - gen # 3. GUIs - gtk+2.0 # 4. File formats -makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which - coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex fontconfig-dev - fontforge-dev freetype-dev glm gperf gpgme-dev gst-plugins-base-dev - gstreamer-dev harfbuzz-dev hunspell-dev hyphen-dev icu icu-dev lcms2-dev - libcmis-dev libexttextcat-dev libjpeg-turbo-dev libnumbertext-dev libpng-dev - libxml2-utils libxslt-dev mdds>=1.4.1 mythes-dev neon-dev nss-dev - openldap-dev openssl-dev paxmark perl poppler-dev postgresql-dev python3-dev - py3-lxml redland-dev sane-dev sed ucpp unixodbc-dev util-linux xmlsec-dev zip +makedepends="apr-dev autoconf automake bash bison boost-dev cairo-dev + clucene-dev cmd:which coreutils cppunit-dev cups-dev dbus-glib-dev findutils + flex fontconfig-dev fontforge-dev freetype-dev glm gperf gpgme-dev + gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev hyphen-dev icu + icu-dev lcms2-dev libcmis-dev libexttextcat-dev libjpeg-turbo-dev + libnumbertext-dev libpng-dev libqrcodegen libxml2-utils libxslt-dev mdds~1.5 + mythes-dev neon-dev nss-dev openldap-dev openssl-dev perl poppler-dev + postgresql-dev python3-dev py3-lxml redland-dev sane-dev sed ucpp + unixodbc-dev util-linux xmlsec-dev zip libepoxy-dev libxinerama-dev libxrandr-dev libxrender-dev libxext-dev - gtk+2.0-dev gdk-pixbuf-dev glib-dev + gtk+3.0-dev glib-dev mesa-dev libabw-dev libcdr-dev libe-book-dev libepubgen-dev libetonyek-dev - libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev>=0.14 + libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev~0.15 libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev libzmf-dev -" + " # -common also depends on these fonts _fonts="ttf-liberation ttf-dejavu ttf-carlito" @@ -79,7 +85,7 @@ checkdepends="$_fonts" # -doc comes first since it redirects manpages from the other subpackages # -lang-* comes before -common since it redirects miscellaneous # language-specific files from -common -subpackages="$pkgname-doc $pkgname-base $pkgname-gtk2 +subpackages="$pkgname-doc $pkgname-base $pkgname-gtk3 $pkgname-calc $pkgname-draw $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkgver.tar.xz @@ -88,14 +94,13 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-help-$pkgver.tar.xz linux-musl.patch fix-execinfo.patch - fix-includes.patch gettext-tiny.patch disable-crc-test.patch disable-outdated-font-test.patch disable-mariadbc.patch - disable-mysqlc.patch - boost.patch -" + mso-lockfile-utf16le.patch + poppler-0.83.patch + " ldpath="/usr/lib/$pkgname/program" _languages="af:Afrikaans:MPL-2.0 AND Public-Domain AND LGPL-3.0 AND LGPL-2.1+ AND Apache-2.0 @@ -188,8 +193,6 @@ _languages="af:Afrikaans:MPL-2.0 AND Public-Domain AND LGPL-3.0 AND LGPL-2.1+ AN sk:Slovak:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1 OR MPL-1.1) AND LPPL-1.3c AND MIT AND Apache-2.0 sl:Slovenian:MPL-2.0 AND (GPL-2.0 OR LGPL-2.1) AND LGPL-2.1 AND Apache-2.0 sq:Albanian:MPL-2.0 AND Apache-2.0 - sr:Serbian:MPL-2.0 AND (LGPL-2.1+ OR MPL-1.1+ OR GPL-2.0+ OR CC-BY-SA-3.0) AND LGPL-2.1+ AND Apache-2.0 - sr_latn:Serbian (Latin):MPL-2.0 AND Apache-2.0 ss:Swati:MPL-2.0 AND Apache-2.0 st:Southern Sotho:MPL-2.0 AND Apache-2.0 sv:Swedish:MPL-2.0 AND LGPL-3.0 AND Custom AND Apache-2.0 @@ -211,7 +214,7 @@ _languages="af:Afrikaans:MPL-2.0 AND Public-Domain AND LGPL-3.0 AND LGPL-2.1+ AN zh_cn:Simplified Chinese (People's Republic of China):MPL-2.0 AND Apache-2.0 zh_tw:Traditional Chinese (Taiwan):MPL-2.0 AND Apache-2.0 zu:Zulu:MPL-2.0 AND LGPL-2.1 AND Apache-2.0 -" + " _lo_lang() { local lang="$1" case "$lang" in @@ -237,6 +240,16 @@ for _lang in $(printf '%s' "$_languages" | cut -d : -f 1); do done subpackages="$subpackages $pkgname-common" +# secfixes: +# 6.4.0.3-r0: +# - CVE-2019-9848 +# - CVE-2019-9849 +# - CVE-2019-9850 +# - CVE-2019-9851 +# - CVE-2019-9852 +# - CVE-2019-9853 +# - CVE-2019-9854 + prepare() { default_prepare NOCONFIGURE=1 ./autogen.sh @@ -276,8 +289,7 @@ build() { --disable-firebird-sdbc \ --disable-coinmp \ --disable-lpsolve \ - --disable-gtk3 \ - --enable-gtk \ + --enable-gtk3 \ --disable-qt5 \ --disable-odk \ --disable-avahi \ @@ -400,14 +412,10 @@ _split_lang() { common() { pkgdesc="LibreOffice - common files" - depends="$pkgname-lang-en_us $_fonts" + depends="$pkgname-lang-en_us=$pkgver-r$pkgrel $_fonts !$pkgname-gtk2" _split common - paxmark -m \ - "$subpkgdir"/usr/lib/libreoffice/program/soffice.bin \ - "$subpkgdir"/usr/lib/libreoffice/program/unopkg.bin - mkdir -p "$subpkgdir/usr/share/appdata" mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata" @@ -424,65 +432,64 @@ common() { fi } -gtk2() { - pkgdesc="LibreOffice - GTK+2.0 GUI" - depends="libreoffice-common" - install_if="$pkgname-common=$pkgver-r$pkgrel gtk+2.0" +gtk3() { + pkgdesc="LibreOffice - GTK+3.0 GUI" + depends="libreoffice-common=$pkgver-r$pkgrel" + install_if="$pkgname-common=$pkgver-r$pkgrel gtk+3.0" _split gnome } base() { pkgdesc="LibreOffice - database frontend" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split base } calc() { pkgdesc="LibreOffice - spreadsheet editor" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split calc } draw() { pkgdesc="LibreOffice - drawing application" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split draw } impress() { pkgdesc="LibreOffice - presentation application" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split impress } math() { pkgdesc="LibreOffice - equation editor" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split math } postgres() { pkgdesc="LibreOffice - connector for PostgreSQL database" - depends="libreoffice-base" + depends="libreoffice-base=$pkgver-r$pkgrel" _split postgresql } writer() { pkgdesc="LibreOffice - word processor" - depends="libreoffice-common" + depends="libreoffice-common=$pkgver-r$pkgrel" _split writer } -sha512sums="0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef libreoffice-6.2.1.2.tar.xz -e9acd76b783a7a0b3344f267a8105ede52b2da92d6c1ae2b54237ffc30d4f87a8e126bb597ab3c4d993bb1e89f1b5d16921ea3d83419c1b5b69cb83aae007bd3 libreoffice-dictionaries-6.2.1.2.tar.xz -4dafc81179fbb8a0b10c774ec072d0abdcdfebbcd5eb8341802bd7d515bd0ea5fb117729ae66b5666da5927a567b54a23c870bcd16ba64478016a4ab84f7f3a5 libreoffice-translations-6.2.1.2.tar.xz -c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f libreoffice-help-6.2.1.2.tar.xz -600e4eb772b1e24e06b906682fc4d4114d62ede3adcde3639482edafef56e970ac09925fcd910dccee8a14f5ca049ac3de3f279ebcc2be3a611e3883f3a7efb8 linux-musl.patch +sha512sums="1ea4b5865b7ad7d7400a775e153b00aa01d188844b580b26adb0d513db5f29a880cac145a746f139d236fff8fb5e8ed316943551de2e2eea218ab96bf177ca42 libreoffice-6.4.0.3.tar.xz +6e6bd33c86b6fe0744b9db70982aca8032011ceda55db30a8214b822dd77ad4760518f58aa42fed10996081ce91bf791fc332a8273664d5dd2141cc88eaaba97 libreoffice-dictionaries-6.4.0.3.tar.xz +168800ec5526f69febf6f37df4d04c0c42d26595587339721141c40c9812d9398bef7618732244759d65b4ccf46072b65536504c37c95f73e1ab91e6582ee75d libreoffice-translations-6.4.0.3.tar.xz +f3f0b5e9f09e55c49a74439e4355dfebc3fe0b6ec809eee44d58fa8493454828ea6af9aab6f336c74394aab0a71fa7d0aa3485d4f662f9917bfb798ad3164e13 libreoffice-help-6.4.0.3.tar.xz +91e3659232a6427234d483289892e1c66673ad2abef792cec9bf905f35797893faba59f10d775cdd0bad23d2be7b77578747dfa707d55bef62a2fbdc95ba3d2c linux-musl.patch ed18d6bc6e03369e17b50e6b969ac0804984c1416fdfe7120251d11c59a791bb0fc8956f848ee8697fce3c074f2943b03d4441aa531ff9504be2f497a8e7e412 fix-execinfo.patch -a1d704c78e3decb83eb45b0f180e7b352d58b4005a7e43dd8fddcb4829c932da4f0dd3d4dfeaa2313c1520273e9e1c64979a0ecbe5d72737926c54d5658bd2ff fix-includes.patch bac06a1f0f6ef3e5860ec340470583b2a7ff079efa9efee9119ae1ac320b97ecbfdb7eba63975d4f7a4e2476d3b01a9508a53a84b49df0a8febe12e17b685529 gettext-tiny.patch -6a039ba592a23b8db1dd5c8d5dffbc9562270de691d2eb1e1c420f8632532c0fce14a0f3844dc2e6f6b6b04655c40230bd69fd81d1ae6f0bd16f0e88ce0a2783 disable-crc-test.patch +ebfc1276a14354bb6b7274bd7850b7fe2b1653c379b1e04023c9fce65eaace4214b2e79d302a075b848297f454b3d340cf5e7db3565a69a2dfaecd4c98d6e669 disable-crc-test.patch 4ffc389a3c545d37d152bb52390c3abd06a32eb9fee03110c07e8b57f9b9d1be68fdc5092ad0be76f6540367a1f1d2e9e32d519021d8205847594edb811da428 disable-outdated-font-test.patch -c1925fe5833410c6a4b47a1723e67ce3898fc01ebded766023855cd93f290a6788638a86a8595e112ab788628c0ea7642c41d7ff987ba9117c2e079a99a3b29f disable-mariadbc.patch -01ef207d0b3ab1ded5edadd2d05cefe65d7c2dc4285abee12d7fbb61c92b2a3e37d5cfe5bb8f5ea9a40fd2918396ec25b473a916012e04732ebbe79ee6768a21 disable-mysqlc.patch -431f55b4ec96caa94b0f55d3691931ad65320ecacbd8f9c9f477107136866ba614683eb77458006960240918392e995a567f5b5436d75003ac036f6d24a77e0a boost.patch" +a4b63e741cd0aa295440a79142f221f2526ae7ba4f2fd28f37366871970c539332de70d89dfe8682d917aa70131b7c3a703e592e88085b58d024659105f8066a disable-mariadbc.patch +52f2e36b77fd952293d5bcd75d58aaee52faa846764d39c9f066778dfb7c7dcd3a6ab7ff6aeb8bd4a5671cec450888638f7c628c0302c7603e07b582c84ca556 mso-lockfile-utf16le.patch +38b09913075219e6d9bc34e94f995653941909118e96f89f7cf45798682758c541ff182b6643e45c7f20dfbb1c4c03e51ea4d8cdd15a997718f297c3c78245b5 poppler-0.83.patch" diff --git a/user/libreoffice/boost.patch b/user/libreoffice/boost.patch deleted file mode 100644 index cd8ef9dba..000000000 --- a/user/libreoffice/boost.patch +++ /dev/null @@ -1,17 +0,0 @@ -After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails: - -sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool' - return loaded; - ^~~~~~ - ---- lo/sfx2/source/appl/shutdownicon.cxx.orig 2018-06-19 22:27:30 UTC -+++ lo/sfx2/source/appl/shutdownicon.cxx -@@ -167,7 +167,7 @@ bool LoadModule() - #endif // ENABLE_QUICKSTART_APPLET - } - assert(!boost::logic::indeterminate(loaded)); -- return loaded; -+ return bool{loaded}; - } - - } diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch index d2b9ab551..474408514 100644 --- a/user/libreoffice/disable-crc-test.patch +++ b/user/libreoffice/disable-crc-test.patch @@ -1,39 +1,62 @@ ---- libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-10 16:08:33.000000000 -0400 -+++ libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-18 15:25:41.030304773 -0400 -@@ -760,14 +760,13 @@ void SvmTest::checkBitmaps(const GDIMeta - xmlDocPtr pDoc = dumpMeta(rMetaFile); +--- libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2019-08-29 16:51:57.000000000 -0500 ++++ libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2019-09-12 20:46:12.114022513 -0500 +@@ -896,14 +896,13 @@ void SvmTest::checkBitmaps(const GDIMeta + } + #endif - #ifdef LINUX -- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); -+ assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},}); +- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", crc1}}); ++ assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}}); assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", { -- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"} -+ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, +- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", crc2} ++ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"} }); assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", { {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, - {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, -- {"crc", "5e01ddcc"} +- {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, +- {"crc", crc3} ++ {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"} }); - #else - assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); -@@ -816,16 +815,16 @@ void SvmTest::checkBitmapExs(const GDIMe + } + +@@ -973,33 +972,33 @@ void SvmTest::checkBitmapExs(const GDIMe + } - #ifdef LINUX assertXPathAttrs(pDoc, "/metafile/bmpex[1]", { -- {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"} -+ {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"} +- {"x", "1"}, {"y", "1"}, {"crc", aExpectedCRC[0]}, {"transparenttype", "bitmap"} ++ {"x", "1"}, {"y", "1"}, {"transparenttype", "bitmap"} }); assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", { - {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, -- {"crc", "281fc589"}, {"transparenttype", "bitmap"} + {"x", "5"}, {"y", "0"}, {"width", "2"}, {"height", "3"}, +- {"crc", aExpectedCRC[1]}, {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"} }); assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", { - {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, - {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, -- {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"} + {"destx", "7"}, {"desty", "1"}, {"destwidth", "2"}, {"destheight", "2"}, + {"srcx", "0"}, {"srcy", "0"}, {"srcwidth", "3"}, {"srcheight", "4"}, +- {"crc", aExpectedCRC[2]}, {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"} }); - #else - assertXPathAttrs(pDoc, "/metafile/bmpex[1]", { + + #ifndef MACOSX + assertXPathAttrs(pDoc, "/metafile/bmpex[2]", { +- {"x", "6"}, {"y", "6"}, {"crc", aExpectedCRC[3]}, {"transparenttype", "bitmap"} ++ {"x", "6"}, {"y", "6"}, {"transparenttype", "bitmap"} + }); + assertXPathAttrs(pDoc, "/metafile/bmpex[3]", { +- {"x", "0"}, {"y", "6"}, {"crc", aExpectedCRC[4]}, {"transparenttype", "bitmap"} ++ {"x", "0"}, {"y", "6"}, {"transparenttype", "bitmap"} + }); + assertXPathAttrs(pDoc, "/metafile/bmpex[4]", { +- {"x", "2"}, {"y", "6"}, {"crc", aExpectedCRC[5]}, {"transparenttype", "bitmap"} ++ {"x", "2"}, {"y", "6"}, {"transparenttype", "bitmap"} + }); + assertXPathAttrs(pDoc, "/metafile/bmpex[5]", { +- {"x", "0"}, {"y", "8"}, {"crc", aExpectedCRC[6]}, {"transparenttype", "bitmap"} ++ {"x", "0"}, {"y", "8"}, {"transparenttype", "bitmap"} + }); + assertXPathAttrs(pDoc, "/metafile/bmpex[6]", { +- {"x", "2"}, {"y", "8"}, {"crc", aExpectedCRC[7]}, {"transparenttype", "bitmap"} ++ {"x", "2"}, {"y", "8"}, {"transparenttype", "bitmap"} + }); + #endif + } diff --git a/user/libreoffice/disable-mariadbc.patch b/user/libreoffice/disable-mariadbc.patch index ada1d1e7a..f63692775 100644 --- a/user/libreoffice/disable-mariadbc.patch +++ b/user/libreoffice/disable-mariadbc.patch @@ -1,13 +1,13 @@ We don't have MariaDB yet and there is no ./configure option for it ---- libreoffice-6.2.1.2/configure.ac -+++ libreoffice-6.2.1.2/configure.ac -@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION) +--- libreoffice-6.2.3.2/configure.ac ++++ libreoffice-6.2.3.2/configure.ac +@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR) AC_SUBST(PYTHON_VERSION_MINOR) -ENABLE_MARIADBC=TRUE +ENABLE_MARIADBC= - if test "$_os" = "Android" -o "$_os" = "iOS"; then + if test "$_os" = "Android" -o "$_os" = "iOS" -o "$enable_mpl_subset" = "yes"; then ENABLE_MARIADBC= fi diff --git a/user/libreoffice/disable-mysqlc.patch b/user/libreoffice/disable-mysqlc.patch deleted file mode 100644 index adcdd4275..000000000 --- a/user/libreoffice/disable-mysqlc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist <tml@collabora.com> -Date: Tue, 05 Mar 2019 17:28:55 +0200 -Subject: [PATCH] Make mysqlc conditional on MARIADBC, too - -Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794 -Reviewed-on: https://gerrit.libreoffice.org/68764 -Tested-by: Jenkins -Reviewed-by: Tor Lillqvist <tml@collabora.com> -Reviewed-on: https://gerrit.libreoffice.org/68783 -Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> ---- - -diff --git a/Repository.mk b/Repository.mk -index 36b35b7..f4899a1 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -404,7 +404,7 @@ - $(call gb_Helper_optional,SCRIPTING,msforms) \ - mtfrenderer \ - $(if $(ENABLE_JAVA),mysql_jdbc) \ -- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ -+ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ - numbertext \ - odbc \ - odfflatxml \ diff --git a/user/libreoffice/fix-includes.patch b/user/libreoffice/fix-includes.patch deleted file mode 100644 index a4adcd352..000000000 --- a/user/libreoffice/fix-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx -+++ libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx -@@ -21,7 +21,7 @@ - #include <dbus/dbus.h> - #include <errno.h> - #include <fcntl.h> -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> diff --git a/user/libreoffice/linux-musl.patch b/user/libreoffice/linux-musl.patch index 3bd6ccdde..2641620cb 100644 --- a/user/libreoffice/linux-musl.patch +++ b/user/libreoffice/linux-musl.patch @@ -1,24 +1,15 @@ ---- libreoffice-6.2.1.2/configure.ac -+++ libreoffice-6.2.1.2/configure.ac -@@ -462,7 +462,7 @@ if test -n "$with_android_ndk"; then - # (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if - # all objects have been built with debug information.) - case $build_os in -- linux-gnu*) -+ linux-gnu*|linux-musl*) - ndk_build_os=linux - ;; - darwin*) -@@ -592,7 +592,7 @@ solaris*) +--- libreoffice-6.4.0.3/configure.ac 2020-01-22 23:14:16.000000000 +0000 ++++ libreoffice-6.4.0.3/configure.ac 2020-02-04 04:09:34.970114523 +0000 +@@ -612,7 +612,7 @@ solaris*) fi ;; -linux-gnu*|k*bsd*-gnu*) +linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4149,7 +4149,7 @@ kfreebsd*) + test_kf5=yes + test_gtk3_kde5=yes +@@ -4341,7 +4341,7 @@ kfreebsd*) esac ;; @@ -27,16 +18,7 @@ COM=GCC USING_X11=TRUE OS=LINUX -@@ -7277,7 +7277,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9854,21 +9854,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) +@@ -10232,21 +10232,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) AC_SUBST(ENABLE_LIBNUMBERTEXT) AC_SUBST(LIBNUMBERTEXT_CFLAGS) @@ -58,12 +40,3 @@ dnl ========================================= dnl Check for uuidgen dnl ========================================= -@@ -12828,7 +12813,7 @@ else - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != ""; then - pathmunge "$JAVA_HOME/bin" "after" - fi diff --git a/user/libreoffice/mso-lockfile-utf16le.patch b/user/libreoffice/mso-lockfile-utf16le.patch new file mode 100644 index 000000000..e71413e0a --- /dev/null +++ b/user/libreoffice/mso-lockfile-utf16le.patch @@ -0,0 +1,33 @@ +--- libreoffice-6.3.1.2/svl/source/misc/msodocumentlockfile.cxx 2019-08-29 16:51:57.000000000 -0500 ++++ libreoffice-6.3.1.2/svl/source/misc/msodocumentlockfile.cxx 2019-09-15 04:19:32.593900468 -0500 +@@ -12,6 +12,7 @@ + #include <algorithm> + #include <ucbhelper/content.hxx> + #include <comphelper/processfactory.hxx> ++#include <oox/helper/helper.hxx> + + #include <com/sun/star/io/IOException.hpp> + #include <com/sun/star/io/XOutputStream.hpp> +@@ -220,7 +221,7 @@ LockFileEntry MSODocumentLockFile::GetLo + const int nACPLen = aBuf[0]; + if (nACPLen > 0 && nACPLen <= 52) // skip wrong format + { +- const sal_Int8* pBuf = aBuf.getConstArray() + 54; ++ sal_Int8* pBuf = aBuf.getArray() + 54; + int nUTF16Len = *pBuf; // try Word position + // If UTF-16 length is 0x20, then ACP length is also less than maximal, which means + // that in Word lockfile case, at least two preceding bytes would be zero. Both +@@ -228,9 +229,12 @@ LockFileEntry MSODocumentLockFile::GetLo + if (nUTF16Len == 0x20 && (*(pBuf - 1) != 0 || *(pBuf - 2) != 0)) + nUTF16Len = *++pBuf; // use Excel/PowerPoint position + +- if (nUTF16Len > 0 && nUTF16Len <= 52) // skip wrong format ++ if (nUTF16Len > 0 && nUTF16Len <= 52) { // skip wrong format ++ oox::ByteOrderConverter::convertLittleEndianArray( ++ reinterpret_cast<sal_Unicode*>(pBuf + 2), nUTF16Len); + aResult[LockFileComponent::OOOUSERNAME] + = OUString(reinterpret_cast<const sal_Unicode*>(pBuf + 2), nUTF16Len); ++ } + } + } + return aResult; diff --git a/user/libreoffice/poppler-0.83.patch b/user/libreoffice/poppler-0.83.patch new file mode 100644 index 000000000..57cf13c52 --- /dev/null +++ b/user/libreoffice/poppler-0.83.patch @@ -0,0 +1,70 @@ +From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 +From: Martin Milata <martin@martinmilata.cz> +Date: Wed, 4 Dec 2019 02:37:40 +0100 +Subject: [PATCH] Fix build with poppler-0.83 + +Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 +Reviewed-on: https://gerrit.libreoffice.org/84384 +Tested-by: Jenkins +Reviewed-by: Michael Stahl <michael.stahl@cib.de> +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ + sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ + 3 files changed, 15 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 26048177e87d..e9c2a407c279 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const + gfree(pBuf); + } + ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++void PDFOutDev::printPath( const GfxPath* pPath ) ++#else + void PDFOutDev::printPath( GfxPath* pPath ) ++#endif + { + int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; + for( int i=0; i<nSubPaths; i++ ) + { ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ const ++#endif + GfxSubpath* pSub = pPath->getSubpath( i ); + const int nPoints = pSub->getNumPoints(); + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 02f6b59f6f15..2e7d2186f9a1 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -149,7 +149,11 @@ namespace pdfi + + int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; + void writeFontFile( GfxFont* gfxFont ) const; ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ static void printPath( const GfxPath* pPath ); ++#else + static void printPath( GfxPath* pPath ); ++#endif + + public: + explicit PDFOutDev( PDFDoc* pDoc ); +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index 42178b650cdd..b1a54bd09c5f 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -68,7 +68,11 @@ int main(int argc, char **argv) + } + + // read config file ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ globalParams = std::make_unique<GlobalParams>(); ++#else + globalParams = new GlobalParams(); ++#endif + globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); diff --git a/user/librevenge/APKBUILD b/user/librevenge/APKBUILD index 2170fceaa..bf4ec674d 100644 --- a/user/librevenge/APKBUILD +++ b/user/librevenge/APKBUILD @@ -9,14 +9,12 @@ arch="all" license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause" depends="" depends_dev="boost-dev zlib-dev" -makedepends="$depends_dev doxygen" checkdepends="cppunit-dev" +makedepends="$depends_dev doxygen" subpackages="$pkgname-dev $pkgname-doc" source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/librsvg/APKBUILD b/user/librsvg/APKBUILD index 76ca74648..3fa19b15b 100644 --- a/user/librsvg/APKBUILD +++ b/user/librsvg/APKBUILD @@ -1,22 +1,24 @@ # Maintainer: pkgname=librsvg -pkgver=2.40.20 -pkgrel=1 +pkgver=2.40.21 +pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="https://wiki.gnome.org/action/show/Projects/LibRsvg" arch="all" options="!check" # Depends on specific font hinting. license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="gtk+2.0-dev libcroco-dev libgsf-dev" makedepends="$depends_dev bzip2-dev cairo-dev glib-dev gobject-introspection-dev" -install= source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +# secfixes: +# 2.40.21-r0: +# - CVE-2019-20446 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,14 +29,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR=""$pkgdir"" install rm -rf "$pkgdir"/usr/lib/mozilla } -sha512sums="cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f librsvg-2.40.20.tar.xz" +sha512sums="db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280 librsvg-2.40.21.tar.xz" diff --git a/user/libsamplerate/APKBUILD b/user/libsamplerate/APKBUILD index aed5129ba..308259c25 100644 --- a/user/libsamplerate/APKBUILD +++ b/user/libsamplerate/APKBUILD @@ -12,13 +12,11 @@ makedepends="fftw-dev libsndfile-dev linux-headers" source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD index 36e5f8e65..c466b1750 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.1 +pkgver=3.6.3 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="e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb libsass-3.6.1.tar.gz" +sha512sums="e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee libsass-3.6.3.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index bb7f81e1f..828b3ed74 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.19.1 +pkgver=0.20.1 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="134f98f09a1cc7c61b9011b2fb35900d9beccfc06d978f1ffab8b5286dc6caa176832e55e3bed498c6f3526f6f34998307f67cf7accc4c79e9abf1c17cc9c7c2 libsecret-0.19.1.tar.xz" +sha512sums="d8fca5f4da63427f594e1cb38c91330a98ab706aa945f8e735337f3fd342895bc96ceb36390ba01a4c0b9c5d503c4b544753c3243c444579f46f7b2e7836d1ac libsecret-0.20.1.tar.xz" diff --git a/user/libsexy/APKBUILD b/user/libsexy/APKBUILD index d572034be..cdb914740 100644 --- a/user/libsexy/APKBUILD +++ b/user/libsexy/APKBUILD @@ -7,19 +7,17 @@ url="https://blog.chipx86.com/tag/libsexy/" arch="all" options="!check" # Tests require manual intervention and X11 display. license="LGPL-2.1+" -subpackages="$pkgname-dev $pkgname-doc" +depends="" makedepends="gtk+2.0-dev iso-codes-dev libxml2-dev" +subpackages="$pkgname-dev $pkgname-doc" source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } -build () -{ - cd "$builddir" +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,7 +27,6 @@ build () } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/lib/libsexy.a } diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD index 3e0bf669c..943216d01 100644 --- a/user/libsigc++/APKBUILD +++ b/user/libsigc++/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsigc++ pkgver=2.10.2 pkgrel=0 @@ -8,12 +8,11 @@ url="https://libsigcplusplus.github.io/libsigcplusplus/" arch="all" license="LGPL-2.1+" depends="" -makedepends="" +makedepends="m4" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/libsigc++/${pkgver%.*}/libsigc++-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libsm/APKBUILD b/user/libsm/APKBUILD index 5ff18a439..04a84270e 100644 --- a/user/libsm/APKBUILD +++ b/user/libsm/APKBUILD @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libSM-$pkgver.tar.bz2" builddir="$srcdir"/libSM-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,14 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2" diff --git a/user/libsndfile/APKBUILD b/user/libsndfile/APKBUILD index 26ca137e9..77e7ad39f 100644 --- a/user/libsndfile/APKBUILD +++ b/user/libsndfile/APKBUILD @@ -8,7 +8,7 @@ url="http://www.mega-nerd.com/libsndfile" arch="all" license="LGPL-2.1-only OR LGPL-3.0-only" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="flac-dev libogg-dev libvorbis-dev" makedepends="$depends_dev alsa-lib-dev linux-headers" source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz @@ -32,7 +32,6 @@ source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz # - CVE-2017-8365 build() { - cd "$builddir" ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ ./configure \ --build=$CBUILD \ @@ -44,12 +43,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index f334b02ec..2f9ee4358 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,13 +1,14 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsoup -pkgver=2.68.2 +pkgver=2.68.3 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" arch="all" options="!check" # HSTS tests fail because .localdomain names fail to resolve. license="LGPL-2.0+ AND LGPL-2.1+" +depends="" makedepends="glib-dev libxml2-dev sqlite-dev libpsl-dev intltool vala-dev gobject-introspection-dev glib-networking meson ninja krb5-dev" subpackages="$pkgname-dev $pkgname-lang" @@ -30,4 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="4fb8fc55fc49c11da1e3575c9de7c407ff616d07a81983347701b868153f69a3fece8bdaeddce6d1ba817d4c547ec6c3ce4cc2d763d34c8b476a92505d99e533 libsoup-2.68.2.tar.xz" +sha512sums="4ab7777e8e910a5741628d10a9e22215b7811c03034dc3ccd1fa34bcfa2a643f27e7c005ab048f2931d58af4b161eee71e1f433cb55a74628da5b08ef8b693fd libsoup-2.68.3.tar.xz" diff --git a/user/libspectre/APKBUILD b/user/libspectre/APKBUILD index 2e43f6abc..0caa4b284 100644 --- a/user/libspectre/APKBUILD +++ b/user/libspectre/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="https://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD index bad200ada..6f4829b12 100644 --- a/user/libstaroffice/APKBUILD +++ b/user/libstaroffice/APKBUILD @@ -9,13 +9,11 @@ arch="all" options="!check" # No test suite. license="MPL-2.0 OR LGPL-2.0+" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev zlib-dev boost-dev doxygen" +makedepends="boost-dev doxygen librevenge-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD index a1a24c35b..45a2bc72d 100644 --- a/user/libstatgrab/APKBUILD +++ b/user/libstatgrab/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libstatgrab pkgver=0.92 pkgrel=0 @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" LIBS="-lutmps -lskarnet -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 3bf73d5d6..92acda745 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsysstat pkgver=0.4.2 pkgrel=0 @@ -14,11 +14,9 @@ subpackages="$pkgname-dev" source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,13 +24,12 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz" diff --git a/user/libtap/APKBUILD b/user/libtap/APKBUILD index b8a992768..e2e8aa026 100644 --- a/user/libtap/APKBUILD +++ b/user/libtap/APKBUILD @@ -22,7 +22,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/libtasn1/APKBUILD b/user/libtasn1/APKBUILD index f3fcce75d..8412236d7 100644 --- a/user/libtasn1/APKBUILD +++ b/user/libtasn1/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtasn1 -pkgver=4.14 +pkgver=4.16.0 pkgrel=0 pkgdesc="Highly portable ASN.1 library" url="https://www.gnu.org/software/libtasn1/" arch="all" license="LGPL-2.1+" +depends="" makedepends="texinfo" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - " +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" # secfixes: # 4.14-r0: @@ -21,7 +21,6 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz # - CVE-2017-10790 build() { - cd "$builddir" CFLAGS="-Wno-error=inline" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -49,4 +46,4 @@ tools() { mv -i "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223 libtasn1-4.14.tar.gz" +sha512sums="b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71 libtasn1-4.16.0.tar.gz" diff --git a/user/libtheora/APKBUILD b/user/libtheora/APKBUILD index 618f413b9..59e55f677 100644 --- a/user/libtheora/APKBUILD +++ b/user/libtheora/APKBUILD @@ -2,14 +2,15 @@ pkgname=libtheora pkgver=1.1.1 pkgrel=14 -pkgdesc="An open video codec developed by the Xiph.org" +pkgdesc="An open video codec developed by Xiph.org" url="https://www.theora.org/" arch="all" license="BSD-3-Clause" -subpackages="$pkgname-dev $pkgname-doc $pkgname-examples" +depends="" depends_dev="libogg-dev" makedepends="libvorbis-dev libogg-dev sdl-dev autoconf automake libtool linux-headers" +subpackages="$pkgname-dev $pkgname-doc $pkgname-examples" source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2 libtheora-flags.patch enc.patch diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index 5231ff63d..e7322c37b 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc -pkgver=1.1.4 -pkgrel=1 +pkgver=1.2.5 +pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="https://sourceforge.net/projects/libtirpc/" arch="all" @@ -12,11 +12,11 @@ depends_dev="bsd-compat-headers krb5-dev" 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 - musl.patch" + bsd-types.patch + endian-header.patch + " build() { - cd "$builddir" - export CFLAGS="$CFLAGS -D__u_char_defined -D__daddr_t_defined" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,9 +26,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 libtirpc-1.1.4.tar.bz2 -8e52246ae478ae9e4689426627e17d9c58d701f4fd21a40ffe3cf17c4ceaa4ab2e8e91d2fa3ba0d0c7adc52ae4b986fcda113ec86e370ede83903bb641de520c musl.patch" +sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 libtirpc-1.2.5.tar.bz2 +237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch +0a7a21a3d08bb0ff0110b993b8f8ddca41513ddaa0a468028a53eac9732a2a2e5070abe7da0a3ecff265b3800490c82f08810bd34e9d0af2e75345c86ef7d638 endian-header.patch" diff --git a/user/libtirpc/bsd-types.patch b/user/libtirpc/bsd-types.patch new file mode 100644 index 000000000..3fbe378b8 --- /dev/null +++ b/user/libtirpc/bsd-types.patch @@ -0,0 +1,12 @@ +u_int32_t (etc) is a BSD type. Define _BSD_SOURCE so musl declares it. + +--- libtirpc-1.2.5/tirpc/rpc/types.h.old 2019-12-19 18:55:48.000000000 +0000 ++++ libtirpc-1.2.5/tirpc/rpc/types.h 2019-12-29 19:17:59.146261005 +0000 +@@ -38,6 +38,7 @@ + #ifndef _TIRPC_TYPES_H + #define _TIRPC_TYPES_H + ++#define _BSD_SOURCE + #include <sys/types.h> + + typedef int32_t bool_t; diff --git a/user/libtirpc/endian-header.patch b/user/libtirpc/endian-header.patch new file mode 100644 index 000000000..9f9523305 --- /dev/null +++ b/user/libtirpc/endian-header.patch @@ -0,0 +1,13 @@ +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/libtirpc/musl.patch b/user/libtirpc/musl.patch deleted file mode 100644 index 5a4fb04f5..000000000 --- a/user/libtirpc/musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./tirpc/rpc/types.h.orig 2018-03-17 10:23:10.022055255 +0100 -+++ ./tirpc/rpc/types.h 2018-03-17 10:23:30.877751656 +0100 -@@ -66,7 +66,7 @@ - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD index 2e5bce094..e54de9fc0 100644 --- a/user/libtommath/APKBUILD +++ b/user/libtommath/APKBUILD @@ -1,14 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtommath -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="Theoretic multiple-precision integer library" url="https://www.libtom.net/LibTomMath/" arch="all" +options="!check" # no longer builds properly, tested manually on gwyn license="Unlicense" depends="" -makedepends="" +makedepends="libtool" subpackages="$pkgname-dev" source="https://github.com/libtom/libtommath/releases/download/v$pkgver/ltm-$pkgver.tar.xz" @@ -17,11 +18,12 @@ build() { } check() { - make PREFIX=/usr -f makefile.shared test_standalone + make PREFIX=/usr -f makefile.shared -j1 test + ./test } package() { make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install } -sha512sums="6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 ltm-1.1.0.tar.xz" +sha512sums="6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203 ltm-1.2.0.tar.xz" diff --git a/user/libunistring/APKBUILD b/user/libunistring/APKBUILD index 95a2e3608..e41e0cffc 100644 --- a/user/libunistring/APKBUILD +++ b/user/libunistring/APKBUILD @@ -9,12 +9,10 @@ arch="all" license="GPL-2.0+ OR LGPL-3.0+" depends="" makedepends="" -install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz" +source="https://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/lib/charset.alias } diff --git a/user/libusb/APKBUILD b/user/libusb/APKBUILD index 649c84c6a..80e8d0dd6 100644 --- a/user/libusb/APKBUILD +++ b/user/libusb/APKBUILD @@ -6,8 +6,9 @@ pkgdesc="Library for USB device communication" url="https://libusb.info/" arch="all" license="LGPL-2.1+" -subpackages="$pkgname-dev" +depends="" makedepends="eudev-dev linux-headers" +subpackages="$pkgname-dev" source="https://github.com/libusb/libusb/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/libutempter/APKBUILD b/user/libutempter/APKBUILD index 3e8a0601e..847c0be49 100644 --- a/user/libutempter/APKBUILD +++ b/user/libutempter/APKBUILD @@ -16,12 +16,10 @@ source="ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2 " build() { - cd "$builddir" make LDLIBS="-lutmps -lskarnet" } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # we need to be setuid, not setgid chmod 4711 "$pkgdir"/usr/lib/utempter/utempter diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index 74dec5108..d42e22efa 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.5.0 +pkgver=2.6.1 pkgrel=0 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" @@ -9,15 +9,9 @@ arch="all" options="!check" # No test suite. license="MIT" depends="" -depends_dev="mesa-dev" -makedepends="$depends_dev autoconf automake libtool cmd:which" +makedepends="libdrm-dev libx11-dev libxext-dev libxfixes-dev cmd:which" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/intel/$pkgname/archive/$pkgver.tar.gz" - -prepare() { - default_prepare - ./autogen.sh -} +source="https://github.com/intel/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2" build() { ./configure \ @@ -39,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce810faa216fc9b3f466565b598018b20b8590692ec6b88874d2920bce8c5e875e429957e370ebba95aa2375f80c1c0f0d68cb6eb2276494c74b9da2a5547f96 libva-2.5.0.tar.gz" +sha512sums="b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d libva-2.6.1.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 4560d319c..2c8b32cb0 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.3/libvdpau-$pkgver.tar.bz2" build() { meson -Dprefix=/usr \ @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="a839ed06ac3bb1ceaa8020e38f40f6dd1d1af066878effbc02e3b02f0917ccdad4059ac2a4428ca39265bda3ba02885d905231f365b86151bae28d135d8de3d5 libvdpau-1.3.tar.xz" +sha512sums="c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2" diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD index 9038302e7..602ed91e8 100644 --- a/user/libverto/APKBUILD +++ b/user/libverto/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Main loop abstraction library" url="https://github.com/npmccallum/libverto" arch="all" license="MIT" +depends="" makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool" subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib" source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz diff --git a/user/libvisio/APKBUILD b/user/libvisio/APKBUILD index a22189789..e9cf48128 100644 --- a/user/libvisio/APKBUILD +++ b/user/libvisio/APKBUILD @@ -7,9 +7,9 @@ pkgdesc="Import filter and tools for MS Visio diagrams" url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" arch="all" license="MPL-2.0" -depends_dev="librevenge-dev" -makedepends="$depends_dev boost-dev icu-dev libxml2-dev doxygen gperf perl" +depends="" checkdepends="cppunit-dev" +makedepends="boost-dev icu-dev librevenge-dev libxml2-dev doxygen gperf perl" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 764fec75a..7058ad208 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver pkgver=0.9.12 -pkgrel=0 +pkgrel=1 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -12,10 +12,13 @@ depends="" depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libice-dev libx11-dev libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" -makedepends="$depends_dev autoconf automake libtool" +makedepends="$depends_dev cmake" subpackages="$pkgname-dev" source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - CVE-2018-15127.patch" + CVE-2018-15127.patch + CVE-2019-15681.patch + CVE-2019-15690.patch + " builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -24,6 +27,9 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # - CVE-2016-9942 # 0.9.12-r0: # - CVE-2018-15127 +# 0.9.12-r1: +# - CVE-2019-15681 +# - CVE-2019-15690 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,7 +41,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -49,4 +55,6 @@ package() { } sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz -8b5b6742e6c3a181c60652484b15ec42cc0a3acc1e82cef38e82b61f43f1de456d09731976f4e5dfab44abf3e551e22aaf4300cb8418cd8e136d705fcb2a7dbe CVE-2018-15127.patch" +8b5b6742e6c3a181c60652484b15ec42cc0a3acc1e82cef38e82b61f43f1de456d09731976f4e5dfab44abf3e551e22aaf4300cb8418cd8e136d705fcb2a7dbe CVE-2018-15127.patch +5ecb5a26813f3f07440ef6c54eebaca4e9b4f7c1cf2ba13375e3b23b950a9b818d068d4eef5532d7ea4d7ae084c4356af7257c45426101ff51afe2b7da338a1f CVE-2019-15681.patch +52f62a65c3e91b7c7a11b5ad6e1432d697e1314bf6c938b5cb0c9cc8bdffbf1c25612c33e05282c11d59c6523e208b882f963fca8bcd34a5c72dd476427e7542 CVE-2019-15690.patch" diff --git a/user/libvncserver/CVE-2019-15681.patch b/user/libvncserver/CVE-2019-15681.patch new file mode 100644 index 000000000..e328d8792 --- /dev/null +++ b/user/libvncserver/CVE-2019-15681.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 000000000..7fe36e454 --- /dev/null +++ b/user/libvncserver/CVE-2019-15690.patch @@ -0,0 +1,36 @@ +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/libvorbis/APKBUILD b/user/libvorbis/APKBUILD index 73520bf56..1dd35bf77 100644 --- a/user/libvorbis/APKBUILD +++ b/user/libvorbis/APKBUILD @@ -7,8 +7,9 @@ url="https://xiph.org/vorbis/" arch="all" options="!check" # Test suite doesn't compile. license="BSD-3-Clause" -subpackages="$pkgname-dev $pkgname-doc" +depends="" makedepends="libogg-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.xz CVE-2017-14160-and-2018-10393.patch CVE-2018-10392.patch diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index c99e8605a..58de8225a 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -1,39 +1,35 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom -pkgver=0.33 -pkgrel=2 +pkgver=1.2 +pkgrel=0 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" arch="all" license="MIT" depends="" -makedepends="libgudev-dev" checkdepends="bash findutils" +makedepends="libgudev-dev libxml2-dev meson ninja" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 - fix-database.patch + musl-test.patch " build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static - make + meson \ + -Dprefix=/usr \ + -Dtest_deprecated=false \ + build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir" install - install -dm755 "$pkgdir"/usr/lib/udev/rules.d/ - tools/generate-udev-rules \ - > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2 -db07a7c44bd7ed010eec167d5e7cd807da203f8d42630855189b7c7e91ef6776b7df571ee0b0a0985912f836640fcf458ee4a394a47e9e8365892a6a137a3f00 fix-database.patch" +sha512sums="595c073d8160bce2d6cec13d5c672594c73ae677e37dbba0ac088c9010d6e2f824d442ccdb7f695642bd06cce75c85473d863823c20a46fbe27e966ae3fed147 libwacom-1.2.tar.bz2 +5aebef9f8b224c83fa9f175b2cfec0198aeb0b462b2bb55c02e0cf10ef78f8af66def81f715fc3d95e8d7191f6fb688795f3561eb6850eed76105f865229d3f4 musl-test.patch" diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch deleted file mode 100644 index 3c43b5bbf..000000000 --- a/user/libwacom/fix-database.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c -index afb89a2..28388f5 100644 ---- a/libwacom/libwacom-database.c -+++ b/libwacom/libwacom-database.c -@@ -147,14 +147,13 @@ make_match_string (const char *name, WacomBusType bus, int vendor_id, int produc - static gboolean - match_from_string(const char *str, WacomBusType *bus, int *vendor_id, int *product_id, char **name) - { -- int rc = 1; -- char busstr[64], namestr[64]; -+ int rc = 1, len = 0; -+ char busstr[64]; - -- memset(namestr, 0, sizeof(namestr)); -- -- rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr); -- if (rc == 4) { -- *name = g_strdup(namestr); -+ rc = sscanf(str, "%63[^:]:%x:%x:%n", busstr, vendor_id, product_id, &len); -+ if (len > 0) { -+ /* Grumble grumble scanf handling of %n */ -+ *name = g_strdup(str+len); - } else if (rc == 3) { - *name = NULL; - } else { diff --git a/user/libwacom/musl-test.patch b/user/libwacom/musl-test.patch new file mode 100644 index 000000000..74625f02b --- /dev/null +++ b/user/libwacom/musl-test.patch @@ -0,0 +1,22 @@ +--- libwacom-1.2/meson.build.old 2019-12-22 21:45:06.000000000 +0000 ++++ libwacom-1.2/meson.build 2019-12-25 11:43:51.004107631 +0000 +@@ -555,7 +555,7 @@ + # because of the tricks we use in calling the function and exposing + # it to begin with, LTO gets confused and this fails to link. + # Let's just disable it here. +- if not get_option('b_lto') ++ if not get_option('b_lto') and get_option('test_deprecated') + test_deprecated = executable('test-deprecated', + 'test/test-deprecated.c', + dependencies: [dep_libwacom, dep_dl], +--- libwacom-1.2/meson_options.txt.old 2019-11-07 02:25:47.000000000 +0000 ++++ libwacom-1.2/meson_options.txt 2019-12-25 11:45:11.585452086 +0000 +@@ -10,4 +10,8 @@ + type: 'boolean', + value: true, + description: 'Build the tests [default=true]') ++option('test_deprecated', ++ type: 'boolean', ++ value: true, ++ description: 'Test the deprecated ABI (fails on musl) [default=true]') + diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index 93ef7b9dd..a003a6b92 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: pkgname=libwebp pkgver=1.0.3 @@ -7,6 +7,7 @@ pkgdesc="Libraries for working with WebP images" url="https://developers.google.com/speed/webp/" arch="all" license="BSD-3-Clause" +depends="" makedepends="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz" diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index 2c7bc1b78..5eb5e4e81 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libwnck pkgver=3.32.0 _pkgmaj=${pkgver%.*} @@ -13,27 +13,19 @@ makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev libxres-dev subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz" -prepare() { - default_prepare - mkdir -p "$builddir"/build -} - build() { - cd "$builddir"/build meson \ -Dprefix=/usr \ - .. - ninja + build . + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } sha512sums="a939b96feda20b0eba2b87556b97a9ba4b9aaea4c82c0e274a23796a3a9b49cb93be582d79e32a52a87b5ca6e35182a9d617cb802802b3c2ba2bff2b028aa3de libwnck-3.32.0.tar.xz" diff --git a/user/libwps/APKBUILD b/user/libwps/APKBUILD index f58ca254b..c8744c72e 100644 --- a/user/libwps/APKBUILD +++ b/user/libwps/APKBUILD @@ -9,13 +9,11 @@ arch="all" options="!check" # No test suite. license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev doxygen" +makedepends="doxygen librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +26,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD index 2c7087200..25703a6ef 100644 --- a/user/libx11/APKBUILD +++ b/user/libx11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libx11 -pkgver=1.6.8 +pkgver=1.6.9 pkgrel=0 pkgdesc="X11 client-side library" url="https://www.X.Org/" @@ -15,7 +15,6 @@ source="https://www.X.Org/releases/individual/lib/libX11-$pkgver.tar.bz2" builddir="$srcdir"/libX11-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,14 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76 libX11-1.6.8.tar.bz2" +sha512sums="fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 libX11-1.6.9.tar.bz2" diff --git a/user/libxaw/APKBUILD b/user/libxaw/APKBUILD index a817b0bb1..3dd598556 100644 --- a/user/libxaw/APKBUILD +++ b/user/libxaw/APKBUILD @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXaw-$pkgver.tar.bz2" builddir="$srcdir"/libXaw-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxcb/0001-tests-Support-Check-0.13.0-API.patch b/user/libxcb/0001-tests-Support-Check-0.13.0-API.patch new file mode 100644 index 000000000..fce1f83d0 --- /dev/null +++ b/user/libxcb/0001-tests-Support-Check-0.13.0-API.patch @@ -0,0 +1,40 @@ +From a667ec3e0cf5d9cd1d1715e3fff3328e353fae84 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Mon, 23 Dec 2019 21:49:29 -0600 +Subject: [PATCH] tests: Support Check 0.13.0 API + +--- + tests/check_all.c | 4 ++-- + tests/check_suites.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/check_all.c b/tests/check_all.c +index 4393422..f201dec 100644 +--- a/tests/check_all.c ++++ b/tests/check_all.c +@@ -1,10 +1,10 @@ + #include <stdlib.h> + #include "check_suites.h" + +-void suite_add_test(Suite *s, TFun tf, const char *name) ++void suite_add_test(Suite *s, const TTest *tt, const char *name) + { + TCase *tc = tcase_create(name); +- tcase_add_test(tc, tf); ++ tcase_add_test(tc, tt); + suite_add_tcase(s, tc); + } + +diff --git a/tests/check_suites.h b/tests/check_suites.h +index 499f1af..595923a 100644 +--- a/tests/check_suites.h ++++ b/tests/check_suites.h +@@ -1,4 +1,4 @@ + #include <check.h> + +-void suite_add_test(Suite *s, TFun tf, const char *name); ++void suite_add_test(Suite *s, const TTest *tt, const char *name); + Suite *public_suite(void); +-- +2.24.1 + diff --git a/user/libxcb/APKBUILD b/user/libxcb/APKBUILD index 53db51310..cac678bff 100644 --- a/user/libxcb/APKBUILD +++ b/user/libxcb/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcb -pkgver=1.13.1 +pkgver=1.14 pkgrel=0 pkgdesc="X11 C language Binding" url="https://xcb.freedesktop.org/" arch="all" license="X11" depends="" -subpackages="$pkgname-dev $pkgname-doc" depends_dev="libxau-dev xcb-proto" checkdepends="check-dev" -makedepends="$depends_dev libxslt python3 libpthread-stubs libxdmcp-dev" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc" +makedepends="$depends_dev libxslt python3 libxdmcp-dev" +source="https://www.X.org/releases/individual/lib/libxcb-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,14 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23 libxcb-1.13.1.tar.bz2" +sha512sums="b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6 libxcb-1.14.tar.xz" diff --git a/user/libxcursor/APKBUILD b/user/libxcursor/APKBUILD index 6aff75fef..8b23c9078 100644 --- a/user/libxcursor/APKBUILD +++ b/user/libxcursor/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="X cursor management library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxfixes-dev libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXcursor-$pkgver.tar.bz2" builddir="$srcdir"/libXcursor-$pkgver diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD index 50a1e7dfc..70fe0d512 100644 --- a/user/libxdg-basedir/APKBUILD +++ b/user/libxdg-basedir/APKBUILD @@ -1,27 +1,24 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> -# TODO: Repackage from better source, rehost or something. pkgname=libxdg-basedir pkgver=1.2.0 pkgrel=0 pkgdesc="library for XDG base dir specification" -url="https://nevill.ch/libxdg-basedir/" +url=" " # No URL. arch="all" license="MIT" depends="" -makedepends="" +makedepends="autoconf automake libtool" subpackages="$pkgname-dev" -source="https://nevill.ch/libxdg-basedir/downloads/$pkgname-$pkgver.tar.gz" +source="http://ponce.cc/slackware/sources/repo/libxdg-basedir-1.2.0.tar.xz" prepare() { - cd "$builddir" default_prepare - update_config_sub + ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,13 +28,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="346553ddd9d0a0c854af9320f2ced695a0838adc18736b66120bea48ea60cb9ea3a7390672a42f83909db92f692e94de833d9e8bcfe51568a72ad1f4661fde06 libxdg-basedir-1.2.0.tar.gz" +sha512sums="f1766cd94dd66fcba9211427910ef02c7f203c7bf655e74b903566a68521d1c156c9687cd89eca73428098c0a78a1458cada2057dd9268b6f6b48229c80b5d2e libxdg-basedir-1.2.0.tar.xz" diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 561c84bcf..62acc0a53 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libxfce4ui pkgver=4.14.1 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ AND GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev libxfce4util-dev xfconf-dev startup-notification-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -20,7 +21,8 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-vala=yes + --enable-vala=yes \ + --with-vendor-info="Adélie Linux" make } diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 8e8bcb8aa..823692e8e 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libxfce4util pkgver=4.14.0 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ GPL-2.0+" +depends="" makedepends="intltool glib-dev gobject-introspection-dev vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-$pkgver.tar.bz2" diff --git a/user/libxfont/APKBUILD b/user/libxfont/APKBUILD deleted file mode 100644 index c98112974..000000000 --- a/user/libxfont/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=libxfont -pkgver=1.5.4 -pkgrel=0 -pkgdesc="X11 Font library" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="xtrans" -makedepends="freetype-dev libfontenc-dev util-macros xmlto xorgproto-dev" -subpackages="$pkgname-dev" -source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" -builddir="$srcdir/libXfont-$pkgver" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2" diff --git a/user/libxinerama/APKBUILD b/user/libxinerama/APKBUILD index 6e0b849ba..e2a072fe1 100644 --- a/user/libxinerama/APKBUILD +++ b/user/libxinerama/APKBUILD @@ -6,14 +6,13 @@ pkgdesc="X11 Xinerama extension library" url="https://www.X.Org/" arch="all" license="MIT AND X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXinerama-$pkgver.tar.bz2" builddir="$srcdir"/libXinerama-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index 6dc619982..15791113f 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,38 +1,33 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=0.8.4 +pkgver=0.10.0 pkgrel=0 pkgdesc="Keyboard handling library" url="https://www.xkbcommon.org/" arch="all" license="MIT AND X11" -makedepends="bison flex libxcb-dev util-macros xorgproto-dev" +depends="xkeyboard-config" checkdepends="bash" -subpackages="$pkgname-dev" +makedepends="bison doxygen flex libxcb-dev meson ninja util-macros + xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz" build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make + meson \ + -Dprefix=/usr \ + -Denable-wayland=false \ + build + ninja -C build } check() { - cd "$builddir" - make check + ninja -C build test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3 libxkbcommon-0.8.4.tar.xz" +sha512sums="58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79 libxkbcommon-0.10.0.tar.xz" diff --git a/user/libxkbui/APKBUILD b/user/libxkbui/APKBUILD index 80340714e..1d5bcf8f2 100644 --- a/user/libxkbui/APKBUILD +++ b/user/libxkbui/APKBUILD @@ -12,13 +12,11 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD index e1addd860..6a788bbce 100644 --- a/user/libxklavier/APKBUILD +++ b/user/libxklavier/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libxklavier pkgver=5.4 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="High-level API for XKB" url="https://www.freedesktop.org/wiki/Software/LibXklavier/" arch="all" license="LGPL-2.0+" +depends="" makedepends="gobject-introspection-dev libx11-dev libxml2-dev glib-dev libxcb-dev libxkbcommon-dev libxkbfile-dev libxi-dev iso-codes-dev vala-dev" @@ -14,13 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://people.freedesktop.org/~svu/libxklavier-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxmu/APKBUILD b/user/libxmu/APKBUILD index 854f806a3..60360e16c 100644 --- a/user/libxmu/APKBUILD +++ b/user/libxmu/APKBUILD @@ -7,11 +7,11 @@ url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="X11 AND MIT" -subpackages="$pkgname-dev $pkgname-doc" depends="" depends_dev="util-linux-dev" makedepends="$depends_dev libsm-dev libx11-dev libxext-dev libxt-dev util-macros xmlto" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXmu-$pkgver.tar.bz2" builddir="$srcdir"/libXmu-$pkgver diff --git a/user/libxp/APKBUILD b/user/libxp/APKBUILD index 45cfad2bb..25953833a 100644 --- a/user/libxp/APKBUILD +++ b/user/libxp/APKBUILD @@ -14,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.bz2" builddir="$srcdir/libXp-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxpm/APKBUILD b/user/libxpm/APKBUILD index 53f3e6fab..364f20b3d 100644 --- a/user/libxpm/APKBUILD +++ b/user/libxpm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxpm -pkgver=3.5.12 -pkgrel=1 +pkgver=3.5.13 +pkgrel=0 pkgdesc="X11 pixmap library" url="https://www.X.Org/" arch="all" @@ -13,7 +13,6 @@ source="https://www.X.Org/releases/individual/lib/libXpm-$pkgver.tar.bz2" builddir="$srcdir"/libXpm-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,14 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e libXpm-3.5.12.tar.bz2" +sha512sums="3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2" diff --git a/user/libxrender/APKBUILD b/user/libxrender/APKBUILD index 0f6978084..a212b8f67 100644 --- a/user/libxrender/APKBUILD +++ b/user/libxrender/APKBUILD @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXrender-$pkgver.tar.bz2" builddir="$srcdir"/libXrender-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxres/APKBUILD b/user/libxres/APKBUILD index 9244440c4..9c8914958 100644 --- a/user/libxres/APKBUILD +++ b/user/libxres/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="X11 X-Resource extension library" url="https://www.X.Org/" arch="all" license="MIT AND X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXres-$pkgver.tar.bz2" builddir="$srcdir"/libXres-$pkgver diff --git a/user/libxscrnsaver/APKBUILD b/user/libxscrnsaver/APKBUILD index f793c67d5..2bdfb8a3d 100644 --- a/user/libxscrnsaver/APKBUILD +++ b/user/libxscrnsaver/APKBUILD @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXScrnSaver-$pkgver.tar.bz2" builddir="$srcdir"/libXScrnSaver-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxshmfence/APKBUILD b/user/libxshmfence/APKBUILD index 1608eb19d..f13c7e3c4 100644 --- a/user/libxshmfence/APKBUILD +++ b/user/libxshmfence/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/libxshmfence-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxt/APKBUILD b/user/libxt/APKBUILD index c0990b0b5..c1ef89fe5 100644 --- a/user/libxt/APKBUILD +++ b/user/libxt/APKBUILD @@ -8,8 +8,8 @@ arch="all" license="X11" depends="" depends_dev="libsm-dev" -makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto-dev" checkdepends="glib-dev" +makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXt-$pkgver.tar.bz2" builddir="$srcdir"/libXt-$pkgver diff --git a/user/libxtst/APKBUILD b/user/libxtst/APKBUILD index f32cb1cbb..9a933e987 100644 --- a/user/libxtst/APKBUILD +++ b/user/libxtst/APKBUILD @@ -6,16 +6,13 @@ pkgdesc="X11 Testing Resource extension library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" depends="" -depends_dev="xorgproto-dev" -makedepends="$depends_dev libx11-dev libxext-dev libxi-dev util-macros" -source="https://www.X.Org/releases/individual/lib/libXtst-$pkgver.tar.bz2 - " +makedepends="libx11-dev libxext-dev libxi-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.X.Org/releases/individual/lib/libXtst-$pkgver.tar.bz2" builddir="$srcdir"/libXtst-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,14 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } sha512sums="6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765 libXtst-1.2.3.tar.bz2" diff --git a/user/libxv/APKBUILD b/user/libxv/APKBUILD index 573c1c0d1..d17cb97ba 100644 --- a/user/libxv/APKBUILD +++ b/user/libxv/APKBUILD @@ -10,10 +10,9 @@ depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXv-$pkgver.tar.bz2" - builddir="$srcdir"/libXv-$pkgver + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58 libXv-1.0.11.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index 2baf9b21d..99026afc0 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc pkgver=1.0.12 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" arch="all" @@ -30,9 +30,6 @@ check() { package() { make DESTDIR="$pkgdir" install - - # Conflicts with xorgproto until 2019.2, which is unreleased. - rm "$pkgdir"/usr/include/X11/extensions/vldXvMC.h } sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2" diff --git a/user/libxxf86misc/APKBUILD b/user/libxxf86misc/APKBUILD index 2ead4d544..ab259eb3d 100644 --- a/user/libxxf86misc/APKBUILD +++ b/user/libxxf86misc/APKBUILD @@ -6,14 +6,13 @@ pkgdesc="X11 XFree86 miscellaneous extension library" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2" builddir="$srcdir/libXxf86misc-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +22,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxxf86vm/APKBUILD b/user/libxxf86vm/APKBUILD index 0f8f91a4a..53c8d3df0 100644 --- a/user/libxxf86vm/APKBUILD +++ b/user/libxxf86vm/APKBUILD @@ -6,14 +6,13 @@ pkgdesc="X11 XFree86 video mode extension library" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2" builddir="$srcdir"/libXxf86vm-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,14 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 libXxf86vm-1.1.4.tar.bz2" diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD index 9c1836e60..379075ae7 100644 --- a/user/libzip/APKBUILD +++ b/user/libzip/APKBUILD @@ -9,6 +9,7 @@ pkgdesc="C library for manipulating ZIP archives" url="https://libzip.org/" arch="all" license="BSD-3-Clause" +depends="" depends_dev="zlib-dev" makedepends="$depends_dev cmake openssl-dev perl" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" @@ -25,7 +26,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" + -DCMAKE_C_FLAGS="$CFLAGS" . make } diff --git a/user/libzmf/APKBUILD b/user/libzmf/APKBUILD index 6829fb3f8..c81460caa 100644 --- a/user/libzmf/APKBUILD +++ b/user/libzmf/APKBUILD @@ -9,8 +9,8 @@ arch="all" license="MPL-2.0" depends="" depends_dev="boost-dev icu-dev libpng-dev zlib-dev" -makedepends="$depends_dev librevenge-dev doxygen" checkdepends="cppunit-dev" +makedepends="$depends_dev librevenge-dev doxygen" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" @@ -20,7 +20,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 5f768bbdd..b501a5f18 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,19 +1,20 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.54 -pkgrel=2 +pkgver=1.4.55 +pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" -arch="all" -license="BSD-3-Clause" -install="$pkgname.pre-install $pkgname.pre-upgrade" pkgusers="lighttpd" pkggroups="lighttpd" +arch="all" +license="BSD-3-Clause" +depends="" makedepends="attr-dev bzip2-dev flex gamin-dev libev-dev libxml2-dev openldap-dev openssl-dev pcre-dev sqlite-dev zlib-dev" subpackages="$pkgname-doc $pkgname-dbg $pkgname-mod_auth $pkgname-openrc $pkgname-mod_webdav" +install="$pkgname.pre-install $pkgname.pre-upgrade" source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.xz $pkgname.initd $pkgname.confd @@ -96,7 +97,7 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37 lighttpd-1.4.54.tar.xz +sha512sums="023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439 lighttpd-1.4.55.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/lilo/APKBUILD b/user/lilo/APKBUILD new file mode 100644 index 000000000..606b633b3 --- /dev/null +++ b/user/lilo/APKBUILD @@ -0,0 +1,51 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=lilo +pkgver=24.2 +pkgrel=0 +pkgdesc="Minimal BIOS bootloader for x86 systems" +url="https://www.joonet.de/lilo/" +arch="pmmx x86 x86_64" +options="!check" # No test suite. +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 + musl.patch + partuuid.patch + lilo.conf.template + " + +build() { + export CFLAGS="$CFLAGS -fno-strict-aliasing" + make +} + +package() { + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/etc/lilo/kernel \ + "$pkgdir"/etc/lilo/initramfs \ + "$pkgdir"/usr/sbin/mkrescue \ + "$pkgdir"/usr/share/man/man8/mkrescue.8 + + mkdir "$pkgdir"/boot/lilo/gfx + mv "$pkgdir"/boot/lilo/*.bmp \ + "$pkgdir"/boot/lilo/*.dat \ + "$pkgdir"/boot/lilo/gfx + + install -Dm644 "$srcdir"/lilo.conf.template \ + "$pkgdir"/etc/lilo/lilo.conf.template + mv "$pkgdir"/etc/lilo/lilo.conf_example \ + "$pkgdir"/etc/lilo/lilo.conf.example +} + +sha512sums="4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 lilo-24.2.tar.gz +cf8dab563e88cc7b280f5740c3b0f25049b9ce27c77a67e7b0c55dc21a158f8b2998f0c7743f11bcc4ae893697e6b6cc56054a40919899bf2d6d79b4e1a59190 adelie.patch +ed1ffb03dbbbf6fe6974d045005f72b3657d470cd3f3556d582e09a38836090c3e75a684a1dcfbe7ade91e5ada3706b712ae7111460df85454518a746c60bde4 cflags.patch +1c1ce61d2d7c88c1ba66e1415b36edb6743f46a50857b5bcd2b6b28a0711e4de3f0a75c352a5997bc9b5d50b0754c49a3f69b736e07a6e389c02da004289c64f musl.patch +3962bf30a866f31fa5263618210d61ac5663117cac1d5a52a5e14f3665ff8edfd628c80807591f3da5f2e6908b8c0af9b19fac32f6ab90e6c4755bf79cb34d5a partuuid.patch +489f57d29ee6607fb7040a33655bc369a510290804ae11686e02ba91d6cd3401175fa93d8d74da6058f03126b924004d28d5145ec5df70be4d04acba112c5729 lilo.conf.template" diff --git a/user/lilo/adelie.patch b/user/lilo/adelie.patch new file mode 100644 index 000000000..29983faff --- /dev/null +++ b/user/lilo/adelie.patch @@ -0,0 +1,400 @@ +Adjust paths so that lilo has its own dir in /etc and /boot. + +--- lilo-24.2/make.vars 2013-06-07 02:50:30.000000000 -0500 ++++ lilo-24.2/make.vars 2020-03-19 15:50:13.710057044 -0500 +@@ -90,8 +90,8 @@ OPT=-Os + # + + SBIN_DIR=/sbin +-CFG_DIR=/etc +-BOOT_DIR=/boot ++CFG_DIR=/etc/lilo ++BOOT_DIR=/boot/lilo + USRSBIN_DIR=/usr/sbin + BUILTIN=1 + +--- lilo-24.2/src/config.h 2011-06-22 02:13:58.000000000 -0500 ++++ lilo-24.2/src/config.h 2020-03-19 15:34:21.320045281 -0500 +@@ -39,8 +39,8 @@ + #define DFL_CHAIN LILO_DIR "/chain.b" /* default chain loader */ + #define DFL_MBR LILO_DIR "/mbr.b" /* default MBR */ + #else +-#define CFG_DIR "/etc" /* location of configuration files */ +-#define BOOT_DIR "/boot" /* location of boot files */ ++#define CFG_DIR "/etc/lilo" /* location of configuration files */ ++#define BOOT_DIR "/boot/lilo" /* location of boot files */ + #define BACKUP_DIR BOOT_DIR /* boot sector and partition table backups */ + #define DFL_CONFIG CFG_DIR "/lilo.conf"/* default configuration file */ + #define DFL_DISKTAB CFG_DIR "/disktab" /* LILO's disk parameter table */ +--- lilo-24.2/sample/lilo.example.conf 2015-11-20 14:50:03.000000000 -0600 ++++ lilo-24.2/sample/lilo.example.conf 2020-03-19 15:53:08.030059197 -0500 +@@ -1,4 +1,4 @@ +-# /etc/lilo.conf - systemwide LILO configuration (LILO 24) ++# /etc/lilo/lilo.conf - systemwide LILO configuration (LILO 24) + # details see in manpages: lilo(8) and lilo.conf(5) + + # +-------------------------------------------------------------+ +@@ -50,7 +50,7 @@ root = /dev/sda1 + # Specifies the location of the map file. Lilo creates the (sector) + # map file of direct sector addresses which are independent of any + # filesystem. +-map = /boot/map ++map = /boot/lilo/map + + # --------------------------------------------------------------- + +@@ -63,7 +63,7 @@ install = menu + # A) Customized boot message for choice 'text'. + # For the simple text menu you can set an extra message in the + # created file. Its text will be displayed before boot prompt. +-#message = /boot/message.txt ++#message = /boot/lilo/message.txt + + # B) Configuration of the scheme for choice 'menu'. + # Use following coding: <text>:<highlight>:<border>:<title> +@@ -83,7 +83,7 @@ menu-scheme = Wb:Yr:Wb:Wb + # with 16 colors: onlyblue, tuxlogo, inside + # with 256 colors: coffee + # for Debian: debianlilo, debian, debian-de +-#bitmap = /boot/tuxlogo.bmp ++#bitmap = /boot/lilo/gfx/tuxlogo.bmp + + # --------------------------------------------------------------- + +--- lilo-24.2/scripts/liloconfig 2015-11-21 18:00:21.000000000 -0600 ++++ lilo-24.2/scripts/liloconfig 2020-03-19 15:23:42.240037388 -0500 +@@ -44,7 +44,7 @@ getopts('hvfu'); + pod2usage(1) if $opt_h; + + #---- other variables +-our $liloconf = "/etc/lilo.conf"; ++our $liloconf = "/etc/lilo/lilo.conf"; + our $conftmp_1 = "/tmp/lilotmp1"; + our $conftmp_2 = "/tmp/lilotmp2"; + our $liloconfold = $liloconf . ".old"; +@@ -54,7 +54,7 @@ our $fstabconf = "/etc/fstab"; + our $idpath = "/dev/disk/by-id"; + our $uuidpath = "/dev/disk/by-uuid"; + our $lblpath = "/dev/disk/by-label"; +-our $template = "/usr/share/doc/lilo/examples/lilo.example.conf.gz"; ++our $template = "/etc/lilo/lilo.conf.template"; + + our $rootpart; # found root part + our $root_dev; # /dev/hdX9, /dev/sdX9, /dev/md/* +@@ -399,8 +401,12 @@ sub copy_template { + + # copy template config + if (-f $template) { +- system("gzip -d -c $template >$conftmp_1") if ($template =~ /\.gz$/); +- system("cat $template >$conftmp_1") if ($template =~ /\.conf$/); ++ if ($template =~ /\.gz$/) { ++ system("gzip -d -c $template >$conftmp_1"); ++ } ++ else { ++ system("cat $template >$conftmp_1"); ++ } + + open(CONFTMP1, "<$conftmp_1") or die "$prog: couldn't open $conftmp_1: $!\n"; + open(CONFTMP2, ">$conftmp_2") or die "$prog: couldn't open $conftmp_2: $!\n"; +@@ -418,7 +418,7 @@ sub copy_template { + } + else { + open(CONFTMP2, ">$conftmp_2") or die "$prog: couldn't open $conftmp_2: $!\n"; +- print CONFTMP2 "# /etc/lilo.conf ++ print CONFTMP2 "# /etc/lilo/lilo.conf + + ### LILO global section ### + +@@ -426,7 +426,7 @@ sub copy_template { + lba32 + boot = /dev/sda + root = /dev/sda1 +-map = /boot/map ++map = /boot/lilo/map + install = menu + menu-scheme = Wb:Yr:Wb:Wb + prompt +@@ -781,7 +781,7 @@ lilo.conf file you find many useful comm + Please pay attention about error messages if liloconfig cannot find + any images (/boot/vmlinuz*) oder image symlinks (/vmlinuz, /vmlinu.old). + Then you need to search for images by ourself and make some changes +-in the '/etc/lilo.conf' file. Otherwise no bootloader can be installed ++in the '/etc/lilo/lilo.conf' file. Otherwise no bootloader can be installed + with '/sbin/lilo'. + + =head1 OPTIONS +@@ -808,7 +808,7 @@ Force overriding/update of boot line in + + =head1 EXAMPLES + +-Lines in the configuration file /etc/lilo.conf: ++Lines in the configuration file /etc/lilo/lilo.conf: + + ### LILO global section ### + +@@ -818,7 +818,7 @@ Lines in the configuration file /etc/lil + boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999 + #root = /dev/sda1 + root = "UUID=18843936-00f9-4df0-a373-000d05a5dd44" +- map = /boot/map ++ map = /boot/lilo/map + install = menu + menu-scheme = Wb:Yr:Wb:Wb + prompt +--- lilo-24.2/scripts/lilo-uuid-diskid 2014-10-16 16:53:29.000000000 -0500 ++++ lilo-24.2/scripts/lilo-uuid-diskid 2020-03-19 15:28:07.360040662 -0500 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + + # lilo-uuid-diskid - convert boot and root options to diskid +-# and uuid in /etc/lilo.conf ++# and uuid in /etc/lilo/lilo.conf + # + # Copyright 2010-2014 Joachim Wiedorn <joodevel at joonet.de> + # +@@ -41,7 +41,7 @@ getopts('hv'); + pod2usage(1) if $opt_h; + + #---- other variables +-our $liloconf = "/etc/lilo.conf"; ++our $liloconf = "/etc/lilo/lilo.conf"; + our $liloconfold = $liloconf . ".old"; + our $liloconfnew = $liloconf . ".new"; + our $fstabconf = "/etc/fstab"; +@@ -454,7 +454,7 @@ Print verbose messages. + + =head1 EXAMPLES + +-Lines in the configuration file /etc/lilo.conf: ++Lines in the configuration file /etc/lilo/lilo.conf: + + #boot = /dev/sda + boot = /dev/disk/by-id/ata-SAMSUNG_SV1604N_S01FJ10X999999 +--- lilo-24.2/man/keytab-lilo.8 2010-06-28 15:41:18.000000000 -0500 ++++ lilo-24.2/man/keytab-lilo.8 2020-03-19 16:01:06.730065109 -0500 +@@ -37,7 +37,7 @@ to set the keyboard type when booting + [using the + .B keytable + parameter in +-.BR /etc/lilo.conf ]. ++.BR /etc/lilo/lilo.conf ]. + + .I kbd_layout + should be the name of a map file which specifies the desired +@@ -68,7 +68,7 @@ output, so you should redirect it to a s + .B lilo + has no particular restrictions on the name of keyboard translation + files, but the suggested naming convention and location is +-.BI /boot/ mapping .ktl ++.BI /boot/lilo/ mapping .ktl + (where + .B .ktl + stands for "Keyboard Table for Lilo"). +@@ -86,11 +86,11 @@ respectively. + + .SH "EXAMPLES" + .TP +-.B keytab\-lilo dvorak >/boot/dvorak.ktl ++.B keytab\-lilo dvorak >/boot/lilo/dvorak.ktl + + This is the most common form of invocation; it simply compiles the + given map file (in this case dvorak) and puts the result in +-.BR /boot/dvorak.ktl . ++.BR /boot/lilo/dvorak.ktl . + + .SH "AUTHOR" + Werner Almesberger (almesber@bernina.ethz.ch). +--- lilo-24.2/man/lilo-uuid-diskid.8 2015-11-21 17:25:42.000000000 -0600 ++++ lilo-24.2/man/lilo-uuid-diskid.8 2020-03-19 15:59:05.390063610 -0500 +@@ -100,7 +100,7 @@ Print a brief help. + Print verbose messages. + .SH "EXAMPLES" + .IX Header "EXAMPLES" +-Lines in the configuration file /etc/lilo.conf: ++Lines in the configuration file /etc/lilo/lilo.conf: + .PP + .Vb 2 + \& #boot = /dev/sda +--- lilo-24.2/man/lilo.8 2015-11-21 17:25:31.000000000 -0600 ++++ lilo-24.2/man/lilo.8 2020-03-19 16:01:39.580065515 -0500 +@@ -108,7 +108,7 @@ Auxiliary uses: + .SH "DESCRIPTION" + .IX Header "DESCRIPTION" + lilo installs a boot loader that will be activated the next time you boot +-your system. The default configuration file \fI/etc/lilo.conf\fR (see manpage ++your system. The default configuration file \fI/etc/lilo/lilo.conf\fR (see manpage + \&\fIlilo.conf\fR\|(5)) will contain most options, but many, including those which + override the configuration file, may be specified on the command line. + .SH "OPTIONS" +@@ -140,7 +140,7 @@ Speeds up the booting especially from fl + .IP "\fB\-C\fR \fIconfig-file\fR" 4 + .IX Item "-C config-file" + Set another pathname and filename for the configuration file. The default +-configuration file is \fI/etc/lilo.conf\fR. ++configuration file is \fI/etc/lilo/lilo.conf\fR. + .IP "\fB\-d\fR \fIdelay-time\fR" 4 + .IX Item "-d delay-time" + Set the delay time in tenths of a second ('20' = 2 sec) before automatically +@@ -171,7 +171,7 @@ header will be lost. It can be restored + a text-based backup for the \s-1LILO\s0 header information. + .IP "\fB\-f\fR \fIdisk-tab\fR" 4 + .IX Item "-f disk-tab" +-Set another disk geometry parameter file. The default is \fI/etc/disktab\fR. ++Set another disk geometry parameter file. The default is \fI/etc/lilo/disktab\fR. + .IP "\fB\-F\fR" 4 + .IX Item "-F" + Override boot sector check for filesystems (e.g., swap, ext4, xfs ...) which +@@ -204,7 +204,7 @@ addresses, allowing access to all partit + (This is the default geometry). + .IP "\fB\-m\fR \fImap-file\fR" 4 + .IX Item "-m map-file" +-Use another map file instead of the default file /boot/map. ++Use another map file instead of the default file /boot/lilo/map. + .IP "\fB\-M\fR \fImaster-device\fR \fB{mbr|ext}\fR" 4 + .IX Item "-M master-device {mbr|ext}" + Install a Master Boot Record on the device specified as master-device, selecting +@@ -232,7 +232,7 @@ sector. Compare with the '\-F' flag, whi + boot sector. + .Sp + \&\fB<global\-option>\fR allows the passing of any global option which may +-appear in the global section (top) of the configuration file (\fI/etc/lilo.conf\fR). ++appear in the global section (top) of the configuration file (\fI/etc/lilo/lilo.conf\fR). + For instance \fI'\-P nowarn'\fR will pass the 'nowarn' option, just as though 'nowarn' + appeared in the configuration file (same as the '\-w' switch). Similarly + \&\fI'\-P timeout=50'\fR will add or override the 'timeout=' line in the configuration +@@ -241,7 +241,7 @@ line option switches. However, it is not + cause an override of other options; e.g. '\-g' (\-P geometric), '\-L' (\-P lba32). + .IP "\fB\-q\fR" 4 + .IX Item "-q" +-List the currently mapped files. \fBlilo\fR maintains a file, by default \fI/boot/map\fR, ++List the currently mapped files. \fBlilo\fR maintains a file, by default \fI/boot/lilo/map\fR, + containing each name and location of the kernel(s) to boot. This option will list + the names therein. Use with \fB\-v\fR for more detailed information about the + installed boot loader. +@@ -249,7 +249,7 @@ installed boot loader. + .IX Item "-r root-directory" + Before doing anything else, do a \fI'chroot'\fR to the indicated directory. The new + root directory must contain a \fI/dev\fR directory and may need a /boot directory. +-It may also need an \fI/etc/lilo.conf\fR file. ++It may also need an \fI/etc/lilo/lilo.conf\fR file. + .IP "\fB\-R\fR \fIcommand-line\fR" 4 + .IX Item "-R command-line" + This option sets the default command for the boot loader for the next time it +@@ -267,13 +267,13 @@ Refer to \fI\fIlilo.conf\fI\|(5)\fR for + .IP "\fB\-s\fR \fIsave-file\fR" 4 + .IX Item "-s save-file" + When lilo writes a new boot sector, it preserves the former contents of the boot +-sector in a file, named by default /boot/boot.NNNN, where \s-1NNNN\s0 is the hexadecimal ++sector in a file, named by default /boot/lilo/boot.NNNN, where \s-1NNNN\s0 is the hexadecimal + representation of the major and minor device numbers of the drive/partition. + .Sp + This option defines the backup save file in one of three ways: a save directory +-(default is '/boot') using the default filename 'boot.NNNN' in the defined ++(default is '/boot/lilo') using the default filename 'boot.NNNN' in the defined + directory; a pathname template to which '.NNNN' is appended (default would be +-\&'/boot/boot'); or the full pathname of the file, which must include the correct ++\&'/boot/lilo/boot'); or the full pathname of the file, which must include the correct + \&'.NNNN' suffix. When used with the \-u option, the full file pathname must be set. + .IP "\fB\-S\fR \fIsave-file\fR" 4 + .IX Item "-S save-file" +@@ -386,7 +386,7 @@ removed from the command line before it + noted. + .IP "\fBlock\fR" 4 + .IX Item "lock" +-Locks the command line, as though 'lock' had been defined in \fI/etc/lilo.conf\fR. ++Locks the command line, as though 'lock' had been defined in \fI/etc/lilo/lilo.conf\fR. + .IP "\fBmem=###[,K,M,G]\fR" 4 + .IX Item "mem=###[,K,M,G]" + Set the maximum memory in the system in bytes, kilobytes, megabytes or gigabytes. +--- lilo-24.2/man/lilo.conf.5 2013-06-07 14:17:39.000000000 -0500 ++++ lilo-24.2/man/lilo.conf.5 2020-03-19 16:01:57.970065742 -0500 +@@ -25,13 +25,13 @@ lilo.conf \- configuration file for lilo + .SH DESCRIPTION + .LP + This file, by default +-.IR /etc/lilo.conf , ++.IR /etc/lilo/lilo.conf , + is read by the boot loader installer 'lilo' (see lilo(8)). + .LP + It might look as follows: + .IP + .nf +-# /etc/lilo.conf ++# /etc/lilo/lilo.conf + # + # global options: + boot=/dev/hda +@@ -111,7 +111,7 @@ All RAID installations should use only t + multiple backups may be created. The '.NNNN' suffix is the hexadecimal + representation of the major and minor device numbers of the device or + partition. If this option is not specified, the default name of boot sector +-backups is '/boot/boot.NNNN'. If a backup already exists, it will be ++backups is '/boot/lilo/boot.NNNN'. If a backup already exists, it will be + preserved, rather than overwritten. C.f., \fBforce-backup=\fP below. + .TP + .BI "bios-passes-dl=" <option> +@@ -334,7 +334,7 @@ viz., + .BI "disktab=" <disktab-file> + Specifies the name of the disk parameter table. + The map installer looks for +-.I /etc/disktab ++.I /etc/lilo/disktab + if `disktab' is omitted. The use of disktabs is discouraged. + .TP + .BI "el-torito-bootable-CD" +@@ -436,7 +436,7 @@ The per-image password option `mandatory + .TP + .BI "map=" <map-file> + Specifies the location of the map file. If `map' is omitted, the file +-.I /boot/map ++.I /boot/lilo/map + is used. + + On machines with a pre-1998 BIOS, the EDD bios extensions which are required +@@ -812,7 +812,7 @@ requirements of the boot-installer parse + an operator. The kernel command line parser is very much simpler, and + must not see any quotation marks. Simply stated, only use the quotation + marks within +-.IR /etc/lilo.conf . ++.IR /etc/lilo/lilo.conf . + .TP + .BI "vga=" <mode> + This specifies the VGA text mode that should be selected when +@@ -1027,7 +1027,7 @@ at the time the boot loader is installed + the password, it should be specified: \fBpassword=""\fP. + Passwords entered interactively are not required to be entered again if the + boot installer is re-run. They are cached, in hashed form, in a companion +-file to the config-file, default name: \fB/etc/lilo.conf.crc\fP. If the ++file to the config-file, default name: \fB/etc/lilo/lilo.conf.crc\fP. If the + config-file is updated, a warning message + will be issued telling you to re-run \fIlilo \-p\fP to force re-creation of the + password cache file. +--- lilo-24.2/man/liloconfig.8 2015-11-21 17:25:48.000000000 -0600 ++++ lilo-24.2/man/liloconfig.8 2020-03-19 16:02:08.680065874 -0500 +@@ -92,7 +92,7 @@ lilo.conf file you find many useful comm + Please pay attention about error messages if liloconfig cannot find + any images (/boot/vmlinuz*) oder image symlinks (/vmlinuz, /vmlinu.old). + Then you need to search for images by ourself and make some changes +-in the '/etc/lilo.conf' file. Otherwise no bootloader can be installed ++in the '/etc/lilo/lilo.conf' file. Otherwise no bootloader can be installed + with '/sbin/lilo'. + .SH "OPTIONS" + .IX Header "OPTIONS" +@@ -110,7 +110,7 @@ Force overriding existing lilo.conf. + Force overriding/update of boot line in lilo.conf. + .SH "EXAMPLES" + .IX Header "EXAMPLES" +-Lines in the configuration file /etc/lilo.conf: ++Lines in the configuration file /etc/lilo/lilo.conf: + .PP + .Vb 1 + \& ### LILO global section ### +@@ -121,7 +121,7 @@ Lines in the configuration file /etc/lil + \& boot = /dev/disk/by\-id/ata\-SAMSUNG_SV1604N_S01FJ10X999999 + \& #root = /dev/sda1 + \& root = "UUID=18843936\-00f9\-4df0\-a373\-000d05a5dd44" +-\& map = /boot/map ++\& map = /boot/lilo/map + \& install = menu + \& menu\-scheme = Wb:Yr:Wb:Wb + \& prompt diff --git a/user/lilo/cflags.patch b/user/lilo/cflags.patch new file mode 100644 index 000000000..253d77a33 --- /dev/null +++ b/user/lilo/cflags.patch @@ -0,0 +1,13 @@ +Ensure our CFLAGS are being used + +--- lilo-24.2/src/Makefile 2015-11-21 17:50:25.000000000 -0600 ++++ lilo-24.2/src/Makefile 2020-03-19 04:48:25.069499686 -0500 +@@ -22,7 +22,7 @@ LD86=ld86 -0 + NASM=nasm + G=`cat foo1 foo2 | grep version | cut -d " " -f 3` + +-CFLAGS=$(OPT) -Wall $(PCONFIG) ++CFLAGS+=-Wall $(PCONFIG) + LIBS=$(DEVMAPPER) + + OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \ diff --git a/user/lilo/lilo.conf.template b/user/lilo/lilo.conf.template new file mode 100644 index 000000000..527ecf364 --- /dev/null +++ b/user/lilo/lilo.conf.template @@ -0,0 +1,23 @@ +# /etc/lilo/lilo.conf + +### LILO global section ### + +# Good assumptions for a modern (post-1998) system +compact +large-memory +lba32 + +# Menu configuration +install = bmp +bitmap = /boot/lilo/gfx/tuxlogo.bmp + +# Boot the first entry automatically in 10 seconds +prompt +timeout = 100 + +# These will be configured automatically by liloconfig(8) +boot = "" +root = "" + +### LILO per-image section ### + diff --git a/user/lilo/lilo.trigger b/user/lilo/lilo.trigger new file mode 100644 index 000000000..0f5a802a2 --- /dev/null +++ b/user/lilo/lilo.trigger @@ -0,0 +1,93 @@ +#!/bin/sh -e +conf=/etc/lilo/lilo.conf + +# Check whether LILO is installed +# This function is from /usr/sbin/mkboot from debianutils, with copyright: +# +# Debian GNU/Linux +# Copyright 1996-1997 Guy Maor <maor@debian.org> +# +# Modified for Gentoo for use with the lilo ebuild by: +# Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003) +# +# Modified for Adélie for use with the lilo APKBUILD by: +# Max Rees <maxcrees@me.com> (19 Mar 2020) +lilocheck() { + if ! [ -e "$conf" ]; then + cat >&2 <<-EOF + * + * Could not find '$conf'! + * + EOF + exit 1 + fi + + if grep -q "^[[:space:]]*password[[:space:]]*=[[:space:]]*\"\"" \ + "$conf"; then + cat >&2 <<-EOF + * + * You have requested interactive LILO password setup. + * Run "lilo -p" by hand. + * + EOF + return 1 + fi + + bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" "$conf")" + if ! [ -b "$bootpart" ]; then + cat >&2 <<-EOF + * + * Could not find '$bootpart'! + * + EOF + exit 1 + fi + + if ! dd if="$bootpart" ibs=16 count=1 2>/dev/null | grep -q LILO; then + cat >&2 <<-EOF + * + * No LILO signature found on '$bootpart'. + * You must run 'lilo' yourself. + * + EOF + return 1 + fi +} + +if ! [ -e /etc/fstab ]; then + cat >&2 <<-EOF + * + * You are missing an /etc/fstab file, so liloconfig + * cannot determine the root filesystem. Skipping + * automatic configuration. + * + EOF + exit 0 +fi + +if [ -e "$conf" ] && [ "$conf" -nt "$conf.template" ]; then + cat >&2 <<-EOF + * + * You appear to have manually edited '$conf'. + * LILO configuration will not be automatically regenerated. + * + EOF + exit 0 +fi + +cat >&2 <<-EOF +* +* Running liloconfig... +* +EOF +liloconfig -f "$conf" +touch -r "$conf.template" "$conf" + +if lilocheck; then + cat >&2 <<-EOF + * + * Running lilo... + * + EOF + lilo -C "$conf" +fi diff --git a/user/lilo/musl.patch b/user/lilo/musl.patch new file mode 100644 index 000000000..5b95e717f --- /dev/null +++ b/user/lilo/musl.patch @@ -0,0 +1,81 @@ +Regarding O_NOACCESS: + + > Using a value of 3 as the argument to open is a traditional Linux + > extension for getting an fd that's usable only for ioctls. That's + > reasonable. What's not reasonable or correct is using O_ACCMODE as a + > way to get a 3. + +https://www.openwall.com/lists/musl/2014/07/01/12 + +--- lilo-24.2/src/common.h 2015-11-21 17:50:23.000000000 -0600 ++++ lilo-24.2/src/common.h 2020-03-19 07:32:52.429998369 -0500 +@@ -26,12 +26,8 @@ + # define PAGE_SIZE 4096U + #endif + +-#ifdef O_ACCMODE +-# define O_NOACCESS O_ACCMODE +-#else + /* open a file for "no access" */ +-# define O_NOACCESS 3 +-#endif ++#define O_NOACCESS 3 + + /* special for LILO, bypass the actual open in dev_open( , ,-1) */ + #define O_BYPASS -1 +--- lilo-24.2/src/config.h 2011-06-22 02:13:58.000000000 -0500 ++++ lilo-24.2/src/config.h 2020-03-19 04:43:53.769503552 -0500 +@@ -20,10 +20,6 @@ + #endif + + #if !__MSDOS__ +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) || \ +- !defined(__GLIBC_MINOR__) || (__GLIBC_MINOR__ < 1) +-# warning "glibc version 2.1 or later is recommended" +-#endif /* !__MSDOS__ */ + + #define TMP_DEV "/tmp/dev.%d" /* temporary devices are created here */ + #define MAX_TMP_DEV 50 /* highest temp. device number */ +--- lilo-24.2/src/lilo.c 2015-11-21 17:51:24.000000000 -0600 ++++ lilo-24.2/src/lilo.c 2020-03-19 04:34:43.899511387 -0500 +@@ -182,7 +182,6 @@ extern int has_partitions_beta(dev_t dev + printf("Without"); + #endif + printf(" device-mapper\n"); +- printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__); + printf("Kernel Headers included from %d.%d.%d\n", + LINUX_VERSION_CODE>>16, + LINUX_VERSION_CODE>>8 & 255, +--- lilo-24.2/src/partition.c 2015-11-21 17:50:20.000000000 -0600 ++++ lilo-24.2/src/partition.c 2020-03-19 04:41:05.339505952 -0500 +@@ -31,30 +31,6 @@ + #include "boot.h" + #include "loader.h" + +-#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 1 +-#if defined(_syscall5) && defined(__NR__llseek) +- +- _syscall5(int, _llseek, unsigned int, fd, unsigned int, hi, +- unsigned int, lo, lloff_t *, res, unsigned int, wh); +- int _llseek(unsigned int fd, unsigned int offset_high, +- unsigned int offset_low, lloff_t * result, unsigned int whence); +- +- lloff_t lseek64(unsigned int fd, lloff_t offs, unsigned int whence) +- { lloff_t res; +- return _llseek(fd, offs>>32, offs, &res, whence) < 0 ? +- (lloff_t)(-1) : res; +- } +- +-#else +-/* last ditch attempt on small disks, and very old systems */ +-# warning "*****************************************" +-# warning "***** no 64 bit lseek is available ******" +-# warning "***** using 23 bit sector addresses *****" +-# warning "*****************************************" +-# define lseek64 lseek +-#endif +-#endif +- + static + int anywhere(unsigned char *buf, char *str) + { diff --git a/user/lilo/partuuid.patch b/user/lilo/partuuid.patch new file mode 100644 index 000000000..a1a4fcc10 --- /dev/null +++ b/user/lilo/partuuid.patch @@ -0,0 +1,65 @@ +Enable usage of PARTUUID if /etc/fstab uses it for the root filesystem. +While we're here, make the generated labels for the kernel choices more +descriptive as well. + +--- lilo-24.2/src/bsect.c 2011-06-22 02:09:44.000000000 -0500 ++++ lilo-24.2/src/bsect.c 2020-03-19 07:59:59.819990912 -0500 +@@ -1098,6 +1098,9 @@ if (image) { /* long section specific to + else if (strlen(root)>5 && !strncmp(root,"UUID=",5)) { + sprintf(strchr(options,0),"root=%s ", root); + } ++ else if (strlen(root)>9 && !strncmp(root,"PARTUUID=",9)) { ++ sprintf(strchr(options,0),"root=%s ", root); ++ } + else { + sprintf(strchr(options,0),"root=%x ",dev_number(root)); + } +--- lilo-24.2/scripts/liloconfig 2015-11-21 18:00:21.000000000 -0600 ++++ lilo-24.2/scripts/liloconfig 2020-03-19 14:36:22.710002318 -0500 +@@ -217,11 +218,12 @@ sub convert_root_device { + $found = 0; + } + } +- elsif ($rootpart =~ /^UUID/ or $rootpart =~ /^LABEL/) { ++ elsif ($rootpart =~ /^(PART)?UUID/ or $rootpart =~ /^LABEL/) { + $root_link = $rootpart; + $root_link =~ s{\"}{}g; + $root_link =~ s{^LABEL=}{/dev/disk/by-label/}; + $root_link =~ s{^UUID=}{/dev/disk/by-uuid/}; ++ $root_link =~ s{^PARTUUID=}{/dev/disk/by-partuuid/}; + + if (-l $root_link) { + $root_id = $rootpart; +@@ -610,6 +610,7 @@ sub write_image_config { + my $initrd2; + my $nr; + my $nr2; ++ my $label; + + # append to new lilo.conf + open(MYFH_NEW, ">> $liloconfnew") or die "Cannot open file: $!"; +@@ -627,18 +628,16 @@ sub write_image_config { + $initrd2 = $initrd; + $initrd2 =~ s/\.img//; + $nr2 = $nr + 1; ++ $label = $image; ++ $label =~ s@/boot/vmlinuz-@@; ++ $label =~ s/-[^-]*$//; ++ $label = substr $label, 0, 15; + + print MYFH_NEW 'image = ' . $image . "\n"; + if($opt_v) { print 'image = ' . $image . "\n"; } + +- if ($nr == 0) { +- print MYFH_NEW "\t" . 'label = "Linux"' . "\n"; +- if($opt_v) { print "\t" . 'label = "Linux"' . "\n"; } +- } +- elsif ($nr == 1) { +- print MYFH_NEW "\t" . 'label = "Linux Old"' . "\n"; +- if($opt_v) { print "\t" . 'label = "Linux Old"' . "\n"; } +- } ++ print MYFH_NEW "\t" . "label = \"$label\"" . "\n"; ++ if($opt_v) { print "\t" . "label = \"$label\"" . "\n"; } + + print MYFH_NEW "\t" . 'read-only' . "\n"; + if($opt_v) { print "\t" . 'read-only' . "\n"; } diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD index 987002899..168ef1a37 100644 --- a/user/listres/APKBUILD +++ b/user/listres/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/listres-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 4d50aa986..128b7ad39 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,12 +1,14 @@ # Maintainer: pkgname=live-media -pkgver=2019.09.30 +pkgver=2019.12.30 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" arch="all" options="!check" # No test suite. license="LGPL-3.0+" +depends="" +makedepends="openssl-dev" subpackages="$pkgname-dev $pkgname-utils" source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz" builddir="$srcdir"/live @@ -23,7 +25,6 @@ build() { } package() { - local testprog f so mkdir -p "$pkgdir"/usr/lib for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do mkdir -p "$pkgdir"/usr/include/$f @@ -50,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="6378d08153d0178d3b9ec191a7f57ed5c6bf6adf304bf1107db67bb6d050827b1a85ce157df576c2644aa3a819c47aa4dbf0300e3b223456cc6649eeadbd2324 live.2019.09.30.tar.gz" +sha512sums="223ce65751099e5f84767939e75cefa19f10780d7e894991b4f7164c4bafa4ed8942713f237df74933caa0e1f0ead83bf69c95f232f84f7220082613cc84bc83 live.2019.12.30.tar.gz" diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD index c625bb4d5..645230f32 100644 --- a/user/lksctp-tools/APKBUILD +++ b/user/lksctp-tools/APKBUILD @@ -8,7 +8,7 @@ url="http://lksctp.sourceforge.net/" arch="all" license="GPL-2.0-only AND LGPL-2.1-only" depends="" -makedepends="autoconf automake" +makedepends="autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz header-install.patch diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD index cf8e93f1b..19286ae5f 100644 --- a/user/lm_sensors/APKBUILD +++ b/user/lm_sensors/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=lm_sensors _pkgname=lm-sensors -pkgver=3.5.0 +pkgver=3.6.0 _pkgver=$(printf '%s' "$pkgver" | tr . -) pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." @@ -13,7 +13,7 @@ depends="bash sysfsutils" makedepends="bison flex perl rrdtool-dev cmd:which" subpackages="$pkgname-dev $pkgname-doc $pkgname-detect $pkgname-sensord $pkgname-sensord-openrc:sensord_openrc:noarch" -source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V$_pkgver.tar.gz use-module-load.d-dir.patch fancontrol.initd sensord.confd @@ -22,7 +22,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv builddir="$srcdir/$_pkgname-$_pkgver" prepare() { - cd "$builddir" + default_prepare + sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile # Respect LDFLAGS sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile @@ -31,39 +32,32 @@ prepare() { # do not check for libiconv in ldconfig cache sed -i -e 's/^LIBICONV.*/LIBICONV ?=/' prog/sensors/Module.mk - - default_prepare } build() { - cd "$builddir" export CFLAGS="$CFLAGS -fno-stack-protector" make PREFIX=/usr user } package() { - cd "$builddir" make PROG_EXTRA:=sensord user_install \ PREFIX=/usr \ MANDIR=/usr/share/man \ DESTDIR="$pkgdir" - cd "$srcdir" - install -Dm755 fancontrol.initd "$pkgdir"/etc/init.d/fancontrol + install -Dm755 "$srcdir"/fancontrol.initd "$pkgdir"/etc/init.d/fancontrol } detect() { depends="perl" pkgdesc="Detection/migration scripts for lm_sensors" mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin - cd "$pkgdir" - mv usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/ - mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/sbin/sensors-detect "$subpkgdir"/usr/bin/ } sensord() { pkgdesc="sensord daemon" - cd "$builddir" mkdir -p "$subpkgdir"/usr/sbin mv "$pkgdir"/usr/sbin/sensord "$subpkgdir"/usr/sbin/sensord } @@ -75,7 +69,7 @@ sensord_openrc() { install -Dm755 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord } -sha512sums="bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1 lm_sensors-3.5.0.tar.gz +sha512sums="4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf lm_sensors-3.6.0.tar.gz 794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb use-module-load.d-dir.patch 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21 fancontrol.initd a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d sensord.confd diff --git a/user/lohit-ttf/APKBUILD b/user/lohit-ttf/APKBUILD index 9b464c39e..cf0d06e27 100644 --- a/user/lohit-ttf/APKBUILD +++ b/user/lohit-ttf/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="https://releases.pagure.org/lohit/lohit-ttf-$pkgver.tar.gz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="b622be55e16a8ccbad0d2fc6e546c072e0af1954a36095a00f31e09e6dd80e86e98a36f4a4a7b8adf21a3f380f816e6fe77ef2e61f15521abfd9f7f4b8c06cbc lohit-ttf-20140220.tar.gz" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 731853147..8e6681499 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,9 +1,9 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=19.08.2 +pkgver=19.12.3 pkgrel=0 -pkgdesc="Lieutenant Skat is an interactive two-player card game" +pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" arch="all" license="GPL-2.0-only" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdbusaddons-dev kdoctools-dev kguiaddons-dev ki18n-dev kxmlgui-dev kwidgetsaddons-dev libkdegames-dev phonon-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/lskat-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/lskat-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb83c64de6cb6988bdd9a0abe14aa88085bcc76f5932709fc74baf91d9f98a9189d29081d422db573c31f84333e9e05de65714311c418b5b218e90c8ed66995e lskat-19.08.2.tar.xz" +sha512sums="84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed lskat-19.12.3.tar.xz" diff --git a/user/lsof/APKBUILD b/user/lsof/APKBUILD index 370d8c7a7..5330d1a7a 100644 --- a/user/lsof/APKBUILD +++ b/user/lsof/APKBUILD @@ -1,30 +1,24 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=lsof -pkgver=4.91 +pkgver=4.93.2 pkgrel=0 pkgdesc="LiSt Open Files" url="https://people.freebsd.org/~abe" arch="all" license="zlib-acknowledgement" -subpackages="$pkgname-doc" +depends="" makedepends="linux-headers cmd:which utmps-dev" -source="http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/lsof-org/lsof/archive/$pkgver.tar.gz utmps.patch + test-disable-nfs-test.patch test-enable-suite.patch test-linux-sysmacros.patch - test-disable-nfs-test.patch" -builddir="$srcdir/${pkgname}_${pkgver}" - -unpack() { - default_unpack - cd "$builddir" - tar xf "${pkgname}_${pkgver}_src.tar" -} + " prepare() { default_prepare - cd "$builddir/${pkgname}_${pkgver}_src" sed -i "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \ dialects/linux/machine.h @@ -32,32 +26,26 @@ prepare() { } build () { - cd "$builddir/${pkgname}_${pkgver}_src" - ./Configure -n linux make } check() { - cd "$builddir/${pkgname}_${pkgver}_src/tests" - # The LTsock test will fail if /etc/hosts is not set correctly. # Make sure that 127.0.0.1 and ::1 have aliases corresponding to # `hostname`. - printf "y" | make - make opt + printf "y" | make -C tests + make -C tests opt } package() { - cd "$builddir/${pkgname}_${pkgver}_src" - install -Dm755 lsof "$pkgdir/usr/bin/lsof" - install -Dm644 lsof.8 "$pkgdir/usr/share/man/man8/lsof.8" + install -Dm644 Lsof.8 "$pkgdir/usr/share/man/man8/lsof.8" install -Dm644 COPYING "$pkgdir/usr/share/licenses/lsof/COPYING" } -sha512sums="95937afda1ba58e6636b2a2661d819480ec42b4beafc0e69e6132d7fdffd4e3974a95036a02c6fd8baf92089c73ac969cdc00a297bf0249257867d695bff2f94 lsof_4.91.tar.gz -dfbfcfd41a4bccf3335ed01cc2dc9a11b6badd3149878d89ef5fed322a914d3d8341c68783140a4973d007907ce54b4438f011c26289df9e27d2d487a8f6b0b0 utmps.patch -34d9573f90d942c717e3f3ff17283a66981c4a2e8e886746b591f980142d66115bc7afe6bdd0fc660ea6c1b42f591b161b9535e5849b8757e79546c197ccfdda test-linux-sysmacros.patch -7f3e9b2850af54a5391db6a8f7eaa22329217fd559d3d41ee3bcd33b07b3526d17da75a542d28b013111bc5d5712a718e961aa4fe84ca3c5e73a97e0518ba2ec test-enable-suite.patch -d299e2070415168f75a9ee6424e18c1496f6d1fd5430b13a92159422c9df58050ac63e22cebd13a5228207f5960cf2cde5830a46c9ec7a4c216f5e6fb71887f4 test-disable-nfs-test.patch" +sha512sums="3c4a4d503391b1a648a08a4947c2e72a9629b169eddf50738b16a16a82f2a26967e4db2902e4a9157de5a73ae638db48e392117ffbd591e9fafd6b1725cd01a0 lsof-4.93.2.tar.gz +d6f2f5b991c137abf30b8cd29eebaf7662f7255e6d99b7fba5c945eba09a2c7ce7c444895e72c6871a7d90fe3ad8ca28b052a428127ba0342b13b3b027a3c77f utmps.patch +f2128d3aa3183244ade8a553f5a1ca7a5db571eae4ebd9c87c05f4b2996de152796573dd35d9c57d0f35671f2eb928b66fe637b1693ec1b8828c9a8d739c6771 test-disable-nfs-test.patch +72923d42db63435a95b07d17b6c6e8ac64f1a8f20505f851ed706783078bce0c49cac61dd8c05c08d24333c07ad981aaf34d4a4e4d1edb2a82ae8c9e9b8328e0 test-enable-suite.patch +14473839fa695e84cddac8bc1a33e06aba082bcc56baa6c4a6134a6c55ec1c9d08f756dab483785c0796a9442345853f7762fed76efb60a732fbc709bb06d25f test-linux-sysmacros.patch" diff --git a/user/lsof/test-disable-nfs-test.patch b/user/lsof/test-disable-nfs-test.patch index 9ccb11cf9..ed1b88ed4 100644 --- a/user/lsof/test-disable-nfs-test.patch +++ b/user/lsof/test-disable-nfs-test.patch @@ -1,7 +1,7 @@ LTnfs requires a NFS filesystem in order to run. ---- lsof_4.91/lsof_4.91_src/tests/Makefile 2006-01-10 13:27:52.000000000 -0500 -+++ lsof_4.91/lsof_4.91_src/tests/Makefile 2018-09-12 18:27:52.309560442 -0400 +--- lsof_4.91/tests/Makefile 2006-01-10 13:27:52.000000000 -0500 ++++ lsof_4.91/tests/Makefile 2018-09-12 18:27:52.309560442 -0400 @@ -19,7 +19,7 @@ BASTST= LTbasic diff --git a/user/lsof/test-enable-suite.patch b/user/lsof/test-enable-suite.patch index 7601aa9c0..c5fc9286c 100644 --- a/user/lsof/test-enable-suite.patch +++ b/user/lsof/test-enable-suite.patch @@ -1,5 +1,5 @@ ---- lsof_4.91/lsof_4.91_src/tests/CkTestDB 2010-02-12 15:37:05.000000000 -0500 -+++ lsof_4.91/lsof_4.91_src/tests/CkTestDB 2018-09-12 18:22:36.179562676 -0400 +--- lsof_4.91/tests/CkTestDB 2010-02-12 15:37:05.000000000 -0500 ++++ lsof_4.91/tests/CkTestDB 2018-09-12 18:22:36.179562676 -0400 @@ -67,6 +68,5 @@ echo "" - exit 1 diff --git a/user/lsof/test-linux-sysmacros.patch b/user/lsof/test-linux-sysmacros.patch index bc75a9f39..1764f5369 100644 --- a/user/lsof/test-linux-sysmacros.patch +++ b/user/lsof/test-linux-sysmacros.patch @@ -1,5 +1,5 @@ ---- lsof_4.91/lsof_4.91_src/tests/LTlib.c 2017-09-10 19:05:11.000000000 -0400 -+++ lsof_4.91/lsof_4.91_src/tests/LTlib.c 2018-09-12 18:05:26.719569950 -0400 +--- lsof_4.91/tests/LTlib.c 2017-09-10 19:05:11.000000000 -0400 ++++ lsof_4.91/tests/LTlib.c 2018-09-12 18:05:26.719569950 -0400 @@ -189,6 +189,12 @@ #endif /* defined(LT_DIAL_uw) */ diff --git a/user/lsof/utmps.patch b/user/lsof/utmps.patch index 91324e28e..f4790a818 100644 --- a/user/lsof/utmps.patch +++ b/user/lsof/utmps.patch @@ -1,5 +1,5 @@ ---- lsof_4.91/lsof_4.91_src/Configure 2018-02-14 09:18:55.000000000 -0500 -+++ lsof_4.91/lsof_4.91_src/Configure 2018-09-12 17:48:25.269577168 -0400 +--- lsof_4.91/Configure 2018-02-14 09:18:55.000000000 -0500 ++++ lsof_4.91/Configure 2018-09-12 17:48:25.269577168 -0400 @@ -2943,6 +2943,12 @@ LSOF_CFGF="$LSOF_CFGF -DHASIPv6" fi # } diff --git a/user/lua-expat/32bit.patch b/user/lua-expat/32bit.patch new file mode 100644 index 000000000..5a09710e1 --- /dev/null +++ b/user/lua-expat/32bit.patch @@ -0,0 +1,11 @@ +--- luaexpat-1.3.3/makefile.old 2018-11-27 11:31:28.000000000 +0000 ++++ luaexpat-1.3.3/makefile 2020-01-24 06:06:47.843102618 +0000 +@@ -36,7 +36,7 @@ + -Wpointer-arith \ + -Wshadow \ + -Wwrite-strings \ +- -DLUA_C89_NUMBERS ++ -Wno-long-long + + CFLAGS = -fPIC -std=gnu99 $(CWARNS) -ansi -O2 -I$(LUA_INC) -I$(EXPAT_INC) + CC = gcc diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 9c8a6713a..704f89173 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contribtor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-expat -_name=expat -pkgver=1.3.0 +pkgver=1.3.3 pkgrel=0 pkgdesc="SAX XML parser based on the Expat library" url="https://matthewwild.co.uk/projects/luaexpat/" @@ -11,22 +10,25 @@ arch="all" license="MIT" depends="lua5.3" makedepends="lua5.3-dev expat-dev" -source="http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz + 32bit.patch + " builddir="$srcdir/luaexpat-$pkgver" build() { - cd "$builddir" make LUA_V=5.3 } check() { - cd "$builddir" - LUA_CPATH="./src/?.so" lua tests/test.lua + LUA_CPATH="./src/?.so.1.3.3" lua tests/test.lua } package() { - cd "$builddir" - make LUA_V=5.3 DESTDIR="$pkgdir" install + make \ + LUA_LIBDIR="$pkgdir"/usr/lib/lua5.3 \ + LUA_DIR="$pkgdir"/usr/share/lua5.3 \ + LUA_V=5.3 DESTDIR="$pkgdir" install } -sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae luaexpat-1.3.0.tar.gz" +sha512sums="aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 lua-expat-1.3.3.tar.gz +ac5b05991dfe36bcc0c9ff7570110dbb1face387c0b65e4735b99cedaff5e29311a919b5e8ce6dae2ac674eadd2fa0bea6ec547754071d325dcce6460eeef36e 32bit.patch" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index e0deea91a..11e166311 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem pkgver=1.7.0.2 @@ -16,18 +16,15 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/arc builddir="$srcdir/$_pkgname-$_pkgver" build() { - cd "$builddir" make CFLAGS="$CFLAGS $(pkg-config lua --cflags) -fPIC" } check() { - cd "$builddir" LUA_CPATH=./src/?.so lua tests/test.lua } package() { - local rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver" - cd "$builddir" + rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver" make LUA_LIBDIR="$pkgdir/$(pkg-config --variable=INSTALL_CMOD lua)" install mkdir -p "$rockdir" echo 'rock_manifest = {}' > "$rockdir"/rock_manifest diff --git a/user/lua-lgi/APKBUILD b/user/lua-lgi/APKBUILD index f9b07ca3b..be1bd5334 100644 --- a/user/lua-lgi/APKBUILD +++ b/user/lua-lgi/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="Dynamic Lua binding to GObject libraries using GObject-Introspection" url="https://github.com/pavouk/lgi" arch="all" +options="!check" # Test suite requires D-Bus. license="MIT" -options="!check" # checks require dbus depends="" makedepends="glib-dev gobject-introspection-dev libffi-dev lua5.3-dev" subpackages="$pkgname-doc" @@ -15,18 +15,15 @@ source="lgi-$pkgver.tar.gz::https://github.com/pavouk/lgi/archive/$pkgver.tar.gz builddir="$srcdir"/lgi-$pkgver build() { - cd "$builddir" make PREFIX=/usr LUA_VERSION="5.3" \ LUA_CFLAGS="$(pkg-config --cflags lua)" } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install PREFIX=/usr LUA_VERSION="5.3" DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/share/doc/lua-lgi diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD index c9adf49ff..2ab2f12fc 100644 --- a/user/lua-sec/APKBUILD +++ b/user/lua-sec/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=lua-sec -pkgver=0.8.1 +pkgver=0.9 pkgrel=0 pkgdesc="TLS/SSL Support for Lua" url="https://github.com/brunoos/luasec/wiki" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="MIT" depends="lua5.3 lua-socket" makedepends="lua5.3-dev openssl-dev" subpackages="$pkgname-doc" -source="luasec-$pkgver.tar.gz::https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz" -builddir="$srcdir/luasec-luasec-$pkgver" +source="luasec-$pkgver.tar.gz::https://github.com/brunoos/luasec/archive/v$pkgver.tar.gz" +builddir="$srcdir/luasec-$pkgver" build() { make linux INC_PATH="$(pkg-config --cflags lua)" LD="${CC:-gcc}" @@ -27,4 +27,4 @@ package() { cp -r samples "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="982bddc0ee725220625e645f7497592671578ed33960c2c2e6f556d6236a15da65be7d7359552e616882900669540fb0a0ee4eb60a052d54265a6f752e84e8ff luasec-0.8.1.tar.gz" +sha512sums="ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933 luasec-0.9.tar.gz" diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 89cbd7447..7c0197036 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-socket _name=luasocket pkgver=3.0_rc1_git20160306 @@ -19,19 +19,16 @@ source="luasocket-$_ver.tar.gz::https://github.com/diegonehab/luasocket/archive/ builddir="$srcdir/$_name-$_ver" build() { - cd "$builddir" make LUAV="" } check() { - cd "$builddir" mkdir -p src/socket && cp src/socket-$_ver.so src/socket/core.so mkdir -p src/mime && cp src/mime-1.0.3.so src/mime/core.so LUA_CPATH=./src/?.so LUA_PATH="./src/?.lua;;" lua test/hello.lua } package() { - cd "$builddir" make prefix=/usr DESTDIR="$pkgdir" LUAV="5.3" install-unix } diff --git a/user/lua-yaml/APKBUILD b/user/lua-yaml/APKBUILD new file mode 100644 index 000000000..f252b3a7b --- /dev/null +++ b/user/lua-yaml/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=lua-yaml +pkgver=6.2.4 +pkgrel=0 +pkgdesc="LibYAML binding for Lua" +url="https://gvvaughan.github.io/lyaml/" +arch="all" +options="!check" # No tests, sweet. +license="MIT" +depends="lua5.3" +makedepends="lua5.3-dev yaml-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/gvvaughan/lyaml/archive/v$pkgver.tar.gz" +builddir="$srcdir/lyaml-$pkgver" + +build () { + ./build-aux/luke PREFOX=$pkgdir/usr VERSION="${pkgver}" +} + +package() { + mkdir -p $pkgdir/usr + ./build-aux/luke PREFIX=$pkgdir/usr install +} + +sha512sums="92dea86a3b1d648093d2134ea4c558432b0861942aa141359d1ca9d7bc55f33a62bb38e12fd653d69139e0a6f0ea6202a9e8c57f750a065d35f0dd674eacaf8a lua-yaml-6.2.4.tar.gz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index dbceb82e5..44440a3ef 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=luarocks -pkgver=3.2.1 +pkgver=3.3.1 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9abf2c5477b9ab8e3caf485dd10fc154435b41efc13c7709f36a9182ccbd98d022738627f76901977a9b7c42ae61e5f139e78070d469094a7571910afbb747ff luarocks-3.2.1.tar.gz" +sha512sums="0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a luarocks-3.3.1.tar.gz" diff --git a/user/luit/APKBUILD b/user/luit/APKBUILD index 09e135e12..5464e3d9d 100644 --- a/user/luit/APKBUILD +++ b/user/luit/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/luit-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index 41752c57a..b5a76d86d 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lximage-qt pkgver=0.14.1 pkgrel=0 @@ -15,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -27,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd lximage-qt-0.14.1.tar.xz" diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index 846d44da3..a8d4d4b92 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 @@ -8,17 +8,16 @@ url="https://lxqt.org" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" +depends="" makedepends="automake autoconf glib-dev intltool" source="lxmenu-data-$pkgver.tar.gz::https://github.com/lxde/lxmenu-data/archive/$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,7 +28,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 8a6f865c9..767194b42 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-about pkgver=0.14.1 pkgrel=0 @@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,13 +24,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a lxqt-about-0.14.1.tar.xz" diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index 2dc1b1db3..a464f20d0 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-admin pkgver=0.14.1 pkgrel=0 @@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,13 +24,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373 lxqt-admin-0.14.1.tar.xz" diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 1447fdee0..a2ffa3160 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-build-tools pkgver=0.6.0 pkgrel=0 @@ -11,28 +11,26 @@ options="!check" license="BSD-3-Clause" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev" +subpackages="" source="lxqt-build-tools-$pkgver.tar.gz::https://github.com/lxde/lxqt-build-tools/archive/$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz" diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 0198540b4..5f64da9ce 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-config pkgver=0.14.1 pkgrel=0 @@ -16,29 +16,25 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make -j1 + ${CMAKE_CROSSOPTS} -Bbuild + make -j1 -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index a49fea8d7..6ad593a75 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-desktop pkgver=0.13.0 pkgrel=1 @@ -14,17 +14,10 @@ depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab" makedepends="" -install="" subpackages="$pkgname-doc" source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1" -builddir="$srcdir/$pkgname-$pkgver" - -build() { - cd "$srcdir" -} package() { - cd "$srcdir" install -D -m644 "$srcdir"/org.adelie-linux.about-lxqt.desktop \ "$pkgdir"/usr/share/applications/org.adelie-linux.about-lxqt.desktop install -D -m755 "$srcdir"/startlxqt "$pkgdir"/usr/bin/startlxqt diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index 721f8f118..da75788ad 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-globalkeys -pkgver=0.14.1 +pkgver=0.14.3 pkgrel=0 pkgdesc="Daemon and configuration utility for global shortcuts in LXQt" url="https://lxqt.org" @@ -15,11 +15,9 @@ subpackages="$pkgname-dev" source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -27,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="7683971a916adb0dff8efd5567dad11e0860e48960bb6ed650aa2cd8e1bc33f7b8cbff95e19f198e00b61eea4f7492b41e7a0acf19365143c1c0ce8ea0cbb2a3 lxqt-globalkeys-0.14.1.tar.xz" +sha512sums="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c lxqt-globalkeys-0.14.3.tar.xz" diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index cc60400d1..b13843f75 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 @@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev libqtxdg-dev source="https://github.com/lxde/lxqt-l10n/releases/download/$pkgver/lxqt-l10n-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,13 +24,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="cbafc0f1c12a9c14af8ed896f5147d90fcd24786be0cc5de7f8897e31ac012a7308604622635f43709edeb13824395806e6d8e89355a0fd6799227f8d0d8f686 lxqt-l10n-0.13.0.tar.xz" diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 76bf8585f..137b19cf8 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-notificationd pkgver=0.14.1 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" url="https://lxqt.org" arch="all" +options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 @@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*} source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz" diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index b45edca56..0778adc3d 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-openssh-askpass pkgver=0.14.1 pkgrel=0 @@ -15,11 +15,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -27,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf lxqt-openssh-askpass-0.14.1.tar.xz" diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 2dfef7350..8f8a38643 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-panel pkgver=0.14.1 pkgrel=0 pkgdesc="Panel for LXQt desktop" url="https://lxqt.org" 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 @@ -17,11 +18,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -29,18 +28,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687 lxqt-panel-0.14.1.tar.xz" diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index d940b6d52..7b677a646 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-policykit pkgver=0.14.1 pkgrel=0 @@ -16,11 +16,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940 lxqt-policykit-0.14.1.tar.xz" diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 68907d723..0b3097cdd 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-powermanagement pkgver=0.14.1 pkgrel=0 pkgdesc="Power management utilities for LXQt" url="https://lxqt.org" 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 @@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10 lxqt-powermanagement-0.14.1.tar.xz" diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index ae0a30b03..9d237c3f6 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-qtplugin pkgver=0.14.0 pkgrel=0 pkgdesc="Qt plugin for platform integration with LXQt" url="https://lxqt.org/" 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 @@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz" diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index d44d72c1e..7acd62c9b 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-runner pkgver=0.14.1 pkgrel=0 pkgdesc="Qt-based application launcher for LXQt" url="https://lxqt.org" arch="all" +options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 @@ -16,11 +17,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-runner/releases/download/$pkgver/lxqt-runner-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c lxqt-runner-0.14.1.tar.xz" diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index 0b960dee0..d6cc987a0 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-session pkgver=0.14.1 pkgrel=0 pkgdesc="Session management utilities for LXQt" url="https://lxqt.org" 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 @@ -14,11 +15,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install rm "$pkgdir"/usr/bin/startlxqt rm "$pkgdir"/usr/share/man/man1/start* } diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index 5a15a9cfb..c65fe652c 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-sudo pkgver=0.14.1 pkgrel=0 @@ -15,11 +15,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -27,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222 lxqt-sudo-0.14.1.tar.xz" diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 233511d95..6881e5a4d 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-themes pkgver=0.14.0 pkgrel=0 @@ -13,11 +13,9 @@ makedepends="cmake lxqt-build-tools>=0.6.0" source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -25,13 +23,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz" diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 24af506f4..4bd75c160 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lynx pkgver=2.8.9_p1 _relver="${pkgver%_p*}rel.${pkgver#*_p}" @@ -16,7 +16,6 @@ source="https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver} builddir="$srcdir/${pkgname}${_relver}" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" ./lynx -version } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install-help install-doc \ helpdir=/usr/share/doc/lynx/help \ docdir=/usr/share/doc/lynx diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD index 1120b249b..fa5b7d902 100644 --- a/user/mac-fdisk/APKBUILD +++ b/user/mac-fdisk/APKBUILD @@ -7,8 +7,8 @@ pkgrel=2 pkgdesc="68K and PowerPC fixed disk partitioning utility" url="https://adelielinux.org/" arch="all !aarch64" # Literally does not support this arch. -license="GPL-2.0" options="!check" # No test suite. +license="GPL-2.0" depends="" makedepends="linux-headers" subpackages="$pkgname-doc" @@ -23,16 +23,15 @@ source="https://distfiles.adelielinux.org/source/mac-fdisk_0.1.orig.tar.gz mac-fdisk-large-disk-support.patch mac-fdisk-largerthan2gb.patch mac-fdisk-non-glibc-support.patch - flush-stdout.patch" + flush-stdout.patch + " builddir="$srcdir/$pkgname-$_pkgver.orig" build() { - cd "$builddir" make CFLAGS="-D_GNU_SOURCE" } package() { - cd "$builddir" mkdir -p "$pkgdir"/sbin make DESTDIR="$pkgdir" install diff --git a/user/mactel-boot/APKBUILD b/user/mactel-boot/APKBUILD index 8909202af..e0e1bf16e 100644 --- a/user/mactel-boot/APKBUILD +++ b/user/mactel-boot/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="http://www.codon.org.uk/~mjg59/mactel-boot/mactel-boot-$pkgver.tar.bz2" build() { - cd "$builddir" make hfs-bless } diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 863b8122c..214373d24 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -15,10 +15,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev zlib-dev kio-dev kparts-dev kcrash-dev ki18n-dev phonon-dev plasma-framework-dev qt5-qtpositioning-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" -source="https://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/marble-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,13 +28,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d18cfa59be6b360271afc711f61925a09dc4a304eaf41abbaeb6c7c6dc5aedff35eab658c47abba6fa5919940b6a7236292d38cc2e6eafe792c4188f090c1c61 marble-19.08.2.tar.xz" +sha512sums="e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 marble-19.12.3.tar.xz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index c227e07b1..30c55065c 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=marco -pkgver=1.22.3 +pkgver=1.24.0 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -9,13 +9,13 @@ arch="all" license="GPL-2.0+ AND MIT-advertising AND MIT-CMU" depends="" makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev - libxml2-utils zenity" + libxml2-utils startup-notification-dev zenity" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/marco-$pkgver.tar.xz - correctly-posix.patch" + correctly-posix.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,14 +27,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="439b327949b12d0a440fa29dfa7a40783003e7bce77a12695258d438d8c34ff4acc6b2563bc6d8c19ed0556a2a26d64a50aa9aa3c6a05f25e3a30992b00805b0 marco-1.22.3.tar.xz +sha512sums="b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428 marco-1.24.0.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 9dced4d5f..815a44faa 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.8 +pkgver=10.4.12 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -27,12 +27,15 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz crc32-power.patch gcc_builtins_ppc.h - libedit.patch ppchax.patch mariadb.initd mariadb-server.limits " +# secfixes: +# 10.4.12-r0: +# - CVE-2020-7221 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -262,10 +265,9 @@ doc() { default_doc } -sha512sums="1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42 mariadb-10.4.8.tar.gz +sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 mariadb-10.4.12.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h -41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch -0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch +0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/libedit.patch b/user/mariadb/libedit.patch deleted file mode 100644 index 14dc9db49..000000000 --- a/user/mariadb/libedit.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d9342e88289fa588ea2f1a094dbfc32f0693e23d Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper <sebastian_ml@gmx.net> -Date: Tue, 9 Apr 2019 22:28:10 +0200 -Subject: [PATCH] cmake: support new libedit interface - -libedit changed it's interface a while ago. MariaDB's cmake file doesn't -recognize the new interface, the compile test fails: - -/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)': -/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive] - int res= (*rl_completion_entry_function)(0,0); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ - -Fix this by adding a detection for the new interface as well. - -Run-tested on a MIPS machine. - -Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> ---- - cmake/readline.cmake | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/cmake/readline.cmake b/cmake/readline.cmake -index 12a8980b6a90..a2b2cc4c241f 100644 ---- a/cmake/readline.cmake -+++ b/cmake/readline.cmake -@@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) - int res= (*rl_completion_entry_function)(0,0); - completion_matches(0,0); - }" -- LIBEDIT_INTERFACE) -- SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) -+ LIBEDIT_HAVE_COMPLETION_INT) -+ -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include <stdio.h> -+ #include <readline.h> -+ int main(int argc, char **argv) -+ { -+ char res= *(*rl_completion_entry_function)(0,0); -+ completion_matches(0,0); -+ }" -+ LIBEDIT_HAVE_COMPLETION_CHAR) -+ IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR) -+ SET(USE_LIBEDIT_INTERFACE 1) -+ ENDIF() - ENDIF() - ENDMACRO() - -@@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE) - IF(USE_LIBEDIT_INTERFACE) - SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) - SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) -+ SET(USE_NEW_READLINE_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR}) - ELSE() - MYSQL_USE_BUNDLED_READLINE() - ENDIF() diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch index 26ffb5189..4ce0d304b 100644 --- a/user/mariadb/ppchax.patch +++ b/user/mariadb/ppchax.patch @@ -1,6 +1,6 @@ --- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000 +++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000 -@@ -922,6 +922,10 @@ +@@ -867,6 +867,10 @@ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" HAVE_GCC_C11_ATOMICS) @@ -13,7 +13,7 @@ SET(HAVE_valgrind 1) --- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000 +++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000 -@@ -91,6 +91,10 @@ +@@ -92,6 +92,10 @@ TARGET_LINK_LIBRARIES(mysys pthread) ENDIF() diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD index e3eb7c72d..f91b6ff04 100644 --- a/user/mate-applets/APKBUILD +++ b/user/mate-applets/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-applets -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Utility applications for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,10 +13,9 @@ makedepends="dbus-dev dbus-glib-dev gtk+3.0-dev gtksourceview-3.0-dev libwnck-dev libxml2-dev libxml2-utils mate-panel-dev polkit-dev upower-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/1.22/mate-applets-$pkgver.tar.xz" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-applets-$pkgver.tar.xz" build() { - cd "$builddir" rm -r mateweather/docs/ru ./configure \ --build=$CBUILD \ @@ -29,13 +28,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f mate-applets-1.22.2.tar.xz" +sha512sums="345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e mate-applets-1.24.0.tar.xz" diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD index bd70d43a8..ff2dd8671 100644 --- a/user/mate-backgrounds/APKBUILD +++ b/user/mate-backgrounds/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-backgrounds -pkgver=1.22.0 +pkgver=1.24.0 pkgrel=0 pkgdesc="Desktop wallpapers provided by the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-backgrounds-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b7135cdb20972d50f43026cf98275faaa3c5e41bd0900bca7624a8f9ed03d0ec7f465c78aaf3da534ea6798e8cc690727a1fed8f14b3fb42a8a63bd82858ff30 mate-backgrounds-1.22.0.tar.xz" +sha512sums="29bb18ad77767593c9428c0bbb28da5b2fccab67b71b7d295784c7ec018692f6d5fcdcbae202549650765bc090932cec99a9ec9066d066dc8b4fc6d7347f5905 mate-backgrounds-1.24.0.tar.xz" diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD index 0a0d5c90f..b8c15fe4f 100644 --- a/user/mate-calc/APKBUILD +++ b/user/mate-calc/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-calc -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Calculator utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-calc-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4235e49df4517d1a43a1f6422220f5b35320c34f588eb9ff3c63aa2ff59123a53ea9723372d3fe4d8c29d40ef09a51f4bd536655b5056d840eb5c253f572afb5 mate-calc-1.22.2.tar.xz" +sha512sums="ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb mate-calc-1.24.0.tar.xz" diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD index e84227d22..210e68923 100644 --- a/user/mate-common/APKBUILD +++ b/user/mate-common/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-common -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Additional development support for the MATE desktop environment" url="https://mate-desktop.org" @@ -10,10 +10,9 @@ license="GPL-3.0-only" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="https://pub.mate-desktop.org/releases/1.22/mate-common-$pkgver.tar.xz" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-common-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0afedfae9a93f9b3f8344d5f8a93d80b71b472f084e8322daa7f616e9f0861511536aa1f56f8cfc57abd7e1720cd4695dcecc0582483b009bc6e67daaa82107b mate-common-1.22.2.tar.xz" +sha512sums="bbeead4b0493e386756670ca31e9f9cca92d9205e84282c87ee73d4a17b77ca258265569dc6f3483566ac04bc4a2de1aa737bcaaecbb01a83c73fb804b18a642 mate-common-1.24.0.tar.xz" diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD index f3a5ac75a..a828fd924 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/APKBUILD @@ -1,26 +1,28 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-complete pkgver=1.22.0 pkgrel=0 -url="https://mate-desktop.org" pkgdesc="Complete MATE desktop environment" +url="https://mate-desktop.org" arch="noarch" options="!check" # No tests -license=" " +license="Public-Domain" depends="atril caja caja-dropbox caja-extensions 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 - mate-polkit mate-power-manager mate-screensaver mate-sensors-applet - mate-session-manager mate-settings-daemon mate-system-monitor - mate-terminal mate-user-guide mate-user-share mate-utils mozo pluma" + 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 + mate-polkit mate-power-manager mate-screensaver mate-sensors-applet + mate-session-manager mate-settings-daemon mate-system-monitor + mate-terminal mate-user-guide mate-user-share mate-utils mozo pluma" +makedepends="" +subpackages="" source="org.adelie-linux.about-mate.desktop" package() { - cd "$srcdir" mkdir -p "$pkgdir"/usr/share/applications - install -Dm644 org.adelie-linux.about-mate.desktop "$pkgdir"/usr/share/applications + install -Dm644 "$srcdir"/org.adelie-linux.about-mate.desktop \ + "$pkgdir"/usr/share/applications } sha512sums="24fd0524d949a22b22e38c81667f31498bc524302c52128c10d8a5802315720543426ba82245f5e7510832c493389ff59f36be14433f1a6a6c68993f733f329c org.adelie-linux.about-mate.desktop" diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD index c65bae49d..68be1f9b4 100644 --- a/user/mate-control-center/APKBUILD +++ b/user/mate-control-center/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-control-center -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Configuration utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -10,13 +10,12 @@ license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND MIT" depends="" makedepends="accountsservice-dev dbus-dev dbus-glib-dev desktop-file-utils gtk+3.0-dev intltool itstool libcanberra-dev libmatekbd-dev - libxklavier-dev libxml2-dev libxml2-utils marco-dev mate-desktop-dev - mate-menus-dev mate-settings-daemon-dev" + libxklavier-dev libxml2-dev libxml2-utils marco-dev mate-desktop-dev>=1.24.0 + mate-menus-dev mate-settings-daemon-dev>=1.24.0 polkit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-control-center-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="994563b8970ebf51ba44afe49122e82ff67fdb6c78ab2e8175acc6f619d40a82284cbafc1d61b89b25ac9e8488b00f63433eda94118d40a4fbff0d644ae1ddd5 mate-control-center-1.22.2.tar.xz" +sha512sums="78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce mate-control-center-1.24.0.tar.xz" diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD index b88573a5f..e9b825680 100644 --- a/user/mate-desktop/APKBUILD +++ b/user/mate-desktop/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-desktop -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Core library for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-desktop-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d2e965f9e26e4fe25337a4ef69521239388f38cff25e978331a307591555d8a9ff22d6a19ef3c92cf336c472fbfb231969ef5ac60e3a4c5908a81ded1e5f0f46 mate-desktop-1.22.2.tar.xz" +sha512sums="ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323 mate-desktop-1.24.0.tar.xz" diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD index 424ac19ed..eb5431a39 100644 --- a/user/mate-icon-theme/APKBUILD +++ b/user/mate-icon-theme/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-icon-theme -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Default icon theme for the MATE desktop environment" url="https://mate-desktop.org" @@ -11,10 +11,8 @@ depends="" makedepends="icon-naming-utils-dev intltool" subpackages="$pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-icon-theme-$pkgver.tar.xz" -builddir="$srcdir/mate-icon-theme-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bea4676305b3b26b1a65080d960c33276c1ba30bcd442a200773745b2723700f1ff04affb2483f9c2389475b80700355e85a1fa7fe20c8ee645927d95e0d3b23 mate-icon-theme-1.22.2.tar.xz" +sha512sums="18ad6a236f02b7536697fed9086eadd997f0c47cc8311324e43641b21ccf942d0dbd52fa6c49623e679d3b23d82619cc256c98d9f8ccc3b3d4cda5d9a6e465f1 mate-icon-theme-1.24.0.tar.xz" diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD index 1988c358a..1f16d683a 100644 --- a/user/mate-indicator-applet/APKBUILD +++ b/user/mate-indicator-applet/APKBUILD @@ -1,21 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-indicator-applet -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="MATE panel applet for consistent information display" url="https://mate-desktop.org" arch="all" license="GPL-3.0+ AND LGPL-2.0+" depends="" -makedepends="ayatana-ido-dev gtk+3.0-dev intltool libayatana-indicator-dev +makedepends="ayatana-ido-dev bash gtk+3.0-dev intltool libayatana-indicator-dev mate-panel-dev" subpackages="$pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-indicator-applet-$pkgver.tar.xz" build() { - cd "$builddir" - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2224e7222c36f04f78d4f5e10dfa7dffab31c687474fac605ec54795edaa7d230518168fef82459aba47e72362941b7968b94b11ccace40d8857adf605f8d8db mate-indicator-applet-1.22.1.tar.xz" +sha512sums="0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413 mate-indicator-applet-1.24.0.tar.xz" diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD index 11d43613a..489705ecc 100644 --- a/user/mate-media/APKBUILD +++ b/user/mate-media/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-media -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Media utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -11,10 +11,9 @@ depends="" makedepends="gtk+3.0-dev intltool libcanberra-dev libmatemixer-dev libxml2-dev mate-desktop-dev mate-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/1.22/mate-media-$pkgver.tar.xz" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-media-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="88a78e7ddf02335ffe4d819921cbb978b9e2fc430e0edd950f04edb3999f94d59c4aa39a8089ac0c66af6b152b1514e20810ae4c577095dcd60735046a88ec3a mate-media-1.22.2.tar.xz" +sha512sums="82ee6a16a49d9f4d229539cfacb5803c150af09dff227fb5995bf78e2b83a1f5bddb307756648e569a138124e4485ca56f635184e47fbfd76dcedd17f2bf0425 mate-media-1.24.0.tar.xz" diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD index d2d6d33d5..f6ae74b46 100644 --- a/user/mate-menus/APKBUILD +++ b/user/mate-menus/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-menus -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Desktop menu implementation for the MATE desktop environment" url="https://mate-desktop.org" @@ -10,10 +10,9 @@ license="LGPL-2.0+" depends="" makedepends="gobject-introspection-dev intltool" subpackages="$pkgname-dev $pkgname-lang" -source="https://pub.mate-desktop.org/releases/1.22/mate-menus-$pkgver.tar.xz" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-menus-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2766cafa35c11da6f6d5d6129a5e39c09e73ca97f72382df757091198260a342d278c53f88cddf75e174231443c1015198dfa1800b3601d5b770553ec7047a00 mate-menus-1.22.1.tar.xz" +sha512sums="27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406 mate-menus-1.24.0.tar.xz" diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD index 381e9d991..d2ef4243c 100644 --- a/user/mate-netbook/APKBUILD +++ b/user/mate-netbook/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-netbook -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Netbook-oriented window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-netbook-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="caaa841857b86592dd7417fa77e8211d1527f8234cd248a00a3a74b2b1487bd1c06a4bfde44818e1c3b0a64350b94e47d8bfdbcd545d787365dfd76c3af2ff71 mate-netbook-1.22.2.tar.xz" +sha512sums="fd2efbfaa3fb53f96bf9bff28eba70d3cd46b723a63e6748af0cb8314821cbafdc8d0122d402e89ac2742247685e630544f3d98149514114de5a3e38f7fbe471 mate-netbook-1.24.0.tar.xz" diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD index d3a0235c7..76a0d9ed5 100644 --- a/user/mate-notification-daemon/APKBUILD +++ b/user/mate-notification-daemon/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-notification-daemon -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Notification service for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-notification-daemon-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5faec84a2c25b3d17db5e0e564081a5712a0ae9a648b61e7d6233f7c6671a137cb9e0d2328eccad4e634eb99cae72cf235589f3667b9bf29e66c3734f7ed8bc7 mate-notification-daemon-1.22.1.tar.xz" +sha512sums="0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147 mate-notification-daemon-1.24.0.tar.xz" diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD index 36cbb8c84..6578e1583 100644 --- a/user/mate-panel/APKBUILD +++ b/user/mate-panel/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-panel -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Panel for the MATE desktop environment" url="https://mate-desktop.org" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-panel-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ccfd9e44116e66688d4de53c86e1a7d0754fd221b8083d7bee729f2a02a777a54b98ff70332b979aa075c157bc36c6ed6651f9190fa4a7e37b8a029a1f2a623f mate-panel-1.22.2.tar.xz" +sha512sums="12a88534400603998b4d4d415940947dd6372914135aa8eb6052c75e134412739a96064ad654e8f2625dbb6fe853e8cb376c41e530c30234e08141a46634820b mate-panel-1.24.0.tar.xz" diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD index 345159cbc..c634bcd6a 100644 --- a/user/mate-polkit/APKBUILD +++ b/user/mate-polkit/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-polkit -pkgver=1.22.0 +pkgver=1.24.0 pkgrel=0 pkgdesc="PolKit integration for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-polkit-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e761ec10842789b5bbb3831f568c64e969429131a893850e8323927b949e115a24b3907fd3def7f31f5f785f0831717d852c61f08a9028a009ea9cca0ba86393 mate-polkit-1.22.0.tar.xz" +sha512sums="8d759bd5f78750c75dc92ffa27e555ae36ae7199b76483cbfe7e0848d3a66cda5b82c98bf334068eb79a1344757665cf7d1bf403e4e908e332ca929c8ebe2a98 mate-polkit-1.24.0.tar.xz" diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD index 56d13b5c1..3a9c24620 100644 --- a/user/mate-power-manager/APKBUILD +++ b/user/mate-power-manager/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-power-manager -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Power management utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-power-manager-$pkgver.tar.xz" build() { - cd "$builddir" LIBS="-lexecinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="99a273558c072ce1d23c8964d9292f45a29a2d5a5e89b504e79e3686a65ad8cc7b200441ba22147d3d828f574e2cebc260c47531338e286b2c47988263763af6 mate-power-manager-1.22.2.tar.xz" +sha512sums="6194d1156a004c1006b3b0b5d50a4def5e6d07df5229aafac487843e4e544e144b85e2a9b45ee0b932b8de9a6969aa844f8f61ac607f9f5e6234fd4ff5d8a4d5 mate-power-manager-1.24.0.tar.xz" diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD index 1fd702a93..7f990b77e 100644 --- a/user/mate-screensaver/APKBUILD +++ b/user/mate-screensaver/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-screensaver -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Screensaver for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-screensaver-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6d28f7261556d59af0bdb8c59ac13fc042c9c5b4cce47e7f6d4148041eb7f05d5cb062f85f05dddb51d009e4aebac31c21fc1243c0e07813adc050fede134ef3 mate-screensaver-1.22.2.tar.xz" +sha512sums="8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0 mate-screensaver-1.24.0.tar.xz" diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD index fcb3ebb96..66bdcf6fa 100644 --- a/user/mate-sensors-applet/APKBUILD +++ b/user/mate-sensors-applet/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-sensors-applet -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="System monitoring applet for the MATE desktop environment" url="https://mate-desktop.org" @@ -11,10 +11,10 @@ depends="" makedepends="gtk+3.0-dev intltool itstool libnotify-dev libxml2-utils libxslt mate-panel-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-sensors-applet-$pkgver.tar.xz" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-sensors-applet-$pkgver.tar.xz + locale-guards.patch" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +26,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6 mate-sensors-applet-1.22.1.tar.xz" +sha512sums="039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2 mate-sensors-applet-1.24.0.tar.xz +dd8d0c78ad16e26b6f9cad3283fcd45ce7f5bd4ea16a01ff26cfd060cb26206a07a71c42d90a16cc39fb2e53b890d08b0fc9690b20ff0662c5ff16eab3065265 locale-guards.patch" diff --git a/user/mate-sensors-applet/locale-guards.patch b/user/mate-sensors-applet/locale-guards.patch new file mode 100644 index 000000000..d3a35b92b --- /dev/null +++ b/user/mate-sensors-applet/locale-guards.patch @@ -0,0 +1,29 @@ +diff -Nurd mate-sensors-applet-1.24.0/plugins/i2c-proc/i2c-proc-plugin.c mate-sensors-applet-1.24.0.new/plugins/i2c-proc/i2c-proc-plugin.c +--- mate-sensors-applet-1.24.0/plugins/i2c-proc/i2c-proc-plugin.c 2020-02-10 07:40:35.000000000 -0500 ++++ mate-sensors-applet-1.24.0.new/plugins/i2c-proc/i2c-proc-plugin.c 2020-02-15 12:50:42.395405752 -0500 +@@ -144,9 +144,11 @@ + gchar *old_locale = NULL; + + /* always use C locale */ ++#ifdef HAVE_LOCALE_H + if (NULL == (old_locale = setlocale(LC_NUMERIC, "C"))) { + g_warning("Could not change locale to C locale for reading i2c-proc device files.. will try regardless"); + } ++#endif + + if (NULL == (fp = fopen(path, "r"))) { + g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, I2C_PROC_DEVICE_FILE_OPEN_ERROR, "Error opening sensor device file %s", path); +@@ -203,11 +205,11 @@ + } /* end switch */ + fclose(fp); + } +- ++#ifdef HAVE_LOCALE_H + if (NULL != old_locale) { + setlocale(LC_NUMERIC, old_locale); + } +- ++#endif + return (gdouble)sensor_value; + } + diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD index a7c5baaea..1947acf5f 100644 --- a/user/mate-session-manager/APKBUILD +++ b/user/mate-session-manager/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-session-manager -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Session manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="afa712f8c708c79efd7a9d829fe961bb5a29612907df5fa90811fba1d417cddaca5ccc3c40042ecae6b544f0e0199c444f078d88bc9a264cb7ad930469dd5dd1 mate-session-manager-1.22.2.tar.xz" +sha512sums="ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37 mate-session-manager-1.24.0.tar.xz" diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD index fb99c523e..5a57e8554 100644 --- a/user/mate-settings-daemon/APKBUILD +++ b/user/mate-settings-daemon/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-settings-daemon -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Settings daemon for the MATE desktop environment" url="https://mate-desktop.org" @@ -15,25 +15,23 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-settings-daemon-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-pulse make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9a7d9d81f18e2603c45fab223b3341df1939ee92b0e2db00f0ca5c095a88511c67b33d668b951b1a8f93c81c1e801bfd35729e64fab8bf2962af1e443d8448b6 mate-settings-daemon-1.22.1.tar.xz" +sha512sums="897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1 mate-settings-daemon-1.24.0.tar.xz" diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD index 78b1b08c8..f08d2ad77 100644 --- a/user/mate-system-monitor/APKBUILD +++ b/user/mate-system-monitor/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-system-monitor -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="System monitor utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-system-monitor-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="47ccb38e27906c4de0cc18abc9d43ffc3b2c8f2f33b3f4cea3e47fd82c48870f03927fab39d323b61b9b871614b24bb2bc258d1c547650cdfb6b8eef65cb0de3 mate-system-monitor-1.22.2.tar.xz" +sha512sums="430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282 mate-system-monitor-1.24.0.tar.xz" diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD index 02da7e5b3..a79d54187 100644 --- a/user/mate-terminal/APKBUILD +++ b/user/mate-terminal/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-terminal -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Terminal emulator for the MATE desktop environment" url="https://mate-desktop.org" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-terminal-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b20102c15dc140b59c93802606ca94fd108dfd5f7ac7f079b872e957794fc2c3aab40c0e6da697e8d393a67fca7b106573a4cb8014af5d6c8ad777be3a798534 mate-terminal-1.22.1.tar.xz" +sha512sums="2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76 mate-terminal-1.24.0.tar.xz" diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD index 1f8f61ef6..c9ec36fe0 100644 --- a/user/mate-user-guide/APKBUILD +++ b/user/mate-user-guide/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-user-guide -pkgver=1.22.3 +pkgver=1.24.0 pkgrel=0 pkgdesc="User handbook for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-user-guide-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="87524a59143f3f79996e7bec9de059954d6447391f73238591ce437d4ff9ff21c5ec54d73876342a3077899315e8d7e9b620c2f38ca84b3a75c929e02463bc7b mate-user-guide-1.22.3.tar.xz" +sha512sums="80129fcbf628dd10d0748d0a35f9456c15a3748c1cd407aa7adf4d90e5f87d999778d136d772c64392279152da9b76912378b16a894f03dc5d11bec478ad6301 mate-user-guide-1.24.0.tar.xz" diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD index b519c9701..d20aae02f 100644 --- a/user/mate-user-share/APKBUILD +++ b/user/mate-user-share/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-user-share -pkgver=1.22.1 +pkgver=1.24.0 pkgrel=0 pkgdesc="Inter-user file sharing utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="afd2c2f8484124e26ac9ced23abd89c1b553adb4df6ca8bd49159e3ec5d76f2b16f6576b7f5608488e5290cddef733e27c653433ee9f57a09a6b76b774555894 mate-user-share-1.22.1.tar.xz" +sha512sums="15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664 mate-user-share-1.24.0.tar.xz" diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD index 0a8677b18..710cfd1bf 100644 --- a/user/mate-utils/APKBUILD +++ b/user/mate-utils/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mate-utils -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Miscellaneous utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -9,12 +9,11 @@ arch="all" license="LGPL-2.0+ AND LGPL-2.1+ AND GPL-2.0+ AND GPL-3.0+" depends="" makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libgtop-dev - libsm-dev libxml2-utils mate-panel-dev" + libsm-dev libxml2-utils mate-panel-dev udisks2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-utils-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60 mate-utils-1.22.2.tar.xz" +sha512sums="d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c mate-utils-1.24.0.tar.xz" diff --git a/user/mcpp/APKBUILD b/user/mcpp/APKBUILD index 233899f5f..761a3149e 100644 --- a/user/mcpp/APKBUILD +++ b/user/mcpp/APKBUILD @@ -15,13 +15,11 @@ source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz 02-gniibe-fixes.patch" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,17 +34,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - mkdir -p "$pkgdir"/usr/share/licenses/$pkgname - mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } sha512sums="1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235 mcpp-2.7.2.tar.gz diff --git a/user/mdadm/APKBUILD b/user/mdadm/APKBUILD index d15aefbc9..4025c9cc3 100644 --- a/user/mdadm/APKBUILD +++ b/user/mdadm/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=mdadm pkgver=4.1 -pkgrel=0 +pkgrel=2 pkgdesc="Tool for managing Linux soft RAID arrays" url="http://neil.brown.name/blog/mdadm" arch="all" @@ -17,15 +17,15 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve $pkgname.initd $pkgname.confd $pkgname-raid.initd + sysmacros.patch + time64.patch " build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname @@ -45,12 +45,13 @@ misc() { pkgdesc="$pkgdesc (misc scripts)" depends="$pkgname bash" - cd "$builddir" - install -Dm755 misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck - install -Dm755 misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events + install -Dm755 "$builddir"/misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck + install -Dm755 "$builddir"/misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events } sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c128126751915fde41407d46c544514d864bf82b508419bc08f1db7aa447557e2ca9e mdadm-4.1.tar.gz ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd -37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd" +37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd +47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 sysmacros.patch +53c2fe442e8657a7a5a011eab1cd1bfcca6c315ee42e4148a50e1314d238f957e7e722e1264c64c548d398a2c6b10600cccf45a4fb69351d3d9ad403f90c1fde time64.patch" diff --git a/user/mdadm/sysmacros.patch b/user/mdadm/sysmacros.patch new file mode 100644 index 000000000..22a393447 --- /dev/null +++ b/user/mdadm/sysmacros.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/580188 + +From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 19 Apr 2016 18:10:54 -0400 +Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes + +These funcs are defined in sys/sysmacros.h, so include it for them. +It works today due to an implicit include by sys/types.h, but the +various Linux C libraries are moving away from that. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + mdadm.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mdadm.h b/mdadm.h +index d209488..b8767a7 100755 +--- a/mdadm.h ++++ b/mdadm.h +@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + # endif + #endif + ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <stdint.h> +-- +2.7.4 + diff --git a/user/mdadm/time64.patch b/user/mdadm/time64.patch new file mode 100644 index 000000000..fd05fcb2f --- /dev/null +++ b/user/mdadm/time64.patch @@ -0,0 +1,19 @@ +--- mdadm-4.1/monitor.c.old 2018-10-01 18:26:06.000000000 +0000 ++++ mdadm-4.1/monitor.c 2020-01-22 19:51:39.575877908 +0000 +@@ -20,6 +20,7 @@ + + #include "mdadm.h" + #include "mdmon.h" ++#include <inttypes.h> + #include <sys/syscall.h> + #include <sys/select.h> + #include <signal.h> +@@ -447,7 +448,7 @@ + } + + gettimeofday(&tv, NULL); +- dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", ++ dprintf("(%d): %"PRId64".%06"PRId64" state:%s prev:%s action:%s prev: %s start:%llu\n", + a->info.container_member, + tv.tv_sec, tv.tv_usec, + array_states[a->curr_state], diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD index 3fe25f000..c9542b220 100644 --- a/user/mdds/APKBUILD +++ b/user/mdds/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mdds -pkgver=1.4.3 +pkgver=1.5.0 pkgrel=0 pkgdesc="Multi-dimensional data index algorithms" url="https://gitlab.com/mdds/mdds" arch="noarch" license="MIT" depends="" -makedepends="" checkdepends="boost-dev" +makedepends="" subpackages="$pkgname-doc" -source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2" replaces="$pkgname-dev" +source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2" build() { ./configure \ @@ -36,4 +36,4 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -sha512sums="fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c mdds-1.4.3.tar.bz2" +sha512sums="9ed434dbc00285defbf3e0989396a1b52439bfdda01e5fd5822fef5e42e2c9b0b9436dd11b99af84a09a1965191ec106114e4046834f5b733474759f43bbfd95 mdds-1.5.0.tar.bz2" diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD index ae73a2f66..64559ad16 100644 --- a/user/mednafen/APKBUILD +++ b/user/mednafen/APKBUILD @@ -6,12 +6,12 @@ pkgrel=0 pkgdesc="Portable multi-system emulator" url="https://mednafen.github.io/" arch="all !s390x" -options="!check !dbg" # mednafen does not ship actual tests +options="!check !dbg" # mednafen does not ship actual tests subpackages="$pkgname-lang" license="GPL-2.0-only" depends="" makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev - lzo-dev sdl2-dev zlib-dev" + lzo-dev sdl2-dev zlib-dev autoconf automake" source="https://mednafen.github.io/releases/files/$pkgname-$pkgver.tar.xz ppc.patch ppc64.patch diff --git a/user/menu-cache/APKBUILD b/user/menu-cache/APKBUILD index 0ed6c1272..dd8b8a0f5 100644 --- a/user/menu-cache/APKBUILD +++ b/user/menu-cache/APKBUILD @@ -8,12 +8,12 @@ url="https://lxde.org/" arch="all" options="!check libtool" # No test suite. license="GPL-2.0+" +depends="" makedepends="glib-dev libfm-extra-dev" subpackages="$pkgname-dev" source="https://downloads.sourceforge.net/lxde/menu-cache/1.1/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -23,7 +23,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index d1c172828..7a79aa829 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -5,15 +5,15 @@ pkgname=mesa-demos pkgver=8.4.0 pkgrel=1 pkgdesc="Mesa demos and utils" -url="http://mesa3d.org" +url="https://mesa3d.org" arch="all" +options="!check" # No test suite. license="X11" -options="!check" # No testsuite +depends="" makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool" -source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgname-$pkgver.tar.bz2" +source="https://mesa.freedesktop.org/archive/demos/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -23,7 +23,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # conflicts with X11 bitmap tool mv "$pkgdir"/usr/bin/bitmap "$pkgdir"/usr/bin/bitmap-demo diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 50100c2bb..7af2e17cd 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,113 +1,73 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.3.6 +pkgver=19.3.4 +_llvmver=8 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" +options="!check" # No test suite. license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+" -depends= -subpackages="$pkgname-dev - $pkgname-dri-ati:_dri - $pkgname-dri-nouveau:_dri - $pkgname-dri-freedreno:_dri - $pkgname-dri-swrast:_dri - $pkgname-dri-virtio:_dri - $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles - $pkgname-xatracker $pkgname-osmesa $pkgname-gbm - " -_llvmver=8 +depends="" depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev xorgproto-dev" -makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev - libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev - libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend python3 - py3-libxml2 py3-mako zlib-dev" +makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev + libva-dev libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev + libxv-dev libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend meson + ninja python3 py3-libxml2 py3-mako zlib-dev" +subpackages="$pkgname-dev $pkgname-dri + $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles + $pkgname-xatracker $pkgname-osmesa $pkgname-gbm" +# requires glslang: $pkgname-vulkan-overlay source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz + amdgpu-pthread-header.patch + big-endian-flipping.patch + intel-vulkan.patch musl-fixes.patch musl-fix-includes.patch - amdgpu-pthread-header.patch - disk_cache-stack-overflow.patch - drmdeps.patch - fix-non-altivec-ppc32.patch + no-tls.patch + time64.patch " _dri_driverdir=/usr/lib/xorg/modules/dri -_dri_drivers="r200,radeon,nouveau,swrast" +_dri_drivers="r200,nouveau" _gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl" -_vulkan_drivers="radeon" - -builddir="$srcdir/mesa-$pkgver" - -_arch_opts= +_vulkan_drivers="amd" case "$CARCH" in x86* | pmmx) - _dri_drivers="${_dri_drivers},i915,i965" - _gallium_drivers="${_gallium_drivers},svga" + _dri_drivers="${_dri_drivers},i965" + _gallium_drivers="${_gallium_drivers},i915,svga" _vulkan_drivers="${_vulkan_drivers},intel" - subpackages="$subpackages $pkgname-dri-intel:_dri $pkgname-dri-vmwgfx:_dri" ;; aarch64 | arm*) - _gallium_drivers="${_gallium_drivers},vc4" - subpackages="$subpackages $pkgname-dri-vc4:_dri" + _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnaviv" case "$CARCH" in armhf) CFLAGS="$CFLAGS -mfpu=neon";; esac ;; +ppc64) + _arch_conf="-Dpower8=false" + ;; esac -prepare() { - default_prepare - libtoolize --force \ - && aclocal \ - && automake --add-missing \ - && autoreconf -} - build() { - export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700" - PYTHON=python3 ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=$_dri_driverdir \ - --disable-asm \ - --with-gallium-drivers=${_gallium_drivers} \ - --with-dri-drivers=${_dri_drivers} \ - --with-vulkan-drivers=${_vulkan_drivers} \ - --with-llvm-prefix=/usr/lib/llvm$_llvmver \ - --enable-llvm-shared-libs \ - --enable-llvm \ - --with-platforms=x11,drm \ - --enable-shared-glapi \ - --enable-gbm \ - --disable-glx-tls \ - --disable-nine \ - --enable-dri \ - --enable-dri3 \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-xa \ - --enable-vdpau \ - $_arch_opts - - make -} - -check() { - # Compiler test requires LLVM 3.8 and Python 2 - for i in gtest util mapi; do - make -C "src/$i" check - done + meson \ + -Dprefix=/usr \ + -Ddri-drivers-path=$_dri_driverdir \ + -Dplatforms=x11,drm,surfaceless \ + -Ddri-drivers=$_dri_drivers \ + -Dgallium-drivers=$_gallium_drivers \ + -Dvulkan-drivers=$_vulkan_drivers \ + -Dosmesa=gallium \ + $_arch_conf \ + build + + ninja -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } egl() { @@ -128,7 +88,7 @@ gl() { glapi() { replaces="$pkgname-gles" - pkgdesc="Mesa shared glapi" + pkgdesc="Mesa OpenGL API" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libglapi.so.* \ "$subpkgdir"/usr/lib/ @@ -143,7 +103,7 @@ gles() { } xatracker() { - pkgdesc="Mesa XA state tracker for vmware" + pkgdesc="Mesa XA state tracker for VMware" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libxatracker*.so.* \ "$subpkgdir"/usr/lib/ @@ -157,83 +117,47 @@ osmesa() { } gbm() { - pkgdesc="Mesa gbm library" + pkgdesc="Mesa GBM library" replaces="mesa" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libgbm.so.* \ "$subpkgdir"/usr/lib/ } -_mv_dri() { - install -d "$subpkgdir"/$_dri_driverdir - - while [ $# -gt 0 ]; do - mv "$pkgdir"/$_dri_driverdir/${1}.so \ - "$subpkgdir"/$_dri_driverdir/ || return 1 - shift - done -} - -_mv_vdpau() { - local i - install -d "$subpkgdir"/usr/lib/vdpau - for i in "$@"; do - mv "$pkgdir"/usr/lib/vdpau/libvdpau_$i.* \ - "$subpkgdir"/usr/lib/vdpau/ || return 1 - done -} - -_mv_gpipe() { - return 0 - # http://cgit.freedesktop.org/mesa/mesa/commit/?id=44ec468e8033553c26a112cebba41c343db00eb1 - # https://code.google.com/p/chromium/issues/detail?id=412089 -# local i -# install -d "$subpkgdir"/usr/lib/gallium-pipe -# for i in "$@"; do -# mv "$pkgdir"/usr/lib/gallium-pipe/pipe_$i.* \ -# "$subpkgdir"/usr/lib/gallium-pipe/ || return 1 -# done +vulkan_overlay() { + pkgdesc="Vulkan layer to display information about the current window" + install -d "$subpkgdir"/usr/lib + install -d "$subpkgdir"/usr/share/vulkan/explicit_layer.d + mv "$pkgdir"/usr/lib/libVkLayer_MESA_overlay.so \ + "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json \ + "$subpkgdir"/usr/share/vulkan/explicit_layer.d/ } -_dri() { - local n="${subpkgname##*-dri-}" - pkgdesc="Mesa DRI driver for $n" - case $n in - ati) - _mv_dri radeon_dri r200_dri r300_dri r600_dri radeonsi_dri \ - && _mv_vdpau r300 r600 radeonsi \ - && _mv_gpipe r300 r600 - ;; - intel) - _mv_dri i915_dri i965_dri - ;; - nouveau) - _mv_dri nouveau_dri nouveau_vieux_dri \ - && _mv_vdpau nouveau \ - && _mv_gpipe nouveau - ;; - freedreno) - _mv_dri msm_dri kgsl_dri - ;; - swrast) - _mv_dri swrast_dri kms_swrast_dri && _mv_gpipe swrast - ;; - vc4) - _mv_dri vc4_dri - ;; - vmwgfx) - _mv_dri vmwgfx_dri && _mv_gpipe vmwgfx - ;; - virtio) - _mv_dri virtio_gpu_dri - ;; - esac +dri() { + pkgdesc="Mesa DRI drivers" + replaces="mesa-dri-ati mesa-dri-freedreno mesa-dri-intel + mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4 + mesa-dri-virtio mesa-dri-vmwgfx" + provides="$replaces" + install -d "$subpkgdir"/usr/lib/xorg/modules + install -d "$subpkgdir"/usr/share/vulkan + mv "$pkgdir"/usr/lib/dri "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/xorg/modules/dri "$subpkgdir"/usr/lib/xorg/modules/ + mv "$pkgdir"/usr/share/drirc.d "$subpkgdir"/usr/share/ + # XvMC drivers + mv "$pkgdir"/usr/lib/libXvMC*.so* "$subpkgdir"/usr/lib/ + # support non-Vulkan arches + mv "$pkgdir"/usr/lib/libvulkan*.so* "$subpkgdir"/usr/lib/ || true + mv "$pkgdir"/usr/lib/vdpau "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487 mesa-18.3.6.tar.xz +sha512sums="2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz +245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch +3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f big-endian-flipping.patch +ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70 intel-vulkan.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch -245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch -f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch -6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch -71a397cf9937e623d21abacb2726602f1b5165b18543e11fdfdaac748c221aeafbbda790492a2180b590dace9a17c931c1eac199de32e90c3fa3305706a4011f fix-non-altivec-ppc32.patch" +56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch +0aad2fdc56ea8825533746ee4c2c803734f871e04da13ddd461b2de36716ba52e345e745a6861ffae62efacf6b64f629187ddda3c01e3d880ce20c0ac551dccb time64.patch" diff --git a/user/mesa/big-endian-flipping.patch b/user/mesa/big-endian-flipping.patch new file mode 100644 index 000000000..154a83108 --- /dev/null +++ b/user/mesa/big-endian-flipping.patch @@ -0,0 +1,37 @@ +From f1e0d76264491a8d8f99a0041b1a36cf9752fd28 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 27 Feb 2020 04:24:52 -0600 +Subject: [PATCH] mesa: Support flipping three-channel formats + +Test system: POWER9 ppc64 (BE) system with a Radeon R5 230. + +Before this commit, starting Xorg caused this message: +Assertion failed: !"Invalid array format" (../src/mesa/main/formats.c: _mesa_array_format_flip_channels: 421) + +After this commit, Xorg starts successfully. +--- + src/mesa/main/formats.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c +index 370859d37ca..2e7d5d7f05e 100644 +--- a/src/mesa/main/formats.c ++++ b/src/mesa/main/formats.c +@@ -419,6 +419,14 @@ _mesa_array_format_flip_channels(mesa_array_format format) + return format; + } + ++ if (num_channels == 3) { ++ static const uint8_t flip[6] = { 2, 1, 0, 3, 4, 5 }; ++ _mesa_array_format_set_swizzle(&format, ++ flip[swizzle[0]], flip[swizzle[1]], ++ flip[swizzle[2]], flip[swizzle[3]]); ++ return format; ++ } ++ + if (num_channels == 4) { + static const uint8_t flip[6] = { 3, 2, 1, 0, 4, 5 }; + _mesa_array_format_set_swizzle(&format, +-- +2.25.1 + diff --git a/user/mesa/disk_cache-stack-overflow.patch b/user/mesa/disk_cache-stack-overflow.patch deleted file mode 100644 index 3fad95259..000000000 --- a/user/mesa/disk_cache-stack-overflow.patch +++ /dev/null @@ -1,42 +0,0 @@ -The disk cache code tries to allocate a 256 Kbyte buffer on the stack. -Since musl only gives 80 Kbyte of stack space per thread, this causes a trap. - ---- mesa-17.3.1/src/util/disk_cache.c.old 2017-12-21 11:31:22.000000000 -0600 -+++ mesa-17.3.1/src/util/disk_cache.c 2017-12-29 01:17:15.625633901 -0600 -@@ -716,7 +716,7 @@ - deflate_and_write_to_disk(const void *in_data, size_t in_data_size, int dest, - const char *filename) - { -- unsigned char out[BUFSIZE]; -+ unsigned char *out; - - /* allocate deflate state */ - z_stream strm; -@@ -733,6 +733,11 @@ - /* compress until end of in_data */ - size_t compressed_size = 0; - int flush; -+ -+ out = calloc(1, BUFSIZE); -+ if (out == NULL) -+ return 0; -+ - do { - int remaining = in_data_size - BUFSIZE; - flush = remaining > 0 ? Z_NO_FLUSH : Z_FINISH; -@@ -754,6 +759,7 @@ - ssize_t written = write_all(dest, out, have); - if (written == -1) { - (void)deflateEnd(&strm); -+ free(out); - return 0; - } - } while (strm.avail_out == 0); -@@ -768,6 +774,7 @@ - - /* clean up and return */ - (void)deflateEnd(&strm); -+ free(out); - return compressed_size; - } - diff --git a/user/mesa/drmdeps.patch b/user/mesa/drmdeps.patch deleted file mode 100644 index edcb80643..000000000 --- a/user/mesa/drmdeps.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/src/gallium/winsys/radeon/drm/Makefile.am 2017-08-10 11:45:20.737377457 -0400 -+++ b/src/gallium/winsys/radeon/drm/Makefile.am 2017-08-10 11:50:23.414534307 -0400 -@@ -7,4 +7,6 @@ - - noinst_LTLIBRARIES = libradeonwinsys.la - -+libradeonwinsys_la_LIBADD = -ldrm_radeon -+ - libradeonwinsys_la_SOURCES = $(C_SOURCES) ---- a/src/gallium/winsys/radeon/drm/Makefile.in 2017-08-10 11:45:25.577298181 -0400 -+++ b/src/gallium/winsys/radeon/drm/Makefile.in 2017-08-10 11:57:11.151189074 -0400 -@@ -119,7 +119,7 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) --libradeonwinsys_la_LIBADD = -+libradeonwinsys_la_LIBADD = -ldrm_radeon - am__objects_1 = radeon_drm_bo.lo radeon_drm_cs.lo \ - radeon_drm_surface.lo radeon_drm_winsys.lo - am_libradeonwinsys_la_OBJECTS = $(am__objects_1) ---- a/src/gallium/winsys/amdgpu/drm/Makefile.am 2017-12-21 11:31:21.000000000 -0600 -+++ b/src/gallium/winsys/amdgpu/drm/Makefile.am 2017-12-28 19:24:48.613693400 -0600 -@@ -11,6 +11,6 @@ - noinst_LTLIBRARIES = libamdgpuwinsys.la - - libamdgpuwinsys_la_LIBADD = \ -- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -+ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu - - libamdgpuwinsys_la_SOURCES = $(C_SOURCES) ---- a/src/gallium/winsys/amdgpu/drm/Makefile.in 2017-12-21 11:31:30.000000000 -0600 -+++ b/src/gallium/winsys/amdgpu/drm/Makefile.in 2017-12-28 19:25:22.553597353 -0600 -@@ -572,7 +572,7 @@ - AM_CXXFLAGS = $(AM_CFLAGS) - noinst_LTLIBRARIES = libamdgpuwinsys.la - libamdgpuwinsys_la_LIBADD = \ -- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -+ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu - - libamdgpuwinsys_la_SOURCES = $(C_SOURCES) - all: all-am diff --git a/user/mesa/fix-non-altivec-ppc32.patch b/user/mesa/fix-non-altivec-ppc32.patch deleted file mode 100644 index 846cf5031..000000000 --- a/user/mesa/fix-non-altivec-ppc32.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- mesa-18.3.2/src/util/u_cpu_detect.c.old 2019-01-17 11:26:23.000000000 +0000 -+++ mesa-18.3.2/src/util/u_cpu_detect.c 2019-02-22 19:23:26.620000000 +0000 -@@ -41,6 +41,9 @@ - #if defined(PIPE_ARCH_PPC) - #if defined(PIPE_OS_APPLE) - #include <sys/sysctl.h> -+#elif defined(PIPE_OS_LINUX) -+#include <asm/cputable.h> -+#include <linux/auxvec.h> - #else - #include <signal.h> - #include <setjmp.h> -@@ -92,7 +95,7 @@ - #endif - - --#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) -+#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) && !defined(PIPE_OS_LINUX) - static jmp_buf __lv_powerpc_jmpbuf; - static volatile sig_atomic_t __lv_powerpc_canjump = 0; - -@@ -126,7 +129,43 @@ - util_cpu_caps.has_altivec = 1; - } - } --#else /* !PIPE_OS_APPLE */ -+#elif defined(PIPE_OS_LINUX) -+ /* Taken from FFmpeg 4.1.1 (LGPL-2.1+) */ -+ // The linux kernel could have the altivec support disabled -+ // even if the cpu has it. -+ int i, ret = 0; -+ int fd = open("/proc/self/auxv", O_RDONLY); -+ unsigned long buf[64] = { 0 }; -+ ssize_t count; -+ boolean enable_vsx = TRUE; -+ /* VSX instructions can be explicitly enabled/disabled via GALLIVM_VSX=1 or 0 */ -+ char *env_vsx = getenv("GALLIVM_VSX"); -+ if (env_vsx && env_vsx[0] == '0') { -+ enable_vsx = FALSE; -+ } -+ -+ if (fd < 0) -+ return 0; -+ -+ while ((count = read(fd, buf, sizeof(buf))) > 0) { -+ for (i = 0; i < count / sizeof(*buf); i += 2) { -+ if (buf[i] == AT_NULL) -+ goto out; -+ if (buf[i] == AT_HWCAP) { -+ if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC) -+ util_cpu_caps.has_altivec = 1; -+#ifdef PPC_FEATURE_HAS_VSX -+ if (enable_vsx && buf[i + 1] & PPC_FEATURE_HAS_VSX) -+ util_cpu_caps.has_vsx = 1; -+#endif -+ goto out; -+ } -+ } -+ } -+ -+out: -+ close(fd); -+#else /* !PIPE_OS_APPLE, !PIPE_OS_LINUX */ - /* not on Apple/Darwin, do it the brute-force way */ - /* this is borrowed from the libmpeg2 library */ - signal(SIGILL, sigill_handler); diff --git a/user/mesa/intel-vulkan.patch b/user/mesa/intel-vulkan.patch new file mode 100644 index 000000000..6ba03d6d1 --- /dev/null +++ b/user/mesa/intel-vulkan.patch @@ -0,0 +1,26 @@ +From 791ece114e2e27fa4ede1a998650964bd37d867b Mon Sep 17 00:00:00 2001 +From: Eric Engestrom <eric.engestrom@intel.com> +Date: Sun, 27 Oct 2019 00:04:33 +0100 +Subject: [PATCH] anv: add missing xmlconfig headers dependency + +Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> +Acked-by: Dylan Baker <dylan@pnwbakers.com> +--- + src/intel/vulkan/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build +index 69e472f719b..10fc4c4e611 100644 +--- a/src/intel/vulkan/meson.build ++++ b/src/intel/vulkan/meson.build +@@ -133,6 +133,7 @@ anv_deps = [ + dep_valgrind, + idep_nir_headers, + idep_vulkan_util_headers, ++ idep_xmlconfig_headers, + ] + anv_flags = [ + c_vis_args, +-- +2.24.1 + diff --git a/user/mesa/no-tls.patch b/user/mesa/no-tls.patch new file mode 100644 index 000000000..b5e0b3adb --- /dev/null +++ b/user/mesa/no-tls.patch @@ -0,0 +1,14 @@ +--- mesa-19.3.1/meson.build.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/meson.build 2020-01-26 05:11:44.774286868 +0000 +@@ -386,11 +386,6 @@ + endif + endif + +-# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. +-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) +- pre_args += '-DUSE_ELF_TLS' +-endif +- + if with_glx != 'disabled' + if not (with_platform_x11 and with_any_opengl) + error('Cannot build GLX support without X11 platform support and at least one OpenGL API') diff --git a/user/mesa/time64.patch b/user/mesa/time64.patch new file mode 100644 index 000000000..7e7894a9d --- /dev/null +++ b/user/mesa/time64.patch @@ -0,0 +1,34 @@ +--- mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c 2020-01-20 19:26:36.470000000 +0000 +@@ -107,8 +107,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + +--- mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c 2020-01-20 19:28:02.600000000 +0000 +@@ -23,6 +23,7 @@ + + #include <errno.h> + #include <err.h> ++#include <inttypes.h> + #include <sys/mman.h> + #include <fcntl.h> + #include <xf86drm.h> +@@ -80,8 +81,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 487888387..d975e1460 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.51.2 +pkgver=0.52.1 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="5d6bc5c59c026b67d065b28a5ce8c7901ffb9663d3cb1609ef1714ace50e3b1e0fc116466a34ba5ae8dbfb2337b7848008f3d865832ea537422221f1a6793ddd meson-0.51.2.tar.gz" +sha512sums="81e8c5897ba5311ccffc401fd514bd9a67d16caaea1f28a5c5432605766341ecd82b70c05661fbbe0c9a6006ff5ea892950bbaa548e70c3f87350438775ea6fd meson-0.52.1.tar.gz" diff --git a/user/metalog/APKBUILD b/user/metalog/APKBUILD new file mode 100644 index 000000000..3998a3a2d --- /dev/null +++ b/user/metalog/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: +# Maintainer: +pkgname=metalog +pkgver=20200113 +pkgrel=0 +pkgdesc="A highly configurable replacement for syslogd/klogd" +url="https://github.com/hvisage/metalog" +arch="all" +license="GPL-2.0-only" +depends="pcre" +makedepends="autoconf autoconf-archive-dev automake pcre-dev" +subpackages="$pkgname-doc $pkgname-openrc" +source="https://github.com/hvisage/$pkgname/archive/$pkgname-$pkgver.tar.gz + metalog-0.9-metalog-conf.patch + + metalog.confd + metalog.initd-r1 + " +builddir="$srcdir/$pkgname-$pkgname-$pkgver/" + +build() { + autoreconf -fi + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/metalog.initd-r1 \ + "$pkgdir"/etc/init.d/metalog + install -D -m644 "$srcdir"/metalog.confd \ + "$pkgdir"/etc/conf.d/metalog +} + +sha512sums="d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93 metalog-20200113.tar.gz +0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df metalog-0.9-metalog-conf.patch +4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e metalog.confd +09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344 metalog.initd-r1" diff --git a/user/metalog/metalog-0.9-metalog-conf.patch b/user/metalog/metalog-0.9-metalog-conf.patch new file mode 100644 index 000000000..efb794de5 --- /dev/null +++ b/user/metalog/metalog-0.9-metalog-conf.patch @@ -0,0 +1,11 @@ +--- a/metalog.conf ++++ b/metalog.conf +@@ -21,6 +21,8 @@ + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging : + # + # facility = "*" diff --git a/user/metalog/metalog.confd b/user/metalog/metalog.confd new file mode 100644 index 000000000..ec7e64eda --- /dev/null +++ b/user/metalog/metalog.confd @@ -0,0 +1,18 @@ +# /etc/conf.d/metalog + +# Some useful options: +# -a Log with buffering +# -s Log without buffering +# See `metalog --help` for more + +METALOG_OPTS="" + + +# Options used by /usr/sbin/consolelog.sh + +# Space delimited list of devices to write "console" messages to +#CONSOLE="/dev/console /dev/tty10" +CONSOLE="/dev/tty10" + +# Format of logging (make sure you use single quotes) +FORMAT='$1 [$2] $3' diff --git a/user/metalog/metalog.initd-r1 b/user/metalog/metalog.initd-r1 new file mode 100644 index 000000000..bb947bdad --- /dev/null +++ b/user/metalog/metalog.initd-r1 @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="${PIDFILE:-/run/metalog.pid}" +command="/usr/sbin/metalog" +command_args="--pidfile=${pidfile} --daemonize ${METALOG_OPTS}" + +extra_started_commands="buffer unbuffer" + +depend() { + need localmount + use clock hostname + after bootmisc + provide logger +} + +buffer() { + ebegin "Enabling log buffering" + start-stop-daemon --exec "${command}" --signal USR2 --pidfile "${pidfile}" + eend ${?} +} + +unbuffer() { + ebegin "Disabling log buffering" + start-stop-daemon --exec "${command}" --signal USR1 --pidfile "${pidfile}" + eend ${?} +} diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index 787a48375..bd0282fa6 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=milou -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="" makedepends="cmake extra-cmake-modules python3 kcoreaddons-dev kdeclarative-dev - ki18n-dev krunner-dev kservice-dev plasma-framework-dev" + ki18n-dev kitemmodels-dev krunner-dev kservice-dev plasma-framework-dev" subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz" @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="87b34643c32e9c57cc3aa8b12b536d2cb1bf38fb8f4c4ea7df7b6022c498d3f3d796cb825b14d9fa7b636c30bfb2d136d4771b68e9951d4e5e9fc98bd4a53a28 milou-5.12.8.tar.xz" +sha512sums="db82ef379714d7e678dea901a77dcfba986d2b27e0168ecdc44875c612eff6cebd63521916a0a4c23daf855c5bee5c75e96a8700d28b7ae87940aacc28f2d913 milou-5.18.3.tar.xz" diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index c69f27270..8913eecd8 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mimetic pkgver=0.9.8 pkgrel=0 @@ -16,13 +16,11 @@ source="http://www.codesink.org/download/mimetic-$pkgver.tar.gz " prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/minicom/APKBUILD b/user/minicom/APKBUILD index d597290e8..7ff093995 100644 --- a/user/minicom/APKBUILD +++ b/user/minicom/APKBUILD @@ -3,7 +3,7 @@ pkgname=minicom pkgver=2.7.1 pkgrel=0 -pkgdesc="menu driven communications program for terminals" +pkgdesc="Menu-driven communications program for terminals" url="https://fossies.org/linux/minicom/" arch="all" license="GPL-2.0+" @@ -11,10 +11,10 @@ depends="" makedepends="ncurses-dev gettext-tiny-dev linux-headers" subpackages="$pkgname-doc $pkgname-lang" source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz - fix-includes.patch" + fix-includes.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/minivmac/APKBUILD b/user/minivmac/APKBUILD index 71a16a1b2..08a38f1fb 100644 --- a/user/minivmac/APKBUILD +++ b/user/minivmac/APKBUILD @@ -10,15 +10,12 @@ options="!check" # minivmac does not ship a test suite license="GPL-2.0-only" depends="" makedepends="libx11-dev libxcb-dev libxau-dev libbsd-dev libxdmcp-dev" -source="http://oddball.tech/code/emu_pkg/$pkgname-$pkgver.tar.xz" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" CARCH=$CARCH ./configure - cd "$builddir"/mnvmplus - make -j1 - cd "$builddir"/mnvmII - make -j1 + make -C mnvmplus -j1 + make -C mnvmII -j1 } package() { @@ -26,4 +23,4 @@ package() { install -m755 "$builddir"/mnvmII/minivmac "$pkgdir"/usr/bin/minivmacII } -sha512sums="ff28266641dd37df74c84c16c8bf32282729d55ae6512d4a98abf92ba40692f9fc107b501f072755ba0f8a0322d4f755915d9be74a407ce89af94bfd24d11043 minivmac-3.5.8.tar.xz" +sha512sums="ff28266641dd37df74c84c16c8bf32282729d55ae6512d4a98abf92ba40692f9fc107b501f072755ba0f8a0322d4f755915d9be74a407ce89af94bfd24d11043 minivmac-3.5.8.tar.xz" diff --git a/user/minizip/APKBUILD b/user/minizip/APKBUILD new file mode 100644 index 000000000..df93d126f --- /dev/null +++ b/user/minizip/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=minizip +pkgver=1.2.11 +pkgrel=0 +pkgdesc="Miniature ZIP archive manipulation library" +url="https://zlib.net" +arch="all" +license="zlib" +depends="" +makedepends="autoconf automake libtool zlib-dev" +subpackages="$pkgname-dev" +source="https://zlib.net/zlib-$pkgver.tar.gz" +builddir="$srcdir"/zlib-$pkgver/contrib/minizip + +prepare() { + default_prepare + autoreconf -vif +} + +build() { + ./configure \ + --prefix=/usr \ + --enable-shared + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae zlib-1.2.11.tar.gz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index fba6ff5c7..2cc6eb4d7 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev kcrash-dev kdoctools-dev fluidsynth-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/minuet-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="38b937e85c60adf5241ed16402563b386a8ebee4ae9eddef4ffd1b27f8ab9535c6507f1889c0a9fcf1ac0e6ff20bd100a17a30424b3521a91bccc2fbfacf751f minuet-19.08.2.tar.xz" +sha512sums="545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0 minuet-19.12.3.tar.xz" diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index cfda36c89..71f215ecd 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -6,12 +6,12 @@ pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev" provides="mkfontdir=$pkgver-r$pkgrel" triggers="$pkgname.trigger=/usr/share/fonts/* $pkgname.trigger=/usr/share/fonts/X11/*" +subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index acbe85329..192101edb 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -8,12 +8,12 @@ url="http://mirbsd.de/mksh" arch="all" license="MirOS OR ISC" depends="" -makedepends="" checkdepends="ed perl" +makedepends="" subpackages="$pkgname-doc" install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall" source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz" -builddir=$srcdir/$pkgname +builddir="$srcdir"/$pkgname build() { # Build the main shell: @@ -27,10 +27,10 @@ build() { } check() { - echo "Running the test suite for mksh:" + msg "Running the test suite for mksh" ./test_mksh.sh - echo "Running the test suite for lksh:" + msg "Running the test suite for lksh:" ./test_lksh.sh } diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index ad94dd2ff..dce0dca9f 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.16.0 +pkgver=6.20.0 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" arch="all" options="!check" # No test suite. license="LGPL-2.1+ AND GPL-3.0+" +depends="" makedepends="bsd-compat-headers ffmpeg-dev fftw-dev frei0r-plugins-dev gtk+2.0-dev libexif-dev libsamplerate-dev libxml2-dev sdl-dev sdl2-dev qt5-qtbase-dev qt5-qtsvg-dev sdl_image-dev sox-dev" @@ -17,10 +18,11 @@ source="https://github.com/mltframework/mlt/releases/download/v$pkgver/mlt-$pkgv " build() { - local _maybe_asm="" + _maybe_asm="" case $CTARGET_ARCH in pmmx) _maybe_asm="--disable-sse --target-arch=i586" ;; + ppc) export LDFLAGS="$LDFLAGS -latomic" ;; esac ./configure \ @@ -43,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 mlt-6.16.0.tar.gz +sha512sums="939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 mlt-6.20.0.tar.gz d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD new file mode 100644 index 000000000..0b84de2ea --- /dev/null +++ b/user/modemmanager-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=modemmanager-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt framework for ModemManager" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires MM running. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +depends_dev="modemmanager-dev" +makedepends="$depends_dev cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/modemmanager-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" \ + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="6314130e61e11d2a916e55630df4173ecf60a2c58bbca9b05b865505b916f783deec32fd3cd310bfe6a1171c9723ce84d4428f94c29aaa0aa033901909a4e19b modemmanager-qt-5.68.0.tar.xz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index 5a5804d96..62cf584ce 100644 --- a/user/modemmanager/APKBUILD +++ b/user/modemmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager -pkgver=1.10.6 +pkgver=1.12.6 pkgrel=0 pkgdesc="Software to control mobile broadband modems" url="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -43,6 +43,6 @@ package() { "$srcdir"/01-org.freedesktop.ModemManager.rules } -sha512sums="9d0cdca7413c1ad7e44a0c65d620e3c36204919b896290878180c73d7843d217f7c759bcba1007cbed2ec75f615b7ab196989e90afddbcbbf38a1b4cd04a8e3a ModemManager-1.10.6.tar.xz +sha512sums="63c2f874c8ac62ddddf02735cc3dc0dec0c3ea62be39eb7f69cfb899ae04f6d14cfe59d63cd2fa4a5150afa15560d4a6db7a3fdb7c4467f228cd1b4b30fbd1ec ModemManager-1.12.6.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/monoid/APKBUILD b/user/monoid/APKBUILD index 449d177e1..da210f0f7 100644 --- a/user/monoid/APKBUILD +++ b/user/monoid/APKBUILD @@ -15,8 +15,7 @@ source="https://raw.githubusercontent.com/larsenwork/monoid/2db2d289f4e61010dd3f builddir="$srcdir/" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="2776bbc7febf17c10f87bbdd3e6e4fd7c24b93286009d1dcb0ca8058e1e1437c3179068ab608c3f69ae07c08950ececb4d0ad88e82ccba4a6bd2d8b63f71a9c8 Monoid-Small.zip" diff --git a/user/montecarlo/APKBUILD b/user/montecarlo/APKBUILD index f3c794409..c49434e64 100644 --- a/user/montecarlo/APKBUILD +++ b/user/montecarlo/APKBUILD @@ -15,8 +15,6 @@ source="http://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz" builddir="$srcdir/MonteCarlo-PCF" package() { - cd "$builddir" - local _font for _font in *.pcf; do gzip -9 $_font install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz diff --git a/user/mosh/APKBUILD b/user/mosh/APKBUILD index 7ec12f783..d138bd4f3 100644 --- a/user/mosh/APKBUILD +++ b/user/mosh/APKBUILD @@ -20,12 +20,10 @@ prepare() { default_prepare # Test unicode-later-combining is failing. Ideally we want to fix it. sed -i '/unicode-later-combining.test/d' "$builddir"/src/tests/Makefile.am - cd "$builddir" ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,12 +36,10 @@ build() { } check() { - cd "$builddir" make check VERBOSE=1 V=1 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mosquitto/APKBUILD b/user/mosquitto/APKBUILD index e7cd25057..67ec942a1 100644 --- a/user/mosquitto/APKBUILD +++ b/user/mosquitto/APKBUILD @@ -2,15 +2,16 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mosquitto -pkgver=1.6.6 +pkgver=1.6.9 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="" -makedepends="c-ares-dev openssl-dev util-linux-dev" checkdepends="python3" +makedepends="c-ares-dev openssl-dev util-linux-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc $pkgname-clients" install="$pkgname.pre-install" @@ -18,7 +19,7 @@ source="http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz mosquitto.initd disable-flaky-test.patch openrc-conf.patch - python3.patch" + " # secfixes: # 1.6.6-r0: @@ -73,8 +74,7 @@ clients() { mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/ } -sha512sums="ea6ba7b57773c8f4a59e708ae305a0e38ca85df94854410b29cccddbe10bbb91c2ea5e827fefb3f57cb4fce188ab9c3021804f1ae398b7fd5e9e965354b68bc1 mosquitto-1.6.6.tar.gz +sha512sums="f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7 mosquitto-1.6.9.tar.gz 681fddc737b3ef3e6c052f0c854a730df290352640a18a63e23ef83d14c425558aff87805d1eb95e44de101b5df48872173af9f5414464ffa8cf727ea2c0491e mosquitto.initd 3886171e36f759a717aa6626d5b8dbd392963c737d5de28b4d52b81359008927b99ff7a0ca82f56a0e5deaed4585571759ba9216336a664fd346845837c2bc18 disable-flaky-test.patch -b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch -078197e6c3e59b664f5fdd1e4a4f669c9a76ab84fe4a5d8602ac80406b85c4e1cce29d9372e76d995155b74abb438d0dc0cdcdb98251fb904122073c4088d76a python3.patch" +b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch" diff --git a/user/mosquitto/python3.patch b/user/mosquitto/python3.patch deleted file mode 100644 index f348cbc3e..000000000 --- a/user/mosquitto/python3.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- mosquitto-1.6.4/test/broker/09-extended-auth-change-username.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-change-username.py 2019-08-27 22:20:08.560518752 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Check whether an extended auth plugin can change the username of a client. - ---- mosquitto-1.6.4/test/broker/09-extended-auth-multistep-reauth.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-multistep-reauth.py 2019-08-27 22:22:11.530519618 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from mosq_test_helper import * - ---- mosquitto-1.6.4/test/broker/09-extended-auth-multistep.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-multistep.py 2019-08-27 22:20:37.030518952 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from mosq_test_helper import * - ---- mosquitto-1.6.4/test/broker/09-extended-auth-single.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-single.py 2019-08-27 22:21:42.250519412 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Multi tests for extended auth with a single step. - # * Error in plugin ---- mosquitto-1.6.4/test/broker/09-extended-auth-single2.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-single2.py 2019-08-27 22:21:02.220519130 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Multi tests for extended auth with a single step - multiple plugins at once. - # * Error in plugin ---- mosquitto-1.6.4/test/broker/09-extended-auth-unsupported.py.old 2019-08-01 19:50:01.000000000 +0000 -+++ mosquitto-1.6.4/test/broker/09-extended-auth-unsupported.py 2019-08-27 22:21:20.360519257 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Test whether an unsupported extended auth is rejected. - diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index be5799335..f7e87a35d 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mousepad pkgver=0.4.2 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview-3.0-dev intltool xfconf-dev" subpackages="$pkgname-lang" diff --git a/user/mozjs/APKBUILD b/user/mozjs/APKBUILD index 78d4ea352..86c7c5c0c 100644 --- a/user/mozjs/APKBUILD +++ b/user/mozjs/APKBUILD @@ -42,7 +42,6 @@ unpack() { } prepare() { - cd "$builddir" default_prepare cd "$builddir"/js/src export PATH="$srcdir/python/bin:$PATH" diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD index 2c7c919c4..717eff0f5 100644 --- a/user/mozo/APKBUILD +++ b/user/mozo/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mozo -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Menu editor for the MATE desktop environment" url="https://mate-desktop.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mozo-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71 mozo-1.22.2.tar.xz" +sha512sums="e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193 mozo-1.24.0.tar.xz" diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD index e21981859..7c75ee723 100644 --- a/user/mpg123/APKBUILD +++ b/user/mpg123/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mpg123 -pkgver=1.25.12 +pkgver=1.25.13 pkgrel=0 pkgdesc="Real time MPEG Audio player for Layers 1, 2 and 3" url="https://www.mpg123.org/" arch="all" options="libtool textrels" license="LGPL-2.1-only" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="alsa-lib-dev libtool linux-headers pulseaudio-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.mpg123.org/download/$pkgname-$pkgver.tar.bz2" build() { @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff mpg123-1.25.12.tar.bz2" +sha512sums="2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39 mpg123-1.25.13.tar.bz2" diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 576de2514..8f703f637 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mplayer pkgver=1.4 pkgrel=1 diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index 9c12a7aa6..6f5c53558 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -1,13 +1,14 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mpv -pkgver=0.29.1 -pkgrel=2 +pkgver=0.32.0 +pkgrel=0 pkgdesc="An improved fork of mplayer" url="https://mpv.io" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="LGPL-2.1+ AND GPL-2.0+ AND ISC AND BSD-2-Clause AND MIT AND BSD-3-Clause" +depends="" makedepends="python3 zlib-dev libarchive-dev py3-docutils uchardet-dev ncurses-dev @@ -32,10 +33,8 @@ build() { --disable-javascript \ --disable-wayland \ --disable-gl-wayland \ - --enable-dvdread \ --enable-dvdnav \ - --enable-cdda \ - --enable-tv + --enable-cdda python3 ./waf build } @@ -43,4 +42,4 @@ package() { python3 ./waf install --destdir="$pkgdir" } -sha512sums="ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 mpv-0.29.1.tar.gz" +sha512sums="f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6 mpv-0.32.0.tar.gz" diff --git a/user/mtdev/APKBUILD b/user/mtdev/APKBUILD index 81300c4e2..18a1826f0 100644 --- a/user/mtdev/APKBUILD +++ b/user/mtdev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mtdev -pkgver=1.1.5 -pkgrel=3 +pkgver=1.1.6 +pkgrel=0 pkgdesc="Multitouch Protocol Translation Library" url="http://bitmath.org/code/mtdev/" arch="all" @@ -11,16 +11,16 @@ depends="" depends_dev="linux-headers" makedepends="$depends_dev" subpackages="$pkgname-dev" -source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz" +source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz + printf-format.patch + " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +45,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="f59f8cda9b81e17253ff2da93a14b6f8e48361aff890dd5d1bb89ca385d713c212f961ed34fc5b866affd83013530a036736faca071ec9a424091979a12c9208 mtdev-1.1.5.tar.gz" +sha512sums="e643264baa880abfc31b53f8e8ed54fe1adea4bc110fab57d36be16caba84f970c09fc864244c64b0a76e85f5f021fd086c12f96badbd886da6ccf254ab678e9 mtdev-1.1.6.tar.gz +5a429ab3f7773e86eafb5beaff466ca6e209a131bfc1fd633e3ba4bfdf92caadf5037a3e84efb512bdc12891b2cc44ebb61b826daf3e66a7735004cc1dcd2713 printf-format.patch" diff --git a/user/mtdev/printf-format.patch b/user/mtdev/printf-format.patch new file mode 100644 index 000000000..46d187f64 --- /dev/null +++ b/user/mtdev/printf-format.patch @@ -0,0 +1,19 @@ +--- mtdev-1.1.6/test/mtdev-test.c.old 2020-01-26 14:00:32.000000000 +0000 ++++ mtdev-1.1.6/test/mtdev-test.c 2020-01-30 02:17:49.009346559 +0000 +@@ -31,6 +31,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <stdint.h> ++#include <inttypes.h> + + #ifndef input_event_sec + #define input_event_sec time.tv_sec +@@ -56,7 +57,7 @@ + mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; + if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) + slot = ev->value; +- fprintf(stderr, "%012llx %02d %01d %04x %d\n", ++ fprintf(stderr, "%012"PRIx64" %02d %01d %04x %d\n", + evtime, slot, ev->type, ev->code, ev->value); + } + diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD index b2483b326..59fc8a203 100644 --- a/user/mtr/APKBUILD +++ b/user/mtr/APKBUILD @@ -41,15 +41,13 @@ build() { } package() { - cd "$builddir"/curses - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C curses install } gtk() { pkgdesc="Graphical traceroute tool" depends="" - cd "$builddir"/gtk - make DESTDIR="$subpkgdir" install + make DESTDIR="$subpkgdir" -C "$builddir"/gtk install install -D -m 644 "$srcdir"/mtr-gtk.desktop \ "$subpkgdir"/usr/share/applications/mtr-gtk.desktop install -D -m 644 "$builddir"/img/mtr_icon.xpm \ diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index f088af0fa..7f3dd35c1 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=muparser pkgver=2.2.6.1 pkgrel=0 diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD index 47ca39a43..c0eb566a7 100644 --- a/user/musl-obstack/APKBUILD +++ b/user/musl-obstack/APKBUILD @@ -8,7 +8,7 @@ url=" " arch="all" license="GPL-2.0+" depends="" -makedepends="" +makedepends="autoconf automake libtool" subpackages="$pkgname-dev" source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz" diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index dcc71891e..09b0f49d3 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,13 +3,14 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.12.2 +pkgver=1.13.4 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" url="http://www.mutt.org" # No HTTPS arch="all" options="suid !check" # No test suite. license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND Public-Domain" +depends="" makedepends="cyrus-sasl-dev gdbm-dev gettext-tiny gpgme-dev libidn-dev ncurses-dev openssl-dev perl" subpackages="$pkgname-doc $pkgname-lang" @@ -56,4 +57,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd mutt-1.12.2.tar.gz" +sha512sums="59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3 mutt-1.13.4.tar.gz" diff --git a/user/mythes/APKBUILD b/user/mythes/APKBUILD index 6346e7cb9..5f171b76a 100644 --- a/user/mythes/APKBUILD +++ b/user/mythes/APKBUILD @@ -8,13 +8,13 @@ url="http://hunspell.github.io/" arch="all" options="!check" # No test suite. license="Custom" -subpackages="$pkgname-dev" +depends="" depends_dev="perl hunspell-dev" makedepends="$depends_dev" -source="http://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +30,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 02a0d0fdc..9ff07764a 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.5 +pkgver=4.8 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" arch="all" license="GPL-3.0+" +depends="" makedepends="file-dev ncurses-dev" subpackages="$pkgname-doc $pkgname-lang" -replaces="nano-syntax" # ??? why was this ever split source="https://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -Dm644 doc/sample.nanorc \ "$pkgdir"/etc/nanorc @@ -44,4 +40,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="1caee1f559cb11efa7535f4682e7ff6e22802d01ca21733a67031e4ba7c5d3ca13c60f22f71460bb99eadd8d001aeb3783a5e34d1433583e8822fc13d063e4d9 nano-4.5.tar.xz" +sha512sums="9799d93f322ac12d95784b6ecc7f7f9037f0a395be0cafe238b9e0ae2d8d93181a8a114a11ccccb20bcf07375ddaf842f49f7d23372f0d330ce67a66d0318ae8 nano-4.8.tar.xz" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 81aa6a996..4e73db97e 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -6,12 +6,13 @@ pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" arch="all" license="BSD-2-Clause" +depends="" checkdepends="perl" +makedepends="" subpackages="$pkgname-doc" source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" export CFLAGS= export CXXFLAGS= ./configure \ @@ -22,12 +23,10 @@ build () { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ncftp/APKBUILD b/user/ncftp/APKBUILD index 1a9b5fce4..dd1a31d21 100644 --- a/user/ncftp/APKBUILD +++ b/user/ncftp/APKBUILD @@ -8,13 +8,12 @@ url="http://www.ncftp.com/" arch="all" options="!check" # No test suite. license="ClArtistic" +depends="" makedepends="ncurses-dev" -source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz" subpackages="$pkgname-doc $pkgname-bookmarks" +source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz" -build () { - cd "$builddir" - +build() { LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,22 +21,18 @@ build () { --sysconfdir=/etc \ --mandir=/usr/share/man - cd "$builddir"/libncftp - make shared - cd "$builddir" + make -C libncftp shared make } package() { - cd "$builddir"/libncftp - make PREFIX="${pkgdir}"/usr soinstall - cd "$builddir" + make PREFIX="${pkgdir}"/usr -C libncftp soinstall make DESTDIR="$pkgdir" install install -D doc/LICENSE.txt \ "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE } -bookmarks () { +bookmarks() { mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/ncftpbookmarks \ "$subpkgdir"/usr/bin/ diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD index 0a34a72fe..1e283dd2a 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -1,16 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ncompress -pkgver=4.2.4.5 +pkgver=4.2.4.6 pkgrel=0 pkgdesc="Fast, simple LZW compressor" url="https://github.com/vapier/ncompress" arch="all" options="!check" # No test suite. license="Public-Domain" +depends="" +makedepends="" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz - fix-9bit-compress.patch" + fix-9bit-compress.patch + " build() { make @@ -21,5 +24,5 @@ package() { install -D -m644 "$builddir"/compress.1 "$pkgdir"/usr/share/man/man1/compress.1 } -sha512sums="487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3 ncompress-4.2.4.5.tar.gz +sha512sums="03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8 ncompress-4.2.4.6.tar.gz b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch" diff --git a/user/neon/APKBUILD b/user/neon/APKBUILD index 8dda94d31..4b0c4349b 100644 --- a/user/neon/APKBUILD +++ b/user/neon/APKBUILD @@ -5,7 +5,7 @@ pkgrel=3 pkgdesc="HTTP and WebDAV client library with a C interface" url=" " arch="all" -license="GPL LGPL" +license="LGPL-2.0+" depends="ca-certificates" depends_dev="expat-dev openssl-dev zlib-dev" makedepends="$depends_dev" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +29,10 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631 neon-0.30.2.tar.gz" diff --git a/user/net-snmp/APKBUILD b/user/net-snmp/APKBUILD index 9f083a732..3fc1bceb4 100644 --- a/user/net-snmp/APKBUILD +++ b/user/net-snmp/APKBUILD @@ -26,18 +26,13 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz " prepare() { - update_config_sub default_prepare - # Allow tmpfs volume size monitoring - # Ref #932 + update_config_sub sed -e 's#"tmpfs",#/* "tmpfs", */#g' -i agent/mibgroup/host/hr_filesys.c } build() { - cd "$builddir" - export lt_cv_sys_max_cmd_len=8192 - LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -64,7 +59,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # remove things we dont want distribute rm "$pkgdir"/usr/lib/libsnmp* \ diff --git a/user/netifrc/APKBUILD b/user/netifrc/APKBUILD index da1ef7d28..6749f98c7 100644 --- a/user/netifrc/APKBUILD +++ b/user/netifrc/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-openrc" source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname PF="$pkgname-$pkgver" } package() { - cd "$builddir" make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname DESTDIR="$pkgdir" install for doc in README CREDITS TODO; do install -m 644 "$builddir"/$doc "$pkgdir"/usr/share/doc/$pkgname/ diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 173f4da66..551895f83 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -7,13 +7,13 @@ pkgdesc="The qmail mail transfer agent (community version)" url="http://www.netqmail.org/" arch="all" license="Public-Domain" -provides=sendmail options="suid !check" # suid programs (qmail-queue); no test suite depends="execline s6 s6-networking" makedepends="utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" -install="$pkgname.post-install $pkgname.pre-deinstall" provider_priority=1 +provides="sendmail" +install="$pkgname.post-install $pkgname.pre-deinstall" source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch 0002-qbiffutmpx-20170820.patch @@ -66,7 +66,6 @@ makeservicedir() } build() { - cd "$builddir" echo "$CC $CFLAGS" > conf-cc echo "$CC $LDFLAGS -s -static" > conf-ld echo "$CC $LDFLAGS" > conf-ldi # because fakeroot doesn't work with static programs @@ -79,7 +78,6 @@ build() { } package() { - cd "$builddir" mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d chown qmaill:qmaill "$pkgdir"/var/log/qmail chmod 2700 "$pkgdir"/var/log/qmail diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index e6f799627..0c9fc7e8b 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=netsurf pkgver=3.9 pkgrel=0 diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD new file mode 100644 index 000000000..22d4d65d0 --- /dev/null +++ b/user/networkmanager-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=networkmanager-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt framework for NetworkManager" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires the system to have NM running. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +depends_dev="networkmanager-dev" +makedepends="$depends_dev cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/networkmanager-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" \ + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="e9b81c9720db55c4d403df06b6d56e7003adb08a437b9869a7e18fd1d3621fd24e73c254f957d41ee428b4449eb5484a06add15486a79bb901c2234d2db36f8f networkmanager-qt-5.68.0.tar.xz" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 6fb844bf9..19ba6c868 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.20.4 +pkgver=1.22.8 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -9,12 +9,12 @@ 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="bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev +makedepends="bash bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-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" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" -source="https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-$pkgver.tar.xz +source="https://download.gnome.org/sources/NetworkManager/${pkgver%.*}/NetworkManager-$pkgver.tar.xz editline.patch errno.patch musl.patch @@ -31,7 +31,7 @@ builddir="$srcdir/NetworkManager-$pkgver" build() { # pppd plugin dir is a huge hack. - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -90,13 +90,13 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb NetworkManager-1.20.4.tar.xz -a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch -0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch -313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch +sha512sums="3533f6d0cfb2723078aece287101feda0d4f65a1f0160ae17dd77142ca5e126a0f27f5904c2e2c4dcdf9433dacc3990e1bf366f14e67b94fa1cd3006dd6b3a4c NetworkManager-1.22.8.tar.xz +ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch +b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch +7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch 5142bf14ac5574a3ae4bc8753055c534702892871ca45a1bc4d48d4d5c07d11bd54e52861458a673c328d129cdd6f1f749a9546eba1c16fea5173f92840506de qsort_r.patch -f149b9bb7b16c6e79685ff6a8c0f6f20a692bb675f66f8dd5dffe2158850b15d7a4591be8e906adec5e16047b681d0501b3228c4af5d218152ec8f82068fd414 random.patch -942986f22b1b522420afb885ca5c1d5dcaae10c193e001cb0604a78125b5efcc7f3e2b318f2b1f44b867369a243f7467bb00948617ac1d44271da7fd6e6b2ce6 tests.patch +d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e42b442cfaa882e9fd2bba7548872586d53d3caca76263e79 random.patch +602859c1c7b63984b3b9d9597772e4bff496b3838eb0131ad1d707ae9226c5bdd703080683e48bc93b9c1a6572505dad0332d63c57e6320e63c011931877233a tests.patch 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 01-org.freedesktop.NetworkManager.rules 26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a 10-openrc-status f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a nm.confd diff --git a/user/networkmanager/editline.patch b/user/networkmanager/editline.patch index e727f374a..7508e9b9a 100644 --- a/user/networkmanager/editline.patch +++ b/user/networkmanager/editline.patch @@ -1,6 +1,6 @@ --- NetworkManager-1.18.1/clients/cli/agent.c.old 2019-04-18 09:19:11.000000000 +0000 +++ NetworkManager-1.18.1/clients/cli/agent.c 2019-05-10 06:15:55.614930112 +0000 -@@ -25,8 +25,7 @@ +@@ -9,8 +9,7 @@ #include <stdio.h> #include <stdlib.h> @@ -12,7 +12,7 @@ #include "utils.h" --- NetworkManager-1.18.1/clients/cli/common.c.old 2019-04-20 19:01:59.000000000 +0000 +++ NetworkManager-1.18.1/clients/cli/common.c 2019-05-10 07:07:34.506620687 +0000 -@@ -26,8 +26,7 @@ +@@ -10,8 +10,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/ioctl.h> @@ -22,7 +22,7 @@ #include "nm-vpn-helpers.h" #include "nm-client-utils.h" -@@ -1008,7 +1007,7 @@ +@@ -992,7 +991,7 @@ * nmc_readline_echo: * * The same as nmc_readline() except it can disable echoing of input characters if @echo_on is %FALSE. @@ -31,7 +31,7 @@ */ char * nmc_readline_echo (const NmcConfig *nmc_config, -@@ -1019,8 +1018,7 @@ +@@ -1003,8 +1002,7 @@ va_list args; gs_free char *prompt = NULL; char *str; @@ -41,7 +41,7 @@ va_start (args, prompt_fmt); prompt = g_strdup_vprintf (prompt_fmt, args); -@@ -1030,8 +1028,7 @@ +@@ -1014,8 +1012,7 @@ /* Hide the actual password */ if (!echo_on) { @@ -51,7 +51,7 @@ rl_redisplay_function = nmc_secret_redisplay; } -@@ -1040,7 +1037,10 @@ +@@ -1024,7 +1021,10 @@ /* Restore the non-hiding behavior */ if (!echo_on) { rl_redisplay_function = rl_redisplay; @@ -65,7 +65,7 @@ return str; --- NetworkManager-1.18.1/clients/cli/connections.c.old 2019-04-20 19:01:59.000000000 +0000 +++ NetworkManager-1.18.1/clients/cli/connections.c 2019-05-10 07:05:43.058781503 +0000 -@@ -26,8 +26,7 @@ +@@ -12,8 +12,7 @@ #include <unistd.h> #include <signal.h> #include <netinet/ether.h> @@ -75,7 +75,7 @@ #include <fcntl.h> #include "nm-client-utils.h" -@@ -6050,9 +6049,6 @@ +@@ -6110,9 +6109,6 @@ return nmc_rl_gen_func_basic (text, state, avals); } @@ -85,7 +85,7 @@ /* * Attempt to complete on the contents of TEXT. START and END show the * region of TEXT that contains the word to complete. We can use the -@@ -6079,9 +6075,6 @@ +@@ -6139,9 +6135,6 @@ /* Disable default filename completion */ rl_attempted_completion_over = 1; @@ -95,7 +95,7 @@ /* Filter out possible ANSI color escape sequences */ prompt_tmp = nmc_filter_out_colors ((const char *) rl_prompt); -@@ -9150,7 +9143,6 @@ +@@ -9243,7 +9236,6 @@ generator_func = _meta_abstract_generator; } else if (g_strcmp0 (rl_prompt, PROMPT_IMPORT_FILE) == 0) { rl_attempted_completion_over = 0; @@ -105,7 +105,7 @@ } --- NetworkManager-1.18.1/clients/cli/devices.c.old 2019-04-20 19:01:59.000000000 +0000 +++ NetworkManager-1.18.1/clients/cli/devices.c 2019-05-10 06:16:21.432108032 +0000 -@@ -23,7 +23,7 @@ +@@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> @@ -116,7 +116,7 @@ #include "nm-client-utils.h" --- NetworkManager-1.18.1/clients/cli/nmcli.c.old 2019-04-20 19:01:59.000000000 +0000 +++ NetworkManager-1.18.1/clients/cli/nmcli.c 2019-05-10 06:16:29.211257692 +0000 -@@ -30,8 +30,7 @@ +@@ -15,8 +15,7 @@ #include <unistd.h> #include <locale.h> #include <glib-unix.h> diff --git a/user/networkmanager/errno.patch b/user/networkmanager/errno.patch index 825cc97a7..00c932586 100644 --- a/user/networkmanager/errno.patch +++ b/user/networkmanager/errno.patch @@ -1,6 +1,6 @@ --- NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c.old 2019-04-19 09:31:51.000000000 +0000 +++ NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c 2019-05-10 06:01:00.812741059 +0000 -@@ -121,7 +121,6 @@ +@@ -106,7 +106,6 @@ nm_assert (buf); nm_assert (buf_size > 0); @@ -8,7 +8,7 @@ /* XSI-compliant */ { int errno_saved = errno; -@@ -132,10 +131,6 @@ +@@ -117,10 +116,6 @@ } buf2 = buf; } diff --git a/user/networkmanager/musl.patch b/user/networkmanager/musl.patch index d8e9fdab2..ddf86390f 100644 --- a/user/networkmanager/musl.patch +++ b/user/networkmanager/musl.patch @@ -36,7 +36,7 @@ diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h index 25e6ab8..7967e8a 100644 --- a/shared/systemd/src/basic/util.h +++ b/shared/systemd/src/basic/util.h -@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) { +@@ -30,6 +30,12 @@ static inline unsigned u64log2(uint64_t n) { #endif } @@ -53,7 +53,7 @@ diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 2b5baba..976850c 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h -@@ -29,7 +29,11 @@ +@@ -15,7 +15,11 @@ #include <netinet/in.h> /* For ETH_ALEN and INFINIBAND_ALEN */ @@ -85,7 +85,7 @@ diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils index 36148b5..d282eb2 100644 --- a/src/platform/wifi/nm-wifi-utils.h +++ b/src/platform/wifi/nm-wifi-utils.h -@@ -21,7 +21,11 @@ +@@ -7,7 +7,11 @@ #ifndef __WIFI_UTILS_H__ #define __WIFI_UTILS_H__ @@ -101,7 +101,7 @@ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7514fa7..f041382 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -31,7 +31,11 @@ +@@ -17,7 +17,11 @@ #include <arpa/inet.h> #include <fcntl.h> #include <linux/if_addr.h> @@ -117,19 +117,19 @@ diff --git a/src/nm-manager.c b/src/nm-manager.c index 0bf6a75..e392507 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -25,6 +25,7 @@ - #include <stdlib.h> - #include <fcntl.h> - #include <unistd.h> +@@ -15,6 +15,7 @@ + #include <sys/stat.h> + #include <sys/sendfile.h> + #include <limits.h> +#include <asm/types.h> - - #include "nm-utils/nm-c-list.h" - + + #include "nm-glib-aux/nm-c-list.h" + diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h index 8c07c53..d043afc 100644 --- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h -@@ -63,7 +63,7 @@ +@@ -50,7 +50,7 @@ # ifdef HAVE___SECURE_GETENV # define secure_getenv __secure_getenv # else @@ -140,7 +140,7 @@ index 8c07c53..d043afc 100644 --- NetworkManager-1.18.1/src/platform/nm-linux-platform.c.old 2019-04-19 09:31:51.000000000 +0000 +++ NetworkManager-1.18.1/src/platform/nm-linux-platform.c 2019-05-10 07:21:32.665163629 +0000 -@@ -19,6 +19,7 @@ +@@ -6,6 +6,7 @@ #include "nm-default.h" #include "nm-linux-platform.h" @@ -148,7 +148,7 @@ index 8c07c53..d043afc 100644 #include <arpa/inet.h> #include <dlfcn.h> -@@ -27,7 +28,11 @@ +@@ -14,7 +15,11 @@ #include <libudev.h> #include <linux/fib_rules.h> #include <linux/ip.h> @@ -160,7 +160,7 @@ index 8c07c53..d043afc 100644 #include <linux/if_bridge.h> #include <linux/if_link.h> #include <linux/if_tun.h> -@@ -57,7 +62,6 @@ +@@ -44,7 +49,6 @@ #include "nm-platform-private.h" #include "wifi/nm-wifi-utils.h" #include "wifi/nm-wifi-utils-wext.h" @@ -172,7 +172,7 @@ diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/ index b0afb5c..f72e346 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c -@@ -19,6 +19,9 @@ +@@ -17,6 +17,9 @@ #include <sys/wait.h> #include <syslog.h> #include <unistd.h> @@ -182,7 +182,7 @@ index b0afb5c..f72e346 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include <valgrind/valgrind.h> -@@ -1105,11 +1108,13 @@ void reset_cached_pid(void) { +@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -196,7 +196,7 @@ index b0afb5c..f72e346 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1138,7 +1143,12 @@ pid_t getpid_cached(void) { +@@ -1156,7 +1161,12 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does — though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -213,7 +213,7 @@ index b0afb5c..f72e346 100644 --- NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c.old 2019-08-06 10:22:09.000000000 +0000 +++ NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c 2019-08-09 05:17:18.249955730 +0000 -@@ -8,7 +8,7 @@ +@@ -7,7 +7,7 @@ #include <errno.h> #include <string.h> #include <sys/ioctl.h> diff --git a/user/networkmanager/random.patch b/user/networkmanager/random.patch index 30acd9c3b..1d3c21588 100644 --- a/user/networkmanager/random.patch +++ b/user/networkmanager/random.patch @@ -36,7 +36,7 @@ diff --git shared/n-dhcp4/src/n-dhcp4-private.h shared/n-dhcp4/src/n-dhcp4-priva index c38ddbfc8..fb4880771 100644 --- a/shared/n-dhcp4/src/n-dhcp4-private.h +++ b/shared/n-dhcp4/src/n-dhcp4-private.h -@@ -259,7 +259,11 @@ struct NDhcp4ClientProbeConfig { +@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig { bool inform_only; bool init_reboot; struct in_addr requested_ip; diff --git a/user/networkmanager/tests.patch b/user/networkmanager/tests.patch index ec9719a89..d2691db3b 100644 --- a/user/networkmanager/tests.patch +++ b/user/networkmanager/tests.patch @@ -1,6 +1,6 @@ --- NetworkManager-1.18.1/src/devices/tests/test-lldp.c.old 2019-04-18 09:19:11.000000000 +0000 +++ NetworkManager-1.18.1/src/devices/tests/test-lldp.c 2019-05-10 07:23:58.979198831 +0000 -@@ -20,7 +20,6 @@ +@@ -6,7 +6,6 @@ #include "nm-default.h" #include <fcntl.h> @@ -8,7 +8,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -31,6 +30,7 @@ +@@ -17,6 +16,7 @@ #include "platform/tests/test-common.h" #include "nm-test-utils-core.h" diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD index 361caa50b..f8aab64a2 100644 --- a/user/newt/APKBUILD +++ b/user/newt/APKBUILD @@ -10,7 +10,7 @@ arch="all" options="!check" # No test suite. license="LGPL-2.0-only" depends="" -makedepends="popt-dev slang-dev" +makedepends="autoconf automake popt-dev slang-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz" builddir="$srcdir/newt-r$_pkgver" diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD index 84f90982f..b9b3064d6 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.5.3 +pkgver=2.6.3 pkgrel=0 pkgdesc="Nextcloud desktop client" url="https://github.com/nextcloud/desktop" @@ -13,7 +13,7 @@ makedepends="cmake qt5-qttools-dev qtkeychain-dev zlib-dev subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/desktop/archive/v$pkgver.tar.gz no-webengine.patch - openssl.patch" + test-fix-include.patch" builddir="$srcdir/desktop-$pkgver" build() { @@ -21,11 +21,10 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR="/etc/$pkgname" \ - -DNO_SHIBBOLETH=1 \ -DWITH_CRASHREPORTER=bool:OFF \ -DUNIT_TESTING=bool:ON \ - -DNO_SHIBBOLETH=bool:ON + -DNO_SHIBBOLETH=bool:ON \ + -DNO_WEBENGINE=bool:ON . make } @@ -37,8 +36,12 @@ check() { package() { make DESTDIR="$pkgdir" install + cat > "$pkgdir"/etc/Nextcloud/Nextcloud.conf <<-EOF + [General] + skipUpdateCheck=true + EOF } -sha512sums="998e38278472e87e9606fad407ba7b1295594a777845c6fa7413ffb485b3a3b7a26ad8212a1161e1d695d9ecfa066e9090aa633b4ec4af84700c28bc1321b710 nextcloud-client-2.5.3.tar.gz -17e6a8437d33a2bb1305e45405aee4e23f233e00c232669a1f8317355032d88329899d3f7b65d1069cf1612029b589a575b0f64018b9b23d239a73c5f4bed2ce no-webengine.patch -e323a1074f8ac96667a420f076fdfc988e2fd97cdacd05d83ac54b467b567f5adbf635e7c4fb0414af0012b4016cc4c13441cb35ed3976bc970e514e81b65fd4 openssl.patch" +sha512sums="ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 nextcloud-client-2.6.3.tar.gz +38dd89ca2bf67294187bb4d5c59cdf725ec3b502f23bf4a60210e85c66f6a7e00da0e0b41775bc138159bed300dc60a1f179d1d6ad3b7a27e1aadf4f0576f348 no-webengine.patch +c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f test-fix-include.patch" diff --git a/user/nextcloud-client/no-webengine.patch b/user/nextcloud-client/no-webengine.patch index 762b5092d..cbbfe2a72 100644 --- a/user/nextcloud-client/no-webengine.patch +++ b/user/nextcloud-client/no-webengine.patch @@ -1,6 +1,45 @@ ---- desktop-2.5.2/src/CMakeLists.txt 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/CMakeLists.txt 2019-04-22 04:01:31.260028906 +0000 -@@ -4,7 +4,7 @@ +From 61561d454fec726741a938b81149fa0e2d7db4d6 Mon Sep 17 00:00:00 2001 +From: Max Rees <maxcrees@me.com> +Date: Mon, 24 Feb 2020 21:32:58 -0600 +Subject: [PATCH] Add support for compiling without QtWebEngine (webflow / + flow2 support) + +Signed-off-by: Max Rees <maxcrees@me.com> +--- + CMakeLists.txt | 7 +++++++ + src/CMakeLists.txt | 6 +++++- + src/gui/CMakeLists.txt | 25 +++++++++++++++------- + src/gui/accountmanager.cpp | 2 ++ + src/gui/creds/credentialsfactory.cpp | 4 ++++ + src/gui/wizard/owncloudsetuppage.cpp | 4 ++++ + src/gui/wizard/owncloudwizard.cpp | 31 +++++++++++++++++++++++++++- + src/gui/wizard/owncloudwizard.h | 6 ++++++ + src/libsync/networkjobs.cpp | 8 +++++++ + 9 files changed, 83 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8e92e250..90719c222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,6 +167,13 @@ if(NO_SHIBBOLETH) + add_definitions(-DNO_SHIBBOLETH=1) + endif() + ++# Disable webengine-based components ++option(NO_WEBENGINE "Build without webflow / flow2 support so QtWebEngine isn't required" OFF) ++if(NO_WEBENGINE) ++ message("Compiling without webengine") ++ add_definitions(-DNO_WEBENGINE=1) ++endif() ++ + if(APPLE) + set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" ) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9f854b006..881daec8e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -4,11 +4,15 @@ endif() set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) @@ -9,26 +48,35 @@ if (Qt5Core_VERSION VERSION_LESS 5.9.0) message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.") endif() ---- desktop-2.5.2/src/gui/CMakeLists.txt 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/gui/CMakeLists.txt 2019-04-22 04:15:53.230034980 +0000 -@@ -40,7 +40,6 @@ - wizard/owncloudoauthcredspage.ui - wizard/owncloudsetupnocredspage.ui - wizard/owncloudwizardresultpage.ui -- wizard/webview.ui - ) - set(client_SRCS -@@ -103,8 +102,6 @@ ++if(NOT NO_WEBENGINE) ++ find_package(Qt5 5.6 COMPONENTS WebEngineWidgets WebEngine REQUIRED) ++endif() ++ + if(NOT TOKEN_AUTH_ONLY) + find_package(Qt5Keychain REQUIRED) + endif() +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +index 4372a9f23..d62f23d1e 100644 +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -108,24 +108,17 @@ set(client_SRCS creds/credentialsfactory.cpp creds/httpcredentialsgui.cpp creds/oauth.cpp +- creds/flow2auth.cpp + creds/keychainchunk.cpp - creds/webflowcredentials.cpp - creds/webflowcredentialsdialog.cpp wizard/postfixlineedit.cpp wizard/abstractcredswizardpage.cpp wizard/owncloudadvancedsetuppage.cpp -@@ -115,8 +112,6 @@ + wizard/owncloudconnectionmethoddialog.cpp + wizard/owncloudhttpcredspage.cpp + wizard/owncloudoauthcredspage.cpp +- wizard/flow2authcredspage.cpp +- wizard/flow2authwidget.cpp + wizard/owncloudsetuppage.cpp wizard/owncloudwizardcommon.cpp wizard/owncloudwizard.cpp wizard/owncloudwizardresultpage.cpp @@ -37,169 +85,291 @@ wizard/slideshow.cpp ) -@@ -295,7 +290,7 @@ +@@ -138,6 +131,18 @@ IF(NOT NO_SHIBBOLETH) + ) + endif() + ++IF(NOT NO_WEBENGINE) ++ list(APPEND client_SRCS ++ creds/flow2auth.cpp ++ creds/webflowcredentials.cpp ++ creds/webflowcredentialsdialog.cpp ++ wizard/flow2authcredspage.cpp ++ wizard/flow2authwidget.cpp ++ wizard/webviewpage.cpp ++ wizard/webview.cpp ++ ) ++endif() ++ + set(updater_SRCS + updater/ocupdater.cpp + updater/updateinfo.cpp +@@ -298,7 +303,11 @@ else() endif() add_library(updater STATIC ${updater_SRCS}) -target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets) -+target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml) ++if(NOT NO_WEBENGINE) ++ target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets) ++else() ++ target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml) ++endif() target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES ---- desktop-2.5.2/src/gui/accountmanager.cpp 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/gui/accountmanager.cpp 2019-04-22 04:17:04.440035482 +0000 -@@ -253,20 +253,6 @@ +diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp +index eec375180..2d7b0bc30 100644 +--- a/src/gui/accountmanager.cpp ++++ b/src/gui/accountmanager.cpp +@@ -253,6 +253,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) acc->setUrl(urlConfig.toUrl()); } -- // Migrate to webflow -- if (authType == QLatin1String("http")) { -- authType = "webflow"; -- settings.setValue(QLatin1String(authTypeC), authType); -- -- foreach(QString key, settings.childKeys()) { -- if (!key.startsWith("http_")) -- continue; -- auto newkey = QString::fromLatin1("webflow_").append(key.mid(5)); -- settings.setValue(newkey, settings.value((key))); -- settings.remove(key); -- } -- } -- ++#ifndef NO_WEBENGINE + // Migrate to webflow + if (authType == QLatin1String("http")) { + authType = "webflow"; +@@ -266,6 +267,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) + settings.remove(key); + } + } ++#endif + qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType; - acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString(); ---- desktop-2.5.2/src/gui/creds/credentialsfactory.cpp 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/gui/creds/credentialsfactory.cpp 2019-04-22 04:23:19.590038126 +0000 -@@ -21,7 +21,6 @@ +diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp +index 6062f70eb..723196d08 100644 +--- a/src/gui/creds/credentialsfactory.cpp ++++ b/src/gui/creds/credentialsfactory.cpp +@@ -21,7 +21,9 @@ #ifndef NO_SHIBBOLETH #include "creds/shibbolethcredentials.h" #endif --#include "creds/webflowcredentials.h" ++#ifndef NO_WEBENGINE + #include "creds/webflowcredentials.h" ++#endif namespace OCC { -@@ -40,8 +39,6 @@ +@@ -40,8 +42,10 @@ namespace CredentialsFactory { } else if (type == "shibboleth") { return new ShibbolethCredentials; #endif -- } else if (type == "webflow") { -- return new WebFlowCredentials; ++#ifndef NO_WEBENGINE + } else if (type == "webflow") { + return new WebFlowCredentials; ++#endif } else { qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type)); return new DummyCredentials; ---- desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp 2019-04-22 04:24:59.360038829 +0000 -@@ -26,7 +26,6 @@ +diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp +index 11b1fc80c..30df7cc7f 100644 +--- a/src/gui/wizard/owncloudsetuppage.cpp ++++ b/src/gui/wizard/owncloudsetuppage.cpp +@@ -144,7 +144,11 @@ void OwncloudSetupPage::slotLogin() + void OwncloudSetupPage::slotGotoProviderList() + { + _ocWizard->setRegistration(true); ++#ifndef NO_WEBENGINE + _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow); ++#else ++ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic); ++#endif + _authTypeKnown = true; + _checking = false; + emit completeChanged(); +diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp +index 2076136ff..8cb91e250 100644 +--- a/src/gui/wizard/owncloudwizard.cpp ++++ b/src/gui/wizard/owncloudwizard.cpp +@@ -27,8 +27,10 @@ #endif #include "wizard/owncloudadvancedsetuppage.h" #include "wizard/owncloudwizardresultpage.h" --#include "wizard/webviewpage.h" ++#ifndef NO_WEBENGINE + #include "wizard/webviewpage.h" + #include "wizard/flow2authcredspage.h" ++#endif #include "QProgressIndicator.h" -@@ -51,7 +50,6 @@ +@@ -47,14 +49,18 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) + , _setupPage(new OwncloudSetupPage(this)) + , _httpCredsPage(new OwncloudHttpCredsPage(this)) + , _browserCredsPage(new OwncloudOAuthCredsPage) ++#ifndef NO_WEBENGINE + , _flow2CredsPage(new Flow2AuthCredsPage) ++#endif + #ifndef NO_SHIBBOLETH + , _shibbolethCredsPage(new OwncloudShibbolethCredsPage) + #endif , _advancedSetupPage(new OwncloudAdvancedSetupPage) , _resultPage(new OwncloudWizardResultPage) , _credentialsPage(nullptr) -- , _webViewPage(new WebViewPage(this)) ++#ifndef NO_WEBENGINE + , _webViewPage(new WebViewPage(this)) ++#endif , _setupLog() , _registration(false) { -@@ -64,7 +62,6 @@ +@@ -62,13 +68,17 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) + setPage(WizardCommon::Page_ServerSetup, _setupPage); + setPage(WizardCommon::Page_HttpCreds, _httpCredsPage); + setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage); ++#ifndef NO_WEBENGINE + setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage); ++#endif + #ifndef NO_SHIBBOLETH + setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage); #endif setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage); setPage(WizardCommon::Page_Result, _resultPage); -- setPage(WizardCommon::Page_WebView, _webViewPage); ++#ifndef NO_WEBENGINE + setPage(WizardCommon::Page_WebView, _webViewPage); ++#endif connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished); -@@ -79,7 +76,6 @@ +@@ -80,11 +90,15 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) + connect(_setupPage, &OwncloudSetupPage::determineAuthType, this, &OwncloudWizard::determineAuthType); + connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); + connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); ++#ifndef NO_WEBENGINE + connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); ++#endif #ifndef NO_SHIBBOLETH connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); #endif -- connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); ++#ifndef NO_WEBENGINE + connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); ++#endif connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders, this, &OwncloudWizard::createLocalAndRemoteFolders); connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration); -@@ -168,10 +164,6 @@ +@@ -106,12 +120,16 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) + // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching) + connect(this, &OwncloudWizard::styleChanged, _setupPage, &OwncloudSetupPage::slotStyleChanged); + connect(this, &OwncloudWizard::styleChanged, _advancedSetupPage, &OwncloudAdvancedSetupPage::slotStyleChanged); ++#ifndef NO_WEBENGINE + connect(this, &OwncloudWizard::styleChanged, _flow2CredsPage, &Flow2AuthCredsPage::slotStyleChanged); ++#endif + + customizeStyle(); + ++#ifndef NO_WEBENGINE + // allow Flow2 page to poll on window activation + connect(this, &OwncloudWizard::onActivate, _flow2CredsPage, &Flow2AuthCredsPage::slotPollNow); ++#endif + } + + void OwncloudWizard::setAccount(AccountPtr account) +@@ -180,9 +198,11 @@ void OwncloudWizard::successfulStep() + _browserCredsPage->setConnected(); + break; + ++#ifndef NO_WEBENGINE + case WizardCommon::Page_Flow2AuthCreds: + _flow2CredsPage->setConnected(); + break; ++#endif + + #ifndef NO_SHIBBOLETH + case WizardCommon::Page_ShibbolethCreds: +@@ -190,9 +210,11 @@ void OwncloudWizard::successfulStep() break; #endif -- case WizardCommon::Page_WebView: -- _webViewPage->setConnected(); -- break; -- ++#ifndef NO_WEBENGINE + case WizardCommon::Page_WebView: + _webViewPage->setConnected(); + break; ++#endif + case WizardCommon::Page_AdvancedSetup: _advancedSetupPage->directoriesCreated(); - break; -@@ -195,8 +187,6 @@ +@@ -217,10 +239,12 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type) #endif if (type == DetermineAuthTypeJob::OAuth) { _credentialsPage = _browserCredsPage; -- } else if (type == DetermineAuthTypeJob::WebViewFlow) { -- _credentialsPage = _webViewPage; ++#ifndef NO_WEBENGINE + } else if (type == DetermineAuthTypeJob::LoginFlowV2) { + _credentialsPage = _flow2CredsPage; + } else if (type == DetermineAuthTypeJob::WebViewFlow) { + _credentialsPage = _webViewPage; ++#endif } else { // try Basic auth even for "Unknown" _credentialsPage = _httpCredsPage; } ---- desktop-2.5.2/src/libsync/networkjobs.h 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/libsync/networkjobs.h 2019-04-22 05:21:11.950062594 +0000 -@@ -411,8 +411,7 @@ - enum AuthType { - Basic, // also the catch-all fallback for backwards compatibility reasons - OAuth, -- Shibboleth, -- WebViewFlow -+ Shibboleth - }; - - explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr); ---- desktop-2.5.2/src/libsync/networkjobs.cpp 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/libsync/networkjobs.cpp 2019-04-22 05:33:28.590067785 +0000 -@@ -922,7 +922,7 @@ - - // WebViewFlow > OAuth > Shib > Basic - if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) { -- result = WebViewFlow; -+ result = Basic; +@@ -245,7 +269,12 @@ void OwncloudWizard::slotCurrentPageChanged(int id) } - qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result; ---- desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp 2019-03-19 01:52:24.000000000 +0000 -+++ desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp 2019-04-22 05:32:01.750067173 +0000 -@@ -143,7 +143,7 @@ - void OwncloudSetupPage::slotGotoProviderList() - { - _ocWizard->setRegistration(true); -- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow); -+ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic); - _authTypeKnown = true; - _checking = false; - emit completeChanged(); -@@ -260,8 +260,6 @@ - return WizardCommon::Page_OAuthCreds; - case DetermineAuthTypeJob::Shibboleth: - return WizardCommon::Page_ShibbolethCreds; -- case DetermineAuthTypeJob::WebViewFlow: -- return WizardCommon::Page_WebView; - } - return WizardCommon::Page_HttpCreds; - } ---- desktop-2.5.2/src/gui/wizard/owncloudwizard.h 2019-03-18 21:52:24.000000000 -0400 -+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.h 2019-04-22 02:07:03.600081984 -0400 -@@ -39,7 +39,6 @@ + setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup); +- if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) { ++ if (id == WizardCommon::Page_AdvancedSetup ++ && (_credentialsPage == _browserCredsPage ++#ifndef NO_WEBENGINE ++ || _credentialsPage == _flow2CredsPage ++#endif ++ )) { + // For OAuth, disable the back button in the Page_AdvancedSetup because we don't want + // to re-open the browser. + button(QWizard::BackButton)->setEnabled(false); +diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h +index 3cbf89f71..2f398d416 100644 +--- a/src/gui/wizard/owncloudwizard.h ++++ b/src/gui/wizard/owncloudwizard.h +@@ -39,8 +39,10 @@ class OwncloudAdvancedSetupPage; class OwncloudWizardResultPage; class AbstractCredentials; class AbstractCredentialsWizardPage; --class WebViewPage; ++#ifndef NO_WEBENGINE + class WebViewPage; + class Flow2AuthCredsPage; ++#endif /** * @brief The OwncloudWizard class -@@ -106,7 +105,6 @@ +@@ -114,11 +116,15 @@ private: + #ifndef NO_SHIBBOLETH + OwncloudShibbolethCredsPage *_shibbolethCredsPage; + #endif ++#ifndef NO_WEBENGINE + Flow2AuthCredsPage *_flow2CredsPage; ++#endif OwncloudAdvancedSetupPage *_advancedSetupPage; OwncloudWizardResultPage *_resultPage; AbstractCredentialsWizardPage *_credentialsPage; -- WebViewPage *_webViewPage; ++#ifndef NO_WEBENGINE + WebViewPage *_webViewPage; ++#endif QStringList _setupLog; +diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp +index 76789a8ce..73f0bed0e 100644 +--- a/src/libsync/networkjobs.cpp ++++ b/src/libsync/networkjobs.cpp +@@ -955,12 +955,20 @@ void DetermineAuthTypeJob::checkAllDone() + + // WebViewFlow > OAuth > Shib > Basic + if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) { ++#ifndef NO_WEBENGINE + result = WebViewFlow; ++#else ++ result = Basic; ++#endif + } + + // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic + if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) { ++#ifndef NO_WEBENGINE + result = LoginFlowV2; ++#else ++ result = Basic; ++#endif + } + + // If we determined that we need the webview flow (GS for example) then we switch to that +-- +2.25.0 + diff --git a/user/nextcloud-client/openssl.patch b/user/nextcloud-client/openssl.patch deleted file mode 100644 index 426fa0cfb..000000000 --- a/user/nextcloud-client/openssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- desktop-2.5.0-beta2/CMakeLists.txt 2018-08-24 12:54:42.000000000 +0000 -+++ desktop-2.5.0-beta2/CMakeLists.txt 2018-10-03 06:19:15.840263697 +0000 -@@ -183,7 +183,7 @@ if(BUILD_CLIENT) - endif() - find_package(Sphinx) - find_package(PdfLatex) -- find_package(OpenSSL 1.1 REQUIRED ) -+ find_package(OpenSSL 1.0 REQUIRED ) - - find_package(ZLIB REQUIRED) - find_package(GLib2) diff --git a/user/nextcloud-client/test-fix-include.patch b/user/nextcloud-client/test-fix-include.patch new file mode 100644 index 000000000..da8423022 --- /dev/null +++ b/user/nextcloud-client/test-fix-include.patch @@ -0,0 +1,22 @@ +From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001 +From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com> +Date: Fri, 12 Oct 2018 15:56:26 +0200 +Subject: [PATCH] Fix include file + +--- + test/testnextcloudpropagator.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp +index 6ad1a6b37..dc2e476ad 100644 +--- a/test/testnextcloudpropagator.cpp ++++ b/test/testnextcloudpropagator.cpp +@@ -8,7 +8,7 @@ + #include <QDebug> + + #include "propagatedownload.h" +-#include "nextcloudpropagator_p.h" ++#include "owncloudpropagator_p.h" + + using namespace OCC; + namespace OCC { diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD index b044b12af..6e948b1ff 100644 --- a/user/nextcloud/APKBUILD +++ b/user/nextcloud/APKBUILD @@ -104,10 +104,6 @@ done # Directory for apps shipped with Nextcloud. _appsdir="usr/share/webapps/$pkgname/apps" -build() { - cd "$builddir" -} - package() { local basedir="var/lib/$pkgname" local datadir="$basedir/data" diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index 8b1039750..2d42c60ff 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nfs-utils -pkgver=2.4.1 -pkgrel=1 +pkgver=2.4.3 +pkgrel=0 pkgdesc="NFS file sharing client and server" url="http://nfs.sourceforge.net/" arch="all" @@ -13,10 +13,8 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev rpcsvc-proto sqlite-dev util-linux-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz - nfs-utils-1.1.4-mtab-sym.patch - nfsdcld.patch posixish.patch - undef-def.patch + time64.patch exports nfs.confd nfs.initd nfsclient.confd nfsclient.initd nfsmount.confd @@ -59,11 +57,9 @@ package() { done } -sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e nfs-utils-2.4.1.tar.xz -1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch -0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419 nfsdcld.patch -db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b posixish.patch -3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841 undef-def.patch +sha512sums="9b8065d9d3958e45021898e24574d1e6d59353f94c2f760df18a793a734d79d0047df95e2f9cdebfda58e3f68f52b2ef723df2261c10bbeb5b16fe1413c1b8d7 nfs-utils-2.4.3.tar.xz +8ed36d22094eaca1a7b83fd5e840e774ee172ca81bf15215cf04127e45fc32ac75c3e0f3d8914370ac09c93d08a0fe8aa6d8f3eb7a8318db1e9ab7b2a05dee06 posixish.patch +e85afa3ba90eeb48d3a571543ab1361a27b9c4148799548a6b0cd304cff3231235c09753268a1601bf793b1589eb320d7196d00e86ef5eb33aee466fa260dafd time64.patch fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 exports bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 nfs.confd f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch deleted file mode 100644 index e80956bb8..000000000 --- a/user/nfs-utils/nfsdcld.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- nfs-utils-2.4.1/utils/nfsdcld/legacy.c.old 2019-06-10 14:34:37.000000000 +0000 -+++ nfs-utils-2.4.1/utils/nfsdcld/legacy.c 2019-06-20 00:29:10.493973462 +0000 -@@ -24,6 +24,7 @@ - #include <errno.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <limits.h> - #include "cld.h" - #include "sqlite.h" - #include "xlog.h" ---- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old 2019-06-10 14:34:37.000000000 +0000 -+++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c 2019-06-20 00:28:42.926915402 +0000 -@@ -645,7 +645,7 @@ - int - main(int argc, char **argv) - { -- char arg; -+ int arg; - int rc = 0; - bool foreground = false; - char *progname; diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch index 9bc817ad0..d8802047d 100644 --- a/user/nfs-utils/posixish.patch +++ b/user/nfs-utils/posixish.patch @@ -1,6 +1,6 @@ --- nfs-utils-2.3.3/configure.old 2018-09-06 18:10:07.000000000 +0000 +++ nfs-utils-2.3.3/configure 2019-01-10 16:01:32.110000000 +0000 -@@ -20302,9 +20302,9 @@ +@@ -20596,9 +20596,9 @@ fi fi @@ -13,7 +13,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -20318,27 +20318,27 @@ +@@ -20612,27 +20612,27 @@ #ifdef __cplusplus extern "C" #endif diff --git a/user/nfs-utils/time64.patch b/user/nfs-utils/time64.patch new file mode 100644 index 000000000..b28ee2f44 --- /dev/null +++ b/user/nfs-utils/time64.patch @@ -0,0 +1,94 @@ +--- nfs-utils-2.4.2/support/nfs/cacheio.c.old 2019-11-13 17:09:41.000000000 +0000 ++++ nfs-utils-2.4.2/support/nfs/cacheio.c 2020-01-24 03:32:30.296395221 +0000 +@@ -26,6 +26,7 @@ + #include <fcntl.h> + #include <time.h> + #include <errno.h> ++#include <inttypes.h> + + extern struct state_paths etab; + +@@ -234,7 +235,7 @@ + stb.st_mtime > now) + stb.st_mtime = time(0); + +- sprintf(stime, "%ld\n", stb.st_mtime); ++ sprintf(stime, "%"PRId64"\n", stb.st_mtime); + for (c=0; cachelist[c]; c++) { + int fd; + sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]); +--- nfs-utils-2.4.2/utils/idmapd/idmapd.c.old 2019-11-13 17:09:41.000000000 +0000 ++++ nfs-utils-2.4.2/utils/idmapd/idmapd.c 2020-01-24 03:35:05.459393437 +0000 +@@ -65,6 +65,7 @@ + #include <ctype.h> + #include <libgen.h> + #include <nfsidmap.h> ++#include <inttypes.h> + + #include "xlog.h" + #include "conffile.h" +@@ -172,7 +173,7 @@ + int fd; + char stime[32]; + +- sprintf(stime, "%ld\n", now); ++ sprintf(stime, "%"PRId64"\n", now); + fd = open(path, O_RDWR); + if (fd == -1) + return -1; +@@ -625,7 +626,7 @@ + /* Name */ + addfield(&bp, &bsiz, im.im_name); + /* expiry */ +- snprintf(buf1, sizeof(buf1), "%lu", ++ snprintf(buf1, sizeof(buf1), "%"PRIu64, + time(NULL) + cache_entry_expiration); + addfield(&bp, &bsiz, buf1); + /* Note that we don't want to write the id if the mapping +@@ -653,7 +654,7 @@ + snprintf(buf1, sizeof(buf1), "%u", im.im_id); + addfield(&bp, &bsiz, buf1); + /* expiry */ +- snprintf(buf1, sizeof(buf1), "%lu", ++ snprintf(buf1, sizeof(buf1), "%"PRIu64, + time(NULL) + cache_entry_expiration); + addfield(&bp, &bsiz, buf1); + /* Note we're ignoring the status field in this case; we'll +--- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.old 2019-11-13 17:09:41.000000000 +0000 ++++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c 2020-01-24 04:40:06.871901242 +0000 +@@ -38,6 +38,7 @@ + #include <sys/inotify.h> + #include <dirent.h> + #include <limits.h> ++#include <inttypes.h> + #ifdef HAVE_SYS_CAPABILITY_H + #include <sys/prctl.h> + #include <sys/capability.h> +@@ -525,7 +526,7 @@ + if (*tail) + return -EINVAL; + +- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); ++ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRId64, __func__, gracetime); + + ret = sqlite_remove_unreclaimed(gracetime); + +--- nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c.old 2019-11-13 17:09:41.000000000 +0000 ++++ nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c 2020-01-24 04:40:31.519202517 +0000 +@@ -48,6 +48,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <sqlite3.h> ++#include <inttypes.h> + #include <linux/limits.h> + + #include "xlog.h" +@@ -544,7 +545,7 @@ + int ret; + char *err = NULL; + +- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", ++ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRId64, + grace_start); + if (ret < 0) { + return ret; diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch deleted file mode 100644 index a8b03ac03..000000000 --- a/user/nfs-utils/undef-def.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- nfs-utils-2.3.3/utils/mountd/cache.c.old 2018-09-06 18:09:08.000000000 +0000 -+++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-01-10 16:26:22.750000000 +0000 -@@ -446,7 +446,7 @@ - if (count_slashes(p) != count_slashes(parent)) - return 0; - --#if HAVE_NAME_TO_HANDLE_AT -+#ifdef HAVE_NAME_TO_HANDLE_AT - struct { - struct file_handle fh; - unsigned char handle[128]; ---- nfs-utils-2.3.3/utils/mount/network.c.old 2018-09-06 18:09:08.000000000 +0000 -+++ nfs-utils-2.3.3/utils/mount/network.c 2019-01-10 16:28:46.840000000 +0000 -@@ -39,7 +39,7 @@ - #include <sys/socket.h> - #include <sys/wait.h> - #include <sys/stat.h> --#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24) -+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) - /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */ - # define IPV6_PREFER_SRC_PUBLIC 2 - # define IPV6_ADDR_PREFERENCES 72 diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index 124c35dfd..41e356d37 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -1,21 +1,25 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=nftables -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="https://netfilter.org/projects/nftables" -options="!check" # no test suite arch="all" +options="!check" # No test suite. license="GPL-2.0+ AND GPL-2.0" -makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev" +depends="" +makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev + autoconf automake libtool" subpackages="$pkgname-doc $pkgname-openrc" source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2 asciidoctor.patch nftables.confd - nftables.initd" + nftables.initd + " prepare() { default_prepare @@ -24,7 +28,7 @@ prepare() { build() { # TODO: Man pages are massively broken with asciidoctor - A2X=asciidoctor ./configure \ + A2X=asciidoctor bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -43,7 +47,7 @@ package() { install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6 nftables-0.9.2.tar.bz2 +sha512sums="d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43 nftables-0.9.3.tar.bz2 f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 001403fd6..41dd0bc58 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.39.2 +pkgver=1.40.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" arch="all" 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" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8c971543e3e87736dfafebca55e9ecd0644e304c9731edaccba34170205824476595861a439077289b438ad489dd6008dedf2c6b2c111920300329be1b1bf34 nghttp2-1.39.2.tar.xz" +sha512sums="3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce nghttp2-1.40.0.tar.xz" diff --git a/user/ninja/APKBUILD b/user/ninja/APKBUILD index e0638a176..2b82aef51 100644 --- a/user/ninja/APKBUILD +++ b/user/ninja/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Small build system with a focus on speed" url="https://ninja-build.org/" arch="all" license="Apache-2.0" +depends="" makedepends="asciidoctor gtest python3 re2c" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgver.tar.gz @@ -14,20 +15,16 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgv " build() { - cd "$builddir" python3 ./configure.py --bootstrap asciidoctor doc/manual.asciidoc } check() { - cd "$builddir" - ./ninja ninja_test ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots } package() { - cd "$builddir" install -m755 -D ninja "$pkgdir/usr/bin/ninja" install -m644 -D doc/manual.asciidoc \ "$pkgdir/usr/share/doc/ninja/manual.asciidoc" diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD index 3b256aaa3..304c94cae 100644 --- a/user/nmap/APKBUILD +++ b/user/nmap/APKBUILD @@ -7,7 +7,8 @@ url="https://nmap.org/" arch="all" license="GPL-2.0-only" depends="" -makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev" +makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev + libssh2-dev lua5.3-dev" subpackages=" $pkgname-doc $pkgname-scripts::noarch @@ -33,7 +34,7 @@ build() { export CFLAGS=-g3 export CPPFLAGS=-g3 export CXXFLAGS=-g3 - ./configure \ + LDFLAGS="$LDFLAGS -L/usr/lib/lua5.3" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -47,7 +48,7 @@ build() { --with-libpcre=yes \ --with-libz=yes \ --with-libssh2=yes \ - --with-liblua=/usr/lua5.3 + --with-liblua=yes make } diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD index 6b7f9facb..e47718dd0 100644 --- a/user/nml/APKBUILD +++ b/user/nml/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nml pkgver=0.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="NewGRF Meta Language utilities for OpenTTD mods" url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main" arch="all" @@ -10,21 +10,21 @@ license="GPL-2.0+" depends="python3 py3-pillow py3-ply" makedepends="python3-dev" subpackages="" -source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz" +source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz + pillow.patch + " build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" make -C regression } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz" +sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz +06ba794eca5a4af5b06b8c4a223bb2006567cfced1d3017d380ef4c0000e69124e1f67855a982eff7a68aeb24ee30b080e345fa8d3e251a3553ea4153ed84e98 pillow.patch" diff --git a/user/nml/pillow.patch b/user/nml/pillow.patch new file mode 100644 index 000000000..4fb1f1247 --- /dev/null +++ b/user/nml/pillow.patch @@ -0,0 +1,14 @@ +--- nml-0.4.5/nml/version_info.py.old 2018-06-30 09:10:30.000000000 +0000 ++++ nml-0.4.5/nml/version_info.py 2020-01-11 00:14:30.683254313 +0000 +@@ -71,7 +71,10 @@ + #PIL + try: + from PIL import Image +- versions["PIL"] = Image.VERSION ++ if hasattr(Image, 'VERSION'): ++ versions["PIL"] = Image.VERSION ++ else: ++ versions["PIL"] = "1.1.7" # Pillow + except ImportError: + try: + import Image diff --git a/user/node/APKBUILD b/user/node/APKBUILD index ac9eaeb44..d60a359af 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node -pkgver=10.16.3 +pkgver=10.19.0 pkgrel=0 pkgdesc="JavaScript runtime" url="https://nodejs.org/" @@ -46,7 +46,6 @@ unpack() { } build() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" # We can't use --shared-openssl until 1.1 is available. python ./configure.py \ @@ -63,18 +62,16 @@ build() { } check() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" make DESTDIR="$pkgdir" test-only } package() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" make DESTDIR="$pkgdir" install } -sha512sums="5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7 node-v10.16.3.tar.xz +sha512sums="512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee node-v10.19.0.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch 6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch diff --git a/user/notmuch/0.28.2-disable-rpath.patch b/user/notmuch/0.28.2-disable-rpath.patch deleted file mode 100644 index cc5102614..000000000 --- a/user/notmuch/0.28.2-disable-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ed15cac16414418c11896071d6ca9238d033f23d Mon Sep 17 00:00:00 2001 -From: Luis Ressel <aranea@aixah.de> -Date: Mon, 25 Feb 2019 08:18:24 +0100 -Subject: [PATCH] Add a configure flag to disable rpaths - ---- - configure | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index a6f5dfa2..5e7e5aa9 100755 ---- a/configure -+++ b/configure -@@ -82,6 +82,7 @@ WITH_API_DOCS=1 - WITH_EMACS=1 - WITH_DESKTOP=1 - WITH_BASH=1 -+WITH_RPATH=1 - WITH_RUBY=1 - WITH_ZSH=1 - WITH_RETRY_LOCK=1 -@@ -241,6 +242,14 @@ for option; do - fi - elif [ "${option}" = '--without-bash-completion' ] ; then - WITH_BASH=0 -+ elif [ "${option%%=*}" = '--with-rpath' ]; then -+ if [ "${option#*=}" = 'no' ]; then -+ WITH_RPATH=0 -+ else -+ WITH_RPATH=1 -+ fi -+ elif [ "${option}" = '--without-rpath' ] ; then -+ WITH_RPATH=0 - elif [ "${option%%=*}" = '--with-ruby' ]; then - if [ "${option#*=}" = 'no' ]; then - WITH_RUBY=0 -@@ -928,7 +937,7 @@ fi - rm -f compat/check_asctime - - printf "Checking for rpath support... " --if ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1 -+if [ $WITH_RPATH = "1" ] && ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1 - then - printf "Yes.\n" - rpath_ldflags="-Wl,--enable-new-dtags -Wl,-rpath,\$(libdir)" --- -2.19.2 - diff --git a/user/notmuch/APKBUILD b/user/notmuch/APKBUILD deleted file mode 100644 index b585d685f..000000000 --- a/user/notmuch/APKBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> -pkgname=notmuch -pkgver=0.28.4 -pkgrel=0 -pkgdesc="Thread-based email index, search and tagging" -url="https://notmuchmail.org/" -arch="all" -license="GPL-3.0+" -depends="" -depends_dev="gmime-dev talloc-dev xapian-core-dev zlib-dev" -makedepends="$depends_dev doxygen emacs python3-dev ruby-dev" -checkdepends="bash dtach gnupg" -subpackages="$pkgname-dev $pkgname-doc $pkgname-emacs py3-$pkgname:_py ruby-$pkgname:_rb $pkgname-bash-completion:bashcomp:noarch $pkgname-zsh-completion:zshcomp:noarch" -source="https://notmuchmail.org/releases/notmuch-$pkgver.tar.gz - 0.28.2-disable-rpath.patch" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --without-bash-completion \ - --without-desktop \ - --without-rpath - make - - cd bindings/python - python3 setup.py build -} - -check() { - cd "$builddir" - # config, regexp-query: musl issues, TODO: Fixed in master - # atomicity, count, new, insert: gdb-based tests which fail randomly on some arches, with some CFLAGS, or during some moon phases - NOTMUCH_SKIP_TESTS="config regexp-query atomicity count new insert" make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -doc() { - default_doc - # TODO: We'd need sphinx to generate the man pages, but the raw *.rst's are still better than no docs at all. - mkdir -p "$subpkgdir/usr/share/doc/$pkgname" "$builddir/doc/man"* - cp -r "$builddir/doc/man"* "$subpkgdir/usr/share/doc/$pkgname/" -} - -emacs() { - mkdir -p "$subpkgdir/usr/bin" "$subpkgdir/usr/share" - mv "$pkgdir/usr/bin/notmuch-emacs-mua" "$subpkgdir/usr/bin" - mv "$pkgdir/usr/share/emacs" "$subpkgdir/usr/share" -} - -_py() { - pkgdesc="$pkgdesc (Python bindings)" - depends="$pkgname=$pkgver-r$pkgrel python3" - - cd "$builddir/bindings/python" - python3 setup.py install --prefix=/usr --root="$subpkgdir" -} - -_rb() { - pkgdesc="$pkgdesc (Ruby bindings)" - depends="$pkgname=$pkgver-r$pkgrel ruby" - - cd "$builddir/bindings/ruby" - make DESTDIR="$subpkgdir" install -} - - -bashcomp() { - pkgdesc="$pkgdesc (Bash completion)" - depends="" - install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - - install -Dt "$subpkgdir/usr/share/bash-completion" "$builddir/completion/notmuch-completion.bash" -} - -zshcomp() { - pkgdesc="$pkgdesc (Zsh completion)" - depends="" - install_if="$pkgname=$pkgver-r$pkgrel zsh" - - mkdir -p "$subpkgdir/usr/share" - mv "$pkgdir/usr/share/zsh" "$subpkgdir/usr/share" -} - -sha512sums="77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7 notmuch-0.28.4.tar.gz -b2991ee5edf927f04d904d99888dbce17a98e9d4d7d809bc2248f45d214025f4a1632b19e4fbca2b08e99721ec8a7eea82384c5c718206884801c7bfa5a8c540 0.28.2-disable-rpath.patch" diff --git a/user/npth/APKBUILD b/user/npth/APKBUILD index 7f73efd37..35cb7878d 100644 --- a/user/npth/APKBUILD +++ b/user/npth/APKBUILD @@ -6,11 +6,12 @@ pkgdesc="Portable threading library from GNU" url="https://www.gnupg.org/software/npth/index.html" arch="all" license="LGPL-2.1+" +depends="" +makedepends="" subpackages="$pkgname-dev" -source="ftp://ftp.gnupg.org/gcrypt/npth/npth-$pkgver.tar.bz2" +source="https://gnupg.org/ftp/gcrypt/npth/npth-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD index 0b2b96389..518fe3501 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=nsd -pkgver=4.2.2 -pkgrel=1 +pkgver=4.2.4 +pkgrel=0 pkgdesc="An authoritative only name server" url="https://www.nlnetlabs.nl/projects/nsd/about/" arch="all" @@ -23,8 +23,6 @@ source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz # - CVE-2019-13207 build() { - cd "$builddir" - # dnstap has yet unpackaged dependencies ./configure \ --build=$CBUILD \ @@ -44,7 +42,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -54,6 +51,6 @@ openrc() { install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" } -sha512sums="43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2 nsd-4.2.2.tar.gz +sha512sums="5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208 nsd-4.2.4.tar.gz f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd 139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/ntfs-3g/APKBUILD b/user/ntfs-3g/APKBUILD index aaa5be24b..e5afed691 100644 --- a/user/ntfs-3g/APKBUILD +++ b/user/ntfs-3g/APKBUILD @@ -11,10 +11,12 @@ url="https://www.tuxera.com/community/open-source-ntfs-3g/" arch="all" options="!check" # No test suite. license="LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0+ AND GPL-3.0+" +depends="" makedepends="attr-dev util-linux-dev linux-headers fuse-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://tuxera.com/opensource/$_pkgname-$pkgver.tgz - CVE-2019-9755.patch" + CVE-2019-9755.patch + " builddir="$srcdir/$_pkgname-$pkgver" # secfixes: @@ -22,7 +24,6 @@ builddir="$srcdir/$_pkgname-$pkgver" # - CVE-2019-9755 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,7 +37,6 @@ build() { } package() { - cd "$builddir" mkdir -p "$pkgdir"/lib make -j1 DESTDIR="$pkgdir" LDCONFIG=: install ln -s /bin/ntfs-3g "$pkgdir"/sbin/mount.ntfs diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD index f0ff082be..98aa4a16d 100644 --- a/user/numactl/APKBUILD +++ b/user/numactl/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Daniel Sabogal <dsabogalcc@gmail.com> -# Maintainer: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> pkgname=numactl pkgver=2.0.13 pkgrel=0 @@ -8,10 +8,12 @@ url="https://github.com/numactl/numactl" # ARM lacks the __NR_migrate_pages syscall arch="all !armhf !armv7" license="GPL-2.0+ AND LGPL-2.1" +depends="" makedepends="autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz - musl.patch" + musl.patch + " prepare() { default_prepare diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index c1da38c31..08ad8f475 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=obconf-qt pkgver=0.14.1 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" url="https://lxqt.org/" 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 @@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed obconf-qt-0.14.1.tar.xz" diff --git a/user/oclock/APKBUILD b/user/oclock/APKBUILD index d75964c02..58369a584 100644 --- a/user/oclock/APKBUILD +++ b/user/oclock/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/oclock-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD index 7a55d53cb..9e1f520d1 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.14 +pkgver=0.16 pkgrel=0 pkgdesc="High performance library for simulating rigid body dynamics" url="https://ode.org/" @@ -13,11 +13,10 @@ makedepends="autoconf automake libtool" subpackages="$pkgname-dev" source="https://bitbucket.org/odedevs/ode/downloads/ode-$pkgver.tar.gz fix-test-link.patch + stdint.patch " build() { - cd "$builddir" - ./bootstrap CXXFLAGS="$CXXFLAGS -fpermissive" ./configure \ --build=$CBUILD \ @@ -35,14 +34,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1f74c3c4687ee9665fa70e65a79100747fba577729830a90806e374115f1c161a2f4545cf591b0979054aa3e2f9a3673635668cb7362ab5c213ada0d39b1a03d ode-0.14.tar.gz -8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch" +sha512sums="302e6f689851acb9ba0db23e13ab59ae0acbbd8dbdfa7e277b57d870c0d3435274e64da16134fb4b7053f951489c138e485165d79664d11764a88b3437d703d3 ode-0.16.tar.gz +8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch +0d618cec0afdab86279687275bf476594897d1dfd7b5619fe6bc05343f22f6292c9598a73ff6f2967d5f39e071abcf282fc673c0ffe33f7efd9bbe56ca674dae stdint.patch" diff --git a/user/ode/stdint.patch b/user/ode/stdint.patch new file mode 100644 index 000000000..f3674335e --- /dev/null +++ b/user/ode/stdint.patch @@ -0,0 +1,44 @@ +--- ode-0.16/include/ode/odeconfig.h.old 2018-12-09 20:04:03.000000000 +0000 ++++ ode-0.16/include/ode/odeconfig.h 2020-01-12 08:36:16.664428956 +0000 +@@ -32,6 +32,7 @@ + #include <math.h> + #include <string.h> + #include <float.h> ++#include <stdint.h> + + + #include <ode/precision.h> +@@ -128,20 +129,20 @@ + typedef __int64 dint64; + typedef unsigned __int64 duint64; + #else +- typedef long long dint64; +- typedef unsigned long long duint64; ++ typedef int64_t dint64; ++ typedef uint64_t duint64; + #endif +- typedef int dint32; +- typedef unsigned int duint32; +- typedef short dint16; +- typedef unsigned short duint16; +- typedef signed char dint8; +- typedef unsigned char duint8; +- +- typedef dint32 dintptr; +- typedef duint32 duintptr; +- typedef dint32 ddiffint; +- typedef duint32 dsizeint; ++ typedef int32_t dint32; ++ typedef uint32_t duint32; ++ typedef int16_t dint16; ++ typedef uint16_t duint16; ++ typedef int8_t dint8; ++ typedef uint8_t duint8; ++ ++ typedef intptr_t dintptr; ++ typedef uintptr_t duintptr; ++ typedef ptrdiff_t ddiffint; ++ typedef size_t dsizeint; + + #endif + diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 8eb2a7167..d7fc84030 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.2 +pkgver=0.26.3 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246 okteta-0.26.2.tar.xz" +sha512sums="345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6 okteta-0.26.3.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 9ecf861e7..4e9567438 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.08.2 -pkgrel=0 +pkgver=19.12.3 +pkgrel=1 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -14,13 +14,17 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kio-dev kjs-dev kparts-dev kwallet-dev kwindowsystem-dev khtml-dev threadweaver-dev kactivities-dev poppler-qt5-dev tiff-dev qca-dev libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev - libspectre-dev ebook-tools-dev" + libspectre-dev ebook-tools-dev libzip-dev poppler-dev qt5-qtspeech-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz es-doc-fix.patch - pt-doc-fix.patch + CVE-2020-9359.patch " +# secfixes: +# 19.12.3-r1: +# - CVE-2020-9359 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -32,7 +36,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -45,6 +49,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fbf6285e65f45b2d49596169216ded2da26a73abec1d2279bc510db5df0bb6dbf9794e864de06837c5b7bf1db19de1774c38c18eb78c4b0c2d3ac49cb35bb9f7 okular-19.08.2.tar.xz -d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch -43daf92826a87b58fbafdaf282af4c2fddbf2a7d8c8c6491418ee962e4bccd6dcbbf8ff36b63f7b1ead181b957ba0f66e08e73c3e755397aafdbf99f3397da1e pt-doc-fix.patch" +sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz +de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch +02b27bd206006dbbafbe74e60665ad5159ef6ea32b8bf1526b9c655c046cb6de08630f28d64c9935e73d5707a30d0835f2ab8cd4521740e5236cefc3d3057d29 CVE-2020-9359.patch" diff --git a/user/okular/CVE-2020-9359.patch b/user/okular/CVE-2020-9359.patch new file mode 100644 index 000000000..34ff3e2ce --- /dev/null +++ b/user/okular/CVE-2020-9359.patch @@ -0,0 +1,27 @@ +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/okular/es-doc-fix.patch b/user/okular/es-doc-fix.patch index 05967d736..b064c8910 100644 --- a/user/okular/es-doc-fix.patch +++ b/user/okular/es-doc-fix.patch @@ -1,6 +1,6 @@ --- okular-19.04.1/po/es/docs/okular/index.docbook.old 2019-05-07 00:14:57.000000000 +0000 +++ okular-19.04.1/po/es/docs/okular/index.docbook 2019-05-12 03:14:04.511177243 +0000 -@@ -1090,7 +1090,7 @@ +@@ -1228,7 +1228,7 @@ <para >Para eliminar una anotación, pulse sobre ella con el &RMB; y seleccione <guimenuitem >Borrar</guimenuitem diff --git a/user/okular/pt-doc-fix.patch b/user/okular/pt-doc-fix.patch deleted file mode 100644 index a761139f6..000000000 --- a/user/okular/pt-doc-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- okular-19.08.0/po/pt_BR/docs/okular/index.docbook.old 2019-08-09 00:21:00.000000000 +0000 -+++ okular-19.08.0/po/pt_BR/docs/okular/index.docbook 2019-08-15 14:29:06.782714494 +0000 -@@ -1194,7 +1194,7 @@ - <para - >Para remover uma anotação, basta clicar com o &RMB; e selecionar <guimenuitem - >Excluir</guimenuitem -->ou selecione uma anotação usando o &LMB; e pressione a tecla ∇. </para> -+>ou selecione uma anotação usando o &LMB; e pressione a tecla Delete. </para> - <para - >Ao removê-la, a janela da anotação será fechada, caso esteja aberta. </para> - <note> diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD index 8c14250df..c4399f782 100644 --- a/user/oniguruma/APKBUILD +++ b/user/oniguruma/APKBUILD @@ -2,12 +2,14 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=oniguruma -pkgver=6.9.3 +pkgver=6.9.4 pkgrel=0 pkgdesc="A regular expression library" url="https://github.com/kkos/oniguruma" arch="all" license="BSD-2-Clause" +depends="" +makedepends="" subpackages="$pkgname-dev" source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz" builddir="$srcdir/onig-$pkgver" @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861 onig-6.9.3.tar.gz" +sha512sums="ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b onig-6.9.4.tar.gz" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index f65d278ca..7bdcc5597 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 +pkgver=6.5.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="f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571 skiboot-6.5.tar.gz +sha512sums="765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091 skiboot-6.5.2.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch 692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD index d5d32afe3..3f5f9c29d 100644 --- a/user/openal-soft/APKBUILD +++ b/user/openal-soft/APKBUILD @@ -6,6 +6,7 @@ pkgrel=0 pkgdesc="Software implementation of OpenAL API" url="https://kcat.strangesoft.net/openal.html" arch="all" +options="!check" # No test suite. license="LGPL-2.0+" depends="" depends_dev="alsa-lib-dev" @@ -13,14 +14,8 @@ makedepends="$depends_dev cmake linux-headers pulseaudio-dev" subpackages="$pkgname-dev" source="https://kcat.strangesoft.net/openal-releases/${pkgname}-${pkgver}.tar.bz2" -prepare() { - default_prepare - mkdir -p "$builddir"/build -} - build() { local _cpuext_neon="" - cd "$builddir"/build case "$CARCH" in armhf) _cpuext_neon="-DALSOFT_CPUEXT_NEON=OFF" ;; esac @@ -28,18 +23,12 @@ build() { -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_LIBDIR="lib" \ $_cpuext_neon \ - "$builddir" - make -} - -check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 openal-soft-1.19.1.tar.bz2" diff --git a/user/openbox/APKBUILD b/user/openbox/APKBUILD index a062a6d26..7f763fdb1 100644 --- a/user/openbox/APKBUILD +++ b/user/openbox/APKBUILD @@ -17,13 +17,11 @@ source="http://openbox.org/dist/openbox/openbox-$pkgver.tar.gz http://icculus.org/openbox/tools/setlayout.c" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install "$builddir"/setlayout "$pkgdir"/usr/bin/setlayout } diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD index a8a38c149..b8739c3be 100644 --- a/user/opencv/APKBUILD +++ b/user/opencv/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opencv -pkgver=4.1.1 -pkgrel=1 +pkgver=4.2.0 +pkgrel=0 pkgdesc="Computer vision and machine learning software library" url="https://opencv.org" arch="all" @@ -15,7 +15,6 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev subpackages="$pkgname-dev $pkgname-libs" source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz cmake-license.patch - CVE-2019-16249.patch " # secfixes: @@ -38,19 +37,20 @@ prepare() { } build() { + _sse="" if [ "$CARCH" != "x86_64" ]; then - local _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF" + _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF" fi if [ "$CARCH" = "ppc" ]; then - LDFLAGS="-latomic" + export LDFLAGS="$LDFLAGS -latomic" fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -U_FORTIFY_SOURCE" \ - -DCMAKE_C_FLAGS="$CFLAGS -U_FORTIFY_SOURCE" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DWITH_OPENMP=ON \ -DWITH_OPENCL=ON \ @@ -65,6 +65,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="80fa48d992ca06a2a4ab6740df6d8c21f4926165486b393969da2c5bbe2f3a0b799fb76dee5e3654e90c743e49bbd2b5b02ad59a4766896bbf4cd5b4e3251e0f opencv-4.1.1.tar.gz -ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch -39f2f9abb1051220d6b842e9337c3636ee229781c7efcc92e987dae47ac82072dc95568e6a766e01329ee61c0a3be4efdd82aa3b56c011b44e175444d81c134d CVE-2019-16249.patch" +sha512sums="2629d548384c81a786ab2620e089539b4b2f4ae5e1d837e5fe7f75ddadb909b65b65d0319226ae4726675f105ceb5adb88616ca6399c7660d3021ca4b9a06531 opencv-4.2.0.tar.gz +ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch" diff --git a/user/opencv/CVE-2019-16249.patch b/user/opencv/CVE-2019-16249.patch deleted file mode 100644 index a7f0027ac..000000000 --- a/user/opencv/CVE-2019-16249.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cd7fa04985b10db5e66de542725d0da57f0d10b6 Mon Sep 17 00:00:00 2001 -From: Vitaly Tuzov <terfendail@mediana.jetos.com> -Date: Tue, 17 Sep 2019 15:53:18 +0300 -Subject: [PATCH] Fixed out of bound reading in DIS optical flow evaluation - implementation - ---- - modules/video/src/dis_flow.cpp | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/modules/video/src/dis_flow.cpp b/modules/video/src/dis_flow.cpp -index 85400c71ca7..a260b8726bb 100644 ---- a/modules/video/src/dis_flow.cpp -+++ b/modules/video/src/dis_flow.cpp -@@ -494,7 +494,6 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp - v_float32x4 w10v = v_setall_f32(w10); \ - v_float32x4 w11v = v_setall_f32(w11); \ - \ -- v_uint8x16 I0_row_16, I1_row_16, I1_row_shifted_16, I1_row_next_16, I1_row_next_shifted_16; \ - v_uint16x8 I0_row_8, I1_row_8, I1_row_shifted_8, I1_row_next_8, I1_row_next_shifted_8, tmp; \ - v_uint32x4 I0_row_4_left, I1_row_4_left, I1_row_shifted_4_left, I1_row_next_4_left, I1_row_next_shifted_4_left; \ - v_uint32x4 I0_row_4_right, I1_row_4_right, I1_row_shifted_4_right, I1_row_next_4_right, \ -@@ -502,29 +501,22 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp - v_float32x4 I_diff_left, I_diff_right; \ - \ - /* Preload and expand the first row of I1: */ \ -- I1_row_16 = v_load(I1_ptr); \ -- I1_row_shifted_16 = v_extract<1>(I1_row_16, I1_row_16); \ -- v_expand(I1_row_16, I1_row_8, tmp); \ -- v_expand(I1_row_shifted_16, I1_row_shifted_8, tmp); \ -+ I1_row_8 = v_load_expand(I1_ptr); \ -+ I1_row_shifted_8 = v_load_expand(I1_ptr + 1); \ - v_expand(I1_row_8, I1_row_4_left, I1_row_4_right); \ - v_expand(I1_row_shifted_8, I1_row_shifted_4_left, I1_row_shifted_4_right); \ - I1_ptr += I1_stride; - - #define HAL_PROCESS_BILINEAR_8x8_PATCH_EXTRACTION \ - /* Load the next row of I1: */ \ -- I1_row_next_16 = v_load(I1_ptr); \ -- /* Circular shift left by 1 element: */ \ -- I1_row_next_shifted_16 = v_extract<1>(I1_row_next_16, I1_row_next_16); \ -- /* Expand to 8 ushorts (we only need the first 8 values): */ \ -- v_expand(I1_row_next_16, I1_row_next_8, tmp); \ -- v_expand(I1_row_next_shifted_16, I1_row_next_shifted_8, tmp); \ -+ I1_row_next_8 = v_load_expand(I1_ptr); \ -+ I1_row_next_shifted_8 = v_load_expand(I1_ptr + 1); \ - /* Separate the left and right halves: */ \ - v_expand(I1_row_next_8, I1_row_next_4_left, I1_row_next_4_right); \ - v_expand(I1_row_next_shifted_8, I1_row_next_shifted_4_left, I1_row_next_shifted_4_right); \ - \ - /* Load current row of I0: */ \ -- I0_row_16 = v_load(I0_ptr); \ -- v_expand(I0_row_16, I0_row_8, tmp); \ -+ I0_row_8 = v_load_expand(I0_ptr); \ - v_expand(I0_row_8, I0_row_4_left, I0_row_4_right); \ - \ - /* Compute diffs between I0 and bilinearly interpolated I1: */ \ diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index e3f0dbaaf..6393b9717 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -17,13 +17,10 @@ source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-sour builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make GIMP="" _V="" bundle_tar } package() { - cd "$builddir" - local _file for _file in *.grf opengfx.obg; do install -D -m644 -g games $_file \ "$pkgdir"/usr/share/games/openttd/data/$_file diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 4861c4f9b..4ad8f07a0 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -8,9 +8,9 @@ pkgrel=0 pkgdesc="Libre Java development kit for Java 8" url="https://icedtea.classpath.org/" arch="all" +options="sover-namecheck" license="GPL-2.0-only" depends="$pkgname-jre java-cacerts" -options="sover-namecheck" 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 @@ -102,17 +102,15 @@ unpack() { } prepare() { - cd "$builddir" - - local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" - local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" + 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 - local patch; for patch in $source; do + for patch in $source; do case $patch in icedtea-*.patch) cp ../$patch patches @@ -136,7 +134,7 @@ build() { fi DISTRIBUTION_PATCHES="" - local patch; for patch in $source; do + for patch in $source; do case $patch in icedtea-*.patch) DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch" @@ -146,7 +144,6 @@ build() { export DISTRIBUTION_PATCHES echo "icedtea patches: $DISTRIBUTION_PATCHES" - cd "$builddir" bash ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -183,8 +180,6 @@ check() { } package() { - cd "$builddir" - mkdir -p "$pkgdir"/$_java_home cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/ @@ -195,9 +190,6 @@ package() { # running `java -Xshare:dump`. rm -f "$pkgdir"/$_jrelib/server/classes.jsa - # pax mark again (due to fakeroot xattr handling bug) - ./pax-mark-vm "$pkgdir"/$_java_home true - # symlink to shared java cacerts store rm -f "$pkgdir"/$_java_home/jre/lib/security/cacerts ln -sf /etc/ssl/certs/java/cacerts \ @@ -208,7 +200,6 @@ jrelib() { pkgdesc="OpenJDK 8 Java Runtime (class libraries)" depends="" - local file dir for file in jre/lib/images \ jre/lib/*.jar \ jre/lib/security \ @@ -226,7 +217,6 @@ jrelib() { jre() { pkgdesc="OpenJDK 8 Java Runtime" - local file dir mkdir -p "$subpkgdir" for file in jre/bin/policytool \ @@ -242,9 +232,6 @@ jre() { mkdir -p "$subpkgdir"/$_java_home/$dir mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir done - - # Pax mark again (due to fakeroot xattr handling bug). - "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true } jrebase() { @@ -257,16 +244,13 @@ jrebase() { mv "$pkgdir"/$_java_home/lib/$_jarch/jli \ "$subpkgdir"/$_java_home/lib/$_jarch/ - local file; 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/ done # Rest of the jre subdir (which were not taken by -jre subpkg). mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/ - - # Pax mark again (due to fakeroot xattr handling bug). - "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true } doc() { diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index e454afa61..54f9811ea 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,28 +2,26 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" options="!check" # No test suite. license="BSD-2-Clause-NetBSD" +depends="" depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz - CVE-2019-12973.patch" - -build() { - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DOPENJPEG_INSTALL_LIB_DIR=lib \ - -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*} - make -} + CVE-2019-12973.patch + CVE-2020-6851.patch + CVE-2020-8112.patch + " # secfixes: +# 2.3.1-r3: +# - CVE-2020-6851 +# - CVE-2020-8112 # 2.3.1-r2: # - CVE-2019-12973 # 2.3.0-r0: @@ -40,6 +38,15 @@ build() { # - CVE-2016-9580 # - CVE-2016-9581 +build() { + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DOPENJPEG_INSTALL_LIB_DIR=lib \ + -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*} + make +} + package() { make DESTDIR="$pkgdir" install } @@ -51,4 +58,6 @@ tools() { } sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 openjpeg-2.3.1.tar.gz -472deba1d521553f9c7af805ba3d0c4fc31564fd36e37c598646f468b7d05bf5f81d2320fd6fadf8c0e3344ebce7bc0d04cece55a1b3cec2ef693a6e65bd2516 CVE-2019-12973.patch" +472deba1d521553f9c7af805ba3d0c4fc31564fd36e37c598646f468b7d05bf5f81d2320fd6fadf8c0e3344ebce7bc0d04cece55a1b3cec2ef693a6e65bd2516 CVE-2019-12973.patch +c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297 CVE-2020-6851.patch +9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc CVE-2020-8112.patch" diff --git a/user/openjpeg/CVE-2020-6851.patch b/user/openjpeg/CVE-2020-6851.patch new file mode 100644 index 000000000..9a70291f5 --- /dev/null +++ b/user/openjpeg/CVE-2020-6851.patch @@ -0,0 +1,29 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 14f6ff41a..922550eb1 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, + l_img_comp = p_image->comps; + for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { + OPJ_INT32 l_h, l_w; ++ if (p_image->x0 > (OPJ_UINT32)INT_MAX || ++ p_image->y0 > (OPJ_UINT32)INT_MAX || ++ p_image->x1 > (OPJ_UINT32)INT_MAX || ++ p_image->y1 > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(p_manager, EVT_ERROR, ++ "Image coordinates above INT_MAX are not supported\n"); ++ return OPJ_FALSE; ++ } + + l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, + (OPJ_INT32)l_img_comp->dx); diff --git a/user/openjpeg/CVE-2020-8112.patch b/user/openjpeg/CVE-2020-8112.patch new file mode 100644 index 000000000..95cb8095f --- /dev/null +++ b/user/openjpeg/CVE-2020-8112.patch @@ -0,0 +1,43 @@ +From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index deecc4dff..aa419030a 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ + l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; + l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; +- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; +- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, ++ (OPJ_INT32)l_pdx)) << l_pdx; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_x_end = (OPJ_INT32)tmp; ++ } ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, ++ (OPJ_INT32)l_pdy)) << l_pdy; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_y_end = (OPJ_INT32)tmp; ++ } + /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ + + l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 3f84e64c7..30f2059ff 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -1,5 +1,4 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> -# Contributor: Jakub Jirutka <jakub@jirutka.cz> # # secfixes: # 2.4.48-r0: @@ -12,23 +11,23 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.48 +pkgver=2.4.49 pkgrel=0 pkgdesc="LDAP Server" -url="http://www.openldap.org/" +url="https://www.openldap.org/" arch="all" options="!check" # Test suite takes > 2 hours to complete on each builder. -license="custom" +license="OLDAP-2.8" depends="" -pkgusers="ldap" -pkggroups="ldap" depends_dev="openssl-dev cyrus-sasl-dev util-linux-dev" -makedepends="$depends_dev db-dev groff unixodbc-dev libtool +makedepends="$depends_dev db-dev groff icu-dev unixodbc-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc $pkgname-clients $pkgname-passwd-pbkdf2:passwd_pbkdf2 $pkgname-backend-all:_backend_all:noarch $pkgname-overlay-all:_overlay_all:noarch" +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 openldap-2.4-ppolicy.patch @@ -60,7 +59,7 @@ do done prepare() { - cd "$builddir" + default_prepare update_config_sub sed -i '/^STRIP/s,-s,,g' build/top.mk @@ -68,8 +67,6 @@ prepare() { } build () { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -106,13 +103,10 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install # Install passwd pbkdf2. @@ -124,8 +118,8 @@ package() { rmdir var/lib/openldap/run # Fix tools symlinks to slapd. - local path; for path in $(find usr/sbin/ -type l); do - ln -sf slapd $path + for _path in $(find usr/sbin/ -type l); do + ln -sf slapd $_path done # Move executable from lib to sbin. @@ -149,7 +143,6 @@ package() { libldap() { pkgdesc="OpenLDAP libraries" depends="" - install="" _submv "usr/lib/*.so*" etc/openldap/ldap.conf } @@ -199,13 +192,13 @@ _overlay() { } _submv() { - local path; for path in "$@"; do + for path in "$@"; do mkdir -p "$subpkgdir"/${path%/*} mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/ done } -sha512sums="cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb openldap-2.4.48.tgz +sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 openldap-2.4.49.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD index e3afba25d..04782e944 100644 --- a/user/openmsx/APKBUILD +++ b/user/openmsx/APKBUILD @@ -18,13 +18,11 @@ source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source. builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make _V="" bundle } package() { cd "$builddir"/$pkgname-$pkgver - local _file for _file in *.mid openmsx.obm; do install -D -m644 -g games $_file \ "$pkgdir"/usr/share/games/openttd/gm/$_file diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD index 00093833d..130747b3b 100644 --- a/user/opensfx/APKBUILD +++ b/user/opensfx/APKBUILD @@ -14,20 +14,17 @@ source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source. builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make } check() { - cd "$builddir" make check } package() { - cd "$builddir" - install -D -m644 -g games opensfx.cat \ + install -D -m644 -g games "$builddir"/opensfx.cat \ "$pkgdir"/usr/share/games/openttd/data/opensfx.cat - install -D -m644 -g games opensfx.obs \ + install -D -m644 -g games "$builddir"/opensfx.obs \ "$pkgdir"/usr/share/games/openttd/data/opensfx.obs } diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD index 23fd01d01..76b5b5c68 100644 --- a/user/openvpn/APKBUILD +++ b/user/openvpn/APKBUILD @@ -2,15 +2,15 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=openvpn -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="https://openvpn.net/" arch="all" license="GPL-2.0-only WITH openvpn-openssl-exception" -subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc" depends="iproute2" makedepends="openssl-dev lzo-dev linux-pam-dev linux-headers" +subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc" install="$pkgname.pre-install" source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz openvpn.initd @@ -59,7 +59,7 @@ pam() { "$subpkgdir"/usr/lib/openvpn/plugins/ } -sha512sums="c96359ceffe7e47dd0881d4b37dfef45a9ef4450fcfcd9b95de70c73fb0b5756463f3e0dd3e4087643e00b0aeb72b99c5ce9c6f38edbbb491d0fd5a426f65972 openvpn-2.4.7.tar.gz +sha512sums="fd559b6fe2323624fce5511f142a005cf62b15cb6c98d29e1aac3785cede6aad53ae9ded46ae1757da79b17820263906d7f7fbc00ea159301c122dd8baabdfad openvpn-2.4.8.tar.gz 3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd 6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD index 90641b0e3..07a844c14 100644 --- a/user/oprofile/APKBUILD +++ b/user/oprofile/APKBUILD @@ -16,7 +16,6 @@ source="https://prdownloads.sourceforge.net/oprofile/oprofile-$pkgver.tar.gz " build() { - cd "$builddir" CXXFLAGS="$CXXFLAGS" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/optipng/APKBUILD b/user/optipng/APKBUILD index fcdef5b01..7ad5fbe5f 100644 --- a/user/optipng/APKBUILD +++ b/user/optipng/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/optipng/optipng-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ -prefix=/usr \ -mandir=/usr/share/man \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 7d6854a1b..5251ec8b0 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -7,13 +7,12 @@ pkgdesc="Codec designed for speech and audio transmission" url="http://www.opus-codec.org/" arch="all" license="BSD-3-Clause" +depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://archive.mozilla.org/pub/$pkgname/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" - CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" \ ./configure \ --build=$CBUILD \ @@ -28,13 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD index fa68d8249..c0208b12d 100644 --- a/user/opusfile/APKBUILD +++ b/user/opusfile/APKBUILD @@ -12,8 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD index c64f3c18b..9681a20ae 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=orage pkgver=4.12.1 pkgrel=2 @@ -7,6 +7,7 @@ pkgdesc="Calendaring software for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+ OR Artistic-2.0) AND MPL-1.0 AND BSD-2-Clause AND LGPL-2.0+" +depends="" makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" diff --git a/user/orbit2/APKBUILD b/user/orbit2/APKBUILD index 5b954c654..2d4f507fe 100644 --- a/user/orbit2/APKBUILD +++ b/user/orbit2/APKBUILD @@ -7,22 +7,19 @@ pkgdesc="CORBA implementation for GNOME" url="https://projects-old.gnome.org/ORBit2/" arch="all" license="LGPL-2.0-only" -depends= +depends="" makedepends="glib-dev libidl-dev" -install="" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2 glib-2.36.patch" builddir="$srcdir"/ORBit2-$pkgver prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/orc/APKBUILD b/user/orc/APKBUILD index fc760912f..74768e513 100644 --- a/user/orc/APKBUILD +++ b/user/orc/APKBUILD @@ -2,17 +2,16 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=orc -pkgver=0.4.30 +pkgver=0.4.31 pkgrel=0 pkgdesc="The Oil Run-time Compiler" url="https://gstreamer.freedesktop.org/modules/orc.html" arch="all" license="BSD-2-Clause AND BSD-3-Clause" +depends="" makedepends="linux-headers meson ninja" subpackages="$pkgname-dev $pkgname-compiler" -source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz - ppc-fixes.patch - " +source="https://gstreamer.freedesktop.org/src/orc/$pkgname-$pkgver.tar.xz" build() { meson -Dprefix=/usr \ @@ -40,5 +39,4 @@ compiler() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="da254347f5ebb278f0932a7bfa878adc2a14c42c7e6a20a4e6bb68c0883e307fef57bef867d54e150bd1d875f79eee27f9d34aede410d3eddd4093e5b055cd22 orc-0.4.30.tar.xz -b049e4ab9e2ee71013cc1f387dfc24df97c25fcf72dd3fd0502d891ee5e1e305dd710a639839ac64f6a58383b18d49ccffd32645dc64255b15945920acaf56d6 ppc-fixes.patch" +sha512sums="4e97597e70982dbfc239d1ef9a8913b0155e5aaac15d91162d7f73a1095bd944e27fbe6d6194b9f74af07b985a44b1d9dddbe917425e1ad9e8da17ce86495696 orc-0.4.31.tar.xz" diff --git a/user/orc/ppc-fixes.patch b/user/orc/ppc-fixes.patch deleted file mode 100644 index ab4aecd40..000000000 --- a/user/orc/ppc-fixes.patch +++ /dev/null @@ -1,990 +0,0 @@ -diff --git a/orc-test/orctest.c b/orc-test/orctest.c -index 614421b..d9cb9d5 100644 ---- a/orc-test/orctest.c -+++ b/orc-test/orctest.c -@@ -523,14 +523,14 @@ float_compare (OrcArray *array1, OrcArray *array2, int i, int j) - if (isnan(*(float *)ptr1) && isnan(*(float *)ptr2)) return TRUE; - if (*(float *)ptr1 == *(float *)ptr2) return TRUE; - if ((*(float *)ptr1 < 0.0) == (*(float *)ptr2 < 0.0) && -- abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2) <= 2)) -+ abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2)) <= 2) - return TRUE; - return FALSE; - case 8: - if (isnan(*(double *)ptr1) && isnan(*(double *)ptr2)) return TRUE; - if (*(double *)ptr1 == *(double *)ptr2) return TRUE; - if ((*(double *)ptr1 < 0.0) == (*(double *)ptr2 < 0.0) && -- llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2) <= 2)) -+ llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2)) <= 2) - return TRUE; - return FALSE; - } -diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c -index e054d07..ed98437 100644 ---- a/orc/orcpowerpc.c -+++ b/orc/orcpowerpc.c -@@ -208,7 +208,7 @@ powerpc_emit_srawi (OrcCompiler *compiler, int regd, int rega, int shift, - powerpc_get_regname(regd), - powerpc_get_regname(rega), shift); - -- insn = (31<<26) | (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); -+ insn = (31<<26) | (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); - insn |= (shift<<11) | (824<<1) | record; - - powerpc_emit (compiler, insn); -@@ -233,7 +233,7 @@ powerpc_emit_D (OrcCompiler *compiler, const char *name, - ORC_ASM_CODE(compiler," %s %s, %s, %d\n", name, - powerpc_get_regname(regd), - powerpc_get_regname(rega), imm); -- insn |= (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); -+ insn |= (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); - insn |= imm&0xffff; - - powerpc_emit (compiler, insn); -@@ -543,7 +543,7 @@ powerpc_load_constant (OrcCompiler *p, int i, int reg) - { - unsigned int insn; - -- ORC_ASM_CODE(p," addi %s, %s, %db - %s\n", -+ ORC_ASM_CODE(p," addi %s, %s, %df - %s\n", - powerpc_get_regname(greg), - powerpc_get_regname(greg), p->constants[i].label, p->program->name); - insn = (14<<26) | (powerpc_regnum (greg)<<21) | (powerpc_regnum (greg)<<16); -@@ -740,3 +740,42 @@ void powerpc_emit_label (OrcCompiler *compiler, int label) - powerpc_add_label (compiler, compiler->codeptr, label); - } - -+void -+powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) -+{ -+ if (IS_POWERPC_BE (compiler)) { -+ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", -+ powerpc_get_regname (vector_reg), -+ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -+ powerpc_get_regname (src_reg)); -+ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), -+ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -+ } else { -+ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", -+ powerpc_get_regname (vector_reg), -+ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -+ powerpc_get_regname (src_reg)); -+ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), -+ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -+ } -+} -+ -+void -+powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) -+{ -+ if (IS_POWERPC_BE (compiler)) { -+ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", -+ powerpc_get_regname (vector_reg), -+ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -+ powerpc_get_regname (src_reg)); -+ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), -+ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -+ } else { -+ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", -+ powerpc_get_regname (vector_reg), -+ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -+ powerpc_get_regname (src_reg)); -+ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), -+ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -+ } -+} -diff --git a/orc/orcpowerpc.h b/orc/orcpowerpc.h -index e6b315a..ba824b2 100644 ---- a/orc/orcpowerpc.h -+++ b/orc/orcpowerpc.h -@@ -138,6 +138,9 @@ void powerpc_emit_full_constants (OrcCompiler* p); - void powerpc_emit_load_address (OrcCompiler* compiler, int regd, int rega, int imm); - void powerpc_load_constant (OrcCompiler* p, int i, int reg); - -+void powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); -+void powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); -+ - /* instructions */ - #define powerpc_emit_vand(p,a,b,c) powerpc_emit_VX_2 (p, "vand", 0x10000404, a, b, c) - #define powerpc_emit_vandc(p,a,b,c) powerpc_emit_VX_2 (p, "vandc", 0x10000444, a, b, c) -@@ -159,8 +162,10 @@ void powerpc_load_constant (OrcCompiler* p, int i, int reg); - - #define powerpc_emit_vmrghb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghb", 0x1000000c, a, b, c) - #define powerpc_emit_vmrghh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghh", 0x1000004c, a, b, c) -+#define powerpc_emit_vmrghw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghw", 0x1000008c, a, b, c) - #define powerpc_emit_vmrglb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglb", 0x1000010c, a, b, c) - #define powerpc_emit_vmrglh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglh", 0x1000014c, a, b, c) -+#define powerpc_emit_vmrglw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglw", 0x1000018c, a, b, c) - - #define powerpc_emit_vpkshss(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshss", 0x1000018e, a, b, c) - #define powerpc_emit_vpkshus(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshus", 0x1000010e, a, b, c) -diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c -index 659115e..808b4e1 100644 ---- a/orc/orcprogram-altivec.c -+++ b/orc/orcprogram-altivec.c -@@ -18,6 +18,8 @@ static void orc_compiler_powerpc_init (OrcCompiler *compiler); - static unsigned int orc_compiler_powerpc_get_default_flags (void); - static void orc_compiler_powerpc_assemble (OrcCompiler *compiler); - static const char* powerpc_get_flag_name (int shift); -+static int orc_powerpc_assemble_copy_check (OrcCompiler *compiler); -+static void orc_powerpc_assemble_copy (OrcCompiler *compiler); - - - static void -@@ -199,8 +201,8 @@ powerpc_load_constants_outer (OrcCompiler *compiler) - } - } - -- orc_compiler_emit_invariants (compiler); -- -+ /* Load constants first, as they may be used by invariants */ -+ ORC_ASM_CODE(compiler,"# load constants\n"); - for(i=0;i<compiler->n_constants;i++) { - if (compiler->constants[i].is_long && - !compiler->constants[i].alloc_reg) { -@@ -212,6 +214,9 @@ powerpc_load_constants_outer (OrcCompiler *compiler) - } - } - } -+ -+ ORC_ASM_CODE(compiler,"# load invariants\n"); -+ orc_compiler_emit_invariants (compiler); - } - - static void -@@ -219,6 +224,7 @@ powerpc_load_inner_constants (OrcCompiler *compiler) - { - int i; - -+ ORC_ASM_CODE(compiler,"# load inner constants\n"); - for(i=0;i<ORC_N_COMPILER_VARIABLES;i++){ - if (compiler->vars[i].name == NULL) continue; - switch (compiler->vars[i].vartype) { -@@ -305,6 +311,11 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) - int label_leave; - int set_vscr = FALSE; - -+ if (orc_powerpc_assemble_copy_check (compiler)) { -+ orc_powerpc_assemble_copy (compiler); -+ return; -+ } -+ - label_outer_loop_start = orc_compiler_label_new (compiler); - label_loop_start = orc_compiler_label_new (compiler); - label_leave = orc_compiler_label_new (compiler); -@@ -312,6 +323,8 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) - { - int i; - -+ /* Emit invariants also to check for constants */ -+ orc_compiler_emit_invariants (compiler); - orc_powerpc_emit_loop (compiler, 0); - - compiler->codeptr = compiler->code; -@@ -486,3 +499,199 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) - powerpc_do_fixups (compiler); - } - -+static -+int orc_powerpc_assemble_copy_check (OrcCompiler *compiler) -+{ -+ if (compiler->program->n_insns == 1 && -+ compiler->program->is_2d == FALSE && -+ (strcmp (compiler->program->insns[0].opcode->name, "copyb") == 0 || -+ strcmp (compiler->program->insns[0].opcode->name, "copyw") == 0 || -+ strcmp (compiler->program->insns[0].opcode->name, "copyl") == 0 || -+ strcmp (compiler->program->insns[0].opcode->name, "copyq") == 0) && -+ (compiler->program->insns[0].flags & -+ (ORC_INSTRUCTION_FLAG_X2 | ORC_INSTRUCTION_FLAG_X4)) == 0 && -+ compiler->program->n_param_vars == 0 && -+ compiler->program->n_const_vars == 0) { -+ /* TODO: add param & const support if this turns out to be faster */ -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static -+void orc_powerpc_assemply_copy_loop (OrcCompiler *compiler, int size, -+ int shift, int next_label) -+{ -+ const int src = POWERPC_R5; -+ const int dst = POWERPC_R6; -+ const int count = POWERPC_R7; -+ const int tmp = POWERPC_R0; -+ const int vtmp = POWERPC_V0; -+ const int vperm = POWERPC_V1; -+ int label_copy; -+ -+ label_copy = orc_compiler_label_new (compiler); -+ -+ ORC_ASM_CODE(compiler," cmplwi %s, %d\n", -+ powerpc_get_regname(count), size); -+ powerpc_emit(compiler, 0x28000000|(powerpc_regnum(count)<<16)|(size&0xffff)); -+ -+ ORC_ASM_CODE(compiler," blt %d%c\n", next_label, -+ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); -+ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); -+ powerpc_emit (compiler, 0x41800000); -+ -+ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, src, size-1); -+ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, -+ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); -+ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); -+ powerpc_emit (compiler, 0x41810000); -+ -+ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, dst, size-1); -+ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, -+ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); -+ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); -+ powerpc_emit (compiler, 0x41810000); -+ -+ powerpc_emit_srawi (compiler, tmp, count, shift, 0); -+ -+ ORC_ASM_CODE (compiler, " mtctr %s\n", powerpc_get_regname(tmp)); -+ powerpc_emit (compiler, 0x7c0903a6 | (powerpc_regnum (tmp)<<21)); -+ -+ powerpc_emit_label (compiler, label_copy); -+ if (size == 16) { -+ ORC_ASM_CODE(compiler," lvx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (src)); -+ powerpc_emit_X (compiler, 0x7c0000ce, powerpc_regnum(vtmp), -+ 0, powerpc_regnum(src)); -+ ORC_ASM_CODE(compiler," stvx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (dst)); -+ powerpc_emit_X (compiler, 0x7c0001ce, -+ powerpc_regnum(vtmp), -+ 0, powerpc_regnum(dst)); -+ } else { -+ switch (size) { -+ case 1: -+ ORC_ASM_CODE(compiler," lvebx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (src)); -+ powerpc_emit_X (compiler, 0x7c00000e, powerpc_regnum(vtmp), -+ 0, powerpc_regnum(src)); -+ break; -+ case 2: -+ ORC_ASM_CODE(compiler," lvehx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (src)); -+ powerpc_emit_X (compiler, 0x7c00004e, powerpc_regnum(vtmp), -+ 0, powerpc_regnum(src)); -+ break; -+ case 4: -+ ORC_ASM_CODE(compiler," lvewx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (src)); -+ powerpc_emit_X (compiler, 0x7c00008e, powerpc_regnum(vtmp), -+ 0, powerpc_regnum(src)); -+ break; -+ } -+ powerpc_load_align (compiler, vperm, 0, src); -+ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); -+ powerpc_store_align (compiler, vperm, 0, dst); -+ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); -+ switch (size) { -+ case 1: -+ ORC_ASM_CODE(compiler," stvebx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (dst)); -+ powerpc_emit_X (compiler, 0x7c00010e, -+ powerpc_regnum(vtmp), -+ 0, powerpc_regnum(dst)); -+ break; -+ case 2: -+ ORC_ASM_CODE(compiler," stvehx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (dst)); -+ powerpc_emit_X (compiler, 0x7c00014e, -+ powerpc_regnum(vtmp), -+ 0, powerpc_regnum(dst)); -+ break; -+ case 4: -+ ORC_ASM_CODE(compiler," stvewx %s, 0, %s\n", -+ powerpc_get_regname (vtmp), -+ powerpc_get_regname (dst)); -+ powerpc_emit_X (compiler, 0x7c00018e, -+ powerpc_regnum(vtmp), -+ 0, powerpc_regnum(dst)); -+ break; -+ } -+ } -+ -+ powerpc_emit_addi (compiler, src, src, size); -+ powerpc_emit_addi (compiler, dst, dst, size); -+ powerpc_emit_addi (compiler, count, count, -size); -+ powerpc_emit_bne (compiler, label_copy); -+ -+ powerpc_emit_label (compiler, next_label); -+} -+ -+static -+void orc_powerpc_assemble_copy (OrcCompiler *compiler) -+{ -+ const int src = POWERPC_R5; -+ const int dst = POWERPC_R6; -+ const int count = POWERPC_V7; -+ OrcInstruction *insn; -+ int shift = 0; -+ int label_word; -+ int label_halfword; -+ int label_byte; -+ int label_done; -+ -+ insn = compiler->program->insns + 0; -+ -+ if (strcmp (insn->opcode->name, "copyw") == 0) { -+ shift = 1; -+ } else if (strcmp (insn->opcode->name, "copyl") == 0) { -+ shift = 2; -+ } else if (strcmp (insn->opcode->name, "copyq") == 0) { -+ shift = 3; -+ } -+ -+ label_word = orc_compiler_label_new (compiler); -+ label_halfword = orc_compiler_label_new (compiler); -+ label_byte = orc_compiler_label_new (compiler); -+ label_done = orc_compiler_label_new (compiler); -+ -+ powerpc_emit_prologue (compiler); -+ -+ powerpc_emit_load_address (compiler, -+ dst, -+ POWERPC_R3, -+ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->dest_args[0]])); -+ powerpc_emit_load_address (compiler, -+ src, -+ POWERPC_R3, -+ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->src_args[0]])); -+ powerpc_emit_lwz (compiler, count, POWERPC_R3, -+ (int)ORC_STRUCT_OFFSET(OrcExecutor, n)); -+ -+ powerpc_emit_addi (compiler, POWERPC_R0, 0, shift); -+ ORC_ASM_CODE(compiler, " slw %s, %s, %s\n", -+ powerpc_get_regname(count), -+ powerpc_get_regname(count), -+ powerpc_get_regname(POWERPC_R0)); -+ powerpc_emit (compiler, (31<<26) | -+ (powerpc_regnum (count)<<21) | -+ (powerpc_regnum (count)<<16) | -+ (powerpc_regnum (POWERPC_R0)<<11) | (24<<1)); -+ -+ orc_powerpc_assemply_copy_loop (compiler, 16, 4, label_word); -+ orc_powerpc_assemply_copy_loop (compiler, 4, 2, label_halfword); -+ orc_powerpc_assemply_copy_loop (compiler, 2, 1, label_byte); -+ orc_powerpc_assemply_copy_loop (compiler, 1, 0, label_done); -+ -+ powerpc_emit_epilogue (compiler); -+ powerpc_do_fixups (compiler); -+} -diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c -index fa40ac3..7729b69 100644 ---- a/orc/orcrules-altivec.c -+++ b/orc/orcrules-altivec.c -@@ -15,26 +15,6 @@ - - /* rules */ - --static void --powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) --{ -- if (IS_POWERPC_BE (compiler)) { -- ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", -- powerpc_get_regname (vector_reg), -- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -- powerpc_get_regname (src_reg)); -- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), -- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -- } else { -- ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", -- powerpc_get_regname (vector_reg), -- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), -- powerpc_get_regname (src_reg)); -- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), -- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); -- } --} -- - static inline int - powerpc_select_value (OrcCompiler *compiler, int be_value, int le_value) - { -@@ -322,19 +302,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) - int perm = orc_compiler_get_temp_reg (compiler); - int tmp = orc_compiler_get_temp_reg (compiler); - -- if (IS_POWERPC_BE (compiler)) { -- ORC_ASM_CODE(compiler," lvsr %s, 0, %s\n", -- powerpc_get_regname (perm), -- powerpc_get_regname (dest->ptr_register)); -- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(perm), -- 0, powerpc_regnum(dest->ptr_register)); -- } else { -- ORC_ASM_CODE(compiler," lvsl %s, 0, %s\n", -- powerpc_get_regname (perm), -- powerpc_get_regname (dest->ptr_register)); -- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(perm), -- 0, powerpc_regnum(dest->ptr_register)); -- } -+ powerpc_store_align (compiler, perm, 0, dest->ptr_register); - powerpc_emit_vperm (compiler, tmp, src->alloc, src->alloc, perm); - - switch (size) { -@@ -370,8 +338,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) - powerpc_regnum(tmp), - 0, powerpc_regnum(dest->ptr_register)); - -- powerpc_emit_D (compiler, "addi", 0x38000000, compiler->gp_tmpreg, -- 0, 4); -+ powerpc_emit_addi (compiler, compiler->gp_tmpreg, 0, 4); - - ORC_ASM_CODE(compiler," stvewx %s, %s, %s\n", - powerpc_get_regname (tmp), -@@ -397,6 +364,48 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) - } - } - -+static void -+powerpc_denormalize_sp_full(OrcCompiler *p, int reg, int zero, int mask) -+{ -+ int tmp = p->tmpreg; -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); -+ powerpc_emit_VX_2(p, "vcmpequw", 0x10000086, tmp, tmp, zero); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); -+ powerpc_emit_VX_2(p, "xvcpsgnsp", 0xf0000687, reg, reg, tmp); -+} -+ -+static void -+powerpc_denormalize_sp_zero(OrcCompiler *p, int reg, int zero) -+{ -+ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x7f800000, -+ 0x7f800000, 0x7f800000); -+ powerpc_denormalize_sp_full(p, reg, zero, mask); -+} -+ -+static void -+powerpc_denormalize_sp(OrcCompiler *p, int reg) -+{ -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_sp_zero(p, reg, zero); -+} -+ -+static void -+powerpc_denormalize_dp_full(OrcCompiler *p, int reg, int zero, int mask) -+{ -+ int tmp = p->tmpreg; -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); -+ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, reg, reg, tmp); -+} -+ -+static void -+powerpc_denormalize_dp_zero(OrcCompiler *p, int reg, int zero) -+{ -+ int mask = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, -+ 0x7ff00000, 0x00000000); -+ powerpc_denormalize_dp_full(p, reg, zero, mask); -+} - - - #define RULE(name, opcode, code) \ -@@ -409,6 +418,33 @@ powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ - powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2);\ - } - -+#define RULE_DP(name, opcode, code) \ -+static void \ -+powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ -+{ \ -+ int src1 = ORC_SRC_ARG (p, insn, 0); \ -+ int src2 = ORC_SRC_ARG (p, insn, 1); \ -+ int dest = ORC_DEST_ARG (p, insn, 0); \ -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ -+ powerpc_denormalize_dp_zero (p, src1, zero); \ -+ powerpc_denormalize_dp_zero (p, src2, zero); \ -+ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ -+ powerpc_denormalize_dp_zero (p, dest, zero); \ -+} -+ -+#define RULE_DP_SRC(name, opcode, code) \ -+static void \ -+powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ -+{ \ -+ int src1 = ORC_SRC_ARG (p, insn, 0); \ -+ int src2 = ORC_SRC_ARG (p, insn, 1); \ -+ int dest = ORC_DEST_ARG (p, insn, 0); \ -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ -+ powerpc_denormalize_dp_zero (p, src1, zero); \ -+ powerpc_denormalize_dp_zero (p, src2, zero); \ -+ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ -+} -+ - #define RULE_SHIFT(name, opcode, code) \ - static void \ - powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ -@@ -503,13 +539,11 @@ RULE(maxf, "vmaxfp", 0x1000040a) - RULE(minf, "vminfp", 0x1000044a) - RULE(cmpeqf, "vcmpeqfp", 0x100000c6) - --RULE(addd, "xvadddp", 0xf0000307) --RULE(subd, "xvsubdp", 0xf0000347) --RULE(muld, "xvmuldp", 0xf0000387) --RULE(divd, "xvdivdp", 0xf00003c7) --RULE(mind, "xvmindp", 0xf0000747) --RULE(maxd, "xvmaxdp", 0xf0000707) --RULE(cmpeqd, "xvcmpeqdp", 0xf000031f) -+RULE_DP(addd, "xvadddp", 0xf0000307) -+RULE_DP(subd, "xvsubdp", 0xf0000347) -+RULE_DP(muld, "xvmuldp", 0xf0000387) -+RULE_DP(divd, "xvdivdp", 0xf00003c7) -+RULE_DP_SRC(cmpeqd, "xvcmpeqdp", 0xf000031f) - - RULE(addq, "vaddudm", 0x100000c0) - RULE(subq, "vsubudm", 0x100004c0) -@@ -541,13 +575,12 @@ powerpc_rule_mullb (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int perm = powerpc_get_constant_full(p, 0x11011303, 0x15051707, -+ 0x19091b0b, 0x1d0d1f0f); - -- if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmulesb (p, dest, src1, src2); -- powerpc_emit_vsldoi (p, dest, dest, dest, 1); -- } else { -- powerpc_emit_vmulosb (p, dest, src1, src2); -- } -+ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulosb (p, dest, src1, src2); -+ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); - } - - static void -@@ -556,15 +589,12 @@ powerpc_rule_mulhsb (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, -+ 0x18081a0a, 0x1c0c1e0e); - -- if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmulesb (p, dest, src1, src2); -- } else { -- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); -- -- powerpc_emit_vmulosb (p, dest, src1, src2); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, src1, tmp); -- } -+ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulosb (p, dest, src1, src2); -+ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); - } - - static void -@@ -573,15 +603,12 @@ powerpc_rule_mulhub (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, -+ 0x18081a0a, 0x1c0c1e0e); - -- if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmuleub (p, dest, src1, src2); -- } else { -- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); -- -- powerpc_emit_vmuloub (p, dest, src1, src2); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -- } -+ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmuloub (p, dest, src1, src2); -+ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); - } - - static void -@@ -590,16 +617,12 @@ powerpc_rule_mulhsw (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, -+ 0x18190809, 0x1c1d0c0d); - -- if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmulesh (p, dest, src1, src2); -- } else { -- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); -- -- powerpc_emit_vmulosh (p, dest, src1, src2); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -- } -+ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulosh (p, dest, src1, src2); -+ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); - } - - static void -@@ -608,16 +631,12 @@ powerpc_rule_mulhuw (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, -+ 0x18190809, 0x1c1d0c0d); - -- if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmuleuh (p, dest, src1, src2); -- } else { -- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); -- -- powerpc_emit_vmulouh (p, dest, src1, src2); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -- } -+ powerpc_emit_vmuleuh(p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulouh(p, dest, src1, src2); -+ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); - } - - static void -@@ -765,10 +784,12 @@ powerpc_rule_mulsbw (OrcCompiler *p, void *user, OrcInstruction *insn) - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); - -+ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulosb (p, dest, src1, src2); - if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmulesb (p, dest, src1, src2); -+ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); - } else { -- powerpc_emit_vmulosb (p, dest, src1, src2); -+ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); - } - } - -@@ -779,10 +800,12 @@ powerpc_rule_mulubw (OrcCompiler *p, void *user, OrcInstruction *insn) - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); - -+ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmuloub (p, dest, src1, src2); - if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmuleub (p, dest, src1, src2); -+ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); - } else { -- powerpc_emit_vmuloub (p, dest, src1, src2); -+ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); - } - } - -@@ -793,10 +816,12 @@ powerpc_rule_mulswl (OrcCompiler *p, void *user, OrcInstruction *insn) - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); - -+ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulosh (p, dest, src1, src2); - if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmulesh (p, dest, src1, src2); -+ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); - } else { -- powerpc_emit_vmulosh (p, dest, src1, src2); -+ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); - } - } - -@@ -807,10 +832,12 @@ powerpc_rule_muluwl (OrcCompiler *p, void *user, OrcInstruction *insn) - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); - -+ powerpc_emit_vmuleuh (p, p->tmpreg, src1, src2); -+ powerpc_emit_vmulouh (p, dest, src1, src2); - if (IS_POWERPC_BE (p)) { -- powerpc_emit_vmuleuh (p, dest, src1, src2); -+ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); - } else { -- powerpc_emit_vmulouh (p, dest, src1, src2); -+ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); - } - } - -@@ -848,17 +875,13 @@ powerpc_rule_mulll (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int tmp = orc_compiler_get_temp_reg(p); -+ int perm = powerpc_get_constant_full(p, 0x14151617, 0x04050607, -+ 0x1c1d1e1f, 0x0c0d0e0f); - -- if (IS_POWERPC_BE (p)) { -- int perm; -- -- powerpc_emit_vmuleuw (p, dest, src1, src2); -- perm = powerpc_get_constant_full (p, 0x04050607, 0x04050607, -- 0x0c0d0e0f, 0x0c0d0e0f); -- powerpc_emit_vperm (p, dest, dest, dest, perm); -- } else { -- powerpc_emit_vmulouw (p, dest, src1, src2); -- } -+ powerpc_emit_vmulouw (p, tmp, src1, src2); -+ powerpc_emit_vmuleuw (p, dest, src1, src2); -+ powerpc_emit_vperm (p, dest, tmp, dest, perm); - } - - static void -@@ -1428,20 +1451,11 @@ powerpc_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -- int y = orc_compiler_get_temp_reg (p); -- int t = orc_compiler_get_temp_reg (p); -- int c1; -- int c0; -- -- c1 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x3f800000); /* 1.0 */ -- -- powerpc_emit_VX_db (p, "vrefp", 0x1000010a, y, src2); -- -- powerpc_emit_VA_acb (p, "vnmsubfp", 0x1000002f, t, y, c1, src2); -- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, y, y, y, t); -- -- c0 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x00000000); /* 0.0 */ -- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, dest, y, c0, src1); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_sp_zero (p, src1, zero); -+ powerpc_denormalize_sp_zero (p, src2, zero); -+ powerpc_emit_VX_2(p, "xvdivsp", 0xf00002c7, dest, src1, src2); -+ powerpc_denormalize_sp_zero (p, dest, zero); - } - - static void -@@ -1521,8 +1535,10 @@ powerpc_rule_sqrtf(OrcCompiler* p, void* user, OrcInstruction* insn) - { - int src1 = ORC_SRC_ARG(p, insn, 0); - int dest = ORC_DEST_ARG(p, insn, 0); -- -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_sp_zero (p, src1, zero); - powerpc_emit_VX_db(p, "xvsqrtsp", 0xf000022f, dest, src1); -+ powerpc_denormalize_sp_zero (p, dest, zero); - } - - static void -@@ -1530,18 +1546,65 @@ powerpc_rule_sqrtd(OrcCompiler* p, void* user, OrcInstruction* insn) - { - int src1 = ORC_SRC_ARG(p, insn, 0); - int dest = ORC_DEST_ARG(p, insn, 0); -- -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_dp_zero (p, src1, zero); - powerpc_emit_VX_db(p, "xvsqrtdp", 0xf000032f, dest, src1); -+ powerpc_denormalize_dp_zero (p, dest, zero); - } - - static void --powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) -+powerpc_rule_mind (OrcCompiler *p, void *user, OrcInstruction *insn) - { - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, -+ 0x7ff80000, 0x00000000); -+ int tmp2 = orc_compiler_get_temp_reg(p); -+ int tmp = p->tmpreg; -+ powerpc_denormalize_dp_zero (p, src1, zero); -+ powerpc_denormalize_dp_zero (p, src2, zero); -+ powerpc_emit_VX_2(p, "xvmindp", 0xf0000747, tmp2, src2, src1); -+ // Handle QNaN -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp2, src1, tmp); -+} - --// powerpc_emit_VXR (p, "vcmpgtfp", 0x100002c6, dest, src2, src1, FALSE); -+static void -+powerpc_rule_maxd (OrcCompiler *p, void *user, OrcInstruction *insn) -+{ -+ int src1 = ORC_SRC_ARG (p, insn, 0); -+ int src2 = ORC_SRC_ARG (p, insn, 1); -+ int dest = ORC_DEST_ARG (p, insn, 0); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, -+ 0x7ff80000, 0x00000000); -+ int tmp2 = orc_compiler_get_temp_reg(p); -+ int tmp3 = orc_compiler_get_temp_reg(p); -+ int tmp = p->tmpreg; -+ powerpc_denormalize_dp_zero (p, src1, zero); -+ powerpc_denormalize_dp_zero (p, src2, zero); -+ powerpc_emit_VX_2(p, "xvmaxdp", 0xf0000707, tmp2, src2, src1); -+ // Handle QNaN -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src2, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp3, tmp2, src2, tmp); -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp3, src1, tmp); -+} -+ -+static void -+powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) -+{ -+ int src1 = ORC_SRC_ARG (p, insn, 0); -+ int src2 = ORC_SRC_ARG (p, insn, 1); -+ int dest = ORC_DEST_ARG (p, insn, 0); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_dp_zero (p, src1, zero); -+ powerpc_denormalize_dp_zero (p, src2, zero); - powerpc_emit_VX_2(p, "xvcmpgtdp", 0xf000035f, dest, src2, src1); - } - -@@ -1551,8 +1614,9 @@ powerpc_rule_cmpled (OrcCompiler *p, void *user, OrcInstruction *insn) - int src1 = ORC_SRC_ARG (p, insn, 0); - int src2 = ORC_SRC_ARG (p, insn, 1); - int dest = ORC_DEST_ARG (p, insn, 0); -- --// powerpc_emit_VXR (p, "vcmpgefp", 0x100001c6, dest, src2, src1, FALSE); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ powerpc_denormalize_dp_zero (p, src1, zero); -+ powerpc_denormalize_dp_zero (p, src2, zero); - powerpc_emit_VX_2(p, "xvcmpgedp", 0xf000039f, dest, src2, src1); - } - -@@ -1561,11 +1625,13 @@ powerpc_rule_convld (OrcCompiler *p, void *user, OrcInstruction *insn) - { - int src1 = ORC_SRC_ARG (p, insn, 0); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); - - if (IS_POWERPC_LE (p)) { - powerpc_emit_vsldoi(p, src1, src1, src1, 4); - } - powerpc_emit_VX_db (p, "xvcvsxddp", 0xf00003e3, dest, src1); -+ powerpc_denormalize_dp_zero (p, dest, zero); - } - - static void -@@ -1573,8 +1639,19 @@ powerpc_rule_convdl (OrcCompiler *p, void *user, OrcInstruction *insn) - { - int src1 = ORC_SRC_ARG (p, insn, 0); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int mask = powerpc_get_constant_full (p, 0xfff00000, 0x00000000, -+ 0xfff00000, 0x00000000); -+ int nan = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, -+ 0x7ff00000, 0x00000000); -+ int maxint = powerpc_get_constant_full (p, 0x7fffffff, 0x7fffffff, -+ 0x7fffffff, 0x7fffffff); -+ int tmp = p->tmpreg; - -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, nan); - powerpc_emit_VX_db (p, "xvcvdpsxws", 0xf0000363, dest, src1); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, dest, maxint, tmp); -+ - if (IS_POWERPC_LE (p)) { - int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); - powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); -@@ -1586,11 +1663,23 @@ powerpc_rule_convfd (OrcCompiler *p, void *user, OrcInstruction *insn) - { - int src1 = ORC_SRC_ARG (p, insn, 0); - int dest = ORC_DEST_ARG (p, insn, 0); -+ int tmp2 = orc_compiler_get_temp_reg(p); -+ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); -+ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x00000000, -+ 0x7f800000, 0x00000000); -+ int tmp = p->tmpreg; - - if (IS_POWERPC_LE (p)) { -- powerpc_emit_vsldoi(p, src1, src1, src1, 4); -+ powerpc_emit_vsldoi(p, tmp2, src1, src1, 4); -+ } else { -+ powerpc_emit_vor(p, tmp2, src1, src1); - } -- powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, src1); -+ powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, tmp2); -+ -+ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, tmp2, mask); -+ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); -+ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, dest, zero, tmp); -+ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, dest, dest, tmp); - } - - static void -@@ -1604,6 +1693,7 @@ powerpc_rule_convdf (OrcCompiler *p, void *user, OrcInstruction *insn) - int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); - powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); - } -+ powerpc_denormalize_sp(p, dest); - } - - -@@ -1757,7 +1847,6 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) - REG(cmplef); - REG(cmpltf); - REG(mulf); -- REG(divf); - REG(convfl); - REG(convlf); - -@@ -1789,6 +1878,7 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) - - rule_set = orc_rule_set_new(orc_opcode_set_get("sys"), target, ORC_TARGET_POWERPC_VSX); - -+ REG(divf); - REG(sqrtf); - REG(addd); - REG(subd); -diff --git a/orc/orctarget.h b/orc/orctarget.h -index 642bfe3..53000b3 100644 ---- a/orc/orctarget.h -+++ b/orc/orctarget.h -@@ -19,7 +19,7 @@ enum { - ORC_TARGET_FAST_DENORMAL = (1<<31) - }; - --enum { -+typedef enum { - ORC_TARGET_POWERPC_64BIT = (1<<0), - ORC_TARGET_POWERPC_LE = (1<<1), - ORC_TARGET_POWERPC_ALTIVEC = (1<<2), -diff --git a/testsuite/exec_parse.c b/testsuite/exec_parse.c -index 0858413..859ad4e 100644 ---- a/testsuite/exec_parse.c -+++ b/testsuite/exec_parse.c -@@ -20,6 +20,7 @@ main (int argc, char *argv[]) - char *code; - int n; - int i; -+ int ret; - OrcProgram **programs; - const char *filename = NULL; - -@@ -45,7 +46,11 @@ main (int argc, char *argv[]) - - for(i=0;i<n;i++){ - if (verbose) printf("%s\n", programs[i]->name); -- orc_test_compare_output_full (programs[i], 0); -+ ret = orc_test_compare_output_full (programs[i], 0); -+ if (!ret) { -+ printf("failed %s\n", programs[i]->name); -+ error = TRUE; -+ } - orc_program_free (programs[i]); - } - -diff --git a/testsuite/memcpy_speed.c b/testsuite/memcpy_speed.c -index a1a69f1..4cf1c39 100644 ---- a/testsuite/memcpy_speed.c -+++ b/testsuite/memcpy_speed.c -@@ -102,7 +102,7 @@ main(int argc, char *argv[]) - max = 140; - } - -- for(i=0;i<max;i++){ -+ for(i=0;i<max;i+=2){ - double x = i*0.1 + 6.0; - int size = pow(2.0, x); - diff --git a/user/os-prober/APKBUILD b/user/os-prober/APKBUILD index 65ff5061b..016f92168 100644 --- a/user/os-prober/APKBUILD +++ b/user/os-prober/APKBUILD @@ -8,7 +8,7 @@ url="http://joeyh.name/code/os-prober/" arch="all" options="!check" # No test suite. license="GPL-2.0+ AND GPL-1.0+" -depends="/bin/sh" +depends="/bin/sh grub-mount" makedepends="" subpackages="" source="http://deb.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.xz" @@ -32,19 +32,21 @@ package() { linux-boot-probes linux-boot-probes/mounted; do mkdir -p "$pkgdir/usr/lib/$probes" for file in $probes/common/*; do - install -Dm644 $file "$pkgdir/usr/lib/$probes" + install -Dm755 $file "$pkgdir/usr/lib/$probes" done if [ -e "$probes/${PROBE_ARCH}" ]; then - install -Dm644 $probes/${PROBE_ARCH}/* \ - "$pkgdir/usr/lib/$probes" + mkdir -p "$pkgdir/usr/lib/$probes/${PROBE_ARCH}" + cp -a $probes/${PROBE_ARCH}/* \ + "$pkgdir/usr/lib/$probes/${PROBE_ARCH}" fi done mkdir -p "$pkgdir"/usr/lib/os-prober "$pkgdir"/usr/bin mkdir -p "$pkgdir"/usr/share/os-prober + install -dm700 "$pkgdir"/var/lib/os-prober install -Dm755 newns "$pkgdir"/usr/lib/os-prober/ install -Dm755 os-prober "$pkgdir"/usr/bin/ install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/ - install -Dm644 common.sh "$pkgdir"/usr/share/os-prober/ + install -Dm755 common.sh "$pkgdir"/usr/share/os-prober/ } sha512sums="4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b os-prober_1.77.tar.xz" diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD index b67bd4347..ffbf36df1 100644 --- a/user/otf-culmus/APKBUILD +++ b/user/otf-culmus/APKBUILD @@ -1,14 +1,15 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-culmus pkgver=0.133 pkgrel=0 pkgdesc="Culmus collections of Hebrew font families" url="http://culmus.sourceforge.net/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="MIT AND GPL-2.0-only WITH font-exception" depends="fontconfig" +makedepends="" source="https://downloads.sourceforge.net/culmus/culmus-$pkgver.tar.gz" builddir="$srcdir"/${pkgname#*-}-$pkgver diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index 939ae229a..c7ee2436a 100644 --- a/user/otf-exo/APKBUILD +++ b/user/otf-exo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-exo pkgver=2 pkgrel=0 @@ -11,12 +11,10 @@ license="OFL-1.1" depends="fontconfig" makedepends="" source="http://ndiscovered.com/archives/exo-$pkgver.zip" -builddir="$srcdir" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} - for i in *.otf; do + for i in "$srcdir"/*.otf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD index 0f34cac2a..0f1ad30b2 100644 --- a/user/otf-office-code-pro/APKBUILD +++ b/user/otf-office-code-pro/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-office-code-pro pkgver=1.004 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://github.com/nathco/Office-Code-Pro" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD index 3af3cc125..985c7f18e 100644 --- a/user/otf-proggy-vector/APKBUILD +++ b/user/otf-proggy-vector/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-proggy-vector pkgver=1.1.5 pkgrel=0 pkgdesc="Monospaced font family for programming" url="https://github.com/bluescan/proggyfonts" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="MIT AND Custom" depends="fontconfig" makedepends="" diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD index 78e144b82..5e96c1717 100644 --- a/user/otf-source-code-pro/APKBUILD +++ b/user/otf-source-code-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-source-code-pro pkgver=2.030 _pkgver=1.050 @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Monospaced font family for user interfaces and programming" url="https://adobe-fonts.github.io/source-code-pro/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD index 04581e14c..1457b6ede 100644 --- a/user/otf-source-sans-pro/APKBUILD +++ b/user/otf-source-sans-pro/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-source-sans-pro pkgver=3.006 pkgrel=0 pkgdesc="Sans serif font family for user interfaces" url="https://adobe-fonts.github.io/source-sans-pro" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index 478066c17..e90f45cbd 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-pro/APKBUILD @@ -1,23 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=otf-source-serif-pro -pkgver=3.000 +pkgver=3.001 pkgrel=0 pkgdesc="Serif font family for typesetting" url="https://adobe-fonts.github.io/source-serif-pro/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R/${pkgname#*-}-${pkgver}R.zip" +builddir="$srcdir/${pkgname#*-}-${pkgver}R" package() { - cd "$srcdir"/OTF + cd "$builddir"/OTF mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } -sha512sums="865ea8ab6d5b8107b85a494f3b54da83a479a613c198c657d16fc6abe10022d0bbb1e441a328371a33a0d393467da599eba6458be31835cdd7391cfde4a6eec8 source-serif-pro-3.000R.zip" +sha512sums="5f05b1e5ab99f4b6cfb15921acde5552fade2a84d94f10953f12b52e293c1fe21f1a35153a93216517ee3b410d556eb5cc874b8c1ac8842ecd5627ccfa0abbe6 source-serif-pro-3.001R.zip" diff --git a/user/oxygen-fonts/APKBUILD b/user/oxygen-fonts/APKBUILD index 152a0aae4..bf4202efb 100644 --- a/user/oxygen-fonts/APKBUILD +++ b/user/oxygen-fonts/APKBUILD @@ -10,10 +10,9 @@ license="OFL-1.1" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev fontforge-dev" subpackages="" -source="http://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -24,17 +23,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index 6c44d063b..397e87ce7 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -14,7 +14,6 @@ subpackages="" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/oxygen-icons5-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5ae34015aebff31cab3192905c388ac5a75c67e7b24ba3bb12075edf6f6cb013f9ace837ea8dd4ef7c5174e27ea1b84e418b34eb983648943c4063dd076d6ccb oxygen-icons5-5.54.0.tar.xz" +sha512sums="d7ba6906823b0e4c6a724b98b587808d8136e29a7f3bdf6fdb8309cbb9bfd43bc903a79cf5629c5f5cbf15510de3526332728f538d8ff624c52c021488b4ca6c oxygen-icons5-5.68.0.tar.xz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index e94059d0b..660b70cd0 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=oxygen -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev frameworkintegration-dev kcmutils-dev kcompletion-dev kconfig-dev kdecoration-dev kguiaddons-dev ki18n-dev kservice-dev kwidgetsaddons-dev kwindowsystem-dev" -subpackages="$pkgname-dev $pkgname-lang" +subpackages="$pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz" build() { @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d6d60c295eab7e1d8eb453c3150ad50fa387dc6ad8f2950ed53df320ccd2499397b35561dafcf7c3f4faef84039a9c1f54ad19b69a42c100d453ad87420982b3 oxygen-5.12.8.tar.xz" +sha512sums="25cbace24d143cbbf9608722db2cfe68453be69fd14e2bbb218461ace435d6d0a186fd5cf896b4095c1a756e2e1d5086b5b2f48c27fc9f88954414124deda52f oxygen-5.18.3.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 49597e2f5..793560380 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev knotifications-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/palapeli-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/palapeli-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="717107fb7ee402c74257377d6e3a026463fd7ef87fcde5ecc55a334bbc583345c1d44a91d3fa5d10ff9f1f2d7ff5d74768e51614cdbbd942165a0215cc9c2646 palapeli-19.08.2.tar.xz" +sha512sums="4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676 palapeli-19.12.3.tar.xz" diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD index c26726d5d..a9e6d5beb 100644 --- a/user/pango/APKBUILD +++ b/user/pango/APKBUILD @@ -7,11 +7,12 @@ url="https://www.pango.org/" arch="all" options="!check" # no tests available license="LGPL-2.1+" -subpackages="$pkgname-dev $pkgname-doc" +depends="" makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/pango/*/modules" +subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz CVE-2019-1010238.patch" diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD index 5b2ddd058..20787b69f 100644 --- a/user/pangomm/APKBUILD +++ b/user/pangomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pangomm pkgver=2.42.0 pkgrel=0 @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/pangomm/${pkgver%.*}/pangomm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index 3e0bab284..6dff3c80d 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,13 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20190919 +pkgver=20200201 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" arch="noarch" -license="LGPL-3.0" options="!check" # Icon set. +license="LGPL-3.0" depends="" makedepends="" subpackages="$pkgname-light $pkgname-dark e$pkgname:epapirus" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="183765db87863f46d5036ea020ef5f4da5f74b6b519bdf9409f95e904209ba308abf46af29d5d8e86a1abe95e18975bd9114cfc929cd4620a9cef49e6a5c939b papirus-icons-20190919.tar.gz" +sha512sums="07ed45eb409ed12f57657f058f9a5a03dec77679ed598dc8645536a614ecc5424c60be57f10de20ca72204d2a21152fdd62adadf2637bbfa1266d588c787d7e9 papirus-icons-20200201.tar.gz" diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD index 7ffbda2f8..cf55cd657 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -1,12 +1,13 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=parole -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="GStreamer-based media player for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.1+" +depends="" makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev gst-plugins-base-dev libnotify-dev libice-dev" subpackages="$pkgname-dev $pkgname-lang" @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f67830e36b6ac41c85dbbb7d6b4e2dfbd037c9e8fe4f5ab5ef8c52ebe4c69b5a9bfdee298b174a85334a4ae9414ed3492994853896f745c489116359cc14969 parole-1.0.4.tar.bz2" +sha512sums="458b042752919d4dd1bfdaceda2b281b07a3094d986a99ec2ff51c12b7ca32adba6ce67ecb67e9ab70bdf83cfa22f8b5027054e2c3a3cf71d50ec8b98eeb24df parole-1.0.5.tar.bz2" diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD index 5e67e25af..d37784b29 100644 --- a/user/partitionmanager/APKBUILD +++ b/user/partitionmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=partitionmanager -pkgver=3.3.1 +pkgver=4.1.0 pkgrel=0 pkgdesc="Qt-based partition manager" url="https://www.kde.org/applications/system/partitionmanager" @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/partitionmanager/$pkgver/src/partitionmanager-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0 partitionmanager-3.3.1.tar.xz" +sha512sums="63f77c68f0468e6b17da33bf52824e2858b43f33cb46f8ff7069386d56a154c86f5f3ec20113c472d567a790ba0d8593c2ecb44d9c0d4e1614dcdc570b072761 partitionmanager-4.1.0.tar.xz" diff --git a/user/password-store/APKBUILD b/user/password-store/APKBUILD index f8830a2ef..972bdb26a 100644 --- a/user/password-store/APKBUILD +++ b/user/password-store/APKBUILD @@ -10,8 +10,7 @@ arch="noarch" options="!check" # this is a shell script and has no tests license="GPL-2.0+" depends="bash gnupg libqrencode tree xclip" -depends_dev="" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-doc $pkgname-contrib $pkgname-bash-completion:bashcomp @@ -20,7 +19,6 @@ subpackages="$pkgname-doc source="https://git.zx2c4.com/password-store/snapshot/$pkgname-$pkgver.tar.xz" package() { - cd "$builddir" make DESTDIR="$pkgdir" \ WITH_ALLCOMP=yes install } diff --git a/user/patchutils/APKBUILD b/user/patchutils/APKBUILD index ac1322e2e..eabb82788 100644 --- a/user/patchutils/APKBUILD +++ b/user/patchutils/APKBUILD @@ -11,10 +11,8 @@ depends="diffutils" makedepends="xmlto" subpackages="$pkgname-doc" source="http://cyberelk.net/tim/data/patchutils/stable/patchutils-$pkgver.tar.xz" -builddir="$srcdir/patchutils-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index 3cbcd2c30..e8254c58e 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pavucontrol-qt pkgver=0.14.1 pkgrel=0 @@ -14,11 +14,9 @@ makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,13 +24,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 pavucontrol-qt-0.14.1.tar.xz" diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index dd02568a7..5c98d4f57 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pavucontrol pkgver=4.0 pkgrel=0 @@ -10,10 +10,9 @@ license="GPL-2.0+" depends="" makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev" subpackages="$pkgname-doc $pkgname-lang" -source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz" +source="https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index a20e48e9d..45924bda1 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -17,7 +17,6 @@ source="https://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar. " build() { - cd "$builddir" sed -i -e "106s/^/\#/" Makefile make OPT="$CFLAGS" ZLIB=no \ SHARED=yes \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make PREFIX="$pkgdir"/usr \ SHARED=yes \ SHAREDIR="$pkgdir"/usr/share/hwdata \ diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index 75b042e40..a48274c4f 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pcmanfm-qt pkgver=0.14.1 pkgrel=0 @@ -16,11 +16,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/pcmanfm-qt/releases/download/$pkgver/pcmanfm-qt-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,18 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e pcmanfm-qt-0.14.1.tar.xz" diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD index 8ecf6ba0a..806d8b65d 100644 --- a/user/pcmanfm/APKBUILD +++ b/user/pcmanfm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pcmanfm pkgver=1.3.1 pkgrel=0 @@ -7,12 +7,12 @@ pkgdesc="GTK-based file manager" url="https://sourceforge.net/projects/pcmanfm/" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+2.0-dev libfm-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/pcmanfm/pcmanfm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pcmciautils/APKBUILD b/user/pcmciautils/APKBUILD index f94d49086..1189b7d04 100644 --- a/user/pcmciautils/APKBUILD +++ b/user/pcmciautils/APKBUILD @@ -16,12 +16,10 @@ source="https://mirrors.kernel.org/pub/linux/utils/kernel/pcmcia/$pkgname-$pkgve " build() { - cd "$builddir" make -j1 LEX=flex } package() { - cd "$builddir" make DESTDIR="$pkgdir"/ install ln -sf pccardctl "$pkgdir"/sbin/lspcmcia } diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index ff8a667a9..d4e0355a6 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -17,7 +17,6 @@ source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2 pcscd.initd" build() { - cd "$builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -36,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m755 "$srcdir"/pcscd.initd \ "$pkgdir"/etc/init.d/pcscd diff --git a/user/perl-algorithm-diff/APKBUILD b/user/perl-algorithm-diff/APKBUILD index 9c95c3cef..a2a4c455b 100644 --- a/user/perl-algorithm-diff/APKBUILD +++ b/user/perl-algorithm-diff/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-any-moose/APKBUILD b/user/perl-any-moose/APKBUILD index 75b200d44..1963a75a7 100644 --- a/user/perl-any-moose/APKBUILD +++ b/user/perl-any-moose/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl perl-mouse" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-apache-logformat-compiler/APKBUILD b/user/perl-apache-logformat-compiler/APKBUILD index cd8d5aa99..7929095c0 100644 --- a/user/perl-apache-logformat-compiler/APKBUILD +++ b/user/perl-apache-logformat-compiler/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=Apache-LogFormat-Compiler _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.35 +pkgver=0.36 pkgrel=0 pkgdesc="Compile a log format string to Perl code" url="https://metacpan.org/release/Apache-LogFormat-Compiler" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-posix-strftime-compiler perl-try-tiny" +depends="perl perl-posix-strftime-compiler perl-try-tiny" checkdepends="perl-http-message perl-test-mocktime" makedepends="perl-dev perl-module-build-tiny" subpackages="$pkgname-doc" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9a4447e0be864e6ba3a6170daa6f219b0ddd6b765ab6fbe6125a808da76803fb4bf6eed131df793a8cf900378b5c72f11489d5429106b97931f6fbef08f9f349 Apache-LogFormat-Compiler-0.35.tar.gz" +sha512sums="a6f7f0f9f98401a70e4bb6bd4862e9e520e8b968c5e0f25853da57b12bf6d67357ddc8d2fe985668520758e5745b5d7783f6c656c35efd823f4325f267fdbfee Apache-LogFormat-Compiler-0.36.tar.gz" diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD index fb01bc146..f339331ce 100644 --- a/user/perl-app-licensecheck/APKBUILD +++ b/user/perl-app-licensecheck/APKBUILD @@ -1,23 +1,26 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-app-licensecheck _pkgreal=App-Licensecheck _author=JONASS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.0.37 +pkgver=3.0.44 pkgrel=0 pkgdesc="Perl library and utility for checking source-file licensing" url="https://metacpan.org/release/App-Licensecheck" arch="noarch" license="GPL-3.0+" -depends="perl perl-getopt-long-descriptive perl-moo perl-namespace-clean - perl-path-iterator-rule perl-path-tiny perl-pod-constants - perl-regexp-pattern perl-regexp-pattern-license perl-software-license - perl-sort-key perl-strictures perl-string-copyright perl-string-escape - perl-test-requires perl-test-script perl-try-tiny - perl-universal-require" -makedepends="" +depends="perl perl-array-intspan perl-encode-locale + perl-getopt-long-descriptive perl-list-someutils perl-log-any + perl-log-any-adapter-screen perl-moo perl-moox-struct + perl-namespace-clean perl-path-iterator-rule perl-path-tiny + perl-pod-constants perl-regexp-pattern>=0.2.12 perl-regexp-pattern-license>=3.1.102 + perl-re-engine-re2 perl-software-license perl-sort-key perl-strictures + perl-string-copyright perl-string-escape perl-test-requires + perl-test-script perl-try-tiny perl-universal-require" +checkdepends="perl-test-command-simple" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" @@ -36,4 +39,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6053ff06162ca651cd365e8a8049d48ed0deb2dd4ec7fae5fed8e6855f5cce7310099b47cfd1ddf79ef2cecb24eea28cc90247ed3d0220589c8185ef111d45ed App-Licensecheck-v3.0.37.tar.gz" +sha512sums="3a1fa510c8e103f6ac7cc5507ab63258e59b01181ba5bbb38345526eb73eaa547cbca36e5b0c12a4a60186d133a31060b17a1aba84e0a82c05917a8793a512d3 App-Licensecheck-v3.0.44.tar.gz" diff --git a/user/perl-array-intspan/APKBUILD b/user/perl-array-intspan/APKBUILD new file mode 100644 index 000000000..b36cd9c62 --- /dev/null +++ b/user/perl-array-intspan/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-array-intspan +_pkgreal=Array-IntSpan +_author=DDUMONT +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=2.003 +pkgrel=0 +pkgdesc="Perl modules for interacting with arrays via integers" +url="https://metacpan.org/pod/Array::IntSpan" +arch="noarch" +license="Artistic-2.0" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/D/DD/DDUMONT/Array-IntSpan-$pkgver.tar.gz" +builddir="$srcdir/Array-IntSpan-$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="f55e39f7cccc3db56be07442e8b5f62d1afbf798ba3cf4008134ace8a30a6387cd7876f534e6bccfb24eb05213cc56961c7a28f73902c06105c80612a7c000a4 Array-IntSpan-2.003.tar.gz" diff --git a/user/perl-b-hooks-endofscope/APKBUILD b/user/perl-b-hooks-endofscope/APKBUILD index 63493ead5..1934140e9 100644 --- a/user/perl-b-hooks-endofscope/APKBUILD +++ b/user/perl-b-hooks-endofscope/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/B-Hooks-EndOfScope" arch="noarch" license="Artistic-1.0-Perl" depends="perl-module-implementation perl-sub-exporter-progressive perl-sub-name - perl-variable-magic" + perl-variable-magic perl" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD index 9bababe6c..b5dae3817 100644 --- a/user/perl-b-hooks-op-check/APKBUILD +++ b/user/perl-b-hooks-op-check/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-b-hooks-op-check _pkgreal=B-Hooks-OP-Check diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD index cf17b46b1..7b67d3047 100644 --- a/user/perl-bareword-filehandles/APKBUILD +++ b/user/perl-bareword-filehandles/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-bareword-filehandles _pkgreal=bareword-filehandles @@ -11,7 +11,7 @@ pkgdesc="Perl module for disabling support for bareword filehandles" url="https://metacpan.org/pod/bareword::filehandles" arch="all" license="Artistic-1.0-Perl" -depends="perl-b-hooks-op-check" +depends="perl perl-b-hooks-op-check" makedepends="perl-dev perl-extutils-depends" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-capture-tiny/APKBUILD b/user/perl-capture-tiny/APKBUILD index e2d315515..8e2082b86 100644 --- a/user/perl-capture-tiny/APKBUILD +++ b/user/perl-capture-tiny/APKBUILD @@ -19,7 +19,6 @@ source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver builddir="$srcdir/$_pkgreal-$pkgver" build() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/user/perl-cgi/APKBUILD b/user/perl-cgi/APKBUILD index 61838b4a8..6ea8b71e1 100644 --- a/user/perl-cgi/APKBUILD +++ b/user/perl-cgi/APKBUILD @@ -5,15 +5,15 @@ _pkgreal=CGI _author=LEEJO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=4.44 +pkgver=4.46 pkgrel=0 pkgdesc="Handle CGI requests and responses in Perl" url="https://metacpan.org/release/CGI" arch="noarch" license="Artistic-1.0-Perl" depends="perl-html-parser" -makedepends="perl-dev" checkdepends="perl-test-deep perl-test-nowarnings perl-test-warn" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3cbb7d8c54a08ded7a78f971bda8dbd95ebe52cb10ff20a1094bbff7aa422eb76d456aa4a425aa45c6add2a6a2d669fc3814ee4ba554079d64a5226e0538ccfc CGI-4.44.tar.gz" +sha512sums="11280537b828fc595ad8c3d18a8a0b148cfcaccf1c4d4e58288e581254781182f1f3c4b119880c4e793af3bb051973b52c08142e9f0179178e927c4bfe33a292 CGI-4.46.tar.gz" diff --git a/user/perl-chart/APKBUILD b/user/perl-chart/APKBUILD index 9f0d2bca5..7914d8849 100644 --- a/user/perl-chart/APKBUILD +++ b/user/perl-chart/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Series of charting modules for Perl" url="https://metacpan.org/release/Chart" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-gd" +depends="perl perl-gd" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-class-accessor/APKBUILD b/user/perl-class-accessor/APKBUILD index e898f3938..b3b076eb6 100644 --- a/user/perl-class-accessor/APKBUILD +++ b/user/perl-class-accessor/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl class accessor generator" url="https://metacpan.org/release/Class-Accessor" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-sub-name" +depends="perl perl-sub-name" makedepends="perl-dev perl-module-install" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-class-load-xs/APKBUILD b/user/perl-class-load-xs/APKBUILD index 3f1678655..641a41853 100644 --- a/user/perl-class-load-xs/APKBUILD +++ b/user/perl-class-load-xs/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Class-Load-XS" arch="all" license="Artistic-2.0" depends="perl-class-load" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-needs" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-class-load/APKBUILD b/user/perl-class-load/APKBUILD index e40e1e671..7b59b4b71 100644 --- a/user/perl-class-load/APKBUILD +++ b/user/perl-class-load/APKBUILD @@ -13,8 +13,8 @@ arch="noarch" license="Artistic-1.0-Perl" depends="perl-data-optlist perl-module-implementation perl-module-runtime perl-package-stash perl-try-tiny" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-needs" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-class-method-modifiers/APKBUILD b/user/perl-class-method-modifiers/APKBUILD index 5fe47284a..2eb8f618e 100644 --- a/user/perl-class-method-modifiers/APKBUILD +++ b/user/perl-class-method-modifiers/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Class::Method::Modifiers" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-needs perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-class-singleton/APKBUILD b/user/perl-class-singleton/APKBUILD index 3cae4b475..c59f0fc4c 100644 --- a/user/perl-class-singleton/APKBUILD +++ b/user/perl-class-singleton/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl implementation of a Singleton class pattern" url="https://metacpan.org/release/Class-Singleton" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="" +depends="perl" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-code-tidyall/APKBUILD b/user/perl-code-tidyall/APKBUILD index 54a677e4f..c62037f75 100644 --- a/user/perl-code-tidyall/APKBUILD +++ b/user/perl-code-tidyall/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Code-TidyAll _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.74 +pkgver=0.75 pkgrel=0 pkgdesc="Your all-in-one Perl code tidier and validator" url="https://metacpan.org/release/Code-TidyAll" @@ -17,9 +17,9 @@ depends="perl-capture-tiny perl-config-ini perl-file-pushd perl-file-which perl-path-tiny perl-scope-guard perl-specio perl-specio-library-path-tiny perl-text-diff perl-timedate perl-time-duration-parse perl-try-tiny" -makedepends="perl-dev" checkdepends="perl-lib-relative perl-test-class-most perl-test-differences perl-test-fatal perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -38,4 +38,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0b306814cfc87b27a3dc34ccb855b65f7cc072ace6f9862596a94c5a9cb89978d38645c74382bd8c41ba21c8134d830f552daa5cb1453593940458bba019f3b1 Code-TidyAll-0.74.tar.gz" +sha512sums="d58846fc13d64a7a7334979d42d65056760d57963ecc6a73d07052310e4850ce378db2c8f5793f653dcdb618f0450e5b33c6a6bc38eb4c8bd75b1580b16658c1 Code-TidyAll-0.75.tar.gz" diff --git a/user/perl-common-sense/APKBUILD b/user/perl-common-sense/APKBUILD index 9e586481d..43a250151 100644 --- a/user/perl-common-sense/APKBUILD +++ b/user/perl-common-sense/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-cookie-baker/APKBUILD b/user/perl-cookie-baker/APKBUILD index 43093f0bc..30085dd68 100644 --- a/user/perl-cookie-baker/APKBUILD +++ b/user/perl-cookie-baker/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Cookie string generator and parser for Perl" url="https://metacpan.org/release/Cookie-Baker" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-uri" +depends="perl perl-uri" checkdepends="perl-test-time" makedepends="perl-dev perl-module-build-tiny" subpackages="$pkgname-doc" diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD new file mode 100644 index 000000000..0a1f4ddd4 --- /dev/null +++ b/user/perl-cpan-changes/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-cpan-changes +_pkgreal=CPAN-Changes +_author=HAARG +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.400002 +pkgrel=0 +pkgdesc="Perl module for validating CPAN Changes files" +url="https://metacpan.org/release/CPAN-Changes" +arch="noarch" +license="GPL-2.0+ OR Artistic-1.0-Perl" +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="d359073d9d5ed2126835d4895c1ee5288cc09e72202ba77441bb25cf13e9cd0f16d4040b7e2cf1785efd6e8ccbe7908415fb4fefeebe9c0548d838d2ac850dfb CPAN-Changes-0.400002.tar.gz" diff --git a/user/perl-cpan-meta-check/APKBUILD b/user/perl-cpan-meta-check/APKBUILD index 4c03d00bb..e264a92a0 100644 --- a/user/perl-cpan-meta-check/APKBUILD +++ b/user/perl-cpan-meta-check/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/CPAN-Meta-Check" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-deep" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-crypt-rijndael/APKBUILD b/user/perl-crypt-rijndael/APKBUILD index 6f5678cc2..8f7c3cf1c 100644 --- a/user/perl-crypt-rijndael/APKBUILD +++ b/user/perl-crypt-rijndael/APKBUILD @@ -10,7 +10,7 @@ pkgdesc="Crypt::CBC compliant Rijndael encryption module" url="https://metacpan.org/release/Crypt-Rijndael" arch="all" license="LGPL-3.0+" -depends="perl-test-manifest" +depends="perl perl-test-manifest" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://search.cpan.org/CPAN/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz diff --git a/user/perl-cwd-guard/APKBUILD b/user/perl-cwd-guard/APKBUILD index fea81f7a8..c04973dd8 100644 --- a/user/perl-cwd-guard/APKBUILD +++ b/user/perl-cwd-guard/APKBUILD @@ -12,9 +12,8 @@ url="https://metacpan.org/pod/Cwd::Guard" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev perl-module-build" checkdepends="perl-test-requires" -install="" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD index 72f987266..1ee807e32 100644 --- a/user/perl-data-dump/APKBUILD +++ b/user/perl-data-dump/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-dump _pkgreal=Data-Dump @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Data::Dump" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0+" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-data-optlist/APKBUILD b/user/perl-data-optlist/APKBUILD index a870222dc..050ac92d8 100644 --- a/user/perl-data-optlist/APKBUILD +++ b/user/perl-data-optlist/APKBUILD @@ -1,4 +1,3 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-optlist _pkgreal=Data-OptList diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD index 2160b02bc..48e7a8759 100644 --- a/user/perl-data-section/APKBUILD +++ b/user/perl-data-section/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-section _pkgreal=Data-Section @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Data::Section" arch="noarch" license="Artistic-1.0-Perl" depends="perl perl-mro-compat perl-sub-exporter perl-test-failwarnings" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-data-uuid/APKBUILD b/user/perl-data-uuid/APKBUILD new file mode 100644 index 000000000..17e97b05f --- /dev/null +++ b/user/perl-data-uuid/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-data-uuid +_pkgreal=Data-UUID +_author=RJBS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=1.224 +pkgrel=0 +pkgdesc="Perl module for working with UUIDs" +url="https://metacpan.org/pod/Data::UUID" +arch="all" +license="MIT" +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="897ab26e83600214110167b86fc63848281b7bdf3818dcfedb713bf2eb64a06c48cc7cee43bfa4130c6fdb912fb77863bd31ffe08c95ec85e6660a9b369b7970 Data-UUID-1.224.tar.gz" diff --git a/user/perl-datetime-locale/APKBUILD b/user/perl-datetime-locale/APKBUILD index 557e75f8a..06bef0c08 100644 --- a/user/perl-datetime-locale/APKBUILD +++ b/user/perl-datetime-locale/APKBUILD @@ -13,7 +13,7 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-dist-checkconflicts perl-file-sharedir perl-file-sharedir-install perl-ipc-system-simple perl-namespace-autoclean - perl-params-validationcompiler" + perl-params-validationcompiler perl" checkdepends="perl-specio perl-test-fatal perl-test-file-sharedir perl-test-requires perl-test-warnings" makedepends="perl-dev perl-cpan-meta-check perl-dist-checkconflicts" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 0b58f4a53..6e14ed90e 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -5,16 +5,16 @@ _pkgreal=DateTime-TimeZone _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.37 +pkgver=2.38 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-class-singleton perl-module-runtime perl-namespace-autoclean - perl-params-validationcompiler perl-specio perl-try-tiny" + perl-params-validationcompiler perl-specio perl-try-tiny perl" checkdepends="perl-test-fatal perl-test-requires" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9cc26cb9e1563ad86dcee2c83dc7f745631903a370e28ba14211671d905d2fe1a9ef3f72ee51777fdc6999b9ffb4f9d58b50c48655dd6b9ab9fee3fa97df701f DateTime-TimeZone-2.37.tar.gz" +sha512sums="984a3bf8e30bae0085be51d67288230ffd8d2834b066b275720ab3658df6cc0607316cb22b2ca28ec8c9c1be7f6cbb8509eee52d4906aedf6175bf36a413b643 DateTime-TimeZone-2.38.tar.gz" diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD index 7ca5bb0ee..c1157189e 100644 --- a/user/perl-datetime/APKBUILD +++ b/user/perl-datetime/APKBUILD @@ -13,7 +13,7 @@ arch="all" license="Artistic-2.0" depends="perl-datetime-locale perl-datetime-timezone perl-dist-checkconflicts perl-namespace-autoclean perl-params-validationcompiler perl-specio - perl-try-tiny" + perl-try-tiny perl" checkdepends="perl-test-fatal perl-test-warnings" makedepends="perl-dev perl-cpan-meta-check" subpackages="$pkgname-doc" diff --git a/user/perl-dbd-pg/APKBUILD b/user/perl-dbd-pg/APKBUILD index d4e6d7207..40a12303e 100644 --- a/user/perl-dbd-pg/APKBUILD +++ b/user/perl-dbd-pg/APKBUILD @@ -12,9 +12,9 @@ url="https://metacpan.org/release/DBD-Pg" arch="all" options="!check" # https://github.com/bucardo/dbdpg/issues/56 license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-dbi" -makedepends="perl-dev postgresql-dev" +depends="perl perl-dbi" checkdepends="cmd:locale postgresql" +makedepends="perl-dev postgresql-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz fix-tests.patch diff --git a/user/perl-devel-checkcompiler/APKBUILD b/user/perl-devel-checkcompiler/APKBUILD index 11dd443f6..ad3f71d20 100644 --- a/user/perl-devel-checkcompiler/APKBUILD +++ b/user/perl-devel-checkcompiler/APKBUILD @@ -13,13 +13,11 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev perl-module-build-tiny" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` perl Build.PL --destdir="$pkgdir" --prefix="/usr" --installdirs=vendor ./Build } diff --git a/user/perl-devel-globaldestruction/APKBUILD b/user/perl-devel-globaldestruction/APKBUILD index c426cfcb5..944d7c083 100644 --- a/user/perl-devel-globaldestruction/APKBUILD +++ b/user/perl-devel-globaldestruction/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl perl-sub-exporter-progressive" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD index 7be49e5e2..55a62f12a 100644 --- a/user/perl-devel-hide/APKBUILD +++ b/user/perl-devel-hide/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-devel-hide _pkgreal=Devel-Hide -_author=FERREIRA +_author=DCANTRELL _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.0010 +pkgver=0.0011 pkgrel=0 pkgdesc="Perl module for forcing the unavailability of modules for testing" url="https://metacpan.org/pod/Devel::Hide" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" 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="50bd9daf86239963e501936f09c0ee4b19be65deef22774910813a2502a2f60a6efcf7fbd586f2ea09c60ca1b77aa418a08043151f5a0d9915b7d881d66013c9 Devel-Hide-0.0010.tar.gz" +sha512sums="8034ced8a126b88f3724780a40adbc13e662c794901ac103061416627b328f598e742e1353e15d6e89f648d9ac6e5804e9b41ced79bd7c600386fa874dc17042 Devel-Hide-0.0011.tar.gz" diff --git a/user/perl-devel-nytprof/APKBUILD b/user/perl-devel-nytprof/APKBUILD index 71fd0ad60..5488f7527 100644 --- a/user/perl-devel-nytprof/APKBUILD +++ b/user/perl-devel-nytprof/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Devel-NYTProf" arch="all" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl perl-file-which perl-json-maybexs" -makedepends="perl-dev" checkdepends="perl-test-differences" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-devel-overloadinfo/APKBUILD b/user/perl-devel-overloadinfo/APKBUILD index 2d2a9bd82..7c397a253 100644 --- a/user/perl-devel-overloadinfo/APKBUILD +++ b/user/perl-devel-overloadinfo/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Introspect overloaded Perl operators" url="https://metacpan.org/release/Devel-OverloadInfo" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-mro-compat perl-package-stash perl-sub-identify" -makedepends="perl-dev" +depends="perl perl-mro-compat perl-package-stash perl-sub-identify" checkdepends="perl-test-fatal" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-devel-stacktrace-ashtml/APKBUILD b/user/perl-devel-stacktrace-ashtml/APKBUILD index f9f1e45c3..9204d236b 100644 --- a/user/perl-devel-stacktrace-ashtml/APKBUILD +++ b/user/perl-devel-stacktrace-ashtml/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Display Perl stack traces in HTML" url="https://metacpan.org/release/Devel-StackTrace-AsHTML" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-devel-stacktrace" +depends="perl perl-devel-stacktrace" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-devel-symdump/APKBUILD b/user/perl-devel-symdump/APKBUILD index 05b24d680..f290739d6 100644 --- a/user/perl-devel-symdump/APKBUILD +++ b/user/perl-devel-symdump/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-dir-manifest/APKBUILD b/user/perl-dir-manifest/APKBUILD index 02c836efa..d5cdfa2f4 100644 --- a/user/perl-dir-manifest/APKBUILD +++ b/user/perl-dir-manifest/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Dir-Manifest _author=SHLOMIF _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.2.0 +pkgver=0.6.1 pkgrel=0 pkgdesc="Perl module to turn a directory and files into a dictionary" url="https://metacpan.org/release/Dir-Manifest" @@ -19,7 +19,6 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { perl Build.PL installdirs=vendor - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` ./Build } @@ -32,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="202f6342d42e36830215d3b678b9a1be159680fc8a222def00e4f5688403a4f413ad8efa4460824664e37db76fb0d19c5c61b4e5af0060b7567e722992049ffc Dir-Manifest-0.2.0.tar.gz" +sha512sums="e816d1f656bc992fc1f065b0adff53e83af03da9842987df9382ec12875ca7081ca4aa49d775c84d9f6602cb550acb1b8baf3c1f528a999e3bf39dcea2498efd Dir-Manifest-0.6.1.tar.gz" diff --git a/user/perl-dist-checkconflicts/APKBUILD b/user/perl-dist-checkconflicts/APKBUILD index 75b3916d5..369e56e99 100644 --- a/user/perl-dist-checkconflicts/APKBUILD +++ b/user/perl-dist-checkconflicts/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Declare version conflicts for Perl distributions" url="https://metacpan.org/release/Dist-CheckConflicts" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-module-runtime" -makedepends="perl-dev" +depends="perl perl-module-runtime" checkdepends="perl-test-fatal" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-email-abstract/APKBUILD b/user/perl-email-abstract/APKBUILD index 2bc865650..1c50d6402 100644 --- a/user/perl-email-abstract/APKBUILD +++ b/user/perl-email-abstract/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Unified interface to email representations in Perl" url="https://metacpan.org/release/Email-Abstract" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-email-simple perl-mro-compat perl-module-pluggable" +depends="perl perl-email-simple perl-mro-compat perl-module-pluggable" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-email-mime-encodings/APKBUILD b/user/perl-email-mime-encodings/APKBUILD index da7b6b3a2..239633dff 100644 --- a/user/perl-email-mime-encodings/APKBUILD +++ b/user/perl-email-mime-encodings/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Unified interface to MIME codecs for Perl" url="https://metacpan.org/release/Email-MIME-Encodings" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-capture-tiny" +depends="perl perl-capture-tiny" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-email-mime/APKBUILD b/user/perl-email-mime/APKBUILD index ab6eabe56..f4549e334 100644 --- a/user/perl-email-mime/APKBUILD +++ b/user/perl-email-mime/APKBUILD @@ -13,7 +13,7 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-email-address-xs perl-email-messageid perl-email-mime-contenttype perl-email-mime-encodings perl-email-simple perl-mime-types - perl-module-runtime" + perl-module-runtime perl" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-email-reply/APKBUILD b/user/perl-email-reply/APKBUILD index cd8cb1dfe..b5e83eac3 100644 --- a/user/perl-email-reply/APKBUILD +++ b/user/perl-email-reply/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Reply to email from Perl" url="https://metacpan.org/release/Email-Reply" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-email-abstract perl-email-address perl-email-mime" +depends="perl perl-email-abstract perl-email-address perl-email-mime" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-email-sender/APKBUILD b/user/perl-email-sender/APKBUILD index 2248087cb..1194e9b5d 100644 --- a/user/perl-email-sender/APKBUILD +++ b/user/perl-email-sender/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Email-Sender _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.300031 +pkgver=1.300034 pkgrel=0 pkgdesc="Library for sending email" url="https://metacpan.org/release/Email-Sender" @@ -14,7 +14,7 @@ license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-capture-tiny perl-email-abstract perl-email-address perl-email-simple perl-module-runtime perl-moo perl-moox-types-mooselike perl-sub-exporter perl-throwable - perl-try-tiny" + perl-try-tiny perl" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="72aa65d21df9b0a1fa52ba99c9c1c4a660142819ed9658eb2c2b74f1ab70257911af1f071524ecbb3917a7be1464b7a157792b5e03921788ce9f23a86e7874f1 Email-Sender-1.300031.tar.gz" +sha512sums="cd19fc1df95b1c651b8612512f3baf860d00a74121e03e3408dffb15dba19ab77fc7522a4f6c832b8a0e59a0c57752689a36e1e2a48eb2988a5ee96e7f997021 Email-Sender-1.300034.tar.gz" diff --git a/user/perl-email-simple/APKBUILD b/user/perl-email-simple/APKBUILD index bdc30f311..50f8835f4 100644 --- a/user/perl-email-simple/APKBUILD +++ b/user/perl-email-simple/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Simple parsing of RFC 2822 email messages and headers for Perl" url="https://metacpan.org/release/Email-Simple" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-email-date-format" +depends="perl perl-email-date-format" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-eval-closure/APKBUILD b/user/perl-eval-closure/APKBUILD index 42c766666..51ed39484 100644 --- a/user/perl-eval-closure/APKBUILD +++ b/user/perl-eval-closure/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Eval-Closure" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-exception-class/APKBUILD b/user/perl-exception-class/APKBUILD index b57e8d329..b5cac436a 100644 --- a/user/perl-exception-class/APKBUILD +++ b/user/perl-exception-class/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl module for declaring 'real' exception classes" url="https://metacpan.org/release/Exception-Class" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-class-data-inheritable perl-devel-stacktrace" +depends="perl perl-class-data-inheritable perl-devel-stacktrace" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-extutils-cbuilder/APKBUILD b/user/perl-extutils-cbuilder/APKBUILD new file mode 100644 index 000000000..98df541b9 --- /dev/null +++ b/user/perl-extutils-cbuilder/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-extutils-cbuilder +_pkgreal=ExtUtils-CBuilder +_author=AMBS +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.280234 +pkgrel=0 +pkgdesc="Perl module for writing C code for Perl modules" +url="https://metacpan.org/pod/ExtUtils::CBuilder" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl" +makedepends="perl-dev" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/ExtUtils-CBuilder-$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="a87c71adb9c06a4080ee3c6493c5f3d83c7904709bdc73fd3e87800192b3a92f91d0ff3890e3c5fb28a19bbff120f4adcca629416547ca71f28c3dc7bc74ad5b ExtUtils-CBuilder-0.280234.tar.gz" diff --git a/user/perl-extutils-cppguess/APKBUILD b/user/perl-extutils-cppguess/APKBUILD new file mode 100644 index 000000000..75fbfd83c --- /dev/null +++ b/user/perl-extutils-cppguess/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-extutils-cppguess +_pkgreal=ExtUtils-CppGuess +_author=ETJ +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.21 +pkgrel=0 +pkgdesc="Perl module for checking C++ compiler and flags" +url="https://metacpan.org/pod/ExtUtils::CppGuess" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl perl-capture-tiny perl-extutils-parsexs" +makedepends="perl-dev perl-module-build perl-extutils-cbuilder" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/ExtUtils-CppGuess-$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="e48e4815ac9db4e8bb91de101f1d22aed95c770cf6fa2ea5e38094643fe96bc9fe69b0e5a76ba8aa53a653753f93526edab8b1604d864bb2b3a50223617f84d9 ExtUtils-CppGuess-0.21.tar.gz" diff --git a/user/perl-extutils-depends/APKBUILD b/user/perl-extutils-depends/APKBUILD index 557b64b73..e88fa2f7e 100644 --- a/user/perl-extutils-depends/APKBUILD +++ b/user/perl-extutils-depends/APKBUILD @@ -13,7 +13,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-extutils-parsexs/APKBUILD b/user/perl-extutils-parsexs/APKBUILD new file mode 100644 index 000000000..8aceb730f --- /dev/null +++ b/user/perl-extutils-parsexs/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-extutils-parsexs +_pkgreal=ExtUtils-ParseXS +_author=SMUELLER +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=3.35 +pkgrel=0 +pkgdesc="Perl module for converting XS code into C" +url="https://metacpan.org/pod/ExtUtils::ParseXS" +arch="noarch" +license="Artistic-2.0 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/ExtUtils-ParseXS-$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="90862ecb97f19066a4564be1788bd061c5835abb440fbea2cad43c903e912a7864453ef61c2c384566a4fe6536783f480938c4460b63879734a2d74372a956b8 ExtUtils-ParseXS-3.35.tar.gz" diff --git a/user/perl-extutils-pkgconfig/APKBUILD b/user/perl-extutils-pkgconfig/APKBUILD index ad4153ce0..1fc40c2d7 100644 --- a/user/perl-extutils-pkgconfig/APKBUILD +++ b/user/perl-extutils-pkgconfig/APKBUILD @@ -19,7 +19,6 @@ source="http://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver. builddir="$srcdir/$_pkgreal-$pkgver" build() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/user/perl-file-basedir/APKBUILD b/user/perl-file-basedir/APKBUILD index d143a204c..2080e32cd 100644 --- a/user/perl-file-basedir/APKBUILD +++ b/user/perl-file-basedir/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Base directory specification support for Perl" url="https://metacpan.org/release/File-BaseDir" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-ipc-system-simple xdg-user-dirs" +depends="perl perl-ipc-system-simple xdg-user-dirs" checkdepends="perl-file-which" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" diff --git a/user/perl-file-copy-recursive-reduced/APKBUILD b/user/perl-file-copy-recursive-reduced/APKBUILD index e54ec4d2f..54eec9674 100644 --- a/user/perl-file-copy-recursive-reduced/APKBUILD +++ b/user/perl-file-copy-recursive-reduced/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive::Reduced" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev" checkdepends="perl-capture-tiny perl-path-tiny" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-file-copy-recursive/APKBUILD b/user/perl-file-copy-recursive/APKBUILD index 1b94cc2fc..393832558 100644 --- a/user/perl-file-copy-recursive/APKBUILD +++ b/user/perl-file-copy-recursive/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-warnings perl-path-tiny perl-test-deep perl-test-file" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-file-desktopentry/APKBUILD b/user/perl-file-desktopentry/APKBUILD index 3cf54a4c5..04094a3c9 100644 --- a/user/perl-file-desktopentry/APKBUILD +++ b/user/perl-file-desktopentry/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Handle .desktop files from Perl" url="https://metacpan.org/release/File-DesktopEntry" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-file-basedir perl-uri-escape" +depends="perl perl-file-basedir perl-uri-escape" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-file-find-object-rule/APKBUILD b/user/perl-file-find-object-rule/APKBUILD index be981dbf7..4b5d8fc60 100644 --- a/user/perl-file-find-object-rule/APKBUILD +++ b/user/perl-file-find-object-rule/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=File-Find-Object-Rule _author=SHLOMIF _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.0311 +pkgver=0.0312 pkgrel=0 pkgdesc="Alternative Perl interface to File::Find::Object" url="https://metacpan.org/release/File-Find-Object-Rule" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-class-xsaccessor perl-file-find-object perl-number-compare +depends="perl perl-class-xsaccessor perl-file-find-object perl-number-compare perl-text-glob" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="ac187c22e05b736245ba8acecd4845d036580ba12be478254a9e74d3c397f1b3e97c1041eb8da256bb147dffd3943d9286a8955f94594a3e426a6ec8f9acc3be File-Find-Object-Rule-0.0311.tar.gz" +sha512sums="fb8b9faa8f38d2585ec0674178e99044d2fb3e3ed6eb1c80f067b68aa54def777d192f46110be84f19b2ccfc36e3e70a0ea5f248819f5953c880b00b974d18d8 File-Find-Object-Rule-0.0312.tar.gz" diff --git a/user/perl-file-find-object/APKBUILD b/user/perl-file-find-object/APKBUILD index 56377f8b2..667d7ff7a 100644 --- a/user/perl-file-find-object/APKBUILD +++ b/user/perl-file-find-object/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=File-Find-Object _author=SHLOMIF _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=0 pkgdesc="Object-oriented File::Find replacement for Perl" url="https://metacpan.org/release/File-Find-Object" arch="noarch" license="Artistic-2.0" -depends="perl-class-xsaccessor" +depends="perl perl-class-xsaccessor" makedepends="perl-dev perl-module-build" 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="88d69158ecc2fafb8d2bd7f0173b1e204fd8c96f3c0fefa491db4240f8fa9db52707a8d65aaa76f8459269619e6f91755c877f2a491f1eab78d043abc90f9b3f File-Find-Object-0.3.4.tar.gz" +sha512sums="0260f9b82cc742078f272544cf1e5bd021aefc234833e84f655a94b6e43dab2d6ce900490ab60fc4fb1977beed89003dabd90deffffd12d45c5987e6d4fa6f9d File-Find-Object-0.3.5.tar.gz" diff --git a/user/perl-file-finder/APKBUILD b/user/perl-file-finder/APKBUILD index c82f6bb63..1dbfe614e 100644 --- a/user/perl-file-finder/APKBUILD +++ b/user/perl-file-finder/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Wrap Perl File::Find" url="https://metacpan.org/release/File-Finder" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-text-glob" +depends="perl perl-text-glob" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz diff --git a/user/perl-file-mimeinfo/APKBUILD b/user/perl-file-mimeinfo/APKBUILD index 48602e04c..ad6a0f9ff 100644 --- a/user/perl-file-mimeinfo/APKBUILD +++ b/user/perl-file-mimeinfo/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Determine file types from Perl" url="https://metacpan.org/release/File-MimeInfo" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-file-basedir perl-file-desktopentry perl-path-tiny +depends="perl perl-file-basedir perl-file-desktopentry perl-path-tiny shared-mime-info" makedepends="perl-dev" subpackages="$pkgname-doc" diff --git a/user/perl-file-sharedir/APKBUILD b/user/perl-file-sharedir/APKBUILD index b0eb865b0..c0f2fa9a2 100644 --- a/user/perl-file-sharedir/APKBUILD +++ b/user/perl-file-sharedir/APKBUILD @@ -11,7 +11,8 @@ pkgdesc="Locate files shared by Perl modules" url="https://metacpan.org/release/File-ShareDir" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-class-inspector perl-file-sharedir-install perl-list-moreutils perl-params-util" +depends="perl perl-class-inspector perl-file-sharedir-install + perl-list-moreutils perl-params-util" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index ca846f49e..46f78e1d9 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.28 +pkgver=9999.29 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="4e4f6ee3f1563eff230a4d3db8e71647e41f58be523c60d023763c94b41a850c24873ac2b0f27e192a47afc77cc20e2e09d7b83ffef34b465601ef64ec9cd4ef File-Slurp-9999.28.tar.gz" +sha512sums="f98f83ceb17eef1e79ba9a9222106b0cc00bffe671b91046bcabda8aeb85a3d4f3ee7d64048a916c9486602326819ebfb4ede274e39435aacbda4e35d30cdd5c File-Slurp-9999.29.tar.gz" diff --git a/user/perl-filesys-notify-simple/APKBUILD b/user/perl-filesys-notify-simple/APKBUILD index d87fcbb4b..ec4f2cdcb 100644 --- a/user/perl-filesys-notify-simple/APKBUILD +++ b/user/perl-filesys-notify-simple/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Filesys-Notify-Simple _author=MIYAGAWA _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.13 +pkgver=0.14 pkgrel=0 pkgdesc="Simple file system watcher for Perl" url="https://metacpan.org/release/Filesys-Notify-Simple" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e8c02428240687d34c7ade45a893baecdd6cfc77e4730d3fe07d2009c7ac441512c494cfd139002b7e49ae2b23cc6323da3903004262930adc89f21077960c88 Filesys-Notify-Simple-0.13.tar.gz" +sha512sums="45fe097beb925e913af9c48704f5f550931c70673455258249127dff27abe1955e0e968f37c7c0f4c798a20be78b1055362c69ec2906e8e2633b21f68b198208 Filesys-Notify-Simple-0.14.tar.gz" diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD index b72c57592..e93b026a1 100644 --- a/user/perl-games-solitaire-verify/APKBUILD +++ b/user/perl-games-solitaire-verify/APKBUILD @@ -13,15 +13,14 @@ arch="noarch" license="MIT" depends="perl-class-xsaccessor perl-dir-manifest perl-exception-class perl-list-moreutils" -makedepends="perl-dev perl-module-build" checkdepends="perl-test-differences perl-path-tiny" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { perl Build.PL installdirs=vendor - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` ./Build } diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD index 16c87aa10..6ac163fb6 100644 --- a/user/perl-gd/APKBUILD +++ b/user/perl-gd/APKBUILD @@ -1,4 +1,3 @@ -# Automatically generated by apkbuild-cpan, template 1 # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-gd @@ -12,7 +11,7 @@ pkgdesc="Perl module for GD graphics library" url="https://metacpan.org/release/GD" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="" +depends="perl" makedepends="perl-dev perl-extutils-pkgconfig freetype-dev libgd-dev libjpeg-turbo-dev libpng-dev libwebp-dev zlib-dev" subpackages="$pkgname-doc" @@ -20,7 +19,7 @@ source="http://search.cpan.org/CPAN/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgv builddir="$srcdir/$_pkgreal-$pkgver" build() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + export CFLAGS="$(perl -MConfig -E 'say $Config{ccflags}')" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/user/perl-gdgraph/APKBUILD b/user/perl-gdgraph/APKBUILD index 394b95fbe..db2b2f67e 100644 --- a/user/perl-gdgraph/APKBUILD +++ b/user/perl-gdgraph/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Produce charts from Perl using GD" url="https://metacpan.org/release/GDGraph" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-gd perl-gdtextutil" +depends="perl perl-gd perl-gdtextutil" checkdepends="perl-capture-tiny perl-test-exception" makedepends="perl-dev" subpackages="$pkgname-doc" diff --git a/user/perl-gdtextutil/APKBUILD b/user/perl-gdtextutil/APKBUILD index 49dad183a..446a4c47e 100644 --- a/user/perl-gdtextutil/APKBUILD +++ b/user/perl-gdtextutil/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Text utilities for use with GD's Perl interface" url="https://metacpan.org/release/GDTextUtil" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-gd" +depends="perl perl-gd" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD index e0bffefdf..b5492009c 100644 --- a/user/perl-getopt-long-descriptive/APKBUILD +++ b/user/perl-getopt-long-descriptive/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Simpler Perl implementation of Getopt::Long" url="https://metacpan.org/release/Getopt-Long-Descriptive" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-params-validate perl-sub-exporter" -makedepends="perl-dev" +depends="perl perl-params-validate perl-sub-exporter" checkdepends="perl-cpan-meta-check perl-test-fatal perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-hash-defhash/APKBUILD b/user/perl-hash-defhash/APKBUILD new file mode 100644 index 000000000..cd4df455d --- /dev/null +++ b/user/perl-hash-defhash/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-hash-defhash +_pkgreal=Hash-DefHash +_author=PERLANCAR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.071 +pkgrel=0 +pkgdesc="Perl module for providing an OO interface to hashes" +url="https://metacpan.org/pod/Hash::DefHash" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl perl-string-trim-more" +checkdepends="perl-test-exception" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/Hash-DefHash-$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="0ab03b03f3269e4afa5027335cfbae5cf24023762268eebdbff6e086bb7c5cf2089b96cf7ee69b400afa29b98212d9441701a297a8c9cc5ac76267cf764d92cf Hash-DefHash-0.071.tar.gz" diff --git a/user/perl-hash-fieldhash/APKBUILD b/user/perl-hash-fieldhash/APKBUILD new file mode 100644 index 000000000..6cdef3d9a --- /dev/null +++ b/user/perl-hash-fieldhash/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-hash-fieldhash +pkgver=0.15 +pkgrel=0 +pkgdesc="Lightweight fields for inside-out Perl objects" +url="https://metacpan.org/pod/Hash::FieldHash" +arch="all" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl" +checkdepends="perl-test-leaktrace" +makedepends="perl-dev perl-module-build" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/G/GF/GFUJI/Hash-FieldHash-$pkgver.tar.gz" +builddir="$srcdir/Hash-FieldHash-$pkgver" + +build() { + PERL5LIB="." perl Build.PL --destdir="$pkgdir" --prefix="/usr" --installdirs="vendor" + ./Build +} + +check() { + ./Build test +} + +package() { + ./Build install +} + +sha512sums="2f42b0e7efdba03b99c9646882afc47130de1989777eb1ceaf8031769a3a11ebdaa841abedea8288b770aa27c44108846d0765f531a35d707e44a8c1f0f8036e Hash-FieldHash-0.15.tar.gz" diff --git a/user/perl-hash-multivalue/APKBUILD b/user/perl-hash-multivalue/APKBUILD index f034200c1..3be9274d3 100644 --- a/user/perl-hash-multivalue/APKBUILD +++ b/user/perl-hash-multivalue/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Hash-MultiValue" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-html-formatter/APKBUILD b/user/perl-html-formatter/APKBUILD index 9fc2e5fcd..1d8127cf2 100644 --- a/user/perl-html-formatter/APKBUILD +++ b/user/perl-html-formatter/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="HTML formatters for Perl" url="https://metacpan.org/release/HTML-Formatter" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-file-slurper perl-font-afm perl-html-tree" +depends="perl perl-file-slurper perl-font-afm perl-html-tree" checkdepends="perl-test-warnings" makedepends="perl-dev" subpackages="$pkgname-doc" @@ -19,18 +19,15 @@ source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/user/perl-html-formattext-withlinks/APKBUILD b/user/perl-html-formattext-withlinks/APKBUILD index 656a4cf5b..8e9c9878f 100644 --- a/user/perl-html-formattext-withlinks/APKBUILD +++ b/user/perl-html-formattext-withlinks/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl-based HTML-to-text converter with links as footnotes" url="https://metacpan.org/release/HTML-FormatText-WithLinks" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-html-formatter perl-html-tree perl-uri" +depends="perl perl-html-formatter perl-html-tree perl-uri" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-html-scrubber/APKBUILD b/user/perl-html-scrubber/APKBUILD index 179574648..762f8367b 100644 --- a/user/perl-html-scrubber/APKBUILD +++ b/user/perl-html-scrubber/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/HTML-Scrubber" arch="noarch" options="!check" # insane amount of test pods that no other module uses license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-html-parser" +depends="perl perl-html-parser" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-html-tree/APKBUILD b/user/perl-html-tree/APKBUILD index c6009558c..4239e8fa8 100644 --- a/user/perl-html-tree/APKBUILD +++ b/user/perl-html-tree/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="DOM tree structure parser for Perl" url="https://metacpan.org/release/HTML-Tree" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-html-parser" +depends="perl perl-html-parser" checkdepends="perl-test-fatal" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" diff --git a/user/perl-http-entity-parser/APKBUILD b/user/perl-http-entity-parser/APKBUILD index e4fd7abe7..ea37b802a 100644 --- a/user/perl-http-entity-parser/APKBUILD +++ b/user/perl-http-entity-parser/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=HTTP-Entity-Parser _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.21 +pkgver=0.22 pkgrel=0 pkgdesc="PSGI compliant HTTP entity parser for Perl" url="https://metacpan.org/release/HTTP-Entity-Parser" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-hash-multivalue perl-http-multipartparser perl-json-maybexs +depends="perl perl-hash-multivalue perl-http-multipartparser perl-json-maybexs perl-stream-buffered perl-www-form-urlencoded" checkdepends="perl-http-message" makedepends="perl-dev perl-module-build-tiny" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3852741017748205d9e030a6a42d5a949e3497c5e119713d81c9bf6ee42f9a0a822e65f4be9b8785840b6e81841c7715d34aabcb9b8d950611ce528f702fffd1 HTTP-Entity-Parser-0.21.tar.gz" +sha512sums="fc54b92af197ec4dbdb1069f5a7a8db0892483f80a3737f4914cb6d03dd0ec01b2b215bed96b6736474d2d484516071926774610ace475199cae44174cc2abd0 HTTP-Entity-Parser-0.22.tar.gz" diff --git a/user/perl-http-headers-fast/APKBUILD b/user/perl-http-headers-fast/APKBUILD index f6709826f..83192f746 100644 --- a/user/perl-http-headers-fast/APKBUILD +++ b/user/perl-http-headers-fast/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Fast HTTP header parsing for Perl" url="https://metacpan.org/release/HTTP-Headers-Fast" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-http-date" +depends="perl perl-http-date" checkdepends="perl-test-requires perl-uri" makedepends="perl-dev perl-module-build-tiny" subpackages="$pkgname-doc" diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD index 08a28e060..3aeb91912 100644 --- a/user/perl-importer/APKBUILD +++ b/user/perl-importer/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-importer _pkgreal=Importer @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Importer" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD index 39027a11d..d9fe7b5fa 100644 --- a/user/perl-indirect/APKBUILD +++ b/user/perl-indirect/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-indirect _pkgreal=indirect diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD index b6fb45555..ed895b5ae 100644 --- a/user/perl-inline-c/APKBUILD +++ b/user/perl-inline-c/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Inline::C" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl perl-inline perl-pegex perl-parse-recdescent" -makedepends="perl-dev perl-file-sharedir-install" checkdepends="perl-test-warn perl-yaml-libyaml perl-file-copy-recursive" +makedepends="perl-dev perl-file-sharedir-install" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD index 35da3125f..bfb2cdff5 100644 --- a/user/perl-inline/APKBUILD +++ b/user/perl-inline/APKBUILD @@ -2,18 +2,18 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline _pkgreal=Inline -_author=TINITA +_author=INGY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.83 +pkgver=0.86 pkgrel=0 pkgdesc="Write Perl Subroutines in Other Programming Languages" url="https://metacpan.org/pod/Inline" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-warn" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="83ebc1f6e836117a49e991117be2a650c077ecd368b50547b80176b8da1ab776c12ee9615b54d30f07cc4ec9b1456929e6a940e52e3a05d8d8df568ad32709cd Inline-0.83.tar.gz" +sha512sums="d7f5a15f66c686c89dbc0b6aa3e2496b939683befeb5033b242b4d5281cc1ed6bb5d7303f51059177e042d6fe8c903e4df535099b60eb16dbef431b50a179ac0 Inline-0.86.tar.gz" diff --git a/user/perl-io-stringy/APKBUILD b/user/perl-io-stringy/APKBUILD index af975f67b..58564455e 100644 --- a/user/perl-io-stringy/APKBUILD +++ b/user/perl-io-stringy/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-io-stringy -_pkgreal=IO-stringy -_author=DSKOLL +_pkgreal=IO-Stringy +_author=CAPOEIRAB _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.111 +pkgver=2.113 pkgrel=0 pkgdesc="I/O on in-core objects like strings and arrays" url="https://metacpan.org/release/IO-stringy" @@ -16,8 +16,7 @@ subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` +build() { PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } @@ -31,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a IO-stringy-2.111.tar.gz" +sha512sums="5af104766c20b4336649dc4a19554ad204506c2476b4bf7d8ad7c2cfab15f0296efadb9019cd57e770a2a3c5f5686f7f010bddbd6efd51d300c54ca36286f094 IO-Stringy-2.113.tar.gz" diff --git a/user/perl-io-tty/APKBUILD b/user/perl-io-tty/APKBUILD index 972526fed..9fac80940 100644 --- a/user/perl-io-tty/APKBUILD +++ b/user/perl-io-tty/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=IO-Tty _author=TODDR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.12 +pkgver=1.14 pkgrel=0 pkgdesc="Low-level allocate a pseudo-tty" url="https://metacpan.org/pod/IO::Tty" arch="all" license="Artistic-1.0-Perl" -depends="" +depends="perl" 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="23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d IO-Tty-1.12.tar.gz" +sha512sums="4d6a5299f87eab0281f5e26953bc1537d760d88c486de9c8512750af733d5e466e059400a310746eb8fe432b8c8dcb82055c4cfbb1d31e25c9ce874557618305 IO-Tty-1.14.tar.gz" diff --git a/user/perl-ipc-system-simple/APKBUILD b/user/perl-ipc-system-simple/APKBUILD index b037e8bae..4d23b778d 100644 --- a/user/perl-ipc-system-simple/APKBUILD +++ b/user/perl-ipc-system-simple/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-ipc-system-simple _pkgreal=IPC-System-Simple -_author=PJF +_author=JKEENAN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.25 +pkgver=1.26 pkgrel=0 pkgdesc="Run commands from Perl with detailed diagnostics" url="https://metacpan.org/release/IPC-System-Simple" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fda275786605eb80acaa6062cc51c32aa0e84f150e7ca7afcfe874f088ce7b8f9a97669e91bec24fdb05426db8b0f05552aa8853e44b08996e625281d1892f72 IPC-System-Simple-1.25.tar.gz" +sha512sums="cf9a0ba99ecb080010f9da995d5985501dc61fb4254c4ba0c0033000e5f2678f728feb8cf3f96324439fcc77dbd76da6a509e0b75203ef37a8ca11bf1a2aa2bb IPC-System-Simple-1.26.tar.gz" diff --git a/user/perl-json-rpc/APKBUILD b/user/perl-json-rpc/APKBUILD index 6f0aac32e..74126858d 100644 --- a/user/perl-json-rpc/APKBUILD +++ b/user/perl-json-rpc/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Perl JSON RPC 2.0 server implementation" url="https://metacpan.org/release/JSON-RPC" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-cgi perl-class-accessor-lite perl-json perl-libwww perl-plack - perl-router-simple" +depends="perl perl-cgi perl-class-accessor-lite perl-json perl-libwww + perl-plack perl-router-simple" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-list-moreutils-xs/APKBUILD b/user/perl-list-moreutils-xs/APKBUILD index c1cb2c2e2..786d7c9e6 100644 --- a/user/perl-list-moreutils-xs/APKBUILD +++ b/user/perl-list-moreutils-xs/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util in XS" url="https://metacpan.org/release/List-MoreUtils-XS" arch="all" license="Apache-2.0" -depends="" +depends="perl" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-list-moreutils/APKBUILD b/user/perl-list-moreutils/APKBUILD index 044cc6a63..13253c8e8 100644 --- a/user/perl-list-moreutils/APKBUILD +++ b/user/perl-list-moreutils/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util" url="https://metacpan.org/release/List-MoreUtils" arch="noarch" license="Apache-2.0" -depends="perl-exporter-tiny" +depends="perl perl-exporter-tiny" makedepends="perl-dev perl-list-moreutils-xs" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-list-someutils-xs/APKBUILD b/user/perl-list-someutils-xs/APKBUILD index 57eb8b154..98eb4db65 100644 --- a/user/perl-list-someutils-xs/APKBUILD +++ b/user/perl-list-someutils-xs/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/List-SomeUtils-XS" arch="all" license="Artistic-2.0" depends="" -makedepends="perl-dev" checkdepends="perl-test-leaktrace perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-list-someutils/APKBUILD b/user/perl-list-someutils/APKBUILD index b7cb4c779..90759cf3d 100644 --- a/user/perl-list-someutils/APKBUILD +++ b/user/perl-list-someutils/APKBUILD @@ -5,15 +5,15 @@ _pkgreal=List-SomeUtils _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.56 +pkgver=0.58 pkgrel=0 pkgdesc="Provide the stuff missing in Perl's List::Util module" url="https://metacpan.org/release/List-SomeUtils" arch="noarch" license="Artistic-1.0-Perl" depends="perl-list-someutils-xs perl-module-implementation" -makedepends="perl-dev" checkdepends="perl-test-leaktrace" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b74c2a97811185d21bfd68fe60606afe8e92c266e98a763d51589021c9b3ae5310275005dc80198b8f9d92118fed569b5251d5ad87643f47af75a478db388503 List-SomeUtils-0.56.tar.gz" +sha512sums="e45f05dbd82914bf804cc1ee00c808b6f8b4f2c80f852db55b3efb13cfe1601c34926e4c7966887a75ef49fd0fb2bd43adf48d12c72687464ece4e2b5a697ff4 List-SomeUtils-0.58.tar.gz" diff --git a/user/perl-log-any-adapter-screen/APKBUILD b/user/perl-log-any-adapter-screen/APKBUILD new file mode 100644 index 000000000..7631325e1 --- /dev/null +++ b/user/perl-log-any-adapter-screen/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-log-any-adapter-screen +_pkgreal=Log-Any-Adapter-Screen +_author=PERLANCAR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.140 +pkgrel=0 +pkgdesc="Perl module for logging to GNU screen" +url="https://metacpan.org/pod/Log::Any::Adapter::Screen" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl perl-log-any screen" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/Log-Any-Adapter-Screen-$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="a7ded27bbc548108169e59964783ba6200c3afd798219bcd9daea47c390128db628c30392eb7eaebb93b5e3b59f51c717599518130b3ba31a1765cca3b4c362c Log-Any-Adapter-Screen-0.140.tar.gz" diff --git a/user/perl-log-any/APKBUILD b/user/perl-log-any/APKBUILD index 913a545ff..a62488a8f 100644 --- a/user/perl-log-any/APKBUILD +++ b/user/perl-log-any/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Log-Any _author=PREACTION _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.707 +pkgver=1.708 pkgrel=0 pkgdesc="Bring Perl loggers and listeners together" url="https://metacpan.org/release/Log-Any" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b5fc37130b3bb07c9fac896c539657fffad2e80c2055a09816e133e48f3f5db9a3b896ea11bf087b5fe6844a72fb6189656a3033c7761c00f471282747e1c290 Log-Any-1.707.tar.gz" +sha512sums="7cb86cb376140cd99a1f5aca97e5991ae958dbea39c64db3f095663341160cda055572694679f281581e0ba5c2a74d92c27a13aaed6b40f33c6f95d0c3ac7523 Log-Any-1.708.tar.gz" diff --git a/user/perl-lwp-protocol-https/APKBUILD b/user/perl-lwp-protocol-https/APKBUILD index 840e93e64..6512088a6 100644 --- a/user/perl-lwp-protocol-https/APKBUILD +++ b/user/perl-lwp-protocol-https/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="HTTPS support for Perl LWP" url="https://metacpan.org/release/LWP-Protocol-https" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-io-socket-ssl perl-libwww perl-mozilla-ca perl-net-http" +depends="perl perl-io-socket-ssl perl-libwww perl-mozilla-ca perl-net-http" checkdepends="perl-test-requiresinternet" makedepends="perl-dev" subpackages="$pkgname-doc" diff --git a/user/perl-module-build-xsutil/APKBUILD b/user/perl-module-build-xsutil/APKBUILD index ffcc9fbd6..108843fe2 100644 --- a/user/perl-module-build-xsutil/APKBUILD +++ b/user/perl-module-build-xsutil/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Build::XSUtil" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl perl-module-build perl-devel-checkcompiler" -makedepends="perl-dev" checkdepends="perl-capture-tiny perl-cwd-guard perl-file-copy-recursive-reduced" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-module-implementation/APKBUILD b/user/perl-module-implementation/APKBUILD index 9605051f1..ce019078c 100644 --- a/user/perl-module-implementation/APKBUILD +++ b/user/perl-module-implementation/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Loads an underlying implementation of a Perl module" url="https://metacpan.org/release/Module-Implementation" arch="noarch" license="Artistic-2.0" -depends="perl-module-runtime perl-try-tiny" -makedepends="perl-dev" +depends="perl perl-module-runtime perl-try-tiny" checkdepends="perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-module-runtime/APKBUILD b/user/perl-module-runtime/APKBUILD index fc79c7f95..11a19b383 100644 --- a/user/perl-module-runtime/APKBUILD +++ b/user/perl-module-runtime/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Runtime" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-pod perl-test-pod-coverage" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-moo/APKBUILD b/user/perl-moo/APKBUILD index 7c0fc33ea..400733dec 100644 --- a/user/perl-moo/APKBUILD +++ b/user/perl-moo/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Moo _author=HAARG _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.003004 +pkgver=2.003006 pkgrel=0 pkgdesc="Minimalist Object Orientation (with Moose compatibility)" url="https://metacpan.org/pod/Moo" @@ -13,8 +13,8 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl perl-module-runtime perl-devel-globaldestruction perl-class-method-modifiers perl-sub-quote perl-role-tiny" -makedepends="perl-dev" checkdepends="perl-test-fatal" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="686996e4dd0238cff7483e4e06db5439660e390c67e65ace67c3fd0b05ade379a168d36ae649812c8a5e2b715eefea7cb17e5db323a0cd31b90667d8954eb38a Moo-2.003004.tar.gz" +sha512sums="151875a67aeaf78afdd678964ca3bae36dfd13d2290b5ffb903f648deeb1157ee3829f7310b7fae3a899404cfeaea211b57cb3f6e6d611bf39e8209a7bef2863 Moo-2.003006.tar.gz" diff --git a/user/perl-moose/APKBUILD b/user/perl-moose/APKBUILD index 86b7e557d..b716f58fc 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.2011 +pkgver=2.2012 pkgrel=0 pkgdesc="A postmodern object system for Perl 5" url="https://metacpan.org/release/Moose" @@ -17,9 +17,9 @@ depends="perl-class-load perl-class-load-xs perl-data-optlist perl-module-runtime-conflicts perl-mro-compat perl-package-deprecationmanager perl-params-util perl-sub-exporter perl-sub-identify perl-sub-name perl-try-tiny" -makedepends="perl-dev" -checkdepends="perl-cpan-meta-check perl-dist-checkconflicts +checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-output perl-test-cleannamespaces perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -38,4 +38,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f94ed23c45a860b9afa8defe7f5067a65fdd9d457d94a85e4ea192640d09ad73bc336a2e54c4c663643ec0efa32872f4b2aa69083e99093e420cecf5430f34a3 Moose-2.2011.tar.gz" +sha512sums="195079c32ce0110ae5d76bc1753b9e5c9aa8b3132049912d85600b7d29470b3426e10ccac50a24acbadbb8e00b68c99a98ca975a001b12096b02f2fa1c1264f3 Moose-2.2012.tar.gz" diff --git a/user/perl-moosex-getopt/APKBUILD b/user/perl-moosex-getopt/APKBUILD index ca0caabf3..d1a835f95 100644 --- a/user/perl-moosex-getopt/APKBUILD +++ b/user/perl-moosex-getopt/APKBUILD @@ -12,10 +12,10 @@ url="https://metacpan.org/release/MooseX-Getopt" arch="noarch" license="Artistic-1.0-Perl" depends="perl-getopt-long-descriptive perl-moose perl-moosex-role-parameterised - perl-namespace-autoclean perl-try-tiny" -makedepends="perl-dev perl-module-build-tiny" + perl-namespace-autoclean perl-try-tiny perl" checkdepends="perl-moosex-strictconstructor perl-path-tiny perl-test-deep perl-test-fatal perl-test-needs perl-test-trap perl-test-warnings" +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" diff --git a/user/perl-moosex-role-parameterised/APKBUILD b/user/perl-moosex-role-parameterised/APKBUILD index 1589d37bb..26946518e 100644 --- a/user/perl-moosex-role-parameterised/APKBUILD +++ b/user/perl-moosex-role-parameterised/APKBUILD @@ -11,9 +11,11 @@ pkgdesc="Perl Moose roles with composition parameters" url="https://metacpan.org/release/MooseX-Role-Parameterized" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-module-runtime perl-moose perl-namespace-autoclean perl-namespace-clean" +depends="perl perl-module-runtime perl-moose perl-namespace-autoclean + perl-namespace-clean" +checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal + perl-test-requires" makedepends="perl-dev perl-module-build-tiny" -checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal perl-test-requires" provides="perl-moosex-role-parameterized=$pkgver-r$pkgrel" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-moosex-strictconstructor/APKBUILD b/user/perl-moosex-strictconstructor/APKBUILD index c0778ec92..4aa583aef 100644 --- a/user/perl-moosex-strictconstructor/APKBUILD +++ b/user/perl-moosex-strictconstructor/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Ensure unknown attributes passed to Perl Moose ctors are errors" url="https://metacpan.org/release/MooseX-StrictConstructor" arch="noarch" license="Artistic-2.0" -depends="perl-moose perl-namespace-autoclean" -makedepends="perl-dev" +depends="perl perl-moose perl-namespace-autoclean" checkdepends="perl-moo perl-test-fatal perl-test-needs" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-moox-late/APKBUILD b/user/perl-moox-late/APKBUILD index 7238eacfc..5bae5212a 100644 --- a/user/perl-moox-late/APKBUILD +++ b/user/perl-moox-late/APKBUILD @@ -5,15 +5,15 @@ _pkgreal=MooX-late _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.015 +pkgver=0.016 pkgrel=0 pkgdesc="Translate Moose code into Moo" url="https://metacpan.org/release/MooX-late" arch="noarch" license="Artistic-1.0-Perl" depends="perl-moo perl-type-tiny" -makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4d685f4e68abe10487a98def8f0e7b0bafbd9928af27e61a5ac410bcafa9833a4aebdc8cd5bdbebd1a6ee53b4b0d5ae9bfa3864cae428b21c926730365fefb6d MooX-late-0.015.tar.gz" +sha512sums="d2d53ad531a87e711c78a08e94852b80492cb62120c513ff0a80fb5cffcf8f5eacec227a3dececd03fe47612c3829ff44918c09b7561143c172ef8eff2d49346 MooX-late-0.016.tar.gz" diff --git a/user/perl-moox-struct/APKBUILD b/user/perl-moox-struct/APKBUILD new file mode 100644 index 000000000..116e1a0cc --- /dev/null +++ b/user/perl-moox-struct/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-moox-struct +_pkgreal=MooX-Struct +_author=TOBYINK +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.017 +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" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/MooX-Struct-$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="6877065c1ece8c7bef78871e76d279e9a35b7cf0ae6b499dcfb6f02e2fb6ad2a1c73823bb54b434ed8012eb3e8426a530155eae24e3053db46cfca7ff6ce8329 MooX-Struct-0.017.tar.gz" diff --git a/user/perl-moox-types-mooselike/APKBUILD b/user/perl-moox-types-mooselike/APKBUILD index 5200b3397..b9e4db2f0 100644 --- a/user/perl-moox-types-mooselike/APKBUILD +++ b/user/perl-moox-types-mooselike/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Moose-like types for Perl Moo" url="https://metacpan.org/release/MooX-Types-MooseLike" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-module-runtime perl-moo" +depends="perl perl-module-runtime perl-moo" checkdepends="perl-test-fatal" makedepends="perl-dev" subpackages="$pkgname-doc" diff --git a/user/perl-moox/APKBUILD b/user/perl-moox/APKBUILD index 33605c480..eacc40aba 100644 --- a/user/perl-moox/APKBUILD +++ b/user/perl-moox/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl module for using Moo and MooX:: lazily" url="https://metacpan.org/release/MooX" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-data-optlist perl-import-into perl-module-runtime perl-moo" +depends="perl perl-data-optlist perl-import-into perl-module-runtime perl-moo" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD index 8aea1d200..638aea5bf 100644 --- a/user/perl-mouse/APKBUILD +++ b/user/perl-mouse/APKBUILD @@ -12,8 +12,9 @@ url="https://metacpan.org/pod/Mouse" arch="all" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" +checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace + perl-test-output perl-test-requires perl-try-tiny" makedepends="perl-dev perl-module-build-xsutil" -checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace perl-test-output perl-test-requires perl-try-tiny" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD index 97aa29a51..4d7e17f53 100644 --- a/user/perl-multidimensional/APKBUILD +++ b/user/perl-multidimensional/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-multidimensional _pkgreal=multidimensional @@ -11,7 +11,7 @@ pkgdesc="Perl module for disabling multidimensional array emulation" url="https://metacpan.org/pod/multidimensional" arch="all" license="Artistic-1.0-Perl" -depends="" +depends="perl" makedepends="perl-b-hooks-op-check perl-dev perl-extutils-depends" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-namespace-autoclean/APKBUILD b/user/perl-namespace-autoclean/APKBUILD index ecb87e181..2ef2b5600 100644 --- a/user/perl-namespace-autoclean/APKBUILD +++ b/user/perl-namespace-autoclean/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Keep imports out of your Perl namespace" url="https://metacpan.org/release/namespace-autoclean" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify" -makedepends="perl-dev" +depends="perl perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify" checkdepends="perl-moo perl-moose perl-mouse perl-test-requires perl-test-needs" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-namespace-clean/APKBUILD b/user/perl-namespace-clean/APKBUILD index 822d22d81..f7a4677cf 100644 --- a/user/perl-namespace-clean/APKBUILD +++ b/user/perl-namespace-clean/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Keep imports and functions out of your Perl namespace" url="https://metacpan.org/release/namespace-clean" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-b-hooks-endofscope perl-package-stash" +depends="perl perl-b-hooks-endofscope perl-package-stash" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD new file mode 100644 index 000000000..7291dbaa2 --- /dev/null +++ b/user/perl-net-dbus/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-net-dbus +_pkgreal=Net-DBus +_author=DANBERR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=1.2.0 +pkgrel=0 +pkgdesc="Perl interface for dbus" +url="https://metacpan.org/release/Net-DBus" +arch="all" +license="GPL-2.0+ OR Artistic-1.0-Perl" +depends="perl perl-xml-twig" +checkdepends="perl-cpan-changes perl-test-pod perl-test-pod-coverage" +makedepends="dbus-dev perl-dev perl-extutils-pkgconfig" +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="9dc95288ae81037985020e18db33331de6908b1280fc3b0ca898c183a5b577d21d240f4f1045393f9459a9be6e3425feffa9ea581e6af2bcf165cdf48348b255 Net-DBus-1.2.0.tar.gz" diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD index 1fe4d5df9..ab5d1483c 100644 --- a/user/perl-net-snmp/APKBUILD +++ b/user/perl-net-snmp/APKBUILD @@ -1,5 +1,4 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-snmp _pkgreal=Net-SNMP @@ -12,14 +11,13 @@ pkgdesc="Object oriented interface to SNMP" url="https://metacpan.org/release/Net-SNMP" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" -depends="perl-crypt-des perl-crypt-rijndael perl-digest-hmac perl-digest-sha1" +depends="perl perl-crypt-des perl-crypt-rijndael perl-digest-hmac perl-digest-sha1" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://search.cpan.org/CPAN/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" build() { - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` perl Build.PL installdirs=vendor ./Build } diff --git a/user/perl-number-compare/APKBUILD b/user/perl-number-compare/APKBUILD index b56b735dc..9ff48e4fa 100644 --- a/user/perl-number-compare/APKBUILD +++ b/user/perl-number-compare/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Number-Compare" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD index c81342876..dd99a6970 100644 --- a/user/perl-number-range/APKBUILD +++ b/user/perl-number-range/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-number-range _pkgreal=Number-Range @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Number::Range" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-object-id/APKBUILD b/user/perl-object-id/APKBUILD new file mode 100644 index 000000000..2f40bf887 --- /dev/null +++ b/user/perl-object-id/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-object-id +_pkgreal=Object-ID +_author=MSCHWERN +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.1.2 +pkgrel=0 +pkgdesc="Unique identifiers for Perl objects" +url="https://metacpan.org/pod/Object::ID" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl perl-module-build perl-hash-fieldhash perl-data-uuid + perl-sub-name" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-v$pkgver" + +build() { + perl Build.PL --destdir="$pkgdir" --prefix="/usr" --installdirs="vendor" + ./Build +} + +check() { + ./Build test +} + +package() { + ./Build install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="ac43a0c1d5b789052f4740a9dc726ef8bf197d88f1a6410ad98c7d8d5371c0419d763578f19a418bdd81c8c19f8ea43a461c6bbad31a7971d13f0452b48fb206 Object-ID-v0.1.2.tar.gz" diff --git a/user/perl-package-deprecationmanager/APKBUILD b/user/perl-package-deprecationmanager/APKBUILD index 74676a255..bb8a8f8b6 100644 --- a/user/perl-package-deprecationmanager/APKBUILD +++ b/user/perl-package-deprecationmanager/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Manage deprecation warnings for your Perl distribution" url="https://metacpan.org/release/Package-DeprecationManager" arch="noarch" license="Artistic-2.0" -depends="perl-package-stash perl-params-util perl-sub-install perl-sub-name" -makedepends="" +depends="perl perl-package-stash perl-params-util perl-sub-install perl-sub-name" checkdepends="perl-test-fatal perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-package-stash-xs/APKBUILD b/user/perl-package-stash-xs/APKBUILD index 2555e5739..f0f96a947 100644 --- a/user/perl-package-stash-xs/APKBUILD +++ b/user/perl-package-stash-xs/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Faster and more correct implementation of Package::Stash" url="https://metacpan.org/release/Package-Stash-XS" arch="all" license="Artistic-1.0-Perl" -depends="" -makedepends="perl-dev" +depends="perl" checkdepends="perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-package-stash/APKBUILD b/user/perl-package-stash/APKBUILD index ab8a0b910..fe596936a 100644 --- a/user/perl-package-stash/APKBUILD +++ b/user/perl-package-stash/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Package-Stash" arch="noarch" license="Artistic-1.0-Perl" depends="perl-module-implementation perl-package-stash-xs" -makedepends="perl-dev" checkdepends="perl-dist-checkconflicts perl-test-fatal perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD index 8e194b501..fea0b4e57 100644 --- a/user/perl-parallel-forkmanager/APKBUILD +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-parallel-forkmanager _pkgreal=Parallel-ForkManager @@ -13,7 +13,7 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl perl-moo" checkdepends="perl-test-warn" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-params-util/APKBUILD b/user/perl-params-util/APKBUILD index 17fb32693..55899e69d 100644 --- a/user/perl-params-util/APKBUILD +++ b/user/perl-params-util/APKBUILD @@ -1,4 +1,3 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-params-util _pkgreal=Params-Util diff --git a/user/perl-params-validate/APKBUILD b/user/perl-params-validate/APKBUILD index 0cecdda67..902196fd4 100644 --- a/user/perl-params-validate/APKBUILD +++ b/user/perl-params-validate/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Validate Perl method/function parameters" url="https://metacpan.org/release/Params-Validate" arch="all" license="Artistic-2.0" -depends="perl-module-implementation" -makedepends="perl-dev perl-module-build" +depends="perl perl-module-implementation" checkdepends="perl-test-fatal perl-test-requires" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-params-validationcompiler/APKBUILD b/user/perl-params-validationcompiler/APKBUILD index 9b2a8e462..7ec16a1fe 100644 --- a/user/perl-params-validationcompiler/APKBUILD +++ b/user/perl-params-validationcompiler/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Params-ValidationCompiler" arch="noarch" options="!check" # many, many, many unpackaged test deps license="Artistic-2.0" -depends="perl-class-xsaccessor perl-eval-closure perl-exception-class" +depends="perl perl-class-xsaccessor perl-eval-closure perl-exception-class" checkdepends="perl-specio" makedepends="perl-dev" subpackages="$pkgname-doc" diff --git a/user/perl-parse-recdescent/APKBUILD b/user/perl-parse-recdescent/APKBUILD index 62beda77e..04b1037c1 100644 --- a/user/perl-parse-recdescent/APKBUILD +++ b/user/perl-parse-recdescent/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Parse::RecDescent" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-warn perl-test-pod" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-patchreader/APKBUILD b/user/perl-patchreader/APKBUILD index ae6e4e42b..360477487 100644 --- a/user/perl-patchreader/APKBUILD +++ b/user/perl-patchreader/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/PatchReader" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD index edc9d6b0a..785d2ee3c 100644 --- a/user/perl-path-iterator-rule/APKBUILD +++ b/user/perl-path-iterator-rule/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-path-iterator-rule _pkgreal=Path-Iterator-Rule @@ -11,9 +11,9 @@ pkgdesc="Perl module for terative, recursive file-finding" url="https://metacpan.org/pod/Path::Iterator::Rule" arch="noarch" license="Apache-2.0" -depends="perl-file-pushd perl-number-compare perl-path-tiny perl-test-deep +depends="perl perl-file-pushd perl-number-compare perl-path-tiny perl-test-deep perl-test-filename perl-text-glob perl-try-tiny" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-path-tiny/APKBUILD b/user/perl-path-tiny/APKBUILD index 6a88deb6c..e30f0bbdd 100644 --- a/user/perl-path-tiny/APKBUILD +++ b/user/perl-path-tiny/APKBUILD @@ -5,15 +5,15 @@ _pkgreal=Path-Tiny _author=DAGOLDEN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.108 +pkgver=0.112 pkgrel=0 pkgdesc="File path utility" url="https://metacpan.org/pod/Path::Tiny" arch="noarch" license="Apache-2.0" depends="perl" -makedepends="" checkdepends="perl-test-mockrandom" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="21cbc8ec84474a2fc14b77a2c8b659676d4842a87a7572497c0dd6ba1c2e5f91cdefa30fc9578fdc416d8c8ee4155ff302833925c1fdf9242c898ba6a0ebee13 Path-Tiny-0.108.tar.gz" +sha512sums="c387192fc42a78aee506fa332fd9fcd385fbc28fed02bc41b9c50e4cff6c65700ad3fd9d840871ef3bf7a8029719d8fd8b84f993ac816ff65c8d4e2203ad3b3f Path-Tiny-0.112.tar.gz" diff --git a/user/perl-pegex/APKBUILD b/user/perl-pegex/APKBUILD index 9bd8df39d..e8d845a1c 100644 --- a/user/perl-pegex/APKBUILD +++ b/user/perl-pegex/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Pegex" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-file-sharedir-install" checkdepends="perl-yaml-libyaml" +makedepends="perl-file-sharedir-install" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-perl-tidy/APKBUILD b/user/perl-perl-tidy/APKBUILD index 8c9693b05..50fa1b800 100644 --- a/user/perl-perl-tidy/APKBUILD +++ b/user/perl-perl-tidy/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Perl-Tidy" arch="noarch" license="GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-perlio-utf8_strict/APKBUILD b/user/perl-perlio-utf8_strict/APKBUILD index 32b32758d..90a01a560 100644 --- a/user/perl-perlio-utf8_strict/APKBUILD +++ b/user/perl-perlio-utf8_strict/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/PerlIO-utf8_strict" arch="all" license="Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" checkdepends="perl-test-exception" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-plack/APKBUILD b/user/perl-plack/APKBUILD index fcac54b8f..6cea46688 100644 --- a/user/perl-plack/APKBUILD +++ b/user/perl-plack/APKBUILD @@ -16,9 +16,9 @@ depends="perl-apache-logformat-compiler perl-cookie-baker perl-devel-stacktrace perl-file-sharedir-install perl-filesys-notify-simple perl-hash-multivalue perl-http-entity-parser perl-http-headers-fast perl-http-message perl-stream-buffered perl-try-tiny perl-uri - perl-www-form-urlencoded" + perl-www-form-urlencoded perl" checkdepends="perl-test-requires perl-test-tcp" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD index 4715fffbe..69a0129eb 100644 --- a/user/perl-pod-constants/APKBUILD +++ b/user/perl-pod-constants/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod-constants _pkgreal=Pod-Constants @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Pod::Constants" arch="noarch" license="Artistic-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-pod-coverage/APKBUILD b/user/perl-pod-coverage/APKBUILD index 7bd736aaa..23b7afc41 100644 --- a/user/perl-pod-coverage/APKBUILD +++ b/user/perl-pod-coverage/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Checks if the documentation of a module is comprehensive" url="https://metacpan.org/pod/Pod::Coverage" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-devel-symdump" -makedepends="" +depends="perl perl-devel-symdump" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-posix-strftime-compiler/APKBUILD b/user/perl-posix-strftime-compiler/APKBUILD index 8cc92189b..5d5e4181b 100644 --- a/user/perl-posix-strftime-compiler/APKBUILD +++ b/user/perl-posix-strftime-compiler/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/POSIX-strftime-Compiler" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="perl-module-build" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD index 51ea21c2a..c495e0b8e 100644 --- a/user/perl-probe-perl/APKBUILD +++ b/user/perl-probe-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-probe-perl _pkgreal=Probe-Perl @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Probe::Perl" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-re-engine-re2/APKBUILD b/user/perl-re-engine-re2/APKBUILD new file mode 100644 index 000000000..dcee65c4e --- /dev/null +++ b/user/perl-re-engine-re2/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-re-engine-re2 +_pkgreal=re-engine-RE2 +_author=DGL +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.13 +pkgrel=0 +pkgdesc="RE2-based regex engine for Perl" +url="https://metacpan.org/pod/re::engine::RE2" +arch="all" +options="!check" # broken tests, I'm shocked +license="(Artistic-2.0 OR GPL-2.0-only) AND BSD-3-Clause" +depends="perl" +makedepends="perl-dev perl-extutils-cppguess" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/re-engine-RE2-$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="c0c04f9115b4d84786bbac7de461a2b133dcea3986f2586739d9aabc8c50b0bd66409118d9cc3397236a138c78779327844abe48d116b0b56d82e40311520cca re-engine-RE2-0.13.tar.gz" diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD index 4adb207f6..114d16c3c 100644 --- a/user/perl-regexp-common/APKBUILD +++ b/user/perl-regexp-common/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-common _pkgreal=Regexp-Common @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Regexp::Common" arch="noarch" license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD index 1b47b7406..3453eea72 100644 --- a/user/perl-regexp-pattern-license/APKBUILD +++ b/user/perl-regexp-pattern-license/APKBUILD @@ -1,18 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern-license _pkgreal=Regexp-Pattern-License _author=JONASS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.1.94 +pkgver=3.1.102 pkgrel=0 pkgdesc="Perl module for regex-matching legal licenses" url="https://metacpan.org/pod/Regexp::Pattern::License" arch="noarch" license="GPL-3.0+" -depends="perl-regexp-pattern perl-strictures perl-try-tiny" -makedepends="" +depends="perl perl-re-engine-re2 perl-regexp-pattern perl-strictures + perl-test-regexp-pattern perl-try-tiny" +checkdepends="perl-test-requires" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" @@ -31,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0111b27733a84b0d1aa64310a2b48072f4e9840f46a5d1937a6379e4c3b22396c09e947f451fea9202d4f912d95d2cc259d1f70fcfa00c263cf88bc344227bb8 Regexp-Pattern-License-v3.1.94.tar.gz" +sha512sums="4f3f877eff3a3035d23d04b00ecc9e2448cf9efd5fced3d67f5babc8a60de9bc60312e59944329883508e31e70b52b2756e36955d912612eddd9d95db0738155 Regexp-Pattern-License-v3.1.102.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 55c780f00..4ab828d5e 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern _pkgreal=Regexp-Pattern _author=PERLANCAR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.2.9 +pkgver=0.2.13 pkgrel=0 pkgdesc="Perl framework for regex collection standardization" url="https://metacpan.org/pod/Regexp::Pattern" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-test-exception" -makedepends="" +depends="perl perl-test-exception" +makedepends="perl-dev" 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="5d08dad97ef9bf97a3a42132bee176b50da4cee9a399761f6189f39f70d6486a0c0915c5a00996be7d6d02092814cbd911c1d56775c72b103c511da95e9794c0 Regexp-Pattern-0.2.9.tar.gz" +sha512sums="174bdba6540a9593f99850f71ef919582e0a61c9079b89480fd1c817df5c40f7300c1402c9a9b1cc6844a0eb6af9ef48fac35ef1646754d1700759e94381114e Regexp-Pattern-0.2.13.tar.gz" diff --git a/user/perl-role-tiny/APKBUILD b/user/perl-role-tiny/APKBUILD index 91602644a..e61fa15b1 100644 --- a/user/perl-role-tiny/APKBUILD +++ b/user/perl-role-tiny/APKBUILD @@ -5,14 +5,14 @@ _pkgreal=Role-Tiny _author=HAARG _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.001003 +pkgver=2.001004 pkgrel=0 pkgdesc="A minimalist role composition tool" url="https://metacpan.org/pod/Role::Tiny" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" 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="27105e0b5daf780364b48d4d8c9bc6e845b69b70966822d853fa17882c1fb8137c117464bbb03fab0c755f2f9cc5ae9cdb636ce9f7cb3bdd6ad5bae234b52238 Role-Tiny-2.001003.tar.gz" +sha512sums="818373746cc4d86f87f9f88adf7f108de396f135e5dd1e380bf7722503675cacd9ee1d0d1f1eb2cd7851e50121504f94db02b3b67512d4069d7fdec94e441130 Role-Tiny-2.001004.tar.gz" diff --git a/user/perl-router-simple/APKBUILD b/user/perl-router-simple/APKBUILD index dbcfe7c27..2b4d2202a 100644 --- a/user/perl-router-simple/APKBUILD +++ b/user/perl-router-simple/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Simple HTTP router for Perl" url="https://metacpan.org/release/Router-Simple" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-class-accessor-lite" -makedepends="perl-module-build" +depends="perl perl-class-accessor-lite" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-scope-guard/APKBUILD b/user/perl-scope-guard/APKBUILD index a7c047af1..884d96003 100644 --- a/user/perl-scope-guard/APKBUILD +++ b/user/perl-scope-guard/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Scope-Guard" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -27,7 +27,6 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/user/perl-soap-lite/APKBUILD b/user/perl-soap-lite/APKBUILD index 464b72f21..b14da2660 100644 --- a/user/perl-soap-lite/APKBUILD +++ b/user/perl-soap-lite/APKBUILD @@ -13,9 +13,9 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-class-inspector perl-io-sessiondata perl-io-socket-ssl perl-libwww perl-lwp-protocol-https perl-task-weaken perl-uri - perl-xml-parser perl-xml-parser-lite" + perl-xml-parser perl-xml-parser-lite perl" checkdepends="perl-test-warn" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD index a462cd961..0e28bc4a4 100644 --- a/user/perl-software-license/APKBUILD +++ b/user/perl-software-license/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-software-license _pkgreal=Software-License @@ -11,8 +11,8 @@ pkgdesc="Perl module for generating prefilled license text" url="https://metacpan.org/pod/Software::License" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-data-section perl-text-template perl-try-tiny" -makedepends="" +depends="perl perl-data-section perl-text-template perl-try-tiny" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD index bd2860b5e..c79e65b6c 100644 --- a/user/perl-sort-key/APKBUILD +++ b/user/perl-sort-key/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sort-key _pkgreal=Sort-Key diff --git a/user/perl-specio-library-path-tiny/APKBUILD b/user/perl-specio-library-path-tiny/APKBUILD index e8710d952..793639532 100644 --- a/user/perl-specio-library-path-tiny/APKBUILD +++ b/user/perl-specio-library-path-tiny/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Path::Tiny types and coercions for Specio" url="https://metacpan.org/release/Specio-Library-Path-Tiny" arch="noarch" license="Apache-2.0" -depends="perl-file-pushd perl-path-tiny perl-specio" -makedepends="" +depends="perl perl-file-pushd perl-path-tiny perl-specio" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-specio/APKBUILD b/user/perl-specio/APKBUILD index 00eabaa23..e4b98e930 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.44 +pkgver=0.45 pkgrel=0 pkgdesc="Type constraints and coercions for Perl" url="https://metacpan.org/release/Specio" @@ -14,8 +14,8 @@ license="Artistic-2.0" depends="perl-devel-stacktrace perl-eval-closure perl-mro-compat perl-module-runtime perl-role-tiny perl-sub-quote perl-test-fatal perl-try-tiny" -makedepends="" checkdepends="perl-test-needs" +makedepends="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5292927383ff3eef3c32a81188a108c009367644117af23b31665550cc4b51d47f0bc0c6791dce3caebb27cd7a92307370f41afe62b65682205cd91b7e99cd43 Specio-0.44.tar.gz" +sha512sums="28c32b155ddd1537e2ed2e634b667c4010903a4c68e4684f07f4bb74414eeaf5f5ef05f4ed898c830751abfacc51280b00970250db1b2e1219acc23e834994d7 Specio-0.45.tar.gz" diff --git a/user/perl-stream-buffered/APKBUILD b/user/perl-stream-buffered/APKBUILD index 5490b6459..7f0f33e91 100644 --- a/user/perl-stream-buffered/APKBUILD +++ b/user/perl-stream-buffered/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Stream-Buffered" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD index ee70baec6..4593d1b79 100644 --- a/user/perl-strictures/APKBUILD +++ b/user/perl-strictures/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-strictures _pkgreal=strictures @@ -11,8 +11,8 @@ pkgdesc="Perl module for using strict and fatal warnings" url="https://metacpan.org/pod/strictures" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-bareword-filehandles perl-indirect perl-multidimensional" -makedepends="" +depends="perl perl-bareword-filehandles perl-indirect perl-multidimensional" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD index 1f9e7ba12..ce456a524 100644 --- a/user/perl-string-copyright/APKBUILD +++ b/user/perl-string-copyright/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-copyright _pkgreal=String-Copyright @@ -11,8 +11,8 @@ pkgdesc="Perl module for normalizing copyright text" url="https://metacpan.org/pod/String::Copyright" arch="noarch" license="GPL-3.0+" -depends="perl-exporter-tiny perl-number-range" -makedepends="" +depends="perl perl-exporter-tiny perl-number-range" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD index dcaddac1a..ce9e32862 100644 --- a/user/perl-string-escape/APKBUILD +++ b/user/perl-string-escape/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-escape _pkgreal=String-Escape @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/String::Escape" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-string-shellquote/APKBUILD b/user/perl-string-shellquote/APKBUILD index 306ec6e07..927ad5427 100644 --- a/user/perl-string-shellquote/APKBUILD +++ b/user/perl-string-shellquote/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/String-ShellQuote" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-string-trim-more/APKBUILD b/user/perl-string-trim-more/APKBUILD new file mode 100644 index 000000000..ec5b2f896 --- /dev/null +++ b/user/perl-string-trim-more/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-string-trim-more +_pkgreal=String-Trim-More +_author=PERLANCAR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.03 +pkgrel=0 +pkgdesc="Perl utilities for trimming strings" +url="https://metacpan.org/pod/String::Trim::More" +arch="noarch" +license="Artistic-2.0 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/String-Trim-More-$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="b9c1613bfe736f24b875bd1aaed485d0902ffa7f0e2a8ca65e8e735a37c32199008fca7de6dac5e37cb4aacbee8bf12f61731e0868dddea18620f471548c1493 String-Trim-More-0.03.tar.gz" diff --git a/user/perl-sub-exporter-progressive/APKBUILD b/user/perl-sub-exporter-progressive/APKBUILD index 6a7d681f6..c8ad23970 100644 --- a/user/perl-sub-exporter-progressive/APKBUILD +++ b/user/perl-sub-exporter-progressive/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Only use Sub::Exporter if you need it" url="https://metacpan.org/pod/Sub::Exporter::Progressive" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-sub-exporter" -makedepends="" +depends="perl perl-sub-exporter" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-sub-exporter/APKBUILD b/user/perl-sub-exporter/APKBUILD index 7416bb22e..2af5726b6 100644 --- a/user/perl-sub-exporter/APKBUILD +++ b/user/perl-sub-exporter/APKBUILD @@ -1,5 +1,3 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-exporter _pkgreal=Sub-Exporter @@ -13,7 +11,7 @@ url="https://metacpan.org/release/Sub-Exporter" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl-data-optlist perl-sub-install perl-params-util" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD index ba2ccfe70..ad01d3757 100644 --- a/user/perl-sub-info/APKBUILD +++ b/user/perl-sub-info/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-info _pkgreal=Sub-Info @@ -11,8 +11,8 @@ pkgdesc="Perl module for introspecting subroutines" url="https://metacpan.org/pod/Sub::Info" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-importer" -makedepends="" +depends="perl perl-importer" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-sub-install/APKBUILD b/user/perl-sub-install/APKBUILD index 543c17783..bb6eac5d7 100644 --- a/user/perl-sub-install/APKBUILD +++ b/user/perl-sub-install/APKBUILD @@ -1,4 +1,3 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-install _pkgreal=Sub-Install diff --git a/user/perl-sub-quote/APKBUILD b/user/perl-sub-quote/APKBUILD index 25fcc7845..427d8b410 100644 --- a/user/perl-sub-quote/APKBUILD +++ b/user/perl-sub-quote/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Sub-Quote" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="" checkdepends="perl-test-fatal" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-task-freecellsolver-testing/APKBUILD b/user/perl-task-freecellsolver-testing/APKBUILD index 6b9a60751..2e2641814 100644 --- a/user/perl-task-freecellsolver-testing/APKBUILD +++ b/user/perl-task-freecellsolver-testing/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Perl module for testing the Freecell Solver package" url="https://metacpan.org/release/Task-FreecellSolver-Testing" arch="noarch" license="MIT" -depends="perl-code-tidyall perl-env-path perl-file-which +depends="perl perl-code-tidyall perl-env-path perl-file-which perl-games-solitaire-verify perl-inline perl-inline-c perl-list-moreutils perl-moo perl-moox perl-moox-late perl-path-tiny perl-string-shellquote perl-task-test-run-allplugins diff --git a/user/perl-task-test-run-allplugins/APKBUILD b/user/perl-task-test-run-allplugins/APKBUILD index 34a6dfa3a..6d584013c 100644 --- a/user/perl-task-test-run-allplugins/APKBUILD +++ b/user/perl-task-test-run-allplugins/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Install all the Test::Run plugins" url="https://metacpan.org/release/Task-Test-Run-AllPlugins" arch="noarch" license="MIT" -depends="perl-test-run perl-test-run-cmdline +depends="perl perl-test-run perl-test-run-cmdline perl-test-run-plugin-alternateinterpreters perl-test-run-plugin-breakonfailure perl-test-run-plugin-colourfileverdicts diff --git a/user/perl-task-weaken/APKBUILD b/user/perl-task-weaken/APKBUILD index 8dfccee17..db595447b 100644 --- a/user/perl-task-weaken/APKBUILD +++ b/user/perl-task-weaken/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Ensure Perl platform has weaken support" url="https://metacpan.org/release/Task-Weaken" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-sub-name" -makedepends="" +depends="perl perl-sub-name" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-template-gd/APKBUILD b/user/perl-template-gd/APKBUILD index 0807ba40e..967e24f89 100644 --- a/user/perl-template-gd/APKBUILD +++ b/user/perl-template-gd/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Use GD from Perl's Template Toolkit" url="https://metacpan.org/release/Template-GD" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-gd perl-template-toolkit" -makedepends="" +depends="perl perl-gd perl-template-toolkit" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index bcc8d0c5e..40c898c4a 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/release/Template-Toolkit" arch="all" license="Artistic-1.0-Perl" depends="perl-appconfig" -makedepends="perl-dev" checkdepends="perl-cgi perl-test-leaktrace" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD index 6cbe47d52..2cc51c4d1 100644 --- a/user/perl-term-size-any/APKBUILD +++ b/user/perl-term-size-any/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-any _pkgreal=Term-Size-Any @@ -11,8 +11,8 @@ pkgdesc="Perl module for retrieving terminal sizing" url="https://metacpan.org/pod/Term::Size::Any" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-devel-hide perl-term-size-perl" -makedepends="" +depends="perl perl-devel-hide perl-term-size-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" diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD index 64f392b32..599757534 100644 --- a/user/perl-term-size-perl/APKBUILD +++ b/user/perl-term-size-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-perl _pkgreal=Term-Size-Perl @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Term::Size::Perl" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD index 866194359..9faf22bf0 100644 --- a/user/perl-term-table/APKBUILD +++ b/user/perl-term-table/APKBUILD @@ -1,19 +1,19 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-table _pkgreal=Term-Table _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.013 +pkgver=0.015 pkgrel=0 pkgdesc="Perl module for producing pretty tables for terminal applications" url="https://metacpan.org/pod/Term::Table" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-importer" -makedepends="" +depends="perl perl-importer" checkdepends="perl-test-simple" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e327b0856b1f3d97056f3bd057fa3b22b7dd3b1263313f2a3f81cf0986c2dc5692c7e40e7eb1de321cb718fce0dcfd9cc4ba57ad159a0b38ee3f0af982ce8d46 Term-Table-0.013.tar.gz" +sha512sums="2f5cbc28d0d0f76a6269892055871c103a65d9fd9836d3a0b7c7320cf1439d27cba596453f1d94bd324bd4d4dffdd0eb672801aa23f9a8609310a28eca15dd87 Term-Table-0.015.tar.gz" diff --git a/user/perl-test-class-most/APKBUILD b/user/perl-test-class-most/APKBUILD index f9e407693..9ddeb7543 100644 --- a/user/perl-test-class-most/APKBUILD +++ b/user/perl-test-class-most/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Test Perl classes the easy way" url="https://metacpan.org/release/Test-Class-Most" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-test-class perl-test-most" -makedepends="" +depends="perl perl-test-class perl-test-most" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-class/APKBUILD b/user/perl-test-class/APKBUILD index fd784beb2..ed59d1bc3 100644 --- a/user/perl-test-class/APKBUILD +++ b/user/perl-test-class/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Create Perl test classes in xUnit/JUnit style" url="https://metacpan.org/release/Test-Class" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-module-runtime perl-mro-compat perl-try-tiny" -makedepends="" +depends="perl perl-module-runtime perl-mro-compat perl-try-tiny" checkdepends="perl-test-exception" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-cleannamespaces/APKBUILD b/user/perl-test-cleannamespaces/APKBUILD index afcf5a7fd..c4b260329 100644 --- a/user/perl-test-cleannamespaces/APKBUILD +++ b/user/perl-test-cleannamespaces/APKBUILD @@ -11,11 +11,11 @@ pkgdesc="Check Perl code for uncleaned imports" url="https://metacpan.org/release/Test-CleanNamespaces" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-file-pushd perl-module-runtime perl-namespace-clean +depends="perl perl-file-pushd perl-module-runtime perl-namespace-clean perl-package-stash perl-sub-identify" -makedepends="" checkdepends="perl-moo perl-mouse perl-sub-exporter perl-test-deep perl-test-needs perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-command-simple/APKBUILD b/user/perl-test-command-simple/APKBUILD new file mode 100644 index 000000000..27ebb0f99 --- /dev/null +++ b/user/perl-test-command-simple/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-test-command-simple +pkgver=0.05 +pkgrel=0 +pkgdesc="Simple interface for testing external commands in Perl" +url="https://metacpan.org/pod/Test::Command::Simple" +arch="noarch" +license="Artistic-2.0 OR GPL-1.0+" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/D/DM/DMCBRIDE/Test-Command-Simple-$pkgver.tar.gz" +builddir="$srcdir/Test-Command-Simple-$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="65c921785d775a782dae9d3a3b81350374cb97bb09dd604aab71aeaed4e6818e32d8fd60c97b88d3d11ff9be8e28f0c082246e4c8981f1e36b6268464fc71c9b Test-Command-Simple-0.05.tar.gz" diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD index 4c364a153..a1027ddd4 100644 --- a/user/perl-test-command/APKBUILD +++ b/user/perl-test-command/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-command _pkgreal=Test-Command @@ -14,7 +14,7 @@ url="https://metacpan.org/release/Test-Command" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-module-build" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-data-split/APKBUILD b/user/perl-test-data-split/APKBUILD index 93e7e0c54..7d55b1116 100644 --- a/user/perl-test-data-split/APKBUILD +++ b/user/perl-test-data-split/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Split data-driven Perl tests into several test scripts" url="https://metacpan.org/release/Test-Data-Split" arch="noarch" license="MIT" -depends="perl-io-all perl-list-moreutils perl-moox perl-moox-late" -makedepends="perl-module-build" +depends="perl perl-io-all perl-list-moreutils perl-moox perl-moox-late" checkdepends="perl-test-differences" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-deep/APKBUILD b/user/perl-test-deep/APKBUILD index bba7fbd1d..b41b1e20a 100644 --- a/user/perl-test-deep/APKBUILD +++ b/user/perl-test-deep/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::Deep" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-differences/APKBUILD b/user/perl-test-differences/APKBUILD index 0db0fa3b6..cc77d3c06 100644 --- a/user/perl-test-differences/APKBUILD +++ b/user/perl-test-differences/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Test strings and data structures and show differences if not ok" url="https://metacpan.org/pod/Test::Differences" arch="noarch" license="Artistic-1.0-Perl OR GPL-1.0" -depends="perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod" -makedepends="" +depends="perl perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD index 6573c3a00..1067e2e07 100644 --- a/user/perl-test-failwarnings/APKBUILD +++ b/user/perl-test-failwarnings/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-failwarnings _pkgreal=Test-FailWarnings @@ -11,8 +11,8 @@ pkgdesc="Perl module for failing tests on caught warnings" url="https://metacpan.org/pod/Test::FailWarnings" arch="noarch" license="Apache-2.0" -depends="perl-capture-tiny" -makedepends="" +depends="perl perl-capture-tiny" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-file-sharedir/APKBUILD b/user/perl-test-file-sharedir/APKBUILD index e52199be9..a6961c1f3 100644 --- a/user/perl-test-file-sharedir/APKBUILD +++ b/user/perl-test-file-sharedir/APKBUILD @@ -11,10 +11,10 @@ pkgdesc="Module testing support for Perl" url="https://metacpan.org/release/Test-File-ShareDir" arch="noarch" license="Artistic-1.0-Perl or GPL-2.0-only" -depends="perl-class-tiny perl-file-copy-recursive perl-file-sharedir +depends="perl perl-class-tiny perl-file-copy-recursive perl-file-sharedir perl-path-tiny perl-scope-guard" checkdepends="perl-test-fatal" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-file/APKBUILD b/user/perl-test-file/APKBUILD index 8fb30801f..5306421c2 100644 --- a/user/perl-test-file/APKBUILD +++ b/user/perl-test-file/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::File" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="" checkdepends="perl-test-pod perl-test-pod-coverage perl-test-utf8" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD index 5307ae2ff..2bb1a9fb6 100644 --- a/user/perl-test-filename/APKBUILD +++ b/user/perl-test-filename/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-filename _pkgreal=Test-Filename @@ -11,8 +11,8 @@ pkgdesc="Perl module for portable filename comparison" url="https://metacpan.org/pod/Test::Filename" arch="noarch" license="Apache-2.0" -depends="perl-path-tiny perl-try-tiny" -makedepends="" +depends="perl perl-path-tiny perl-try-tiny" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-manifest/APKBUILD b/user/perl-test-manifest/APKBUILD index 30e610f1d..a329fa2f2 100644 --- a/user/perl-test-manifest/APKBUILD +++ b/user/perl-test-manifest/APKBUILD @@ -1,5 +1,3 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-manifest _pkgreal=Test-Manifest @@ -13,7 +11,7 @@ url="https://metacpan.org/release/Test-Manifest" arch="noarch" license="Artistic-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https:///cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-mockrandom/APKBUILD b/user/perl-test-mockrandom/APKBUILD index f7d1b201f..8711be987 100644 --- a/user/perl-test-mockrandom/APKBUILD +++ b/user/perl-test-mockrandom/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::MockRandom" arch="noarch" license="Apache-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-mocktime/APKBUILD b/user/perl-test-mocktime/APKBUILD index b75d9c0d3..030dd3e46 100644 --- a/user/perl-test-mocktime/APKBUILD +++ b/user/perl-test-mocktime/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Test-MockTime" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD index aaaddc298..330107c88 100644 --- a/user/perl-test-more-utf8/APKBUILD +++ b/user/perl-test-more-utf8/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-more-utf8 _pkgreal=Test-More-UTF8 @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::More::UTF8" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-most/APKBUILD b/user/perl-test-most/APKBUILD index deffa4376..7d6895596 100644 --- a/user/perl-test-most/APKBUILD +++ b/user/perl-test-most/APKBUILD @@ -11,8 +11,9 @@ pkgdesc="Most commonly needed Perl test functions and features" url="https://metacpan.org/release/Test-Most" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-exception-class perl-test-deep perl-test-differences perl-test-exception perl-test-warn" -makedepends="" +depends="perl perl-exception-class perl-test-deep perl-test-differences + perl-test-exception perl-test-warn" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-output/APKBUILD b/user/perl-test-output/APKBUILD index 241c8b29c..130871fd0 100644 --- a/user/perl-test-output/APKBUILD +++ b/user/perl-test-output/APKBUILD @@ -1,5 +1,3 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-output _pkgreal=Test-Output @@ -12,9 +10,9 @@ pkgdesc="Utilities to test STDOUT and STDERR messages" url="https://metacpan.org/release/Test-Output" arch="noarch" license="Artistic-2.0" -depends="perl-capture-tiny perl-sub-exporter perl-test-simple" -makedepends="" +depends="perl perl-capture-tiny perl-sub-exporter perl-test-simple" checkdepends="perl-test-pod" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-perltidy/APKBUILD b/user/perl-test-perltidy/APKBUILD index d631c4fa1..29d325646 100644 --- a/user/perl-test-perltidy/APKBUILD +++ b/user/perl-test-perltidy/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Check all your Perl files for tidiness" url="https://metacpan.org/release/Test-PerlTidy" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff" +depends="perl perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff" checkdepends="perl-path-tiny" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-pod-coverage/APKBUILD b/user/perl-test-pod-coverage/APKBUILD index 9992a6bda..35e3e6096 100644 --- a/user/perl-test-pod-coverage/APKBUILD +++ b/user/perl-test-pod-coverage/APKBUILD @@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::Pod::Coverage" arch="noarch" license="Artistic-2.0" depends="perl perl-pod-coverage" -makedepends="" checkdepends="perl-test-pod" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-regexp-pattern/APKBUILD b/user/perl-test-regexp-pattern/APKBUILD new file mode 100644 index 000000000..7b3553695 --- /dev/null +++ b/user/perl-test-regexp-pattern/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-test-regexp-pattern +_pkgreal=Test-Regexp-Pattern +_author=PERLANCAR +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=0.006 +pkgrel=0 +pkgdesc="Perl module for testing regular expression patterns" +url="https://metacpan.org/pod/Test::Regexp::Pattern" +arch="noarch" +license="Artistic-2.0 OR GPL-2.0-only" +depends="perl perl-hash-defhash perl-regexp-pattern" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/Test-Regexp-Pattern-$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="e45e363d63f30bd7255e41873fa9f96755a832d3ee89640f00b39ce4b14606b27be7adfec04d29b1ca949c23bf1000ea89c8743e573985a778e0e81bbcb89e51 Test-Regexp-Pattern-0.006.tar.gz" diff --git a/user/perl-test-run-cmdline/APKBUILD b/user/perl-test-run-cmdline/APKBUILD index e1c32a2af..aa806f921 100644 --- a/user/perl-test-run-cmdline/APKBUILD +++ b/user/perl-test-run-cmdline/APKBUILD @@ -11,10 +11,10 @@ pkgdesc="Analyse tests from the command line using Perl Test::Run" url="https://metacpan.org/release/Test-Run-CmdLine" arch="noarch" license="MIT" -depends="perl-moose perl-moosex-getopt perl-test-run perl-universal-require - perl-yaml-libyaml" -makedepends="" +depends="perl perl-moose perl-moosex-getopt perl-test-run + perl-universal-require perl-yaml-libyaml" checkdepends="perl-test-trap" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-run-plugin-ai/APKBUILD b/user/perl-test-run-plugin-ai/APKBUILD index a48610aa8..4fc3b2de7 100644 --- a/user/perl-test-run-plugin-ai/APKBUILD +++ b/user/perl-test-run-plugin-ai/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Define different interpreters for test scripts with Perl Test::Run" url="https://metacpan.org/release/Test-Run-Plugin-AlternateInterpreters" arch="noarch" license="MIT" -depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" -makedepends="" +depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-run-plugin-bof/APKBUILD b/user/perl-test-run-plugin-bof/APKBUILD index b0e224125..d1bd6da75 100644 --- a/user/perl-test-run-plugin-bof/APKBUILD +++ b/user/perl-test-run-plugin-bof/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Stop processing entire Test::Run suite on single failure" url="https://metacpan.org/release/Test-Run-Plugin-BreakOnFailure" arch="noarch" license="MIT" -depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" -makedepends="" +depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" diff --git a/user/perl-test-run-plugin-cfv/APKBUILD b/user/perl-test-run-plugin-cfv/APKBUILD index a6b38f143..8c8f9438b 100644 --- a/user/perl-test-run-plugin-cfv/APKBUILD +++ b/user/perl-test-run-plugin-cfv/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Make Perl Test::Run file verdicts (ok, not ok) colourful" url="https://metacpan.org/release/Test-Run-Plugin-ColorFileVerdicts" arch="noarch" license="MIT" -depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" -makedepends="" +depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" +makedepends="perl-dev" subpackages="$pkgname-doc" provides="perl-test-run-plugin-colorfileverdicts=$pkgver-r$pkgrel" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-test-run-plugin-cs/APKBUILD b/user/perl-test-run-plugin-cs/APKBUILD index e0e828863..5814e7d28 100644 --- a/user/perl-test-run-plugin-cs/APKBUILD +++ b/user/perl-test-run-plugin-cs/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Perl Test::Run plugin that colours test summary" url="https://metacpan.org/release/Test-Run-Plugin-ColorSummary" arch="noarch" license="MIT" -depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" -makedepends="" +depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" +makedepends="perl-dev" subpackages="$pkgname-doc" provides="perl-test-run-plugin-colorsummary=$pkgver-r$pkgrel" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" diff --git a/user/perl-test-run-plugin-tdf/APKBUILD b/user/perl-test-run-plugin-tdf/APKBUILD index 9a5367aff..3121ebba3 100644 --- a/user/perl-test-run-plugin-tdf/APKBUILD +++ b/user/perl-test-run-plugin-tdf/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Handle excessively long filenames in Perl Test::Run suites" url="https://metacpan.org/release/Test-Run-Plugin-TrimDisplayedFilenames" arch="noarch" license="MIT" -depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" -makedepends="" +depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-run/APKBUILD b/user/perl-test-run/APKBUILD index de126e631..e35eebd21 100644 --- a/user/perl-test-run/APKBUILD +++ b/user/perl-test-run/APKBUILD @@ -11,10 +11,10 @@ pkgdesc="Perl classes to run standard TAP scripts" url="https://metacpan.org/release/Test-Run" arch="noarch" license="MIT" -depends="perl-ipc-system-simple perl-list-moreutils perl-moose +depends="perl perl-ipc-system-simple perl-list-moreutils perl-moose perl-moosex-strictconstructor perl-test-trap perl-text-sprintf-named perl-universal-require" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-runvalgrind/APKBUILD b/user/perl-test-runvalgrind/APKBUILD index 9f7d5b9d5..e6f13fde5 100644 --- a/user/perl-test-runvalgrind/APKBUILD +++ b/user/perl-test-runvalgrind/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Tests an external program is 'valgrind clean' from Perl" url="https://metacpan.org/release/Test-RunValgrind" arch="noarch" license="MIT" -depends="perl-path-tiny perl-test-trap" -makedepends="perl-module-build" +depends="perl perl-path-tiny perl-test-trap valgrind" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz portable-memory-assumptions.patch diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD index 0963e18d5..75ce72031 100644 --- a/user/perl-test-script/APKBUILD +++ b/user/perl-test-script/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-script _pkgreal=Test-Script _author=PLICEASE _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.25 +pkgver=1.26 pkgrel=0 pkgdesc="Perl module for cross-platform script testing" url="https://metacpan.org/pod/Test::Script" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-capture-tiny perl-probe-perl perl-test2-suite" -makedepends="" +depends="perl perl-capture-tiny perl-probe-perl perl-test2-suite" +makedepends="perl-dev" 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="307aeb0692ff4f116bbdadced22526ee583df184742ffde7922e18e2949889b309f57d12dfdc4fef65d55489634dedd77d57fa76ba7b12fc3e58c3bb71b6d81b Test-Script-1.25.tar.gz" +sha512sums="9cca12ff9cb8de394cac760da16b39d371a70fa9624adc8d4e97ee45f0b18ccb41add99716ed6a969aaeb2df5ee3f1aa7cb287e2d93ee8533c89bbd0cf6b2c96 Test-Script-1.26.tar.gz" diff --git a/user/perl-test-sharedfork/APKBUILD b/user/perl-test-sharedfork/APKBUILD index a866b24a9..d1dcce3d4 100644 --- a/user/perl-test-sharedfork/APKBUILD +++ b/user/perl-test-sharedfork/APKBUILD @@ -13,7 +13,7 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" checkdepends="perl-test-requires" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-tcp/APKBUILD b/user/perl-test-tcp/APKBUILD index ade11be97..22ca298d3 100644 --- a/user/perl-test-tcp/APKBUILD +++ b/user/perl-test-tcp/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Testing library for Perl code using TCP" url="https://metacpan.org/release/Test-TCP" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-test-sharedfork" -makedepends="" +depends="perl perl-test-sharedfork" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-time/APKBUILD b/user/perl-test-time/APKBUILD index 51c9ec1e2..0e30b1874 100644 --- a/user/perl-test-time/APKBUILD +++ b/user/perl-test-time/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Test-Time" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-trailingspace/APKBUILD b/user/perl-test-trailingspace/APKBUILD index e84ca6bc1..3da940f14 100644 --- a/user/perl-test-trailingspace/APKBUILD +++ b/user/perl-test-trailingspace/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Test for trailing spaces in Perl source files" url="https://metacpan.org/release/Test-TrailingSpace" arch="noarch" license="MIT" -depends="perl-file-find-object-rule" -makedepends="perl-module-build" +depends="perl perl-file-find-object-rule" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-trap/APKBUILD b/user/perl-test-trap/APKBUILD index fa119c353..fa4764ce1 100644 --- a/user/perl-test-trap/APKBUILD +++ b/user/perl-test-trap/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Trap Perl exit codes, exceptions, and output" url="https://metacpan.org/release/Test-Trap" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-data-dump" -makedepends="" +depends="perl perl-data-dump" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" diff --git a/user/perl-test-utf8/APKBUILD b/user/perl-test-utf8/APKBUILD index 909e0fa45..408a847be 100644 --- a/user/perl-test-utf8/APKBUILD +++ b/user/perl-test-utf8/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::utf8" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="perl-module-install" +makedepends="perl-dev perl-module-install" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-test-warnings/APKBUILD b/user/perl-test-warnings/APKBUILD index 00af77820..978cdc674 100644 --- a/user/perl-test-warnings/APKBUILD +++ b/user/perl-test-warnings/APKBUILD @@ -5,14 +5,14 @@ _pkgreal=Test-Warnings _author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.027 +pkgver=0.028 pkgrel=0 pkgdesc="Test for warnings and the lack of them" url="https://metacpan.org/pod/Test::Warnings" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" -makedepends="" +makedepends="perl-dev" 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="d8e5d2bbddd7119e0b5a45cb23451f664936e120ecb8c579ee5cdeada0aa20592d4f8aaeefce99c4e85052520edd75ccf095580a5a02979a33910ccf4ec57da9 Test-Warnings-0.027.tar.gz" +sha512sums="6e8c1012eeebd3260d36ef0bf731a6351ce704a400e24709009bc72b07a4411d6725ea612e19ad55edca6d985e0ea8d9da3a51713b4c655e5783f3d9e6e39ab0 Test-Warnings-0.028.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index ef075b554..9e3765505 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -1,22 +1,22 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test2-suite _pkgreal=Test2-Suite _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.000126 +pkgver=0.000129 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-importer perl-module-pluggable perl-scope-guard +depends="perl perl-importer perl-module-pluggable perl-scope-guard perl-sub-info perl-term-table perl-test-simple perl-sub-name perl-term-readkey perl-term-size-any perl-unicode-linebreak" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3359bc8071edbeb2ea004648a6ed2da78cc4abdcc8198eb4019f99c7083c85740f3bf2bdf230e80fa72b667e52eab57d4e524b887b37842889a74142c73c6fbd Test2-Suite-0.000126.tar.gz" +sha512sums="0d72ab6998f741ba016e1398a45b751930a016488b7b02117d476d6e8d6656a4de0f2ceae379260472d0eba7e8ca00e6bfa59240ee09c71ed9963be3dfd249da Test2-Suite-0.000129.tar.gz" diff --git a/user/perl-text-diff/APKBUILD b/user/perl-text-diff/APKBUILD index 394263c58..17b4f16d4 100644 --- a/user/perl-text-diff/APKBUILD +++ b/user/perl-text-diff/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Perform diffs on files and record sets" url="https://metacpan.org/pod/Text::Diff" arch="noarch" license="GPL-2.0+ OR Artistic-1.0-Perl" -depends="perl-algorithm-diff" -makedepends="" +depends="perl perl-algorithm-diff" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-text-glob/APKBUILD b/user/perl-text-glob/APKBUILD index 310656f6c..ca186c590 100644 --- a/user/perl-text-glob/APKBUILD +++ b/user/perl-text-glob/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Text-Glob" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-text-sprintf-named/APKBUILD b/user/perl-text-sprintf-named/APKBUILD index 5b2e0125f..8d7ff5b92 100644 --- a/user/perl-text-sprintf-named/APKBUILD +++ b/user/perl-text-sprintf-named/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="sprintf-like function for Perl with named conversions" url="https://metacpan.org/release/Text-Sprintf-Named" arch="noarch" license="MIT" -depends="perl-module-build" -makedepends="" +depends="perl perl-module-build" checkdepends="perl-test-warn" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index 076f1eee5..7afc5ca1d 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-text-template _pkgreal=Text-Template @@ -11,8 +11,8 @@ pkgdesc="Perl module for expanding embedded Perl in templates" url="https://metacpan.org/pod/Text::Template" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-test-more-utf8 perl-test-warnings" -makedepends="" +depends="perl perl-test-more-utf8 perl-test-warnings" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-throwable/APKBUILD b/user/perl-throwable/APKBUILD index d5712bfa5..8a919288c 100644 --- a/user/perl-throwable/APKBUILD +++ b/user/perl-throwable/APKBUILD @@ -11,8 +11,9 @@ pkgdesc="Role for Perl classes that can be thrown" url="https://metacpan.org/release/Throwable" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-devel-stacktrace perl-module-runtime perl-moo perl-sub-quote" -makedepends="" +depends="perl perl-devel-stacktrace perl-module-runtime perl-moo + perl-sub-quote" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-time-duration-parse/APKBUILD b/user/perl-time-duration-parse/APKBUILD index b7bd2c169..7f9c5b6f7 100644 --- a/user/perl-time-duration-parse/APKBUILD +++ b/user/perl-time-duration-parse/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Parse strings in Perl that represent time durations" url="https://metacpan.org/release/Time-Duration-Parse" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-exporter-lite perl-time-duration" -makedepends="" +depends="perl perl-exporter-lite perl-time-duration" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-time-duration/APKBUILD b/user/perl-time-duration/APKBUILD index cdeeaa508..469a307d3 100644 --- a/user/perl-time-duration/APKBUILD +++ b/user/perl-time-duration/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/Time-Duration" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-timedate/APKBUILD b/user/perl-timedate/APKBUILD index f1e1e2bc0..65704784a 100644 --- a/user/perl-timedate/APKBUILD +++ b/user/perl-timedate/APKBUILD @@ -2,19 +2,20 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-timedate _pkgreal=TimeDate -_author=GBARR +_author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.30 +pkgver=2.31 pkgrel=0 pkgdesc="Date and time handling routines for Perl" url="https://metacpan.org/release/TimeDate" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz + " builddir="$srcdir/$_pkgreal-$pkgver" build() { @@ -31,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221 TimeDate-2.30.tar.gz" +sha512sums="abee40d77ce4a57e251575b450406b1d26ac369d05899c1630f996b6f3c0c5ac222b84ff04d6fdf4c0763eb0a5bc45a59edadcfb15c73982787c8c17e0ee2a2a TimeDate-2.31.tar.gz" diff --git a/user/perl-type-tiny/APKBUILD b/user/perl-type-tiny/APKBUILD index 7eb5cbd67..b296afe02 100644 --- a/user/perl-type-tiny/APKBUILD +++ b/user/perl-type-tiny/APKBUILD @@ -5,14 +5,14 @@ _pkgreal=Type-Tiny _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.004004 +pkgver=1.008005 pkgrel=0 pkgdesc="Tiny Moo(se) compatible type constraint" url="https://metacpan.org/release/Type-Tiny" arch="noarch" license="Artistic-1.0-Perl" -depends="perl-exporter-tiny" -makedepends="" +depends="perl perl-exporter-tiny" +makedepends="perl-dev" 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="a1e09c5a3369e0a9ea8e172d86e68e818a720c5c4d633103a442fe389f7a8a7b4a03b2487ffd09f184caf4eca94ef471cc9293b04557b8d4dd260649b4121673 Type-Tiny-1.004004.tar.gz" +sha512sums="70ee8d80e1b1468035e7a354faa605098615f29770d046740c384e2017e207a8fa574fd19b69dc7d0b5b954aa68e01eccc92c4a38bf0d6dc7eb1a090df6fac60 Type-Tiny-1.008005.tar.gz" diff --git a/user/perl-types-serialiser/APKBUILD b/user/perl-types-serialiser/APKBUILD index 1aab72a8d..b9a70810d 100644 --- a/user/perl-types-serialiser/APKBUILD +++ b/user/perl-types-serialiser/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Simple data types for common serialisation formats" url="https://metacpan.org/pod/Types::Serialiser" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-common-sense" -makedepends="" +depends="perl perl-common-sense" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-universal-require/APKBUILD b/user/perl-universal-require/APKBUILD index 6b573becc..73e7604d4 100644 --- a/user/perl-universal-require/APKBUILD +++ b/user/perl-universal-require/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/UNIVERSAL-require" arch="noarch" license="Artistic-1.0-Perl" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-www-form-urlencoded/APKBUILD b/user/perl-www-form-urlencoded/APKBUILD index e10d4a7fd..5a53fa096 100644 --- a/user/perl-www-form-urlencoded/APKBUILD +++ b/user/perl-www-form-urlencoded/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/WWW-Form-UrlEncoded" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="perl-module-build" +makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-x11-xcb/APKBUILD b/user/perl-x11-xcb/APKBUILD index e553e620a..ccf8703c3 100644 --- a/user/perl-x11-xcb/APKBUILD +++ b/user/perl-x11-xcb/APKBUILD @@ -10,14 +10,14 @@ pkgrel=0 pkgdesc="Perl bindings for libxcb" url="https://metacpan.org/pod/X11::XCB" arch="all" +options="!check" # Tests require a running X server license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-extutils-pkgconfig perl-extutils-depends +depends="perl perl-extutils-pkgconfig perl-extutils-depends perl-xs-object-magic perl-data-dump perl-xml-simple perl-xml-descent perl-mouse perl-mousex-nativetraits" +checkdepends="perl-test-deep perl-test-exception" makedepends="perl-dev perl-xs-object-magic-dev libxcb-dev xcb-util-dev xcb-util-wm-dev" -checkdepends="perl-test-deep perl-test-exception" -options="!check" # Tests require a running X server subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xml-descent/APKBUILD b/user/perl-xml-descent/APKBUILD index 7b3f99c12..ad385fbcf 100644 --- a/user/perl-xml-descent/APKBUILD +++ b/user/perl-xml-descent/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Recursive descent XML parsing" url="https://metacpan.org/pod/XML::Descent" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-xml-tokeparser" -makedepends="" +depends="perl perl-xml-tokeparser" checkdepends="perl-test-pod perl-test-differences" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD index b55e4123a..4de6e775e 100644 --- a/user/perl-xml-namespacesupport/APKBUILD +++ b/user/perl-xml-namespacesupport/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-namespacesupport _pkgreal=XML-NamespaceSupport diff --git a/user/perl-xml-parser-lite/APKBUILD b/user/perl-xml-parser-lite/APKBUILD index ad215f020..752e667ca 100644 --- a/user/perl-xml-parser-lite/APKBUILD +++ b/user/perl-xml-parser-lite/APKBUILD @@ -13,7 +13,7 @@ arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" checkdepends="perl-test-requires" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xml-sax-base/APKBUILD b/user/perl-xml-sax-base/APKBUILD index 6cde82c47..a44b135d6 100644 --- a/user/perl-xml-sax-base/APKBUILD +++ b/user/perl-xml-sax-base/APKBUILD @@ -12,7 +12,7 @@ url="https://metacpan.org/release/XML-SAX-Base" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xml-sax/APKBUILD b/user/perl-xml-sax/APKBUILD index f9fbad337..811d79713 100644 --- a/user/perl-xml-sax/APKBUILD +++ b/user/perl-xml-sax/APKBUILD @@ -11,10 +11,10 @@ pkgdesc="Perl SAX parser" url="https://metacpan.org/release/XML-SAX" arch="noarch" license="Artistic-1.0-Perl OR GPL-1.0+" -depends="perl-xml-namespacesupport perl-xml-sax-base" -makedepends="" -install="$pkgname.post-install $pkgname.pre-deinstall" +depends="perl perl-xml-namespacesupport perl-xml-sax-base" +makedepends="perl-dev" subpackages="$pkgname-doc" +install="$pkgname.post-install $pkgname.pre-deinstall" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz install-fix.patch " diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD index 14c99dbf7..62d543912 100644 --- a/user/perl-xml-simple/APKBUILD +++ b/user/perl-xml-simple/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-simple _pkgreal=XML-Simple diff --git a/user/perl-xml-tokeparser/APKBUILD b/user/perl-xml-tokeparser/APKBUILD index 601954f4e..6be97aaa5 100644 --- a/user/perl-xml-tokeparser/APKBUILD +++ b/user/perl-xml-tokeparser/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="Simplified interface to XML::Parser" url="https://metacpan.org/pod/XML::TokeParser" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-xml-parser" -makedepends="" +depends="perl perl-xml-parser" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xml-twig/APKBUILD b/user/perl-xml-twig/APKBUILD index e4c5b6c02..b8307f27e 100644 --- a/user/perl-xml-twig/APKBUILD +++ b/user/perl-xml-twig/APKBUILD @@ -11,8 +11,8 @@ pkgdesc="XML, the Perl way" url="https://metacpan.org/release/XML-Twig" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-xml-parser" -makedepends="" +depends="perl perl-xml-parser" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xmlrpc-lite/APKBUILD b/user/perl-xmlrpc-lite/APKBUILD index 3372e58e0..dc2f7bc8d 100644 --- a/user/perl-xmlrpc-lite/APKBUILD +++ b/user/perl-xmlrpc-lite/APKBUILD @@ -10,10 +10,11 @@ pkgrel=0 pkgdesc="Lightweight Perl implementation of XML-RPC" url="https://metacpan.org/release/XMLRPC-Lite" arch="noarch" +options="!check" # https://rt.cpan.org/Public/Bug/Display.html?id=127761 license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl-soap-lite" +depends="perl perl-soap-lite" checkdepends="perl-dev" -makedepends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-xs-object-magic/APKBUILD b/user/perl-xs-object-magic/APKBUILD index bfbd8ef9e..f708427dd 100644 --- a/user/perl-xs-object-magic/APKBUILD +++ b/user/perl-xs-object-magic/APKBUILD @@ -11,9 +11,9 @@ pkgdesc="Opaque, extensible XS pointer backed objects using sv_magic" url="https://metacpan.org/pod/XS::Object::Magic" arch="all" license="Artistic-1.0-Perl AND GPL-2.0" -depends="perl-module-install perl-extutils-depends" -makedepends="perl-dev" +depends="perl perl-module-install perl-extutils-depends" checkdepends="perl-test-fatal" +makedepends="perl-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 15c79e9a7..25e153a20 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.80 +pkgver=0.81 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="01decde5b5b4576c89ad00985605a77e15201ad492e2122b0e64eb2ff9f8bdee520f15d0302c282339dc0a1806e31265a9c4847d5daadd909cade3e94ef1d98c YAML-LibYAML-0.80.tar.gz" +sha512sums="469ac568f5b7562cb4e58150121f7dbaaf129ce2ae72690e94c644da980a43fb0e1b372c4d674ca5413741af1d2756971341631f03c51bd99479cfe775b7c6e2 YAML-LibYAML-0.81.tar.gz" diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD index adb9914ee..de6f49d36 100644 --- a/user/phonon-vlc/APKBUILD +++ b/user/phonon-vlc/APKBUILD @@ -28,7 +28,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DPHONON_BUILD_PHONON4QT5=True \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/phonon/APKBUILD b/user/phonon/APKBUILD index 0b08f443a..e92cc464e 100644 --- a/user/phonon/APKBUILD +++ b/user/phonon/APKBUILD @@ -2,19 +2,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon pkgver=4.11.1 -pkgrel=0 +pkgrel=1 pkgdesc="Qt library for playing multimedia files" url="https://phonon.kde.org/" arch="all" license="LGPL-2.1-only OR LGPL-3.0-only" depends="" -makedepends="cmake extra-cmake-modules pulseaudio-dev - qt5-qtbase-dev qt5-qttools-dev" -subpackages="$pkgname-dev $pkgname-designer" -source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz - ecm.patch - qt59.patch - " +makedepends="cmake extra-cmake-modules pulseaudio-dev qt5-qtbase-dev + qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-designer $pkgname-lang" +source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -27,11 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \ - -DWITH_GLIB2=TRUE \ - -DWITH_PulseAudio=TRUE \ - -DPHONON_BUILD_PHONON4QT5=TRUE \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -52,6 +45,4 @@ designer() { rmdir "$pkgdir"/usr/lib/qt5/plugins || true # Never mind } -sha512sums="858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 phonon-4.11.1.tar.xz -4de5a7ec143f7bf5068b376b77a1d8acb85225ee87d7ab59cb315ef59be3351305602354b8ef96a1a3fbb17308441704f2c2dfa2fcefadf0560708b4eb377e64 ecm.patch -06614abd2db7634acdf7bd27c026ea4544845bdd995b4bdeb9b1d2c9fa61940bdb839c39c18c4c9c487b95c2a91aae48056742ce2c8e558bd9186a941b8d0bac qt59.patch" +sha512sums="858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 phonon-4.11.1.tar.xz" diff --git a/user/phonon/ecm.patch b/user/phonon/ecm.patch deleted file mode 100644 index 71776a981..000000000 --- a/user/phonon/ecm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- phonon-4.11.1/CMakeLists.txt.old 2019-09-26 10:29:38.000000000 +0000 -+++ phonon-4.11.1/CMakeLists.txt 2019-09-30 21:04:18.966519535 +0000 -@@ -15,7 +15,7 @@ - set(CMAKE_AUTOUIC TRUE) - set(CMAKE_AUTORCC TRUE) - --find_package(ECM 5.60 NO_MODULE) -+find_package(ECM 5.54 NO_MODULE) - set_package_properties(ECM PROPERTIES - TYPE REQUIRED - DESCRIPTION "Extra CMake Modules" diff --git a/user/phonon/qt59.patch b/user/phonon/qt59.patch deleted file mode 100644 index 0ee5d017f..000000000 --- a/user/phonon/qt59.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- phonon-4.11.1/phonon/factory.cpp.old 2019-09-26 10:29:38.000000000 +0000 -+++ phonon-4.11.1/phonon/factory.cpp 2019-09-30 21:07:16.417472319 +0000 -@@ -474,7 +474,11 @@ - } - - // Apply PHONON_BACKEND override if set. -- const QString backendEnv = qEnvironmentVariable("PHONON_BACKEND"); -+ const QByteArray backendVal = qgetenv("PHONON_BACKEND"); -+ if (backendVal.isNull()) { -+ return backendList; -+ } -+ const QString backendEnv = QString::fromLocal8Bit(backendVal); - if (backendEnv.isEmpty()) { - return backendList; - } diff --git a/user/physfs/APKBUILD b/user/physfs/APKBUILD index 86f57e0cc..827e65a44 100644 --- a/user/physfs/APKBUILD +++ b/user/physfs/APKBUILD @@ -8,7 +8,7 @@ url="https://www.icculus.org/physfs" arch="all" license="Zlib" depends="" -makedepends="" +makedepends="cmake" subpackages="$pkgname-dev $pkgname-tools" source="https://icculus.org/physfs/downloads/physfs-$pkgver.tar.bz2" @@ -18,12 +18,11 @@ build() { 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} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/physlock/APKBUILD b/user/physlock/APKBUILD index f9a5f9574..19858bde7 100644 --- a/user/physlock/APKBUILD +++ b/user/physlock/APKBUILD @@ -13,7 +13,8 @@ makedepends="linux-headers linux-pam-dev utmps-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz utmps.patch - makefile.patch" + makefile.patch + " build() { make diff --git a/user/picocom/APKBUILD b/user/picocom/APKBUILD index 274d2e894..289d7d353 100644 --- a/user/picocom/APKBUILD +++ b/user/picocom/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=picocom pkgver=3.1 pkgrel=0 pkgdesc="Minimal dumb-terminal emulation program" url="https://github.com/npat-efault/picocom" arch="all" -options="!check" # No test suite +options="!check" # No test suite. license="BSD-2-Clause AND GPL-2.0+" depends="" makedepends="" diff --git a/user/pidgin-otr/APKBUILD b/user/pidgin-otr/APKBUILD index a1369188d..6d713b2ee 100644 --- a/user/pidgin-otr/APKBUILD +++ b/user/pidgin-otr/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://otr.cypherpunks.ca/pidgin-otr-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD index 5921247b8..83ee02c14 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -7,15 +7,14 @@ url="http://pidgin.im/" arch="all" license="GPL-2.0-only" depends="gst-plugins-base" -makedepends="gtk+-dev perl-dev libsm-dev startup-notification-dev gtkspell-dev +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 + cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev gst-plugins-base-dev farstream-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" LIBS="-lX11 -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -42,12 +41,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pigz/APKBUILD b/user/pigz/APKBUILD index 107019248..0f8ea3a0b 100644 --- a/user/pigz/APKBUILD +++ b/user/pigz/APKBUILD @@ -7,23 +7,21 @@ pkgdesc="Parallel implementation of gzip" url="http://zlib.net/pigz/" arch="all" license="zlib" +depends="" makedepends="zlib-dev" subpackages="$pkgname-doc" source="http://zlib.net/pigz/pigz-$pkgver.tar.gz" build() { - cd "$builddir" export CXXFLAGS="$CXXFLAGS -std=gnu++98" make } check() { - cd "$builddir" make tests } package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/bin mkdir -p "$pkgdir"/usr/share/man/man1 for i in pigz unpigz; do diff --git a/user/pinentry/APKBUILD b/user/pinentry/APKBUILD index 4bacb46e7..c61f941d6 100644 --- a/user/pinentry/APKBUILD +++ b/user/pinentry/APKBUILD @@ -8,14 +8,13 @@ url="https://www.gnupg.org/related_software/pinentry/" arch="all" license="GPL-2.0+" depends="" -makedepends="gtk+-dev libassuan-dev libcap-dev libgpg-error-dev ncurses-dev +makedepends="gtk+2.0-dev libassuan-dev libcap-dev libgpg-error-dev ncurses-dev qt5-qtbase-dev" subpackages="$pkgname-doc $pkgname-gtk $pkgname-qt5" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 pinentry" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +28,10 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/bin/pinentry diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD index 0e545f547..d36f5a1ee 100644 --- a/user/pixman/APKBUILD +++ b/user/pixman/APKBUILD @@ -6,8 +6,9 @@ pkgdesc="Low-level pixel manipulation library" url="https://www.X.Org/" arch="all" license="MIT" +depends="" +makedepends="libpng-dev perl linux-headers" subpackages="$pkgname-dev $pkgname-dbg" -makedepends="perl linux-headers" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2 stacksize-reduction.patch " diff --git a/user/plasma-browser-integration/APKBUILD b/user/plasma-browser-integration/APKBUILD new file mode 100644 index 000000000..dc238a9e4 --- /dev/null +++ b/user/plasma-browser-integration/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-browser-integration +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Integrate Web browsers into the KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kcrash-dev kdbusaddons-dev kfilemetadata-dev ki18n-dev kio-dev knotifications-dev krunner-dev purpose-dev qt5-qtbase-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-browser-integration-$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 + rm -r "$pkgdir"/etc +} + +sha512sums="25f63cd8b5131704d869df67e674cc77dfe7a35a41599e84204fb2dc8617f0d48fe1206d400117eea32bc05d468baa353b927f7713333431071ba145d66dd84d plasma-browser-integration-5.18.3.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index 4d7883931..d2b0489da 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-desktop -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -9,25 +9,26 @@ arch="all" options="!check" # Test suite fails due to keyboard layouts license="GPL-2.0 LGPL-2.1" # theme/visual dependencies -depends="breeze breeze-icons oxygen ttf-liberation" +depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2 + qqc2-desktop-style ttf-liberation" # shell/QML dependencies depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap" # Good Ideas™ to have -depends="$depends consolekit kdeclarative" +depends="$depends consolekit2 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 + kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev kcmutils-dev knewstuff-dev knotifications-dev knotifyconfig-dev attica-dev kwallet-dev krunner-dev kglobalaccel-dev kdeclarative-dev kpeople-dev kdbusaddons-dev kactivities-dev kactivities-stats-dev kconfig-dev kitemmodels-dev plasma-workspace-dev xf86-input-evdev-dev libxkbcommon-dev pulseaudio-dev libcanberra-dev libxkbfile-dev xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev - xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules" + xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules + kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev + qqc2-desktop-style-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz - cmake-fixes.patch - " +source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,7 +42,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -53,5 +54,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc55d9a894c52c44cd2aff844793e038dd66854862a212d47dfb0144dd489c3ae8d2c4e289a1e76c3d31ca68a8543bb511623f96617db799d28009736591c58f plasma-desktop-5.12.8.tar.xz -45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch" +sha512sums="50a856af3763cf84977d1b59fe2d42b89d56b07d06ece54fe63b8d971e7731b2cfbbdb13bb3e5e1ca09143d9f0d97ba66f483cab4962088302398bb46880288a plasma-desktop-5.18.3.tar.xz" diff --git a/user/plasma-desktop/cmake-fixes.patch b/user/plasma-desktop/cmake-fixes.patch deleted file mode 100644 index c6457351a..000000000 --- a/user/plasma-desktop/cmake-fixes.patch +++ /dev/null @@ -1,174 +0,0 @@ -From bcd8015eaf3638fca0e369955aa1a4290d079ef8 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 31 Mar 2019 19:49:40 +0200 -Subject: Harmonize use of HAVE_X11, using cmakedefine01. - -Fixes: config-X11.h:44:18: warning: "TRUE" is not defined, evaluates to 0 [-Wundef] - -It should *all* be ported to cmakedefine01... ---- - CMakeLists.txt | 3 +++ - config-X11.h.cmake | 2 +- - kcms/fonts/fonts.cpp | 4 ++-- - kcms/fonts/fonts.h | 4 ++-- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 036d781..df43295 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,9 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" - TYPE REQUIRED - PURPOSE "Required for building the X11 based workspace" - ) -+if(X11_FOUND) -+ set(HAVE_X11 1) -+endif() - - find_package(UDev) - set_package_properties(UDev PROPERTIES DESCRIPTION "UDev library" -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index f336518..218c3eb 100644 ---- a/kcms/fonts/fonts.cpp -+++ b/kcms/fonts/fonts.cpp -@@ -224,7 +224,7 @@ - } - - /**** FontAASettings ****/ --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - FontAASettings::FontAASettings(QWidget *parent) - : QDialog(parent), - changesMade(false) -@@ -501,13 +501,13 @@ - - void FontAASettings::changed() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - changesMade = true; - enableWidgets(); - #endif - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - int FontAASettings::exec() - { - const int i = QDialog::exec(); -@@ -643,7 +643,7 @@ - QGridLayout *lay = new QGridLayout(); - layout->addLayout(lay); - lay->setColumnStretch(3, 10); --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - QLabel *label = 0L; - label = new QLabel(i18n("Use a&nti-aliasing:"), this); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); -@@ -692,7 +692,7 @@ - lay->addWidget(spinboxDpi, 1, 1); - layout->addStretch(1); - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - aaSettings = new FontAASettings(this); - #endif - -@@ -720,7 +720,7 @@ - fontUseList.at(i)->setDefault(); - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA = AASystem; - cbAA->setCurrentIndex(useAA); - aaSettings->defaults(); -@@ -739,7 +739,7 @@ - (*it)->readFont(); - } - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA_original = useAA = aaSettings->load() ? AAEnabled : AADisabled; - cbAA->setCurrentIndex(useAA); - #endif -@@ -762,7 +762,7 @@ - spinboxDpi->setValue(dpicfg); - dpi_original = dpicfg; - }; --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - if (cfgfonts.readEntry("dontChangeAASettings", true)) { - useAA_original = useAA = AASystem; - cbAA->setCurrentIndex(useAA); -@@ -791,7 +791,7 @@ - } else { - cfgfonts.writeEntry("forceFontDPI", dpi); - } --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - cfgfonts.writeEntry("dontChangeAASettings", cbAA->currentIndex() == AASystem); - #endif - cfgfonts.sync(); -@@ -817,7 +817,7 @@ - // Don't overwrite global settings unless explicitly asked for - e.g. the system - // fontconfig setup may be much more complex than this module can provide. - // TODO: With AASystem the changes already made by this module should be reverted somehow. --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - bool aaSave = false; - if (cbAA->currentIndex() == AAEnabled ) { - aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled); -@@ -870,7 +870,7 @@ - - void KFonts::slotUseAntiAliasing() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - useAA = static_cast< AASetting >(cbAA->currentIndex()); - aaSettingsButton->setEnabled(useAA == AAEnabled); - emit changed(true); -@@ -879,7 +879,7 @@ - - void KFonts::slotCfgAa() - { --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - if (aaSettings->exec()) { - emit changed(true); - } -diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h -index f7ade6b..d760e52 100644 ---- a/kcms/fonts/fonts.h -+++ b/kcms/fonts/fonts.h -@@ -80,7 +80,7 @@ - - public: - --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - FontAASettings(QWidget *parent); - - bool save(KXftConfig::AntiAliasing::State aaState); -@@ -135,7 +135,7 @@ - void slotCfgAa(); - - private: --#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11) -+#if defined(HAVE_FONTCONFIG) && HAVE_X11 - enum AASetting { AAEnabled, AASystem, AADisabled }; - AASetting useAA, useAA_original; - QComboBox *cbAA; --- -cgit v1.1 diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index a0f00850a..fb047de4e 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -15,13 +15,11 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen libx11-dev libxcb-dev graphviz qt5-qtsvg-dev qt5-qttools-dev kdoctools-dev kio-dev kactivities-dev karchive-dev kconfigwidgets-dev kdbusaddons-dev kdeclarative-dev kglobalaccel-dev kguiaddons-dev kiconthemes-dev - kirigami2-dev ki18n-dev knotifications-dev kwayland-dev - qt5-qtquickcontrols2-dev" + kirigami2-dev ki18n-dev knotifications-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/plasma-framework-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,18 +31,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="618f2beb3b8a25cacf7c11339ba15cae10db461c61e278a5ba845e9afac7e9edb48fde16bd78b4bb7d16c07001f8d9fbdbf5bfd58593488a544fa183b3df8c15 plasma-framework-5.54.0.tar.xz" +sha512sums="e4e0ef5fff99518061f79f7eb03fe8048fa8c5d863e8092f05f98dfa0fec8cb1f097d042ffb417434a1b0bd424c0997c4a2c38068bcae30e39324d001ea3ffd0 plasma-framework-5.68.0.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index fbd0642e0..9b173bb13 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-integration -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -29,7 +29,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_DISABLE_FIND_PACKAGE_FontNotoSans=true \ -DCMAKE_DISABLE_FIND_PACKAGE_FontHack=true \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="81c0c14680eee8b81e303ebf874dec11b43cee65f210eed90594a5496f83d59aa8527bb31aab82cc5a045c37ab954b07c6c023083b134d755b8b02bf0c041938 plasma-integration-5.12.8.tar.xz" +sha512sums="1df2bc77ade1ff4f3b858f00dd66c4324bc1b9f1f0a10d1b5481f6432666989a7d57f1407528e1cf8e9cb91519393e6c4d320541c4f970958dce77ffc065c976 plasma-integration-5.18.3.tar.xz" diff --git a/user/plasma-meta/APKBUILD b/user/plasma-meta/APKBUILD new file mode 100644 index 000000000..1ca8ba177 --- /dev/null +++ b/user/plasma-meta/APKBUILD @@ -0,0 +1,20 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-meta +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Metapackage for optional KDE Plasma dependencies" +url="https://www.adelielinux.org/" +arch="noarch" +options="!check" # No tests, it's a metapackage. +license="Public-Domain" +depends="bluedevil breeze-grub drkonqi plasma-browser-integration plasma-pa + plasma-thunderbolt plasma-vault" +makedepends="" +subpackages="" +source="" + +package() { + mkdir -p "$pkgdir" +} + diff --git a/user/plasma-nm/APKBUILD b/user/plasma-nm/APKBUILD new file mode 100644 index 000000000..68a8b860a --- /dev/null +++ b/user/plasma-nm/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-nm +pkgver=5.18.3 +pkgrel=0 +pkgdesc="NetworkManager integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0+" +depends="prison-quick" +makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev + kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdeclarative-dev + ki18n-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kpackage-dev kservice-dev kwallet-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev modemmanager-qt-dev + networkmanager-dev networkmanager-qt-dev plasma-framework-dev + prison-dev qca-dev qt5-qtbase-dev qt5-qtdeclarative-dev solid-dev" +subpackages="$pkgname-lang" +# We don't want to pull NM into plasma-meta, so we do this as a workaround. +install_if="plasma-desktop networkmanager" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-nm-$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="d95a908adf92c21b3eea1561cbebbf241540684afdf3e54c74a7fc6a5198f2c6a3c944f394fd634503b3b51175c65a93a012a9da72712dbe08964ab128a92eca plasma-nm-5.18.3.tar.xz" diff --git a/user/plasma-pa/APKBUILD b/user/plasma-pa/APKBUILD new file mode 100644 index 000000000..4348da799 --- /dev/null +++ b/user/plasma-pa/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-pa +pkgver=5.18.3 +pkgrel=0 +pkgdesc="PulseAudio integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="kirigami2 libcanberra-pulse sound-theme-freedesktop" +makedepends="cmake extra-cmake-modules glib-dev kcoreaddons-dev kdeclarative-dev + kdoctools-dev kglobalaccel-dev ki18n-dev knotifications-dev + libcanberra-dev plasma-framework-dev pulseaudio-dev qt5-qtbase-dev + qt5-qtdeclarative-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-pa-$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="d47a58106a9f6c8dded6478bccfbe1561be2f5239fcbb8d4cb3221a5c5afb4e6c39ed724250e67786a64d01256c6bf276d5b4eb3e1eaec9fc34c0876cda9610f plasma-pa-5.18.3.tar.xz" diff --git a/user/plasma-thunderbolt/APKBUILD b/user/plasma-thunderbolt/APKBUILD new file mode 100644 index 000000000..c127d0a48 --- /dev/null +++ b/user/plasma-thunderbolt/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-thunderbolt +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Thunderbolt device integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires running D-Bus. +license="GPL-2.0-only" +depends="bolt" +makedepends="cmake extra-cmake-modules kcmutils-dev kcoreaddons-dev + knotifications-dev qt5-qtbase-dev qt5-qtdeclarative-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-thunderbolt-$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="0fc0abf69efba6fcae6bb54eab5c4a40517fd3b48ae00a9e53477e6ce2d1ae12eeccfd05f55bb316be27c054a64c24ae01b9d3d543bcc86b753768ba8d0f65d9 plasma-thunderbolt-5.18.3.tar.xz" diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD new file mode 100644 index 000000000..c3f689263 --- /dev/null +++ b/user/plasma-vault/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-vault +pkgver=5.18.3 +pkgrel=0 +pkgdesc="Secure storage plugin for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0-only AND (LGPL-2.1-only OR LGPL-3.0-only)" +depends="encfs" +makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev + kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kio-dev + kwidgetsaddons-dev libksysguard-dev plasma-framework-dev + qt5-qtbase-dev qt5-qtdeclarative-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$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="aac8ec0bb8e7625d14ca9f359eab1db91417c6d9745067a936bb9e6153d7cfa786a5b15f5e952009faa95155f43810dd85cce0015f41df5b8a11ca401c4be693 plasma-vault-5.18.3.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD index e42251f11..8856364b9 100644 --- a/user/plasma-workspace-wallpapers/APKBUILD +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace-wallpapers -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Default wallpapers from KDE" url="https://www.KDE.org/" @@ -23,7 +23,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ac764a16eead6cebbeb720548b15946eba619d5de1d2bb5f74f65f85fa14565e42a26c91a23a3473d4ad4b0c819c0a50a92891018b8ee29e5909229932f1622 plasma-workspace-wallpapers-5.12.8.tar.xz" +sha512sums="a491dce77a9ae207b0c38f2f1b66f57afc9569ed42ef61f0c36c242d9918dfd657ef06214957cc8eefcd2d3b6fd49620850d1dd494616b97e7fd5ed583590382 plasma-workspace-wallpapers-5.18.3.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 036b2b456..f124e61cf 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -13,24 +13,26 @@ depends="kinit qdbus qtpaths xmessage xprop xset xsetroot" # font installation stuff depends="$depends mkfontdir" # QML deps -depends="$depends qt5-qtgraphicaleffects qt5-qtquickcontrols solid" +depends="$depends kquickcharts qt5-qtgraphicaleffects qt5-qtquickcontrols solid" # other runtime deps / plugins depends="$depends libdbusmenu-qt kcmutils kde-cli-tools kded kdesu kio-extras ksysguard kwin milou plasma-integration pulseaudio-utils iso-codes xrdb" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev kitemmodels-dev kservice-dev kwindowsystem-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev - iso-codes-dev libdbusmenu-qt-dev libxtst-dev xcb-util-image-dev + iso-codes-dev libdbusmenu-qt-dev libqalculate-dev libxtst-dev + xcb-util-image-dev libkworkspace-dev baloo-dev kactivities-dev kcmutils-dev kcrash-dev kdbusaddons-dev kdeclarative-dev kdesu-dev kdoctools-dev kglobalaccel-dev kholidays-dev kidletime-dev kjsembed-dev knewstuff-dev knotifyconfig-dev kpackage-dev krunner-dev kscreenlocker-dev ktexteditor-dev ktextwidgets-dev kwallet-dev kwayland-dev kwin-dev kxmlrpcclient-dev libksysguard-dev - plasma-framework-dev prison-dev" + plasma-framework-dev prison-dev kactivities-stats-dev kpeople-dev + kirigami2-dev kuserfeedback-dev libkscreen-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz - cmake-fixes.patch + libkworkspace.patch " build() { @@ -45,7 +47,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -57,5 +59,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c19d338117c5d9b05581fc1be7d99fc60f4453a009a04ddf3609add1fef7ad08bdd0d0c19c0f4151484253036cc444d8301c3fb8ee0d29d8ecc19d9929a9ff8b plasma-workspace-5.12.8.tar.xz -39ea169f50b98fd2dd246396133a3e8d9c844409338c9c3ecd79474945377886c5d1050205ad73c3d8c789315e8a4353311bafa9f1ddd22f25403b3ed7f30fde cmake-fixes.patch" +sha512sums="a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e plasma-workspace-5.18.3.tar.xz +f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch" diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch deleted file mode 100644 index 16307ce31..000000000 --- a/user/plasma-workspace/cmake-fixes.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c534fdf1ba34d0ea8a08b9b5266384a3243271e0 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Feb 2019 20:21:57 +0100 -Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01 everywhere - -I got "#define HAVE_X11 TRUE" and errors because of that where #if was -used. - -This also obeys the logic that HAVE_X11 is set (in the toplevel -CMakeLists.txt) not only when X11_FOUND but also when XCB is found. ---- - appmenu/appmenu.cpp | 2 +- - config-X11.h.cmake | 2 +- - libkworkspace/config-libkworkspace.h.cmake | 2 +- - runners/windows/config-windowsrunner.h.cmake | 2 +- - shell/scripting/appinterface.cpp | 2 +- - soliduiserver/soliduiserver.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp -index 7c956c6..4ab7106 100644 ---- a/appmenu/appmenu.cpp -+++ b/appmenu/appmenu.cpp -@@ -106,7 +106,7 @@ AppMenuModule::~AppMenuModule() = default; - - void AppMenuModule::slotWindowRegistered(WId id, const QString &serviceName, const QDBusObjectPath &menuObjectPath) - { --#ifdef HAVE_X11 -+#if HAVE_X11 - if (KWindowSystem::isPlatformX11()) { - auto *c = QX11Info::connection(); - -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 60286dd..ae8978a 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -41,4 +41,4 @@ - #cmakedefine HAS_RANDR_1_3 1 - - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -+#cmakedefine01 HAVE_X11 -diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/config-libkworkspace.h.cmake -index 36a826e..c3ae6d7 100644 ---- a/libkworkspace/config-libkworkspace.h.cmake -+++ b/libkworkspace/config-libkworkspace.h.cmake -@@ -1,2 +1,2 @@ - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows/config-windowsrunner.h.cmake -index 36a826e..c3ae6d7 100644 ---- a/runners/windows/config-windowsrunner.h.cmake -+++ b/runners/windows/config-windowsrunner.h.cmake -@@ -1,2 +1,2 @@ - /* Define if you have X11 at all */ --#define HAVE_X11 ${X11_FOUND} -\ No newline at end of file -+#cmakedefine01 HAVE_X11 -diff --git a/shell/scripting/appinterface.cpp b/shell/scripting/appinterface.cpp -index bd66cd2..a0ad73c 100644 ---- a/shell/scripting/appinterface.cpp -+++ b/shell/scripting/appinterface.cpp -@@ -37,7 +37,7 @@ - #include <windows.h> - #endif - --#ifdef HAVE_X11 -+#if HAVE_X11 - #include <X11/Xlib.h> - #include <fixx11h.h> - #endif -diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp -index 3ec09c0..d06a1e6 100644 ---- a/soliduiserver/soliduiserver.cpp -+++ b/soliduiserver/soliduiserver.cpp -@@ -219,7 +219,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI - - KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent - --#ifdef HAVE_X11 -+#if HAVE_X11 - if (modal) { - KWindowSystem::setState(dialog->winId(), NET::Modal); - } else { --- -cgit v1.1 - diff --git a/user/plasma-workspace/libkworkspace.patch b/user/plasma-workspace/libkworkspace.patch new file mode 100644 index 000000000..e8e3d93b6 --- /dev/null +++ b/user/plasma-workspace/libkworkspace.patch @@ -0,0 +1,35 @@ +From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 6 +++- + 1 file changed, 5 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e587a386..d1a63527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,6 +63,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.17.90) + + find_package(KScreenLocker 5.17.90 REQUIRED) + find_package(ScreenSaverDBusInterface CONFIG REQUIRED) +@@ -151,7 +151,10 @@ endif() + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + add_subdirectory(doc) +-add_subdirectory(libkworkspace) ++if(NOT LibKWorkspace_FOUND) ++ message(STATUS "System LibKWorkspace not found, using bundled.") ++ add_subdirectory(libkworkspace) ++endif() + add_subdirectory(libdbusmenuqt) + add_subdirectory(appmenu) + +-- +2.19.1 diff --git a/user/plib/APKBUILD b/user/plib/APKBUILD index 46a6ce3d6..f195034f9 100644 --- a/user/plib/APKBUILD +++ b/user/plib/APKBUILD @@ -9,7 +9,7 @@ arch="all" options="!dbg" # No shared libraries license="LGPL-2.0+" depends="" -makedepends="libxi-dev libxmu-dev libxt-dev mesa-dev" +makedepends="autoconf automake libtool libxi-dev libxmu-dev libxt-dev mesa-dev" subpackages="$pkgname-dev" source="http://plib.sourceforge.net/dist/plib-$pkgver.tar.gz fix-openflight.patch @@ -25,7 +25,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD index fde49287d..0e61d02cb 100644 --- a/user/pluma/APKBUILD +++ b/user/pluma/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pluma -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=0 pkgdesc="Text editor for the MATE desktop environment" url="https://mate-desktop.org" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/pluma-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a68b79713f649def15ea29e58e041d70bb6d756a356743f6e06d8dd680f7b39e8bcdd90c68cbe5c517bead7f9263d7596954bc595c3a2501edf0d0ea421c9992 pluma-1.22.2.tar.xz" +sha512sums="390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be pluma-1.24.0.tar.xz" diff --git a/user/pm-quirks/APKBUILD b/user/pm-quirks/APKBUILD index 9b90ead00..c74eb36fd 100644 --- a/user/pm-quirks/APKBUILD +++ b/user/pm-quirks/APKBUILD @@ -6,16 +6,15 @@ pkgrel=0 pkgdesc="Quirks data for pm-utils" url="https://pm-utils.freedesktop.org/wiki/" arch="noarch" -options="!check" # this is a bunch of data files for pm-utils, nothing to check -license="GPL-2.0-only" # same as pm-utils, hopefully +options="!check" # This is a bunch of data files for pm-utils, nothing to check +license="GPL-2.0-only" # same as pm-utils, hopefully depends="pm-utils" makedepends="" source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" package() { - cd "$srcdir" install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks - install -m644 video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ + install -m644 "$srcdir"/video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ } sha512sums="e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc pm-quirks-20100619.tar.gz" diff --git a/user/pm-utils/APKBUILD b/user/pm-utils/APKBUILD index 6ff9fb41a..1ce9ff1d5 100644 --- a/user/pm-utils/APKBUILD +++ b/user/pm-utils/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/polkit-kde-agent-1/APKBUILD b/user/polkit-kde-agent-1/APKBUILD new file mode 100644 index 000000000..343464e17 --- /dev/null +++ b/user/polkit-kde-agent-1/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=polkit-kde-agent-1 +pkgver=5.18.3 +pkgrel=0 +pkgdesc="PolKit agent for KDE" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules kcoreaddons-dev kcrash-dev + kdbusaddons-dev ki18n-dev kiconthemes-dev kwidgetsaddons-dev + kwindowsystem-dev polkit-qt-1-dev qt5-qtbase-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/polkit-kde-agent-1-$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="d9de6d5966053aa27292cfb610ea188a932bbbdaad83a5c2bc27d254368b64d73031304969a722d17858f9549eefc38869aa232b4722b0df427f1c99a12f46c4 polkit-kde-agent-1-5.18.3.tar.xz" diff --git a/user/polkit-qt-1/APKBUILD b/user/polkit-qt-1/APKBUILD index 4a109e7d7..f50285a88 100644 --- a/user/polkit-qt-1/APKBUILD +++ b/user/polkit-qt-1/APKBUILD @@ -25,8 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DUSE_QT5=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index 54ecc7f98..26d66a893 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -10,11 +10,11 @@ options="!check suid" # Requires running ConsoleKit and PolKit for JS backend license="LGPL-2.0+" depends="" makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev - mozjs-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" + mozjs-dev autoconf automake libtool" pkgusers="polkitd" pkggroups="polkitd" install="$pkgname.pre-install $pkgname.pre-upgrade" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz 0001-make-netgroup-support-optional.patch fix-consolekit-db-stat.patch @@ -26,13 +26,11 @@ source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar. # - CVE-2018-19788 prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -56,12 +54,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ponysay/APKBUILD b/user/ponysay/APKBUILD index ffb32bf57..d0928a344 100644 --- a/user/ponysay/APKBUILD +++ b/user/ponysay/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch source="ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/archive/$pkgver.tar.gz" check() { - cd "$builddir" ./dependency-test.sh } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --destdir="$pkgdir" --with-man \ --freedom=sloppy --without-fish --with-custom-env-python=python3 } diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD index ac680fc9a..23f092cea 100644 --- a/user/poppler-qt5/APKBUILD +++ b/user/poppler-qt5/APKBUILD @@ -1,17 +1,17 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=poppler-qt5 _realname=poppler -pkgver=0.80.0 +pkgver=0.83.0 pkgrel=0 _testver=01c92874 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" url="https://poppler.freedesktop.org/" arch="all" license="GPL-2.0+" -makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev - qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev" depends="" depends_dev="$makedepends" +makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev + qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev cmake" subpackages="$pkgname-dev" source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz https://dev.sick.bike/dist/poppler-test-$_testver.tar.gz" @@ -61,5 +61,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f poppler-0.80.0.tar.xz +sha512sums="bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713 poppler-0.83.0.tar.xz 5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b poppler-test-01c92874.tar.gz" diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD index 462c23333..5ea8219f3 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=poppler -pkgver=0.80.0 +pkgver=0.83.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" @@ -63,4 +63,4 @@ glib() { "$subpkgdir"/usr/lib/ } -sha512sums="0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f poppler-0.80.0.tar.xz" +sha512sums="bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713 poppler-0.83.0.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index 338c8ad2d..bc65648cb 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,22 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.7 +pkgver=3.4.9 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" arch="all" +pkgusers="postfix" +pkggroups="postfix postdrop" options="!check suid" # No test suite. license="EPL-2.0 AND IPL-1.0" depends="" makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev - openssl-dev pcre-dev perl postgresql-dev sqlite-dev" -install="$pkgname.pre-install" + openssl-dev pcre-dev perl postgresql-dev sqlite-dev m4" subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc $pkgname-pgsql $pkgname-sqlite" -pkgusers="postfix" -pkggroups="postfix postdrop" +install="$pkgname.pre-install" provider_priority=1 +provides="sendmail" source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz honour-config-directory.patch postfix.initd @@ -91,6 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68 postfix-3.4.7.tar.gz +sha512sums="9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991 postfix-3.4.9.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index fef7c4ef2..8f7f21355 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=10.10 +pkgver=10.12 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -22,7 +22,6 @@ subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs $pkgname-plpython3 $pkgname-plpython3-contrib:plpython3_contrib" install="$pkgname.pre-upgrade" source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2 - initdb.patch perl-rpath.patch conf-unix_socket_directories.patch disable-broken-tests.patch @@ -62,9 +61,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2 prepare() { default_prepare - cd "$builddir" - local file; for file in $pkgname.initd $pkgname.confd; do + for file in $pkgname.initd $pkgname.confd; do sed "s|@VERSION@|${pkgver%.*}|" "$srcdir"/$file > $file done } @@ -93,16 +91,12 @@ build() { } check() { - cd "$builddir" - _run_tests src/test _run_tests src/pl _run_tests contrib } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install-docs cd "$pkgdir" @@ -167,7 +161,6 @@ contrib() { depends="" cd "$builddir" - # Avoid installing plperl and plpython extensions, these will be # installed into separate subpackages. sed -Ei -e 's/(.*_plperl)/#\1/' \ @@ -250,14 +243,13 @@ _run_tests() { } _submv() { - local path; for path in "$@"; do + for path in "$@"; do mkdir -p "$subpkgdir/${path%/*}" mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/ done } -sha512sums="60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc postgresql-10.10.tar.bz2 -1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch +sha512sums="6accc66cbbae811509095c33e8a8d17ddd11d9e307267312e3d09df90469db4700a5806166d66f25d77769d3ef88653c98dfc7d05dd053f10434b03e0a9e33b7 postgresql-10.12.tar.bz2 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch 1966b2a3971f56fbecd8daa45965236d487683e13300e5c000e595bbadbbe9d0e1301fbbfa034f452abe8a4e4a427781f772370b9ff392bb03fc11ee43c9dee7 disable-broken-tests.patch diff --git a/user/postgresql/initdb.patch b/user/postgresql/initdb.patch deleted file mode 100644 index 59a872a49..000000000 --- a/user/postgresql/initdb.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c ---- a/src/bin/initdb/initdb.c -+++ b/src/bin/initdb/initdb.c -@@ -3259,9 +3259,7 @@ - /* translator: This is a placeholder in a shell command. */ - appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile")); - -- printf(_("\nSuccess. You can now start the database server using:\n\n" -- " %s\n\n"), -- start_db_cmd->data); -+ printf(_("\nSuccess.\n\n")); - - destroyPQExpBuffer(start_db_cmd); - diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index 16bb82b24..7948d1089 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=powerdevil -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kactivities-dev kauth-dev kconfig-dev kdbusaddons-dev kglobalaccel-dev ki18n-dev kidletime-dev kio-dev knotifyconfig-dev kdelibs4support-dev - kwayland-dev libkscreen-dev plasma-workspace-dev solid-dev eudev-dev" + kwayland-dev libkscreen-dev libkworkspace-dev solid-dev eudev-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz" @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad159287ababd4410d2277bc43c0f006209f457a1c08ba903db25f60c62be95fd3b114abd56d5c64ebaccbecb523338766bc28468dc54fa7fc072f6381b8e181 powerdevil-5.12.8.tar.xz" +sha512sums="5a1731ca06acec967c8db5b9a41ac444d8ef4a26b1a9d56defe5c5c2a0d2a49563baa7d7584b96503625ff0fd4e21ea80d35167bec1118e6dc1cbef56e654be5 powerdevil-5.18.3.tar.xz" diff --git a/user/ppp/02_all_make-vars.patch b/user/ppp/02_all_make-vars.patch deleted file mode 100644 index 7937d666e..000000000 --- a/user/ppp/02_all_make-vars.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- ppp-2.4.5/chat/Makefile.linux -+++ ppp-2.4.5/chat/Makefile.linux -@@ -10,7 +10,6 @@ - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - --COPTS= -O2 -g -pipe - CFLAGS= $(COPTS) $(CDEFS) - - INSTALL= install -@@ -18,7 +17,7 @@ - all: chat - - chat: chat.o -- $(CC) -o chat chat.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - chat.o: chat.c - $(CC) -c $(CFLAGS) -o chat.o chat.c ---- ppp-2.4.5/pppd/Makefile.linux -+++ ppp-2.4.5/pppd/Makefile.linux -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS+= -Wall - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's ---- ppp-2.4.5/pppd/plugins/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/Makefile.linux -@@ -1,7 +1,11 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I.. -I../../include -fPIC --LDFLAGS = -shared -+LDFLAGS_PROG := $(LDFLAGS) -+export LDFLAGS LDFLAGS_PROG -+LDFLAGS += -shared -+# need the following option, otherwise linking plugins might fail with undef errors (Gentoo bug 210837) -+LDFLAGS += -Wl,--allow-shlib-undefined -+LIBS = - INSTALL = install - - DESTDIR = $(INSTROOT)@DESTDIR@ -@@ -23,7 +27,7 @@ - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done - - %.so: %.c -- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) - ---- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux -@@ -1,7 +1,5 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC --LDFLAGS = -shared - INSTALL = install - - #*********************************************************************** -@@ -33,7 +31,7 @@ - all: $(PLUGIN) - - $(PLUGIN): $(PLUGIN_OBJS) -- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux -@@ -1,7 +1,5 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC --LDFLAGS = -shared - INSTALL = install - - #*********************************************************************** -@@ -16,7 +14,7 @@ - all: $(PLUGINS) - - %.so: %.o -- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppd/plugins/radius/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux -@@ -12,7 +12,7 @@ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. -@@ -43,13 +43,13 @@ - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) - - radius.so: radius.o libradiusclient.a -- $(CC) -o radius.so -shared radius.o libradiusclient.a -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - radattr.so: radattr.o -- $(CC) -o radattr.so -shared radattr.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - radrealms.so: radrealms.o -- $(CC) -o radrealms.so -shared radrealms.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ - clientid.o sendserver.o lock.o util.o md5.o ---- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux -@@ -25,12 +25,11 @@ - # Version is set ONLY IN THE MAKEFILE! Don't delete this! - RP_VERSION=3.8p - --COPTS=-O2 -g - CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' - all: rp-pppoe.so pppoe-discovery - - pppoe-discovery: pppoe-discovery.o debug.o -- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o -+ $(CC) $(LDFLAGS_PROG) $(CFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o - - pppoe-discovery.o: pppoe-discovery.c - $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c -@@ -39,7 +38,7 @@ - $(CC) $(CFLAGS) -c -o debug.o debug.c - - rp-pppoe.so: plugin.o discovery.o if.o common.o -- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o rp-pppoe.so plugin.o discovery.o if.o common.o - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppdump/Makefile.linux -+++ ppp-2.4.5/pppdump/Makefile.linux -@@ -2,7 +2,7 @@ - BINDIR = $(DESTDIR)/sbin - MANDIR = $(DESTDIR)/share/man/man8 - --CFLAGS= -O -I../include/net -+CFLAGS=$(COPTS) -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o - - INSTALL= install -@@ -10,7 +10,7 @@ - all: pppdump - - pppdump: $(OBJS) -- $(CC) -o pppdump $(OBJS) -+ $(CC) $(LDFLAGS) -o pppdump $(OBJS) - - clean: - rm -f pppdump $(OBJS) *~ ---- ppp-2.4.5/pppstats/Makefile.linux -+++ ppp-2.4.5/pppstats/Makefile.linux -@@ -10,7 +10,6 @@ - PPPSTATOBJS = pppstats.o - - #CC = gcc --COPTS = -O - COMPILE_FLAGS = -I../include - LIBS = - -@@ -26,7 +25,7 @@ - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) -- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS) - - clean: - rm -f pppstats *~ #* core diff --git a/user/ppp/04_all_mpls.patch b/user/ppp/04_all_mpls.patch index 54b79f7bd..dd316974e 100644 --- a/user/ppp/04_all_mpls.patch +++ b/user/ppp/04_all_mpls.patch @@ -1,6 +1,6 @@ --- ppp-2.4.5/pppd/main.c +++ ppp-2.4.5/pppd/main.c -@@ -96,6 +96,9 @@ +@@ -95,6 +95,9 @@ #include "fsm.h" #include "lcp.h" #include "ipcp.h" diff --git a/user/ppp/10_all_defaultgateway.patch b/user/ppp/10_all_defaultgateway.patch deleted file mode 100644 index 1b7ae6396..000000000 --- a/user/ppp/10_all_defaultgateway.patch +++ /dev/null @@ -1,90 +0,0 @@ -This patch reverses revision 1.114 of the pppd/sys-linux.c file. -The default gateway is needed by the openswan's %defaultroute. - ---- ppp-2.4.7/pppd/sys-linux.c -+++ ppp-2.4.7/pppd/sys-linux.c -@@ -206,7 +206,7 @@ - - static int if_is_up; /* Interface has been marked up */ - static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */ --static int have_default_route; /* Gateway for default route added */ -+static u_int32_t default_route_gateway; /* Gateway for default route added */ - static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ - static char proxy_arp_dev[16]; /* Device for proxy arp entry */ - static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -346,8 +346,8 @@ - /* - * Delete any routes through the device. - */ -- if (have_default_route) -- cifdefaultroute(0, 0, 0); -+ if (default_route_gateway != 0) -+ cifdefaultroute(0, 0, default_route_gateway); - - if (has_proxy_arp) - cifproxyarp(0, proxy_arp_addr); -@@ -1621,17 +1621,17 @@ - struct rtentry rt; - - if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { -- if (rt.rt_flags & RTF_GATEWAY) -- error("not replacing existing default route via %I", -- SIN_ADDR(rt.rt_gateway)); -- else -- error("not replacing existing default route through %s", -- rt.rt_dev); -+ u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway); -+ -+ if (old_gateway != gateway) -+ error("not replacing existing default route to %s [%I]", -+ rt.rt_dev, old_gateway); - return 0; - } - -- memset (&rt, 0, sizeof (rt)); -- SET_SA_FAMILY (rt.rt_dst, AF_INET); -+ memset (&rt, '\0', sizeof (rt)); -+ SET_SA_FAMILY (rt.rt_dst, AF_INET); -+ SET_SA_FAMILY (rt.rt_gateway, AF_INET); - - rt.rt_dev = ifname; - -@@ -1640,14 +1640,16 @@ - SIN_ADDR(rt.rt_genmask) = 0L; - } - -- rt.rt_flags = RTF_UP; -+ SIN_ADDR(rt.rt_gateway) = gateway; -+ -+ rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { - if ( ! ok_error ( errno )) - error("default route ioctl(SIOCADDRT): %m"); - return 0; - } - -- have_default_route = 1; -+ default_route_gateway = gateway; - return 1; - } - -@@ -1660,7 +1662,7 @@ - { - struct rtentry rt; - -- have_default_route = 0; -+ default_route_gateway = 0; - - memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); -@@ -1673,7 +1675,9 @@ - SIN_ADDR(rt.rt_genmask) = 0L; - } - -- rt.rt_flags = RTF_UP; -+ SIN_ADDR(rt.rt_gateway) = gateway; -+ -+ rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - if (still_ppp()) { - if ( ! ok_error ( errno )) diff --git a/user/ppp/18_all_defaultmetric.patch b/user/ppp/18_all_defaultmetric.patch deleted file mode 100644 index fba787005..000000000 --- a/user/ppp/18_all_defaultmetric.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- ppp-2.4.5/pppd/options.c -+++ ppp-2.4.5/pppd/options.c -@@ -94,6 +94,7 @@ - int kdebugflag = 0; /* Tell kernel to print debug messages */ - int default_device = 1; /* Using /dev/tty or equivalent */ - char devnam[MAXPATHLEN]; /* Device name */ -+int defaultmetric = 0; /* Metric of the default route */ - bool nodetach = 0; /* Don't detach from controlling tty */ - bool updetach = 0; /* Detach once link is up */ - int maxconnect = 0; /* Maximum connect time */ -@@ -289,6 +290,10 @@ - "Number of seconds to wait for child processes at exit", - OPT_PRIO }, - -+ { "defaultmetric", o_int, &defaultmetric, -+ "The metric of the default route", -+ OPT_LIMITS, 0, 32766 }, -+ - #ifdef HAVE_MULTILINK - { "multilink", o_bool, &multilink, - "Enable multilink operation", OPT_PRIO | 1 }, ---- ppp-2.4.5/pppd/pppd.8 -+++ ppp-2.4.5/pppd/pppd.8 -@@ -121,6 +121,9 @@ - This entry is removed when the PPP connection is broken. This option - is privileged if the \fInodefaultroute\fR option has been specified. - .TP -+.B defaultmetric \fIn -+The metric of the default route configured by pppd; default is 0. -+.TP - .B disconnect \fIscript - Execute the command specified by \fIscript\fR, by passing it to a - shell, after ---- ppp-2.4.5/pppd/pppd.h -+++ ppp-2.4.5/pppd/pppd.h -@@ -276,6 +276,7 @@ - extern int kdebugflag; /* Tell kernel to print debug messages */ - extern int default_device; /* Using /dev/tty or equivalent */ - extern char devnam[MAXPATHLEN]; /* Device name */ -+extern int defaultmetric; /* Metric of the default route */ - extern int crtscts; /* Use hardware flow control */ - extern bool modem; /* Use modem control lines */ - extern int inspeed; /* Input/Output speed requested */ ---- ppp-2.4.5/pppd/sys-linux.c -+++ ppp-2.4.5/pppd/sys-linux.c -@@ -1465,7 +1465,7 @@ - FILE *route_fd = (FILE *) 0; - static char route_buffer[512]; - static int route_dev_col, route_dest_col, route_gw_col; --static int route_flags_col, route_mask_col; -+static int route_flags_col, route_mask_col, route_metric_col; - static int route_num_cols; - - static int open_route_table (void); -@@ -1508,6 +1508,7 @@ - route_dest_col = 1; - route_gw_col = 2; - route_flags_col = 3; -+ route_metric_col = 6; - route_mask_col = 7; - route_num_cols = 8; - -@@ -1527,6 +1528,8 @@ - route_gw_col = col; - else if (strcasecmp(q, "flags") == 0) - route_flags_col = col; -+ else if (strcasecmp(q, "metric") == 0) -+ route_metric_col = col; - else if (strcasecmp(q, "mask") == 0) - route_mask_col = col; - else -@@ -1569,6 +1572,7 @@ - - rt->rt_flags = (short) strtoul(cols[route_flags_col], NULL, 16); - rt->rt_dev = cols[route_dev_col]; -+ rt->rt_metric = (short) strtoul(cols[route_metric_col], NULL, 16); - - return 1; - } -@@ -1591,6 +1595,8 @@ - - if (kernel_version > KVERSION(2,1,0) && SIN_ADDR(rt->rt_genmask) != 0) - continue; -+ if (rt->rt_metric != defaultmetric) /* consider only routes with the same metric */ -+ continue; - if (SIN_ADDR(rt->rt_dst) == 0L) { - result = 1; - break; -@@ -1661,6 +1667,7 @@ - SIN_ADDR(rt.rt_gateway) = gateway; - - rt.rt_flags = RTF_UP | RTF_GATEWAY; -+ rt.rt_metric = defaultmetric + 1; /* +1 for binary compatibility */ - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { - if ( ! ok_error ( errno )) - error("default route ioctl(SIOCADDRT): %m"); -@@ -1696,6 +1703,7 @@ - SIN_ADDR(rt.rt_gateway) = gateway; - - rt.rt_flags = RTF_UP | RTF_GATEWAY; -+ rt.rt_metric = defaultmetric + 1; /* +1 for binary compatibility */ - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - if (still_ppp()) { - if ( ! ok_error ( errno )) diff --git a/user/ppp/21_all_custom_iface_names.patch b/user/ppp/21_all_custom_iface_names.patch deleted file mode 100644 index 5d3f7b94b..000000000 --- a/user/ppp/21_all_custom_iface_names.patch +++ /dev/null @@ -1,144 +0,0 @@ -pppd: Support arbitrary interface names - -This patch implements a new string option "ifname" which allows to specify -fully custom PPP interface names on Linux. It does so by renaming the -allocated pppX device immediately after it has been created to the requested -interface name. - -Originally written by Suse. Used by openwrt, debian, ubuntu. - -Reference: - -https://dev.openwrt.org/browser/trunk/package/network/services/ppp/patches/320-custom_iface_names.patch - -diff -purN ppp-2.4.7.orig/pppd/main.c ppp-2.4.7/pppd/main.c ---- ppp-2.4.7.orig/pppd/main.c 2016-08-25 15:52:52.032202044 +0200 -+++ ppp-2.4.7/pppd/main.c 2016-08-25 16:22:25.740299940 +0200 -@@ -729,8 +729,11 @@ void - set_ifunit(iskey) - int iskey; - { -- info("Using interface %s%d", PPP_DRV_NAME, ifunit); -- slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); -+ if (use_ifname[0] == 0) -+ slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); -+ else -+ slprintf(ifname, sizeof(ifname), "%s", use_ifname); -+ info("Using interface %s", ifname); - script_setenv("IFNAME", ifname, iskey); - if (iskey) { - create_pidfile(getpid()); /* write pid to file */ -diff -purN ppp-2.4.7.orig/pppd/options.c ppp-2.4.7/pppd/options.c ---- ppp-2.4.7.orig/pppd/options.c 2016-08-25 15:52:52.191194523 +0200 -+++ ppp-2.4.7/pppd/options.c 2016-08-25 16:04:23.335501924 +0200 -@@ -115,6 +115,7 @@ int log_to_fd = 1; /* send log messages - bool log_default = 1; /* log_to_fd is default (stdout) */ - int maxfail = 10; /* max # of unsuccessful connection attempts */ - char linkname[MAXPATHLEN]; /* logical name for link */ -+char use_ifname[IFNAMSIZ]; /* physical name for PPP link */ - bool tune_kernel; /* may alter kernel settings */ - int connect_delay = 1000; /* wait this many ms after connect script */ - int req_unit = -1; /* requested interface unit */ -@@ -274,6 +275,9 @@ option_t general_options[] = { - { "linkname", o_string, linkname, - "Set logical name for link", - OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXPATHLEN }, -+ { "ifname", o_string, use_ifname, -+ "Set physical name for PPP interface", -+ OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, IFNAMSIZ }, - - { "maxfail", o_int, &maxfail, - "Maximum number of unsuccessful connection attempts to allow", -diff -purN ppp-2.4.7.orig/pppd/pppd.h ppp-2.4.7/pppd/pppd.h ---- ppp-2.4.7.orig/pppd/pppd.h 2016-08-25 15:52:52.829164346 +0200 -+++ ppp-2.4.7/pppd/pppd.h 2016-08-25 16:07:12.024522417 +0200 -@@ -71,6 +71,10 @@ - #include "eui64.h" - #endif - -+#ifndef IFNAMSIZ -+#define IFNAMSIZ 16 -+#endif -+ - /* - * Limits. - */ -@@ -319,6 +323,7 @@ extern char *record_file; /* File to rec - extern bool sync_serial; /* Device is synchronous serial device */ - extern int maxfail; /* Max # of unsuccessful connection attempts */ - extern char linkname[MAXPATHLEN]; /* logical name for link */ -+extern char use_ifname[IFNAMSIZ]; /* physical name for PPP interface */ - extern bool tune_kernel; /* May alter kernel settings as necessary */ - extern int connect_delay; /* Time to delay after connect script */ - extern int max_data_rate; /* max bytes/sec through charshunt */ -diff -purN ppp-2.4.7.orig/pppd/sys-linux.c ppp-2.4.7/pppd/sys-linux.c ---- ppp-2.4.7.orig/pppd/sys-linux.c 2016-08-25 15:52:52.268190881 +0200 -+++ ppp-2.4.7/pppd/sys-linux.c 2016-08-25 16:12:13.905242396 +0200 -@@ -172,6 +172,10 @@ struct in6_ifreq { - /* We can get an EIO error on an ioctl if the modem has hung up */ - #define ok_error(num) ((num)==EIO) - -+#if !defined(PPP_DRV_NAME) -+#define PPP_DRV_NAME "ppp" -+#endif /* !defined(PPP_DRV_NAME) */ -+ - static int tty_disc = N_TTY; /* The TTY discipline */ - static int ppp_disc = N_PPP; /* The PPP discpline */ - static int initfdflags = -1; /* Initial file descriptor flags for fd */ -@@ -644,7 +648,8 @@ void generic_disestablish_ppp(int dev_fd - */ - static int make_ppp_unit() - { -- int x, flags; -+ struct ifreq ifr; -+ int x, flags, s; - - if (ppp_dev_fd >= 0) { - dbglog("in make_ppp_unit, already had /dev/ppp open?"); -@@ -667,6 +672,30 @@ static int make_ppp_unit() - } - if (x < 0) - error("Couldn't create new ppp unit: %m"); -+ -+ if (use_ifname[0] != 0) { -+ s = socket(PF_INET, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_PACKET, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_INET6, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_UNIX, SOCK_DGRAM, 0); -+ if (s >= 0) { -+ slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", PPP_DRV_NAME, ifunit); -+ slprintf(ifr.ifr_newname, sizeof(ifr.ifr_newname), "%s", use_ifname); -+ x = ioctl(s, SIOCSIFNAME, &ifr); -+ close(s); -+ } else { -+ x = s; -+ } -+ if (x < 0) { -+ error("Couldn't rename %s to %s", ifr.ifr_name, ifr.ifr_newname); -+ close(ppp_dev_fd); -+ ppp_dev_fd = -1; -+ } -+ } -+ - return x; - } - -diff -purN ppp-2.4.7.orig/pppstats/pppstats.c ppp-2.4.7/pppstats/pppstats.c ---- ppp-2.4.7.orig/pppstats/pppstats.c 2014-08-09 14:31:39.000000000 +0200 -+++ ppp-2.4.7/pppstats/pppstats.c 2016-08-25 16:13:52.623572634 +0200 -@@ -506,10 +506,12 @@ main(argc, argv) - if (argc > 0) - interface = argv[0]; - -+#if 0 - if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) { - fprintf(stderr, "%s: invalid interface '%s' specified\n", - progname, interface); - } -+#endif - - #ifndef STREAMS - { diff --git a/user/ppp/30_all_Makefile.patch b/user/ppp/30_all_Makefile.patch deleted file mode 100644 index 165fc7b22..000000000 --- a/user/ppp/30_all_Makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ -Ensure that the build process aborts if there is an error in one of -the plugin subdirectories. - -2010-09-01 Martin von Gagern - -References: -http://bugs.gentoo.org/334727 - -Index: ppp-2.4.5/pppd/plugins/Makefile.linux -=================================================================== ---- ppp-2.4.5/pppd/plugins/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/Makefile.linux -@@ -20,7 +20,7 @@ include .depend - endif - - all: $(PLUGINS) -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $?; done - - %.so: %.c - $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -@@ -30,12 +30,12 @@ VERSION = $(shell awk -F '"' '/VERSION/ - install: $(PLUGINS) - $(INSTALL) -d $(LIBDIR) - $(INSTALL) $? $(LIBDIR) -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $?; done - - clean: - rm -f *.o *.so *.a -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean || exit $?; done - - depend: - $(CPP) -M $(CFLAGS) *.c >.depend -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend || exit $?; done diff --git a/user/ppp/32_all_pado-timeout.patch b/user/ppp/32_all_pado-timeout.patch index 72f1adbb1..e17658456 100644 --- a/user/ppp/32_all_pado-timeout.patch +++ b/user/ppp/32_all_pado-timeout.patch @@ -218,37 +218,3 @@ /* Is it PADS? */ if (packet.code == CODE_PADS) { /* Parse for goodies */ ---- ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -14,6 +14,7 @@ - #include <unistd.h> - #include <errno.h> - #include <string.h> -+#include <time.h> - - #include "pppoe.h" - -@@ -513,6 +514,8 @@ - struct timeval tv; - PPPoEPacket packet; - int len; -+ time_t start, now; -+ int time_remain; - - struct PacketCriteria pc; - pc.conn = conn; -@@ -522,9 +525,13 @@ - pc.seenServiceName = 0; - conn->error = 0; - -+ time(&start); - do { -+ time(&now); -+ time_remain = timeout - (int)difftime(now, start); -+ if (time_remain <= 0) return; /* Timed out */ - if (BPF_BUFFER_IS_EMPTY) { -- tv.tv_sec = timeout; -+ tv.tv_sec = time_remain; - tv.tv_usec = 0; - - FD_ZERO(&readable); diff --git a/user/ppp/50_all_linux-headers.patch b/user/ppp/50_all_linux-headers.patch deleted file mode 100644 index cd2adbead..000000000 --- a/user/ppp/50_all_linux-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -the linux headers have started adding shims to not define types or structs -when C lib headers are active, but in order to work, the C lib headers have -to be included before the linux headers. - -move the netinet/in.h include up above the linux/ includes. - -Mike Frysinger <vapier@gentoo.org> - ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -47,6 +47,8 @@ - #include <sys/socket.h> - #endif - -+#include <netinet/in.h> -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include <linux/if.h> -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include <linux/if_ether.h> - #endif - --#include <netinet/in.h> -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include <sys/types.h> - diff --git a/user/ppp/51_all_glibc-2.28.patch b/user/ppp/51_all_glibc-2.28.patch deleted file mode 100644 index cbb5857a7..000000000 --- a/user/ppp/51_all_glibc-2.28.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> -Date: Fri, 6 Apr 2018 14:27:18 +0200 -Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped -libcrypt. The libxcrypt standalone package can be used instead, but -it dropped the old setkey/encrypt API which ppp uses for DES. There -is support for using openssl in pppcrypt.c, but it contains typos -preventing it from compiling and seems to be written for an ancient -openssl version. - -This updates the code to use current openssl. - -[paulus@ozlabs.org - wrote the commit description, fixed comment in - Makefile.linux.] - -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> -Signed-off-by: Paul Mackerras <paulus@ozlabs.org> ---- - pppd/Makefile.linux | 7 ++++--- - pppd/pppcrypt.c | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 36d2b036..8d5ce99d 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -35,10 +35,10 @@ endif - COPTS = -O2 -pipe -Wall -g - LIBS = - --# Uncomment the next 2 lines to include support for Microsoft's -+# Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. - CHAPMS=y --USE_CRYPT=y -+#USE_CRYPT=y - # Don't use MSLANMAN unless you really know what you're doing. - #MSLANMAN=y - # Uncomment the next line to include support for MPPE. CHAPMS (above) must -@@ -137,7 +137,8 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --LIBS += -ldes $(LIBS) -+CFLAGS += -I/usr/include/openssl -+LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 - endif -diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c -index 8b85b132..6b35375e 100644 ---- a/pppd/pppcrypt.c -+++ b/pppd/pppcrypt.c -@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ - des_key[7] = Get7Bits(key, 49); - - #ifndef USE_CRYPT -- des_set_odd_parity((des_cblock *)des_key); -+ DES_set_odd_parity((DES_cblock *)des_key); - #endif - } - -@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ - } - - #else /* USE_CRYPT */ --static des_key_schedule key_schedule; -+static DES_key_schedule key_schedule; - - bool - DesSetkey(key) - u_char *key; - { -- des_cblock des_key; -+ DES_cblock des_key; - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -+ DES_set_key(&des_key, &key_schedule); - return (1); - } - - bool --DesEncrypt(clear, key, cipher) -+DesEncrypt(clear, cipher) - u_char *clear; /* IN 8 octets */ - u_char *cipher; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, -- key_schedule, 1); -+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, -+ &key_schedule, 1); - return (1); - } - -@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) - u_char *cipher; /* IN 8 octets */ - u_char *clear; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, -- key_schedule, 0); -+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, -+ &key_schedule, 0); - return (1); - } - diff --git a/user/ppp/APKBUILD b/user/ppp/APKBUILD index c99d82171..82545b0f7 100644 --- a/user/ppp/APKBUILD +++ b/user/ppp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ppp -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=0 pkgdesc="Point-to-Point Protocol (PPP) implementation for serial networking" url="https://ppp.samba.org/" @@ -11,32 +11,26 @@ license="BSD-4-Clause AND GPL-2.0-only AND GPL-2.0+ AND zlib AND LGPL-2.0+" depends="" makedepends="bsd-compat-headers linux-pam-dev libpcap-dev openssl-dev utmps-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" -source="https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz +source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz - 02_all_make-vars.patch 03_all_use_internal_logwtmp.patch 04_all_mpls.patch 06_all_killaddr-smarter.patch 08_all_wait-children.patch - 10_all_defaultgateway.patch 12_all_linkpidfile.patch 16_all_auth-fail.patch - 18_all_defaultmetric.patch 19_all_radius_pid_overflow.patch 20_all_dev-ppp.patch - 21_all_custom_iface_names.patch 24_all_passwordfd-read-early.patch 26_all_pppd-usepeerwins.patch 28_all_connect-errors.patch - 30_all_Makefile.patch 32_all_pado-timeout.patch 34_all_lcp-echo-adaptive.patch - 50_all_linux-headers.patch - 51_all_glibc-2.28.patch 80_all_eaptls-mppe-1.101a.patch 85_all_dhcp-make-vars.patch 86_all_dhcp-sys_error_to_strerror.patch adelie.patch + CVE-2020-8597.patch dhcp.patch install-path.patch musl-fix-headers.patch @@ -46,6 +40,11 @@ source="https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz ppp.pamd pppd.initd " +builddir="$srcdir"/ppp-ppp-$pkgver + +# secfixes: +# 2.4.8-r0: +# - CVE-2020-8597 prepare() { mv "$srcdir"/dhcp "$builddir"/pppd/plugins @@ -91,35 +90,29 @@ package() { install -Dm 0755 "$srcdir"/pppd.initd "$pkgdir"/etc/init.d/pppd } -sha512sums="e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 ppp-2.4.7.tar.gz +sha512sums="a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478 ppp-2.4.8.tar.gz aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 ppp-dhcpc.tgz -8444d7edfe902a83f6cce96d29b9b7fb45ac68bdbe44494797d2a98470b80017489d36feb50cf945cbe72486bac69f45b23790e15cfbd33e07913a857ee80ab7 02_all_make-vars.patch 4c4a5cc6fd8ce3203c41ff07fc0ce5f0468985c779fe05030898d36c404d2086ce7a49336ac58e6502fc2fd14c4de9006028fe19c500d2cac890a16a55c723e8 03_all_use_internal_logwtmp.patch -1d63795949da00a19712aef39a54f338183b6917b246083e04a0b9ee43d346af5adeeb9357cb165587722790fa19b13375d55008646a4e9e2acdf8724bf3c7cc 04_all_mpls.patch +df263b6a8395be1f3aa0a87aca8fe7bcda1395208df8df73de98decdb59a70a67242a4f7a7227db2c4b470fc1b44d771967d8c91c16cfaffaa3eb41110dc3b28 04_all_mpls.patch b49086401c1b395ee6caba0418272b2d1b2ab9dcf6f1fc7e7f1280e94fcf17c8fdb884a19f4ef911bd7849a9cceb4cc07fc75438726340cd8c17265d4c2bd4d8 06_all_killaddr-smarter.patch 807707ee9795ef4300b92bacdeba6b9e7332b6ce5a355de3ce77ddcc6dafce069f024131fd3ef282e38be3499e4230ad50fdda2b96e00891f5df1696234b775b 08_all_wait-children.patch -c084237458ceb8704541f6e8424855788dbc2883559c4bf1ff35060e277c2b2ddfadcdb6dedc0bf42a5e83e98cfe7241fae8f6dc59d1ed963ed50356c9fd83ed 10_all_defaultgateway.patch 122b9e3dbc3a9accacb31c653b3c0d368e8cdf3d954a6c93d04ac26ca8f3cb5bfcf8a01881d1cf08e855a1d2d0bd86e7fadba22bb5ada1a86f78e6b9820e6687 12_all_linkpidfile.patch 3a23ef3619b2840eb3f1f7e14bd4765526b09acdfa8ab4d659ad8525a6f96d0cfb7c9fef042cde99ba1de8cf5caa74faa32e2a988453b4b17a70d5cc9a4bcf41 16_all_auth-fail.patch -24b2cf579844bb9e1c0360227a5d35c3510471c0de6f16031d5e192d0ae7b1913aba93c2d99ea5fd3724deb6754f9831c1adb30671a31617268c77c65fc8beaf 18_all_defaultmetric.patch 9fdb3346ef13b250f91f1af55c0efa0f836a60abe9e62fceed30df4e431a3bccdd33b083c2662c45e2091085438ba2221cdc4ae51fc1b05a666d77f74d461214 19_all_radius_pid_overflow.patch 82c80701095a2d9707afbf5fc29bdf2fc3f92252b7de5de1d639f8607096a9d34ce90ffd0a2f770512b590a27dec56f2b03e5e9f4c9e56e1f362a2387d9fb568 20_all_dev-ppp.patch -314e0939b546af5229db34888284a06e07d7b4c94190bf95d4382d3ff39935f18ecc6172f62309e4f63a00fdfceca73d908da8d82c95fd0b926b1832968ee3cc 21_all_custom_iface_names.patch 2508cf1285a086c917ba5deffc96c1c29a511f1c1a0ef94c811b2bf139aed0218f34d7c1f1004890e105c47dffc5834a049dbe7686611d0fc8b8607ccdc86105 24_all_passwordfd-read-early.patch 3eb55fb681e7fecf4e09b53683f509d2db3779599dd60fb89f88cd644c92d779f4720114546ba458262e8239581061e4a450143338c4725ada18b7ca314e12b0 26_all_pppd-usepeerwins.patch 2e0bd81124bcd7c1234089f11e0b607b19047d279dc436ced3a4b8d793bcee4fcececd948b6a0755a02f68542c5c5e30b6f8541f90b998c09da8d50362827520 28_all_connect-errors.patch -e495a489ee98258a3a4549127faca2c41feff27dff296065c2e41bfc696ced2ad1062ea0aa5bf3cc2425c85b4494ebbcbaaabacd8a3ea8ce8fab28acea028336 30_all_Makefile.patch -77c0585b46f4fc090a67198d800d67dab2ce75eadcf2153c6e800e274b53ced6b512fd6eb4767c632f765bacd6c332f8d2a68233abb3781d6c62321d6bbb6052 32_all_pado-timeout.patch +32c77c938cd607e44bd358cbc3f0eaf99178084d936bf8e6b8aeb20e881ac9d734008cfb93ff3b1fd2783dae0c46e963c3ee1d1b128712b4ba342db069e26636 32_all_pado-timeout.patch 0bd928f45708f10835250fd6a6162f6e148dca172c810511c1f4b1fe56602c4869e7f622e95a3f4a41e5502ddefd0cf6054cd57211bc83426d5da5b5f10dac26 34_all_lcp-echo-adaptive.patch -cda8e347eef7f26589cf1a12243f4d77de34d5736e3cb04fda9063adc0d931ef7ec7dbb2f142f1dfabc6d3ee04a252d2dd67d2c99ad9c01f2bd343bec88abe97 50_all_linux-headers.patch -fc012971a062456fa4e253f5b4a5e2ce56ae1852293d0245ecfd165ba162fa76ec2c28e1035dd89de3e9d43941d528e2d95a40552eb8037a5ba084c1717c20d1 51_all_glibc-2.28.patch 977b247e87557c4c57a871470c40670457e285ca59357dabab854ab16cc5578526ddf880410aa2efc7078e16d32d7afea4b69928af14ac4449523f6a591284f1 80_all_eaptls-mppe-1.101a.patch 2d294bfe455648949cedb47a12a07913f0395aadbe2566c1e90d70fc37baa8635a667ab45195a697567f8d52de88771c499adffee82cde2e9e318ed858b6007b 85_all_dhcp-make-vars.patch 44d5528c057d0abf2b45ba04943a52b6b94209434a06aa565f8a74acdd660efd86fe13280d540383168eaedad9f627673410bb8468860b64adb3145030e12889 86_all_dhcp-sys_error_to_strerror.patch -2ba9ba8856e569c204a0e058a3e7a4a74f331118cb33bbca445a87b54bb0e4f0da2a968df5f394633911603359284831a80a4d9c793d795eef8477d00bab63f1 adelie.patch -6d38f9779945bce2277f2d52d66dd79d2696f02c44186e1750d236f2d77d692746a8e8c164d925d5bb32dbfd02a723cabb59304f05954e0b5f7adada208ee220 dhcp.patch +350ed598c9690aa2f357ead34eb17a67dc5e34a5bd7529809288c5e0151728882158f32734041f2005413ac701db84d76501edabdcc6c64750dfce2927e2aa2a adelie.patch +e5638fd6e7b573552a7354fad3c91a8bde86760fb17d510e7e925ee8c1f60f7d39efe95134cb0a1c46b1e9fb14c987f224b4adbb1f3c75633b2bea0eccaff7c6 CVE-2020-8597.patch +6d22e4b601dd3eabd55751408b03c4036815ca64184f9c9f07f2368d2f5a6a9081ce7a88e5c7d5ee60708c430c9cf55070e105ce00adb1325b60cddada4bf562 dhcp.patch fb4ae2c2ba4ecdd1c85f6e5f730fd9659cf1fbc7a8a004b09042adafee7e4af6238df8deb3dbd3dc9c69407d9ebc4c82e1792a43b4aaf8ac18ebe18268b50597 install-path.patch -2f071ea9db15e4abf1bed6cce8130dc81b710a31bfef5fa8f9370c353f845dbc47674b1551b8e040478e5156add6f98d480530206125e8bb308f0f4288d1eec6 musl-fix-headers.patch +ba240d483ada6865bf52497ce00cb9ae8d750e8f650e501d0d068b132d364ae4d09ac2e290b903e246aa35d33cf984aa29a6be41906df355b1c1e2b7637dc8b0 musl-fix-headers.patch 723ff3dd0aee13f9878559aa433b314af6043523a2bafd5957258809a645942f7d34b5bd659869a1528cf7b1a462ad7cc2dbf18e7986220f5f685f2c1ea1d36b utmpx.patch 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 ppp.mod e30a397392d467ac3c78f6533f3adff5de7d38f0372d8d6f7b186db4ec69ddf12463d467d8a86eb5867effeb7dd6bd16942a98fb3a3ab59ff754a123e16d0938 ppp.pamd diff --git a/user/ppp/CVE-2020-8597.patch b/user/ppp/CVE-2020-8597.patch new file mode 100644 index 000000000..5d7c51bca --- /dev/null +++ b/user/ppp/CVE-2020-8597.patch @@ -0,0 +1,37 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras <paulus@ozlabs.org> +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> +Signed-off-by: Paul Mackerras <paulus@ozlabs.org> +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f56..1b93db01 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; diff --git a/user/ppp/adelie.patch b/user/ppp/adelie.patch index 06bb6edf9..a89dd4063 100644 --- a/user/ppp/adelie.patch +++ b/user/ppp/adelie.patch @@ -1,14 +1,5 @@ --- ppp-2.4.7/pppd/Makefile.linux.old 2019-05-09 20:32:30.959257140 +0000 +++ ppp-2.4.7/pppd/Makefile.linux 2019-05-09 20:34:48.964184093 +0000 -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS+= -Wall -+COPTS+= -Wall -D_GNU_SOURCE - LIBS = - - # Uncomment the next line to include support for Microsoft's @@ -61,14 +61,14 @@ USE_TDB=y diff --git a/user/ppp/dhcp.patch b/user/ppp/dhcp.patch index 611882326..8ef76d2a0 100644 --- a/user/ppp/dhcp.patch +++ b/user/ppp/dhcp.patch @@ -322,3 +322,14 @@ diff -Naur ppp-2.4.7/pppd/plugins/dhcp.old/socket.h ppp-2.4.7/pppd/plugins/dhcp/ all: $(PLUGIN) +--- ppp-ppp-2.4.8/pppd/plugins/dhcp/Makefile.linux.old 2020-02-26 04:02:43.528569753 +0000 ++++ ppp-ppp-2.4.8/pppd/plugins/dhcp/Makefile.linux 2020-02-26 04:03:07.425957036 +0000 +@@ -14,7 +14,7 @@ + $(INSTALL) -s -c -m 755 dhcpc.so $(LIBDIR) + + dhcpc.so: dhcpc.o clientpacket.o packet.o socket.o options.o +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ ++ $(CC) $(LDFLAGS) -shared $(CFLAGS) -o $@ $^ + + + clean: diff --git a/user/ppp/musl-fix-headers.patch b/user/ppp/musl-fix-headers.patch index d24f62896..5b26fc29c 100644 --- a/user/ppp/musl-fix-headers.patch +++ b/user/ppp/musl-fix-headers.patch @@ -28,14 +28,13 @@ diff --git a/pppd/magic.h b/pppd/magic.h index c81213b..305aece 100644 --- a/pppd/magic.h +++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ +@@ -43,5 +43,7 @@ */ +#include <sys/cdefs.h> + - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ + void magic_init (void); /* Initialize the magic number generator */ + u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 @@ -88,50 +87,13 @@ index 3d3bf4e..b5f82d3 100644 /* Initialize frame types to RFC 2516 values. Some broken peers apparently use different frame types... sigh... */ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..4d68147 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; - - #include <netinet/in.h> - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- - - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif +--- ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h.old 2019-12-31 01:31:26.000000000 +0000 ++++ ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h 2020-02-26 04:01:48.414595401 +0000 +@@ -46,6 +46,7 @@ + /* This has to be included before Linux 4.8's linux/in.h + * gets dragged in. */ #include <netinet/in.h> - #include <arpa/inet.h> ++#include <netinet/if_ether.h> + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index d6bb9b46f..2fa79cc16 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-quick" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/prison-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,17 +26,15 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="6ffdeb4c8196a9ec6c845ebe1d58801c02d570f831bf5c1a2bd8f30d048cc0d62aa8e8273fc8db4689c6ac45caa35906bad82b211e58108b7ed8cf42649acf16 prison-5.54.0.tar.xz" +sha512sums="dc3606bf25ec07f3702b9c5cb51fbb29c410d864349ca65fc5f86d26619be24ce42a14e969a2db4a11b8f1f57dca8705a0bd163e5bea468fe5edfa06a409f1c3 prison-5.68.0.tar.xz" diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 95b728b76..02e67676f 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=prosody -pkgver=0.11.3 +pkgver=0.11.4 pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" @@ -21,7 +21,6 @@ source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc/prosody \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -d -o prosody -g prosody "$pkgdir/var/log/prosody" @@ -52,6 +49,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb prosody-0.11.3.tar.gz +sha512sums="0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3 prosody-0.11.4.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch -24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd" +11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd" diff --git a/user/prosody/prosody.initd b/user/prosody/prosody.initd index 1d835daca..c0557bd81 100644 --- a/user/prosody/prosody.initd +++ b/user/prosody/prosody.initd @@ -19,7 +19,7 @@ checkconfig() { eerror "You need a /etc/prosody/prosody.cfg.lua file to run prosody" return 1 fi - luac5.2 -p /etc/prosody/prosody.cfg.lua + luac -p /etc/prosody/prosody.cfg.lua return $? } diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index cd4e52fbc..c94b096e0 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -1,9 +1,9 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.10.0 +pkgver=3.11.3 _tstver=1.8.1 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" @@ -21,8 +21,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pk prepare() { default_prepare - - cd "$builddir" ./autogen.sh # symlink tests to the test directory @@ -33,7 +31,6 @@ prepare() { build() { # Build Protobuf - cd "$builddir" CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" LDFLAGS="$LDFLAGS -latomic" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -69,7 +66,6 @@ build() { } check() { - cd "$builddir" make check cd "$builddir"/ruby rake test @@ -78,7 +74,6 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -116,5 +111,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977 protobuf-3.10.0.tar.gz +sha512sums="beac21d495bfd8e9b40120d1db9fd82251958f954533fc6f76cd0b9c28f92533ac35368a4c298ebb1d8e09047b670ed3bd948bb7da6eb5cca7fdc0c1c44aa39b protobuf-3.11.3.tar.gz e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" diff --git a/user/proxymngr/APKBUILD b/user/proxymngr/APKBUILD deleted file mode 100644 index 00215b164..000000000 --- a/user/proxymngr/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=proxymngr -pkgver=1.0.4 -pkgrel=0 -pkgdesc="X11 proxy manager service" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="lbxproxy" -makedepends="libice-dev libxt-dev util-macros xorgproto-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="dce0d93558e674ce82197476d204488505079c8aa5192387e57c06844c4ea83da1cf45238e0a63e2bbf9867388ca1175125b6d7b4036085be89b3de353887fd2 proxymngr-1.0.4.tar.bz2" diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index 611a788a0..0d862b9bb 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio -pkgver=12.2 -pkgrel=5 +pkgver=13.0 +pkgrel=0 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" pkgusers="pulse" @@ -13,7 +13,7 @@ options="!check" # Complains about permissions in /var/tmp. license="LGPL-2.1+" makedepends="alsa-lib-dev bash bluez-dev check-dev dbus-dev eudev-dev fftw-dev gconf-dev gtk+3.0-dev intltool libcap-dev libsndfile-dev m4 openssl-dev - orc-compiler orc-dev sbc-dev speexdsp-dev cmd:which" + orc-compiler orc-dev sbc-dev speexdsp-dev cmd:which libltdl libtool" checkdepends="check-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez @@ -23,7 +23,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz $pkgname.initd $pkgname.confd - alsa-include.patch disable-flat-volume.patch " @@ -36,7 +35,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-bluez5 \ - --disable-bluez4 \ --enable-nls \ --enable-orc \ --enable-largefile \ @@ -129,8 +127,7 @@ zshcomp() { mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share } -sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz +sha512sums="d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c pulseaudio-13.0.tar.xz 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd 75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd -1549c495395ea0b9bf863f063be85c5847cdffc27b4e59e8d528aae5de29d1f2552dbae94f8c649fcab264e07ede330e584dcee46118b98ddf64c63cb1e8397e alsa-include.patch dcb50f7c4fd86b0311ab050f7f0340dcf54379a685903951f22e24df6aee5486ee5e02f866c9e53dd55a54ba302658ad282114ce37f169d185855dc37dae0349 disable-flat-volume.patch" diff --git a/user/pulseaudio/alsa-include.patch b/user/pulseaudio/alsa-include.patch deleted file mode 100644 index 2654838e5..000000000 --- a/user/pulseaudio/alsa-include.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Sun, 21 Apr 2019 11:59:30 +0200 -Subject: [PATCH] alsa: Fix inclusion of use-case.h - -The recent change in ALSA upstream stripped -I$include/alsa path from -pkgconfig. We already fixed for this change in some places but still -the code for UCM was overlooked, and this resulted in the unresolved -symbols in alsa card module. Fix them as well. - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - configure.ac | 2 +- - src/modules/alsa/alsa-ucm.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c004bd70d..b44ed1595 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"], - AS_IF([test "x$HAVE_ALSA" = "x1"], - [ - save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS" -- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) -+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) - CPPFLAGS="$save_CPPFLAGS" - ], - HAVE_ALSA_UCM=0) -diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h -index 53abf3f90..c926f3cc3 100644 ---- a/src/modules/alsa/alsa-ucm.h -+++ b/src/modules/alsa/alsa-ucm.h -@@ -23,7 +23,7 @@ - ***/ - - #ifdef HAVE_ALSA_UCM --#include <use-case.h> -+#include <alsa/use-case.h> - #else - typedef void snd_use_case_mgr_t; - #endif --- -2.21.0 - diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD index 22b797908..1ae2b8691 100644 --- a/user/purple-plugin-pack/APKBUILD +++ b/user/purple-plugin-pack/APKBUILD @@ -20,7 +20,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD new file mode 100644 index 000000000..dbad62201 --- /dev/null +++ b/user/purpose/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=purpose +pkgver=5.68.0 +pkgrel=0 +pkgdesc="KDE context menu framework" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+" +depends="kdeclarative" +makedepends="cmake extra-cmake-modules kconfig-dev kcoreaddons-dev ki18n-dev + kio-dev kirigami2-dev knotifications-dev qt5-qtbase-dev + qt5-qtdeclarative-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/purpose-$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() { + # menutest requires X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E menutest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a8103026b5b7bef1dd4fd28912eaefbace466c39967a474a7b8abf1e074be58c5b3d68527c132fa79adf2785a059ae8a09537735b6a51b53aa553113b6d48aad purpose-5.68.0.tar.xz" diff --git a/user/py3-alabaster/APKBUILD b/user/py3-alabaster/APKBUILD index 4bf90edf0..becfde6d2 100644 --- a/user/py3-alabaster/APKBUILD +++ b/user/py3-alabaster/APKBUILD @@ -13,24 +13,21 @@ arch="noarch" license="BSD-3-Clause" depends="python3 py3-pygments" makedepends="python3-dev" +subpackages="" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" # Zero tests currently. python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac py3-alabaster-0.7.12.tar.gz" diff --git a/user/py3-asn1crypto/APKBUILD b/user/py3-asn1crypto/APKBUILD index bcb4a0e93..16aad45a7 100644 --- a/user/py3-asn1crypto/APKBUILD +++ b/user/py3-asn1crypto/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-asn1crypto _pkgname=${pkgname#py3-} -pkgver=0.24.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="Python ASN.1 library with a focus on performance and a pythonic API" url="https://github.com/wbond/asn1crypto" @@ -16,19 +16,15 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/wbond/asn1crypto/archive/$p builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 run.py tests } package() { - mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8 asn1crypto-0.24.0.tar.gz" +sha512sums="00d7d67e717fde9651aacc35141b872e4fcb6c46457af5e971aceae7f9acf1d018dfef94eddfa05eac7c7f3a4c768edc8a1ca0474101c1e77ee377aa4771274b asn1crypto-1.2.0.tar.gz" diff --git a/user/py3-attrs/APKBUILD b/user/py3-attrs/APKBUILD index 5d3e04b20..bd923750f 100644 --- a/user/py3-attrs/APKBUILD +++ b/user/py3-attrs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch> # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-attrs -pkgver=19.2.0 +pkgver=19.3.0 pkgrel=0 pkgdesc="Python classes without boilerplate" url="https://www.attrs.org" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="f7ad98edaf685e7ab85c26a93ab310d82e48927a64694a6fa947d110f6623103335a42e335ed9fd1d2bc61504e60ef8e8d0733603c980bf2c6c157f3429e8875 py3-attrs-19.2.0.tar.gz" +sha512sums="f050ff707cb95f0639b239435b65dacc164a540b5a456d27be5f47615ee7a860ae38096cd16769b0d07fe8e5e952ccaa5af0eb0aafb5166421f9eb3edf248425 py3-attrs-19.3.0.tar.gz" diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 8b9f2def3..2aa56f348 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2019.9.11 +pkgver=2019.11.28 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -12,7 +12,7 @@ license="MPL-2.0" depends="python3 ca-certificates" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz +source="https://files.pythonhosted.org/packages/source/c/$_pkgname/$_pkgname-$pkgver.tar.gz use-system-certs.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -21,9 +21,8 @@ build() { } package() { - mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c certifi-2019.9.11.tar.gz +sha512sums="6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad certifi-2019.11.28.tar.gz f9c7d953b08d6ef87bae07605e2c09e9de1d1e60285fa1f5043beeae1d9f00f3b70fdf598585cd350df2632e22c0197ea2e8b76127e2927ad53880b60b349c9c use-system-certs.patch" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 439609e37..56681055b 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.12.3 +pkgver=1.14.0 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="9070f5cfe543c9261a79f995548899c3e7539ee20f562ba91a4a909887745bd28448b0e38241031d6b2ab87286fd0ec91768b8bf6577716427612d41b0ed3b93 py3-cffi-1.12.3.tar.gz" +sha512sums="4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253 py3-cffi-1.14.0.tar.gz" diff --git a/user/py3-chardet/APKBUILD b/user/py3-chardet/APKBUILD index f33618402..e9d6fce3f 100644 --- a/user/py3-chardet/APKBUILD +++ b/user/py3-chardet/APKBUILD @@ -10,23 +10,27 @@ pkgrel=0 pkgdesc="The Universal Character Encoding Detector" url="https://github.com/chardet/chardet/" arch="noarch" -options="!check" # tests use hypothesis; deep rabbit hole license="LGPL-2.1-only" depends="python3" +checkdepends="py3-hypothesis py3-pytest" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz + pytest.patch + " builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } +check() { + python3 setup.py test +} + package() { - mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 } -sha512sums="61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5 chardet-3.0.4.tar.gz" +sha512sums="61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5 chardet-3.0.4.tar.gz +57bfeb5752123fbf9f9f61386039b7ceb9255290225f73453d2d52f2366e1949ed92692912571c8b451b521aedfa8b605879b2742aec7f1fdce4db10705cbe53 pytest.patch" diff --git a/user/py3-chardet/pytest.patch b/user/py3-chardet/pytest.patch new file mode 100644 index 000000000..039816b78 --- /dev/null +++ b/user/py3-chardet/pytest.patch @@ -0,0 +1,24 @@ +From 440828f8faafdb58700c64a9ea8f6a30b154c08b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> +Date: Mon, 11 Nov 2019 21:02:51 +0100 +Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters + (#174) + +Fixes https://github.com/chardet/chardet/issues/173 +--- + test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test.py b/test.py +index 9833307..ad2b753 100644 +--- a/test.py ++++ b/test.py +@@ -59,7 +59,7 @@ def gen_test_params(): + full_path = join(path, file_name) + test_case = full_path, encoding + if full_path in EXPECTED_FAILURES: +- test_case = pytest.mark.xfail(test_case) ++ test_case = pytest.param(*test_case, marks=pytest.mark.xfail) + yield test_case + + diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD index 6f27198b2..ea88dccbf 100644 --- a/user/py3-commonmark/APKBUILD +++ b/user/py3-commonmark/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-commonmark _pkgname=commonmark _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="Python parser for the CommonMark Markdown flavour" url="https://pypi.org/project/commonmark/" @@ -28,4 +28,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="f5cb6c9a32fdb441a229b70118652c0fd1b0f058728c594966f5fe04a58ec005feaade49fa72f3aa07b3376e4148e76203313e4f14d29fc86f2acc125533a4fa commonmark-0.9.0.tar.gz" +sha512sums="bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324 commonmark-0.9.1.tar.gz" diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD index 199dce3b7..4781c2c27 100644 --- a/user/py3-configargparse/APKBUILD +++ b/user/py3-configargparse/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: pkgname=py3-configargparse _pkgname=ConfigArgParse -pkgver=0.14.0 +pkgver=0.15.2 pkgrel=0 pkgdesc="A drop-in replacement for argparse" url="https://github.com/bw2/ConfigArgParse" @@ -15,25 +15,20 @@ license="MIT" depends="python3" makedepends="python3-dev python3-tests" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://github.com/bw2/$_pkgname/archive/$pkgver.tar.gz - python3.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/bw2/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="e48ca61027abf0e0acb8414b6d89b276b186b4f714368b8c33975537c2264bb2d81f18cf3013b99d9ce752014361afa973f704b3f6957ca4b98319bb0ca5ca8c py3-configargparse-0.14.0.tar.gz -df324cbc12d0d5cf3cf8bfe494e358d366d8a7891183e9a7922d5331f86e30cbe5810b709ad93dfd41f33cd08c1d87371b9aa13c92d7637d4459d83db41be33f python3.patch" +sha512sums="c8403751506b3ce096d707067659492422ecef8e684107935ab26f2e518c7c2c4baca8882cac55dd1961a86e5ad95b73389bc1a681cd2a67b5000bd6d626d2d9 py3-configargparse-0.15.2.tar.gz" diff --git a/user/py3-configargparse/python3.patch b/user/py3-configargparse/python3.patch deleted file mode 100644 index b102e166f..000000000 --- a/user/py3-configargparse/python3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py 2018-02-04 10:00:01.000000000 -0800 -+++ b/setup.py 2018-11-20 21:08:21.339299614 -0800 -@@ -78,7 +78,7 @@ - 'ordereddict', - ]) - tests_require.extend([ -- 'unittest2', -+ 'unittest', - ]) - - diff --git a/user/py3-configobj/APKBUILD b/user/py3-configobj/APKBUILD index 7268eaa42..4fa196a19 100644 --- a/user/py3-configobj/APKBUILD +++ b/user/py3-configobj/APKBUILD @@ -8,22 +8,19 @@ pkgrel=0 pkgdesc="Python library for reading and writing of configuration files (ini)" url="https://github.com/DiffSK/configobj" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause" depends="python3 py3-six" makedepends="python3-dev" subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/DiffSK/configobj/archive/v$pkgver.tar.gz" - builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-cparser/APKBUILD b/user/py3-cparser/APKBUILD index d08071bf2..4f076a744 100644 --- a/user/py3-cparser/APKBUILD +++ b/user/py3-cparser/APKBUILD @@ -14,17 +14,14 @@ source="py3-cparser-$pkgver.tar.gz::https://github.com/eliben/pycparser/archive/ builddir="$srcdir/pycparser-release_v$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 tests/all_tests.py } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index d1c6da05c..a2f3c0091 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -5,14 +5,16 @@ pkgname=py3-cryptography _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.7 +pkgver=2.8 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.org/project/cryptography" arch="all" -options="!check" # tests want hypothesis; deep rabbit hole +options="!check" # See checkdepends comment below. license="Apache-2.0 OR BSD-3-Clause" depends="python3 py3-cffi py3-asn1crypto py3-six" +# requires unpackaged py3-cryptography_vectors which makes no sense to package +#checkdepends="py3-attrs py3-hypothesis py3-pretend py3-pytest py3-tz" makedepends="python3-dev libffi-dev openssl-dev" subpackages="" source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" @@ -22,9 +24,12 @@ build() { python3 setup.py build } +check() { + python3 setup.py test +} + package() { - mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="fa420f44b038b6fe1983c6f2c6d830e2668017c26e1e125ad621e37ea627a927ffe64d0e987e0a26dcc260834f2ec817cccd22da03b892190f46cb6e8131a5a8 cryptography-2.7.tar.gz" +sha512sums="bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7 cryptography-2.8.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 557658b55..9fb5b7b0b 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,29 +1,27 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-distutils-extra -pkgver=2.42 +pkgver=2.43 pkgrel=0 pkgdesc="Python distutils extras for gettext, themed icons, and scrollkeepr docs" url="https://launchpad.net/python-distutils-extra" arch="noarch" license="GPL-2.0-only" depends="python3" -source="https://salsa.debian.org/debian/python-distutils-extra/-/archive/$pkgver/python-distutils-extra-$pkgver.tar.bz2" +makedepends="" +source="https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/$pkgver/python-distutils-extra-$pkgver.tar.bz2" builddir="$srcdir/python-distutils-extra-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3f69aa3617c4b6f33bee989f8b3612aa12b4ce3c5e07f47799209aa402640078d738e15a1e883afb7062d177ed70ff235af6b09910e4f2cc890e013998eca832 python-distutils-extra-2.42.tar.bz2" +sha512sums="a0a3ba147403e0096fd1c9f56eb898282edc7a1caf460128245730bf683d97af8706390127f2e997256b2ee50bc267125b2071b47e2eeac70ca0e2d58fa84176 python-distutils-extra-2.43.tar.bz2" diff --git a/user/py3-docutils/APKBUILD b/user/py3-docutils/APKBUILD index c07253ad7..5c1db1353 100644 --- a/user/py3-docutils/APKBUILD +++ b/user/py3-docutils/APKBUILD @@ -38,16 +38,15 @@ package() { doc() { default_doc - cd "$builddir" - local docdir="$subpkgdir/usr/share/doc/$pkgname" + docdir="$subpkgdir/usr/share/doc/$pkgname" mkdir -p "$docdir" - cp -R docs/* "$docdir" - cp *.txt "$docdir" + cp -R "$builddir"/docs/* "$docdir" + cp "$builddir"/*.txt "$docdir" - local licdir="$subpkgdir/usr/share/licenses/$pkgname" + licdir="$subpkgdir/usr/share/licenses/$pkgname" mkdir -p "$licdir" - rm -f licenses/docutils.conf - cp licenses/* "$licdir" + rm -f "$builddir"/licenses/docutils.conf + cp "$builddir"/licenses/* "$licdir" } sha512sums="b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6 py3-docutils-0.15.2.tar.gz" diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index 13265d2e6..d34548a8f 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-future _pkgname=${pkgname##py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.17.1 +pkgver=0.18.2 pkgrel=0 pkgdesc="Easy, clean, reliable Python 2/3 compatibility" url="http://python-future.org/" @@ -19,14 +19,12 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d future-0.17.1.tar.gz" +sha512sums="91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2 future-0.18.2.tar.gz" diff --git a/user/py3-html5lib/APKBUILD b/user/py3-html5lib/APKBUILD index 898efe4f1..f4f5f7781 100644 --- a/user/py3-html5lib/APKBUILD +++ b/user/py3-html5lib/APKBUILD @@ -9,27 +9,27 @@ pkgrel=0 pkgdesc="HTML parser based on the WHATWG HTML specification" url="https://pypi.python.org/pypi/html5lib" arch="noarch" +options="!check" # https://github.com/html5lib/html5lib-python/issues/433 license="MIT" depends="python3 py3-six py3-webencodings" -makedepends="python3-dev" checkdepends="py3-pytest py3-mock py3-pytest-expect" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +makedepends="python3-dev" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz + pytest.patch + " builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" pytest } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } -sha512sums="35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2 py3-html5lib-1.0.1.tar.gz" +sha512sums="35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2 py3-html5lib-1.0.1.tar.gz +89be46d5eb7b4a9ada22fa30576ae4f92d705b77988a47d52cbd876bf36240b461e7a0057c865a6b1798a3117343159ecbca43faf5316b446e5a80b8486a7e86 pytest.patch" diff --git a/user/py3-html5lib/pytest.patch b/user/py3-html5lib/pytest.patch new file mode 100644 index 000000000..fd6f99649 --- /dev/null +++ b/user/py3-html5lib/pytest.patch @@ -0,0 +1,163 @@ +From 2699544837e68b12f1740a7eb56882a0dc0a4008 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> +Date: Thu, 28 Mar 2019 01:45:43 +0100 +Subject: [PATCH] Support pytest 4 + +Fixes https://github.com/html5lib/html5lib-python/issues/411 +--- + html5lib/tests/test_encoding.py | 4 ++-- + html5lib/tests/test_sanitizer.py | 14 +++++++------- + html5lib/tests/test_serializer.py | 2 +- + html5lib/tests/test_stream.py | 7 ++++--- + html5lib/tests/test_treewalkers.py | 2 +- + requirements-test.txt | 2 +- + 6 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py +index 9a411c77..97b6ca2a 100644 +--- a/html5lib/tests/test_encoding.py ++++ b/html5lib/tests/test_encoding.py +@@ -99,8 +99,8 @@ def test_encoding(): + for filename in get_data_files("encoding"): + tests = _TestData(filename, b"data", encoding=None) + for test in tests: +- yield (runParserEncodingTest, test[b'data'], test[b'encoding']) +- yield (runPreScanEncodingTest, test[b'data'], test[b'encoding']) ++ runParserEncodingTest(test[b'data'], test[b'encoding']) ++ runPreScanEncodingTest(test[b'data'], test[b'encoding']) + + + # pylint:disable=wrong-import-position +diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py +index 45046d57..1b7285fc 100644 +--- a/html5lib/tests/test_sanitizer.py ++++ b/html5lib/tests/test_sanitizer.py +@@ -67,19 +67,19 @@ def test_sanitizer(): + 'tfoot', 'th', 'thead', 'tr', 'select']: + continue # TODO + if tag_name == 'image': +- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name, ++ runSanitizerTest("test_should_allow_%s_tag" % tag_name, + "<img title=\"1\"/>foo <bad>bar</bad> baz", + "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name)) + elif tag_name == 'br': +- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name, ++ runSanitizerTest("test_should_allow_%s_tag" % tag_name, + "<br title=\"1\"/>foo <bad>bar</bad> baz<br/>", + "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name)) + elif tag_name in constants.voidElements: +- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name, ++ runSanitizerTest("test_should_allow_%s_tag" % tag_name, + "<%s title=\"1\"/>foo <bad>bar</bad> baz" % tag_name, + "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name)) + else: +- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name, ++ runSanitizerTest("test_should_allow_%s_tag" % tag_name, + "<%s title=\"1\">foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name), + "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name)) + +@@ -93,7 +93,7 @@ def test_sanitizer(): + attribute_value = 'foo' + if attribute_name in sanitizer.attr_val_is_uri: + attribute_value = '%s://sub.domain.tld/path/object.ext' % sanitizer.allowed_protocols[0] +- yield (runSanitizerTest, "test_should_allow_%s_attribute" % attribute_name, ++ runSanitizerTest("test_should_allow_%s_attribute" % attribute_name, + "<p %s=\"%s\">foo <bad>bar</bad> baz</p>" % (attribute_name, attribute_value), + "<p %s='%s'>foo <bad>bar</bad> baz</p>" % (attribute_name, attribute_value)) + +@@ -101,7 +101,7 @@ def test_sanitizer(): + rest_of_uri = '//sub.domain.tld/path/object.ext' + if protocol == 'data': + rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ=' +- yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol, ++ runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol, + "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri), + """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri)) + +@@ -110,7 +110,7 @@ def test_sanitizer(): + if protocol == 'data': + rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ=' + protocol = protocol.upper() +- yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol, ++ runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol, + "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri), + """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri)) + +diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py +index c23592af..a4250935 100644 +--- a/html5lib/tests/test_serializer.py ++++ b/html5lib/tests/test_serializer.py +@@ -222,4 +222,4 @@ def test_serializer(): + with open(filename) as fp: + tests = json.load(fp) + for test in tests['tests']: +- yield runSerializerTest, test["input"], test["expected"], test.get("options", {}) ++ runSerializerTest(test["input"], test["expected"], test.get("options", {})) +diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py +index 27c39538..a9b3ebbe 100644 +--- a/html5lib/tests/test_stream.py ++++ b/html5lib/tests/test_stream.py +@@ -308,9 +308,10 @@ def test_invalid_codepoints(inp, num): + ("'\\uD800\\uD800\\uD800'", 3), + ("'a\\uD800a\\uD800a\\uD800a'", 3), + ("'\\uDFFF\\uDBFF'", 2), +- pytest.mark.skipif(sys.maxunicode == 0xFFFF, +- ("'\\uDBFF\\uDFFF'", 2), +- reason="narrow Python")]) ++ pytest.param( ++ "'\\uDBFF\\uDFFF'", 2, ++ mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF, ++ reason="narrow Python"))]) + def test_invalid_codepoints_surrogates(inp, num): + inp = eval(inp) # pylint:disable=eval-used + fp = StringIO(inp) +diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py +index 67fc89e5..c2323b7e 100644 +--- a/html5lib/tests/test_treewalkers.py ++++ b/html5lib/tests/test_treewalkers.py +@@ -99,7 +99,7 @@ def test_treewalker_six_mix(): + + for tree in sorted(treeTypes.items()): + for intext, attrs, expected in sm_tests: +- yield runTreewalkerEditTest, intext, expected, attrs, tree ++ runTreewalkerEditTest(intext, expected, attrs, tree) + + + @pytest.mark.parametrize("tree,char", itertools.product(sorted(treeTypes.items()), ["x", "\u1234"])) +diff --git a/requirements-test.txt b/requirements-test.txt +index 4e223a3f..b936e0fa 100644 +--- a/requirements-test.txt ++++ b/requirements-test.txt +@@ -4,7 +4,7 @@ tox + + flake8<3.0 + +-pytest==3.2.5 ++pytest>=4.3,<4.4 + coverage + pytest-expect>=1.1,<2.0 + mock +From 29bb168659da16f7c03ce635a8fbb4cdc2502667 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu> +Date: Mon, 6 Jan 2020 10:55:49 +0100 +Subject: [PATCH] marks not mark + +--- + html5lib/tests/test_stream.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py +index a9b3ebbe..06663b8c 100644 +--- a/html5lib/tests/test_stream.py ++++ b/html5lib/tests/test_stream.py +@@ -310,8 +310,8 @@ def test_invalid_codepoints(inp, num): + ("'\\uDFFF\\uDBFF'", 2), + pytest.param( + "'\\uDBFF\\uDFFF'", 2, +- mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF, +- reason="narrow Python"))]) ++ marks=pytest.mark.skipif(sys.maxunicode == 0xFFFF, ++ reason="narrow Python"))]) + def test_invalid_codepoints_surrogates(inp, num): + inp = eval(inp) # pylint:disable=eval-used + fp = StringIO(inp) diff --git a/user/py3-hypothesis/APKBUILD b/user/py3-hypothesis/APKBUILD index ad6712c8c..a165c08c5 100644 --- a/user/py3-hypothesis/APKBUILD +++ b/user/py3-hypothesis/APKBUILD @@ -4,16 +4,16 @@ pkgname=py3-hypothesis _pkgname=hypothesis _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.32.3 +pkgver=4.56.3 pkgrel=0 pkgdesc="A library for property based testing" url="https://pypi.python.org/pypi/hypothesis" arch="noarch" options="!check" # Tests are missing from release packages due to possible packaging bug? license="MPL-2.0" -depends="python3" -makedepends="python3-dev" +depends="python3 py3-sortedcontainers" checkdepends="py3-pytest py3-attrs" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" @@ -30,4 +30,4 @@ package() { } -sha512sums="a477077bc2406d130839850f813db85a5de0cf102e28f88052831555f6e43cb10ebb780b400966df38578ef6c634e43cea74fd448bcf3001c395be5950af552f py3-hypothesis-4.32.3.tar.gz" +sha512sums="221515d945669c34b676a9f57ab783e30d998b877b6e5bba27fec45cd95f5ed21e60cb4b019687f884b87c0bcad065f881fb0ca2a8d00bb216c43290bbd7d157 py3-hypothesis-4.56.3.tar.gz" diff --git a/user/py3-idna/APKBUILD b/user/py3-idna/APKBUILD index ea624e5fc..2dcf01370 100644 --- a/user/py3-idna/APKBUILD +++ b/user/py3-idna/APKBUILD @@ -17,18 +17,14 @@ source="idna-$pkgver.tar.gz::https://github.com/kjd/idna/archive/v$pkgver.tar.gz builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-imagesize/APKBUILD b/user/py3-imagesize/APKBUILD index 8b2dad108..1403a702b 100644 --- a/user/py3-imagesize/APKBUILD +++ b/user/py3-imagesize/APKBUILD @@ -17,17 +17,14 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-importlib_metadata/APKBUILD b/user/py3-importlib_metadata/APKBUILD index 593099053..90306ecc4 100644 --- a/user/py3-importlib_metadata/APKBUILD +++ b/user/py3-importlib_metadata/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-importlib_metadata _pkgname=importlib_metadata _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.23 +pkgver=1.3.0 pkgrel=0 pkgdesc="Python package metadata accessor" url="https://pypi.python.org/pypi/importlib_metadata" @@ -14,8 +14,7 @@ license="Apache-2.0" depends="python3 py3-importlib_resources py3-zipp" makedepends="" checkdepends="py3-packaging" -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() { @@ -30,5 +29,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a py3-importlib_metadata-0.23.tar.gz -12021ed7d2a358aa87c98ef7d410cc9680f71b3f31cb577b0d510b1220de240c6317ed59eceebfcded6d42d07887c013a05ed399a460616dba25cea0c33111b8 scm.patch" +sha512sums="45d09cbbbceee80a4769f2d374a3c4b511fda56a100ad1a6fc7cedf9a0cd251600c960430c608c7bcd60bdd9a0117f83025ed7b05f9f6a53edc791d128e8b0d7 py3-importlib_metadata-1.3.0.tar.gz" diff --git a/user/py3-importlib_metadata/scm.patch b/user/py3-importlib_metadata/scm.patch deleted file mode 100644 index adab51e0e..000000000 --- a/user/py3-importlib_metadata/scm.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- importlib_metadata-0.19/setup.cfg 2019-07-28 13:52:18.000000000 -0400 -+++ importlib_metadata-0.19/setup.cfg 2019-08-06 05:14:29.910183441 -0400 -@@ -16,7 +16,7 @@ classifiers = - - [options] - python_requires = >=2.7,!=3.0,!=3.1,!=3.2,!=3.3 --setup_requires = setuptools-scm -+setup_requires = - install_requires = - zipp>=0.5 - pathlib2; python_version=='3.4.*' or python_version < '3' ---- importlib_metadata-0.19/setup.py 2019-07-28 13:51:04.000000000 -0400 -+++ importlib_metadata-0.19/setup.py 2019-08-06 05:14:08.670183361 -0400 -@@ -1,3 +1,3 @@ - from setuptools import setup - --setup(use_scm_version=True) -+setup(version='0.23') diff --git a/user/py3-incremental/APKBUILD b/user/py3-incremental/APKBUILD index ff3ed3cb7..8843380f5 100644 --- a/user/py3-incremental/APKBUILD +++ b/user/py3-incremental/APKBUILD @@ -14,17 +14,14 @@ source="https://files.pythonhosted.org/packages/8f/26/02c4016aa95f45479eea37c90c builddir="$srcdir/incremental-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-jinja2/APKBUILD b/user/py3-jinja2/APKBUILD index fae072169..9cd28a69e 100644 --- a/user/py3-jinja2/APKBUILD +++ b/user/py3-jinja2/APKBUILD @@ -4,8 +4,8 @@ pkgname=py3-jinja2 _pkgname=Jinja2 _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.10.1 -pkgrel=1 +pkgver=2.10.3 +pkgrel=0 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python." url="https://pypi.python.org/pypi/Jinja2" arch="noarch" @@ -32,4 +32,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a00153a0e07bb7d67f301b4eaf7af657726a1985e9ffc7ae2d76bdbb4c062d672efc8065e398767e1039b18a483a0092e206deac91e4047aad64920b56869623 py3-jinja2-2.10.1.tar.gz" +sha512sums="c51c335450f46a467b0d40de1a51c149bdb4eb961ea888b64ff141e11b592b32e05040bfd9aa4a39892dda8d9d8cbf5a35b386ea16a247484d31b5b52eda1b8f py3-jinja2-2.10.3.tar.gz" diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index baf70ee55..4cc48bb0b 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -24,4 +24,5 @@ package() { mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } + sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 37c34782c..9237e12b9 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.4.1 +pkgver=4.5.0 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3f11469290868f5bd30631020ac170c40da7348853609edf6fc6b00437b053fd774e0dfc6e711703ac5d05398dfa1f31e59a185935c3dc8ef0e1914a518bd049 lxml-4.4.1.tar.gz" +sha512sums="7cb957b2ab9931c32984ad0808f51e650e82e2d9b14df3fd8df2dd8f2c5c261d26ebf2c672b723e89b00b867a0a8dbb9130023e48a5f302fd02d5409e1c8cd6c lxml-4.5.0.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index 00dcf775d..af088ee11 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.0 +pkgver=1.1.1 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="acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4 Mako-1.1.0.tar.gz" +sha512sums="ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7 Mako-1.1.1.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index 40df4e38d..cf6a22b2a 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -9,7 +9,7 @@ pkgrel=0 pkgdesc="A Python implementation of Markdown" url="https://python-markdown.github.io/" arch="noarch" -options="!check" # needs flake8 +options="!check" # needs flake8 license="BSD-3-Clause" depends="python3" makedepends="python3-dev" diff --git a/user/py3-markupsafe/APKBUILD b/user/py3-markupsafe/APKBUILD index ced64dfdf..a9721b9d3 100644 --- a/user/py3-markupsafe/APKBUILD +++ b/user/py3-markupsafe/APKBUILD @@ -11,25 +11,22 @@ url="https://pypi.python.org/pypi/MarkupSafe" arch="all" license="BSD-3-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" +subpackages="" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONPATH="$PYTHONPATH:$(echo build/lib.*)" pytest } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6 py3-markupsafe-1.1.1.tar.gz" diff --git a/user/py3-mock/APKBUILD b/user/py3-mock/APKBUILD index 28047234a..4445df141 100644 --- a/user/py3-mock/APKBUILD +++ b/user/py3-mock/APKBUILD @@ -19,13 +19,11 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-more-itertools/APKBUILD b/user/py3-more-itertools/APKBUILD index 14fca656c..862a120f4 100644 --- a/user/py3-more-itertools/APKBUILD +++ b/user/py3-more-itertools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-more-itertools _pkgname=more-itertools -pkgver=7.2.0 +pkgver=8.0.2 pkgrel=0 pkgdesc="More routines for operating on iterables, beyond itertools" url="https://pypi.org/project/more-itertools" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="840b535bf5f2fc3cf9c4c0106f977f0b178049b95e5ccb6cf51b5e68d0a6afd77a577bb0d0af25ea8cdf4b7dd2ce9691754ba6c773a196f8b10dba5d7683c6b0 py3-more-itertools-7.2.0.tar.gz" +sha512sums="c309bfd988efb702c25c241ca76379e0be07e1fdfb9d648c257760ac76872fd1aa77b321d94c2af9be8fb9a6709b4c60a9e0e9eb7450757ee74046bb5f9101b4 py3-more-itertools-8.0.2.tar.gz" diff --git a/user/py3-olefile/APKBUILD b/user/py3-olefile/APKBUILD index c44ee5842..a890d231f 100644 --- a/user/py3-olefile/APKBUILD +++ b/user/py3-olefile/APKBUILD @@ -11,21 +11,19 @@ arch="noarch" license="BSD-2-Clause AND Custom" depends="python3" makedepends="python3-dev unzip" +subpackages="" source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/o/$_pkgname/$_pkgname-$pkgver.zip" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONPATH="build/lib" python3 tests/test_olefile.py } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index 2908ca5c7..dd3fe06ae 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-openssl _pkgname=pyOpenSSL _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=19.0.0 +pkgver=19.1.0 pkgrel=0 pkgdesc="Python wrapper module around the OpenSSL library" url="https://github.com/pyca/pyopenssl" @@ -19,14 +19,11 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818 pyOpenSSL-19.0.0.tar.gz" +sha512sums="4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916 pyOpenSSL-19.1.0.tar.gz" diff --git a/user/py3-packaging/APKBUILD b/user/py3-packaging/APKBUILD index 1bd5298dd..c8379180b 100644 --- a/user/py3-packaging/APKBUILD +++ b/user/py3-packaging/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-packaging _pkgname=packaging _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=19.1 +pkgver=19.2 pkgrel=0 pkgdesc="Core utilities for Python packages" url="https://pypi.python.org/pypi/packaging" @@ -32,5 +32,5 @@ package() { } -sha512sums="1dec7f49c325801eb85b11432f8a316d228bb1881a04ac546f5556d60f5fa33f8085d0e91bbd5abfeb30bfcb05ec0532ed75a977dc996e256b4dc8c27c10e79b py3-packaging-19.1.tar.gz +sha512sums="af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a py3-packaging-19.2.tar.gz d67e8f3eae1b7571edf705ba532e1c9a6dc4c241cb01dfeda8addb587c2039114b0e21e73140369e4a30d0256a2073ac877737458cb95006029e7ce44d0bae93 test-glibc.patch" diff --git a/user/py3-paho-mqtt/APKBUILD b/user/py3-paho-mqtt/APKBUILD index cda723c76..adc799311 100644 --- a/user/py3-paho-mqtt/APKBUILD +++ b/user/py3-paho-mqtt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-paho-mqtt _pkgname=paho.mqtt.python -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="MQTT version 3.1.1 client class for Python" url="https://www.eclipse.org/paho/" @@ -10,8 +10,8 @@ url="https://www.eclipse.org/paho/" arch="noarch" license="EPL-1.0 AND EDL-1.0" depends="python3" -makedepends="" checkdepends="py3-pytest" +makedepends="" # Use GitHub tarball since PyPI doesn't include tests source="$pkgname-$pkgver.tar.gz::https://github.com/eclipse/paho.mqtt.python/archive/v$pkgver.tar.gz setup.patch" @@ -29,5 +29,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c py3-paho-mqtt-1.4.0.tar.gz -0cfff826651b36b5062dae8bad3abcab428dc18bfcee6c941a46f5c8900c871bd475d96fa382e06d731ea451ad9159edadf0ee3767f7dea992cb7a7ed7313d80 setup.patch" +sha512sums="7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294 py3-paho-mqtt-1.5.0.tar.gz +690f18379f1d920c9eb63a14dfa1331e8400d95db5a6038df85aaa78756d965a303a5b00877615b1546cefb804994dec99c4067564d899421aceb0e0ad3c3e68 setup.patch" diff --git a/user/py3-paho-mqtt/setup.patch b/user/py3-paho-mqtt/setup.patch index 70ccc869f..17a2243a9 100644 --- a/user/py3-paho-mqtt/setup.patch +++ b/user/py3-paho-mqtt/setup.patch @@ -1,14 +1,15 @@ --- paho.mqtt.python-1.4.0/setup.py 2018-09-02 11:20:42.000000000 +0000 +++ paho.mqtt.python-1.4.0/setup.py 2019-08-28 02:51:55.690633661 +0000 -@@ -11,9 +11,8 @@ with open('README.rst', 'rb') as readme_ +@@ -11,10 +11,9 @@ with open('README.rst', 'rb') as readme_ readme = readme_file.read().decode('utf-8') requirements = [] --test_requirements = ['pytest', 'pylama'] +-test_requirements = ['pytest', 'pylama', 'six'] -needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv) -setup_requirements = ['pytest-runner'] if needs_pytest else [] +test_requirements = ['pytest'] +setup_requirements = [] + extra_requirements = {'proxy': ['PySocks']} if sys.version_info < (3, 0): test_requirements += ['mock'] diff --git a/user/py3-parsedatetime/APKBUILD b/user/py3-parsedatetime/APKBUILD index dc2766b37..4e8698bc0 100644 --- a/user/py3-parsedatetime/APKBUILD +++ b/user/py3-parsedatetime/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-parsedatetime _pkgname=parsedatetime -pkgver=2.4 +pkgver=2.5 pkgrel=0 pkgdesc="Parse human-readable date/time strings" url="https://github.com/bear/parsedatetime" @@ -14,17 +14,14 @@ license="Apache-2.0" depends="python3 py3-future" makedepends="python3-dev" source="$_pkgname-$pkgver.tar.gz::https://github.com/bear/$_pkgname/archive/v$pkgver.tar.gz" - builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046 parsedatetime-2.4.tar.gz" +sha512sums="f729c32a3e5ee94fe39322be4772dffacb0608753e106e64d79818a6be3febc36f37e0eeac73190f1510f5e88aa0755eb0fb85fab19aa53f4643619907b245bf parsedatetime-2.5.tar.gz" diff --git a/user/py3-passlib/APKBUILD b/user/py3-passlib/APKBUILD index 83d184039..18d0d23bd 100644 --- a/user/py3-passlib/APKBUILD +++ b/user/py3-passlib/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-passlib _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=0 pkgdesc="Python password hashing framework" url="https://pypi.org/project/passlib/" @@ -31,4 +31,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168 passlib-1.7.1.tar.gz" +sha512sums="1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53 passlib-1.7.2.tar.gz" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index 77c687851..a8885c816 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.3 +pkgver=5.4.4 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="546a24a84152f7e6929e456de08302fbc0a6f736d2b6a88078c4e07eb1c12736c88d5319a3e756c14ad11e879fd9efbcd5f14b4159f11526080561534543e2df pbr-5.4.3.tar.gz" +sha512sums="da2c6c3020692215e02770ab5a31f2eccb489375e78ac2d796e3a413446c849699537d1188f0f5f83b4c8eea420af05c46cc6e2059b62ac530009ba4934e151f pbr-5.4.4.tar.gz" diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index b4e0e1745..234102cc4 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -1,10 +1,10 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pexpect _pkgname=${pkgname#*-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.7.0 +pkgver=4.8.0 pkgrel=0 pkgdesc="Python library for managing console applications" url="https://pexpect.readthedocs.io/" @@ -16,18 +16,15 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/pexpect-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4cea4229332c1f3de26dfcad596877665b3c02e91d51ca3c45c1f9b44462adb7c82abc7b76eb09a73822c2d1ccc9d812574cf79bf6bc8fb0b7d2f1093962cc3f pexpect-4.7.0.tar.gz" +sha512sums="7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580 pexpect-4.8.0.tar.gz" diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD index efc2a7b64..bb4878256 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-pillow _pkgname=Pillow _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=6.2.0 +pkgver=6.2.2 pkgrel=0 pkgdesc="A Python Imaging Library" url="https://pypi.org/project/Pillow" @@ -20,6 +20,14 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ https://dev.sick.bike/dist/$pkgname-scripts-$_scripts_rev.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +# secfixes: pillow +# 6.2.2-r0: +# - CVE-2019-19911 +# - CVE-2020-5310 +# - CVE-2020-5311 +# - CVE-2020-5312 +# - CVE-2020-5313 + unpack() { default_unpack mv pillow-scripts-*/Scripts "$builddir/Scripts" @@ -43,12 +51,11 @@ doc() { pkgdesc="Example scripts for $pkgname" depends="$pkgname" - cd "$builddir" - local destdir="$subpkgdir/usr/share/doc/$pkgname" + destdir="$subpkgdir/usr/share/doc/$pkgname" install -d "$destdir"/Scripts - install -m 644 Scripts/* "$destdir"/Scripts/ - install -Dm644 LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE" + install -m 644 "$builddir"/Scripts/* "$destdir"/Scripts/ + install -Dm644 "$builddir"/LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="6eeb51d764c85a9b1f4eb0a59bbff41541852d5e2988c0e32b03acb56010b7d398f5761daaa56731bde278e52a551b44fab5b662988e096e8fd53e5d15d4e083 py3-pillow-6.2.0.tar.gz +sha512sums="517c971d4fb23a47466a7e8326c8c29291f7832d4521001c1898d6223ea25d4b0a8b7c8f7e78dd706f421229a8261b558b9fbdc43e47a0a2a7b2b4bbc1a21eff py3-pillow-6.2.2.tar.gz c01e83a7cef6653a33f60acbcbc737f0d40ff0dbc792ce0b2ce52f21092d3071845830fa0f64b27a1c5e679c53df57e0ec2e89867ee717f938d4e6f19db77790 py3-pillow-scripts-b24479c.tar.gz" diff --git a/user/py3-pluggy/APKBUILD b/user/py3-pluggy/APKBUILD index b5a750e5f..df9de6f8d 100644 --- a/user/py3-pluggy/APKBUILD +++ b/user/py3-pluggy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pluggy _pkgname=pluggy -pkgver=0.13.0 +pkgver=0.13.1 pkgrel=0 pkgdesc="Plugin management and hook calling for Python" url="https://pypi.python.org/pypi/pluggy" @@ -11,8 +11,8 @@ options="!check" # Cyclic dependency with py3-pytest. Passes on x86_64 # Certified net clean license="MIT" depends="python3 py3-importlib_metadata" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz scm.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -29,5 +29,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7 py3-pluggy-0.13.0.tar.gz +sha512sums="eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e py3-pluggy-0.13.1.tar.gz 0d811c2ba311b64af7762d48f92d3df2d72e71398f5b42d4ae71a067810f6d4b6d0f0bc4a06529f7e335c54e70640cc8c82b00b5dccd54aee4310c24bfa5e7ce scm.patch" diff --git a/user/py3-ply/APKBUILD b/user/py3-ply/APKBUILD index 495a66d53..351c11b03 100644 --- a/user/py3-ply/APKBUILD +++ b/user/py3-ply/APKBUILD @@ -14,17 +14,14 @@ source="http://www.dabeaz.com/ply/ply-$pkgver.tar.gz" builddir="$srcdir/ply-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-pretend/APKBUILD b/user/py3-pretend/APKBUILD index 87ba1cdf6..5a7b8e175 100644 --- a/user/py3-pretend/APKBUILD +++ b/user/py3-pretend/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Test script missing from tarball license="BSD-3-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 test_pretend.py } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD index 465b3056f..3b58a225f 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.6.3 +pkgver=5.7.0 pkgrel=0 pkgdesc="Process and system utilities" url="https://pypi.org/project/psutil/" @@ -12,7 +12,7 @@ license="BSD-3-Clause" depends="python3" makedepends="python3-dev utmps-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz +source="https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz utmpx.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c psutil-5.6.3.tar.gz +sha512sums="8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 psutil-5.7.0.tar.gz 5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" diff --git a/user/py3-psycopg2/APKBUILD b/user/py3-psycopg2/APKBUILD index 1d78e60b8..2e75817d4 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.3 +pkgver=2.8.4 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="74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928 psycopg2-2.8.3.tar.gz" +sha512sums="d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28 psycopg2-2.8.4.tar.gz" diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD index 981976f23..af121ab31 100644 --- a/user/py3-ptyprocess/APKBUILD +++ b/user/py3-ptyprocess/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-ptyprocess pkgver=0.6.0 pkgrel=0 @@ -10,21 +10,18 @@ license="ISC" depends="python3" makedepends="" source="https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-$pkgver.tar.gz" -sha512sums="b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86 ptyprocess-0.6.0.tar.gz" builddir="$srcdir/ptyprocess-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } +sha512sums="b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86 ptyprocess-0.6.0.tar.gz" diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index 0b725ba6e..15fbb0d5b 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -1,20 +1,21 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pycairo -pkgver=1.18.1 +pkgver=1.19.0 pkgrel=0 pkgdesc="Python bindings for Cairo" url="https://pycairo.readthedocs.io/" arch="all" +options="!check" # Test suite requires unpackaged py3-flake8. license="MIT AND (LGPL-2.1-only OR MPL-1.1)" depends="" +checkdepends="py3-pytest" makedepends="python3-dev cairo-dev meson" subpackages="$pkgname-dev" source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz" builddir="$srcdir/pycairo-$pkgver" build() { - cd "$builddir" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -26,12 +27,11 @@ build() { } check() { - cd "$builddir" + ninja -C output test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } -sha512sums="fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024 pycairo-1.18.1.tar.gz" +sha512sums="920c456cba580901e7276d324a15ff65c7c6a18bff623ba030a121f5d6a52e13f49c3db2d8f4e5aada0e3462cd4aa744ea7b8465ef1f253c8fb28f2b4919e5b9 pycairo-1.19.0.tar.gz" diff --git a/user/py3-pycotap/APKBUILD b/user/py3-pycotap/APKBUILD index a2731dc39..1a1ced5c9 100644 --- a/user/py3-pycotap/APKBUILD +++ b/user/py3-pycotap/APKBUILD @@ -15,17 +15,14 @@ source="https://files.pythonhosted.org/packages/a1/99/f1dfa70ffe1140f701ba979763 builddir="$srcdir/$_pipname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index a9c885418..9bfe39936 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -6,10 +6,10 @@ pkgname=py3-pygments _pkgname=Pygments _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.4.2 +pkgver=2.5.2 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" -url="http://pygments.org/" +url="https://pygments.org/" arch="noarch" options="!check" # needs nose, flake8 license="BSD-2-Clause" @@ -37,4 +37,4 @@ doc() { install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1 } -sha512sums="c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66 Pygments-2.4.2.tar.gz" +sha512sums="d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859 Pygments-2.5.2.tar.gz" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index d1dfe928d..f8c355cb8 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pygobject -pkgver=3.32.2 +pkgver=3.34.0 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -10,22 +10,19 @@ license="LGPL-2.1+ AND LGPL-2.1-only" depends="py3-pycairo" makedepends="python3-dev gobject-introspection-dev py3-pycairo-dev" subpackages="$pkgname-dev" -source="https://ftp.gnome.org/pub/GNOME/sources/pygobject/3.32/pygobject-$pkgver.tar.xz" +source="https://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject-$pkgver.tar.xz" builddir="$srcdir/pygobject-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="50081bfed45e8b5f0b87fe5c95d4cc12d1b31085e869c603bbc70e34bca69059cc44e8a42270f51e7f04e3ecf2c98da524327a982ed7bb594621fb434d4227f6 pygobject-3.32.2.tar.xz" +sha512sums="782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766 pygobject-3.34.0.tar.xz" diff --git a/user/py3-pytest-expect/APKBUILD b/user/py3-pytest-expect/APKBUILD index 0a3d5cb17..2b82dc863 100644 --- a/user/py3-pytest-expect/APKBUILD +++ b/user/py3-pytest-expect/APKBUILD @@ -16,20 +16,16 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" # No tests available python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd py3-pytest-expect-1.1.0.tar.gz" diff --git a/user/py3-python-dateutil/APKBUILD b/user/py3-python-dateutil/APKBUILD index 56e7075e8..833c61ed2 100644 --- a/user/py3-python-dateutil/APKBUILD +++ b/user/py3-python-dateutil/APKBUILD @@ -18,17 +18,17 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" - pytest + # Required with PyTest >=4.8, see: + # https://bugzilla.redhat.com/show_bug.cgi?id=1734775 + # https://github.com/pytest-dev/pytest/issues/5678 + pytest -W ignore::pytest.PytestUnknownMarkWarning } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-random2/APKBUILD b/user/py3-random2/APKBUILD index d8ac44035..da7838e39 100644 --- a/user/py3-random2/APKBUILD +++ b/user/py3-random2/APKBUILD @@ -12,22 +12,18 @@ arch="noarch" license="Python-2.0" depends="python3" makedepends="python3-dev" -install="" source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.zip" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONPATH="build/lib" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-requests-toolbelt/APKBUILD b/user/py3-requests-toolbelt/APKBUILD index 189ad887d..8ecddaa88 100644 --- a/user/py3-requests-toolbelt/APKBUILD +++ b/user/py3-requests-toolbelt/APKBUILD @@ -8,7 +8,7 @@ pkgrel=0 pkgdesc="Useful classes and functions to be used with python-requests" url="https://github.com/requests/toolbelt" arch="noarch" -options="!check" # needs betamax +options="!check" # Needs betamax license="Apache-2.0" depends="python3" makedepends="python3-dev" @@ -17,13 +17,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/requests/$_pkgname/archive/$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD index a82061ee2..f5b4d4c8f 100644 --- a/user/py3-requests/APKBUILD +++ b/user/py3-requests/APKBUILD @@ -24,7 +24,6 @@ build() { } package() { - mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index 34332a1d8..5af94e017 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -20,13 +20,11 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-six/APKBUILD b/user/py3-six/APKBUILD index 94ece5835..32beed401 100644 --- a/user/py3-six/APKBUILD +++ b/user/py3-six/APKBUILD @@ -10,23 +10,20 @@ arch="noarch" options="!check" # Circular dependency with py3-pytest license="MIT" depends="" -makedepends="python3-dev" #checkdepends="py3-pluggy py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/benjaminp/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sortedcontainers/APKBUILD b/user/py3-sortedcontainers/APKBUILD new file mode 100644 index 000000000..b14785965 --- /dev/null +++ b/user/py3-sortedcontainers/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-sortedcontainers +_pkgname=sortedcontainers +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=2.1.0 +pkgrel=0 +pkgdesc="Sorted container objects for Python 3" +url="https://pypi.python.org/pypi/sortedcontainers" +arch="noarch" +options="!check" # See checkdepends comment below. +license="Apache-2.0" +depends="python3" +# requires unpackaged filelock, toml; requires importlib_metadata<1 +#checkdepends="py3-importlib_metadata py3-packaging py3-tox" +makedepends="python3-dev" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" + +} + +sha512sums="6fe2b6e7d030b67aa990d62160079852feaee7828164eae03a6477dc1704863f6ed0daadb44dc919653c66996d51f833b5858351a8fd5ad28998f8010a8ca1a4 py3-sortedcontainers-2.1.0.tar.gz" diff --git a/user/py3-sphinx/APKBUILD b/user/py3-sphinx/APKBUILD index df79f3b9b..d42d67825 100644 --- a/user/py3-sphinx/APKBUILD +++ b/user/py3-sphinx/APKBUILD @@ -13,8 +13,8 @@ options="!check" # Some latex tests failing on 2.0.0 due to translation bug, see # Main software is BSD-2-Clause. license="BSD-2-Clause AND BSD-3-Clause AND MIT" depends="python3 py3-alabaster py3-babel py3-pygments py3-docutils py3-imagesize py3-jinja2 py3-packaging py3-pyparsing py3-requests py3-snowballstemmer py3-tz py3-sphinxcontrib-applehelp py3-sphinxcontrib-devhelp py3-sphinxcontrib-htmlhelp py3-sphinxcontrib-jsmath py3-sphinxcontrib-qthelp py3-sphinxcontrib-serializinghtml imagemagick" -makedepends="python3-dev" checkdepends="py3-pytest py3-docutils py3-html5lib" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD index 26010c36a..eebdeb272 100644 --- a/user/py3-sphinxcontrib-applehelp/APKBUILD +++ b/user/py3-sphinxcontrib-applehelp/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Cyclic dependency with sphinx license="BSD-2-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25 } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sphinxcontrib-asyncio/APKBUILD b/user/py3-sphinxcontrib-asyncio/APKBUILD index 09f91c27b..8723f312c 100644 --- a/user/py3-sphinxcontrib-asyncio/APKBUILD +++ b/user/py3-sphinxcontrib-asyncio/APKBUILD @@ -27,7 +27,6 @@ check() { } package() { - mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD index 5b25ff13c..474ec4928 100644 --- a/user/py3-sphinxcontrib-devhelp/APKBUILD +++ b/user/py3-sphinxcontrib-devhelp/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Cyclic dependency with sphinx license="BSD-2-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25 } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD index 09de4ddf6..abfc54ec8 100644 --- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD +++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD @@ -12,8 +12,8 @@ arch="noarch" options="!check" # Cyclic dependency with sphinx license="BSD-2-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest py3-html5lib" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" diff --git a/user/py3-sphinxcontrib-jsmath/APKBUILD b/user/py3-sphinxcontrib-jsmath/APKBUILD index 9443b5d25..c8c8d5f25 100644 --- a/user/py3-sphinxcontrib-jsmath/APKBUILD +++ b/user/py3-sphinxcontrib-jsmath/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Cyclic dependency on sphinx license="BSD-2-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25 } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD index fb32bad02..3740f30ff 100644 --- a/user/py3-sphinxcontrib-qthelp/APKBUILD +++ b/user/py3-sphinxcontrib-qthelp/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Cyclic dependency with sphinx license="BSD-2-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25 } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD index b18e17848..35b6bc979 100644 --- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD +++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD @@ -12,23 +12,20 @@ arch="noarch" options="!check" # Cyclic dependency with sphinx license="BSD-2-Clause" depends="python3 py3-markupsafe" -makedepends="python3-dev" checkdepends="py3-sphinx py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25 } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index b877992d3..d59df486f 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-transitions _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=0 pkgdesc="Python state machine library" url="https://pypi.org/project/transitions/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4802e6a914270a183f66e70cf648c5f09c25b63e9233fdeb65b231ad24847d023182c6a45eaa1d47780d1f5d7f6f23695a6e578d4eaae55bf7a7ff121561e06b transitions-0.7.1.tar.gz" +sha512sums="c33eaec3e338b6febd924d803b85436df3ec3ab728315290fe81c73fb328aedcdb15e8f19f0e3d9d3a7d62750671686ae65bad560c48cfd113481dfe702a4204 transitions-0.7.2.tar.gz" diff --git a/user/py3-twisted/APKBUILD b/user/py3-twisted/APKBUILD index c1f9a6321..408081052 100644 --- a/user/py3-twisted/APKBUILD +++ b/user/py3-twisted/APKBUILD @@ -4,18 +4,31 @@ pkgname=py3-twisted _pkgname=Twisted _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=19.7.0 +pkgver=19.10.0 pkgrel=0 pkgdesc="Asynchronous networking framework written in Python" url="https://twistedmatrix.com/" arch="all" +# FIXME: constantly, automat, hyperlink, and PyHamcrest +# also need to be packaged and added to depends= +options="net" license="MIT" -depends="py3-incremental" +depends="python3 py3-attrs py3-incremental py3-zope-interface" makedepends="python3-dev" subpackages="" -source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2 + CVE-2020-10108-and-2020-10109.patch + " builddir="$srcdir/Twisted-$pkgver" +# secfixes: twisted +# 19.10.0-r0: +# - CVE-2019-9512 +# - CVE-2019-9514 +# - CVE-2019-9515 +# - CVE-2020-10108 +# - CVE-2020-10109 + build() { python3 setup.py build } @@ -28,4 +41,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="46588008f0be63f9ec8cfb88bb81f4268e59e8dead8256c36144b521eb3e58726f4d8c9016b7157365b26929e39a3fa6ff2cc2a9f83e8cfa7f1acc43d31297c4 Twisted-19.7.0.tar.bz2" +sha512sums="de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b Twisted-19.10.0.tar.bz2 +dcc22af0a72bce5cca3c9f5ee739b17f14275ac8e776c658743746239c793ad9585fb0333203945912fd4994bd001b7244905562c4389304a707a2a4430faa40 CVE-2020-10108-and-2020-10109.patch" diff --git a/user/py3-twisted/CVE-2020-10108-and-2020-10109.patch b/user/py3-twisted/CVE-2020-10108-and-2020-10109.patch new file mode 100644 index 000000000..9a58f5584 --- /dev/null +++ b/user/py3-twisted/CVE-2020-10108-and-2020-10109.patch @@ -0,0 +1,260 @@ +From 4a7d22e490bb8ff836892cc99a1f54b85ccb0281 Mon Sep 17 00:00:00 2001 +From: Mark Williams <mrw@enotuniq.org> +Date: Sun, 16 Feb 2020 19:00:10 -0800 +Subject: [PATCH] Fix several request smuggling attacks. + +1. Requests with multiple Content-Length headers were allowed (thanks +to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; + +2. Requests with a Content-Length header and a Transfer-Encoding +header honored the first header (thanks to Jake Miller from Bishop +Fox) and now fail with a 400; + +3. Requests whose Transfer-Encoding header had a value other than +"chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail +with a 400. +--- + src/twisted/web/http.py | 64 +++++++--- + src/twisted/web/newsfragments/9770.bugfix | 1 + + src/twisted/web/test/test_http.py | 137 ++++++++++++++++++++++ + 3 files changed, 187 insertions(+), 15 deletions(-) + create mode 100644 src/twisted/web/newsfragments/9770.bugfix + +diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py +index f0fb05b4d69..06d830fe30f 100644 +--- a/src/twisted/web/http.py ++++ b/src/twisted/web/http.py +@@ -2171,6 +2171,51 @@ def _finishRequestBody(self, data): + self.allContentReceived() + self._dataBuffer.append(data) + ++ def _maybeChooseTransferDecoder(self, header, data): ++ """ ++ If the provided header is C{content-length} or ++ C{transfer-encoding}, choose the appropriate decoder if any. ++ ++ Returns L{True} if the request can proceed and L{False} if not. ++ """ ++ ++ def fail(): ++ self._respondToBadRequestAndDisconnect() ++ self.length = None ++ ++ # Can this header determine the length? ++ if header == b'content-length': ++ try: ++ length = int(data) ++ except ValueError: ++ fail() ++ return False ++ newTransferDecoder = _IdentityTransferDecoder( ++ length, self.requests[-1].handleContentChunk, self._finishRequestBody) ++ elif header == b'transfer-encoding': ++ # XXX Rather poorly tested code block, apparently only exercised by ++ # test_chunkedEncoding ++ if data.lower() == b'chunked': ++ length = None ++ newTransferDecoder = _ChunkedTransferDecoder( ++ self.requests[-1].handleContentChunk, self._finishRequestBody) ++ elif data.lower() == b'identity': ++ return True ++ else: ++ fail() ++ return False ++ else: ++ # It's not a length related header, so exit ++ return True ++ ++ if self._transferDecoder is not None: ++ fail() ++ return False ++ else: ++ self.length = length ++ self._transferDecoder = newTransferDecoder ++ return True ++ + + def headerReceived(self, line): + """ +@@ -2196,21 +2241,10 @@ def headerReceived(self, line): + + header = header.lower() + data = data.strip() +- if header == b'content-length': +- try: +- self.length = int(data) +- except ValueError: +- self._respondToBadRequestAndDisconnect() +- self.length = None +- return False +- self._transferDecoder = _IdentityTransferDecoder( +- self.length, self.requests[-1].handleContentChunk, self._finishRequestBody) +- elif header == b'transfer-encoding' and data.lower() == b'chunked': +- # XXX Rather poorly tested code block, apparently only exercised by +- # test_chunkedEncoding +- self.length = None +- self._transferDecoder = _ChunkedTransferDecoder( +- self.requests[-1].handleContentChunk, self._finishRequestBody) ++ ++ if not self._maybeChooseTransferDecoder(header, data): ++ return False ++ + reqHeaders = self.requests[-1].requestHeaders + values = reqHeaders.getRawHeaders(header) + if values is not None: +diff --git a/src/twisted/web/newsfragments/9770.bugfix b/src/twisted/web/newsfragments/9770.bugfix +new file mode 100644 +index 00000000000..4f1be97de8a +--- /dev/null ++++ b/src/twisted/web/newsfragments/9770.bugfix +@@ -0,0 +1 @@ ++Fix several request smuggling attacks: requests with multiple Content-Length headers were allowed (thanks to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; requests with a Content-Length header and a Transfer-Encoding header honored the first header (thanks to Jake Miller from Bishop Fox) and now fail with a 400; requests whose Transfer-Encoding header had a value other than "chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail a 400. +\ No newline at end of file +diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py +index 0a0db09b750..578cb500cda 100644 +--- a/src/twisted/web/test/test_http.py ++++ b/src/twisted/web/test/test_http.py +@@ -2252,6 +2252,143 @@ def process(self): + self.flushLoggedErrors(AttributeError) + + ++ def assertDisconnectingBadRequest(self, request): ++ """ ++ Assert that the given request bytes fail with a 400 bad ++ request without calling L{Request.process}. ++ ++ @param request: A raw HTTP request ++ @type request: L{bytes} ++ """ ++ class FailedRequest(http.Request): ++ processed = False ++ def process(self): ++ FailedRequest.processed = True ++ ++ channel = self.runRequest(request, FailedRequest, success=False) ++ self.assertFalse(FailedRequest.processed, "Request.process called") ++ self.assertEqual( ++ channel.transport.value(), ++ b"HTTP/1.1 400 Bad Request\r\n\r\n") ++ self.assertTrue(channel.transport.disconnecting) ++ ++ ++ def test_duplicateContentLengths(self): ++ """ ++ A request which includes multiple C{content-length} headers ++ fails with a 400 response without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Content-Length: 56', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_duplicateContentLengthsWithPipelinedRequests(self): ++ """ ++ Two pipelined requests, the first of which includes multiple ++ C{content-length} headers, trigger a 400 response without ++ calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Content-Length: 56', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ b'GET /a HTTP/1.1', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_contentLengthAndTransferEncoding(self): ++ """ ++ A request that includes both C{content-length} and ++ C{transfer-encoding} headers fails with a 400 response without ++ calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: chunked', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_contentLengthAndTransferEncodingWithPipelinedRequests(self): ++ """ ++ Two pipelined requests, the first of which includes both ++ C{content-length} and C{transfer-encoding} headers, triggers a ++ 400 response without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: chunked', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ b'GET /a HTTP/1.1', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_unknownTransferEncoding(self): ++ """ ++ A request whose C{transfer-encoding} header includes a value ++ other than C{chunked} or C{identity} fails with a 400 response ++ without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: unknown', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_transferEncodingIdentity(self): ++ """ ++ A request with a valid C{content-length} and a ++ C{transfer-encoding} whose value is C{identity} succeeds. ++ """ ++ body = [] ++ ++ class SuccessfulRequest(http.Request): ++ processed = False ++ def process(self): ++ body.append(self.content.read()) ++ self.setHeader(b'content-length', b'0') ++ self.finish() ++ ++ request = b'''\ ++GET / HTTP/1.1 ++Host: host.invalid ++Content-Length: 2 ++Transfer-Encoding: identity ++ ++ok ++''' ++ channel = self.runRequest(request, SuccessfulRequest, False) ++ self.assertEqual(body, [b'ok']) ++ self.assertEqual( ++ channel.transport.value(), ++ b'HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n', ++ ) ++ ++ + + class QueryArgumentsTests(unittest.TestCase): + def testParseqs(self): diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index f9c40cc4b..1c9545f24 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-tz _pkgname=pytz -pkgver=2019.2 +pkgver=2019.3 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -14,7 +14,7 @@ options="!check" # flake8, sphinx depends="python3 tzdata" makedepends="python3-dev unzip" subpackages="" -source="https://pypi.io/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz +source="https://pypi.io/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz zoneinfo-noinstall.patch zoneinfo-fix.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -27,6 +27,6 @@ package() { mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="86d8b600373274f66200e5e9426303d5855221c85488415ad9270059fc7853c6f5f9399b11aad41f6522fbccc0878b9caf896c9bba16fde9857e412620151beb pytz-2019.2.tar.gz +sha512sums="b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af pytz-2019.3.tar.gz be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch 7629da5d76056789e7c29a4f047d25fe77586d4a78e8a1ce7ad7c513507d286098666edb24ee5cadc9b0a4d5623336bba8a6b0f786072ce741177022201fdc54 zoneinfo-fix.patch" diff --git a/user/py3-u-msgpack-python/APKBUILD b/user/py3-u-msgpack-python/APKBUILD index b4bb4187b..68ea543d2 100644 --- a/user/py3-u-msgpack-python/APKBUILD +++ b/user/py3-u-msgpack-python/APKBUILD @@ -11,8 +11,8 @@ url="https://pypi.python.org/pypi/u-msgpack-python" arch="noarch" license="MIT" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" @@ -26,7 +26,6 @@ check() { package() { python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9 py3-u-msgpack-python-2.5.2.tar.gz" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index bde1340a1..23b590532 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -22,7 +22,6 @@ build() { } package() { - mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-webencodings/APKBUILD b/user/py3-webencodings/APKBUILD index 967596d83..728488106 100644 --- a/user/py3-webencodings/APKBUILD +++ b/user/py3-webencodings/APKBUILD @@ -12,25 +12,21 @@ arch="noarch" # Packaging error, see https://github.com/gsnedders/python-webencodings/blob/master/LICENSE license="BSD-3-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONPATH="build/lib:$PYTHONPATH" pytest webencodings/tests.py } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326 py3-webencodings-0.5.1.tar.gz" diff --git a/user/py3-websockets/APKBUILD b/user/py3-websockets/APKBUILD index 2655259cf..89fa0d503 100644 --- a/user/py3-websockets/APKBUILD +++ b/user/py3-websockets/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-websockets _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=8.0.2 +pkgver=8.1 pkgrel=0 pkgdesc="Python implementation of RFCs 6455 and 7692" url="https://pypi.org/project/websockets/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d2a1a4c781776ec621e63e020033b1d6a6b35109d7648940a980f01067edc39fbdb49cde6ab606319584cc75d0d5f16c34fec7a308b14eaf672a5730e84c3791 websockets-8.0.2.tar.gz" +sha512sums="408e35d7a908830d51b3b9b73a1c34b1b2dbabbbbd2431515bc0fba7f6ec7db402a55fd00dc737d344549fd5d5f2d90e27cef7cd5f7847e4a1545d3c74db007c websockets-8.1.tar.gz" diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD index 32feb82ad..1553b39ed 100644 --- a/user/py3-zope-component/APKBUILD +++ b/user/py3-zope-component/APKBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Zope Component Architecture" url="https://pypi.python.org/pypi/zope.component" arch="noarch" -options="!check" # needs nose +options="!check" # needs nose license="ZPL-2.1" depends="python3 py3-zope-deferredimport py3-zope-deprecation py3-zope-event py3-zope-hookable py3-zope-interface py3-zope-proxy" makedepends="python3-dev" @@ -17,12 +17,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD index 4e68d859c..dff95a0ec 100644 --- a/user/py3-zope-deferredimport/APKBUILD +++ b/user/py3-zope-deferredimport/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Zope module that allows for lazy module importing" url="https://github.com/zopefoundation/zope.deferredimport" arch="noarch" -options="!check" # needs zope.testrunner +options="!check" # needs zope.testrunner license="ZPL-2.1" depends="python3" makedepends="python3-dev py3-zope-proxy" diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD index 22e629f26..faf402240 100644 --- a/user/py3-zope-deprecation/APKBUILD +++ b/user/py3-zope-deprecation/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="A function to mark deprecated parts of an API" url="https://github.com/zopefoundation/zope.deprecation" arch="noarch" -options="!check" # needs zope.testrunner +options="!check" # needs zope.testrunner license="ZPL-2.1" depends="python3" makedepends="python3-dev" @@ -16,12 +16,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-event/APKBUILD b/user/py3-zope-event/APKBUILD index 391da22f7..38ac46e39 100644 --- a/user/py3-zope-event/APKBUILD +++ b/user/py3-zope-event/APKBUILD @@ -8,26 +8,22 @@ pkgrel=0 pkgdesc="Event publishing / dispatch, used by Zope Component Architecture" url="https://github.com/zopefoundation/zope.event" arch="noarch" -options="!check" # needs nose +options="!check" # needs nose license="ZPL-2.1" depends="python3" makedepends="python3-dev" source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" - builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD index b1025e17c..65130c841 100644 --- a/user/py3-zope-interface/APKBUILD +++ b/user/py3-zope-interface/APKBUILD @@ -18,17 +18,14 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index 1b2a069df..2704aa053 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Zope module for class and function proxies" url="https://github.com/zopefoundation/zope.proxy" arch="all" -options="!check" # needs zope.testrunner, zope.security +options="!check" # needs zope.testrunner, zope.security license="ZPL-2.1" depends="python3 py3-zope-interface" makedepends="python3-dev" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 0161221f4..0586a751d 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -11,9 +11,9 @@ depends="bash" makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" subpackages="$pkgname-doc $pkgname-lang" +langdir="/usr/share/qastools/l10n" source="https://gitlab.com/sebholt/qastools/-/archive/v$pkgver/qastools-v$pkgver.tar.bz2" builddir="$srcdir/$pkgname-v$pkgver" -langdir="/usr/share/qastools/l10n" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -24,8 +24,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/qca/APKBUILD b/user/qca/APKBUILD index cd0210d0b..fd2dc82f1 100644 --- a/user/qca/APKBUILD +++ b/user/qca/APKBUILD @@ -13,21 +13,19 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz" build() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DWITH_cyrus-sasl_PLUGIN=yes \ . make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index 472b5e90e..e64bb2510 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -157,6 +157,7 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz signal-fixes.patch sysinfo-header.patch fix-lm32-underlinking.patch + time64.patch $pkgname-guest-agent.confd $pkgname-guest-agent.initd @@ -409,6 +410,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55 c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch +87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd 1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6 qemu-guest-agent.initd 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules diff --git a/user/qemu/time64.patch b/user/qemu/time64.patch new file mode 100644 index 000000000..8ec9f45df --- /dev/null +++ b/user/qemu/time64.patch @@ -0,0 +1,20 @@ +--- qemu-3.0.0/hw/input/virtio-input-host.c.old 2018-08-14 19:10:34.000000000 +0000 ++++ qemu-3.0.0/hw/input/virtio-input-host.c 2020-01-24 06:12:08.788062930 +0000 +@@ -193,13 +193,16 @@ + { + VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput); + struct input_event evdev; ++ struct timeval tv; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tv, NULL)) { + perror("virtio_input_host_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tv.tv_sec; ++ evdev.input_event_usec = tv.tv_usec; + evdev.type = le16_to_cpu(event->type); + evdev.code = le16_to_cpu(event->code); + evdev.value = le32_to_cpu(event->value); diff --git a/user/qml-box2d/APKBUILD b/user/qml-box2d/APKBUILD index 701e06871..1919cb10a 100644 --- a/user/qml-box2d/APKBUILD +++ b/user/qml-box2d/APKBUILD @@ -15,13 +15,11 @@ source="qml-box2d-$pkgver.tar.gz::https://github.com/qml-box2d/qml-box2d/archive builddir="$srcdir/qml-box2d-$_hash" build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD index df20bbe25..30efe0385 100644 --- a/user/qpdf/APKBUILD +++ b/user/qpdf/APKBUILD @@ -7,8 +7,8 @@ url="http://qpdf.sourceforge.net" arch="all" license="Apache-2.0 OR Artistic-2.0" depends="" -makedepends="bash libjpeg-turbo-dev zlib-dev" checkdepends="coreutils perl" +makedepends="bash libjpeg-turbo-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-fix-qdf:fix_qdf:noarch" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD index 6bafa639b..4d37c6ad4 100644 --- a/user/qpdfview/APKBUILD +++ b/user/qpdfview/APKBUILD @@ -9,7 +9,7 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev +makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev poppler-dev poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-doc" source="https://launchpad.net/qpdfview/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz" diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index 550bb8352..ec708c3c0 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qps -pkgver=1.10.20 +pkgver=2.0.0 pkgrel=0 pkgdesc="Qt-based task manager" url="https://lxqt.org" @@ -13,14 +13,13 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0" subpackages="$pkgname-doc" source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz - qps-1.10.17-compile-fixes.patch" + qps-1.10.17-compile-fixes.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -28,19 +27,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef qps-1.10.20.tar.xz +sha512sums="b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019 qps-2.0.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 new file mode 100644 index 000000000..a9468cd1f --- /dev/null +++ b/user/qqc2-desktop-style/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qqc2-desktop-style +pkgver=5.67.1 +pkgrel=0 +pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0-only AND LGPL-3.0-only" +depends="" +makedepends="cmake extra-cmake-modules kconfig-dev kconfigwidgets-dev + kiconthemes-dev kirigami2-dev qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qtquickcontrols2-dev qt5-qtx11extras-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/qqc2-desktop-style-$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="c2a88c81e2f4f1c586c7b512624cb631a1e8b84aea1caa69647aa939b34f44c66a1369bfbcbfa32d152f674e852399877c88abcb038eefd99a7480929b085f66 qqc2-desktop-style-5.67.1.tar.xz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 4bb436a7d..3ed606043 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.9.2 +pkgver=4.11.0 pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" @@ -20,13 +20,11 @@ builddir="$srcdir/$pkgname-opensource-src-$pkgver" build() { export LLVM_INSTALL_DIR=/usr qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo" - ln -s /usr/bin/python3 "$srcdir"/python - PATH="$PATH:$srcdir" make - rm "$srcdir"/python + make } package() { make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="a67a4c53c4b3777bf05151aaa317bb72a46dc3040769e900e72b25458feb42220a68556f63ff75623c873c10a10d882df80fe0d582eedaccd6facb1d9cfa0bf8 qt-creator-opensource-src-4.9.2.tar.gz" +sha512sums="29e5c72d4002cdddecbdea689dd5048aa8d0b74c980a6b8096b03c3c39f4868e4490c4516ba287a4082eaaa4ec412309c1d498a4f97754720c88ae4ab53d30b8 qt-creator-opensource-src-4.11.0.tar.gz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 95f461d64..18b5b88ad 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase -_pkgname=qtbase-opensource-src -pkgver=5.9.7 -pkgrel=1 -pkgdesc="Qt 5.9 base components" +_pkgname=qtbase-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-tds $pkgname-x11" +depends="" depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl sqlite-dev zlib-dev $_sub" @@ -25,15 +26,23 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu big-endian-scroll-wheel.patch link-to-execinfo.patch qt-musl-iconv-no-bom.patch + time64.patch " +# secfixes: qt +# 5.9.7-r0: +# - CVE-2018-15518 +# - CVE-2018-19869 +# - CVE-2018-19870 +# - CVE-2018-19871 +# - CVE-2018-19873 + _qt5_prefix=/usr/lib/qt5 _qt5_datadir=/usr/share/qt5 builddir="$srcdir"/$_pkgname-$pkgver prepare() { default_prepare - cd "$builddir" sed -i -e "s|-O2|$CXXFLAGS|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ @@ -41,9 +50,7 @@ prepare() { } build() { - cd "$builddir" - - local ARCH_OPTS="" + ARCH_OPTS="" [ ${CTARGET_ARCH} != "pmmx" ] || ARCH_OPTS="-no-sse2" ./configure -confirm-license -opensource \ @@ -56,6 +63,7 @@ build() { -glib \ -icu \ -importdir "$_qt5_prefix"/imports \ + -kms \ -libexecdir "$_qt5_prefix"/libexec \ -no-pch \ -no-rpath \ @@ -87,15 +95,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install mkdir -p "$pkgdir"/usr/bin/ - local i for i in "$pkgdir"/$_qt5_prefix/bin/*; do ln -s ../lib/qt5/bin/"$(basename $i)" \ "$pkgdir"/usr/bin/"$(basename $i)" @@ -103,15 +108,14 @@ package() { } _mv_files() { - local i - for i; do + for i in "$@"; do mkdir -p "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i "$subpkgdir"/$i + mv "$pkgdir"/$i "$subpkgdir"/${i%/*} done } dev() { - cd "$pkgdir" + cd "$pkgdir" # Required for the 'find' command to work properly. _mv_files usr/lib/qt5/mkspecs \ usr/lib/cmake \ usr/lib/qt5/bin \ @@ -122,38 +126,32 @@ dev() { sqlite() { pkgdesc="SQLite driver for Qt5's SQL classes" - cd "$pkgdir" _mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlite* } odbc() { pkgdesc="ODBC driver for Qt5's SQL classes" - cd "$pkgdir" _mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlodbc* } postgresql() { pkgdesc="PostgreSQL driver for Qt5's SQL classes" - cd "$pkgdir" _mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlpsql* } mysql() { pkgdesc="MySQL driver for Qt5's SQL classes" - cd "$pkgdir" _mv_files usr/lib/qt5/plugins/sqldrivers/libqsqlmysql* } tds() { pkgdesc="TDS driver for Qt5's SQL classes" - cd "$pkgdir" _mv_files usr/lib/qt5/plugins/sqldrivers/libqsqltds* } x11() { pkgdesc="Qt5 GUI-related libraries" depends="hicolor-icon-theme" - cd "$pkgdir" _mv_files \ usr/lib/libQt5EglFSDeviceIntegration.so.* \ usr/lib/libQt5EglFsKmsSupport.so.* \ @@ -169,11 +167,12 @@ x11() { usr/lib/qt5/plugins/printsupport* \ usr/lib/qt5/plugins/xcbglintegrations - scanelf -Rn usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1 + scanelf -Rn "$pkgdir"/usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1 return 0 } -sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e qtbase-opensource-src-5.9.7.tar.xz -0f5b3d93bd1543f4e28e3dfe4a77db4759f2e3afbeb6f6b2c3aa76bf106ed585984ea228b2233bc53afeb3f51c557e3545b18a74096d2cf129364a1f6c4ef090 big-endian-scroll-wheel.patch +sha512sums="5fb82d903b0db95c23c55785047722dea7979e7f94ecaaf374e0c73b4787aabd768a1c79482a091b8b11f61d7bd4fb891675a6842b90cdc9caaa3b393a3187c6 qtbase-everywhere-src-5.12.6.tar.xz +d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c big-endian-scroll-wheel.patch ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch -dca65670df25a8e391d4c62b8967f4377cbd193a3053d8e8e288452ea197f418fe3f6d9d5e48dc333a44aeadec68e3d4380b3672a07ef6baf7aa3eed96ba96e3 qt-musl-iconv-no-bom.patch" +e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch +436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch" diff --git a/user/qt5-qtbase/big-endian-scroll-wheel.patch b/user/qt5-qtbase/big-endian-scroll-wheel.patch index 3fbb8aec7..4cfa4f7b8 100644 --- a/user/qt5-qtbase/big-endian-scroll-wheel.patch +++ b/user/qt5-qtbase/big-endian-scroll-wheel.patch @@ -1,43 +1,55 @@ ---- qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.old 2018-10-16 08:37:05.000000000 +0000 -+++ qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp 2019-08-03 03:58:05.875790720 +0000 -@@ -43,6 +43,7 @@ - #include "qxcbwindow.h" - #include "qtouchdevice.h" - #include "QtCore/qmetaobject.h" -+#include "QtCore/qendian.h" - #include <qpa/qwindowsysteminterface_p.h> - #include <QDebug> - #include <cmath> -@@ -106,6 +107,7 @@ - XIEventMask xiEventMask; - bitMask = XI_HierarchyChangedMask; - bitMask |= XI_DeviceChangedMask; -+ bitMask = qToLittleEndian(bitMask); - xiEventMask.deviceid = XIAllDevices; - xiEventMask.mask_len = sizeof(bitMask); - xiEventMask.mask = xiBitMask; -@@ -327,7 +329,8 @@ - } - XIEventMask mask; - mask.mask_len = sizeof(bitMask); -+ bitMask = qToLittleEndian(bitMask); - mask.mask = xiBitMask; - // When xi2MouseEvents() is true (the default), pointer emulation for touch and tablet - // events will get disabled. This is preferable, as Qt Quick handles touch events - // directly, while for other applications QtGui synthesizes mouse events. -@@ -353,6 +356,7 @@ - tabletBitMask = XI_PropertyEventMask; - if (!pointerSelected) - tabletBitMask |= XI_ButtonPressMask | XI_ButtonReleaseMask | XI_MotionMask; -+ tabletBitMask = qToLittleEndian(tabletBitMask); - for (int i = 0; i < m_tabletData.count(); ++i) { - int deviceId = m_tabletData.at(i).deviceId; - tabletDevices.insert(deviceId); -@@ -374,6 +378,7 @@ - - scrollBitMask = XI_MotionMask; - scrollBitMask |= XI_ButtonReleaseMask; -+ scrollBitMask = qToLittleEndian(scrollBitMask); - int i=0; - for (const ScrollingDevice& scrollingDevice : qAsConst(m_scrollingDevices)) { - if (tabletDevices.contains(scrollingDevice.deviceId)) +--- qtbase-everywhere-src-5.12.3/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.orig 2019-08-02 17:27:00.011197696 +0200
++++ qtbase-everywhere-src-5.12.3/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp 2019-08-02 17:29:36.336019411 +0200
+@@ -43,6 +43,7 @@
+ #include "qxcbwindow.h"
+ #include "qtouchdevice.h"
+ #include "QtCore/qmetaobject.h"
++#include "QtCore/qendian.h"
+ #include <qpa/qwindowsysteminterface_p.h>
+ #include <QDebug>
+ #include <cmath>
+@@ -66,6 +67,7 @@
+ xiEventMask.mask = XCB_INPUT_XI_EVENT_MASK_HIERARCHY;
+ xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_DEVICE_CHANGED;
+ xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_PROPERTY;
++ xiEventMask.mask = qToLittleEndian(xiEventMask.mask);
+ xcb_input_xi_select_events(xcb_connection(), rootWindow(), 1, &xiEventMask.header);
+ }
+
+@@ -90,7 +92,7 @@
+ qt_xcb_input_event_mask_t mask;
+ mask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+ mask.header.mask_len = 1;
+- mask.mask = bitMask;
++ mask.mask = qToLittleEndian(bitMask);
+ xcb_void_cookie_t cookie =
+ xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &mask.header);
+ xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
+@@ -363,7 +365,7 @@
+ qt_xcb_input_event_mask_t xiMask;
+ xiMask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+ xiMask.header.mask_len = 1;
+- xiMask.mask = mask;
++ xiMask.mask = qToLittleEndian(mask);
+
+ xcb_void_cookie_t cookie =
+ xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &xiMask.header);
+@@ -390,7 +392,7 @@
+ tabletDevices.insert(deviceId);
+ xiEventMask[i].header.deviceid = deviceId;
+ xiEventMask[i].header.mask_len = 1;
+- xiEventMask[i].mask = mask;
++ xiEventMask[i].mask = qToLittleEndian(mask);
+ }
+ xcb_input_xi_select_events(xcb_connection(), window, nrTablets, &(xiEventMask.data()->header));
+ }
+@@ -406,7 +408,7 @@
+ #endif
+ xiEventMask[i].header.deviceid = scrollingDevice.deviceId;
+ xiEventMask[i].header.mask_len = 1;
+- xiEventMask[i].mask = mask;
++ xiEventMask[i].mask = qToLittleEndian(mask);
+ i++;
+ }
+ xcb_input_xi_select_events(xcb_connection(), window, i, &(xiEventMask.data()->header));
+
diff --git a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch index be2afc714..9df5d594d 100644 --- a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch +++ b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch @@ -1,6 +1,6 @@ --- qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-01-18 15:20:58.000000000 +0100 +++ qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-02-21 14:33:32.423808603 +0100 -@@ -63,7 +63,7 @@ +@@ -61,7 +61,7 @@ #elif defined(Q_OS_AIX) # define NO_BOM # define UTF16 "UCS-2" diff --git a/user/qt5-qtbase/time64.patch b/user/qt5-qtbase/time64.patch new file mode 100644 index 000000000..76b4671c6 --- /dev/null +++ b/user/qt5-qtbase/time64.patch @@ -0,0 +1,62 @@ +From e06ac2e26c8490a7b8702e9462d1f38244ac3f0f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Nov 2019 08:27:39 -0800 +Subject: [PATCH] input: Make use of timeval portable for 64bit time_t + +This patch avoids using time field of input_event structure which is not available +on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new +and keeps old input.h implementation functional as well. + +See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign + +Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- + .../input/evdevtouch/qevdevtouchhandler.cpp | 2 +- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +index 666613f09d..0e3e0ea0de 100644 +--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp ++++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +@@ -58,6 +58,11 @@ + #include <linux/input.h> + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + QT_BEGIN_NAMESPACE + + Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") +@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) + qCDebug(qLcEvdevKey) << "switchLed" << led << state; + + struct ::input_event led_ie; +- ::gettimeofday(&led_ie.time, 0); ++ struct timeval tval; ++ ::gettimeofday(&tval, 0); ++ led_ie.input_event_sec = tval.tv_sec; ++ led_ie.input_event_usec = tval.tv_usec; + led_ie.type = EV_LED; + led_ie.code = led; + led_ie.value = state; +diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +index f86f80785e..3914698f2a 100644 +--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp ++++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +@@ -568,7 +568,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) + + // update timestamps + m_lastTimeStamp = m_timeStamp; +- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; ++ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; + + m_lastTouchPoints = m_touchPoints; + m_touchPoints.clear(); +-- +2.24.0 + diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index 38d6e1bb1..349bdfd84 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,17 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative -_pkgname=${pkgname#qt5-}-opensource-src -pkgver=5.9.7 -pkgrel=1 -pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2" +_pkgname=${pkgname#qt5-}-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +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 libexecinfo-dev python3" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz add-execinfo.patch - pmmx.patch + disable-jit-pmmx.patch python3.patch " @@ -35,7 +36,7 @@ package() { done } -sha512sums="bccddeca26c317083fcebc182dd3221dcbe9af665c502bfb636907f2c17a6edd8874a964910423c9eaa6e5c68bf5a13520193ba77f915be08ba1982348d2a9ee qtdeclarative-opensource-src-5.9.7.tar.xz +sha512sums="b60537dd10bc2c91c7a40035248d898733fbf1486ae2e00f8d8de37af965dcb1ee48828f82704441370656f0821896b09acf7f06dd0a7c398a2a9497ce4f0250 qtdeclarative-everywhere-src-5.12.6.tar.xz 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch -07bad5742bf00acadc6f2d5e1b8756b9545b95ad93d2b16646c0031abec881bfab6e1c39ca2f1b0a4e43d716518bd4380fd45995a9597d9ce1b51f88f9379176 pmmx.patch -c434ec3b3eaa8859cc3a3ce48d0299533428d94c998876e5735c210b25f89bc8509980cee0d96f2e68331540f95b5f1ec5e9745949d26367bde1d15bc7ac9081 python3.patch" +d21aeba1167ebebcdfc54eca14f714efc3de7252513ea4fd096dcbcab2d509faa06d94a6b8978ee7ea15b1c9acb94bc23662debecc2f443a4a5258b90c872048 disable-jit-pmmx.patch +bb39564f2d68e5635141f3de950ff7ec8174d2c972d066049153039268154de1cad7fcb82d191e325db0a0317ed90eb869431432e32494fa52584af1536f1990 python3.patch" diff --git a/user/qt5-qtdeclarative/disable-jit-pmmx.patch b/user/qt5-qtdeclarative/disable-jit-pmmx.patch new file mode 100644 index 000000000..971fd9f14 --- /dev/null +++ b/user/qt5-qtdeclarative/disable-jit-pmmx.patch @@ -0,0 +1,18 @@ +It is no longer possible to remove the SSE2 requirement. + +So we remove the JIT entirely on pmmx/x86. + +--- qtdeclarative-everywhere-src-5.12.6/src/qml/jsruntime/qv4global_p.h.old 2019-11-07 11:01:48.000000000 +0000 ++++ qtdeclarative-everywhere-src-5.12.6/src/qml/jsruntime/qv4global_p.h 2019-12-27 06:11:55.456270846 +0000 +@@ -88,10 +88,7 @@ + // + // NOTE: This should match the logic in qv4targetplatform_p.h! + +-#if defined(Q_PROCESSOR_X86_32) && (QT_POINTER_SIZE == 4) \ +- && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) +-# define V4_ENABLE_JIT +-#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ ++#if defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ + && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)) + # define V4_ENABLE_JIT + #elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) \ diff --git a/user/qt5-qtdeclarative/pmmx.patch b/user/qt5-qtdeclarative/pmmx.patch deleted file mode 100644 index a4ce84650..000000000 --- a/user/qt5-qtdeclarative/pmmx.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 4950c366b12265f1ea390a6feb8dbbd0d850d206 Mon Sep 17 00:00:00 2001 -From: Guillem Jover <guillem@hadrons.org> -Date: Mon, 12 Oct 2015 01:45:37 +0200 -Subject: [PATCH v2] Do not make lack of SSE2 support on x86-32 fatal - -When an x86-32 CPU does not have SSE2 support (which is the case for -all AMD CPUs, and older Intel CPUs), fallback to use the interpreter, -otherwise use the JIT engine. - -Even then, make the lack of SSE2 support on x86-32 fatal when trying -to instantiate a JIT engine, which does require it. - -Refactor the required CPU support check into a new pair of privately -exported functions to avoid duplicating the logic, and do so in -functions instead of class members to avoid changing the class -signatures. - -Version: 5.7.x -Bug-Debian: https://bugs.debian.org/792594 ---- - src/qml/jit/qv4isel_masm.cpp | 2 ++ - src/qml/jit/qv4isel_masm_p.h | 18 ++++++++++++++++++ - src/qml/jsruntime/qv4engine.cpp | 1 + - src/qml/qml/v8/qv8engine.cpp | 7 ------- - tools/qmljs/qmljs.cpp | 7 +++---- - 5 files changed, 24 insertions(+), 11 deletions(-) - ---- a/src/qml/jit/qv4isel_masm.cpp -+++ b/src/qml/jit/qv4isel_masm.cpp -@@ -72,6 +72,8 @@ InstructionSelection<JITAssembler>::Inst - , compilationUnit(new CompilationUnit) - , qmlEngine(qmlEngine) - { -+ checkRequiredCpuSupport(); -+ - compilationUnit->codeRefs.resize(module->functions.size()); - module->unitFlags |= QV4::CompiledData::Unit::ContainsMachineCode; - } ---- a/src/qml/jit/qv4isel_masm_p.h -+++ b/src/qml/jit/qv4isel_masm_p.h -@@ -60,6 +60,7 @@ - - #include <QtCore/QHash> - #include <QtCore/QStack> -+#include <private/qsimd_p.h> - #include <config.h> - #include <wtf/Vector.h> - -@@ -72,6 +73,23 @@ QT_BEGIN_NAMESPACE - namespace QV4 { - namespace JIT { - -+Q_QML_PRIVATE_EXPORT inline bool hasRequiredCpuSupport() -+{ -+#ifdef Q_PROCESSOR_X86_32 -+ return qCpuHasFeature(SSE2); -+#else -+ return true; -+#endif -+} -+ -+Q_QML_PRIVATE_EXPORT inline void checkRequiredCpuSupport() -+{ -+#ifdef Q_PROCESSOR_X86_32 -+ if (!qCpuHasFeature(SSE2)) -+ qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); -+#endif -+} -+ - template <typename JITAssembler = Assembler<DefaultAssemblerTargetConfiguration>> - class Q_QML_EXPORT InstructionSelection: - protected IR::IRDecoder, ---- a/src/qml/jsruntime/qv4engine.cpp -+++ b/src/qml/jsruntime/qv4engine.cpp -@@ -159,6 +159,7 @@ - - #ifdef V4_ENABLE_JIT - static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") || -+ !JIT::hasRequiredCpuSupport() || - !OSAllocator::canAllocateExecutableMemory(); - if (forceMoth) { - factory = new Moth::ISelFactory; ---- a/src/qml/qml/v8/qv8engine.cpp -+++ b/src/qml/qml/v8/qv8engine.cpp -@@ -64,7 +64,6 @@ - #include <QtCore/qjsonvalue.h> - #include <QtCore/qdatetime.h> - #include <QtCore/qdatastream.h> --#include <private/qsimd_p.h> - - #include <private/qv4value_p.h> - #include <private/qv4dateobject_p.h> -@@ -129,12 +128,6 @@ QV8Engine::QV8Engine(QJSEngine* qq) - , m_xmlHttpRequestData(0) - , m_listModelData(0) - { --#ifdef Q_PROCESSOR_X86_32 -- if (!qCpuHasFeature(SSE2)) { -- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); -- } --#endif -- - QML_MEMORY_SCOPE_STRING("QV8Engine::QV8Engine"); - qMetaTypeId<QJSValue>(); - qMetaTypeId<QList<int> >(); ---- a/tools/qmljs/qmljs.cpp -+++ b/tools/qmljs/qmljs.cpp -@@ -92,11 +92,10 @@ int main(int argc, char *argv[]) - enum { - use_masm, - use_moth -- } mode; -+ } mode = use_moth; - #ifdef V4_ENABLE_JIT -- mode = use_masm; --#else -- mode = use_moth; -+ if (QV4::JIT::hasRequiredCpuSupport()) -+ mode = use_masm; - #endif - - bool runAsQml = false; diff --git a/user/qt5-qtdeclarative/python3.patch b/user/qt5-qtdeclarative/python3.patch index 2d67290bb..e863f7a9f 100644 --- a/user/qt5-qtdeclarative/python3.patch +++ b/user/qt5-qtdeclarative/python3.patch @@ -20,7 +20,7 @@ QMAKE_EXTRA_COMPILERS += udis86 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c -@@ -110,7 +110,7 @@ +@@ -113,7 +113,7 @@ retgen.script = $$PWD/create_regex_tables retgen.input = retgen.script retgen.CONFIG += no_link diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD index c4a476b9f..57e85b5b0 100644 --- a/user/qt5-qtgraphicaleffects/APKBUILD +++ b/user/qt5-qtgraphicaleffects/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtgraphicaleffects -_pkgname=qtgraphicaleffects-opensource-src -pkgver=5.9.7 +_pkgname=qtgraphicaleffects-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Pre-made visual effects for QML" +pkgdesc="Pre-made visual effects for QML" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +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 qt5-qtdeclarative-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" @@ -14,19 +15,16 @@ _qt5_prefix=/usr/lib/qt5 builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="914e70403b9529071f13b3f7af596f4b06f1988d59e0ea5915cc6f5b8b2e1b38eaab50e2cbe5a895d0f5be4f99c3ec62b32d629083ff3dc1fce413acb2615c0f qtgraphicaleffects-opensource-src-5.9.7.tar.xz" +sha512sums="54bd457e47aaff799eb92d91b7aab5692420556493ee39ff34dca496f8ab24dab84c8a638a71b74c201454db4e306b12dad4c8b300ce6c254cdc0c2d7b3a9c8a qtgraphicaleffects-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtimageformats/APKBUILD b/user/qt5-qtimageformats/APKBUILD new file mode 100644 index 000000000..92ab99eb8 --- /dev/null +++ b/user/qt5-qtimageformats/APKBUILD @@ -0,0 +1,30 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtimageformats +_pkgname=qtimageformats-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Image handling plugin for Qt" +url="https://www.qt.io/" +arch="all" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="jasper-dev libwebp-dev qt5-qtbase-dev tiff-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" + +_qt5_prefix=/usr/lib/qt5 +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +check() { + make check +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="0f8c481f647d6047b66564247b604a741f16c2758e96245abd0ef190ba50c937b6c713c7a466b911dd8e074174a7b30e6ad1ed0cd7ed915c4cda9dc4dccd8ab9 qtimageformats-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD index 9b677708a..204a01047 100644 --- a/user/qt5-qtmultimedia/APKBUILD +++ b/user/qt5-qtmultimedia/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtmultimedia -_pkgname=qtmultimedia-opensource-src -pkgver=5.9.7 +_pkgname=qtmultimedia-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Audio, video, radio, and camera libraries" +pkgdesc="Audio, video, radio, and camera libraries for Qt 5" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" makedepends="alsa-lib-dev gstreamer-dev gst-plugins-base-dev libxv-dev pulseaudio-dev qt5-qtbase-dev qt5-qtdeclarative-dev xorgproto-dev" subpackages="$pkgname-dev" @@ -14,18 +15,15 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="a5c947cb8764e63e81187db01caefa588bab77705b03ed0dff09433b0831f55f2461c64f2ce99085c7bfcac795ae67dd69ac7a992ef8d04c043d237e2c95e4c6 qtmultimedia-opensource-src-5.9.7.tar.xz" +sha512sums="e72768c9b392dcaaefafb63b26cdf1a44b554c545c3f42bd12b0817c251cd495291e06bda97fa303c522c2f34e0483db428684f4053db52753929c57fa257470 qtmultimedia-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index 9f74280ef..47b957554 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtpositioning -_pkgname=qtlocation-opensource-src -pkgver=5.9.7 +_pkgname=qtlocation-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Geolocation services" +pkgdesc="Geolocation services for Qt 5" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" depends="" makedepends="icu-dev qt5-qtbase-dev" subpackages="$pkgname-dev" @@ -18,7 +18,6 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake # too memory hungry if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then @@ -29,9 +28,8 @@ build() { } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="a0ee0d699ecf568eb9371ff0743f9ec65f568e235e8964a2e3187a3135fc943795101c8922fbe560779f7878f44a630383234a65ed67aea35d084ce04eeb7a96 qtlocation-opensource-src-5.9.7.tar.xz +sha512sums="89fa4ea878331423dba90dd3bad7340991b7b24b66b2b1947f53d3a7fe0bdc6465a5cd085d25c6fa0018be5d0931ddb5da021c0c3eb6b5f5eddd5499641b4b4b qtlocation-everywhere-src-5.12.6.tar.xz 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c no-getting-thread-names.patch" diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD index 7666875ce..9468c6bf8 100644 --- a/user/qt5-qtquickcontrols/APKBUILD +++ b/user/qt5-qtquickcontrols/APKBUILD @@ -1,30 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols -_pkgname=qtquickcontrols-opensource-src -pkgver=5.9.7 +_pkgname=qtquickcontrols-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - controls for use with Qt Quick" +pkgdesc="Controls for use with Qt Quick" url="https://www.qt.io/" arch="all" -license="(LGPL-2.0 with exceptions OR GPL-3.0 with exceptions) AND GFDL-1.3" +license="(LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0) AND GFDL-1.3" +depends="" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="87b8af09035f77bf02e6995a173d381536c50896604dcd884f7adede4d70464d5ee28161fda7b449ad851a728254cee00b7984099c4c9f024623a16157c0a656 qtquickcontrols-opensource-src-5.9.7.tar.xz" +sha512sums="901bcf7c800406f2749ebc251a7b0419fdbab4599881475aae7f74ce4eac5347837f5e667f78774ad914a1c3fbf42e144606c9592bff3f34e899870709fb4c87 qtquickcontrols-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index 274ff17bf..4a0593d05 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -1,30 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 -_pkgname=qtquickcontrols2-opensource-src -pkgver=5.9.7 +_pkgname=qtquickcontrols2-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Quick Controls 2.0" +pkgdesc="Qt Quick Controls 2.0" url="https://www.qt.io/" arch="all" options="!check" # Impossible to test with accelerated X desktop -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" depends="" -depends_dev="qt5-qtdeclarative-dev" -makedepends="$depends_dev qt5-qtbase-dev" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="591a3b5ee53f681d1c9906451db76c89c12e9ccdc0cdbbb18937550612149505ba415f85d3acf2c01ab6c6b9aab279388fb2e6b501daf9ac49095b20eaeac032 qtquickcontrols2-opensource-src-5.9.7.tar.xz" +sha512sums="89cd9dc3589367d6c5687426e347d8b51cc3f74777ff2538236d8cee8fbf255d7cbf0d7f0eef584e29750d3d7cb1a34325782112bd0d1a2a70973e3c5feefd25 qtquickcontrols2-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD index 4f56a9e7d..1b22dbc9c 100644 --- a/user/qt5-qtscript/APKBUILD +++ b/user/qt5-qtscript/APKBUILD @@ -1,34 +1,29 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtscript -_pkgname=qtscript-opensource-src -pkgver=5.9.7 -pkgrel=1 -pkgdesc="Qt 5 - Deprecated scripting framework for Qt applications" +_pkgname=qtscript-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Deprecated scripting framework for Qt applications" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +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 - gcc8.patch - " +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake - make + make 2>build.log } check() { - cd "$builddir" make check } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="e019d2e7aa29e1183636503822db960d97f1787fa7517f286acbe42645f2c5daa099cc251ac6640e3243dedb4ef64e509f2e22bca798a7e583063e0ac7635662 qtscript-opensource-src-5.9.7.tar.xz -426174235ab57b14edf58166327372ba215dfce092b9d4cc07686b326c999d4d6348460a75343791de96b6ad7352c393b4a748d0592865e0d78dc119c12657f2 gcc8.patch" +sha512sums="31fdcd008c68ab1b17d0a648441e97bba2186a93c8f0e13381e655125a1b1c282682f9db24428c4bb84b28ab5da0dfd7cbea63d326855580a206d81387a2fcc8 qtscript-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtscript/gcc8.patch b/user/qt5-qtscript/gcc8.patch deleted file mode 100644 index 2fb04a708..000000000 --- a/user/qt5-qtscript/gcc8.patch +++ /dev/null @@ -1,238 +0,0 @@ -From 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Mon, 28 Jan 2019 14:33:12 -0800 -Subject: Fix build with GCC 8.3 - -Qualifiers in the asm statement are not allowed in the global scope. I -thought they were necessary for LTO, but I the commit to this file that -added them predates my work on setting up LTO for GCC. - -Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - .../javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++++----------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -index 1abdf8b..9f60761 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".text" "\n" \ - ".align 2" "\n" \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ -@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ - HIDE_SYMBOL(cti_##op) "\n" \ - SYMBOL_STRING(cti_##op) ":" "\n" \ --- -cgit v1.2.1 - diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD index bc363c58b..1a4abe625 100644 --- a/user/qt5-qtsensors/APKBUILD +++ b/user/qt5-qtsensors/APKBUILD @@ -1,29 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsensors -_pkgname=qtsensors-opensource-src -pkgver=5.9.7 +_pkgname=qtsensors-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Library for interfacing with sensors" +pkgdesc="Library for interfacing with sensors using Qt" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="b07c5a79e9f1db5d64bef6fb92954c7467858d5f00f9bc96f8f7c8651121c1c57de7d21b273827830814919b5fa19720515d3a2dab77bf87876e60fdaedae788 qtsensors-opensource-src-5.9.7.tar.xz" +sha512sums="82921de2fac2e0dcccd7b8ce2a0f5ce83d0e6d9a92a5294a59bc3d5a498de0fd644e284ba69f1ddf61c6f467627ef37bedfa0b8b6890b509cb7755109f444a49 qtsensors-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD index afbf09362..c90c7eee9 100644 --- a/user/qt5-qtserialport/APKBUILD +++ b/user/qt5-qtserialport/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtserialport -_pkgname=qtserialport-opensource-src -pkgver=5.9.7 +_pkgname=qtserialport-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Connect Qt applications to serial ports" +pkgdesc="Connect Qt applications to serial ports" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" depends="" makedepends="eudev-dev qt5-qtbase-dev" subpackages="$pkgname-dev" @@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="a90cfec383f2c1e8240bbcb0fe18c99773833d0749499e3b379d669b6053eaceea7813665068b2512cdc5c57cef5dafbdd9928e8f3d133405fb02c4c0c44e80b qtserialport-opensource-src-5.9.7.tar.xz" +sha512sums="5994ddfafbe21438b5c79667ff32ff19bc9c4a09c798801698584baf5709968ad3e33aec5fac3064769270d94331ae99d223349220610f577ee8b00fcf950403 qtserialport-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD index 408e95824..e6b368602 100644 --- a/user/qt5-qtspeech/APKBUILD +++ b/user/qt5-qtspeech/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtspeech -_pkgname=qtspeech-opensource-src -pkgver=5.9.7 +_pkgname=qtspeech-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Library for speech processing and Text-to-Speech (TTS)" +pkgdesc=" Library for speech processing and Text-to-Speech (TTS) in Qt" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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 qt5-qtmultimedia-dev speech-dispatcher-dev" subpackages="$pkgname-dev" @@ -18,15 +18,13 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="e2d1f2f73bc6595572d18b1c17caf27878851adf164dbca25925301b94916cce96b2ea3db4c2c7e6a23d6e79c37c35b28239aa613adaf6cb9eb340f40c396099 qtspeech-opensource-src-5.9.7.tar.xz +sha512sums="f2355de53e10d6ec9dcbc6371bfde73c2a69e5b3dbf1d97c840c665c9f38efd62d70aa2912f0000813efb072d15291037e4f8eb2edbeaa7549b0e2c348bd918a qtspeech-everywhere-src-5.12.6.tar.xz 7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718 fix-linking-order.patch" diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD index d0c96bdc6..ec6aaa074 100644 --- a/user/qt5-qtsvg/APKBUILD +++ b/user/qt5-qtsvg/APKBUILD @@ -1,31 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsvg -_pkgname=qtsvg-opensource-src -pkgver=5.9.7 +_pkgname=qtsvg-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - SVG rendering library" +pkgdesc="Qt SVG rendering library" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" makedepends="qt5-qtbase-dev zlib-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="d2e58ff0321fd40031dbbc0d0b0a8bb321cae2dc64bb4afec3c72ed9b5a25d67b156971d7a5ea4f74d966a3e8cda779474ee932ab129fa0b26f12978feebcd84 qtsvg-opensource-src-5.9.7.tar.xz" +sha512sums="a0200f38566ba526a9366c0b240d4e3e0ba0662209fa1225145d3c2f2f371c77ba804239f96a6d351f117413240adce17c53f16205285d6aed6978bc5435a942 qtsvg-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index da0fd89c1..876fecd91 100644 --- a/user/qt5-qttools/APKBUILD +++ b/user/qt5-qttools/APKBUILD @@ -1,16 +1,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qttools -_pkgname=qttools-opensource-src -pkgver=5.9.7 +_pkgname=qttools-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Tools for Qt development" +pkgdesc="Tools for Qt development" url="https://www.qt.io/" arch="all" options="!check" # Tests require KDE 4 with special window manager config -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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" -install="" subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer qdbus qtpaths" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz @@ -24,13 +23,11 @@ _qt5_prefix=/usr/lib/qt5 builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" mkdir -p "$pkgdir"/usr/bin/ @@ -65,32 +62,28 @@ package() { } _mv_files() { - local i for i in "$@"; do mkdir -p "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i "$subpkgdir"/$i + mv "$pkgdir"/$i "$subpkgdir"/${i%/*} done } qdbus() { pkgdesc="Qt 5 D-Bus tool" depends="dbus-x11" - cd "$pkgdir" _mv_files $_qt5_prefix/bin/qdbus usr/bin/qdbus-qt5 usr/bin/qdbus } qtpaths() { pkgdesc="Qt 5 path determination tool" - cd "$pkgdir" _mv_files $_qt5_prefix/bin/qtpaths usr/bin/qtpaths-qt5 usr/bin/qtpaths } dev() { - pkgdesc="More Qt 5 development utilities (Qt Designer, Qt Linguist)" default_dev - cd "$pkgdir" + pkgdesc="More Qt 5 development utilities (Qt Designer, Qt Linguist)" for i in designer lconvert linguist lrelease lupdate pixeltool \ - qcollectiongenerator qhelpconverter qhelpgenerator; do + qcollectiongenerator qhelpgenerator; do _mv_files $_qt5_prefix/bin/$i usr/bin/$i-qt5 usr/bin/$i done @@ -103,23 +96,22 @@ dev() { _assistant() { pkgdesc="Documentation browser for Qt 5" - cd "$pkgdir" + # workaround for weird shell bug??? _mv_files usr/bin/assist* \ $_qt5_prefix/bin/assist* \ usr/share/applications/*assistant* \ - usr/share/icons/hicolor/*/apps/assistant* + usr/share/icons/hicolor/{32x32,128x128}/apps/assistant* } _dbusviewer() { pkgdesc="Qt 5 D-Bus debugger and viewer" - cd "$pkgdir" _mv_files usr/bin/qdbusviewer* \ $_qt5_prefix/bin/qdbusviewer* \ usr/share/applications/qdbusviewer* \ - usr/share/icons/hicolor/*/apps/qdbusviewer* + usr/share/icons/hicolor/{32x32,128x128}/apps/qdbusviewer* } -sha512sums="0240881adf23d3b5841882e107969ed298ee05b82c125a7577b568b29d4402259d459e534408f8768ce419c61a8c974c35454cb94c9387e160fd308209188b8a qttools-opensource-src-5.9.7.tar.xz +sha512sums="fd35a9dad9f797657121ce9daf916483f81fcc9dc2cd8ee30333d3614a17376579278f993ed2b96c578c64c7cdad0003151ed350c129263d377e0f1b0a34f787 qttools-everywhere-src-5.12.6.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qtvirtualkeyboard/APKBUILD b/user/qt5-qtvirtualkeyboard/APKBUILD new file mode 100644 index 000000000..98c1a2abc --- /dev/null +++ b/user/qt5-qtvirtualkeyboard/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtvirtualkeyboard +_pkgname=qtvirtualkeyboard-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="On-screen keyboard module for Qt 5" +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 qt5-qtdeclarative-dev qt5-qtsvg-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="9ddac64a6a688333ac7250ce3be38e0909cab4c25ebc1574da30f472df557d9898674cc8b7ad408877b01e7635897c72e45f6b88002134e0e48cff378c066208 qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD index 95a4371fd..b1e793132 100644 --- a/user/qt5-qtwebchannel/APKBUILD +++ b/user/qt5-qtwebchannel/APKBUILD @@ -1,29 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebchannel -_pkgname=qtwebchannel-opensource-src -pkgver=5.9.7 +_pkgname=qtwebchannel-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Connect Qt applications to WebSockets" +pkgdesc="Connect Qt applications to WebSockets" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="0109f11dd9c83e8dbf50921abb642a5e185fda98ead87973bd1b24c1f490268f2a9c7d264da659f7eac1f98942aecc839d7418abce0e7d2a66093b9b89eb4bca qtwebchannel-opensource-src-5.9.7.tar.xz" +sha512sums="3f0a1732cd81506c2e5aa467e0233a909e6241943ed973ce12f6c8f1d1a8bf61b2a9bae7f5ea0655c071e6832f5a767554124ac27950597b146c36273e9e189e qtwebchannel-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch b/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch deleted file mode 100644 index 73f5c97f8..000000000 --- a/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 4594ec8..639f28f 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -342,7 +342,7 @@ - #endif - #endif - --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) -+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD index 36b624e8a..45f739573 100644 --- a/user/qt5-qtwebkit/APKBUILD +++ b/user/qt5-qtwebkit/APKBUILD @@ -1,72 +1,78 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebkit -_pkgname=qtwebkit-opensource-src -pkgver=5.9.1 -pkgrel=4 -pkgdesc="Qt 5 - WebKit components" -url="https://www.qt.io/" +_realname=$pkgname +#qtwebkit +pkgver=5.212.0_git20191114 +_realver=$(printf '%s' "$pkgver" | sed 's/_/-/') +pkgrel=0 +pkgdesc="Open source Web browser engine" +url="https://github.com/qtwebkit/qtwebkit" arch="all" -options="!check" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" -depends="" -depends_dev="qt5-qtdeclarative-dev gstreamer-dev gst-plugins-base-dev - libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev - libxrender-dev - " -makedepends="$depends_dev bison flex fontconfig-dev gperf libjpeg-turbo-dev - libpng-dev libwebp-dev pcre-dev qt5-qtbase-dev ruby sqlite-dev zlib-dev" +options="!check" # Tests fail (surprise), require X11. +license="LGPL-2.1+ AND BSD-3-Clause AND Others" +depends="gst-plugins-base" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf + libxml2-dev libxslt-dev libjpeg-turbo-dev libpng-dev zlib-dev glib-dev + gstreamer-dev fontconfig-dev qt5-qtsensors-dev qt5-qtpositioning-dev + qt5-qtdeclarative-dev qt5-qtwebchannel-dev libxcomposite-dev cmake + libxrender-dev gst-plugins-base-dev hyphen-dev libexecinfo-dev + ruby-dev glib-dev libgcrypt-dev libtasn1-dev" subpackages="$pkgname-dev" -source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz - pic.patch - fix-rpath.patch - fix-execinfo.patch - 0001-Add-ARM-64-support.patch +#source="https://github.com/qtwebkit/qtwebkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz +source="https://distfiles.adelielinux.org/source/$_realname-$_realver.tar.xz + bug-931.patch + cmake.patch + ppc-llint.patch " -builddir="$srcdir"/$_pkgname-$pkgver - -prepare() { - default_prepare - # remove some bundled - mkdir Source/ThirdParty/orig - mv Source/ThirdParty/gtest/ \ - Source/ThirdParty/qunit/ \ - Source/ThirdParty/orig/ - syncqt.pl -version $pkgver Source/sync.profile -} +builddir="$srcdir"/$_realname-$_realver build() { - local _maybe_smaller="" - cd "$builddir" - - # On 32-bit x86, ld.bfd will run out of memory if debugging information - # is built. See https://sourceware.org/bugzilla/show_bug.cgi?id=23470 - # for more information. - case "$CARCH" in - pmmx) _maybe_smaller="QMAKE_CXXFLAGS_DEBUG+=-g0" - esac - - qmake $_maybe_smaller - - # /usr/include/fortify/stdlib.h:20:25: fatal error: stdlib.h: No such file or directory - # see: http://stackoverflow.com/questions/37218953/isystem-on-a-system-include-directory-causes-errors - # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71090 - # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 - qmake Source/JavaScriptCore/LLIntOffsetsExtractor.pro -o \ - Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor - sed -i 's:-isystem /usr/include ::' \ - Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor - + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + # We can enable the JIT when it is stable on all Tier 1 platforms: + # pmmx (ensure no SSE) + # ppc + # ppc64 + # + # DONE: + # aarch64 + # armv7 + # x86_64 + # + # https://github.com/qtwebkit/qtwebkit/issues/930 + # -DENABLE_MEDIA_SOURCE=ON \ + # -DENABLE_VIDEO=ON \ + # -DENABLE_WEB_AUDIO=ON \ + # -DUSE_GSTREAMER=ON \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DENABLE_JIT=OFF \ + -DENABLE_PRINT_SUPPORT=ON \ + -DENABLE_QT_WEBCHANNEL=ON \ + -DPORT=Qt \ + -DUSE_SYSTEM_MALLOC=ON \ + -DUSE_WOFF2=OFF \ + ${CMAKE_CROSSOPTS} . make } +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + package() { - cd "$builddir" - make install INSTALL_ROOT="$pkgdir" - sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc + make DESTDIR="$pkgdir" install } -sha512sums="79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 qtwebkit-opensource-src-5.9.1.tar.xz -9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f pic.patch -00d59c0cdb58ae8e7cf6bc3d03f133697e74c267ccebe12238bcdc274d4c90210b82c2d8bdf0e949cd43da13a4fd8a4c35fb54a00ed5102a4ac4d23aa002d0fe fix-rpath.patch -f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f fix-execinfo.patch -af5097d44f73de156ca31a5423136301dfc12ae693e20c4702bf3f1c6e16395f3912e9268582480ba3177021f37d4cae3b84d4b23eeb063fdc40f2444d3b34c8 0001-Add-ARM-64-support.patch" +sha512sums="ec009773953b9f3e2c0e47072cd678f7044b16219c85879a6031c109c7b2b84f426564bb673ccaafa0bcc3f7a656e3cb0d8e3be28d3bbfb401adcd1a6b8b9edd qt5-qtwebkit-5.212.0-git20191114.tar.xz +85adb979eb5d58ccab85d07d6a6db470b34bdb6fd8af2eef04ce268da41a596b4a19295c97dca1201daf4a51ca9e183bb27dd36b9b12b0e149224793d1c190a9 bug-931.patch +4ee26787bf01f3067fae51e1942b72d783629b13fe13ffcfba9329bbea823de7b751905f01c71c6c498164cb41a33765debce375a034dde83e3f784d6e549ada cmake.patch +0b358e4df16e8792c995a385386bfe9e197e23854f30129b504d3ba851cdfab3a2adef462a6ae3a775ec01d02cd67ef404259491339336c6ce896d7940597c95 ppc-llint.patch" diff --git a/user/qt5-qtwebkit/bug-931.patch b/user/qt5-qtwebkit/bug-931.patch new file mode 100644 index 000000000..7d363dd62 --- /dev/null +++ b/user/qt5-qtwebkit/bug-931.patch @@ -0,0 +1,10 @@ +--- qt5-qtwebkit-5.212.0-git20191114/Source/JavaScriptCore/runtime/NativeExecutable.cpp.old 2019-11-14 19:31:45.000000000 +0000 ++++ qt5-qtwebkit-5.212.0-git20191114/Source/JavaScriptCore/runtime/NativeExecutable.cpp 2020-01-04 19:14:22.974744920 +0000 +@@ -28,6 +28,7 @@ + #include "BatchedTransitionOptimizer.h" + #include "CodeBlock.h" + #include "Debugger.h" ++#include "ExecutableBaseInlines.h" + #include "JIT.h" + #include "JSCInlines.h" + #include "LLIntEntrypoint.h" diff --git a/user/qt5-qtwebkit/cmake.patch b/user/qt5-qtwebkit/cmake.patch new file mode 100644 index 000000000..a41be9ce4 --- /dev/null +++ b/user/qt5-qtwebkit/cmake.patch @@ -0,0 +1,60 @@ +--- qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake.old 2019-11-14 19:31:45.000000000 +0000 ++++ qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake 2020-01-04 20:53:20.522367347 +0000 +@@ -99,8 +99,8 @@ + set(Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\") + set(Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers + +-get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES) +-get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS) ++get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES) ++get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS) + + foreach (_module_dep \${_Qt5@MODULE_NAME@_MODULE_DEPENDENCIES}) + list(APPEND Qt5@MODULE_NAME@_INCLUDE_DIRS \${Qt5\${_module_dep}_INCLUDE_DIRS}) +@@ -117,6 +117,7 @@ + ") + + set(MODULE_NAME WebKit) ++set(FULL_MODULE_NAME WebKitLegacy) + string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY) + ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake" +@@ -124,6 +125,7 @@ + ) + + set(MODULE_NAME WebKitWidgets) ++set(FULL_MODULE_NAME WebKitWidgets) + string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY) + ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitWidgetsConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake" +@@ -154,18 +154,18 @@ + ) + + # QTFIXME +-#install(EXPORT WebKitTargets +-# FILE WebKitTargets.cmake +-# NAMESPACE Qt5:: +-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit" +-# COMPONENT Data +-#) +-#install(EXPORT Qt5WebKitWidgetsTargets +-# FILE Qt5WebKitWidgetsTargets.cmake +-# NAMESPACE Qt5:: +-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets" +-# COMPONENT Data +-#) ++install(EXPORT WebKitTargets ++ FILE WebKitTargets.cmake ++ NAMESPACE Qt5:: ++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit" ++ COMPONENT Data ++) ++install(EXPORT Qt5WebKitWidgetsTargets ++ FILE Qt5WebKitWidgetsTargets.cmake ++ NAMESPACE Qt5:: ++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets" ++ COMPONENT Data ++) + + # Documentation + diff --git a/user/qt5-qtwebkit/fix-execinfo.patch b/user/qt5-qtwebkit/fix-execinfo.patch deleted file mode 100644 index 6fbf4ed8f..000000000 --- a/user/qt5-qtwebkit/fix-execinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp -+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp -@@ -64,7 +64,7 @@ - #include <windows.h> - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID) - #include <cxxabi.h> - #include <dlfcn.h> - #include <execinfo.h> -@@ -242,7 +242,7 @@ - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/user/qt5-qtwebkit/fix-rpath.patch b/user/qt5-qtwebkit/fix-rpath.patch deleted file mode 100644 index 6b08fd1a3..000000000 --- a/user/qt5-qtwebkit/fix-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig -+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -59,8 +59,6 @@ - } - } - --contains(TEMPLATE, app): CONFIG += rpath -- - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. - !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory diff --git a/user/qt5-qtwebkit/pic.patch b/user/qt5-qtwebkit/pic.patch deleted file mode 100644 index ef8993ee3..000000000 --- a/user/qt5-qtwebkit/pic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Source/WTF/wtf/InlineASM.h.orig 2013-10-07 11:36:58.995128674 +0000 -+++ ./Source/WTF/wtf/InlineASM.h 2013-10-07 11:37:28.058792290 +0000 -@@ -42,7 +42,7 @@ - #define THUMB_FUNC_PARAM(name) - #endif - --#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64) -+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86_64) || defined(__PIC__)) - #define GLOBAL_REFERENCE(name) #name "@plt" - #elif CPU(X86) && COMPILER(MINGW) - #define GLOBAL_REFERENCE(name) "@" #name "@4" diff --git a/user/qt5-qtwebkit/ppc-llint.patch b/user/qt5-qtwebkit/ppc-llint.patch new file mode 100644 index 000000000..033bbab68 --- /dev/null +++ b/user/qt5-qtwebkit/ppc-llint.patch @@ -0,0 +1,32 @@ +This fixes JavaScriptCore on big endian systems (mainly ppc). + +Without the patch, attempting to run any JS results in +a crash as the generated code was endian specific. + +--- qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm ++++ qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +@@ -1440,13 +1440,13 @@ _llint_op_put_by_id: + loadp StructureChain::m_vector[t3], t3 + assert(macro (ok) btpnz t3, ok end) + +- loadp Structure::m_prototype[t2], t2 ++ loadp Structure::m_prototype + PayloadOffset[t2], t2 + btpz t2, .opPutByIdTransitionChainDone + .opPutByIdTransitionChainLoop: + loadp [t3], t1 + bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow + addp 4, t3 +- loadp Structure::m_prototype[t1], t2 ++ loadp Structure::m_prototype + PayloadOffset[t1], t2 + btpnz t2, .opPutByIdTransitionChainLoop + + .opPutByIdTransitionChainDone: +@@ -2004,7 +2004,7 @@ _llint_throw_from_slow_path_trampoline: + # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so + # the throw target is not necessarily interpreted code, we come to here. + # This essentially emulates the JIT's throwing protocol. +- loadp Callee[cfr], t1 ++ loadp Callee + PayloadOffset[cfr], t1 + andp MarkedBlockMask, t1 + loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1 + jmp VM::targetMachinePCForThrow[t1] diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index 70f2ce8f0..d324d58e5 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets -_pkgname=qtwebsockets-opensource-src -pkgver=5.9.7 +_pkgname=qtwebsockets-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Pure Qt implementation of WebSockets" +pkgdesc="Qt implementation of WebSockets" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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" @@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="ee5d1eab254a55791ca7414066c1661614605d6a193305d687aa3321bb69fb59fe6c877153cee1ea4321a91721e42b8fafcaa4cda418c6edc057dc3683c73756 qtwebsockets-opensource-src-5.9.7.tar.xz" +sha512sums="1d7de6e642869eb0863bea219183ed66c94e172d67d7c6d5d607b43368ef1f4f47f994aad5a56df35294f6dcd541474e7fec04691da17cee16df59d799b64e40 qtwebsockets-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index ed049fe33..259faa328 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras -_pkgname=qtx11extras-opensource-src -pkgver=5.9.7 +_pkgname=qtx11extras-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Extra libraries for X11 support" +pkgdesc="Qt 5 libraries for X11 support" url="https://www.qt.io/" arch="all" options="!check" -license="LGPLv2 with exceptions OR GPLv3 with exceptions" +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" @@ -16,14 +16,12 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" qmake make } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="04803755cabc449dd35c20a5ec7f4836fec5e9f4e28daf8a577e66385e9698139a1ae23a29ade8f0c5a766665a137497eaff3c55746879b9c2fe85c38710d37f qtx11extras-opensource-src-5.9.7.tar.xz" +sha512sums="b0ad7bf9d9fa9a30abc7bab16cb71a904e7c93d280fcb3306623b0edc56aef72d0ec9fe904571df381c76c6dd15eb8e043ce27957a370432fcf6e09c2f4e1ee5 qtx11extras-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD index 7885359f2..90b79fc96 100644 --- a/user/qt5-qtxmlpatterns/APKBUILD +++ b/user/qt5-qtxmlpatterns/APKBUILD @@ -1,31 +1,29 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtxmlpatterns -_pkgname=qtxmlpatterns-opensource-src -pkgver=5.9.7 +_pkgname=qtxmlpatterns-everywhere-src +pkgver=5.12.6 pkgrel=0 -pkgdesc="Qt 5 - Support for XPath, XQuery, XSLT, and XML schema validation" +pkgdesc="Qt support library for XPath, XQuery, XSLT, and XML schema validation" url="https://www.qt.io/" arch="all" -license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" +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() { - cd "$builddir" qmake make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir" } -sha512sums="d24f983eaf0414b5b5dbbd8e60cfc87d4d742aae82b457e5d77c01a0534620f30f4507e1c71ce4bbe2a16eeafd6dde566c8d11bccea04c5668189936cc44aca3 qtxmlpatterns-opensource-src-5.9.7.tar.xz" +sha512sums="ae59abcb01ddeeb521f0966df818c933e997a5a98b95d6254d3ea964eddcdb437ad497aa59b1b9cb70246026afd4973234bb3690d4f1cfbbc7e538cde968e5c0 qtxmlpatterns-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index 8b86da42c..f54023654 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qt5ct pkgver=0.41 pkgrel=0 @@ -13,13 +13,11 @@ makedepends="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" source="https://sourceforge.net/projects/qt5ct/files/qt5ct-$pkgver.tar.bz2" build() { - cd "$builddir" qmake PREFIX=/usr make } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index 906759828..2ccd6bdf2 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qterminal pkgver=0.14.1 pkgrel=0 @@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf qterminal-0.14.1.tar.xz" diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 8894829c8..916d2e1f4 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qtermwidget pkgver=0.14.1 pkgrel=0 @@ -18,11 +18,9 @@ source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidge " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -31,18 +29,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DQTERMWIDGET_USE_UTEMPTER=True \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 qtermwidget-0.14.1.tar.xz diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD index e3e861748..369526668 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/APKBUILD @@ -1,21 +1,19 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qtkeychain -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=0 pkgdesc="Platform-independent Qt-based API for storing passwords securely" url="https://github.com/frankosterfeld/qtkeychain" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause" -depends_dev="" +depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev" -install="" subpackages="$pkgname-dev" source="qtkeychain-$pkgver.tar.gz::https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,23 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } -check() { - cd "$builddir" - make check -} - package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a qtkeychain-0.9.1.tar.gz" +sha512sums="de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 qtkeychain-0.10.0.tar.gz" diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD index a52be97cb..7f7a81c7c 100644 --- a/user/quassel/APKBUILD +++ b/user/quassel/APKBUILD @@ -11,7 +11,8 @@ depends="$pkgname-client $pkgname-core" makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev extra-cmake-modules kconfigwidgets-dev kcoreaddons-dev kxmlgui-dev knotifications-dev knotifyconfig-dev ktextwidgets-dev qt5-qtscript-dev - kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev" + kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev + cmake" langdir="/usr/share/quassel/translations" subpackages="$pkgname-core $pkgname-client $pkgname-lang" source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2 @@ -24,7 +25,6 @@ source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2 # - CVE-2018-1000179 build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -38,17 +38,15 @@ build() { -DUSE_QT5=ON \ -DWITH_KDE=ON \ -DWITH_WEBENGINE=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -58,7 +56,6 @@ client() { mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/ - local dir for dir in applications icons pixmaps knotifications5; do mkdir -p "$subpkgdir"/usr/share/$dir mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/ diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index a3445fb3d..f8a5f8b8a 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -25,7 +25,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/quazip/APKBUILD b/user/quazip/APKBUILD index bae54fd46..f6afd9948 100644 --- a/user/quazip/APKBUILD +++ b/user/quazip/APKBUILD @@ -8,7 +8,7 @@ url="https://stachenov.github.io/quazip/" arch="all" license="LGPL-2.1-only WITH Static-linking-exception" depends="" -makedepends="qt5-qtbase-dev zlib-dev" +makedepends="cmake qt5-qtbase-dev zlib-dev" subpackages="$pkgname-dev" source="quazip-$pkgver.tar.gz::https://github.com/stachenov/quazip/archive/v$pkgver.tar.gz" diff --git a/user/r/APKBUILD b/user/r/APKBUILD index 6e6caed89..dd86b0c54 100644 --- a/user/r/APKBUILD +++ b/user/r/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=r -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=0 pkgdesc="Environment for statistical computing and graphics" url="https://www.r-project.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fae7d114437c4b5d10fcb2a4265acd707ad2a4810eeb7c11e25caca1d85093a1495c2e13457b4894c1508830ec1b2be95379b7d54007cf3e574c2a9eea28ef80 R-3.6.1.tar.gz" +sha512sums="17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9 R-3.6.2.tar.gz" diff --git a/user/ragel/APKBUILD b/user/ragel/APKBUILD index 9ecfbe587..809e2ff26 100644 --- a/user/ragel/APKBUILD +++ b/user/ragel/APKBUILD @@ -9,14 +9,11 @@ arch="all" options="!check" # no tests license="GPL-2.0+" depends="" -depends_dev="" -makedepends="$depends_dev" -install="" +makedepends="" subpackages="$pkgname-doc" source="http://www.colm.net/files/ragel/ragel-$pkgver.tar.gz" build() { - cd "$builddir" export CXXFLAGS="$CXXFLAGS -std=gnu++98" ./configure \ --build=$CBUILD \ @@ -26,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } sha512sums="6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 ragel-6.10.tar.gz" diff --git a/user/range-v3/APKBUILD b/user/range-v3/APKBUILD new file mode 100644 index 000000000..3221286be --- /dev/null +++ b/user/range-v3/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=range-v3 +pkgver=0.10.0 +pkgrel=0 +pkgdesc="Range library for C++" +url="http://ericniebler.com/2018/12/05/standard-ranges/" +arch="noarch" +license="BSL-1.0 AND NCSA AND MIT" +depends="" +makedepends="cmake doxygen" +subpackages="" +source="range-v3-$pkgver.tar.gz::https://github.com/ericniebler/range-v3/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 \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723 range-v3-0.10.0.tar.gz" diff --git a/user/raptor2/APKBUILD b/user/raptor2/APKBUILD index e092e2e64..3237059c9 100644 --- a/user/raptor2/APKBUILD +++ b/user/raptor2/APKBUILD @@ -10,7 +10,7 @@ arch="all" license="Public-Domain AND (LGPL-2.1+ OR GPL-2.0+ OR Apache-2.0+)" depends="" depends_dev="curl-dev libxml2-dev libxslt-dev yajl-dev" -makedepends="$depends_dev" +makedepends="$depends_dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="http://download.librdf.org/source/$pkgname-$pkgver.tar.gz" @@ -21,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,14 +34,12 @@ build() { } check() { - cd "$builddir" # Note: some tests are shown as FAIL but they are actually XFAIL :) # As long as the return status is zero we are fine make check -j1 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rarian/APKBUILD b/user/rarian/APKBUILD index c3722414e..227d32230 100644 --- a/user/rarian/APKBUILD +++ b/user/rarian/APKBUILD @@ -14,13 +14,11 @@ source="https://download.gnome.org/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2 user-segfault.patch" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/rasqal/APKBUILD b/user/rasqal/APKBUILD index ddeb6bd5e..3329fd30f 100644 --- a/user/rasqal/APKBUILD +++ b/user/rasqal/APKBUILD @@ -20,7 +20,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD index 51e79ab84..4a67f7c6f 100644 --- a/user/rdesktop/APKBUILD +++ b/user/rdesktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rdesktop -pkgver=1.8.6 +pkgver=1.9.0 pkgrel=0 pkgdesc="Remote Desktop Protocol client" url="https://www.rdesktop.org/" @@ -9,22 +9,18 @@ arch="all" options="!check" # No test suite. license="GPL-3.0-only" depends="" -makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libx11-dev - libxrandr-dev openssl-dev" +makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libtasn1-dev + libx11-dev libxcursor-dev libxrandr-dev nettle-dev gnutls-dev bash" subpackages="$pkgname-doc" -source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz - gssapi.patch - signed-int.patch - " +source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz" prepare() { default_prepare update_config_sub - ./bootstrap } build() { - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -43,6 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6 rdesktop-1.8.6.tar.gz -d55709968b21b64fe33bc1fe90156515e88fe715cbaad6f9c7a15ce4b26e09397821708139748c744ba8bb12f1e751602189317c583ff2017941f39360b4b8cd gssapi.patch -e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e signed-int.patch" +sha512sums="e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5 rdesktop-1.9.0.tar.gz" diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch deleted file mode 100644 index a24d2b718..000000000 --- a/user/rdesktop/gssapi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 10 Jul 2017 15:14:01 +0200 -Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue - -That project is abandoned and the distributions aren't including -it anymore. ---- - configure.ac | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e045c409..a969ad5d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,27 +122,20 @@ fi - - dnl CredSSP feature - AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP])) --AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), -- [static_gssglue=yes], [static_gssglue=no]) - AS_IF([test "x$enable_credssp" != "xno"], [ - if test -n "$PKG_CONFIG"; then -- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0]) -+ PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0]) - fi - - if test x"$WITH_CREDSSP" = "x1"; then - CREDSSPOBJ="cssp.o" -- CFLAGS="$CFLAGS $GSSGLUE_CFLAGS" -- -- AS_IF([test "x$static_gssglue" != "xno"], [ -- LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic" -- ], [ -- LIBS="$LIBS -lgssglue" -- ]) -+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ LIBS="$LIBS $GSSAPI_LIBS" - - AC_DEFINE(WITH_CREDSSP) - else - echo -- echo "CredSSP support requires libgssglue, install the dependency" -+ echo "CredSSP support requires GSSAPI, install the dependency" - echo "or disable the feature using --disable-credssp." - echo - exit 1 diff --git a/user/rdesktop/signed-int.patch b/user/rdesktop/signed-int.patch deleted file mode 100644 index 405a4dd3e..000000000 --- a/user/rdesktop/signed-int.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rdesktop-1.8.4/orders.c.old 2019-01-02 14:03:25.000000000 +0000 -+++ rdesktop-1.8.4/orders.c 2019-01-09 17:13:26.170000000 +0000 -@@ -1266,7 +1266,7 @@ - in_uint16_le(s, flags); /* used by bmpcache2 */ - in_uint8(s, type); - -- if (!s_check_rem(s, length + 7)) -+ if (!s_check_rem(s, (sint16) length + 7)) - { - rdp_protocol_error("process_secondary_order(), next order pointer would overrun stream", &packet); - } diff --git a/user/re2c/APKBUILD b/user/re2c/APKBUILD index 7f78fb5e0..d039a5baf 100644 --- a/user/re2c/APKBUILD +++ b/user/re2c/APKBUILD @@ -1,13 +1,15 @@ # Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: pkgname=re2c -pkgver=1.2.1 +pkgver=1.3 pkgrel=0 pkgdesc="Fast lexer generator for C and C++" url="http://re2c.org/" arch="all" license="Public-Domain" +depends="" checkdepends="bash" +makedepends="" subpackages="$pkgname-doc" source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" @@ -30,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58 re2c-1.2.1.tar.xz" +sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e re2c-1.3.tar.xz" diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD index 1c2058d14..3e08ff14a 100644 --- a/user/redis/APKBUILD +++ b/user/redis/APKBUILD @@ -1,15 +1,15 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=redis -pkgver=5.0.6 +pkgver=5.0.7 pkgrel=0 pkgdesc="Advanced key-value store" url="https://redis.io/" arch="all" license="BSD-3-Clause" depends="" -makedepends="linux-headers" checkdepends="tcl" +makedepends="linux-headers" subpackages="$pkgname-openrc" install="redis.pre-install" pkgusers="redis" @@ -79,7 +79,7 @@ package() { install } -sha512sums="19a4738ec4c3ac077d57857559557685c56b0ac58ccfff5aac88a099894fa9a2bbe18ef126522960e38d6c0e8b0f9a00755879305c07caaa5add41bc677d44f3 redis-5.0.6.tar.gz +sha512sums="75c1d4bcca3e28d80f6b6942f0153ff33538d706339c69bddd2646c36f88b901c77dde09fba5629ba90ace00077e45d37b0a822a863f9f737ef9a79eb7093d9d redis-5.0.7.tar.gz f768acea3e1868dbf0596085640c83e58d899860d7d647b0965fa858844c494d0a49b229fb417456d83f3e2690e5450950c31e0fa40529df85a9cde38d8981c4 fix-ppc-atomics.patch 856ae98e9e8670801827c3bd793dc14ed2c62c37365f8d04b452d7e1ab97300a0bf18c59b52ea686c2689d53aeed8e29e2c55207d3d4fb1fd8fc7fc820f33157 posix-runtest.patch 91b663f802aea9a473195940d3bf2ce3ca2af4e5b6e61a2d28ebbfe502ef2c764b574b7e87c49e60345d1a5d6b73d12920924c93b26be110c2ce824023347b6f redis.initd diff --git a/user/redland/APKBUILD b/user/redland/APKBUILD index 1059aa845..d13582ff7 100644 --- a/user/redland/APKBUILD +++ b/user/redland/APKBUILD @@ -21,7 +21,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/redshift/APKBUILD b/user/redshift/APKBUILD index fca669f61..59bd659fd 100644 --- a/user/redshift/APKBUILD +++ b/user/redshift/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=redshift pkgver=1.12 pkgrel=0 @@ -7,14 +7,13 @@ pkgdesc="Adjust the color temperature of your screen according to your surroundi url="http://jonls.dk/redshift/" arch="all" license="GPL-3.0+" -options="!check" # No test suite +options="!check" # No test suite. depends="" makedepends="glib-dev intltool libdrm-dev libx11-dev libxcb-dev libxxf86vm-dev" subpackages="$pkgname-doc $pkgname-gui $pkgname-lang" source="https://github.com/jonls/redshift/releases/download/v$pkgver/redshift-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,13 +34,12 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } doc() { - cd "$builddir" - install -Dm644 -t "$subpkgdir/usr/share/doc/$pkgname" redshift.conf.sample + install -Dm644 -t "$subpkgdir/usr/share/doc/$pkgname" \ + "$builddir"/redshift.conf.sample default_doc } diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD index 30a821e2c..10ba7f50c 100644 --- a/user/rendercheck/APKBUILD +++ b/user/rendercheck/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rfkill/APKBUILD b/user/rfkill/APKBUILD index 9f9889e9a..38575aca5 100644 --- a/user/rfkill/APKBUILD +++ b/user/rfkill/APKBUILD @@ -10,18 +10,16 @@ options="!check" # No test suite. license="MIT" depends="" makedepends="" -install="" subpackages="$pkgname-doc" source="https://www.kernel.org/pub/software/network/rfkill/rfkill-$pkgver.tar.xz - dont-use-git.patch" + dont-use-git.patch + " build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rgb/APKBUILD b/user/rgb/APKBUILD index 42be8cbe4..f45691ebc 100644 --- a/user/rgb/APKBUILD +++ b/user/rgb/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rinutils/APKBUILD b/user/rinutils/APKBUILD new file mode 100644 index 000000000..9abfd0fc3 --- /dev/null +++ b/user/rinutils/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rinutils +pkgver=0.2.0 +pkgrel=0 +pkgdesc="C11 utilities library" +url=" " +arch="noarch" +license="Expat" +depends="" +checkdepends="cmocka-dev perl perl-dev perl-env-path perl-inline perl-inline-c + perl-path-tiny perl-string-shellquote perl-test-differences + perl-test-trailingspace" +makedepends="cmake" +# Headers-only library: no -dev split. +subpackages="" +source="https://github.com/shlomif/rinutils/releases/download/$pkgver/rinutils-$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_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="82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3 rinutils-0.2.0.tar.xz" diff --git a/user/ripgrep/APKBUILD b/user/ripgrep/APKBUILD index 91444ec54..be18ce2e1 100644 --- a/user/ripgrep/APKBUILD +++ b/user/ripgrep/APKBUILD @@ -8,6 +8,7 @@ pkgdesc="Recursively searches directories for a regex pattern" url="https://github.com/BurntSushi/ripgrep" arch="all" license="Unlicense" +depends="" makedepends="cargo pcre2-dev" subpackages="$pkgname-zsh-completion:_zshcomp:noarch" source="" diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 6dd2d5251..2beebf167 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ristretto pkgver=0.10.0 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Image viewer for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="" makedepends="intltool libexif-dev gtk+2.0-dev libxfce4util-dev libxfce4ui-dev libmagic" subpackages="$pkgname-lang" diff --git a/user/rlottie/APKBUILD b/user/rlottie/APKBUILD new file mode 100644 index 000000000..4fc7fb579 --- /dev/null +++ b/user/rlottie/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rlottie +pkgver=0.0.20200110 +_commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b +pkgrel=0 +pkgdesc="Library for Lottie animations" +url=" " +arch="all" +license="LGPL-2.1+ AND MIT AND BSD-3-Clause" +depends="" +makedepends="meson ninja" +subpackages="$pkgname-dev" +source="rlottie-$pkgver.tar.gz::https://github.com/Samsung/rlottie/archive/$_commit.tar.gz" +builddir="$srcdir/rlottie-$_commit" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . build + ninja -C build +} + +check() { + ninja -C build test +} + +package() { + DESTDIR="$pkgdir" ninja -C build install +} + +sha512sums="e78470254ab7b9653dcd95037001a1763f4229bdc611f4631943f302b20739a6e4b519d54c967c1ecd7bcc4b555bb8f651af0bceebc04cc9ea41789360b49af4 rlottie-0.0.20200110.tar.gz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index a679afb20..4d17de4ea 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -14,10 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-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/applications/$pkgver/src/rocs-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz + webkit.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +29,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2832a0dfe83076100357c86eeb3ad0fccf55f667bd4b86c0cd8bd2db21f8b323a524d3016db9509f7bfee1837820d9bcdac0dc4dd8a4e5d2af020f8102b4aa0d rocs-19.08.2.tar.xz" +sha512sums="1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984 rocs-19.12.3.tar.xz +0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch" diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch new file mode 100644 index 000000000..87ba9e747 --- /dev/null +++ b/user/rocs/webkit.patch @@ -0,0 +1,11 @@ +--- 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/rofi/APKBUILD b/user/rofi/APKBUILD new file mode 100644 index 000000000..c7b8c388d --- /dev/null +++ b/user/rofi/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=rofi +pkgver=1.5.4 +pkgrel=0 +pkgdesc="Powerful application switcher and launcher" +url="https://github.com/davatorium/rofi" +arch="all" +license="MIT AND Expat AND GPL-3.0+" +depends="" +checkdepends="check-dev" +makedepends="flex bison pango-dev cairo-dev librsvg-dev libxcb-dev + libxinerama-dev libxrandr-dev xcb-util-wm-dev xcb-util-xrm-dev + startup-notification-dev libxkbcommon-dev" +provides="dmenu" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/davatorium/rofi/releases/download/$pkgver/rofi-$pkgver.tar.xz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + cd "$pkgdir"/usr/bin + ln -s rofi dmenu +} + +sha512sums="03def57fcf919e6c4d8d07345ff37f103fb32aef0b718a6a021ae31cca23bfc962a847a0deb2ffca245d2b8ebac0b60264f00a7b1aa64bf7d313b82e417710ef rofi-1.5.4.tar.xz" diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD index d1af0d6f9..a535b8c7a 100644 --- a/user/rpcbind/APKBUILD +++ b/user/rpcbind/APKBUILD @@ -9,15 +9,15 @@ arch="all" options="!check" # No test suite. license="BSD-3-Clause" depends="" -install="$pkgname.pre-install $pkgname.pre-upgrade" makedepends="libtirpc-dev bsd-compat-headers" +install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc" source="http://downloads.sourceforge.net/project/rpcbind/rpcbind/$pkgver/rpcbind-$pkgver.tar.bz2 rpcbind.initd - rpcbind.confd" + rpcbind.confd + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +32,12 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING } + sha512sums="e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4 rpcbind-1.2.5.tar.bz2 1cd655d86226a45fa3e927f8ac2bb580537644d2fb3684e0f4a956bf3721c95d95b8b8c1d9a2a742fb714eeba9277e0400a7493bf1bf676466d70adb2b35a88e rpcbind.initd 0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd" diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD index 533e63cc5..1f875bafc 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 +pkgver=1.4.1 pkgrel=0 pkgdesc="RPC service protocol definitions and compiler" url=" " @@ -10,10 +10,9 @@ license="BSD-3-Clause" depends="" makedepends="" subpackages="$pkgname-doc" -source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.gz" +source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d1ad662e8036f17cd013b7becbf811caa62ef444f1c48ba6864c3c3cb28c5d69366b0c18b21692d1ad3f8445f33805e6bffe12c00d07e30324f8b930eae418d4 rpcsvc-proto-1.4.tar.gz" +sha512sums="02d08c2e53dd02923a470be4243fa8458ebe73c74dcb755b36c001bfb128747359c5b7c2ba76ea7b12cd4eaa6916edc60849e8ec4b43d2c462751038ba0205fc rpcsvc-proto-1.4.1.tar.xz" diff --git a/user/rpm2targz/APKBUILD b/user/rpm2targz/APKBUILD index ca2cd6a5a..05c55a912 100644 --- a/user/rpm2targz/APKBUILD +++ b/user/rpm2targz/APKBUILD @@ -13,17 +13,14 @@ subpackages="" source="https://distfiles.adelielinux.org/source/rpm2targz-$pkgver.tar.xz" build() { - cd "$builddir" make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD index bec89b8ca..c4fdcd582 100644 --- a/user/rrdtool/APKBUILD +++ b/user/rrdtool/APKBUILD @@ -19,7 +19,6 @@ source="https://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" LANG=C.UTF-8 LC_ALL=C.UTF-8 TZ=UTC make check } package() { - cd "$builddir" export INSTALLDIRS=vendor make DESTDIR="$pkgdir" install find "$pkgdir" -name '.packlist' -delete @@ -52,7 +49,7 @@ dev() { } perl_rrd() { - depends= + depends="" pkgdesc="Perl interface for rrdtool" mkdir -p "$subpkgdir"/usr/lib \ "$pkgdir"/usr/share @@ -61,7 +58,7 @@ perl_rrd() { } cached() { - depends= + depends="" pkgdesc="RRDtool data caching daemon" mkdir -p "$subpkgdir"/usr/sbin \ "$subpkgdir"/var/lib/rrdcached/db \ @@ -71,14 +68,14 @@ cached() { } cgi() { - depends= + depends="" pkgdesc="Create web pages containing RRD graphs based on templates" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/rrdcgi "$subpkgdir"/usr/bin } utils() { - depends= + depends="" pkgdesc="RRDtool standalone utilities" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/rrdinfo \ diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index fd3864d48..d07cd72eb 100644 --- a/user/rsibreak/APKBUILD +++ b/user/rsibreak/APKBUILD @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/rtmpdump/APKBUILD b/user/rtmpdump/APKBUILD index eb14d000c..7ece78237 100644 --- a/user/rtmpdump/APKBUILD +++ b/user/rtmpdump/APKBUILD @@ -13,7 +13,9 @@ depends_dev="zlib-dev" makedepends="$depends_dev linux-headers openssl-dev" subpackages="$pkgname-dev $pkgname-doc librtmp" source="https://distfiles.adelielinux.org/source/rtmpdump-$pkgver.tar.xz - fix-chunk-size.patch" + fix-chunk-size.patch + openssl11.patch + " build() { make @@ -31,4 +33,5 @@ librtmp() { } sha512sums="5273452508b3187aa1a7431fb0b44b1a5883dc6b28f6eda92b4a2db6925c72dea68bdd666a2affd68476ef8db714db4022a9417323c8ef3c58bbf1f407fe99d4 rtmpdump-2.4.tar.xz -f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch" +f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch +6533efc24d22b55cea8db0ba2d4ed5fc2672e17b2ef80a987a65f54abe815cb1337b571a9e2a6cd12b826d129da427c2c0e1c16241f24e67a3ca66761a894e2d openssl11.patch" diff --git a/user/rtmpdump/openssl11.patch b/user/rtmpdump/openssl11.patch new file mode 100644 index 000000000..ba4ad9359 --- /dev/null +++ b/user/rtmpdump/openssl11.patch @@ -0,0 +1,251 @@ +Another Great Gentoo Hack™. + +"Upstream": https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch +Originally from: https://raw.githubusercontent.com/xbmc/inputstream.rtmp/master/depends/common/librtmp/0003-openssl-1.1.patch +See also: https://github.com/xbmc/inputstream.rtmp/pull/46 +--- a/librtmp/dh.h ++++ b/librtmp/dh.h +@@ -253,20 +253,42 @@ + if (!dh) + goto failed; + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_new(dh->g); + + if (!dh->g) + goto failed; ++#else ++ BIGNUM *g = NULL; ++ MP_new(g); ++ if (!g) ++ goto failed; ++#endif + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */ ++#else ++ BIGNUM* p = NULL; ++ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL); ++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */ ++#endif + if (!res) + { + goto failed; + } + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_set_w(dh->g, 2); /* base 2 */ ++#else ++ MP_set_w(g, 2); /* base 2 */ ++ DH_set0_pqg(dh, p, NULL, g); ++#endif + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + dh->length = nKeyBits; ++#else ++ DH_set_length(dh, nKeyBits); ++#endif + return dh; + + failed: +@@ -293,12 +315,24 @@ + MP_gethex(q1, Q1024, res); + assert(res); + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + res = isValidPublicKey(dh->pub_key, dh->p, q1); ++#else ++ BIGNUM const* pub_key = NULL; ++ BIGNUM const* p = NULL; ++ DH_get0_key(dh, &pub_key, NULL); ++ DH_get0_pqg(dh, &p, NULL, NULL); ++ res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1); ++#endif + if (!res) + { ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_free(dh->pub_key); + MP_free(dh->priv_key); + dh->pub_key = dh->priv_key = 0; ++#else ++ DH_free(dh); ++#endif + } + + MP_free(q1); +@@ -314,15 +348,29 @@ + DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) + { + int len; ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + if (!dh || !dh->pub_key) ++#else ++ BIGNUM const* pub_key = NULL; ++ DH_get0_key(dh, &pub_key, NULL); ++ if (!dh || !pub_key) ++#endif + return 0; + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + len = MP_bytes(dh->pub_key); ++#else ++ len = MP_bytes(pub_key); ++#endif + if (len <= 0 || len > (int) nPubkeyLen) + return 0; + + memset(pubkey, 0, nPubkeyLen); ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len); ++#else ++ MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len); ++#endif + return 1; + } + +@@ -364,7 +412,13 @@ + MP_gethex(q1, Q1024, len); + assert(len); + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + if (isValidPublicKey(pubkeyBn, dh->p, q1)) ++#else ++ BIGNUM const* p = NULL; ++ DH_get0_pqg(dh, &p, NULL, NULL); ++ if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1)) ++#endif + res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh); + else + res = -1; +--- a/librtmp/handshake.h ++++ b/librtmp/handshake.h +@@ -31,9 +31,9 @@ + #define SHA256_DIGEST_LENGTH 32 + #endif + #define HMAC_CTX sha2_context +-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) ++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0) ++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig) + + typedef arc4_context * RC4_handle; + #define RC4_alloc(h) *h = malloc(sizeof(arc4_context)) +@@ -50,9 +50,9 @@ + #endif + #undef HMAC_CTX + #define HMAC_CTX struct hmac_sha256_ctx +-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) ++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key) ++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig) + #define HMAC_close(ctx) + + typedef struct arcfour_ctx* RC4_handle; +@@ -64,14 +64,23 @@ + + #else /* USE_OPENSSL */ + #include <openssl/sha.h> ++#include <openssl/ossl_typ.h> + #include <openssl/hmac.h> + #include <openssl/rc4.h> + #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH) + #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256 + #endif +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#else ++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#endif ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx) ++#else ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx) ++#endif + + typedef RC4_KEY * RC4_handle; + #define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY)) +@@ -117,7 +126,7 @@ + { + uint8_t digest[SHA256_DIGEST_LENGTH]; + unsigned int digestLen = 0; +- HMAC_CTX ctx; ++ HMAC_CTX* ctx = NULL; + + RC4_alloc(rc4keyIn); + RC4_alloc(rc4keyOut); +@@ -266,7 +275,7 @@ + size_t keylen, uint8_t *digest) + { + unsigned int digestLen; +- HMAC_CTX ctx; ++ HMAC_CTX* ctx = NULL; + + HMAC_setup(ctx, key, keylen); + HMAC_crunch(ctx, message, messageLen); +--- a/librtmp/hashswf.c ++++ b/librtmp/hashswf.c +@@ -37,9 +37,9 @@ + #define SHA256_DIGEST_LENGTH 32 + #endif + #define HMAC_CTX sha2_context +-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) ++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0) ++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig) + #define HMAC_close(ctx) + #elif defined(USE_GNUTLS) + #include <nettle/hmac.h> +@@ -48,19 +48,27 @@ + #endif + #undef HMAC_CTX + #define HMAC_CTX struct hmac_sha256_ctx +-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) ++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key) ++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig) + #define HMAC_close(ctx) + #else /* USE_OPENSSL */ + #include <openssl/ssl.h> + #include <openssl/sha.h> + #include <openssl/hmac.h> + #include <openssl/rc4.h> +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen); +-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) ++#else ++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#endif ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_close(ctx) HMAC_CTX_cleanup(ctx) ++#else ++#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx) ++#endif + #endif + + extern void RTMP_TLS_Init(); +@@ -289,7 +297,7 @@ + struct info + { + z_stream *zs; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + int first; + int zlib; + int size; diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD index bb9b5e7b0..58d0bb293 100644 --- a/user/rttr/APKBUILD +++ b/user/rttr/APKBUILD @@ -8,7 +8,7 @@ url=" " arch="all" license="MIT" depends="" -makedepends="doxygen graphviz" +makedepends="cmake doxygen graphviz" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-src.tar.gz arm64.patch @@ -27,7 +27,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD index 4bbe58f6c..0a5c2d851 100644 --- a/user/rubberband/APKBUILD +++ b/user/rubberband/APKBUILD @@ -1,20 +1,21 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=rubberband pkgver=1.8.2 pkgrel=0 pkgdesc="Library for audio time-stretching and pitch-shifting" url="https://www.breakfastquay.com/rubberband/" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="BSD-4-Clause AND BSD-3-Clause AND GPL-2.0+" +depends="" makedepends="libsamplerate-dev libsndfile-dev fftw-dev vamp-sdk-dev ladspa-dev" subpackages="$pkgname-dev" source="https://breakfastquay.com/files/releases/rubberband-$pkgver.tar.bz2 - no-jni.patch" + no-jni.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD index d3c470b51..b553c1187 100644 --- a/user/ruby-bundler/APKBUILD +++ b/user/ruby-bundler/APKBUILD @@ -2,15 +2,16 @@ # Maintainer: Alyx Wolcott <alyx@leuhta.com> _gemname=bundler pkgname=ruby-$_gemname -pkgver=2.0.2 +pkgver=2.1.2 pkgrel=0 pkgdesc="Manage an application's gem dependencies" url="https://bundler.io/" arch="noarch" +options="!check" license="MIT" depends="ruby ruby-dev" +makedepends="" subpackages="$pkgname-doc" -options="!check" source="https://rubygems.org/downloads/$_gemname-$pkgver.gem" builddir="$srcdir/$_gemname-$pkgver" @@ -25,7 +26,7 @@ package() { --verbose \ "$srcdir"/$_gemname-$pkgver.gem - local n; for n in 1 5; do + for n in 1 5; do mkdir -p "$pkgdir"/usr/share/man/man$n mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/ done @@ -38,4 +39,4 @@ package() { } -sha512sums="f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a bundler-2.0.2.gem" +sha512sums="2a3b42fa2c6f40998c900eaf9d81d6417970f3daa572e4f1c5cc954fd8ce1e3cacbda0dc9b77d44b2fa756cfb1e72838ef3edee1812881198bbe8c946017e22b bundler-2.1.2.gem" diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD index c6f163ada..5dbca7146 100644 --- a/user/ruby-diff-lcs/APKBUILD +++ b/user/ruby-diff-lcs/APKBUILD @@ -15,7 +15,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/halostatue/$_gemname/archive builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } @@ -23,7 +22,6 @@ package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" local geminstdir="$gemdir/gems/$_gemname-$pkgver" - cd "$builddir" gem install --local \ --install-dir "$gemdir" \ --bindir "$pkgdir/usr/bin" \ diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD index cdd459e33..828a9b1ac 100644 --- a/user/ruby-rake-compiler/APKBUILD +++ b/user/ruby-rake-compiler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rake-compiler _gemname=${pkgname#ruby-} -pkgver=1.0.8 +pkgver=1.1.0 pkgrel=0 pkgdesc="Provide a standard and simplified way to build and package Ruby extensions" url="https://github.com/rake-compiler/rake-compiler" @@ -10,25 +10,22 @@ arch="noarch" license="MIT" depends="ruby ruby-rake" checkdepends="ruby-rspec" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rake-compiler/$_gemname/archive/v$pkgver.tar.gz gemfile-remove-unwanted-files.patch" builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } check() { - cd "$builddir" rspec spec } package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir" - gem install --local \ --install-dir "$gemdir" \ --bindir "$pkgdir/usr/bin" \ @@ -42,5 +39,5 @@ package() { rm -r cache build_info doc } -sha512sums="30b753d45a1180e034b520ad6385f2799098f0916d55e8b4729f5e3a29dabc1acfa292475edfb384c7809543e1c3e428e28db1bacb5383deb9f4bb31b18d6fe5 ruby-rake-compiler-1.0.8.tar.gz -e68672541d62898bc72fb7e40f16bc75ed1d46eabedd18da60a6f0673d67bf63d990e191fb41d6034e3f6361662807030cbd8f0c817223a5d03c46a3a664f855 gemfile-remove-unwanted-files.patch" +sha512sums="77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60 ruby-rake-compiler-1.1.0.tar.gz +21feda7887b7fe0978f906d407ecd44d7f25e334e7ee8ff27f73e71d494bd10af4174d7373652b29b1a8eaf95f53f2c8581879088f343e7f045fc265eecf7eac gemfile-remove-unwanted-files.patch" diff --git a/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch index 3424cd912..6c2909c09 100644 --- a/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch +++ b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch @@ -1,6 +1,6 @@ --- a/rake-compiler.gemspec +++ b/rake-compiler.gemspec -@@ -22,14 +22,8 @@ +@@ -23,14 +23,8 @@ s.add_development_dependency 'cucumber', '~> 1.1.4' # components, files and paths @@ -11,16 +11,16 @@ - s.files += Dir.glob("spec/**/*.rb") - s.files += Dir.glob("tasks/**/*.rake") - s.files += ["Rakefile", "Gemfile"] -- s.files += Dir.glob("*.{rdoc,txt,yml}") +- s.files += Dir.glob("*.{md,rdoc,txt,yml}") s.bindir = 'bin' s.executables = ['rake-compiler'] -@@ -38,8 +32,6 @@ +@@ -39,8 +33,6 @@ # documentation - s.rdoc_options << '--main' << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation' + s.rdoc_options << '--main' << 'README.md' << '--title' << 'rake-compiler -- Documentation' - -- s.extra_rdoc_files = %w(README.rdoc LICENSE.txt History.txt) +- s.extra_rdoc_files = %w(README.md LICENSE.txt History.txt) # project information s.homepage = 'https://github.com/rake-compiler/rake-compiler' diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 0f4beb483..9a7ad8d68 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.8.2 +pkgver=3.9.1 pkgrel=0 pkgdesc="RSpec runner and formatters" url="https://relishapp.com/rspec/rspec-core" @@ -10,8 +10,10 @@ arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" depends="ruby ruby-rspec-support~=${pkgver%.*}" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz - gemspec.patch" + gemspec.patch + " builddir="$srcdir/$_gemname-$pkgver" build() { @@ -35,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8 ruby-rspec-core-3.8.2.tar.gz +sha512sums="2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a ruby-rspec-core-3.9.1.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index 5ba129a65..b78363e57 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.8.5 +pkgver=3.9.0 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -10,19 +10,19 @@ arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz - gemspec.patch" + gemspec.patch + " builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir" gem install --local \ --install-dir "$gemdir" \ --ignore-dependencies \ @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="3d7042e00e3b0f55c653abe0c4f581989c8d400cfaf8da23c45cd2511afc34044bf5979f202ad5cbf430667ce10703525c86d00f8a29fac150f8ff40312e5b14 ruby-rspec-expectations-3.8.5.tar.gz +sha512sums="663b9739681c19b5bb1301447017ce4e10bc377ea3f4e51745ccfaa12b014a47e893aeb262b6fa3792e823adb90ae7a15f5c146c48aa80c72eec5faaf84d516c ruby-rspec-expectations-3.9.0.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index b89f955be..aff6a8008 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.8.2 +pkgver=3.9.1 pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" @@ -10,19 +10,19 @@ arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz - gemspec.patch" + gemspec.patch + " builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir" gem install --local \ --install-dir "$gemdir" \ --ignore-dependencies \ @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed ruby-rspec-mocks-3.8.2.tar.gz +sha512sums="f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f ruby-rspec-mocks-3.9.1.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index a91d0d9dc..a5d1536f9 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.8.3 +pkgver=3.9.2 pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" @@ -10,19 +10,19 @@ arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" depends="ruby" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz - gemspec.patch" + gemspec.patch + " builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir" gem install --local \ --install-dir "$gemdir" \ --ignore-dependencies \ @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a ruby-rspec-support-3.8.3.tar.gz +sha512sums="436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1 ruby-rspec-support-3.9.2.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/ruby-rspec/APKBUILD b/user/ruby-rspec/APKBUILD index 7c6f5ef10..d95857860 100644 --- a/user/ruby-rspec/APKBUILD +++ b/user/ruby-rspec/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.9.0 pkgrel=0 pkgdesc="Behaviour Driven Development for Ruby" url="http://rspec.info/" @@ -13,19 +13,18 @@ depends="ruby ruby-rspec-core~=${pkgver%.*} ruby-rspec-expectations~=${pkgver%.*} ruby-rspec-mocks~=${pkgver%.*}" +makedepends="" source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz gemspec.patch" builddir="$srcdir/$_gemname-$pkgver" build() { - cd "$builddir" gem build $_gemname.gemspec } package() { local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir" gem install --local \ --install-dir "$gemdir" \ --ignore-dependencies \ @@ -39,5 +38,5 @@ package() { "$gemdir"/doc } -sha512sums="0468bfab40de2acb622c772101aef7cc71364c3414344848e90a91376106ae7597d0abcdacebe3a9fad6140780008619d9450bc0842b6e5c9e95bafb9fccae9b ruby-rspec-3.8.0.tar.gz +sha512sums="f6869ca17252ad27de1307b9c75f7184e4b397000fdabe9ab9bcd02805981549831c82f5d5c07838315da2c3a1e004431e02714291bb9da3bd83ac0ee56c170c ruby-rspec-3.9.0.tar.gz f554eef881574e68532dd6c9edeb6b8ad172ac707f7518134378e1099a40ada959c6c770514aab13a6345343113594208be0e42044803c0c2cde3adde00c5520 gemspec.patch" diff --git a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch index 492dbf7ec..83be00997 100644 --- a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch +++ b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch @@ -1,17 +1,17 @@ -From c5fd39c8da01cdb0fea0e323937abcf4895b7511 Mon Sep 17 00:00:00 2001 +From ffe35880050c7e38bb50cb9ecb7b325bb9eff6d9 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Wed, 10 Jan 2018 13:36:41 -0600 -Subject: [PATCH 01/16] Don't pass CFLAGS to the C++ compiler +Subject: [PATCH 01/18] Don't pass CFLAGS to the C++ compiler --- src/bootstrap/builder.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 2e9df48d000..f5ced5b16ed 100644 +index e54c9360bae..7bdd73aa381 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -1138,8 +1138,7 @@ impl<'a> Builder<'a> { +@@ -1126,8 +1126,7 @@ impl<'a> Builder<'a> { if let Ok(cxx) = self.cxx(target) { let cxx = ccacheify(&cxx); cargo diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch index 83091f46b..25d8355fc 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001 +From 02bae9a59de4e38001272219b8a9909549c12df8 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:04:29 -0500 -Subject: [PATCH 02/16] Fix LLVM build +Subject: [PATCH 02/18] Fix LLVM build --- src/bootstrap/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 4d297fa918a..867df81d972 100644 +index b72aa78f3de..3374c88550a 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -769,7 +769,8 @@ impl Build { +@@ -768,7 +768,8 @@ impl Build { // cc-rs because the build scripts will determine that for themselves. let mut base = self.cc[&target].args().iter() .map(|s| s.to_string_lossy().into_owned()) diff --git a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch index cf07c76d2..347e0d362 100644 --- a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +++ b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch @@ -1,7 +1,7 @@ -From 2200debf48b6ef4c87e258cf8a968a89903f8723 Mon Sep 17 00:00:00 2001 +From 9cf754ab1d6ad14f0c95b3c18c4997ee655e62ed Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 2 Dec 2017 17:25:44 -0600 -Subject: [PATCH 03/16] Allow rustdoc to work when cross-compiling on musl +Subject: [PATCH 03/18] Allow rustdoc to work when cross-compiling on musl musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. --- @@ -9,10 +9,10 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index 1c9f6e1ab28..7e90be8d8cc 100644 +index ff38ee8788f..184c9b16562 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs -@@ -23,9 +23,6 @@ fn main() { +@@ -24,9 +24,6 @@ fn main() { Err(_) => 0, }; @@ -22,7 +22,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644 //FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox` //arguments here let mut cmd = Command::new(rustdoc); -@@ -37,7 +34,7 @@ fn main() { +@@ -38,7 +35,7 @@ fn main() { .arg("--sysroot") .arg(&sysroot) .env(bootstrap::util::dylib_path_var(), @@ -31,7 +31,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644 // Force all crates compiled by this compiler to (a) be unstable and (b) // allow the `rustc_private` feature to link to other unstable crates -@@ -86,7 +83,7 @@ fn main() { +@@ -87,7 +84,7 @@ fn main() { eprintln!( "rustdoc command: {:?}={:?} {:?}", bootstrap::util::dylib_path_var(), diff --git a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch index 854cd61e6..7b737b792 100644 --- a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch +++ b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch @@ -1,7 +1,7 @@ -From 10bd267ac2621267e1f537a5a7df34cb87354cd3 Mon Sep 17 00:00:00 2001 +From 8f2821b37da4fe2710e1bf7944765a5c2cf8d98c Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:05:18 -0500 -Subject: [PATCH 04/16] Require static native libraries when linking static +Subject: [PATCH 04/18] Require static native libraries when linking static executables On ELF targets like Linux, gcc/ld will create a dynamically-linked @@ -16,10 +16,10 @@ Fixes #54243 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs -index e3d297e7862..974e8c0239b 100644 +index 8fb0828285c..2d8a0b86076 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs -@@ -1571,9 +1571,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker, +@@ -1567,9 +1567,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker, } } @@ -30,7 +30,7 @@ index e3d297e7862..974e8c0239b 100644 // // 1. The upstream crate is an rlib. In this case we *must* link in the // native dependency because the rlib is just an archive. -@@ -1616,7 +1614,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker, +@@ -1612,7 +1610,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker, continue } match lib.kind { diff --git a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch index 2df7a6654..27556e720 100644 --- a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -1,7 +1,7 @@ -From e8ef432c23ea9fb70b28bea07042b33f1050569b Mon Sep 17 00:00:00 2001 +From 87b08278a8640db921cbd699c7a7dc7e1864f21e Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 22:11:14 -0500 -Subject: [PATCH 05/16] Remove -nostdlib and musl_root from musl targets +Subject: [PATCH 05/18] Remove -nostdlib and musl_root from musl targets --- config.toml.example | 6 ---- @@ -9,7 +9,7 @@ Subject: [PATCH 05/16] Remove -nostdlib and musl_root from musl targets src/bootstrap/cc_detect.rs | 27 ++---------------- src/bootstrap/compile.rs | 21 +------------- src/bootstrap/config.rs | 7 ----- - src/bootstrap/configure.py | 22 --------------- + src/bootstrap/configure.py | 24 ---------------- src/bootstrap/lib.rs | 8 ------ src/bootstrap/sanity.rs | 28 ------------------- .../dist-i586-gnu-i586-i686-musl/Dockerfile | 2 -- @@ -17,13 +17,13 @@ Subject: [PATCH 05/16] Remove -nostdlib and musl_root from musl targets src/ci/docker/dist-x86_64-musl/Dockerfile | 1 - src/ci/docker/test-various/Dockerfile | 1 - src/librustc_target/spec/linux_musl_base.rs | 16 ----------- - 13 files changed, 4 insertions(+), 152 deletions(-) + 13 files changed, 4 insertions(+), 154 deletions(-) diff --git a/config.toml.example b/config.toml.example -index c14adf8ce33..8ec8d2bbbb7 100644 +index cb9f388a8e4..c7d669c91b8 100644 --- a/config.toml.example +++ b/config.toml.example -@@ -479,12 +479,6 @@ +@@ -474,12 +474,6 @@ # only use static libraries. If unset, the target's default linkage is used. #crt-static = false @@ -37,10 +37,10 @@ index c14adf8ce33..8ec8d2bbbb7 100644 #wasi-root = "..." diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs -index 595deb07ec8..c077dc1581e 100644 +index 54b689fb062..81e7e46df37 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs -@@ -145,16 +145,6 @@ fn main() { +@@ -164,16 +164,6 @@ fn main() { cmd.arg("-Cprefer-dynamic"); } @@ -58,10 +58,10 @@ index 595deb07ec8..c077dc1581e 100644 let mut root = OsString::from("native="); root.push(&s); diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs -index 400375cd201..0394ab7a8a7 100644 +index c58a98bac36..3103b29a5b9 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs -@@ -84,7 +84,7 @@ pub fn find(build: &mut Build) { +@@ -86,7 +86,7 @@ pub fn find(build: &mut Build) { if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { cfg.compiler(cc); } else { @@ -70,7 +70,7 @@ index 400375cd201..0394ab7a8a7 100644 } let compiler = cfg.get_compiler(); -@@ -107,7 +107,7 @@ pub fn find(build: &mut Build) { +@@ -109,7 +109,7 @@ pub fn find(build: &mut Build) { cfg.compiler(cxx); true } else if build.hosts.contains(&target) || build.build == target { @@ -79,7 +79,7 @@ index 400375cd201..0394ab7a8a7 100644 true } else { false -@@ -134,8 +134,7 @@ pub fn find(build: &mut Build) { +@@ -136,8 +136,7 @@ pub fn find(build: &mut Build) { fn set_compiler(cfg: &mut cc::Build, compiler: Language, target: Interned<String>, @@ -89,7 +89,7 @@ index 400375cd201..0394ab7a8a7 100644 match &*target { // When compiling for android we may have the NDK configured in the // config.toml in which case we look there. Otherwise the default -@@ -175,26 +174,6 @@ fn set_compiler(cfg: &mut cc::Build, +@@ -177,26 +176,6 @@ fn set_compiler(cfg: &mut cc::Build, } } @@ -117,10 +117,10 @@ index 400375cd201..0394ab7a8a7 100644 } } diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 576267e6948..8e5de3907f6 100644 +index 4cd793adaf5..4839ec9badd 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -116,20 +116,7 @@ impl Step for Std { +@@ -115,20 +115,7 @@ impl Step for Std { fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) { let libdir = builder.sysroot_libdir(*compiler, target); @@ -142,7 +142,7 @@ index 576267e6948..8e5de3907f6 100644 for &obj in &["crt1.o"] { builder.copy( &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj), -@@ -219,12 +206,6 @@ pub fn std_cargo(builder: &Builder<'_>, +@@ -218,12 +205,6 @@ pub fn std_cargo(builder: &Builder<'_>, .arg("--manifest-path") .arg(builder.src.join("src/libstd/Cargo.toml")); @@ -156,10 +156,10 @@ index 576267e6948..8e5de3907f6 100644 if let Some(p) = builder.wasi_root(target) { cargo.env("WASI_ROOT", p); diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 66f504ea924..5bb211501b1 100644 +index a5bfafdfdb4..cc0b489870b 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -133,8 +133,6 @@ pub struct Config { +@@ -132,8 +132,6 @@ pub struct Config { pub print_step_timings: bool, pub missing_tools: bool, @@ -168,7 +168,7 @@ index 66f504ea924..5bb211501b1 100644 pub prefix: Option<PathBuf>, pub sysconfdir: Option<PathBuf>, pub datadir: Option<PathBuf>, -@@ -169,7 +167,6 @@ pub struct Target { +@@ -168,7 +166,6 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub crt_static: Option<bool>, @@ -176,7 +176,7 @@ index 66f504ea924..5bb211501b1 100644 pub wasi_root: Option<PathBuf>, pub qemu_rootfs: Option<PathBuf>, pub no_std: bool, -@@ -307,7 +304,6 @@ struct Rust { +@@ -306,7 +303,6 @@ struct Rust { backtrace: Option<bool>, default_linker: Option<String>, channel: Option<String>, @@ -184,7 +184,7 @@ index 66f504ea924..5bb211501b1 100644 rpath: Option<bool>, optimize_tests: Option<bool>, codegen_tests: Option<bool>, -@@ -346,7 +342,6 @@ struct TomlTarget { +@@ -344,7 +340,6 @@ struct TomlTarget { linker: Option<String>, android_ndk: Option<String>, crt_static: Option<bool>, @@ -192,15 +192,15 @@ index 66f504ea924..5bb211501b1 100644 wasi_root: Option<String>, qemu_rootfs: Option<String>, } -@@ -569,7 +564,6 @@ impl Config { +@@ -564,7 +559,6 @@ impl Config { set(&mut config.llvm_tools_enabled, rust.llvm_tools); config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); config.rustc_default_linker = rust.default_linker.clone(); - config.musl_root = rust.musl_root.clone().map(PathBuf::from); config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from); - set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings)); + set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -607,7 +601,6 @@ impl Config { +@@ -602,7 +596,6 @@ impl Config { target.ranlib = cfg.ranlib.clone().map(PathBuf::from); target.linker = cfg.linker.clone().map(PathBuf::from); target.crt_static = cfg.crt_static.clone(); @@ -209,10 +209,10 @@ index 66f504ea924..5bb211501b1 100644 target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index 907983d43ad..e91f6fcbe4b 100755 +index 346f0cb2039..80409781ede 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py -@@ -111,28 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", +@@ -110,30 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", "aarch64-linux-android NDK standalone path") v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", "x86_64-linux-android NDK standalone path") @@ -230,7 +230,9 @@ index 907983d43ad..e91f6fcbe4b 100755 - "arm-unknown-linux-musleabihf install directory") -v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root", - "armv5te-unknown-linux-musleabi install directory") --v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root", +-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root", +- "armv7-unknown-linux-musleabi install directory") +-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root", - "armv7-unknown-linux-musleabihf install directory") -v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root", - "aarch64-unknown-linux-musl install directory") @@ -242,10 +244,10 @@ index 907983d43ad..e91f6fcbe4b 100755 "rootfs in qemu testing, you probably don't want to use this") v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 867df81d972..4fb57aa6db6 100644 +index 3374c88550a..76cc0dd28a5 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -847,14 +847,6 @@ impl Build { +@@ -846,14 +846,6 @@ impl Build { } } @@ -261,10 +263,10 @@ index 867df81d972..4fb57aa6db6 100644 fn wasi_root(&self, target: Interned<String>) -> Option<&Path> { self.config.target_config.get(&target) diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index dc65fb9b797..060ba6d9e42 100644 +index 4e3930c8da7..3b109548056 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs -@@ -176,34 +176,6 @@ pub fn check(build: &mut Build) { +@@ -187,34 +187,6 @@ pub fn check(build: &mut Build) { } } @@ -313,17 +315,17 @@ index ba2d32a9296..412c37fdd12 100644 --disable-docs diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile -index 5ab4be328a9..f3b622e6037 100644 +index ae2ea8ef95a..19426156d1f 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile -@@ -131,13 +131,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ +@@ -134,13 +134,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ ENV RUST_CONFIGURE_ARGS \ - --musl-root-armv5te=/musl-armv5te \ - --musl-root-arm=/musl-arm \ - --musl-root-armhf=/musl-armhf \ -- --musl-root-armv7=/musl-armv7 \ +- --musl-root-armv7hf=/musl-armv7hf \ - --musl-root-aarch64=/musl-aarch64 \ - --musl-root-mips=/musl-mips \ - --musl-root-mipsel=/musl-mipsel \ @@ -343,10 +345,10 @@ index 385eefde846..81d4f7737e8 100644 --disable-docs \ --set target.x86_64-unknown-linux-musl.crt-static=false \ diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile -index c45b1a9a0f1..440796ff3ec 100644 +index 6a2600d8756..53a99ae1353 100644 --- a/src/ci/docker/test-various/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile -@@ -27,7 +27,6 @@ COPY scripts/sccache.sh /scripts/ +@@ -29,7 +29,6 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS \ diff --git a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch index 2f1094448..a7899a9f6 100644 --- a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch @@ -1,17 +1,17 @@ -From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001 +From faede4a789d3156d5c029606087851fa50d48380 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 9 Sep 2017 00:14:16 -0500 -Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 06/18] Prefer libgcc_eh over libunwind for musl --- src/libunwind/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 9182e349b19..0377fbb58fc 100644 +index 8d916447128..6d653d41fa4 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs -@@ -23,6 +23,6 @@ cfg_if::cfg_if! { +@@ -21,7 +21,7 @@ cfg_if::cfg_if! { } #[cfg(target_env = "musl")] @@ -19,6 +19,7 @@ index 9182e349b19..0377fbb58fc 100644 +#[link(name = "gcc_eh", cfg(target_feature = "crt-static"))] #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] extern {} + -- 2.21.0 diff --git a/user/rust/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch b/user/rust/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch index 05b91456f..d99c71640 100644 --- a/user/rust/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch +++ b/user/rust/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch @@ -1,7 +1,7 @@ -From c9a914f48652de22832a40ef9639ff8d57c57f31 Mon Sep 17 00:00:00 2001 +From b542c403b8211e1e99278b206b82f5f601dd8cbd Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Wed, 4 Sep 2019 20:40:18 -0500 -Subject: [PATCH 07/16] Fix C aggregate-passing ABI on powerpc +Subject: [PATCH 07/18] Fix C aggregate-passing ABI on powerpc The existing code (which looks like it was copied from MIPS) passes aggregates by value in registers. This is wrong. According to the SVR4 diff --git a/user/rust/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch b/user/rust/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch index c3da394a7..ee6a7f5c1 100644 --- a/user/rust/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch +++ b/user/rust/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch @@ -1,7 +1,7 @@ -From f67f0ab40f1328e04916512b9af858ca1b7faa24 Mon Sep 17 00:00:00 2001 +From e734014aa61cc130e180600b8cb9fdb57909e843 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Wed, 4 Sep 2019 20:44:30 -0500 -Subject: [PATCH 08/16] Fix zero-sized aggregate ABI on powerpc +Subject: [PATCH 08/18] Fix zero-sized aggregate ABI on powerpc For targets that pass zero-sized aggregates indirectly (generally those that pass all aggregates indirectly), we must allocate a register @@ -20,10 +20,10 @@ updating each implementation of `compute_abi_info` to handle ZSTs. 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs -index 4af26e19b37..163db9778e5 100644 +index 19c753bc304..b0e1b391e4b 100644 --- a/src/librustc/ty/layout.rs +++ b/src/librustc/ty/layout.rs -@@ -2667,12 +2667,11 @@ where +@@ -2660,12 +2660,11 @@ where }; let target = &cx.tcx().sess.target.target; @@ -41,7 +41,7 @@ index 4af26e19b37..163db9778e5 100644 let rust_abi = match sig.abi { RustIntrinsic | PlatformIntrinsic | Rust | RustCall => true, _ => false, -@@ -2742,11 +2741,10 @@ where +@@ -2735,11 +2734,10 @@ where let is_return = arg_idx.is_none(); let mut arg = mk_arg_type(ty, arg_idx); if arg.layout.is_zst() { diff --git a/user/rust/0009-compiletest-Match-suffixed-environments.patch b/user/rust/0009-compiletest-Match-suffixed-environments.patch index 9ca4d9900..0fa811d5a 100644 --- a/user/rust/0009-compiletest-Match-suffixed-environments.patch +++ b/user/rust/0009-compiletest-Match-suffixed-environments.patch @@ -1,7 +1,7 @@ -From 0b28aa018f3f64913101495ce9806d356230856e Mon Sep 17 00:00:00 2001 +From 12593754aebecd852a8738524025fa59cf44c429 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 2 Sep 2019 22:10:10 -0500 -Subject: [PATCH 09/16] compiletest: Match suffixed environments +Subject: [PATCH 09/18] compiletest: Match suffixed environments --- src/tools/compiletest/src/header.rs | 2 +- @@ -9,10 +9,10 @@ Subject: [PATCH 09/16] compiletest: Match suffixed environments 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs -index 52f777db2da..4bf3c1a8527 100644 +index 076ad87c70f..c5141e97a4e 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs -@@ -820,10 +820,10 @@ impl Config { +@@ -819,10 +819,10 @@ impl Config { if name == "test" || util::matches_os(&self.target, name) || // target @@ -25,10 +25,10 @@ index 52f777db2da..4bf3c1a8527 100644 match self.compare_mode { Some(CompareMode::Nll) => name == "compare-mode-nll", diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs -index 8caf5ca00f5..d23f4edc55d 100644 +index 56ebea7c20f..3a2ee445087 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs -@@ -101,8 +101,12 @@ pub fn get_arch(triple: &str) -> &'static str { +@@ -105,8 +105,12 @@ pub fn get_arch(triple: &str) -> &'static str { panic!("Cannot determine Architecture from triple"); } diff --git a/user/rust/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch b/user/rust/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch index 2e2111edb..cead84b9e 100644 --- a/user/rust/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch +++ b/user/rust/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch @@ -1,7 +1,7 @@ -From e6a01c436377109808cac2d49ec30968a02b561d Mon Sep 17 00:00:00 2001 +From a1203758a3bd13c61834f09794cd232359778689 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 2 Sep 2019 22:09:15 -0500 -Subject: [PATCH 10/16] test/c-variadic: Fix patterns on powerpc64 +Subject: [PATCH 10/18] test/c-variadic: Fix patterns on powerpc64 --- src/test/codegen/c-variadic.rs | 22 +++++++++++----------- diff --git a/user/rust/0011-Use-rustc-workspace-hack-for-rustbook.patch b/user/rust/0011-Use-rustc-workspace-hack-for-rustbook.patch new file mode 100644 index 000000000..311f2a37f --- /dev/null +++ b/user/rust/0011-Use-rustc-workspace-hack-for-rustbook.patch @@ -0,0 +1,58 @@ +From 963e5d726f753d1816eae560b99b241934abe786 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 6 Oct 2019 17:30:11 -0500 +Subject: [PATCH 11/18] Use rustc-workspace-hack for rustbook + +As rustbook now depends transitively on openssl, it needs access to the +rustc-workspace-hack/all-static feature to pick up openssl-sys/vendored. +This fixes the rust build with `all-static = true` on systems where +openssl is not installed (e.g. when cross-compiling). +--- + Cargo.lock | 1 + + src/bootstrap/tool.rs | 1 + + src/tools/rustbook/Cargo.toml | 5 +++++ + 3 files changed, 7 insertions(+) + +diff --git a/Cargo.lock b/Cargo.lock +index ab6731e4d43..54177b36827 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2577,6 +2577,7 @@ dependencies = [ + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "mdbook 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mdbook-linkcheck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-workspace-hack 1.0.0", + ] + + [[package]] +diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs +index df7eb7c455d..c91ccc79aa1 100644 +--- a/src/bootstrap/tool.rs ++++ b/src/bootstrap/tool.rs +@@ -248,6 +248,7 @@ pub fn prepare_tool_cargo( + path.ends_with("rls") || + path.ends_with("clippy") || + path.ends_with("miri") || ++ path.ends_with("rustbook") || + path.ends_with("rustfmt") + { + cargo.env("LIBZ_SYS_STATIC", "1"); +diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml +index a7188f0d11e..89bbde4d5a9 100644 +--- a/src/tools/rustbook/Cargo.toml ++++ b/src/tools/rustbook/Cargo.toml +@@ -13,6 +13,11 @@ clap = "2.25.0" + failure = "0.1" + mdbook-linkcheck = { version = "0.3.0", optional = true } + ++# A noop dependency that changes in the Rust repository, it's a bit of a hack. ++# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` ++# for more information. ++rustc-workspace-hack = "1.0.0" ++ + [dependencies.mdbook] + version = "0.3.0" + default-features = false +-- +2.21.0 + diff --git a/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch new file mode 100644 index 000000000..37723d14b --- /dev/null +++ b/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch @@ -0,0 +1,36 @@ +From 288b1c1845096034f370b78f0c2ff3e31c468581 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 7 Oct 2019 18:36:28 -0500 +Subject: [PATCH 12/18] test/failed-doctest-output: Fix normalization + +Otherwise we get: + +1 +2 running 2 tests +- test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED +- test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED +5 +6 failures: +7 +--- + src/test/rustdoc-ui/failed-doctest-output.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs +index d2cdeb8f8f5..0e3f765fda6 100644 +--- a/src/test/rustdoc-ui/failed-doctest-output.rs ++++ b/src/test/rustdoc-ui/failed-doctest-output.rs +@@ -3,7 +3,7 @@ + // adapted to use that, and that normalize line can go away + + // compile-flags:--test +-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" ++// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" + // failure-status: 101 + + // doctest fails at runtime +-- +2.21.0 + diff --git a/user/rust/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch index 002d84024..9dacfaf10 100644 --- a/user/rust/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch +++ b/user/rust/0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -1,7 +1,7 @@ -From f0fce1130ffe6b5a7666979aedd956becc4d7c25 Mon Sep 17 00:00:00 2001 +From cdc3d5f2aebc0e5ae06f9e5d8ddeb279e0fd494b Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 6 Oct 2018 04:01:48 +0000 -Subject: [PATCH 11/16] test/use-extern-for-plugins: Don't assume multilib +Subject: [PATCH 13/18] test/use-extern-for-plugins: Don't assume multilib --- src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ diff --git a/user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch index 6123af837..63990a199 100644 --- a/user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +++ b/user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -1,7 +1,7 @@ -From 93835653d45142c17adcf3087d2a8e512053bccf Mon Sep 17 00:00:00 2001 +From 45081d6ff61e0f12c1c53545e3bd1b5aed3100b4 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 01:32:20 +0000 -Subject: [PATCH 12/16] test/sysroot-crates-are-unstable: Fix test when rpath +Subject: [PATCH 14/18] test/sysroot-crates-are-unstable: Fix test when rpath is disabled Without this environment var, the test can't run rustc to find diff --git a/user/rust/0013-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0015-Ignore-broken-and-non-applicable-tests.patch index dc0f7adb3..bae3eb94d 100644 --- a/user/rust/0013-Ignore-broken-and-non-applicable-tests.patch +++ b/user/rust/0015-Ignore-broken-and-non-applicable-tests.patch @@ -1,13 +1,12 @@ -From 8eb87a7b794e649003bc8f4bed6c6d6739f65e43 Mon Sep 17 00:00:00 2001 +From 7a797219b4604eb039387d188b22ee9b292bf68a Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sun, 16 Sep 2018 16:38:48 +0000 -Subject: [PATCH 13/16] Ignore broken and non-applicable tests +Subject: [PATCH 15/18] Ignore broken and non-applicable tests c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) long-linker-command-lines: takes >10 minutes to run (but still passes) simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 -simd-intrinsic-generic-select.rs: broken on BE, #59356 sparc-struct-abi: no sparc target sysroot-crates-are-unstable: can't run rustc without RPATH --- @@ -16,10 +15,9 @@ sysroot-crates-are-unstable: can't run rustc without RPATH src/test/run-make-fulldeps/linker-output-non-utf8/Makefile | 2 ++ src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ - src/test/run-pass/env-funky-keys.rs | 1 + - src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs | 2 ++ - src/test/run-pass/simd/simd-intrinsic-generic-select.rs | 2 ++ - 8 files changed, 14 insertions(+) + src/test/ui/env-funky-keys.rs | 1 + + src/test/ui/simd/simd-intrinsic-generic-bitmask.rs | 2 ++ + 7 files changed, 12 insertions(+) diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs index 78e5b14a212..6f93e93286b 100644 @@ -76,21 +74,22 @@ index 9e770706857..6d92ec5cec8 100644 -include ../tools.mk all: -diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs -index 3b236e2b3af..7284d25de48 100644 ---- a/src/test/run-pass/env-funky-keys.rs -+++ b/src/test/run-pass/env-funky-keys.rs -@@ -1,5 +1,6 @@ +diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs +index 4faceb53266..09764dc32bf 100644 +--- a/src/test/ui/env-funky-keys.rs ++++ b/src/test/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass // Ignore this test on Android, because it segfaults there. +// ignore-test // ignore-android // ignore-windows // ignore-cloudabi no execve -diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs +diff --git a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs index b28f742a92e..3ee4ccce731 100644 ---- a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs -+++ b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs +--- a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs ++++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs @@ -2,6 +2,8 @@ #![allow(non_camel_case_types)] @@ -100,19 +99,6 @@ index b28f742a92e..3ee4ccce731 100644 // Test that the simd_bitmask intrinsic produces correct results. -diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -index f79b140494e..39080c8c90d 100644 ---- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -+++ b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -@@ -2,6 +2,8 @@ - #![allow(non_camel_case_types)] - - // ignore-emscripten -+// ignore-powerpc -+// ignore-powerpc64 - - // Test that the simd_select intrinsics produces correct results. - -- 2.21.0 diff --git a/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0016-Link-stage-2-tools-dynamically-to-libstd.patch index 47e9173a9..48d59b1be 100644 --- a/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch +++ b/user/rust/0016-Link-stage-2-tools-dynamically-to-libstd.patch @@ -1,17 +1,17 @@ -From 8e160daedd1a8c928024db648c2f851cddbbd000 Mon Sep 17 00:00:00 2001 +From 662ca3f88621d231be1edb695319efaa6d262572 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 24 Sep 2018 23:42:23 +0000 -Subject: [PATCH 14/16] Link stage 2 tools dynamically to libstd +Subject: [PATCH 16/18] Link stage 2 tools dynamically to libstd --- src/bootstrap/tool.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index bd77f7a91d9..70477b44032 100644 +index c91ccc79aa1..e1b90400cc0 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs -@@ -210,7 +210,9 @@ pub fn prepare_tool_cargo( +@@ -236,7 +236,9 @@ pub fn prepare_tool_cargo( // We don't want to build tools dynamically as they'll be running across // stages and such and it's just easier if they're not dynamically linked. diff --git a/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch index ed30dfd15..9ccb19b60 100644 --- a/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch +++ b/user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch @@ -1,7 +1,7 @@ -From 1d81148c7b7c048cb1c586ece96bd326ae0f72ec Mon Sep 17 00:00:00 2001 +From 7c381527fa142b00f83ec6a9b5f1b7b31fc4d3ee Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 15/16] Move debugger scripts to /usr/share/rust +Subject: [PATCH 17/18] Move debugger scripts to /usr/share/rust --- src/bootstrap/dist.rs | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH 15/16] Move debugger scripts to /usr/share/rust 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 45bc77ec97d..9e82352ef65 100644 +index 552965863d1..fcd644fc52e 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -593,7 +593,7 @@ impl Step for DebuggerScripts { @@ -36,10 +36,10 @@ index 23ba93da8e5..dc51b16c572 100755 # Run GDB with the additional arguments that load the pretty printers # Set the environment variable `RUST_GDB` to overwrite the call to a diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb -index 0eb99423df5..f069300dafe 100755 +index 7b9b40e6b4a..e471db365b7 100755 --- a/src/etc/rust-lldb +++ b/src/etc/rust-lldb -@@ -26,7 +26,7 @@ display the contents of local variables!" +@@ -31,7 +31,7 @@ EOF fi # Prepare commands that will be loaded before any file on the command line has been loaded diff --git a/user/rust/0016-Add-foxkit-target-specs.patch b/user/rust/0018-Add-foxkit-target-specs.patch index 2b60ca937..4c57c1ab0 100644 --- a/user/rust/0016-Add-foxkit-target-specs.patch +++ b/user/rust/0018-Add-foxkit-target-specs.patch @@ -1,7 +1,7 @@ -From e31b3c5f24306f0e643c38692e4679707bea8bb8 Mon Sep 17 00:00:00 2001 +From 263793146d885c14796d7ad8feba6fe60e547faa Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:29:06 +0000 -Subject: [PATCH 16/16] Add foxkit target specs +Subject: [PATCH 18/18] Add foxkit target specs --- .../spec/aarch64_foxkit_linux_musl.rs | 11 +++++++++++ @@ -73,10 +73,10 @@ index 00000000000..f0c4ffbf580 + Ok(base) +} diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs -index 75821aba470..fad73c0fc0e 100644 +index ec72c00c28f..cda203f8078 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs -@@ -328,6 +328,13 @@ macro_rules! supported_targets { +@@ -330,6 +330,13 @@ macro_rules! supported_targets { } supported_targets! { diff --git a/user/rust/0030-libc-linkage.patch b/user/rust/0030-libc-linkage.patch index a54303b8b..55feae94f 100644 --- a/user/rust/0030-libc-linkage.patch +++ b/user/rust/0030-libc-linkage.patch @@ -1,16 +1,16 @@ ---- rustc-1.36.0-src/vendor/libc/src/lib.rs -+++ rustc-1.36.0-src/vendor/libc/src/lib.rs -@@ -26,6 +26,7 @@ - #![deny(missing_copy_implementations, safe_packed_borrows)] +--- rustc-1.38.0-src/vendor/libc/src/lib.rs ++++ rustc-1.38.0-src/vendor/libc/src/lib.rs +@@ -28,6 +28,7 @@ #![no_std] #![cfg_attr(feature = "rustc-dep-of-std", no_core)] -+#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))] + #![cfg_attr(target_os = "redox", feature(static_nobundle))] ++#![cfg_attr(target_env = "musl", feature(static_nobundle))] #[macro_use] mod macros; ---- rustc-1.36.0-src/vendor/libc/src/unix/mod.rs -+++ rustc-1.36.0-src/vendor/libc/src/unix/mod.rs -@@ -307,11 +307,11 @@ cfg_if! { +--- rustc-1.38.0-src/vendor/libc/src/unix/mod.rs ++++ rustc-1.38.0-src/vendor/libc/src/unix/mod.rs +@@ -297,11 +297,11 @@ cfg_if! { // cargo build, don't pull in anything extra as the libstd dep // already pulls in all libs. } else if #[cfg(target_env = "musl")] { @@ -25,9 +25,9 @@ extern {} } else if #[cfg(target_os = "emscripten")] { #[link(name = "c")] ---- rustc-1.36.0-src/vendor/libc/.cargo-checksum.json -+++ rustc-1.36.0-src/vendor/libc/.cargo-checksum.json +--- rustc-1.38.0-src/vendor/libc/.cargo-checksum.json ++++ rustc-1.38.0-src/vendor/libc/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"4f566bfdc168610f37b79d8671c1f9c6f084e0b6cfd40083eed544273e4ab1af","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35582cfa483e7676b25ae4a07064a19443f4942f5e60e43b91632fcd6ae95156","build.rs":"e9b7364366a5b4caa9daa436ab8a3469532fe63d5fae4d3b2e5ff59d32ff3f3a","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"037c1a3160ae3bc336f6f7135476704e7f5e834e4039fa02b37f03b507118945","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"db1936ed9e5ac6bd1c04329cbf12feb6842e2a00ca528ff8ccaf7c3b0a5ebe52","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"911d1249370cf1b0b7b38960cae28af1276f0f614cfcbf5174dbaa38be3dff1d","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"9d764e53df81416a5182b71a26402d2071fc0c15160103b6670b6b268fc356da","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"c9a1ddaaae192d0a40eea37b8402eb506a895711bcf493a7af5a9dfc88fac733","src/macros.rs":"8232e284068d34336713535595fad3c910093346be32e72bde3d3d03327ec6b8","src/redox/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/redox/mod.rs":"34f132e794dc25bbb0e3c08b7f87e4508ce62e0aac00acf39dcdb0f246d7dfc0","src/redox/net.rs":"351960c3a3ad9b296fe43533cac429434e0872c8cca5ad5047dce79d82e009ee","src/redox/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/sgx.rs":"7ff2fbf3e5ad1c880014d68e012f4381a9b9140d13089193b9fba07a7f27c352","src/switch.rs":"fe1414ca053b73cf8a5f54448e807abe81c776c6ac0dfe47ea7772c8140f50b6","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"0095a17e49fa423cab8644c722a375b88f5c0cf56fa456b549738d98131bb2f9","src/unix/bsd/apple/b64.rs":"99fbd3e6d2c969080631e23f58deffa51cb3f42b7a08395b49556f19bb40d4e1","src/unix/bsd/apple/mod.rs":"d67234bd36d2d2ab84716f597af4245cb01fc92fee362a331ae4e0a4eb723faa","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"2cb0a5d10a3c5721d10209ad7ddc59f6756b2c1d4bc89450988053efad788eb6","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"4dcd712c0dd5470171746071a176391f937de7865dd0792173284992d9e3f2c7","src/unix/bsd/freebsdlike/freebsd/arm.rs":"84cf36223f0229cb383036563a4902731543e89b37e4dfe2f450cced566d8545","src/unix/bsd/freebsdlike/freebsd/mod.rs":"0752dc1097fd5e94aabfe7b6d4ead2b94e5c0540e2cd3c8efee883bba13e1a0c","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"9873f41843cbf066f6ffab8eeb63115095f81ce9fa8f337b95ec871e40c6565d","src/unix/bsd/freebsdlike/freebsd/x86.rs":"716cb67cd0aea66d4a8e40470d32b55cbfafddf75edd34a90f70d518c8c75457","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"dd3d8a546730f09b1ef0dfeeb20244eef01d1b4028799b28b3a0c33ae05d5002","src/unix/bsd/freebsdlike/mod.rs":"96a4baa8d7145ff29a9269437ce1fd538a18683488d85a677da78e17e070efc0","src/unix/bsd/mod.rs":"c59685127d6f238b9e9c967424c29da51668ab240e4a88962ab058e4498766b3","src/unix/bsd/netbsdlike/mod.rs":"3b32758ba7a5a133b045521c88e74f51d3718e9051f15ed66122d29267a51138","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"75adb8d6ee202d50487913c245e1a880447582f45e1ef6339743305a13fb5719","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"51dd68ca3c3eab0f1fe496b0dc12ad8b85f8cf964af0c2c95ab9834ad03938a8","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"c8d18b725c62c2f1a3c5e42d875e1a3b167c13a1bd6ae3d35f35a6ec29402f81","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"a3fb2cfc0e100c860dff1674a90693d57e66b7f12861155ceb42c2de372454bd","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"f3edcb2c6c0f8c68daebb1a17490684eae64a488570d1140bee1c2b384e25677","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"d97797fe66dd43c61f6f895596f6a57145b4c9ef61edd93c8ff9b497a2d28411","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"22a5ba8f3d954d4e0c51fde9369ff5e43db891771681d4d6a7b5b640244e2ed5","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"fb1c25abbcbc82fbb4842e442c9ead2710ccc597f1cce65ac12ad6f4d1f64856","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"05a714a785fa94a5131af3d59612ce1e9a5823b3327eb2a23de8ad0ce125c377","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"d3bcb20e70d29a450577c09706bb520fab09d0cb3102755736867bf8a957319c","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"220b041d7142abb9e54004b8a5468be9afe8ad87c87e1d76f0a05f9671697bca","src/unix/notbsd/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/notbsd/emscripten/mod.rs":"42947782f571b56cc1b1c1f4364bb35519bcc44ab8aca53bb13bfd46904de1e0","src/unix/notbsd/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/notbsd/linux/align.rs":"f2520d03b411519161eaaf043f1948b3279509a3f272b2958bca1d1aeda0434d","src/unix/notbsd/linux/mips/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/mips/mips32.rs":"96153abc38b10309e64cb49b1a1e4107be70dbc40bc54ba0372a4573b098b514","src/unix/notbsd/linux/mips/mips64.rs":"9bd96aa81cb0f536c3607d0a2906f4be7a44c3f89e40d5955a898835f04f0e15","src/unix/notbsd/linux/mips/mod.rs":"9a67a2f4043907a50a43569c06ffb4890aefa8db1c26a8737c6bb4bd3e39d90e","src/unix/notbsd/linux/mips/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/mod.rs":"e3531ef28589e4dfd9861f5bd0ba175200dedb69d48f20842baeb129fd8761e1","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"adf8bb67b47995760aab14f04ae671ebd8ecca5579e90314612f46cb79b30cc2","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"19197260a6d06ee521a5aa40a1860b7be33176d0f52bc92d56165fc42729cbd5","src/unix/notbsd/linux/musl/mod.rs":"13d766411fa206b987567e7c802dfe7585e6b7f002fe13ec0fbc810e522b7e2d","src/unix/notbsd/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/notbsd/linux/other/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"fea38039a1908ddeb90672b8ef246c743eec6758663a79aea401e21ef40a736d","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"017cb7cf2810bc633e21879a8951a2c10031c500648e5eb4accc6c88b58ecaa3","src/unix/notbsd/linux/other/mod.rs":"86d6c4f5a01b4da8cf9bbfa7f6fedbeda1c9b1c0528244ce9033a647cd0567d5","src/unix/notbsd/linux/other/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/s390x/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/notbsd/linux/s390x/mod.rs":"b01d158eefce4c31f377b63964d253f9934f7468af35a24474a163ad3725796a","src/unix/notbsd/linux/s390x/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/notbsd/mod.rs":"8aa3fc4d3879b6897871c55c4cb70ff7a63c399d2409a729cc788f21f987452e","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"0c6d148d84f2fa9feb86b464d30af9c52322553bf321ae4fe27184d274ccbe21","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"66d54a7028a422fe331028441d1b1f18cf34bb2deff2a9e5220384b6e10dcc40","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"d1a1af63b583b170d5c94b46a04589a11b9d4f8dc658ab8c74302bae656d0e85","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"d7c2b44735fe8a892fb05ab888de8311fc1f7a86f3aef818b7ff04fae70447fa","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"e322bdc14bf7f8c34de8fc4ea52fd6279bbc9d6c205efa8b9b8925e8b12c4b6c","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"2761f3f80c8af5c04e685af8ac3a2bc8c7d6de91cbad9b96a3a6dae67457a891","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"} +-{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"081d553ece666bafa6152dd34b800d373614516db3191b66a0edc56a36172015","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"04d4132d1039c1ad753fecdadd0b863bbc4e22dd7bc896db09acd125812f8b4a","build.rs":"ee4839872f6d0364101b29a7b7e9d5c2421f47cd0d752e1e52533f58ea489af1","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"b3ca0393f66ca803246e9b2dbbf9b6caadef2b7b7135412f3d914588b0630295","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fixed_width_ints.rs":"782b2b2aa6f471f2ebab220456ed681f76980c572f194ec3755ce76f27c8eab6","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"ce85ffc3da5629701331791d01574fdb824d58d36399cee7bf46118d61dcf935","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"aeda183662787a44c4bd26645cea76f31bf5f7c63d4d59118118c360705fb9eb","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"39d528e87d6165c2cd0d2b3060b1eb458e7ca588c3044f311d6f456c2751c79e","src/macros.rs":"2407f3a2d5e3ae6224457bc793378aa35fc8d57bdc6c3d8024ace0ecbd9782f4","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"6249b9c891f89c74730f70b9f98f2b2c66676e5f2b2ffaddd13b63781f214f3e","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"b2bbdaed9f2006ed6a4a236d5683983307a3c1d229fc8b90dd53afb496ccf422","src/unix/bsd/apple/b64.rs":"dc895aa7d94c9bc6b01a0072708bbf23fceb212fdece0c81ddb73f985d5479e7","src/unix/bsd/apple/mod.rs":"d2a36fa92c1eaa93debfea1fc0a6998881e80d2d1e4cd03759915d8dc275cb9a","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"3ea47ead5855b98267bb931f47d8dad44a0418b262eaa999786deb0d7deb92b2","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"24da2062119597eca17cadcf40d2db93c0c765aeca3eb887c8d2c9534f567d8c","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"e528191e42977fa4c226d8850c47d3e526e951cca46ea9a4a87af40221f79d63","src/unix/bsd/freebsdlike/freebsd/arm.rs":"10fe01bc6269b47da72d1e9f8bdae2fcc7d4f332540e8ce1756e1f58d506bf8c","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bc9f26d046aa8471228c376fb79afb40936eb0ccf8c5dc2111600f7392ef77b4","src/unix/bsd/freebsdlike/freebsd/freebsd11/x86_64.rs":"deb18ce1991567f02831033cd41aca532277affc2e2d14e2966a9a22eb985679","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"f60c8895fb3e3d656eca41f0ed785b260f15b1c4aa8613a5c2b05e41cde27236","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"06b0355363d14ce7c9e7577b1cefbc12984ca7448f712519f9a29a758934db45","src/unix/bsd/freebsdlike/freebsd/mod.rs":"898a5f20d2c69406744ca5ef73acc13af6b1a07ade8361f659a1eee57eef9442","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"125457305b14309cbad4c46fd2fbd54e2f96d37adfec6c89ae9ed8cedfa015bc","src/unix/bsd/freebsdlike/freebsd/x86.rs":"4e0813f01a017dc148262d7c40dfadb964eb7eb6138dc2b0b83d0b51dbe4d467","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"841c64cda9601ad9b0320f01b2bafbd44cdcdd05ca5b90224f294809adb7d80f","src/unix/bsd/freebsdlike/mod.rs":"fc1a3055db220e816c1b0dcd06fd7d792c9c94d0f441779759fb507d63e4fc8a","src/unix/bsd/mod.rs":"939cd11741b845295b25c5cec3bffd321faa2ac44958a8dfdbf5d4be74331aeb","src/unix/bsd/netbsdlike/mod.rs":"6511a4d2b2a7869fdb55489db126eec89cfc0d8771cab6218319aef3e1be271e","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"b29bf6c8c581c6afa21d756803ae245d54ec7bd94777f97f0ecf3f0ad17d5072","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsd/mod.rs":"df51b11d1e96d44f34b8697b16b1162f582101ce56bfc12329047ca689b249af","src/unix/bsd/netbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"1f2da746cdd9683f62cd908fd3048b06d34277f512b7748ed283c01c4b703ff3","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"0e17a9f2bbde2d1b4e83bde0ef39826a25ef357f78dcd7e4671079faa1204799","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/linux_like/android/b32/mod.rs":"73c3482a4f3b200a6bc0a6562a281e4fe449488ee9bde1b430f2412ab2e32dc5","src/unix/linux_like/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/linux_like/android/b64/aarch64.rs":"37a6ad89617f88f45acbd990281b7557047be9ff4b167c435e9cd5e79859e19f","src/unix/linux_like/android/b64/mod.rs":"07b24a9d22731b44459e0533e6a12ffc72c45e9caee86df5263c44bf32def5ab","src/unix/linux_like/android/b64/x86_64.rs":"a6224d4cb8029eccae1549e602c4fc9847eac09213b4300ca65c6b07e8905397","src/unix/linux_like/android/mod.rs":"92ecca148375342e3a7c2c2e16030a340e2ebe153f89105f26f909da3737669d","src/unix/linux_like/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/linux_like/emscripten/mod.rs":"573a180c604d95e80cc72e5bca8ab5d8bce9298951a3979e22afd7c4edd7c572","src/unix/linux_like/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/linux_like/linux/align.rs":"85acc1c7e3701d4b1cad1153798022ad8a3a5c9ae9454fb741237cc15e354ac4","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm.rs":"5848e7e40d63b0f3ed888e479f441a360d5d707498d08237bb2a1c19ae351c4c","src/unix/linux_like/linux/gnu/b32/mips.rs":"172811216a8f2fd0d8b4b8195dbd7f426c02939355d17c9850f592deef701df2","src/unix/linux_like/linux/gnu/b32/mod.rs":"7f358e0a62cee1d375f212db2bf4f24b6f14011d6429be2d2f5e8ca0adcff05b","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"7975df6a52064979d0be2a6f5e216c411994420650972086e8ac4f5c43abdac1","src/unix/linux_like/linux/gnu/b32/x86.rs":"a24ee8115121d087f31191b77986b01c95c585e4a4ba8d934444739deaa9e3d3","src/unix/linux_like/linux/gnu/b64/aarch64.rs":"302307ed471edbf613126b2183788a8d5c5d578631c213de81862d05881e5124","src/unix/linux_like/linux/gnu/b64/mips64.rs":"39e46439f89a41b3ac58247ed5f9b0071b0556a4432b36c91390518d3624e7b5","src/unix/linux_like/linux/gnu/b64/mod.rs":"71d893473ade2c7d6336d735c573430dc53d0f855970504ca5db7b3db203be8d","src/unix/linux_like/linux/gnu/b64/powerpc64.rs":"90f12954a94f85b6f777ae295d4f81ab05627e9a9a660e019876832ee6fbd6b8","src/unix/linux_like/linux/gnu/b64/s390x.rs":"e56e3779f0903ac20e420dfbe8939a1122853fc659b778bb3b8d37842e475132","src/unix/linux_like/linux/gnu/b64/sparc64.rs":"39edd23b8dd140d953a8fb521cf6f2e5313c0fc2f565a1c207ea53ecab7c5f98","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"855c1288837521b3a01b5920409e92b4e444564424f9e77fa871407bcc140fbf","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"9229b6d912bd89f55b258c53ae52b33dfc263b39bfbc34a660d277be57c2c84e","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"30f88d0fa9e7807ee4cbe89fd274061f810099567d5e68fa829277d7d27ba708","src/unix/linux_like/linux/gnu/mod.rs":"99cfa3a1bfa29d595505ab4d80a2090dda3f385ec1f49ed896166a1097cafe56","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"099620d6f239f12b9824ddb23687138053cce5642fa7d63ef4bcc78b7d48fef5","src/unix/linux_like/linux/musl/b32/arm.rs":"91d26fada3f7845b1ab7e97c26dc80cffa25d3ee2be0c5bff9de1e1cd5d73366","src/unix/linux_like/linux/musl/b32/mips.rs":"916a50db36680be4a88f210d34f95ad1f510c7c9cbdaa56b9de4c49b444c5cf7","src/unix/linux_like/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/linux_like/linux/musl/b32/powerpc.rs":"a8e651d67f5baa3033a0ce4d7ccf88c7f86208abd33edb57baf50d7358e2836f","src/unix/linux_like/linux/musl/b32/x86.rs":"4b289b27fa4fefe40265dddc6103c3f4eb93459440ab8058d301b3fbac8d8c17","src/unix/linux_like/linux/musl/b64/aarch64.rs":"2738e577ec6898d42d5d929d1d1a9d703442053c4b7e0afa2accc7e426adc710","src/unix/linux_like/linux/musl/b64/mod.rs":"da8c3caff213c322c3aa323b9c7e1b3db1f33e1ee496e789241df6a8a90f975e","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"10dc1809aebd7bde2fcf743153dcbc331257b373e659a9db4e9745cf115e4c7d","src/unix/linux_like/linux/musl/b64/x86_64.rs":"bca197efaa40ac23e7d3fd76c7d33477b70253c6bf5445de0348fd399ffa224e","src/unix/linux_like/linux/musl/mod.rs":"db253049dff6588afa44a6c0a2c4c3a2d4b4d015588e2d4e245585625b5405df","src/unix/linux_like/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/linux_like/mod.rs":"4a45bcaf295488b972021d91c58443a664fb00284114fc4dd8d885284b1e1faa","src/unix/mod.rs":"6b59a01adfff0f675fedf7c32e718315a67f4ccc1124a9d6a9b05b5f8805931a","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"0fb07669a9bb7849850c4f6507de3b73b34131e3a1cdbac421076c8a60fd11b6","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"d5ccf1a80b09bcd42a78804a3ad038f3bf90cce9b1b46b88e30f9c0a8dc2352e","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"b715246dd48adf4794e7b6dc2ec166c80561fcae42fa100c62ffca23b624d6fc","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"617f087ce7b6244633f8f80ac61cb2f1f4d793ba77b1edb2bfa24f1af470ab94","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"417a5ab4f9d6fd35bd08396b6e513da7edabf87ac97381f83565bbb1a166f9f6","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"1054d0bfeb506b3346b9a4148564beced8a22da0d9c9a612101f6237756795fb","src/unix/uclibc/mod.rs":"c0ab7cd511311e03e73bb76245d87ff85ce47e4526d3d44c5de9b005c33d2284","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"b1f529dfacc16810926d144ab317634922739b1aff18b7814feba0fc5c770cd6","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"16d282c830e7ed56c2cecc6affe88ac0597a94e392f295a707fbdf7951f5a723","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"} \ No newline at end of file -+{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"4f566bfdc168610f37b79d8671c1f9c6f084e0b6cfd40083eed544273e4ab1af","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35582cfa483e7676b25ae4a07064a19443f4942f5e60e43b91632fcd6ae95156","build.rs":"e9b7364366a5b4caa9daa436ab8a3469532fe63d5fae4d3b2e5ff59d32ff3f3a","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"037c1a3160ae3bc336f6f7135476704e7f5e834e4039fa02b37f03b507118945","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"db1936ed9e5ac6bd1c04329cbf12feb6842e2a00ca528ff8ccaf7c3b0a5ebe52","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"911d1249370cf1b0b7b38960cae28af1276f0f614cfcbf5174dbaa38be3dff1d","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"9d764e53df81416a5182b71a26402d2071fc0c15160103b6670b6b268fc356da","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"07bb3130ec198a6413db4dd3da2d3e5d1ab69584c274bc151302707e255c4386","src/macros.rs":"8232e284068d34336713535595fad3c910093346be32e72bde3d3d03327ec6b8","src/redox/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/redox/mod.rs":"34f132e794dc25bbb0e3c08b7f87e4508ce62e0aac00acf39dcdb0f246d7dfc0","src/redox/net.rs":"351960c3a3ad9b296fe43533cac429434e0872c8cca5ad5047dce79d82e009ee","src/redox/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/sgx.rs":"7ff2fbf3e5ad1c880014d68e012f4381a9b9140d13089193b9fba07a7f27c352","src/switch.rs":"fe1414ca053b73cf8a5f54448e807abe81c776c6ac0dfe47ea7772c8140f50b6","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"0095a17e49fa423cab8644c722a375b88f5c0cf56fa456b549738d98131bb2f9","src/unix/bsd/apple/b64.rs":"99fbd3e6d2c969080631e23f58deffa51cb3f42b7a08395b49556f19bb40d4e1","src/unix/bsd/apple/mod.rs":"d67234bd36d2d2ab84716f597af4245cb01fc92fee362a331ae4e0a4eb723faa","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"2cb0a5d10a3c5721d10209ad7ddc59f6756b2c1d4bc89450988053efad788eb6","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"4dcd712c0dd5470171746071a176391f937de7865dd0792173284992d9e3f2c7","src/unix/bsd/freebsdlike/freebsd/arm.rs":"84cf36223f0229cb383036563a4902731543e89b37e4dfe2f450cced566d8545","src/unix/bsd/freebsdlike/freebsd/mod.rs":"0752dc1097fd5e94aabfe7b6d4ead2b94e5c0540e2cd3c8efee883bba13e1a0c","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"9873f41843cbf066f6ffab8eeb63115095f81ce9fa8f337b95ec871e40c6565d","src/unix/bsd/freebsdlike/freebsd/x86.rs":"716cb67cd0aea66d4a8e40470d32b55cbfafddf75edd34a90f70d518c8c75457","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"dd3d8a546730f09b1ef0dfeeb20244eef01d1b4028799b28b3a0c33ae05d5002","src/unix/bsd/freebsdlike/mod.rs":"96a4baa8d7145ff29a9269437ce1fd538a18683488d85a677da78e17e070efc0","src/unix/bsd/mod.rs":"c59685127d6f238b9e9c967424c29da51668ab240e4a88962ab058e4498766b3","src/unix/bsd/netbsdlike/mod.rs":"3b32758ba7a5a133b045521c88e74f51d3718e9051f15ed66122d29267a51138","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"75adb8d6ee202d50487913c245e1a880447582f45e1ef6339743305a13fb5719","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"51dd68ca3c3eab0f1fe496b0dc12ad8b85f8cf964af0c2c95ab9834ad03938a8","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"c8d18b725c62c2f1a3c5e42d875e1a3b167c13a1bd6ae3d35f35a6ec29402f81","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"a3fb2cfc0e100c860dff1674a90693d57e66b7f12861155ceb42c2de372454bd","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"f3edcb2c6c0f8c68daebb1a17490684eae64a488570d1140bee1c2b384e25677","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"d97797fe66dd43c61f6f895596f6a57145b4c9ef61edd93c8ff9b497a2d28411","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"7229044b53c8a5cb1500a9ee4df550e97c6a9a04b680d1cccc1ca3009040699c","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"fb1c25abbcbc82fbb4842e442c9ead2710ccc597f1cce65ac12ad6f4d1f64856","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"05a714a785fa94a5131af3d59612ce1e9a5823b3327eb2a23de8ad0ce125c377","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"d3bcb20e70d29a450577c09706bb520fab09d0cb3102755736867bf8a957319c","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"220b041d7142abb9e54004b8a5468be9afe8ad87c87e1d76f0a05f9671697bca","src/unix/notbsd/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/notbsd/emscripten/mod.rs":"42947782f571b56cc1b1c1f4364bb35519bcc44ab8aca53bb13bfd46904de1e0","src/unix/notbsd/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/notbsd/linux/align.rs":"f2520d03b411519161eaaf043f1948b3279509a3f272b2958bca1d1aeda0434d","src/unix/notbsd/linux/mips/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/mips/mips32.rs":"96153abc38b10309e64cb49b1a1e4107be70dbc40bc54ba0372a4573b098b514","src/unix/notbsd/linux/mips/mips64.rs":"9bd96aa81cb0f536c3607d0a2906f4be7a44c3f89e40d5955a898835f04f0e15","src/unix/notbsd/linux/mips/mod.rs":"9a67a2f4043907a50a43569c06ffb4890aefa8db1c26a8737c6bb4bd3e39d90e","src/unix/notbsd/linux/mips/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/mod.rs":"e3531ef28589e4dfd9861f5bd0ba175200dedb69d48f20842baeb129fd8761e1","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"adf8bb67b47995760aab14f04ae671ebd8ecca5579e90314612f46cb79b30cc2","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"19197260a6d06ee521a5aa40a1860b7be33176d0f52bc92d56165fc42729cbd5","src/unix/notbsd/linux/musl/mod.rs":"13d766411fa206b987567e7c802dfe7585e6b7f002fe13ec0fbc810e522b7e2d","src/unix/notbsd/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/notbsd/linux/other/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"fea38039a1908ddeb90672b8ef246c743eec6758663a79aea401e21ef40a736d","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"017cb7cf2810bc633e21879a8951a2c10031c500648e5eb4accc6c88b58ecaa3","src/unix/notbsd/linux/other/mod.rs":"86d6c4f5a01b4da8cf9bbfa7f6fedbeda1c9b1c0528244ce9033a647cd0567d5","src/unix/notbsd/linux/other/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/s390x/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/notbsd/linux/s390x/mod.rs":"b01d158eefce4c31f377b63964d253f9934f7468af35a24474a163ad3725796a","src/unix/notbsd/linux/s390x/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/notbsd/mod.rs":"8aa3fc4d3879b6897871c55c4cb70ff7a63c399d2409a729cc788f21f987452e","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"0c6d148d84f2fa9feb86b464d30af9c52322553bf321ae4fe27184d274ccbe21","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"66d54a7028a422fe331028441d1b1f18cf34bb2deff2a9e5220384b6e10dcc40","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"d1a1af63b583b170d5c94b46a04589a11b9d4f8dc658ab8c74302bae656d0e85","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"d7c2b44735fe8a892fb05ab888de8311fc1f7a86f3aef818b7ff04fae70447fa","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"e322bdc14bf7f8c34de8fc4ea52fd6279bbc9d6c205efa8b9b8925e8b12c4b6c","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"2761f3f80c8af5c04e685af8ac3a2bc8c7d6de91cbad9b96a3a6dae67457a891","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"} ++{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"081d553ece666bafa6152dd34b800d373614516db3191b66a0edc56a36172015","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"04d4132d1039c1ad753fecdadd0b863bbc4e22dd7bc896db09acd125812f8b4a","build.rs":"ee4839872f6d0364101b29a7b7e9d5c2421f47cd0d752e1e52533f58ea489af1","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"b3ca0393f66ca803246e9b2dbbf9b6caadef2b7b7135412f3d914588b0630295","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fixed_width_ints.rs":"782b2b2aa6f471f2ebab220456ed681f76980c572f194ec3755ce76f27c8eab6","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"ce85ffc3da5629701331791d01574fdb824d58d36399cee7bf46118d61dcf935","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"aeda183662787a44c4bd26645cea76f31bf5f7c63d4d59118118c360705fb9eb","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"b1f365eacee0e4fdf3759143f8ee5bfa2e2555d1ff5b885b8b4600f10e0cdb80","src/macros.rs":"2407f3a2d5e3ae6224457bc793378aa35fc8d57bdc6c3d8024ace0ecbd9782f4","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"6249b9c891f89c74730f70b9f98f2b2c66676e5f2b2ffaddd13b63781f214f3e","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"b2bbdaed9f2006ed6a4a236d5683983307a3c1d229fc8b90dd53afb496ccf422","src/unix/bsd/apple/b64.rs":"dc895aa7d94c9bc6b01a0072708bbf23fceb212fdece0c81ddb73f985d5479e7","src/unix/bsd/apple/mod.rs":"d2a36fa92c1eaa93debfea1fc0a6998881e80d2d1e4cd03759915d8dc275cb9a","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"3ea47ead5855b98267bb931f47d8dad44a0418b262eaa999786deb0d7deb92b2","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"24da2062119597eca17cadcf40d2db93c0c765aeca3eb887c8d2c9534f567d8c","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"e528191e42977fa4c226d8850c47d3e526e951cca46ea9a4a87af40221f79d63","src/unix/bsd/freebsdlike/freebsd/arm.rs":"10fe01bc6269b47da72d1e9f8bdae2fcc7d4f332540e8ce1756e1f58d506bf8c","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bc9f26d046aa8471228c376fb79afb40936eb0ccf8c5dc2111600f7392ef77b4","src/unix/bsd/freebsdlike/freebsd/freebsd11/x86_64.rs":"deb18ce1991567f02831033cd41aca532277affc2e2d14e2966a9a22eb985679","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"f60c8895fb3e3d656eca41f0ed785b260f15b1c4aa8613a5c2b05e41cde27236","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"06b0355363d14ce7c9e7577b1cefbc12984ca7448f712519f9a29a758934db45","src/unix/bsd/freebsdlike/freebsd/mod.rs":"898a5f20d2c69406744ca5ef73acc13af6b1a07ade8361f659a1eee57eef9442","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"125457305b14309cbad4c46fd2fbd54e2f96d37adfec6c89ae9ed8cedfa015bc","src/unix/bsd/freebsdlike/freebsd/x86.rs":"4e0813f01a017dc148262d7c40dfadb964eb7eb6138dc2b0b83d0b51dbe4d467","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"841c64cda9601ad9b0320f01b2bafbd44cdcdd05ca5b90224f294809adb7d80f","src/unix/bsd/freebsdlike/mod.rs":"fc1a3055db220e816c1b0dcd06fd7d792c9c94d0f441779759fb507d63e4fc8a","src/unix/bsd/mod.rs":"939cd11741b845295b25c5cec3bffd321faa2ac44958a8dfdbf5d4be74331aeb","src/unix/bsd/netbsdlike/mod.rs":"6511a4d2b2a7869fdb55489db126eec89cfc0d8771cab6218319aef3e1be271e","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"b29bf6c8c581c6afa21d756803ae245d54ec7bd94777f97f0ecf3f0ad17d5072","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsd/mod.rs":"df51b11d1e96d44f34b8697b16b1162f582101ce56bfc12329047ca689b249af","src/unix/bsd/netbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"1f2da746cdd9683f62cd908fd3048b06d34277f512b7748ed283c01c4b703ff3","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"0e17a9f2bbde2d1b4e83bde0ef39826a25ef357f78dcd7e4671079faa1204799","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/linux_like/android/b32/mod.rs":"73c3482a4f3b200a6bc0a6562a281e4fe449488ee9bde1b430f2412ab2e32dc5","src/unix/linux_like/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/linux_like/android/b64/aarch64.rs":"37a6ad89617f88f45acbd990281b7557047be9ff4b167c435e9cd5e79859e19f","src/unix/linux_like/android/b64/mod.rs":"07b24a9d22731b44459e0533e6a12ffc72c45e9caee86df5263c44bf32def5ab","src/unix/linux_like/android/b64/x86_64.rs":"a6224d4cb8029eccae1549e602c4fc9847eac09213b4300ca65c6b07e8905397","src/unix/linux_like/android/mod.rs":"92ecca148375342e3a7c2c2e16030a340e2ebe153f89105f26f909da3737669d","src/unix/linux_like/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/linux_like/emscripten/mod.rs":"573a180c604d95e80cc72e5bca8ab5d8bce9298951a3979e22afd7c4edd7c572","src/unix/linux_like/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/linux_like/linux/align.rs":"85acc1c7e3701d4b1cad1153798022ad8a3a5c9ae9454fb741237cc15e354ac4","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm.rs":"5848e7e40d63b0f3ed888e479f441a360d5d707498d08237bb2a1c19ae351c4c","src/unix/linux_like/linux/gnu/b32/mips.rs":"172811216a8f2fd0d8b4b8195dbd7f426c02939355d17c9850f592deef701df2","src/unix/linux_like/linux/gnu/b32/mod.rs":"7f358e0a62cee1d375f212db2bf4f24b6f14011d6429be2d2f5e8ca0adcff05b","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"7975df6a52064979d0be2a6f5e216c411994420650972086e8ac4f5c43abdac1","src/unix/linux_like/linux/gnu/b32/x86.rs":"a24ee8115121d087f31191b77986b01c95c585e4a4ba8d934444739deaa9e3d3","src/unix/linux_like/linux/gnu/b64/aarch64.rs":"302307ed471edbf613126b2183788a8d5c5d578631c213de81862d05881e5124","src/unix/linux_like/linux/gnu/b64/mips64.rs":"39e46439f89a41b3ac58247ed5f9b0071b0556a4432b36c91390518d3624e7b5","src/unix/linux_like/linux/gnu/b64/mod.rs":"71d893473ade2c7d6336d735c573430dc53d0f855970504ca5db7b3db203be8d","src/unix/linux_like/linux/gnu/b64/powerpc64.rs":"90f12954a94f85b6f777ae295d4f81ab05627e9a9a660e019876832ee6fbd6b8","src/unix/linux_like/linux/gnu/b64/s390x.rs":"e56e3779f0903ac20e420dfbe8939a1122853fc659b778bb3b8d37842e475132","src/unix/linux_like/linux/gnu/b64/sparc64.rs":"39edd23b8dd140d953a8fb521cf6f2e5313c0fc2f565a1c207ea53ecab7c5f98","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"855c1288837521b3a01b5920409e92b4e444564424f9e77fa871407bcc140fbf","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"9229b6d912bd89f55b258c53ae52b33dfc263b39bfbc34a660d277be57c2c84e","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"30f88d0fa9e7807ee4cbe89fd274061f810099567d5e68fa829277d7d27ba708","src/unix/linux_like/linux/gnu/mod.rs":"99cfa3a1bfa29d595505ab4d80a2090dda3f385ec1f49ed896166a1097cafe56","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"099620d6f239f12b9824ddb23687138053cce5642fa7d63ef4bcc78b7d48fef5","src/unix/linux_like/linux/musl/b32/arm.rs":"91d26fada3f7845b1ab7e97c26dc80cffa25d3ee2be0c5bff9de1e1cd5d73366","src/unix/linux_like/linux/musl/b32/mips.rs":"916a50db36680be4a88f210d34f95ad1f510c7c9cbdaa56b9de4c49b444c5cf7","src/unix/linux_like/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/linux_like/linux/musl/b32/powerpc.rs":"a8e651d67f5baa3033a0ce4d7ccf88c7f86208abd33edb57baf50d7358e2836f","src/unix/linux_like/linux/musl/b32/x86.rs":"4b289b27fa4fefe40265dddc6103c3f4eb93459440ab8058d301b3fbac8d8c17","src/unix/linux_like/linux/musl/b64/aarch64.rs":"2738e577ec6898d42d5d929d1d1a9d703442053c4b7e0afa2accc7e426adc710","src/unix/linux_like/linux/musl/b64/mod.rs":"da8c3caff213c322c3aa323b9c7e1b3db1f33e1ee496e789241df6a8a90f975e","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"10dc1809aebd7bde2fcf743153dcbc331257b373e659a9db4e9745cf115e4c7d","src/unix/linux_like/linux/musl/b64/x86_64.rs":"bca197efaa40ac23e7d3fd76c7d33477b70253c6bf5445de0348fd399ffa224e","src/unix/linux_like/linux/musl/mod.rs":"db253049dff6588afa44a6c0a2c4c3a2d4b4d015588e2d4e245585625b5405df","src/unix/linux_like/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/linux_like/mod.rs":"4a45bcaf295488b972021d91c58443a664fb00284114fc4dd8d885284b1e1faa","src/unix/mod.rs":"00df62c5b20df3a21f3d52411649eeb3c2cb854239fd0fcb96fce470629a5eda","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"0fb07669a9bb7849850c4f6507de3b73b34131e3a1cdbac421076c8a60fd11b6","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"d5ccf1a80b09bcd42a78804a3ad038f3bf90cce9b1b46b88e30f9c0a8dc2352e","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"b715246dd48adf4794e7b6dc2ec166c80561fcae42fa100c62ffca23b624d6fc","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"617f087ce7b6244633f8f80ac61cb2f1f4d793ba77b1edb2bfa24f1af470ab94","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"417a5ab4f9d6fd35bd08396b6e513da7edabf87ac97381f83565bbb1a166f9f6","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"1054d0bfeb506b3346b9a4148564beced8a22da0d9c9a612101f6237756795fb","src/unix/uclibc/mod.rs":"c0ab7cd511311e03e73bb76245d87ff85ce47e4526d3d44c5de9b005c33d2284","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"b1f529dfacc16810926d144ab317634922739b1aff18b7814feba0fc5c770cd6","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"16d282c830e7ed56c2cecc6affe88ac0597a94e392f295a707fbdf7951f5a723","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"} diff --git a/user/rust/0032-libgit2-sys-abi.patch b/user/rust/0032-libgit2-sys-abi.patch new file mode 100644 index 000000000..f4f3fff8e --- /dev/null +++ b/user/rust/0032-libgit2-sys-abi.patch @@ -0,0 +1,37 @@ +Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 +From https://svnweb.freebsd.org/ports/head/lang/rust-nightly/files/patch-vendor_libgit2-sys_lib.rs + +--- rustc-1.38.0-src/vendor/libgit2-sys/lib.rs ++++ rustc-1.38.0-src/vendor/libgit2-sys/lib.rs +@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { + pub push_negotiation: Option<git_push_negotiation>, + pub transport: Option<git_transport_cb>, + pub payload: *mut c_void, +- pub resolve_url: Option<git_url_resolve_cb>, + } + + #[repr(C)] +@@ -385,8 +384,6 @@ pub type git_push_negotiation = + + pub type git_push_update_reference_cb = + extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; +-pub type git_url_resolve_cb = +- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; + + #[repr(C)] + pub struct git_push_update { +@@ -2233,7 +2230,7 @@ extern "C" { + source: *const git_tree, + ) -> c_int; + pub fn git_treebuilder_clear(bld: *mut git_treebuilder); +- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; ++ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; + pub fn git_treebuilder_free(bld: *mut git_treebuilder); + pub fn git_treebuilder_get( + bld: *mut git_treebuilder, +--- rustc-1.38.0-src/vendor/libgit2-sys/.cargo-checksum.json ++++ rustc-1.38.0-src/vendor/libgit2-sys/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"b709e77341081de5e34db50729c6826a578f320c2a9f5d81b7284a56019d3d09","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","build.rs":"27933b630cb17fc4f6a1f6bc37ff3cc90a9ab6135b9fbe2b2d2739ede5989164","lib.rs":"9b0c3121e3d7fa08ba16309165c31358167c3d8f4f64972049c0681243b5cc63","libgit2/AUTHORS":"d7d4f16a8e4303cc515fd4410b2c64b7ded924b1e8784a125d15195555e986b2","libgit2/CMakeLists.txt":"bfbb833581dff2cc7b5a1d3289a901d1e299cb3f1be42c5378fe2d357d700d74","libgit2/COPYING":"afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42","libgit2/README.md":"b0dfffa6e8fd55bad09c7d5febae66532042dc8ec2a62da4c23e0cfbf82476ac","libgit2/SECURITY.md":"566da5b3e26904232486c2b7107a1ebb0dc90e8eb2f32b9468d0da41e1cd5543","libgit2/api.docurium":"c77dc54504945864b3270877a9ddcabe85d6d1a742c07232f6faf847958c0dd2","libgit2/azure-pipelines.yml":"0a5df837569a4ef6e87ee91bae81c01c17f69575d5e522118089bf105135761a","libgit2/azure-pipelines/bash.yml":"e05b1f9e4ccba24fb03107430c54302e89a9784943830589d183f31aab178c32","libgit2/azure-pipelines/build.sh":"8def8c219506aee6fdf49bed20f963faf6a2f248be20aa86f901eea7075cf578","libgit2/azure-pipelines/coverity-build.sh":"744239da1e6c88096821bede9f9fc9ccf25f94d8c3213520a0d15a40b9c108df","libgit2/azure-pipelines/coverity-publish.sh":"537ce168698d02e84260af73f3a0e627c5842730bc134de34b807b850108d4e7","libgit2/azure-pipelines/coverity.yml":"369f63a0470aeba9f9e5d94e10def2e498f1e50962dbd467e3905d2238cdaa06","libgit2/azure-pipelines/docker.yml":"48b6691f14ede0d67b2d54cd95b104ebdd0f78dc689c333f1b3b327c3fac9574","libgit2/azure-pipelines/nightly.yml":"4c69c2c76a534accfd2f580d52ebd2d0a9540d0e239941c8f6b873dc2a70ebab","libgit2/azure-pipelines/setup-linux.sh":"9dfb203689438473c0efe8cd45d7d64855023bed9e0d4a2a90fe5255566f5f66","libgit2/azure-pipelines/setup-mingw.sh":"ccb61d09c1bc7cdcf802c6edd41b174699c1cffe1305982aa92d70d45eeb5139","libgit2/azure-pipelines/setup-osx.sh":"ae394f829b323461ed611f75c36124a392855bb3fc8010f443bab6b67ee86a87","libgit2/azure-pipelines/test.sh":"c3e1d86e03b7f53b8010d183b9876a8e5a43ce8b729d93222b02e88ebde2751e","libgit2/cmake/Modules/AddCFlagIfSupported.cmake":"6c2fa4ffebe595428f06d8332330e832c7c7352a006705ac811621b9b4d50f73","libgit2/cmake/Modules/CheckPrototypeDefinition.c.in":"9ebefd8410cc69c52e2f5e450a13269307567f0b5a5b5b02694b180dffb30167","libgit2/cmake/Modules/CheckPrototypeDefinition.cmake":"a78c83e4b6da0dfc5307254592162e75abd4f4caa7e8ff1f3a85429358e6a617","libgit2/cmake/Modules/EnableWarnings.cmake":"e98c7d862caf629dbefdd2a2911b636cfcd1e3a08902fef01a87335b87328fc1","libgit2/cmake/Modules/FindCoreFoundation.cmake":"8e1ace5fe47ea5a457855cad091a0641f7311537bcdf71a1b16ce58ac9952f9a","libgit2/cmake/Modules/FindGSSAPI.cmake":"eda9f076dc7aaed50ab81734110c3a15c80b1ed15cbf8d4ab742af166e136410","libgit2/cmake/Modules/FindHTTP_Parser.cmake":"ae7c457f673470a1e20397667555778515e5b5dd4263d3ed8816c7ac5e67d5a5","libgit2/cmake/Modules/FindIconv.cmake":"3ab0b707bb56daf770d74231d0530883296b28c61e8a99444c928db47478f929","libgit2/cmake/Modules/FindPCRE.cmake":"b94df6fd44724b5d8cd968d4f4353adc5eb035e5dfcc46b698d7d6bbab059b69","libgit2/cmake/Modules/FindPCRE2.cmake":"a98eecc6e48947de0f36aa10d8a7f5941986492a6a50fd031e5d87b3957758a0","libgit2/cmake/Modules/FindPkgLibraries.cmake":"9132bb80cb6d9f7925be275c4a267f91fef82b383e9f0f1214b5e4726c76567b","libgit2/cmake/Modules/FindSecurity.cmake":"ccc6fd877175e4319fb972942ec4775457f4437357e74895298ec9e236244fff","libgit2/cmake/Modules/FindStatNsec.cmake":"92dd6a058ecb45ce0fe294031f592383100baaeed6d84050734baf396cac4f47","libgit2/cmake/Modules/FindmbedTLS.cmake":"dddc209a1d02b7599d4bb6a49cd4315fabe32c816190fdb0abfd5c214a470362","libgit2/cmake/Modules/IdeSplitSources.cmake":"0fd931f46f32392f2507ff0ffbdc66c51dc415fe00b72ef44ae3c4776fab1074","libgit2/cmake/Modules/SelectHTTPSBackend.cmake":"c08c1aa1e9a4e61f9f913b4f969bde42d9531c50720a856a04b1f8b3ea0e9fa2","libgit2/cmake/Modules/SelectHashes.cmake":"dc3945858da6c2fcb5cc9f2bfb17343c60e162fc80c9d7853dfe09857bd50d70","libgit2/deps/http-parser/CMakeLists.txt":"5d606f3ef349fed9f555ddb45c4e893d1aee6002f1beaa3c47b4d305c32c9576","libgit2/deps/http-parser/COPYING":"2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87","libgit2/deps/http-parser/http_parser.c":"80930f8b6c15827a3ae571e77ddbdccca366e8f6c98874062cb8c0c6dc877ee2","libgit2/deps/http-parser/http_parser.h":"d3fd211486e4352f57a47e856a5a10dfce06c46211119d0f6d9935713d2ad08a","libgit2/deps/ntlmclient/CMakeLists.txt":"494792dadd723e57e73e6d34770ad62687b81181a69e66696e93a5ee82187ebc","libgit2/deps/ntlmclient/compat.h":"28c0d6a79a98311619886106928161154d8d30fbae4d975363948542a0a3864a","libgit2/deps/ntlmclient/crypt.h":"8037a8b1f4066a6459b7d3bb87fba0840ad11b82a75ec28ec047055df566adfc","libgit2/deps/ntlmclient/crypt_commoncrypto.c":"f572238c92ae8c3fef63f8ed7c3932976016565647994659feccfcdd91764f4b","libgit2/deps/ntlmclient/crypt_commoncrypto.h":"ce71d0afc3434aba6e6d501d4cea7b0b7260d34499b41251cb2263cb0b968441","libgit2/deps/ntlmclient/crypt_mbedtls.c":"2446615bb0556331acf109c41970a4dc95db3c07c1f7906753d266d2d699b578","libgit2/deps/ntlmclient/crypt_mbedtls.h":"ca64a3511eafd516b27354aa713623e53bbed475b01cd6989e4f9ba7b28b84b3","libgit2/deps/ntlmclient/crypt_openssl.c":"30686ed81c2f7e2f00a2cb12fc08a77ce14bab0e5e79c9441c7a82fa3bef46d6","libgit2/deps/ntlmclient/crypt_openssl.h":"6b436be864780013af7257ce917f96a8a03c4b520189982fa64900867b9bf730","libgit2/deps/ntlmclient/ntlm.c":"860de6c763efcacaa7f708f234d698721c154a420094f959e128e0d0aec2d36f","libgit2/deps/ntlmclient/ntlm.h":"bfc570598a36dd463e3b304c2309b00aa2e5ea453bdb15847b7e99b26d0838a8","libgit2/deps/ntlmclient/ntlmclient.h":"365ba1d3c8c745e176697726029123a6263cf9cba44b125b7ff99d72afc3fe9b","libgit2/deps/ntlmclient/unicode.h":"8b37d53c6ddcbc4072dd103cd9b50a1524db25d19e340b1d60fbe7e9bac7c583","libgit2/deps/ntlmclient/unicode_builtin.c":"85c57f301a8f0f46de7cc4fb5a45117f056ee808b1798c9fd6ad8b4f5d5acb9c","libgit2/deps/ntlmclient/unicode_iconv.c":"dc00df55970e7cff5c97cc201acb35e1881b58c3abfcb546511bdcd011fc3805","libgit2/deps/ntlmclient/utf8.h":"0b57540746cfe500009216ba3bb7bcbd1555c158648ec82fe26f16bef75adb97","libgit2/deps/ntlmclient/util.c":"5961cd25fd61ec503b2a8d4901b55214782a825b8cf90331122ab2d7767181e9","libgit2/deps/ntlmclient/util.h":"70c768d11767ab0901b4eb9701a669e0d5601ba421fd0fd82dc34246cd5bf9bb","libgit2/deps/pcre/CMakeLists.txt":"f6c89cc6c4b33e2dd24e1ee33b5af92eb89ffe52075d089eef439c9d6be8c9cf","libgit2/deps/pcre/COPYING":"17abe1dbb92b21ab173cf9757dd57b0b15cd8d863b2ccdef635fdbef03077fb0","libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS":"46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b","libgit2/deps/pcre/cmake/FindEditline.cmake":"44788ac3e7c8c4b4da3e5e0f467c7ee49de7ba9e1c13024dcf1e2501f8fe9684","libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake":"aa3ef1f1c8742da54813aab0ac58c71edd1e58cd3b6b157b856bfd525adc2e5d","libgit2/deps/pcre/cmake/FindReadline.cmake":"055e1df8bd29e6837d8ebb8c15dd5dcb28c88e23aabda8538b76a249dff829b0","libgit2/deps/pcre/config.h.in":"480e3e1a1eea810516e59f19375575e83f62980d20b9cfc990ecf8e8cb17f79f","libgit2/deps/pcre/pcre.h":"e83e434fc470e3f985659b5b400bf9f2d818bd2e122583ef52ffe5e914fcf09a","libgit2/deps/pcre/pcre_byte_order.c":"4030a1156da8690352226b5de2c9c5f52cc6955409e4a7ab9ba4d6b223e74b3c","libgit2/deps/pcre/pcre_chartables.c":"3386fd60b4a4175a7baf474223522540abd6e006e8507a04d3485f84973424ae","libgit2/deps/pcre/pcre_compile.c":"b8eada6b71d793713189e16037148a3ac77beaa29cb90357b3171ac588289f81","libgit2/deps/pcre/pcre_config.c":"fb9e1e766291b2b4b3066ecfd0795db398762b9597fb2af23cc784617984609e","libgit2/deps/pcre/pcre_dfa_exec.c":"1cbf3a680388110bddff833983d3653630eedf6e6e9d9e656a737e3b85de9dd0","libgit2/deps/pcre/pcre_exec.c":"2a6871b9a56de682ce28a467d26b42caf71f4323e44b555db720cd51c0f2c505","libgit2/deps/pcre/pcre_fullinfo.c":"a84fc4cb4d22b2ddfcd4d0f0a0ff333cc9f623e1fbf2a7c90623a212e0bde54d","libgit2/deps/pcre/pcre_get.c":"c93ded768f96cc392f911776e6d993b565114936e08247dfa79080b35dada4e7","libgit2/deps/pcre/pcre_globals.c":"8b2fda23b42715eff2f01188c4911dd8453868ff77fccfe34b99126aa775fa5d","libgit2/deps/pcre/pcre_internal.h":"f713de1fa2c20b5414f6746c80d10878ab48c9186462b074c5bb6a74a822fa80","libgit2/deps/pcre/pcre_jit_compile.c":"d014f896dc55365ac48f481067a048a36117fba48fdad1379eda46807f84fb67","libgit2/deps/pcre/pcre_maketables.c":"8564fab861c7eb4037ffcd53fda789a747a30c4a462f460a5ef824f534fb06dc","libgit2/deps/pcre/pcre_newline.c":"3163ed2193fa74d8cc9e1db2bba672bcebf8efe85c2465cc0aefda51966bd929","libgit2/deps/pcre/pcre_ord2utf8.c":"fa926e32ae8d6e5610c500e7b6971a5149765a1881f798b18904a0a88bf549de","libgit2/deps/pcre/pcre_printint.c":"71751d151efbe935e9d8bbf58bbe143d617b34acd13d1bf237330c7c7736c422","libgit2/deps/pcre/pcre_refcount.c":"0dd8b7273243545fdafab585890fa12e210cf526030eb6b877325ce89250fa39","libgit2/deps/pcre/pcre_string_utils.c":"b83225f9cf2658654d6a0af01199050f6fb36d903041b33cd4d0c06e762b66df","libgit2/deps/pcre/pcre_study.c":"f5285714b59af9503dacff268cb37ab4944fbdf74a78c5a7b9bc49043a00ba40","libgit2/deps/pcre/pcre_tables.c":"fcdd9f705a7a1640ae5e5e5b7148761fc5e82896d84b1a287dd7e55b8b87eb15","libgit2/deps/pcre/pcre_ucd.c":"b35ad7e532f52c5fb1f4ab1d48f5d80618abff2a115099220d95cd13ac64c346","libgit2/deps/pcre/pcre_valid_utf8.c":"4265abf04c03acba9ea90351da662eb89aaed79e7eef03329ccf030ef28ef907","libgit2/deps/pcre/pcre_version.c":"5bb67c3373a934a2d9263ba9f9fe3cd79e381e6aed8507e5319202330bc5275e","libgit2/deps/pcre/pcre_xclass.c":"b2c3b2c7600e18e562a333df017ee35c69233e9427b866726d944122a9560e28","libgit2/deps/pcre/pcreposix.c":"1fbdfce483e2af30c2791023c0b55ca75b23595543e62e0eeff5287b104551d0","libgit2/deps/pcre/pcreposix.h":"85a6a09b806d8506e5710e9862b6716b2b88761abe0d05aeda5071257537d9c3","libgit2/deps/pcre/ucp.h":"ea98e4eb999d8e777f2ba709e68b5aff7108a4eaa169f4eefa4510056551b724","libgit2/deps/winhttp/CMakeLists.txt":"6c641c08d2cb1719c533ac20577f317bfc5ecf27e4ffdd0ea940e26e25dfbf2c","libgit2/deps/winhttp/COPYING.GPL":"d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813","libgit2/deps/winhttp/COPYING.LGPL":"dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551","libgit2/deps/winhttp/urlmon.h":"6cdb0f5ce5f0aea2daefc44c4806697ed31ad759f8baa18fb38a5b220ddc7d7f","libgit2/deps/winhttp/winhttp.def":"89601b95ac2515619426ea52ca093fac1a16ef0bfb5586c1385a028947ab6513","libgit2/deps/winhttp/winhttp.h":"a51828d65b1b260a727f596c41cf3257cac2ef6cfebb11726234fd7ccb1537f6","libgit2/deps/winhttp/winhttp64.def":"7cd0bc8dd2c06d288c241d175da06146e940c28d7201fb63de8a75730d09fcd4","libgit2/deps/zlib/CMakeLists.txt":"abc8b7178f398b88591e04b1df9e8a2389c6705fe9e1607d96afc580a5c38018","libgit2/deps/zlib/COPYING":"864943392878a2479350e12a04f6e8e0ae434b5573bae350823c4d6c4474c755","libgit2/deps/zlib/adler32.c":"47a05d4213c9694e821027225aa8ccf5975b58d7ecfd2877008b44dc8f53983e","libgit2/deps/zlib/crc32.c":"0e842875b2822122efbf822a15483ccbf0cf2d1a39f21f70a78492738f7f2fe5","libgit2/deps/zlib/crc32.h":"407af59d0abfea84a6507c603eb29809411797f98249614fe76a661def783ce1","libgit2/deps/zlib/deflate.c":"11fd6b0328b65c4ad4b5c204d892a97a9083628a7e77dc47836c8e0c799f8da0","libgit2/deps/zlib/deflate.h":"0ca7fb0cf1dd63001c6e9e4ff93c8dbff2fe521199be51a4dda38a11b44919f6","libgit2/deps/zlib/gzguts.h":"1ef4741cf10441feeca5c8dde2b6c754f0cbd96fcae697d54a604757289a5e9b","libgit2/deps/zlib/infback.c":"abe44873b5af2ea68ea1d281d915b2800f1832f846d2c05442a4711adbe6f269","libgit2/deps/zlib/inffast.c":"4d496ab2a3d29df5fadc3dbff6067e039806aaceae6cfcd09ea77d46c2b848fd","libgit2/deps/zlib/inffast.h":"7d8c1c873ce9bc346ad6005bb9d75cce5c6352aaf7395385be216a9452a34908","libgit2/deps/zlib/inffixed.h":"237ba710f090e432b62ebf963bee8b302867e9691406b2d3f8ee89ee7bfef9b0","libgit2/deps/zlib/inflate.c":"8b6c599c3563c14c447c47db0d7dc9a16e8c246a078ec95a169ddcebaaebd811","libgit2/deps/zlib/inflate.h":"8ec9ac297790276f7e46a961d4c6f9f944fb1dec92401339ec2666973cc5983c","libgit2/deps/zlib/inftrees.c":"1960ca67384376f65b6ce8c08fdb501f8eb33923e11ef5f61a855708c6cb0a8a","libgit2/deps/zlib/inftrees.h":"c510b36402784b1f898be3b049b923469aa92701de2d9195aed19f6b65c0dce2","libgit2/deps/zlib/trees.c":"f2a5f949ea70dde7c23a54c793aeed630a03df4bb72417cd3aa008000c44699b","libgit2/deps/zlib/trees.h":"bb0a9d3ca88ee00c81adb7c636e73b97085f6ef1b52d6d58edbe2b6dc3adeb4d","libgit2/deps/zlib/zconf.h":"9c0087f31cd45fe4bfa0ca79b51df2c69d67c44f2fbb2223d7cf9ab8d971c360","libgit2/deps/zlib/zlib.h":"4ddc82b4af931ab55f44d977bde81bfbc4151b5dcdccc03142831a301b5ec3c8","libgit2/deps/zlib/zutil.c":"f7fdc9ef326a2683eb33c794face54e83c751ec17f3d1ba581847a62af36ddcd","libgit2/deps/zlib/zutil.h":"9a63f6690fac1620aa3cecee5752af618806da438a256b4a047fbcd289cac159","libgit2/docs/changelog.md":"56f630a19ffbcd1f2f2070500fd7d85e5baa15adeeb5d40b5cb8d780d3078b23","libgit2/docs/checkout-internals.md":"221b9821d89ef60b6b71d5c6b80200bbd911895649bb4961b3dcaa4f5c32d8c9","libgit2/docs/code_of_conduct.md":"bbb42da81b2c2261fe2781d22179224c5e203144535d33f49a61d4ad322b2217","libgit2/docs/contributing.md":"3cfc5254abdb4db04926d420c0e8c1a44bf2d0a3327528ccb3521cbb49223ef2","libgit2/docs/conventions.md":"b1707aead63c217fbdfbfe5d29257a5324bcef95df8f1fcec0d0a785c65c1cdf","libgit2/docs/diff-internals.md":"4186480a0882c2ba6177e940be9f04d804d7206cd51467e8226aa964bc090753","libgit2/docs/differences-from-git.md":"30c36445bca9a377db72bd2ffeddf68d392a61fbc60561f17e3590873a372e02","libgit2/docs/error-handling.md":"d4b0a7e66b7f289ba6d16cbe08899326646be8d2ed33aae5884a23fccbad57e2","libgit2/docs/fuzzing.md":"f933b83f82b8d3145b6b045d7539b6ff11724c76ee8eb96d91592b42da4781f5","libgit2/docs/merge-df_conflicts.txt":"1d22b5791b72b4c084244888eea37b80b4f0a1dcee9d76991edbc18ecb1df057","libgit2/docs/projects.md":"220fec1464316bc7efcae1bdbe1057e7e53a56cc0ca8cc565ce1e0df73580cb1","libgit2/docs/release.md":"ebc2a3f234c987e348f3f59c62d3791af1070992639f10b8e38ab6a0ef546e80","libgit2/docs/threading.md":"3ecf0560141ccf2814d93f73fd26390e45e173e3c6841c1ca5c07d8c53ac6413","libgit2/docs/troubleshooting.md":"38719af0af50ed2c328c692fe9521f2fe46eef55381b5a4d0346b2a10f501a5d","libgit2/examples/CMakeLists.txt":"899510cd04b24af25ef75fbec48e1ca8cc09f71bf93082f19a53bf4cc9f4fb0f","libgit2/examples/COPYING":"a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499","libgit2/examples/README.md":"418026aef6c3f2870b7c000df5b4cd7847f644f2fbe52dc9ea0ccacbbe37cd64","libgit2/examples/add.c":"48e33612ae6570b3ba3a123a16189819c6e292e64a9ca0e3ff578f5afc15eaed","libgit2/examples/blame.c":"9d75ef2b5e9923d85bc6efb4163722c274ae2a0fabf0b67bcf7670afeed44be3","libgit2/examples/cat-file.c":"453c970d320c5e57821986efadbc39bae1fb2f1c985e6b0708d1878cf5cdf211","libgit2/examples/checkout.c":"35e50e65bfb237965b9fb891a5e62044dc0b86c68840d6fd5d1f1ba6d0c84509","libgit2/examples/clone.c":"7ae0dd13b987fc1a372d7cc64603c4f0274124cd9ff96f82bd51585b8c4642bc","libgit2/examples/common.c":"03e87d15e256477b49e34c1780dda6995560ca77a916631956c9a7d8be72e342","libgit2/examples/common.h":"dbb3f1f9a66386b206e41585b8a020f0b9181716bf7d4fa92b1679b4e483072b","libgit2/examples/config.c":"43962ad38ceb56a96c36fd143a3219612907d54734ddb680e2fd0cf743974337","libgit2/examples/describe.c":"0970388d3afc3c27f0fbeb1a5eb3439ff4361a718b4a67ea2e70b1f7f4195575","libgit2/examples/diff.c":"7820c56f6fef841ead2e41fc620bfd0f68aef5c6c4d85f39286d584d442703fa","libgit2/examples/fetch.c":"efd4cea0c903573773870ab87b5cab41e5bb6788a33018414d159b56421643f0","libgit2/examples/for-each-ref.c":"a83b67cf6bb3782d732bfabbed8a8e7d6531a58daed4c077bfffb78aff9af97b","libgit2/examples/general.c":"5e46e6de31a93321ca963dee9ede0f436cd75edd77d400321a8cec1b46973d34","libgit2/examples/index-pack.c":"23e5ef954f128d97a2b60901587e49bd28ca53e3206de4f069fe4d617c2da525","libgit2/examples/init.c":"0a222d517a4c31c68fa9a427f64894e12e88e488c6b535d9014ff995888e33f4","libgit2/examples/lg2.c":"dac3bd396a3efc1f9ad8ab0f61f3567b2a96cd563e16e40ec546e8d9f9d7fb45","libgit2/examples/log.c":"8d5208854530e497fe2f28aa71326e1eceacc1d7395b72e83d6a84d7ede73af7","libgit2/examples/ls-files.c":"0fad182dc579caf7984140a6aadd01dfc11c46d2bea282e6e73e0046bc3ae559","libgit2/examples/ls-remote.c":"5cdebdc24ff4a07657da50137fed2031f9084567f2050907219bb3dcb0b9a645","libgit2/examples/merge.c":"240564109b712ed36fdce863bfe34e7cd69022ed04e68706477821e6098587af","libgit2/examples/remote.c":"c888ab7c04090303f9062880fcd855f03a554a501380717f0ca7a1ec7a274a26","libgit2/examples/rev-list.c":"95594807e980779da2ab63dd89fb77b092705cce895d7b4ef100389bae49c366","libgit2/examples/rev-parse.c":"dab1ec057afdf12a22b112005c24ff717ab28ff3455cf1da47f8c2d8a217efea","libgit2/examples/show-index.c":"8f3742413429869e7e4e4334933c71dcb58bb571dcf4f76461fd77bd946f8656","libgit2/examples/status.c":"9143c897090fa59f8d75fa9c9312ba9c7ce40cc575f268affadc4f02e62ce463","libgit2/examples/tag.c":"4f8792e6f3426bfcc8b452f1a464d91af4506bc9685cb211a9970a3847ff2ffe","libgit2/fuzzers/CMakeLists.txt":"db67c2dbdb4f7486dcbe9e6848dcf1bcd9d5159dc91c93711c52d5a4f558122c","libgit2/fuzzers/config_file_fuzzer.c":"caf8a146c5b2398b360b2b2be675b5ea16af4c9a8ba2b8db682241666ebafb92","libgit2/fuzzers/corpora/config_file/git2.dat":"dc7279649a38a8c9fa9c859db5f3d804f4295f987d65319e3c2a7599e5379d5b","libgit2/fuzzers/corpora/download_refs/clone.dat":"dd2d1d94c97d7922eeb46b8f3929c60a287ab207c04cb4ee42996a263044f01b","libgit2/fuzzers/corpora/objects/blob":"7c35c725ea9288083740ea6b4c23bc92b143f82a0ca88b16506518b14b8f2934","libgit2/fuzzers/corpora/objects/commit":"8ea04ab56b78a68e3bccd0c98381ea82465e9bb2e4ef7f34228c8e3ba5dded61","libgit2/fuzzers/corpora/objects/tag":"ea7433d733b2b023a637912d00344a58d1ff32beb9b80d52dd81881a60a2cc98","libgit2/fuzzers/corpora/objects/tree":"ff780663747cd2aab987830cb72aef5e1dcc66325fc0ba3a53056e99403e1e6b","libgit2/fuzzers/corpora/packfile/004bd06c91c0dc8ab7e963f4b5e87be00292911e":"53bd8407a18fe3aed0680e230707d6e13bf0d3874111e75b299bf94940f67a26","libgit2/fuzzers/corpora/packfile/00b67414c7b17916b3bd0a3d02284937fa0c4378":"478db1c2dda7b9a110a7a576454e4dcf9f3ca3bacbf21f8813de81aaf5619333","libgit2/fuzzers/corpora/packfile/02eaeb43f0ec7dbfd91bd75e7ddcc7fd590dbc77":"e76379873411c1eed3591cc3eea3e26c9e293f9064f777957cfa4b6536fc538d","libgit2/fuzzers/corpora/packfile/02f4286569be24124d8ab209733b7492f7560310":"e3b9c84ef171ba753b8b5a1025bba400c7bfba38d28799ff0ce623727e748efb","libgit2/fuzzers/corpora/packfile/037ba5f9d6d695aa4739810f8bea6e795c1d7614":"2839cb89e35f3ef5a81c7c2424d37b8d8eb37c8a7dd815ad29628ab7de5347b4","libgit2/fuzzers/corpora/packfile/038e06289ac876f109fc12ca4b8284497ca26821":"ada4b1da277233b00aff0234dd58bb3272310094be8731748ea2e186cbe11f9a","libgit2/fuzzers/corpora/packfile/042dc4512fa3d391c5170cf3aa61e6a638f84342":"de7d1b721a1e0632b7cf04edf5032c8ecffa9f9a08492152b926f1a5a7e765d7","libgit2/fuzzers/corpora/packfile/044bf19babf3f9cde07adbfa2a45c7508538cbe8":"2812d369d21d23341a09e9096fc09230bf8f43a31c78829e736cc8345306762c","libgit2/fuzzers/corpora/packfile/044e12ea43bee3c4befe27ba4687bee98d505fd7":"92e2000f3a1b17f88fc961b602d03984ac45ae834419dd792ff7c23416f908b5","libgit2/fuzzers/corpora/packfile/061fb208431db793bbd3645b7a16058a1e2a2412":"281c93990bac2c69cf372c9a3b66c406c86cca826d6407b68e644da22eef8186","libgit2/fuzzers/corpora/packfile/06576556d1ad802f247cad11ae748be47b70cd9c":"8c2574892063f995fdf756bce07f46c1a5193e54cd52837ed91e32008ccf41ac","libgit2/fuzzers/corpora/packfile/06ceea0c98756d302c302410fffe0dc54a055486":"2a725ce1affc914fe150ea64760a14b5a5a182c7cfbab98fd388e99539af9b55","libgit2/fuzzers/corpora/packfile/071e65ac0bf08f2424a89a4a499004c1bb9f3f6c":"4f3fc765b7e20cf28450a80afba60cfe388b822290fdd23dab75de5195f92ba9","libgit2/fuzzers/corpora/packfile/0739ff2f064568a4d775c8061958e66c419dbea0":"e74301692772a42d8b0c8eee1b9291ceee323cb4f2d367b4eaaa253d3ff14729","libgit2/fuzzers/corpora/packfile/077760469bf8392342d09329c732b98d24be2c30":"2bd0e3544fad2fdeefa1c666128aaf920459b40956cd2975dcc5bf265046f84a","libgit2/fuzzers/corpora/packfile/08534f33c201a45017b502e90a800f1b708ebcb3":"a9253dc8529dd214e5f22397888e78d3390daa47593e26f68c18f97fd7a3876b","libgit2/fuzzers/corpora/packfile/09e9046a7d6125cf2915a326a1504dd75d0543b5":"48c5450fb1e339467e4a978d4b8813620502972d8de03600609cee031cc53059","libgit2/fuzzers/corpora/packfile/0ade7c2cf97f75d009975f4d720d1fa6c19f4897":"19581e27de7ced00ff1ce50b2047e7a567c76b1cbaebabe5ef03f7c3017bb5b7","libgit2/fuzzers/corpora/packfile/0c316c67c1450aee57ffa3f74c19ea5d32d44622":"439028232b268acb647229425e5c96578bf0995d1115efa60051bbf8c4b3003b","libgit2/fuzzers/corpora/packfile/0c395c44e4dd5b67caae8a98a66741e17e8af136":"3e19373a3ede76263f06643b4f839cf74ef98d08f38e691a3463f90bd504ffc2","libgit2/fuzzers/corpora/packfile/0cb9120e5ae00b0d660a111ef85fc9194a5f244a":"83bced3abf6a2e333400c01cd3003ea8cb54b11c527e8f1fdbe9936fb23614d8","libgit2/fuzzers/corpora/packfile/0d44e7156d04cd269fd1219c58c3b79dc8c41d60":"bcf0909af34f683f23f673133bfdbff210ca2a179296e7c52893b5a615d11661","libgit2/fuzzers/corpora/packfile/0d77a48bea1dde6e5d391a65456dc0aa3d9cc5e3":"4b3f1c6b712242de5c763620e21cb3efe8f7106f8e5e3bd156d9e96a02ad2397","libgit2/fuzzers/corpora/packfile/0db25107ff248616cadc75b7819b21d06394cf25":"50dd927afa481af5375dfd80e7af505456b4b1d06ba32aa07dc2cc60c69775f7","libgit2/fuzzers/corpora/packfile/0debae2db7ef2933f386bac21a2d3bebb473070e":"e3be301e3f1e1023743f258b7cb7184f93c7ad35d5c87b1ed4befa77e5f2f7ec","libgit2/fuzzers/corpora/packfile/0e2d48524de33394ca82ea3a43f5f04aac6e86c7":"b130835bfff3633ef53407c63aa4d0b2c87d8a8990b5b160f0f1a8924413a1b6","libgit2/fuzzers/corpora/packfile/0e49f6aa78f3b2f6c3fa5d281d5b1052fa9951dc":"6a5c5265c65305802d683bfd935bbcbaf9900ebfd1ab6ff2bde2858a8f416dd1","libgit2/fuzzers/corpora/packfile/0f2982027f0b3b05250267b19e3969f8797e389e":"8bbc525a26fd6b78fbcb3681d51e28b3c0066e4fc2ace368879177d58263ddc2","libgit2/fuzzers/corpora/packfile/11f6ad8ec52a2984abaafd7c3b516503785c2072":"2d711642b726b04401627ca9fbac32f5c8530fb1903cc4db02258717921a4881","libgit2/fuzzers/corpora/packfile/123ca693d81a8cfd99760ff5ca9e152ded878537":"0f4ae7ab5e78841c6dc1663e18aff88f08416a12bdead9f0cd3fefc094abd39e","libgit2/fuzzers/corpora/packfile/12878ca5643ab15a4a847e74ddd84fb365736af2":"bd3c97f4745454c2cd65ed4dc035baff588820563802d1819c937bc838fe0f6c","libgit2/fuzzers/corpora/packfile/13f292a24a9e79ae911f5d5e1ef7db0112601e64":"cd381288d45705c0921a95d2d54addc90a20e00cee9dd1d93b342845b6e0029f","libgit2/fuzzers/corpora/packfile/13facd9b4b5b4509fee92c7ccc1c82ed90624172":"3bf9d518c3145d933736fcb2ac8da1ebb0e9d1ee6051e9775a7f6390603b3f9f","libgit2/fuzzers/corpora/packfile/140092a21903fdc56c98de126725fa6bead98ab1":"0f9a0a76c4dfc13d9258ae52f791ae798f14a0e975ef4c5dad461042558b92f2","libgit2/fuzzers/corpora/packfile/1489f923c4dca729178b3e3233458550d8dddf29":"96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7","libgit2/fuzzers/corpora/packfile/1501a58834f24f95442f190653a50dd67d01e19d":"65251eb45556a09eea80a69d17c264b2f09f3eac007940753f1433213700d0d2","libgit2/fuzzers/corpora/packfile/15eddee57cafb11e927810d62230a6e104de1d5c":"78ca8145949f63e2e186fa4092058eec188b8db0bbeeb081345d3836517da7ff","libgit2/fuzzers/corpora/packfile/1632aa4b049f1118306485b11c70c499a0200dd5":"b952e334fe7a107da4bfe40b88d51f139b6d75c43cb9c0f19ae154c468acf560","libgit2/fuzzers/corpora/packfile/18e1cf33b179a5cbaaf0baac8279ec4ed1cbdcf3":"25c46585e4f8ec8a2ee1658a190e1464b94965f84e14c6e33e042805c6d8052c","libgit2/fuzzers/corpora/packfile/18e768865207e0b90047487b66532b20bc74b1a2":"1cc65615d187bd8e93318580cc99a9deb66d51e94e46da6797d1cc94b03aa070","libgit2/fuzzers/corpora/packfile/1940c66b45a3bd5c847330b207fd87aee6e96194":"6707b736a22859b83191585476b94fa93bda06294c6143a2ba23d2f4b4b903e5","libgit2/fuzzers/corpora/packfile/1966ab31dc80ab75196b0cbf28e3960a0eb3f6c5":"5ca418aabf800a0b6fd9434fd9c1305cd34804d4e2ac9d2745b0d183c80bab35","libgit2/fuzzers/corpora/packfile/19da91f2603889267dfd77786e07a5b8f067d62a":"9e8e8c37a53bac77a653d590b783b2508e8ed2fed040a278bf4f4703bbd5d82d","libgit2/fuzzers/corpora/packfile/1a72795a3dffdfc999b030d9aab7237dea1e2bc1":"3607f472af344b7265812a5bc63636affe2093476b275aaa51d655fbbf97799c","libgit2/fuzzers/corpora/packfile/1e29cf67a66f225b338610fbcdf1b8185a8f5b7d":"1d49b7dda1d3666529a3eb5153856d5233f73e0cffc0515c08974213f1fe65dd","libgit2/fuzzers/corpora/packfile/1eb8977ef8c3be9ee896d785663c762c7e32be28":"f5476d5e86ea8ad32b1bcabe5ba3859de2e86c54daa16a73b6913c653fd93901","libgit2/fuzzers/corpora/packfile/1f0837530c1c3d122157f2eaa9c2178dcc3580df":"698ae799e3798740b8e4f629b3f3868a705be03b884203eec888aa25ca92e039","libgit2/fuzzers/corpora/packfile/1f3c5fd6dc091faa397bce776aa97b457388fdae":"71a5ec30430d204ed5c01f0e672a57e1889167178d5ffae5354c75624987df95","libgit2/fuzzers/corpora/packfile/20528983163f834108150a7191600ff94ae2c1d2":"e368f886a5ca3b74c94a676564d6456bd49fe11d0d398c51919006e472dffb7e","libgit2/fuzzers/corpora/packfile/20a725140a8ffbe11bb71c1b83f19452147e5180":"d2bd4261bc94f30d398fca196bd437c17ebcb8c04f9e5576563c0f12c3b7b067","libgit2/fuzzers/corpora/packfile/2149aa9e07dda9bbf502e088d8d0a38e8fb94f2e":"e4ff5e7d7a7f08e9800a3e25cb774533cb20040df30b6ba10f956f9acd0eb3f7","libgit2/fuzzers/corpora/packfile/21b664aa8c86aaee4007d9bdbc2d63bf82bd5109":"ec9d63310fbd63348e59d583141b89732779396afe1566564b64bd7da9082f3d","libgit2/fuzzers/corpora/packfile/21b9ec8a7d7ac4d542c9bf7b2e26581cfcfaaab6":"21c38a293c893f05b2b9e4ec34bf760b9f087731518956692bb981da9073228b","libgit2/fuzzers/corpora/packfile/21c07e2affed6b0134d5dc28ea6c4937e691c761":"25267d1a884ed6531ea19a2159b6df6450ba48af719b2d715f6c40b46ed7d985","libgit2/fuzzers/corpora/packfile/23841d4076641ebcb4f58d1fd03047528c9d359b":"9183e06bddef18c75dc49aee2bef20370343e9e0dce6e33031c5d93f29a16374","libgit2/fuzzers/corpora/packfile/23b9174c42560de6525b1f103125f599479f95cb":"c320649ca4c2d85097033bbd174a638b3802295c0dea94d6d5d5866aa3c5f683","libgit2/fuzzers/corpora/packfile/241cbd6dfb6e53c43c73b62f9384359091dcbf56":"22adaf058a2cb668b15cb4c1f30e7cc720bbe38c146544169db35fbf630389c4","libgit2/fuzzers/corpora/packfile/245a2ddea41e6531944933c4420b8c9790ac351b":"4284d20ab66448370b817d51ea50dbe96309ccce97a53f42ffe63415f8084755","libgit2/fuzzers/corpora/packfile/2541e340271ea496a392870bcc20d3510287b9e9":"434f1a0417137e5113f164323e55a450ca5f57e87c9358438761f8f01d0af5ef","libgit2/fuzzers/corpora/packfile/276af22d5bf94344737fb1a5eb5de7d335004493":"8afa3222e3410659809c95605ed3115090c6a664a36f70dadc57596efcbf2a99","libgit2/fuzzers/corpora/packfile/27d5482eebd075de44389774fce28c69f45c8a75":"aaa9402664f1a41f40ebbc52c9993eb66aeb366602958fdfaa283b71e64db123","libgit2/fuzzers/corpora/packfile/28334bd612cb539de776370995f60c8032215434":"8b0f7fe9edb2df6a4f93288b360676d42c319dd2f11b1a872526a788e79c53f6","libgit2/fuzzers/corpora/packfile/2973e2ac092cba077d7350bfffe1cf2e0644a6e1":"43dada443793c736696b140f443efab8190d2d6d18fcc35b2185311de7f7c1be","libgit2/fuzzers/corpora/packfile/2adcd01e876b12d867c858ffaec38c42c59c36c7":"111d33da364d8929a5647a956ad3d1b79e68c6cfda976ac379bd498325513ebb","libgit2/fuzzers/corpora/packfile/2b28470644f5d0323643da99c831d82f20a7a74f":"db8a786bfd5f6b9b8ab68c34cf48872df23e555e47ab390c96a22ee8c648e9c0","libgit2/fuzzers/corpora/packfile/2b86229020ba808df84e16f800dc152254f18f64":"249f9289ddc8d44e8f97c2d6a0e3b9403366126e2e82aeb852ef12c25e93473e","libgit2/fuzzers/corpora/packfile/2cc5bf2f780cd85ad93d232890f418625f4d1274":"40f131c3db3d68f63e653e512ab2303682dace69e6d0e6d319e8c0ac5469900f","libgit2/fuzzers/corpora/packfile/2d6ae8fa82b656879dd3371d0a6899e88ef34e76":"58d924c47d9c5746a411fb157ffac3f473ae62499fb1d0af21447f3a6693b273","libgit2/fuzzers/corpora/packfile/2e74d24e887678f0681d4c7c010477b8b9697f1a":"4f362f9093bb8e7012f466224ff1237c0746d8c8f660b16699f5036ccba9c64a","libgit2/fuzzers/corpora/packfile/2f436c68a7b0be43aa6d4ad5126ec9401a9f9211":"fc257692f52f2a9e94ed3bda610e17569bbb1b3bbae7414fe05464eb1cbc4fde","libgit2/fuzzers/corpora/packfile/2fec48b0dcb45b98597bfec12bf0dc650543b3e3":"d2d4fc8fc2f6022fd04b52de7e94ae9f86ab2fbe6ee351a0e713cb5e5be60f7d","libgit2/fuzzers/corpora/packfile/31bd25636a9807d6024e78b9b3d02fbb1a02835e":"8c568bd48de3ba2260e036b550c34e78471aca68564224d2e590d2c8e6f3b378","libgit2/fuzzers/corpora/packfile/323c88be36ecc20ff30b21cf417106554042db04":"ed4ec49f015e93fe11d8a3b0e3cbc84f77ff0cee5fe68b514e2048688a20583a","libgit2/fuzzers/corpora/packfile/33b3aa957ca4fb31873033a7f460617f1fe81e32":"697219e8ba5c5a4a035cfa9dc55131a29c4c9690f1cef712576f38d059c99c0f","libgit2/fuzzers/corpora/packfile/34303d14e37c9ddfb0bad130e006fec927e13785":"90a24cc8e507f74cfc6b6bb8b82ed8ef8106cf816f6e0564f15db6cdb7bba70c","libgit2/fuzzers/corpora/packfile/34dac9466a4a2c15aaeef13a9567f6827ace7748":"78bbce625718a94a1cc618416122a23fe015b5a78968036df580bf6e30568941","libgit2/fuzzers/corpora/packfile/356a192b7913b04c54574d18c28d46e6395428ab":"6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b","libgit2/fuzzers/corpora/packfile/35bf585248be2c6d3940e15b85f72c4146903097":"68374528eb7a497146e7f93de6a838a358c546aacfa671d64187eff8f07fcb43","libgit2/fuzzers/corpora/packfile/3725a1c4431714019827277deac8ec2efeed8f1d":"04c0c1e3085f812adca4a6da63d3559ff21fbfbc2730bc819a5399eb81eb2bc1","libgit2/fuzzers/corpora/packfile/37a2b7de1fadc9eab2d5fabf5dfe7007c245dbee":"8085a4294993e8f8508fd35480164c6db6c8e410d3c127824057b420b1e4325d","libgit2/fuzzers/corpora/packfile/37ab8a0ca81fc62279057401761f7730a5a8f1b2":"742ef3ee518cf16165dee1d0024c594da8a42f295e61a11081bde66b161aae5a","libgit2/fuzzers/corpora/packfile/38011be20a664dcd2594e712a26c063c2d50efcd":"40e9a20f3b7d1bb25d81aca5d5a2549773d081c42654b007043a9703fc4e152a","libgit2/fuzzers/corpora/packfile/3838851a5da8239c2ae6cbbe869c81446c720e87":"6f8955ff64e3c7012f4f6a6da65b937914b1a695e1b90999542308a70b855f8a","libgit2/fuzzers/corpora/packfile/3921322ac01429b001f88d64c8319088fe49218e":"71ec12ef6dcd10aa15cc10d34bc2f91462f4507435f98eea77f9e67989de3298","libgit2/fuzzers/corpora/packfile/395df8f7c51f007019cb30201c49e884b46b92fa":"594e519ae499312b29433b7dd8a97ff068defcba9755b6d5d00e84c524d67b06","libgit2/fuzzers/corpora/packfile/3e98eb4fd65d3f2c41fa979db0f5678b310e51fe":"663be3787d61eaaff1def59f73dfcbc54d3a53df6b17af6301d4bdbc9aab52c5","libgit2/fuzzers/corpora/packfile/3f9ec359d0cb573cb6d2b2df64c9f4048ea298b8":"50fc019118f159ff1b6e034afe2cc8025a3bd55fa847de321c75ccaefbc5b1cf","libgit2/fuzzers/corpora/packfile/4067250457728bf775aa310ef253b223ae2fe4dc":"f358e46e11888cb4b5d6add27dfe048f6af335ad1f3c8915cd8daf9a8066bd19","libgit2/fuzzers/corpora/packfile/40818db87e110b29cb864f73265586cc054f5bbb":"50c36f3b6a3fc275f77079241e1f6153b3106af3974730cecf6b4af774607795","libgit2/fuzzers/corpora/packfile/418f9fb9ce1d4efdf481ca8fff9dadd09caee9fc":"4ec2274775773a5bd01d038018c1903c47a6602bdd8244569b2910f196dbaed4","libgit2/fuzzers/corpora/packfile/41ca0ae865b686089b8d99e9d661da291ce51019":"7fafdc296890bc117b37b604daf3327643422e66a0bb6a5380ef114ba0180c0e","libgit2/fuzzers/corpora/packfile/42099b4af021e53fd8fd4e056c2568d7c2e3ffa8":"8a5edab282632443219e051e4ade2d1d5bbc671c781051bf1437897cbdfea0f1","libgit2/fuzzers/corpora/packfile/420ce645ce1c93cee59a06da2159cbbb251e4c01":"da948e44d9191c43e3a0a943b2386f2034234205a28bbfaf431d57ae90d29050","libgit2/fuzzers/corpora/packfile/4345cb1fa27885a8fbfe7c0c830a592cc76a552b":"bbf3f11cb5b43e700273a78d12de55e4a7eab741ed2abf13787a4d2dc832b8ec","libgit2/fuzzers/corpora/packfile/450718a71a93a1b5ff982595432400b0fa876fb6":"c69f9f32570fb3a788ca2aeb60ae7696117229e6cd6242098f1dce13bcfe3b42","libgit2/fuzzers/corpora/packfile/453a312eb77b9d4198ac62faef10ecf3e283120c":"b6487bd1bda62379fd5b0adfb1c1fa600e99ef15f4c1b42c001acbe31dad3c77","libgit2/fuzzers/corpora/packfile/45470317334b614ce4d119c05ed2d6250dbc6061":"a1a8655e3884227fc028023592ce5c2296b42e8492dcc880b84e48e669bbb1d6","libgit2/fuzzers/corpora/packfile/45a65193e30784b0124f4fed659eb7e46552c2d0":"ca41841c5c98e34f4a3ae83d9220940395301a9616f69d6672b04ea322f28eb0","libgit2/fuzzers/corpora/packfile/45cff3494791ded181e1e3dab1c7a0e40130b57b":"e703c884ab644527abc3568c8392f6275f20f64fc498dc4501e1cb11f3c7b80a","libgit2/fuzzers/corpora/packfile/481dedc2855981510024d48828af0fe35a1503dd":"1d558ad1097cab5516d172d3fc0fc572b03f57ddde47c4532669b79ea08847a1","libgit2/fuzzers/corpora/packfile/49a6448a722742b1b392f0471542ee0c572c5a9a":"1d3711dde2925c70845e729d0094faed7b06a087d309ed4dc75947f49e110e71","libgit2/fuzzers/corpora/packfile/4a6e6af93dea13a5720be52b95f2948e0cab4602":"94ae66af388edcaf2d0edd6d5eeaa14ad281122c96e6caff19720786983b598e","libgit2/fuzzers/corpora/packfile/4ac25548f35e06eb9f91b0f15b89db3cb5bcb283":"f84a6b5a55d2556f6ce03ae318774057331ea7c51435f1b92e090a52af43ddc2","libgit2/fuzzers/corpora/packfile/4b586169f192749a0aa023ad6e4edd2e15d67f53":"2cd7ba150c2bc318d6cab52de107c70f4ab6abc9e2af160098398b2bb0c205e9","libgit2/fuzzers/corpora/packfile/4c3c8ec0e25da9342dc87c2e78d3040c381514ce":"4e0e3847ad9742d0a217e23b7be39fdba727121b1e6b5a3af80595ba46f34e51","libgit2/fuzzers/corpora/packfile/4d5189cd1411daaa579df34591c6a5946204c9a0":"5adb597fd88f1f7e802382f3cf903e0b2c54d3c84ab4e1f728ad89f62bbb208f","libgit2/fuzzers/corpora/packfile/4d7f1bfa928c0d3399598d562e346c6e23de6a03":"acef8db9a20a8933e65d85cbdb5e29903dd55eb3f6267082164db103855b0b01","libgit2/fuzzers/corpora/packfile/4eee38183d6fce3f42224738be58d0e3975300f4":"372f98baaf19ecad27e909d6d9a21c5a8fe3df7c57eb370bf9b3d49eed7adc39","libgit2/fuzzers/corpora/packfile/4f2e2af611d6567abcf5b6bfc579487ac417a8d4":"d5527cff4b9cf19971d975ed17891d50e6e59d83025e33d847ac2d00974a1cac","libgit2/fuzzers/corpora/packfile/4fa04b2c3ac839c36c4a3b51bf882eb99b7cd097":"cc5cd22723dbce40b45e360c72c0bb6abfac849c38ffc5bd2de02b125475a7ea","libgit2/fuzzers/corpora/packfile/4fbe10aede9fd9ce2030c6e567a9281e1a5338f4":"0eb79f0e16c8dcf59840ce9f2a0e52b276079168eba539f18d26eae6e5f92026","libgit2/fuzzers/corpora/packfile/5037f4f74273aed9a09122af5f4acc10f42c033a":"2c6e703f821f20b073261714cf3c58c09cb856efdcfad65f82a90c4f90c6b9fc","libgit2/fuzzers/corpora/packfile/511993d3c99719e38a6779073019dacd7178ddb9":"5c62e091b8c0565f1bafad0dad5934276143ae2ccef7a5381e8ada5b1a8d26d2","libgit2/fuzzers/corpora/packfile/520aa436eab6343c3729f51f0f8048e6b87f6aeb":"61417f153c5e6fa362868a13c2561ea05511962e2446089cf197c77628b8499d","libgit2/fuzzers/corpora/packfile/521e228f3b62dca81d87d2e7d5476657d7b5e0a9":"a3f99b1d6a58379342d2569fe7ac15d5116c1fadcdf9f55497dccfecc2ec47d1","libgit2/fuzzers/corpora/packfile/52e37dfd77d56769dc8a96388aa26695a8108dac":"34b93ac37ef5c0780c8aa96852cb1ca99071e45f2207ef83c625d08fd6abead3","libgit2/fuzzers/corpora/packfile/5374fb6be0a406cf8d0e95771ecb032254d21305":"b87d96b116f8d1c143dddbf3620435bf5c39a340768b3661dc1ec2e412b1ad2c","libgit2/fuzzers/corpora/packfile/53e1d4898c15c8ee3ef5e2fb279d151108725731":"475b82ad183afbfecb3e095a41595a3337c6edf03f79d831f623678e7673cab1","libgit2/fuzzers/corpora/packfile/53e61ad37ca92b7f6c0396e5fab1ed8743e73da0":"8a731c352c4a868851779b032413b4f87feb30ca196a99c505e052fe4413ff22","libgit2/fuzzers/corpora/packfile/55df2a59ed6a888ee2f0cdfdcc8582696702de7a":"4d4d75d742863ab9656f3d5f76dff8589c3922e95a24ea6812157ffe4aaa3b6b","libgit2/fuzzers/corpora/packfile/56a2020f68c5eb72786ea168cc2a7e8ea34ad9c2":"cf03ac39c4d5f13fa697d63b533482821e359dc5cbdb7e63c649ee75d11b0092","libgit2/fuzzers/corpora/packfile/578678e78b72f8bcb9f414e4129ae5d85a4af914":"c1969918521df12d3cc28ff4c78d96b32f1048b77be7be5ed92d7203a22afa55","libgit2/fuzzers/corpora/packfile/5a8bc5597fd0b2b44194ffabce46e2fa94c1ffd7":"95be31bd34da5678c631d7c3e95a588001c637470e3dc0ceec83ba2ac25e3a51","libgit2/fuzzers/corpora/packfile/5bab61eb53176449e25c2c82f172b82cb13ffb9d":"8a8de823d5ed3e12746a62ef169bcf372be0ca44f0a1236abc35df05d96928e1","libgit2/fuzzers/corpora/packfile/5c2dd944dde9e08881bef0894fe7b22a5c9c4b06":"189f40034be7a199f1fa9891668ee3ab6049f82d38c68be70f596eab2e1857b7","libgit2/fuzzers/corpora/packfile/5cb4674f4468d39f061d1df3c95b9c2dca529c54":"0534e4376f12cd0b5e4d1b424978488667df7b75873867529a0938bb8dd88871","libgit2/fuzzers/corpora/packfile/60b6fbfe65dc1796a09a734e054223aba8c90260":"903ea589b57575eb4314db42d2c3a53a88a7b13fb2e6286aa3045b8cc8f0627d","libgit2/fuzzers/corpora/packfile/611f5b9368427ef823f7ed89ad23667b02a06435":"028e95996ce886b73dbd2a9e974a064f51bda3d523357b867e89d2d17efe9885","libgit2/fuzzers/corpora/packfile/6214b4afdbfe63400ce428d47a58a2e29f682738":"43be55c6bfae3ed5135a1f62d76698adfb199624ecf57413976b76146d757e61","libgit2/fuzzers/corpora/packfile/634b675b80d51b52c3c6fbc73181ed47f61749ba":"64a2cf0bda2138cf4e271b0f78da9441e966e54cd0b7df8c9ca7d47f7d166586","libgit2/fuzzers/corpora/packfile/6431f1b31dc492fad89732b7d3e511fa7361985d":"86143d8fdd6193e2bba055dcf209e5dd2317b543981b2ab58480154d818bb232","libgit2/fuzzers/corpora/packfile/6442fd4bbb7656f142c92050da17b0e81e79fad1":"af45fcd37a8cace71612fd940de118cf73b0acf8b75fee786c5eb435f2eda40f","libgit2/fuzzers/corpora/packfile/6486c8cf6bcc2fca60502564924f6b266399df3d":"e33e0d446df6c82751725194a5815fc278004cbf76d4084c0e9394d139a95146","libgit2/fuzzers/corpora/packfile/651c573b6fdd393e97536a47f8b9e65226e29c33":"6857ae51d2535d3c50d4dc20d7a76325ad5fb5f3dab4ae5e9f39b062d95ca43d","libgit2/fuzzers/corpora/packfile/657fc646e93cb999417f43f0ec77fbad694e3e18":"fe035e27dd216ed91db51fc611a739bfd5e50f1bb0ebb1f1329fac4bc81f67dc","libgit2/fuzzers/corpora/packfile/65cc90263dec0020ceabc727d33aa587e57fc175":"a39c28b283be82be09a64ed16eca831cf6343a77ad6cf8308f3bc7bf0b58e5d9","libgit2/fuzzers/corpora/packfile/688934845f22049cb14668832efa33d45013b6b9":"9b4fb24edd6d1d8830e272398263cdbf026b97392cc35387b991dc0248a628f9","libgit2/fuzzers/corpora/packfile/6b0d31c0d563223024da45691584643ac78c96e8":"62c66a7a5dd70c3146618063c344e531e6d4b59e379808443ce962b3abd63c5a","libgit2/fuzzers/corpora/packfile/6b4dc6028a3a684a20dbc427b15a37ea2fd12dd1":"eb684863e4b67a8d7dbe72ebe8f4ccd002a28185cb386cd2f9cb03d2c83e2b29","libgit2/fuzzers/corpora/packfile/6b7486fc2a47a40eb5a85a5edf53af60d48be7d5":"aca5cfab2b6b34bce54c817b0cfccb483596942e4fbd3bc5609fc480afba8700","libgit2/fuzzers/corpora/packfile/6bace82ea640ac0a78963c79483faf0faa7fd168":"149488d869cbef080602a371ab0d39d97af103fb726aaeb02ccd36c06f494e5d","libgit2/fuzzers/corpora/packfile/6ca38da5f096a5847776e4d50cb63121341fd67c":"6a4bbda5b6050c45b9e10ccf495315716494372ab38c7518fd2bb9a01210ebf4","libgit2/fuzzers/corpora/packfile/6d344a65b9edced36045f94215b6810799789334":"298d915bda9804fc3984f389087f1e60ad128d69f91283a59fac523a26b4eb7d","libgit2/fuzzers/corpora/packfile/6dd655e8ef0573eb1c41151af924974aa1e9c454":"dbdbf9bf608f3df41d2a596a936f2cd8de0307c9dbc8e786a001d6fae2b86f16","libgit2/fuzzers/corpora/packfile/6e118259c2940fafba0a9ceeef6308e12e881ae1":"a73992db63e191ba5105ee3e682ada13e8f6d6611cc57343d06dd3b2a6f5bf81","libgit2/fuzzers/corpora/packfile/6e4b5ef83333606a16a63b579f221f6ffb7b48ee":"0083ad63ced55982ecdeb9312193e38dc473ba8ff1fd09976ce217ce737aa854","libgit2/fuzzers/corpora/packfile/6f47ff60d54c012103a0c28851ffa9eab3002511":"aeec1d01c3267edf30e2e1ed652a8808c034f212cae4fa5d6e4a8b02e65548c8","libgit2/fuzzers/corpora/packfile/701a765befff451207517d56c3fe8609d059867d":"ffd178a6ae2eaf3899396852b8259ec26a2b3fe269a94e47146450a5cdd38ab1","libgit2/fuzzers/corpora/packfile/7050f56d64b28499c89d5430761f18a8a2a933d4":"7ee42d5b88c8af97d2fe05970c441631f60b3a5febcf596ba0874bafbdc098ef","libgit2/fuzzers/corpora/packfile/724fa0194f615e1a0f08184a9f1520123f8e2833":"41f525525aa4c452e6fe17b85d2319d985f2dd4fb1a7d354989e77d8c580f7f2","libgit2/fuzzers/corpora/packfile/72c52d0d98717e21dfee45418a046a19198b5d5d":"a76de76465190214abd08d4578e799f74efc32465ba7add89473b4d37336f380","libgit2/fuzzers/corpora/packfile/72cec0949c5743ee1df67b41ece5d6806f9bede6":"790bbfd0fa86ee71fcb094b8f88719504d77dec1f13a99d9ac0835eba8e5a97d","libgit2/fuzzers/corpora/packfile/72e6bfb7b881befc0b461334411d70ae227a426a":"3c30f9822160fcc2ec4af7c763ab0160de24db5883767c98aa398e6ab6394965","libgit2/fuzzers/corpora/packfile/73b74736664ad85828ce1be2e29fb4a68d24402b":"50868f20258bbc9cce0da2719e8654c108733dd2f663b8737c574ec0ead93eb3","libgit2/fuzzers/corpora/packfile/745bedb79413d20844a8b0e96fbec51b4989c65d":"e596a8e5c49dd20a79bd0c1a7dd190a674507d1129785746fcc1c5e64cd8416c","libgit2/fuzzers/corpora/packfile/748142c17e56d0f0ad9e4d6525b39294d81261d6":"f12d4073f20d8e09e0cd213f88e486f0a019f36829a9c3993f197200e94f5b45","libgit2/fuzzers/corpora/packfile/74dfea2e26741a8778fb942d1d60a84d0759d7a0":"432bf29d5062e65fd5dbc9cd7ff4b331398441fa5b24ab866c13018c779abb74","libgit2/fuzzers/corpora/packfile/767b2efbb7502a2f652a448b471693d32c128677":"decb68b8c054c9c71c1995a66d0ff661b8b66ba439f99e3c3fa1818b1e41d791","libgit2/fuzzers/corpora/packfile/78abe558c4277852128d4b91282edcb68f86bdea":"844a46be5eb4445d754b43acf1b47d128f0fee9ccff9dda7f937b5e15b7771ee","libgit2/fuzzers/corpora/packfile/7960246c2db6d39e68dfe93ded358a3acba8f896":"833e8146ea91d1aa35ac0464900c8d9aab772ada99b24bcff3a6ac5cbe7d4de4","libgit2/fuzzers/corpora/packfile/7a4ff814176b55af008ad9580201d5e659242f05":"9981721ea3de1ceaec7a653b556de1ece3a9ebab8caae9ca1245460610ff6b81","libgit2/fuzzers/corpora/packfile/7a752694fce29ded083fbabbc9ff95f5b92a3d9c":"053e08c1c12476ec8107a1a1306cfe3800b8d6440dc2cf6d1fcaba9584469cd5","libgit2/fuzzers/corpora/packfile/7a81af3e591ac713f81ea1efe93dcf36157d8376":"65c74c15a686187bb6bbf9958f494fc6b80068034a659a9ad44991b08c58f2d2","libgit2/fuzzers/corpora/packfile/7c957a1fd650f9ae0eadc112837ea451a692affc":"51a4b3d09d4f755909793e56fd4416bebc90dd36d2d87c0cf6821bcdf324db4d","libgit2/fuzzers/corpora/packfile/7cda4ab6a0daf50f675d5225cbc166c86a8ef95f":"e6b39029b9173136a0c71578a76e66ff08810c37a3a8e96a0e03ded1b20d0c6f","libgit2/fuzzers/corpora/packfile/7cf184f4c67ad58283ecb19349720b0cae756829":"44bd7ae60f478fae1061e11a7739f4b94d1daf917982d33b6fc8a01a63f89c21","libgit2/fuzzers/corpora/packfile/7df1ea8d86d601c3bd39977ea85e5f74c9db6acb":"5e39875072bb19878194ccd25af26ff9d76e935d87935f5fd8a6b81a7259bd14","libgit2/fuzzers/corpora/packfile/820ec3e39089d863641a1be6942445db3ff34270":"ae12ee9fab37804a48400f691f8833377604f8bd78a6af2bc12f6570aa49d113","libgit2/fuzzers/corpora/packfile/827704fd978bd02a46268b7396b202a52ad261ed":"f23807c78d7b02a51f8c5d40dd9f2d1b4af69f46b4761f396344d180a4e76c82","libgit2/fuzzers/corpora/packfile/828acfc1d49a0fdbcd9f238138ff65582c2a9fc8":"3fd40365a317580c8802c296b8170d685a6cca0b9a6eb2ef3b08e9cb2e77157c","libgit2/fuzzers/corpora/packfile/8306a2f04a47fe4c95098675ffa25c074ecd89de":"cceed482f57105ee1101dda0c4f1d6c288a7527d7caf1e459ba679700ac2e171","libgit2/fuzzers/corpora/packfile/8327db1c6a884d8b3e3cefd94cec9eb94bffae0a":"8bf49c7443551ea96499f3b4d513281e27013f879ce27f162f5888524ce6d91c","libgit2/fuzzers/corpora/packfile/847f4e42f8f2730a48d19951d8829621b2e70082":"5ab289da1abf6db7952d39963192576ae50726816a9ab9e1b6e14cfe857ad0ea","libgit2/fuzzers/corpora/packfile/84a516841ba77a5b4648de2cd0dfcb30ea46dbb4":"2e7d2c03a9507ae265ecf5b5356885a53393a2029d241394997265a1a25aefc6","libgit2/fuzzers/corpora/packfile/8552526f5aba95119c0b95b61cd40386e7a3738b":"764a16d99c81df12829f07c5c031738b060ec15634c75fb0597b8573c14baffd","libgit2/fuzzers/corpora/packfile/8565db62ac64209ff009ac40e7c2d2ac4ae944eb":"a1a9fa92caafd4a5503a892fc6e39cf5f02fe055f2093a8de03966dab782d359","libgit2/fuzzers/corpora/packfile/859b3346967c5c3c136459e565b402f9a936aa0d":"32d71a6f68ce27fa4fa63bceff0aa7064adf4b394acb98bbe5340b53a2e32c83","libgit2/fuzzers/corpora/packfile/86a69caf3c5866d78d80da087b1b843cfea5e907":"7250bdfb69dfc731ea08d8465280ec47ef4fb3b867666c6181ae54a340dc394f","libgit2/fuzzers/corpora/packfile/86e1fb54a04fc18ee482b794ba3b2b306f6515d4":"d5e1fa07bb72903dc23ff979823b0484844a66e2fbd7a2dd7609f810192b9e72","libgit2/fuzzers/corpora/packfile/86f217ee467d31ad9ad2a8c502b91279cd7f1c40":"d15730873e710deba56d2e6acf6c95d65203f5f6a0ac649eff24b2a08b16160f","libgit2/fuzzers/corpora/packfile/8768a53e1d4c182907306300f9ca90cfd8018383":"c00e7f889cfc9216ec818bf2e1682fc6af0d89939c91776669478caf27c9727c","libgit2/fuzzers/corpora/packfile/8834a7aac170c494f45aa4da71b9605a52d82435":"6eb47f3d10f8511006d7e2ce4bae0db37c2408b15b346a3a2144d302d2ae818c","libgit2/fuzzers/corpora/packfile/883f023f38a031d8a8e8ce2cba6614b9bff5d41f":"27047cefdb1afb7679cdfcd2486550f6cfe451040e3c2452a31d376fded309e3","libgit2/fuzzers/corpora/packfile/88738071086eb04e47b77d1ca28b35ddbfaa0968":"518a4a4a69dcfad19e83cfa139700bbb60619562759cb889a0df41299b33b27c","libgit2/fuzzers/corpora/packfile/892aef744c87c6ee4ba3dd457c7ca02ba3d359bd":"680aecd32b417cd8dc27908ceb356cf0841472735593d47ea383ba1806fbd089","libgit2/fuzzers/corpora/packfile/8afb5c282d23c4055500f88a10b26383c682c900":"56bb7177a9753b58d1a91642cc43723dffd3eaa2f452b7ccb8da6cea1066f09f","libgit2/fuzzers/corpora/packfile/8b3dfce4cd7b8942eedb52af0e9ca4caa5c6de61":"d64bdce8a3de44553028d6e67fc9e6bc7e86d13832d2f032ad2bdb6f677f9724","libgit2/fuzzers/corpora/packfile/8c2cccf751bb5844bea8dc63c22e3f8e4489411e":"9e246a7f4fd3d189bba4dee4b60b818e11450346fd4c6debf021811a4bcf1ce1","libgit2/fuzzers/corpora/packfile/8e30894298502ba4d43af98f1ec3088f9b8f29d5":"54273780c0f34503aaebb1b1d9aec1bfefd259e152cbcfad0a7a78f03c936adb","libgit2/fuzzers/corpora/packfile/8eb4d738f7170d2e0594b779f782eb3171c9d421":"f7e7196fc84627c7d552d8878c740ea69e42076607be488f1964987c91ac4ce0","libgit2/fuzzers/corpora/packfile/8f46a043da3aa5d466ade170e62b0b9f362b4c5b":"1dea6c6dce4da36e28a7c14b4afbf425cb04fcc5e432a87b3b671e3ba3ef34f9","libgit2/fuzzers/corpora/packfile/9295f39686016bf3abb1d6e9924d6725c1263920":"b2d4a618a6a37e0340150e07a24456010313a116604dc5418150847fdbaf4f3c","libgit2/fuzzers/corpora/packfile/92fa2c2237724e7ba49e9c59adad8d61ce400bbf":"48a68f4eb5c3f2ad1200c857a537317716cc65780572955b239b8a788ebd369b","libgit2/fuzzers/corpora/packfile/936548b53e1a1e30cb30747a87203abd4eae78ea":"cf00b0f90843c43ff94f36f3fa83dbc268b6aea8eb698ef7d036d74fc846c616","libgit2/fuzzers/corpora/packfile/9835ad3ff27939bc1315632d6a22980b377c36e4":"09a8d7fd4e94e930d9be55f95e235fe863fc5ae3d160f8b6af74a1275cd9e6d0","libgit2/fuzzers/corpora/packfile/9857740c36a95415fa3be04cdf184db7b41a8b3e":"392e7a1bc70abf5219160e19617b1991950e126434d548d4ec36beb82d5daa63","libgit2/fuzzers/corpora/packfile/98c35b9d5e7b430d0d4ef70f642d8e2f3266b6d4":"31255070b27659f258325d5a359eb0944bf1afc78e9803721011c7f308398519","libgit2/fuzzers/corpora/packfile/9929b50ac145c0781a0347be1559764edc668173":"9bca3f4cc3c665d343fbd27104706f4b3bbc149e91e0c061e4bb960eab687ff4","libgit2/fuzzers/corpora/packfile/9bf6a450d87badf2d495c2df37081ea16156915a":"fdb9b6bfe39e368744422405b25d1e6282e69e83f691bfd64ae4211d8287b646","libgit2/fuzzers/corpora/packfile/9bffb3ff7a4429144305b770162074bbffe39ce9":"6acc20a73b586df891d52aeb2e0bc03b0d5913245f6c44841b6f70a43f2a69f4","libgit2/fuzzers/corpora/packfile/9c040d3207196e3aeee0df389170d6e59733ba0f":"d4cc24149d1410975fee6674cedb2ca926c81cb4c7e2f2033be26778f02962b3","libgit2/fuzzers/corpora/packfile/9c740d0f3b8875a3b19f1cf1a88d5192a997a68d":"73ce4744e856ac71aa069b7b202ca58358189f582d03706c39e82f1893700fc5","libgit2/fuzzers/corpora/packfile/9cf72097400efb70d06179e6b00abb4cdec74e66":"5ed855d3fabf5a6799b4201701938b76ec4029184b0466d219ae57687be9f3eb","libgit2/fuzzers/corpora/packfile/9d36c270ef1f14214742562238dc747242d4756e":"30bec7299ee957f8c7f36879728ff14ff45396762071716a8608231515ebea52","libgit2/fuzzers/corpora/packfile/9fb415ccadc8e7b0f38646ec5782d5895111e259":"3c1a049bfe7be1cd5df9c04212b9f787eb546ef32c128c47e3a48921249d7821","libgit2/fuzzers/corpora/packfile/a13b7fbb454fe3bdebd07a51d466484aa41ee142":"3b16feece66e0f53b9ae2a21cd4151b751041f9ed30cb2525b0d9934972e6a7c","libgit2/fuzzers/corpora/packfile/a1a7715c7596c77b892dc6d4debb7c108ca4ef97":"d52022534fa2dba3bb8a45809c425f42a5dd8786ef8d206fcff19c1fd66725b4","libgit2/fuzzers/corpora/packfile/a1ac8b656af02b56aefe6029db36b1af9fb664ef":"60315e08e7127eff65833f43847903f406f6c7601d783891b26d9a49eb57db6c","libgit2/fuzzers/corpora/packfile/a343687e2522222c2d49e8cb18d3feda64cf1d66":"e53612824f7d8ce616d2d90c4241a9dd607151977c3472196951a45aee54e17f","libgit2/fuzzers/corpora/packfile/a6f57425137e9aa54537f0b3f5364ce165aedb0a":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6","libgit2/fuzzers/corpora/packfile/a73df4ce29f75cc638a7a2d823fee57d909ab681":"f50747549fcdad833a87719f700bf3b47fc157160044f11af0b3c38acc7b71a2","libgit2/fuzzers/corpora/packfile/a7ee38bb7be4fc44198cb2685d9601dcf2b9f569":"86be9a55762d316a3026c2836d044f5fc76e34da10e1b45feee5f18be7edb177","libgit2/fuzzers/corpora/packfile/a8b9b91157274e617bf4ac5045fc0c6ac97e76f7":"9a5d8b4f20af57dcdcb68417e54980fdbce5464fab2afd860cff614c2a581a43","libgit2/fuzzers/corpora/packfile/a9c697f383f59a3b0642cd55b88190bce6201bae":"9f1429096e79d09fb146e5a033c33f14b75f9f4825f5db3671f2646410777816","libgit2/fuzzers/corpora/packfile/ab064cd6847c0fa546bbec4241eb9b095e0e73da":"a81119e59a92a2f837c142ea8ef50429edbdb6ea2ec5da75d026acca8ec110b2","libgit2/fuzzers/corpora/packfile/ab2c64588d3d9dc5c54c48d414e6d46d6a78cfa6":"7fc4ce8686c82662e06d7e92afffaf32cea8ee9d953f8a9583acd955a8478e03","libgit2/fuzzers/corpora/packfile/abe729b06750880778312618dcebb43257ec03e0":"823dfa841810526b38bf402ef1f84387f1ef79fe1f955057484a82652cc7014a","libgit2/fuzzers/corpora/packfile/ac1bf5a5fe61e5784f72b364ef1bcddfb0d13716":"cb8b5a2e407d61cd94b3ef29269661294ae1100092c48d7423cf55012a0d2c14","libgit2/fuzzers/corpora/packfile/ac47b6d3f0e479df3292131535f8e0d99c288de9":"85903df244183978ad491f5e727f566f9eda84af7d09f448e4e00aeb0d436c32","libgit2/fuzzers/corpora/packfile/ac9231da4082430afe8f4d40127814c613648d8e":"2b4c342f5433ebe591a1da77e013d1b72475562d48578dca8b84bac6651c3cb9","libgit2/fuzzers/corpora/packfile/ace9ffcaa273c01c0eb60381321e47edf4842332":"bfcdee20ad3f3fee73821ed01645e85716a0c3f1fb6e066bc048fc591d4aa7f1","libgit2/fuzzers/corpora/packfile/ad6ba9b0bc076987efbeb11ce3fc92bc1df69d0a":"ef9bed33abc7920236290dc1b50b678d884974bce98d11710a727e3e5f1c6f3d","libgit2/fuzzers/corpora/packfile/ae99dcb9b5e1b09aa5df6bb2fada3a3de61268fe":"e2e1bd67bf91c9c0af409af9a54fc913c21877799c5bc5678a7e90d46c599597","libgit2/fuzzers/corpora/packfile/aeeacf0499ace69549fe2c76757d4948ba65a10b":"bb9d5a1bd871b1793b42dd3070eb5c97e97c806536480085768112384de5734c","libgit2/fuzzers/corpora/packfile/af6614c37604ee5d3f7b00cddca761a8776283b5":"e0dc9a9618cc8656b1c8053fbd78d1be19ca1332203b2a08eb421b05ecd954ec","libgit2/fuzzers/corpora/packfile/afd44f8c385a922c8caacc1ea5688d324bad5b39":"ff18fe7a59d6f955878313af3cc5e0e9c9611d08293caa391bc6e20b9b41ae92","libgit2/fuzzers/corpora/packfile/aff024fe4ab0fece4091de044c58c9ae4233383a":"50e721e49c013f00c62cf59f2163542a9d8df02464efeb615d31051b0fddc326","libgit2/fuzzers/corpora/packfile/b1f86f05d4928c8393fe0f138c0714df3978f0bb":"3f362712695c59536e3e688cca80ae277764a0a05ce28c5cc8ccc91195132de2","libgit2/fuzzers/corpora/packfile/b452cd4b70f2827e3cbd6d5dd20f678b6e55f813":"5b10f1ffaffa3a373290304bdd876e25fa9f96460ea61244b8c31c131cbb3501","libgit2/fuzzers/corpora/packfile/b491dbad4c3edc87aa5a7f12b2c9a447a712c20d":"8c52ee97976acd0e10f5e3ce5546138933f2f43ba00e41bc48f8f56d31759db7","libgit2/fuzzers/corpora/packfile/b54664965911c6fe91e18cd01b68a75c8183b530":"3e151409ace91cb3394fecd59e92b5dc42c0aad29993a1858f2f70a0866a539b","libgit2/fuzzers/corpora/packfile/b68542373c05c0ed25231d09955b2c699d37c45b":"aa687b58b0e73e2e383f8c500d75b591e188efe0168b3ffbcd3771caaa6dd4c7","libgit2/fuzzers/corpora/packfile/b706e78cf7110a78dfccce991cd4ce22c6fd898a":"7b3fefae8d62926959b152b814a31dee7c2ce70fcd6e8b4ed880d1ab914326c0","libgit2/fuzzers/corpora/packfile/b8d3910a75ad8a7058f9c3f202f8eb27419137d7":"1f4fcffd5bda0918550e8b1b5e0106f2bcfce294abc8525f21e943465788a39c","libgit2/fuzzers/corpora/packfile/b93abe6094fb4ebbfa7414fbceb7199ce766075b":"6a8d6b8fce4c36237eefdae3ea8c3b3c16919e6c20c7384d4ef9cb9e8cddf795","libgit2/fuzzers/corpora/packfile/b9a64cc0694f3ac4a3c530c721bbf69026192187":"3301fce5b1142c8d15a7505f756bea29983a91572ccbc3859e1e483ef3517a25","libgit2/fuzzers/corpora/packfile/b9e5319eca8fbc26e5c322e0b151ed8ed60628d1":"fd7a1eef7d0224d9f5558c69f52763fe75863ebc9dd462d80ab1e50c8ce9f739","libgit2/fuzzers/corpora/packfile/ba390745a04c5394601f7aa73fe795097b814d1a":"527ee4c107847f03bf735054864c09358942e137e3b9d44b27e4d9356c9beafc","libgit2/fuzzers/corpora/packfile/bb7d065b776833337d3e1a3071de4d5d2759d78b":"d16bd22f7196c0a70f4b12aa0b290c4c4acecd5d6ba350ecc8447fbdf4c3819b","libgit2/fuzzers/corpora/packfile/bb99cf0bb3e5d75d59300e6ca9cb1f67ce315e3a":"c8c7687cd870980c15d0ceeb8035737e82d2fb95e53c421b3ab3a37ab535f859","libgit2/fuzzers/corpora/packfile/bd9722d91e0615cbdae3cee3476ec6181fbad98d":"6130bd959ddfc70a81745d1e8a84dd163df47c0fc68fcab00f8b3f560f6d3e86","libgit2/fuzzers/corpora/packfile/bf8b4530d8d246dd74ac53a13471bba17941dff7":"4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a","libgit2/fuzzers/corpora/packfile/bffc4698ad4aaddd977fe857da20858aa6654263":"357c417e27c0526868f4b7f7a9cd1cddf8cd2fe14d0e20b3e425b73d5e4298f3","libgit2/fuzzers/corpora/packfile/c0ea828d8f9c4a2c0fc6253908cd283f6c7994a1":"c016406647d3bf5cbdd674defd9a73f0da3871b59e8bf9382286657510d114ec","libgit2/fuzzers/corpora/packfile/c151b760696d665265187501c51f38cd84503634":"528a84ce6b18eb7d0e54be01379122a76dfdca14c97f02e0424aabf0220d9f51","libgit2/fuzzers/corpora/packfile/c16f90096603258174790bc85f076413dad0e228":"3493b717688b6c1743f814be189580aca11e9bd66e8c3f37d50d489445d1c986","libgit2/fuzzers/corpora/packfile/c20fc8fb8f1d44050c281089191b8eac2dc9444c":"8086925c6e2f51d516f2241098600acef7f552fc07b7f08a3c4bf18c81b4203e","libgit2/fuzzers/corpora/packfile/c2143b1a0db17957bec1b41bb2e5f75aa135981e":"452ba1ddef80246c48be7690193c76c1d61185906be9401014fe14f1be64b74f","libgit2/fuzzers/corpora/packfile/c22c3fba53bb2c5579b47852fa9ec54a88c03472":"d3cd0d7533edf8b992042d6be9f8c0b1205349bc69cb5dfcafb8e4b4d41b331c","libgit2/fuzzers/corpora/packfile/c297564cff1bb4f7933221050cfcffa36c59f691":"cc68b55932b8c746566eac4b43c0c6aa579c9aa954293c977c06209b71cc60df","libgit2/fuzzers/corpora/packfile/c2c4da76233acd3efe08eaebb7ae8dc9b3036527":"c3f610f041394931d0c92e7761420c1a4216afcc2b6afd7fc85e0a057977f763","libgit2/fuzzers/corpora/packfile/c3d47118536d19a8d1a601978510cc24344aa8df":"734b0c91bde31b44f8869916f7aa6c8af2f8f065357d28bc7421759b7b02990f","libgit2/fuzzers/corpora/packfile/c4cbb032db94c57061003a85d30bdf4117979b1e":"25b0287732f3e079c3d69a9fd067842324912a804795a1de11018af6f039900c","libgit2/fuzzers/corpora/packfile/c7090127a03c0e7230c11a649e4f98fcb4ca2b75":"3f6933ff9daf5dacfc3d9314be8ef5246aedd998cdcd4a46338283f3c5d73b1f","libgit2/fuzzers/corpora/packfile/c8b839665bd381ff7d006b1b08c35f94f1818556":"90bcfcc55c9e676fce0a6dba512e0b49b224f35bf291dd4a8099d4f2c8f30072","libgit2/fuzzers/corpora/packfile/ca8c7c16d1d6b60e951dcfb558cc97e14231c750":"836f7c7bfaeb1c965c8ab719763d341cecaf76c336fcc2c70b44e5984a54f3ab","libgit2/fuzzers/corpora/packfile/cb46c744c83541a0900e1e61780c18d43031a08b":"d1bbd73bb09190bfb883056771e22e997541ed20079793bf33975fe1654581c3","libgit2/fuzzers/corpora/packfile/cbf1e454dc7ac878bd23e3dfd0b6a28a50b2155d":"81e2325379124dab3e4a96cc3712fce61658e4a752d92fadb7c2c824c67bfab1","libgit2/fuzzers/corpora/packfile/cbfb8cae82ddd82c04996f474fdb4f1b80dcb6db":"0127665b0bc182a350eee4a978422ddf64df676f9c8a60c13b008cdca9e334dc","libgit2/fuzzers/corpora/packfile/cf74f755c004ca634818f8ba44c99fffbaa950a1":"df45a789633238d7b75bf77ffd3317da84344e827de55c364c6c2e24b72d2d63","libgit2/fuzzers/corpora/packfile/d07e4bc786c88b8d2304f84c7db2098666f822c0":"04b8d34e20e604cadb04b9db8f6778c35f45a2d2a3335ea517dafe8c9cd9b06e","libgit2/fuzzers/corpora/packfile/d17ab0db9edea68e8f9f51f471decae84b192a1a":"a3fd68b224e48c35fc35c694f1a5885b905bfd8936c6ca95e3e198ebe770e40b","libgit2/fuzzers/corpora/packfile/d1854cae891ec7b29161ccaf79a24b00c274bdaa":"1b16b1df538ba12dc3f97edbb85caa7050d46c148134290feba80f8236c83db9","libgit2/fuzzers/corpora/packfile/d22aac18f8b435fc34566fe0d3f42464aec9458c":"a6f08f93a50a32c771dbbf344f88a7f526ab57980611ae611372332402288739","libgit2/fuzzers/corpora/packfile/d446a50788c32053358495358696f9d595358bcf":"50a33c54d59026990630fa15ae212ab14bd1cb667fd66d86cc62db4b8a5cd4bf","libgit2/fuzzers/corpora/packfile/d461cbcff85c87b0068f0e9c15d2056197cdfa52":"13322e999c7f0fee54f64452777f11ccba5212b608ff44a1916408d56497c334","libgit2/fuzzers/corpora/packfile/d54709a1b46002c81f57da533379e57f00afe942":"5b5d914df78806af6f0eae28042c8ea46f6329223aee9cac19cce1c1b135dd90","libgit2/fuzzers/corpora/packfile/d567007f84b83e82df7069838bf8b6c5826b18a8":"8a9a2506ee42c512abffb015e844e840855830c8fecd2f217b6c19c782b9be6a","libgit2/fuzzers/corpora/packfile/d5e60b9f94126a9ec865fda83feb6835d294b76b":"39101a8d8a2163a7dcb4016950280bf89438106dd937bc57e93a5e066fbd36e6","libgit2/fuzzers/corpora/packfile/d81092a4f3607ddbba85862facf2285459696078":"b3450940ef5f01f6ca4c62295840bd162c15521a4881ea18fde1c474a2fdc528","libgit2/fuzzers/corpora/packfile/d898eb860ceac044950605db88429e029ea278ef":"fa0e51396fb692eda18a1bc6802acd70fbfb911150e9e48f54eddfa5df254b9d","libgit2/fuzzers/corpora/packfile/d8fc60ccdd8f555c1858b9f0820f263e3d2b58ec":"19753a9b7681b36104c1f79dfc8a6a1eccc088b8c7d2903a446d81694d2fb3a9","libgit2/fuzzers/corpora/packfile/d9b69c63cdc0c1622f2fab84d1307f9e0c0fa3b9":"9c4a4fafd6c2ad4778831b95313194e091f88afe9fac3879e78cf029298dba6b","libgit2/fuzzers/corpora/packfile/db1bb4b7348d387623dcaf0a743d0b11fa18409f":"12244cff24533d52ff3ab0a6c249084a0a751d7b62635c4ce7e94c3ab5c95bd5","libgit2/fuzzers/corpora/packfile/db291360a195c79ae504a3dfb2cd0f71cbc11902":"201ebc02ab846845e609102cd8e73a65a74419f1487cf2fc05f263163857a143","libgit2/fuzzers/corpora/packfile/dc98359b3ef2ced9c3d07636c89d475a564c39d9":"c40b2356ab24d6c4cf18060a662bcc10926e2f7fdf251c126d5a67f687b570eb","libgit2/fuzzers/corpora/packfile/dccc5642917b20b4dd64d3e44b71d08da30445e9":"f1b532b1b192b5e26fd79ec7e7bf82563da500ad8f136672c4b67abb87fd2ee5","libgit2/fuzzers/corpora/packfile/dd79c8cfb8beeacd0460429944b4ecbe95a31561":"30a5bfa58e128af9e5a4955725d8ad26d4d574a537b58b7dc6d357acad578572","libgit2/fuzzers/corpora/packfile/de9550264c4e2dbef14e1281ff3693f2d19dc1c9":"d62a88e4f74022694b8c6117e1ca882da1edeae3704c446ba77159fdb8f754bc","libgit2/fuzzers/corpora/packfile/df8b4d163e9ed75634eb56467343bde73b13263e":"112008b54d05f2aa80a293a94234d7468ac623c15da47d8b5585054c6021a4f2","libgit2/fuzzers/corpora/packfile/e0184adedf913b076626646d3f52c3b49c39ad6d":"a9f51566bd6705f7ea6ad54bb9deb449f795582d6529a0e22207b8981233ec58","libgit2/fuzzers/corpora/packfile/e0905bac594c818b9cfa909269114977c4d6d1b2":"b4714cd84ab0b51293c704acc0f79884259cb139e9f5b9858a4214343420fb5c","libgit2/fuzzers/corpora/packfile/e0bcb16cd6b42128201e1b6454323175a7e412f0":"ae0dbf170be313a1ba07cfec88d7898bf10a8b2b6fa0461efacc02588942c9c3","libgit2/fuzzers/corpora/packfile/e1ac9563c33f4f31b3e147b9d2fef80fca550948":"ebf725be55096adeff694160b4d8cad47c1ebba470614285939fc9e8dd48092b","libgit2/fuzzers/corpora/packfile/e230c91352f1b07f6f34da803d07e75c06897b30":"e8f1a7e7bd2af4cff5632d7d3b8863078bc4c7ea28064115144916dc63ac8c8a","libgit2/fuzzers/corpora/packfile/e26b3bacbfd6603d021d4ddadbac94b7b7aa0034":"322cf637730efb6ef79fca7bba1d07f80cc1944adc63e24437e25e8c833312f9","libgit2/fuzzers/corpora/packfile/e2a6f8dc3dc5d6c859f19d6e0fa64745201df0a6":"764a43d33fb0ab9ed5d7c9cfcec8ef580295483231f14be3db6748f6b7497104","libgit2/fuzzers/corpora/packfile/e2ba004118345660b379df5147bfa7a39d884dbc":"c0b2d8f765e2414743a5b3c74b0a7b9f302de9625517bfbc2405530fd33af43e","libgit2/fuzzers/corpora/packfile/e45aaf139d726366a18dce9e4854ee6c82901677":"a612b1c1cab495d0f15a91ab991637a4c9f059dfba2f5b091d2e2e21d871916f","libgit2/fuzzers/corpora/packfile/e4b3ab7e8c18de815fc8bd6ebfd5d52cf1924a8e":"5ebc6e0563be00d16f467eb3ad50c10066925330d9801e812136d3732980503e","libgit2/fuzzers/corpora/packfile/e6818b96c50bb749911248959af81a9c412a0223":"6957278b7eaeeb4d4c0f3c1221cb5006dc72123b91c49c934a281791e58d984a","libgit2/fuzzers/corpora/packfile/e69f20e9f683920d3fb4329abd951e878b1f9372":"f67ab10ad4e4c53121b6a5fe4da9c10ddee905b978d3788d2723d7bfacbe28a9","libgit2/fuzzers/corpora/packfile/e6eb439fef7d5461bc3552aa7c064d24e44c5f32":"08b43112bb296295a65deb69bc63bc2958d999a9b297bd26ed57cb0585e28ee0","libgit2/fuzzers/corpora/packfile/e9d9930dc3fea44fbc7acb0d1ef4bd867f1c902b":"5be64c7ad54d3db215d0ef3f210b0aee9ae4633b2881f7d0072810bde509f1a3","libgit2/fuzzers/corpora/packfile/eb05b6ad73fb1f69ef750d0b9cb6c606ab9d949f":"60afaa675730f8ec6476db50b3d40686774533ca08f4ce54b058a322fb51edb5","libgit2/fuzzers/corpora/packfile/eb0814ae767e5f28b87c998b0f44dcf80814db1b":"d4322cebd5966ceb5083cc2c31bc7781f79697a5158323896c18a17a62019188","libgit2/fuzzers/corpora/packfile/ebbd9763912dd557d08abd1373c867a4b56e6a41":"d165a3ccd24ec544a957f94ba8703521fa770744eb0699fe34071a8d118a26b3","libgit2/fuzzers/corpora/packfile/ebcdcb7effcc3f06e0d503638ac621de877fc554":"d1211001882d2ce16a8553e449b6c8b7f71e61836efc2e416143808f20e721e7","libgit2/fuzzers/corpora/packfile/eddccafb2716adafb9ad48203f0621bb00ebc73f":"2d39b23388680948e0061be0bb55ceccde983d1e9648e25fb44dc24c13dd4ae9","libgit2/fuzzers/corpora/packfile/edfbf20c83d3cec45470105581f7dc8b7e0889da":"9ca35acacf2da27dea68e300d51034b0bd0c898fee8d0ee44f93f3cd2b87c519","libgit2/fuzzers/corpora/packfile/f03218467b1c74e465cebb3b8092e21a5122f31d":"2c0fd6635a29873006859b664676c0b75ca95b5e46b0b95266877085d29d3452","libgit2/fuzzers/corpora/packfile/f28600befd899a94bed8e62853e90655d614f439":"51adf8866db0f293c43f8c7a96b5414c4e84d7ee8d997bf31aa4e6e5b18a99ad","libgit2/fuzzers/corpora/packfile/f3b15185b7a9a10716752d58434fe656d839092e":"e65fbd6e85c58a5976b116f05a70007aa3eb6ff0381dc64940c87a94fd285238","libgit2/fuzzers/corpora/packfile/f436ed7933482610e08e18b40e9eec102b63b7d4":"3aad42ed5e354244809aa24d1fafb03215ee3d50ee4cfcacbaa87ed69fb3f1e7","libgit2/fuzzers/corpora/packfile/f55ea5b7c1cf5400aae56d7faf65a42320d0323a":"2c5f37766a0c3ff147a264a9c1633ca4418c82b76e8ffc6bb617a303e2b39032","libgit2/fuzzers/corpora/packfile/f5eeab2d009aa4984378df6bfdd89366b7ecbb32":"72636181279c39fee14ca021361f08e0f9c2b4153690906c6e6fd2da3411ce23","libgit2/fuzzers/corpora/packfile/f6250c8b3cc0510e0f8f621100be83f018e2d234":"87033bb0d6c87b837ed9b5fb618a0ac5d807260e30072777583ae6a2431d43ec","libgit2/fuzzers/corpora/packfile/f7168410c7158ff7331698930937f9cdc54f4d8a":"0dbbde31abdb54bd8ba54779851e67dd2d0942a1bde5c26fb35e3651c715b479","libgit2/fuzzers/corpora/packfile/f91847640af285c1b8a6df27f5c50686ed0deb70":"1bde3122ca94ad63260aa702d4146c791bf1cc05d4b2405ac7ce95d40a09e4fe","libgit2/fuzzers/corpora/packfile/fa58a6b2d3286a136a43afeeaac589d2dde0a2a6":"2dc654a3b45efbeb20547537e2b73ee72fb363749625e1a63fb87e4cdf4ed187","libgit2/fuzzers/corpora/packfile/fe3667be5fd2ffdd553ae04a534a2e9ce5445188":"b0c569bab52da58c60d4a6961391d5b372d0c5f699330edb016153d4da9208cf","libgit2/fuzzers/corpora/packfile/ff21cad92ddd105224408fa696e91080a8cf98fb":"338ebb72e8e1cfb7e2e06f7489ac532092b9d65a46aa84b11ab01f7c85d4fdef","libgit2/fuzzers/corpora/packfile/ff9804ac04790bd58cdd124526c00b920469b812":"8cec4157325a1241ec8cfee807c356c5d43f2caacd02ca673f70df3a9f6bee3e","libgit2/fuzzers/corpora/packfile/ffc54ca808e7666f250133ad0ae2185ad688a826":"9be3799f24592e94e1f7991e5f312648a509ce2fb1edbafa50a66b65c916539a","libgit2/fuzzers/download_refs_fuzzer.c":"5f3f912d61cf808a381acf89e06f9f9970d5ec8fb13a3f7f09249553abbd047c","libgit2/fuzzers/objects_fuzzer.c":"294be4de22f1e9ff962ad3da9bbc004538004c95af67375422823511a3dfd9eb","libgit2/fuzzers/packfile_fuzzer.c":"e8dfb5bb36cf4e861f6d22b0a8d534e28a9a4ee8b410a6d9a6d250b285953bee","libgit2/fuzzers/standalone_driver.c":"72972d4d1e4139d1188c4ba35628eb93f4c7729efee9d5be29078afc53960e7d","libgit2/git.git-authors":"3f26949ee933d877d7797c8401c5d1f77780d3822b495fee98bdb085e9e5c7ea","libgit2/include/git2.h":"1a691bf8a76c8c6fcb28e0206ac944f9ea8459d09e14ec671761e30ca1e1a976","libgit2/include/git2/annotated_commit.h":"b12f2427151df5fc98e3b4386590e1f4626a9d63c164043f9de10ae5f1c5a1c5","libgit2/include/git2/apply.h":"b24e7c2dab9a6659afba24ac4feb02b6292e6ce198d79f4420fce34925d4fad7","libgit2/include/git2/attr.h":"7f9b295d892edea98c0db8415ae3d737e48d1f077a1ed01a7f9e3d9d8e0a7b01","libgit2/include/git2/blame.h":"5ca64dece15d1b4eb350e8ec57b0ce46e6047879e721183b6203c2555183a797","libgit2/include/git2/blob.h":"0dcee4bb6a375edc9bf8a15e3836f87860ac0536a71a8b585da622ad7206b34f","libgit2/include/git2/branch.h":"0d5bcf381bd96bb39f8b49b28ad0c64a737655e47909b2ab71a1ffc9f169ba20","libgit2/include/git2/buffer.h":"6123f50ce96972ed89c1a4316ee1b91d4e319002bccb16d79b460f59c0a4524e","libgit2/include/git2/checkout.h":"1173d124aac04c2263ca842f1c8bb5285238757dd220718598b9eedc0ab39b99","libgit2/include/git2/cherrypick.h":"b7992fc8e527ca0839d2e118321d3ae959a04a928ed9c3a1a1a993f796a46607","libgit2/include/git2/clone.h":"4f29df3fbf99ef2b01f796f69bb83f75cdb7e009a35153f1a64e549285600d58","libgit2/include/git2/commit.h":"956328d15708148d554a693d08d1b19004e994d71a428ca04cc190dde612f31b","libgit2/include/git2/common.h":"8139d12115f8d348b41ecb46ee5f6edc151838673b4e20a9a661f1e1fbe9ac05","libgit2/include/git2/config.h":"679a555f7ca32970e7b19f9e68b0c5a7e0ea25d952890766c36aa97e13bb1a76","libgit2/include/git2/cred_helpers.h":"b6cab2f38efd56fe0da379bf9a19493f362018a6ae31243027b1ec5a637d1bd1","libgit2/include/git2/deprecated.h":"1db051eb9ace17425909a996f33f5f8d38699e8c0a842bc0553a978bf95526b7","libgit2/include/git2/describe.h":"08b3280fbb5c38c5b261e317380bd602948ad5c0c94c6073329fdb222c110700","libgit2/include/git2/diff.h":"2a99276dae3c1a321203920cf628058754e9231aa90a60174780d698b9c85460","libgit2/include/git2/errors.h":"12df1c336d588b024a84a733366ddb81942cdf1c6b3625a3ba811ce92079439e","libgit2/include/git2/filter.h":"4013f43c76c36bc5ee562f2ca1d5027b17f40760d6f69543f8ee96c0a9460c63","libgit2/include/git2/global.h":"88e49fa7593012aa9575df08755b907b5b613f43278f477e9ca8e4feedbe6786","libgit2/include/git2/graph.h":"9b70d4c291f69803c51e8859c416f5ff81850738d3c4d1cdca0a44247fbb7086","libgit2/include/git2/ignore.h":"266b8bbef564bec63b4fe7d1d3042ffd273f252f151bdec23cc4f77c0febb883","libgit2/include/git2/index.h":"71d68397c1dcd4c2f42aa62d446ebcadf1faf3d63613b33792abeefb11d7ff21","libgit2/include/git2/indexer.h":"5906bf9d3bbdf4c4f77e51362dace7d769943d8620a62d963b4166b5f8cfd735","libgit2/include/git2/mailmap.h":"4f0d18eb0ab5ffdacdd716a9649319683fb84a33627bb4dfa6fed8aedff55d73","libgit2/include/git2/merge.h":"b526cbceb438feb65753f8c585d9a8b8f733058283df7b22e5794c46639a1d9d","libgit2/include/git2/message.h":"dd9a84083afa7835e4445e444d85756458133ad34c96f8529c2ab942e8ade5a7","libgit2/include/git2/net.h":"aa6ce5cde1a1c0dc586b3ac22bfd68689505d05fd91ee4c128c0225fdc7676ca","libgit2/include/git2/notes.h":"85a249b9ea66da28802dc0e0d93f0217b14e2c5cd621a2d4353e43308f2d905b","libgit2/include/git2/object.h":"1131f42da0ff2fd787b8e11a6813504dccd4816984eefbe872bf438cc8744877","libgit2/include/git2/odb.h":"761e49bde27ca0539f1761566b25eacf959cf6c2f4e9e13b2492fb6162f00ffb","libgit2/include/git2/odb_backend.h":"0b43a7072550a54e2d17494f6d7709d9cf0637643cfc07fe3f2e62296c4ccae4","libgit2/include/git2/oid.h":"8f07c6fad392eb2d50c09dbf64f391d14ca5c752c211a9e3ee248c4a13580927","libgit2/include/git2/oidarray.h":"9b89c71035101bd1c315c192b72ce50307a679d212ed4be53c68af74f1d2908f","libgit2/include/git2/pack.h":"e8db34362fd7e4243cc52e2b1d3733a427772cc78fb10b2d355fb54c9bc90318","libgit2/include/git2/patch.h":"c9dfe91324fa0884c154953f1645b6354dfdca3b551de04032399e6de865945b","libgit2/include/git2/pathspec.h":"5b482e78f28b084ba7b399b1f4612e58c7b8077e56403d5cb8f2cbec8798eb0c","libgit2/include/git2/proxy.h":"f15d319f1eb226aac56bee8a0c739608413e4bcaa6b362a47aa3e1ac2b08f308","libgit2/include/git2/rebase.h":"6fc70640891e32ed1fd4bb8d6b824b3e3600e2b1ebd3e4e58e3a736cf7b93992","libgit2/include/git2/refdb.h":"77a1b09f4ea49607e7dbaadec51680316e67fc574f822e7f5c92e6e0594c3905","libgit2/include/git2/reflog.h":"c3239c314b3d7bdcb056dcaf7fe31834fdc5905bf98f3e6682d11ad7817bcd4b","libgit2/include/git2/refs.h":"3b624a6085b13d09f45b8dcf3c7ae009267e8d0e52f8fae23e8446855f85eb13","libgit2/include/git2/refspec.h":"3fac2002e7bcc36fba7e353e728846423c121520e8caf00836d232493eda2db0","libgit2/include/git2/remote.h":"42a00d82174e4b883a9ab0f73fa097ab41ec4b6e8db372f674165f0d3e84d7ca","libgit2/include/git2/repository.h":"a5a4fe437d2102f79a7c8d316d0572d5e2b60f7cd599ebaa5f84a5cfeac4d6c1","libgit2/include/git2/reset.h":"303c3b9ac582a59000be80c3c2acec5eaa50c207112fd42efae77e6f3a308909","libgit2/include/git2/revert.h":"fdc9b2a8106191b36edac31d586375f82257614050b1d75fdcd0066e36da2243","libgit2/include/git2/revparse.h":"3447f28f4f811c176bcd43040f68a040111e6c46ad18a3b3fbbcab805964ed5f","libgit2/include/git2/revwalk.h":"5e44012562372dfd07905944b5aba5ca7b46112a23b6d01ffe390884bb40628e","libgit2/include/git2/signature.h":"c4562eb9a73f0f58fe575f040bf4a81fb9228eff91a8d4e22bcbb74007ff23af","libgit2/include/git2/stash.h":"0ec25781eeac85f917bcef432f0eef7c96d7552f18a7cb20978004195884ddb8","libgit2/include/git2/status.h":"b93481ba78d6c76c3bacb7549ca2350c39a9cae9f14639bb07b0328fccc633a9","libgit2/include/git2/stdint.h":"f8e051fb82c10f81982ed3df4fb7572245112567c749a8e4b64883f5cddfc45a","libgit2/include/git2/strarray.h":"bc8661586c2ec8259135dec395514777d0be3fe8078a29ee8be8375d6b4b093f","libgit2/include/git2/submodule.h":"fee3e34b5a5eef9d75b2f6d82ad70308f515495170454572308985ae305a78f4","libgit2/include/git2/sys/alloc.h":"9a19fb88e2c70146520d63e01778e22938976a4b754e4bb9e487c4d5a2ca486b","libgit2/include/git2/sys/commit.h":"3d1b2220325a82983ecb271c2eb8383a8db134dfc0da96b1f050f3664871252a","libgit2/include/git2/sys/config.h":"7888b5265f18640820d43f8ffc31e3e6b3153398ee2851d657ae8b28bdcd10a4","libgit2/include/git2/sys/diff.h":"e341f693acb25645f6ed47c041fc4eda8996a6f1d42905ae4f87fffba22520f3","libgit2/include/git2/sys/filter.h":"0c03098a51d5cad022dd317ad5a5837ff624f96fe36ee82da1ed5416426f0a52","libgit2/include/git2/sys/hashsig.h":"5677f86c02e557c7897e98d395e83d8168c532916ecfb7f9ca5bf7b4057141f4","libgit2/include/git2/sys/index.h":"fa99895949c987b7d40f47f5f6ea6e7f2dcfacb6438e59af7bf3630a7c7c4fa9","libgit2/include/git2/sys/mempack.h":"46f849ec737da6bb31bd35f3a8b0cc495d8c7f296d1acb017cab0431928d437f","libgit2/include/git2/sys/merge.h":"0f55133387914d5184ed517f3f929efd69090dbd503d75ad2fddb89e180c4655","libgit2/include/git2/sys/odb_backend.h":"c409d3131c51b1636303e562e070ebb2dac83bba6309f08d5c8a97df76a123c8","libgit2/include/git2/sys/openssl.h":"011d45d1991a7d4467b5de5c574718af5b16198fb1581639845fd8d07bef7758","libgit2/include/git2/sys/path.h":"97adf0e0751e456546c7c0119743e50aa428fad8a29184fcc637db1eaae08b67","libgit2/include/git2/sys/refdb_backend.h":"7526b2a43bc895c18bc164797001d8983f0cdd3e20ae19690b2ca9492793a858","libgit2/include/git2/sys/reflog.h":"c307ce8e9c8b0483ec45ce34a200f74e1ee73bfea9c4c7b0cc3923e3881360ca","libgit2/include/git2/sys/refs.h":"ee98c1aa0596b1cb409795a94de4891392e1675c42e8877a1e38bd0a5c3fd2d0","libgit2/include/git2/sys/repository.h":"7011981874a2325ea62ab21b0b074bfefb0ad729f51fd1d7a762fc3af883c7d8","libgit2/include/git2/sys/stream.h":"6bd6609f2dd2acaf7206c9542a02abad5439a6516f1ff160f1df040da33ad829","libgit2/include/git2/sys/transport.h":"0fc49f1afc74351bc8b106820ba8db8a446867dafec6b22e5f80c48dd41455d7","libgit2/include/git2/tag.h":"340f5aac9a05cbed975f5bc88522206e545fa4ecdb61b74929c8a36aef339f14","libgit2/include/git2/trace.h":"f9aaff56cd6e6ea2dc5f7e221f198016f7d4a947829340a45c12714bf32f6738","libgit2/include/git2/transaction.h":"4c7969130a952134c597e84a06f38ca4b19e0b372df88085cb4f846292681c5b","libgit2/include/git2/transport.h":"6d251fc43464195b1233f0bc4dd4e916cb800fc969a4313e988221c33ba36d0a","libgit2/include/git2/tree.h":"f78fe72f8fb509ee87a6e08bf9710f994c15408674901de8a776270c69f05b6c","libgit2/include/git2/types.h":"72e7d4ee4e4e373f03173c90f4ce44097e0eb553a4d64a2aeff448a4dac9da89","libgit2/include/git2/version.h":"6708c1341871e3ba8a525c63fa536c5b636464cf72f57c06de7b2f5b22d8c2d8","libgit2/include/git2/worktree.h":"03bd587205770db810df538cabda777f60b7e40307180748871ef7ef7dc1d511","libgit2/libgit2.pc.in":"e03f55b445ac78993a06b2dea6018acea775a38161687f8a583d0de371acfe8b","libgit2/package.json":"5b1e6e439e5df09c82cc7cd5160ebe239e5adca51381c2b31f790b89c7f0da15","libgit2/script/backport.sh":"6ef93a8c4a15ef74d2639638db3b24d20a76fc31faa53b1c34b07e3759c78fe6","libgit2/script/leaks.sh":"62532838555750cfdbff91709c40b1c1356e399238fc29379a45802922530a51","libgit2/script/user_model.c":"073e0b631f2d50af9c326dc009c626dfb9d31707d36bc61396ad9960160652bf","libgit2/script/user_nodefs.h":"4287333a6d7484a5a5796e6deadea53ec1ef587e4c571351e3fab61cf8badb45","libgit2/script/valgrind.sh":"13d1e34010c351992ac5950dbadf35928eaabfc9ba3acad336e7677fbda0946c","libgit2/script/valgrind.supp":"2160c174eda0e9a6bf2f9d39e967f601111703a06cc9cbb523a88e73d8a24264","libgit2/src/CMakeLists.txt":"000987699943bb08407eac146c5c08efb8c30dd015d55a43c80d0a1c62c89d61","libgit2/src/alloc.c":"83963ee373f9435e8eeb118bf412db0f96e3a918cf6dfdd0483ec9e26a70a3eb","libgit2/src/alloc.h":"0897973a8dd43caeedf3806771930d163db62554af8efc61b1c536e7daeb4052","libgit2/src/allocators/stdalloc.c":"1b81cf6589dcc7413c1a6ed7d0183689cfea619768b3b7806ba311ce6d6b3cbf","libgit2/src/allocators/stdalloc.h":"fe632f78c5cb6a079cc5f5dab9e7381aa504dc6937a0222f8de996c4f1f74e9c","libgit2/src/allocators/win32_crtdbg.c":"1324acacbee2596b05f79cf594d1f472331cd918633370795f714ffd00c85daa","libgit2/src/allocators/win32_crtdbg.h":"ebe0dcab46def4f3586a0e981b8bd5cc82e0ca35a62e3f17e0470933422135fe","libgit2/src/annotated_commit.c":"47148878a19e73a5f74ede34163af39f6c29ab6d106900845ac450240415a01d","libgit2/src/annotated_commit.h":"0c685dee827676a1d9548cb57d017fbdd20bade9ea78da62a1403e078b1e2fe2","libgit2/src/apply.c":"986250b0e569585b9bb8fa36ce6595283f7276ddbd90593ff54add4cb8c0ef7b","libgit2/src/apply.h":"f506155358417b3d3b9b56599228e28bd757a23713e74cd049c393f4ce9d1a03","libgit2/src/array.h":"97e942c6173c13ce665b5f4d1e6d82b3dec63ee8c0c511d8df31db04e8cd02cc","libgit2/src/attr.c":"44da9b02f6aed86c3481b8018a59d19e0c22df0b7059852ce937d783756eb04b","libgit2/src/attr.h":"c940426d88f00d1510d2698897d5fd1b9270d91ec0c86a7df10b9d07f598171e","libgit2/src/attr_file.c":"5dffde5053b4d0908d81fb8cda2e1e4ce33257d8c96c32de6eefe16bddedcb1e","libgit2/src/attr_file.h":"3237c0e012aaff478627db897e988e412c7ecc7f04147e35678e5bf3b1cc4e1e","libgit2/src/attrcache.c":"dde42365c6e80f9874a1eed7d3ff6b1e0d1df1c59ea4738541ac5e6fc7f2d7ae","libgit2/src/attrcache.h":"4d151f08fdac02168ef71426b8669da440e81925a88e89815efa8a08ddf5d3ca","libgit2/src/bitvec.h":"281444c865be87104cff9c1b3998877a67bfd92af4b0e5b9b034fd48f6569f7a","libgit2/src/blame.c":"d209f7b6d056075b82d7277b0dcd11b3e3f238c0155ed48726833d54f446ac08","libgit2/src/blame.h":"c1b0660a201d27ac53e781606bf51e60e89d8609982e9ef44bcd3c061853f6a7","libgit2/src/blame_git.c":"e786245d10bec4f7fcdbd7db9c2270fbacc19ac82947a07948b47802032f61e2","libgit2/src/blame_git.h":"9b813f16b93512d27d93648e53d1438d5b931024701273b5976c1da41868e286","libgit2/src/blob.c":"bdcbdc49566beaf7a3c5e6689158f29f29a83e776f1a9b9688d62ff56a1fd64f","libgit2/src/blob.h":"d72bcd2f634e3023aeb7ed03375b143377dcc5a79f77bdd42dd99d326d35b5a0","libgit2/src/branch.c":"b08c5a25cb239e338875fd9e226638c318932343713827ab9c91d0e595923e70","libgit2/src/branch.h":"c73beffe8a3a21390d49f5cc99601accb3e03d82c150be70da823548e031b6d3","libgit2/src/buf_text.c":"cb7a63ea17db38ae7f233d18537854a6bc5af73eec41fecf1575a5f22f49718d","libgit2/src/buf_text.h":"4ec92a3613a02bc4ba977680e6d96e2eccf0563d43a9693232f8631866174e96","libgit2/src/buffer.c":"2758b37c0869e9070a16b25df656a58fae45700d84226134e40b63c4204a6fba","libgit2/src/buffer.h":"1c37582179cf04f2746f482ecc0c04629359d942ec37589223a6fd4efb3d9ebf","libgit2/src/cache.c":"0a16103749f996c0c3ffc4ce95183774191269a6b1f8a3165859ca3a9a041255","libgit2/src/cache.h":"90e470b0f5dc2f1c9b61bb9a63970b55111270d93a7daa467b8d0792acc9841f","libgit2/src/cc-compat.h":"18622830881547152755d21f95feeb1cf8fe29203b7e35255979539fc572e4d5","libgit2/src/checkout.c":"c2b03be7b6f0ab7166a9ef15a4bfcec1817d238d05daaf29529ddbe8850f4ca4","libgit2/src/checkout.h":"deeaae59fbd6f4cb3d6c5b67133df66832ad3e49bc9585b6ce9c5d0aa4aa6ef0","libgit2/src/cherrypick.c":"9e5d4e0fcf51c94bb41b00e7ce3fa5ee71e37c39b6a429d5ce76c454594697e3","libgit2/src/clone.c":"7075e2b7ecb9f64af7b82a22caf8b23ab029b57ffbd7e86e6d9ace29213981df","libgit2/src/clone.h":"b6748c9ced7f93eb57f967679b67c8381e2fd038921aa4035a4e24ec482d6f6c","libgit2/src/commit.c":"815d73d0fdeb7b0c84a3c7e1010078543dcd3cc3ec86adca1da38005b31d4504","libgit2/src/commit.h":"6d46760345b792062679a51471449ec69ffe19079a50f312b51c330fe6a0b519","libgit2/src/commit_list.c":"bc5462b92b5152ad1c2f8edb48a173786d4ba2d09eaa825b8412dea784d59ab5","libgit2/src/commit_list.h":"8640d671d1785f1be371f72b06c332675ae85ab03c65db12b7beaea5f9098c11","libgit2/src/common.h":"37ce11f7b107c6255c30fdc72e1395a398dc6783c71fbd081477e2b60c396e06","libgit2/src/config.c":"c75fe3a6963a1958dfc9d86cc4e0e45e29d73620125f625625f9f7ff5a5ef78a","libgit2/src/config.h":"c37e78949ab85b1b4694cc39d494c9990e3b7e21f98eee79325645a1382ecc5b","libgit2/src/config_backend.h":"961abd79ac486562873d45ceb8836eed9b08c7d4f49f8a68705bbae99f635d1f","libgit2/src/config_cache.c":"9c69d28a6ffdbb049b1de1e653ea94f4fa1059c5b11dc5063539bb6e8cf8ede0","libgit2/src/config_entries.c":"c77c69bbd856a1e9718951071595ced785f2da1c6c82bfc53045ccc53ac1d806","libgit2/src/config_entries.h":"e59e5495d52ae8aa55dc5fa50b3ed46f50d72bb66fd1fa89d32cd42891a1c05c","libgit2/src/config_file.c":"628a814ff5b261fb05db87ac45d3d4cff2a977af23aa95f473aa16325c6ff239","libgit2/src/config_mem.c":"93cc70ae2915a209f7f8e0455a261b2269ab9d9487ef69c4256d2496c796ea71","libgit2/src/config_parse.c":"86709c067f116af8902a8c9df794cb9e7bc8612a0022b928f0bbeb582460abe5","libgit2/src/config_parse.h":"ed2e0138e13fc0115fba047c80687eb20778984bb2ee13c261ae69893e11e5a9","libgit2/src/crlf.c":"4b7c6b911b3cc1dbddec34f65f529eef98f7118323252eb1572a70c30cf41713","libgit2/src/date.c":"f25e34b3a37facbac7db64d60708d9021d0fe2a2492ebd32432399e0e3ad7e90","libgit2/src/delta.c":"0496cb9bed8143c043145e30ef7702441d1fa919a48edbdc203f50816e33ce94","libgit2/src/delta.h":"c757526292144083a0e96e7ab259080e83158e28c4819c4fa8bc2523aec12a59","libgit2/src/describe.c":"660cf42bbc1dc405e4e58e0a50f1d82552514be7656d73bc7f06b9bf3f2b9197","libgit2/src/diff.c":"6a7d06a34c2e20c71299cd9f22d02c90ff495125cc5696474aa92b7cca235afe","libgit2/src/diff.h":"06fc73f98ecc56a5788c0ab2ad8aa68e1fa06579ea1695b1fcba0e0e3a0775e3","libgit2/src/diff_driver.c":"70affc564ae415d1d1339365140a2d539da645dd1209deba0145e8f6364e11d4","libgit2/src/diff_driver.h":"a59c56162e5ee30af5a831b45fcf60833a5a622c05a97b6ac052186a507ded01","libgit2/src/diff_file.c":"03f03169b6d9f6c0295e07f699abc94639b1f41ba1e31eb200716adb7c7f4df1","libgit2/src/diff_file.h":"c4155c960e8e6d773b86161ba01c86f2be5b3e7fa0142747ae6ba1e039676044","libgit2/src/diff_generate.c":"66d846160085efa7769f502f92587d82472984e77260aec5e13476f18faa5514","libgit2/src/diff_generate.h":"49d845bd368538b4f255a2248af863f62c60e695668aea1ddb089c66e86716bf","libgit2/src/diff_parse.c":"18044ddb139273030e4c9e1e328d1e74329a75d03bbde3ffe71f616343b9dcfd","libgit2/src/diff_parse.h":"8902d9ba9102f10898c14d0a41a8d5823450527266908cbbb06e676309e23f56","libgit2/src/diff_print.c":"f6894500f810dbe73c29d01ea2c6f11eeeb4dea87d2458364b9899f9f10f03f4","libgit2/src/diff_stats.c":"566944912aadcc49e4cf6de41b85892480a8ed8707d19439c776a7c48cfd7c85","libgit2/src/diff_tform.c":"152940bc118880043cb26011194bfd580d75625ae0a310b970aa581b3f7604fc","libgit2/src/diff_tform.h":"a4a7433036cefffaa9d968ff45244afb4957313cd9c28980cc102f172f9eaf5a","libgit2/src/diff_xdiff.c":"5f4b6667b2cfc4ce04e37dbfb0d3f5e36a98cb6762e45b8182af2f993f9cc07f","libgit2/src/diff_xdiff.h":"8d083e69b9b90a5b937fdbead37dcc8e000495a16a7139ec600dda735285561a","libgit2/src/errors.c":"580330af95d7dea03bc547a48cbede57ff079f1b921a54c773c84c9157368995","libgit2/src/errors.h":"f71e32f9df35e257c371d7249497f698e8f8429352a250a87cb7ae5c37c88979","libgit2/src/features.h.in":"fee4fd59d18c3dc1c85fdf613cb72a500c108df6643269f3f97a7281a7e69fcf","libgit2/src/fetch.c":"6106680e57ad4834905e2afc4646ef94093b670d3ccbbb7c96dfbb1b5135240d","libgit2/src/fetch.h":"93669dbc5007dfe99856c76d35ca82fd25bcc59f3b5308cd0ca15a14d9fa865d","libgit2/src/fetchhead.c":"a305413a856866decc437bf222f36971b7fbaa488a2f298cda161f8c8f9d963f","libgit2/src/fetchhead.h":"65681769629f670afcf739d582bb7ae90f702f0c6085de3f26b79fb3293d1dc7","libgit2/src/filebuf.c":"709731f48a87a4d8e46c40df8697da9da703d6093b5da1c9c94eed9e02c4db94","libgit2/src/filebuf.h":"addc0cc02b56a9e0c60b334d51cc1fe68bcac82ea838d3189dbeaf8da46340b0","libgit2/src/filter.c":"2036db97cc5696e1b15694aa7cb549e3d1d08094bbe8bdcceb6dc0589d0b553b","libgit2/src/filter.h":"cd7edde15a42f16c2c30e431ed407345c7663c1f14a20c4b525ab1bdbd736797","libgit2/src/futils.c":"ca1197653b03f494c60aaad9ea7d0082458c8e5b9e4cd5f1cc99067b34fe41fe","libgit2/src/futils.h":"2c3c19c8077e854f4e060c67766c577a830a3388ec013ef39026003c4356c990","libgit2/src/global.c":"e43d735f0920856afde996c9e17e027cd429919759688ebd4c6b0700965a7592","libgit2/src/global.h":"20e6c01113aa2e0c374f2e2fd538d7e57d781c78e3aec1e15b7da69dd5830032","libgit2/src/graph.c":"796426d52cbf8110cbed8db369ff88752c8100de4fbf53da31dfa9b0044632dc","libgit2/src/hash.c":"e5bfe87d2cfe885ac3fbd39da5984c5001c4570ba08fe658f1cfe1baf5ad5fd2","libgit2/src/hash.h":"21543ccdf119b879313e5b65fe8c3e4e381523f486859c3897cbc05b0a954ddd","libgit2/src/hash/sha1.h":"9349e5886a08c37d57d32e73b83470f9da658a36f06b6bdb79a43d15fbb51093","libgit2/src/hash/sha1/collisiondetect.c":"a2155f06ce5e8b2d6022008402a479b866ddf8795c11779138d6345fff9788b4","libgit2/src/hash/sha1/collisiondetect.h":"5a1a2a35d0fe5a9e61f4c65fa07e68a923601ad12e0bc14de0d64b634dc1270c","libgit2/src/hash/sha1/common_crypto.c":"7b5be0a2eeca2e51722f6019a98d3e815d2f8c1191e14f36baba6c53be140510","libgit2/src/hash/sha1/common_crypto.h":"bde45e520496280b52c9fc7eae9c987f9f0f2a29a0d4c42cc0a451df3907897b","libgit2/src/hash/sha1/generic.c":"4bab2be3f32eebdf1ba71c71b32d1762eed40e1be4b1e012fe7900a88789e00c","libgit2/src/hash/sha1/generic.h":"b754e12eb4ab867b23dbb241b4f0edd277e42591ea9495287f098baa4e2d3fe7","libgit2/src/hash/sha1/mbedtls.c":"dd4e318b134cea917f67f5184b0aaf0266695db24a4da91d83b3cf9ede15201b","libgit2/src/hash/sha1/mbedtls.h":"be359c3f5006ce661cdf344c857f2725c8a5722bf15e300f5bd30a532f0e900b","libgit2/src/hash/sha1/openssl.c":"0c08735687474fe9da3a2cc21633a0b8c3435dc6101da44b45554f37ad9b2885","libgit2/src/hash/sha1/openssl.h":"ee9d4c8091b780c475b1342e2bb7d7934d2948a2938caac197cab7464a67819b","libgit2/src/hash/sha1/sha1dc/sha1.c":"f62247c8406698760eec4dad5e02f5de4e59ecc76cce8d8be05c344802df5e6d","libgit2/src/hash/sha1/sha1dc/sha1.h":"78f97f092c20329d1fa8d9a8cbb3d53bb90be19cbc49f1917605a9ddf520de83","libgit2/src/hash/sha1/sha1dc/ubc_check.c":"7b0db83569ba82965dc0d16e51e9ad85167cdfdab343f9a02c2c475bfdd93956","libgit2/src/hash/sha1/sha1dc/ubc_check.h":"4a140693701da167b4709c4c1b330800a0c29f2a065d0d819567a27b3171a09f","libgit2/src/hash/sha1/win32.c":"168d9ff60a46d1e9c8ad3625aae210a988260d443158d2a952b73b6161e149d6","libgit2/src/hash/sha1/win32.h":"e63dbd03dc247e5673c106a9036cd515efe2e9300f55d324070dbeb8824c7fdc","libgit2/src/hashsig.c":"21f4673d7ee3275aee03f430878939b808e313dc90cef1796fe09e4b4489e357","libgit2/src/ident.c":"b4d8d98ec1cf7e1fb395f365ae8b7c1ca88ca8a66fd9d4da5698f2c6a86e1c12","libgit2/src/idxmap.c":"84747b1521524ea3ceed1be16a27777425d3e7d6fb2a4357c7b1cbdf5046b3bc","libgit2/src/idxmap.h":"162a477b8faa3d37e83fd413bd53f6ba2801c1cf64a03c29513601058a6ed40b","libgit2/src/ignore.c":"c803d7275f9121c9a477a17d86cd6db703b32389fb611b6c1a4b84cda3171ce5","libgit2/src/ignore.h":"8189ffe01ffe66489fa19f26c960823ba781e5eb35d93f8ee655b06da26ea96b","libgit2/src/index.c":"424fa05e251a9c43d14c5fb9fd5ced86c398fbb2be1319489fd44f2e6db764de","libgit2/src/index.h":"d78e2bf5780e913f932f2a6d70fedfb2d81a0c8f00f16eb2db7386feddd90e22","libgit2/src/indexer.c":"114ab3f53705d5aa5905667f9d9a23070aeb4ec64a1b6e32671d6b43a21043d0","libgit2/src/indexer.h":"bd32fd65a3a7c6014e3e9846477b060033102c8c7baeb097506074f99c50a434","libgit2/src/integer.h":"fedd0377cd5959cdff544f03357541b4b0aed80c2d0a960cb7075b2042f4045d","libgit2/src/iterator.c":"0c05fe63247e42e7d0096b4758d677c9647d19e20043b202946d8d4e1624e2b7","libgit2/src/iterator.h":"3c35704a3eed44649d6ee95f99ea6cbe593eae67638f6b4a115c1537cf844bb9","libgit2/src/khash.h":"5ccd2817f881db49681ce72f39a3dcd96044589617df567b8f75b870619f01c5","libgit2/src/mailmap.c":"eaba2e487a28ffcbd6f9d57752e23c597dc1892cda34f0d56c5d6f48e874e1a7","libgit2/src/mailmap.h":"edd8723b4c861c855708f2d7f9ed5e37cbb7523534349b0f69258a3557b93b36","libgit2/src/map.h":"af71c423780870aa68f525aa0db4ebfbc4f84e46bb9105f14a4c60990c54719f","libgit2/src/merge.c":"89882d08b03ff314da664d10825cea6df0587bb51469a4ed62911dd38d7e1e99","libgit2/src/merge.h":"a82c5435c9b9b25cc5a47c5b1396d92349238b561b537184cf7bca57ae2650de","libgit2/src/merge_driver.c":"3e1235159f8b0cde388c4609077bceb4d7b3a32bc17114c392370ba4786d54e3","libgit2/src/merge_driver.h":"4f56c2965330a5cb08b9f26d6b83dc4e15fced9419540d2d793f2e75049bc121","libgit2/src/merge_file.c":"357cedad56215232038c15bd072e0b081a2d87407bb8fdb591d2d25ba9304bc1","libgit2/src/message.c":"3f8b9aa487cd068319c6ace315d77824e28adf2360f8c96182952a3efcd341c2","libgit2/src/message.h":"7cabd6fb3da32197a5564061b2f4461551263c207810add923250d9127e3e537","libgit2/src/mwindow.c":"896bc03ca0b2a9426424862d4d35c61cdc75a76dae79ba2286ee5a62d6fb506a","libgit2/src/mwindow.h":"38a5bd0f5cbcd5d5b2c8fe5b31567c1d5be7d92f615b57b7c139ba2b2e8dff95","libgit2/src/net.c":"c2c1e5d0e259937fea5f94d7e143888c0de61cfec572fd115ef03cd47ecc0adc","libgit2/src/net.h":"6308284bf525458cee607a3039a13fc874a6f4826866c47d5bb68b2d6868cf33","libgit2/src/netops.c":"09dfd2d9df2cc0f3cddeddca55c341abd08c0c33929cd54ade4f6cd6ceada7b8","libgit2/src/netops.h":"e0ea56ce01b021979cacf459846d8292d9528fb2f91577b3ec7b98a0574736f6","libgit2/src/notes.c":"0e207dc3751ba0e2bc437255241d7d1754c67f23d827efe7bb466da18cc7fafd","libgit2/src/notes.h":"650f92bbf875ab194b9e1d041f06fb8332bf5f402ea49cde528a81d2eac05694","libgit2/src/object.c":"a814f850fbf823fd0b2d5b2a892a56ec03612481eedf3010a2b7ffdc085cd0b3","libgit2/src/object.h":"320c9312a016f82c736197e7f7041d4366e2b6f97c60d0931c35523287e72a03","libgit2/src/object_api.c":"ac963762a903ea36adb20f0d4317388159c23828a6e26e9a1b1333b7a9fa1317","libgit2/src/odb.c":"4212ccae93e7440f9463205639045daccd7732791cc8e5ab44b7dfddb182184c","libgit2/src/odb.h":"6691e97525aeba2df13478f8e5a9f5944f40986e1581d4d0656fe7c6b8611264","libgit2/src/odb_loose.c":"82bd4482ea8029a97edc1ac3b1c965191677e36597fa60eb59bbae54566425c8","libgit2/src/odb_mempack.c":"88bbae0267f0b66c1db9a753aa7298eaeca43e8e085aa31eef0553802a93df0e","libgit2/src/odb_pack.c":"1c3b851dd769793ac2506f7354fd2b7e2f24f91715865240ac1caefbeb723f7d","libgit2/src/offmap.c":"64da9efa0f38ba066af8bf29f4c734b0c52cccf728b662a60bcc1b8110c3596d","libgit2/src/offmap.h":"c0f1515c9d67730d448a96ddc86eea76ec28193caf18ccccaf5b9b9a5c94e5f5","libgit2/src/oid.c":"20d95155503e28089a949b8a563f93a7d9816814cbd215909574a81447275402","libgit2/src/oid.h":"322eef4b2dd9b1f78f25b59034491f3547353655d9fcc9b6fe5a1ab348cb1eca","libgit2/src/oidarray.c":"7574a777c9d92ce2ee3f0b24673fe43c4e5fdaf4203a281c2a69f658523f2025","libgit2/src/oidarray.h":"17a745a4d1f2c464b91080279fb4a3163bb39456be5c7e9d6c8195724cc3cba4","libgit2/src/oidmap.c":"72ee7bfcb30cc05e73e49962aa1d09b78060272666420bc2b31083e18cdc2384","libgit2/src/oidmap.h":"7aff6a1568632f38f2acea1a526e11e24b42fffa7b05b75ac53ce18b9dd70e42","libgit2/src/pack-objects.c":"2d50e571b011d82c5899a060da7cd4738d3c68b710961099bcda618ec0a510ed","libgit2/src/pack-objects.h":"aedd54a7fdd13c69c589644e59aecc23daf33dccaba63c1285f4500f06aeeb92","libgit2/src/pack.c":"ffd54bf6f26e25369aebb15751410595589c1a5efa3655c3fc33ba09656922f9","libgit2/src/pack.h":"a419dcb04291bd4a2a78d87999066ef0289b359e9763eb4730482ee97633eaf5","libgit2/src/parse.c":"56cdcbc1b5a260770ac25d0f23c7ad7758f233b651daf8b5c3d3d897777147a6","libgit2/src/parse.h":"562e93ba8278eee0440af1865f2b6fbf3df37c9f2afc938e362f6f932c8f6cf9","libgit2/src/patch.c":"de8939e05e8291f1b8e57125b1ad3a8b849f77a7d40815aa2b8775d8b97b96cd","libgit2/src/patch.h":"b6e844a48af7a8729c37f9bab8dc794907534ff723543260781491c133930120","libgit2/src/patch_generate.c":"1c4b7d0b188a9a31c2909c421e325b59d506ff3733f891db710d45f33b909ef7","libgit2/src/patch_generate.h":"396a726fd8546630bfc85fb4b1a1fcb3e085aca4b7263f0042aea1b12ff02e35","libgit2/src/patch_parse.c":"8f49c4d51645656cbb726e3e4341c14de85e68945211e8f17ea39d22e93f55d7","libgit2/src/patch_parse.h":"6883a184830f4c59427177eba5462d27737706a1be899db35423c5ad9d6c8c4a","libgit2/src/path.c":"82bc8e2d24363d8aa584f64dede20de1623a7c531f20ef04c553a4e493d37a13","libgit2/src/path.h":"43d1eb70c1afd0b5bb9ec706766195fe768ed2d7fbfdf61e3a1fdf41c4cfa467","libgit2/src/pathspec.c":"a26fdc61468915bd88fba19fd333b547157361e660037f8ff9d8d4c7f1cdd30a","libgit2/src/pathspec.h":"405f9c8598735d84951b8adc40e66617dcaf20f5141e5caa187cb638936041c4","libgit2/src/pool.c":"c78c7f735573033fd0482e06af475d749b326e1bc176b7084b37bca39dc340bc","libgit2/src/pool.h":"a7ae90a762be159937bf9399660bb9be585a0dd0f16cd6d95c1a51bce1d6d29d","libgit2/src/posix.c":"b9c8cdf28c7ea2c1e6d135645293f54c36d48ba0734e0b72bce4f39673824d63","libgit2/src/posix.h":"58b304f9cfb3399d90f62d53c08ed4d0c86e5b951ef1f0ca03ea7fc98d934e85","libgit2/src/posix_regex.h":"70be277c3ef62f3fe322b21275d4118d2c69f29337cd36e295026c50a7e7e78c","libgit2/src/pqueue.c":"d5cd8f6c5639b50898fe0f9354dbb29de1a0be1d20c879242c8423907466c7c2","libgit2/src/pqueue.h":"c4c98b6e99fdc1ab33906a1d659ba113a2048890928f158e9031caa35e385991","libgit2/src/proxy.c":"393f47f681916735c25ed844840d9c03e4fda4389cdc59cc3ce5c94ccacb2bb7","libgit2/src/proxy.h":"e195b1b88c11f9d02aa8f02925fd7f11cd68c0361d0e7a6a477f4a3a5cceb896","libgit2/src/push.c":"b6a7b46b79375c4f501620b21d0c46b4d426ee8ca06ee0ca0f2d4eeda0b1a059","libgit2/src/push.h":"aa327d0a24e838330230c10b4b67431e0ea0fd7913c3bb8fbd24441bf72fb8be","libgit2/src/reader.c":"779bb37bb66d36509549a1d286fe8129a84a220832369e874b2ba594f91b3c85","libgit2/src/reader.h":"7c5c2aa3805bcf813d2ef84373fa55d06c7c675b79854c4fa82e77724a5d575b","libgit2/src/rebase.c":"49ea8649966c8b75746277a4b64dd4e5d9aab952d9feba1fb98008cd5b5cc0a6","libgit2/src/refdb.c":"c9531a351c3a59eeb30f19aff48546d970d67e0d19bd19ae1450c888323b387f","libgit2/src/refdb.h":"56c3c500a704fd792eba6bc91546482e97cf038b08158beece1c4cd69c87071f","libgit2/src/refdb_fs.c":"f7b0c1decdc57836fe910c21fe2316290851a1b98150664fbd9230ade98ea731","libgit2/src/refdb_fs.h":"e981d3df86d535ea91561853a7754419a2c95a3f72313171f5f6e0fe6d1ecacd","libgit2/src/reflog.c":"3894d9a1c4a20bb208d33f2376fc592a2c24388ed04aa906fb9a6eecb13d862b","libgit2/src/reflog.h":"898ae0bf378c465673fef1a4221baa2cf6165a0700949952971f743ca73075da","libgit2/src/refs.c":"b339b49b0cb8740698e992bbcd4193cf69eef30a98be66f0832d03df20f0dd91","libgit2/src/refs.h":"3ac8974a6390519a06c58a4e66e346f5231dde9fd423de95c0c8e9a2bbbb6680","libgit2/src/refspec.c":"918487205af0469f4427ba2aca8f0625d9dbb0c86f2825769c9fcb3330c7bdac","libgit2/src/refspec.h":"6ebd69454d6f9942c531cd7dfb976a2a8f7474e4f12eabbc33f741c0f9632d04","libgit2/src/remote.c":"947b6475d877042faf51f893ccf13fc625b41b64e0e48a6f40d4f892b532725a","libgit2/src/remote.h":"4a75b031546aa55c7c7590a32432f5d6d6ffdfb356af8821e7a30b571725caea","libgit2/src/repo_template.h":"bec227c595d193802723f81765487da76beaffafae40ec05b76a4db7de153c01","libgit2/src/repository.c":"fc9fd579beb769a55228aa82a1ca703c3315fa74026cda0f33e5eef75d5da2c1","libgit2/src/repository.h":"346de04989295d6116495a10b3fe0c9251f27d5978ba864bcc55fb2c44dfcfa2","libgit2/src/reset.c":"09c67fe8d1796be91339c2b5eaee002b426105e69558d003bc3129699de503bc","libgit2/src/revert.c":"c29672b11583af9c0ed6ba15b0f3e60c002f3cc66024a177795d762f083aa6d1","libgit2/src/revparse.c":"6deed5093b7faec4a4e6a1250eb6416060ac0060b8526bf06d227ad077ffaa5a","libgit2/src/revwalk.c":"6faf3778faa31928af4fbef6eea695b4bdf34a7c6f1b6a692df28550b9f016bd","libgit2/src/revwalk.h":"8e089dc8f7081f6c6acebedc7b0a49c599da434cf148f3ca14639e7422c86c72","libgit2/src/settings.c":"fe0a67f6f8436c7c7bbfca7772aa549279dcbb91f80fb34878fa51c7263180ca","libgit2/src/sha1_lookup.c":"95d24473120414853e34972e200d24ad14254420b32a1d9213042e3450eb0956","libgit2/src/sha1_lookup.h":"904c09580175aca72ce97e5dd972ca74bcde4df726700f519d21e157a99726ae","libgit2/src/signature.c":"1caf88ac201b3cc607a6437b6cbee0ebb027a19a420225031e8af32c7eebf4da","libgit2/src/signature.h":"766717ad4c2fdaad4b32f5dc5710f14edcda06ac2f98d98c24cf21a6620e6ff9","libgit2/src/sortedcache.c":"07423d4b26cd3dda91395583deab43441a1e3109716eb5262cd0f5d4f3f6e421","libgit2/src/sortedcache.h":"ba88ec37c17752eceae5cc3d63772905d59d68bb2ff395770951c0ac9b024049","libgit2/src/stash.c":"ffac8b441a3592ae69b457b78e779fb21caccb495672efc8691b2d0fd2e40532","libgit2/src/status.c":"70070f5e54dc2a9f8152cba88dc70ba86c14fa6330f2dc91acb7b9e7a98b5a48","libgit2/src/status.h":"68ed612f65430563ad5b3f50973b360f583c5865e54c9b9298eb082d441c4e79","libgit2/src/stream.h":"a7755d211e19ea4a29d7d6151f71efd92bb92906d1668960e076ced663961784","libgit2/src/streams/mbedtls.c":"c153e314cf4458916528b98e7417031258fac15dc941b6e776a744542c2f0a02","libgit2/src/streams/mbedtls.h":"c428f532370d349645886ddcab62559c8a9d1e0e5b95ca11c475f4b793a53cb7","libgit2/src/streams/openssl.c":"023536239d22c54b29f278128a4d8f71baaf3e96b8f7e852b9749d1d992b5971","libgit2/src/streams/openssl.h":"ffa547170bf777dbf62a3c489c6dfedc5086363ed00216c196396f7e1f09a52c","libgit2/src/streams/registry.c":"ba00c9e40284f811e23787c6bcb2140d981631704a67ddd13d50c4b8e9f6f40e","libgit2/src/streams/registry.h":"42a887dd1fff029efa00a04a4e8716905149d3639a6881dc53254170cb8e18be","libgit2/src/streams/socket.c":"f704041b88aad166a3cff4ac7d630a5fd0ff2e0cdb49c2ddda83e662ff98306e","libgit2/src/streams/socket.h":"6ed5745f368fb167f24b8a733be0c2272f5bceb9fc40b5c550463428533c26f9","libgit2/src/streams/stransport.c":"079b00730c02fa9a03e39c2b8201a8a6485f8224b48d9ae0b6ede985d513aa8c","libgit2/src/streams/stransport.h":"01c4555417713c415de10ea16222d44cd9c0c0db4ad5d7e3d5e9863d62f49eb4","libgit2/src/streams/tls.c":"5aa5912429df26642d95522fda866f590599149b09839386f21fd821ab324291","libgit2/src/streams/tls.h":"c989f0a996ba7a11f8732336da77266905ebbc371e5e5969955d096ae16b64ad","libgit2/src/strmap.c":"02ee770dfbcc95f15bfe6755853f1c2795782f906d883d3102a904fedb2cda23","libgit2/src/strmap.h":"66e8c5a84d36cd1e3f3b6693d8c0601824d709f9fd3e27a48f235ae06f71cc39","libgit2/src/strnlen.h":"27e73ccbe8be7c5bac1d022bf59f2458cc2998d0222e7658a687e02f89fcfd17","libgit2/src/submodule.c":"1a5acfe8bd409a7ae9d95d27ff2fbdc5d68eb5e0afd06bdd6f71b716a19ced17","libgit2/src/submodule.h":"a28adcfb13cc51e3a698f6e5424fd64980b560a0f632f92c2e59f891e2fcb9e4","libgit2/src/sysdir.c":"50febcb03dc8fa38fdb29f457bb9aa1010cda6304bf2ac0de682c1226e30dc3a","libgit2/src/sysdir.h":"cea646b34993e9011dcdc132243be3aab7a75d47c4c4ead50c250df9fa35c299","libgit2/src/tag.c":"3757b55326a721561c63c193b6ebf050bceac084a373b9292515d8dda699fbed","libgit2/src/tag.h":"e14485eafab3d4925bb6652158fb2f6abd211dbefe0655607a561b8bc6826ba9","libgit2/src/thread-utils.c":"cf21d34acd4971927ee8b08de4b35cf4bc3bbb05563883c70145438ce7634dc1","libgit2/src/thread-utils.h":"227f69716555c45a9efa5479120d51206f78c5ff1501de8de3988ac7f2b4c03a","libgit2/src/trace.c":"88eb614e8f308d8a67576f510c33ba42d83b1323a677f1c762685e51a49861a3","libgit2/src/trace.h":"e7bee26ffe4524c6a23e8b3471212abd6cc5337af14277bea3bd065671e85203","libgit2/src/trailer.c":"aa302ab08e9dfd8a1319dc44e67d2bb9d8a61e6257315e8a73e34e07e5f84992","libgit2/src/transaction.c":"acdb20268ac5921f11da7e66bef985fae9b90325a27a025a0e0a586f8f1069e6","libgit2/src/transaction.h":"42e4b38d1fc7a8d57513da8230fff2f11ea4e1c2907130f99d77fdd2f099fc62","libgit2/src/transport.c":"7c8f61ca4cd3c057bbb92012c55eb2898e2ca054d19d072df70a79f0d165df80","libgit2/src/transports/auth.c":"cf50add22826c131a043de90003d34820bad514c23c21a2b6808d1a2ea9af938","libgit2/src/transports/auth.h":"bc75aba34c92dd99662ff20425987fe61a9c51903f7818963950c8c63346cc9a","libgit2/src/transports/auth_negotiate.c":"86d90a74648160b3cdf0f58f1bfc2ce4f255b101f5783dd404eb705c4399c65d","libgit2/src/transports/auth_negotiate.h":"85c02c578e6f9886b3296630cb904f96974bf17ebd6a79ea33c312636408586c","libgit2/src/transports/auth_ntlm.c":"1c97a77039c0acbe9f99716572cc5285a21141781515425cb881a5a4c2ea29c2","libgit2/src/transports/auth_ntlm.h":"272e59329188f075d48661618c3e1877936d678c11a376a08c22db2bce858f74","libgit2/src/transports/cred.c":"dfb3cb442113b4e90755615bc51929d3c0a1d3c0d6d8c84b08cc3bc46e4fabc2","libgit2/src/transports/cred.h":"f60f04d5b1c869578bb25959ac1e5480ec628317f82820ddf13a72a245c6de57","libgit2/src/transports/cred_helpers.c":"1173f709504bf2c97dec66ad345c21a913e39f3efda0d195df9e4ff7cee89793","libgit2/src/transports/git.c":"03cb93730bdb0c45dbaffed3fee35556550e213c8972198c2dd93a3444ebbdca","libgit2/src/transports/http.c":"0c1f4cc0560183f63442d73c327db0eb77ef584d4663aedde98095d3184a9c4c","libgit2/src/transports/http.h":"87a661decea83fb3c9cd9cf91431d0f42aeb6c1786147757905efb2b165323e2","libgit2/src/transports/local.c":"7a340e59e866bbba4f0ac8919edf920f1dd9dca883e5bc6fc4feb6cb1db22b79","libgit2/src/transports/smart.c":"352674b723ecc5775370d4d9bf66e541f90c5eeff0b9b37f6593fa7349c52b89","libgit2/src/transports/smart.h":"7788045386f72f71cdd9e60ed6636b28e55c57cad596c2adda34b9374ee75d53","libgit2/src/transports/smart_pkt.c":"85ae97f585e7ab7c9bb723d6838e64f8e33878f703541a3e335f16445f6da64d","libgit2/src/transports/smart_protocol.c":"0f66bb743f5b6b2adf9fd8435401ef4cbc79571859706e1c155fb6ff86e60f1a","libgit2/src/transports/ssh.c":"d421cdfd779bbe6b932950cec2a7c2119beca7d9dfd6ca66e0eec2aa2a5ff8f8","libgit2/src/transports/ssh.h":"a4f6279848362d54f6ba4e9338443d6a3402c1ddb9eb85e2e3befb937cbea2ff","libgit2/src/transports/winhttp.c":"4fcf99e2caa6cd7843a80621b7d4c510399bb828fc27f5d603754fb0bd65985e","libgit2/src/tree-cache.c":"8300f36285dba6d1980b10f30c95a353789c37f079e2e1868c81df64b21ca3ac","libgit2/src/tree-cache.h":"f7fac0fe438958415ccd256e0bf9cbe30aa20aa125e60f3812a7fa0521ddb12a","libgit2/src/tree.c":"15a6bb307e0204308637a4f983de306bfd7db7c72e7a249c60fb0aa872c1390b","libgit2/src/tree.h":"7f0534f6409c6ab5308dc031c441ae5434267e499aaba35c0a51869ec7afb9df","libgit2/src/tsort.c":"7ea74124c4b53afb2397578d197b1d460eff19e3e9b52964dcb8c606e705ef58","libgit2/src/unix/map.c":"18752ce4b1ac9f1f2cfe6c59bba1e0d3c1b88a87cacaa40883ef54c7aa4a08a4","libgit2/src/unix/posix.h":"40efce804aa197d29b39e32945a46d2d468904487dd39065c19c0148d3645771","libgit2/src/unix/pthread.h":"58c92bef5ac49a7846c6ffdf0ae79996a2c6be965fce6fc2056fb5a5c1fdf512","libgit2/src/unix/realpath.c":"e3ed89d4139d62b8a8f37579edb1f262fa02972834603f7b00596cc88240ad2b","libgit2/src/userdiff.h":"0991e3557bfc03b0fe50b2100ab00dab710b90c91ba0c8168920c26b63e8a04b","libgit2/src/util.c":"b727a8a2ddd8ee5ff0de67a83006ff563f8262ec007ec0337f8fdd5603e74b17","libgit2/src/util.h":"6223615d92956c75520793ea9f6b04ceae617f09c4f1f8e4a5556344f18d7719","libgit2/src/varint.c":"f93c5ba3498ac04d98ba13d3a320263892452356f797c4091411e5833dfe82f2","libgit2/src/varint.h":"db8ed46f6049f12058d4b624cb0a5ea9d0b0f1317b6378c8817d6e632b6436cd","libgit2/src/vector.c":"0f25fbd3e423dbe54e397acf65372c1010424403ec36c043b84549e703b76291","libgit2/src/vector.h":"2ebdb354bbabae224773991a097d71fd14262af49eb2ab00a4ca3844ad54102f","libgit2/src/wildmatch.c":"0102685757a40046a5fdee4be5be784989a84d3b4be9160d48120c4485c37133","libgit2/src/wildmatch.h":"c33e23b44b8989a91614563ddc5b6c69ad6f76a91abc081bfbc985d8a7dc4976","libgit2/src/win32/dir.c":"a0490ab8fe3be9213093afca1923a0fc472d368f2907ab23a86bb392520359cc","libgit2/src/win32/dir.h":"8e520dd28e37c333aeb10f745efce8ba48a4db414b1605027787b1a52b75a222","libgit2/src/win32/error.c":"f1d2bcb2b6e60ca76c1ee0ca0f236e928331aa9755afc16926a5dab5de26d255","libgit2/src/win32/error.h":"47faa526d448f222c9ed0cf7c3f1ed2c4f14c166610524c76eeb6f0f83938a63","libgit2/src/win32/findfile.c":"5105c344a82818382be0fdf2d84de0aa7a5a52cfe85f775e8dd616ebb1960b11","libgit2/src/win32/findfile.h":"47842451768d01dec2b7965669ccbc9da6be26449e3b4ebf93caa1ff3f08ab3e","libgit2/src/win32/git2.rc":"fd75d8a9bcb7376d046aa85ae5dd17df18d5d654f635cbd42237a18033fd984d","libgit2/src/win32/map.c":"0ac9476b9fd7ece93f640512ced686ed9429031aadab420335c915a6c4185764","libgit2/src/win32/mingw-compat.h":"f7b0c7e9dd7147e8930782cdf54ce4be385172966dd1e27435446f38cd2f6d68","libgit2/src/win32/msvc-compat.h":"def0c5afff1c44b03848c9ed9c2dc6106fd3998553fd76d963debb3e6cd8d0ba","libgit2/src/win32/path_w32.c":"46f168c4122f27fb95d7517393d188cb227a2d9d53fa5fe09c3b3717dae4a804","libgit2/src/win32/path_w32.h":"7550fb15df1b8615b58ba82d26c2d9411230db430976760a1f6c3cf4e867e4eb","libgit2/src/win32/posix.h":"0869e5473f6add12123492bbc080997d755f773ae9c8da0e9b25cc27b95ac846","libgit2/src/win32/posix_w32.c":"239b7b5f5bbbca2ae529af1135612212df18e4f0fe56783fec85ca8f933135f9","libgit2/src/win32/precompiled.c":"4dff04101bd64b95c8f708d1accd1bedc39e95a263444290f796c63f4734d4cd","libgit2/src/win32/precompiled.h":"37372692ddba209680b9920307580cb3bf9038f161edca7418c7f55362022b3e","libgit2/src/win32/reparse.h":"b0633542864a263dd0a14b260c400a07933fda30fe8619d323a5e97a65d07a26","libgit2/src/win32/thread.c":"5f6ee18aa2b5d695d3a682dd5d4e3ceffd6deadc661d628aa5bbc484865106fa","libgit2/src/win32/thread.h":"cebaa0ed2045a4fa1d4a910db988639e02665b8b299c74454cbcb79de45d02f2","libgit2/src/win32/utf-conv.c":"fce8f7998d93fcd4f043d4d643f466a854b9611389487250e65fbc987a455bca","libgit2/src/win32/utf-conv.h":"46473448949ef66faf32be710f48d3a925e3db1aee27c4cfc4fcd36d344a5404","libgit2/src/win32/version.h":"d9d9546728ee78923ba7ea1c16c000d44450ca80f8c0c3268bf58fa9966ba38f","libgit2/src/win32/w32_buffer.c":"ad140e9fe2363e7b62c0e842a45ceca5fda6b477301749c1b8d4aae867eb32ed","libgit2/src/win32/w32_buffer.h":"f50a4d06e54710e5f0c5a3eca13690d71875339ae7e696455062651e265b6ae5","libgit2/src/win32/w32_common.h":"d1294b69c707e1864dafb3ccae8661c818285c19b5ee8d5877bca6e43a1345c1","libgit2/src/win32/w32_crtdbg_stacktrace.c":"e85cabf5eec4efd809114fd847bc84cb6c0f90c7b9500e9c3091d9174346501e","libgit2/src/win32/w32_crtdbg_stacktrace.h":"6fa94abbd71d08845b2e3f0913ec93f8ea2dea85a241b34966200878ec88d3b6","libgit2/src/win32/w32_stack.c":"8270a4cac03ce33571b35953dab79457072287af4a3c4fdd5fc4793a09c7ccbc","libgit2/src/win32/w32_stack.h":"0bd8a6d74c0bdd534cf02440f16d692c07ff671412fb48936629cd375539c1ed","libgit2/src/win32/w32_util.c":"fbe85eac432d4d1462ba659726557f782e811353170df8838ea1f967950d8711","libgit2/src/win32/w32_util.h":"e864b7c08ddd63f4353aa00896a57dbe261f56266e74448bb12fbee58ac7e531","libgit2/src/win32/win32-compat.h":"5ea7b1837a159d66a89365ee2bf3724b32579a6a78d94b0b205d44c8697a8e6f","libgit2/src/worktree.c":"1b09a5f9b7ff522738e2b35641c612c0cbfc6688a91cdeda8c4a4654a2f599f6","libgit2/src/worktree.h":"8f2e10b231590962e1d43b4dd51085da343f09f3e74245141720de9ff8a8e4c5","libgit2/src/xdiff/xdiff.h":"63fb0e162716c6c30364d24f5be1192a3724e527864e462d2163a904222d0b91","libgit2/src/xdiff/xdiffi.c":"17f4fd29d3e6c5a45fb3e4942d95abfab96e470c5f5bfc6ea16ec14bda318b0c","libgit2/src/xdiff/xdiffi.h":"3429a12de1a8c990005268801706fc2ced0f935813e12493c2dee68ba28dc94e","libgit2/src/xdiff/xemit.c":"588f9867c656b7311006e63ac1c1fc57cfd5f1f2ba5890bc60946d9f638afcb7","libgit2/src/xdiff/xemit.h":"0a8c569eec74bb4d6e8b7b9a50b457532550800e0566cbba6d185974613a2e6c","libgit2/src/xdiff/xhistogram.c":"141e5d993bb0c609de7828a4c3e1e1b26deebb05b0995f1ef4601cbf609050f7","libgit2/src/xdiff/xinclude.h":"26f9a54fefdc2635e31801febb7d44afa8d039d078414d6cd26463e67e5346b5","libgit2/src/xdiff/xmacros.h":"d9cc54bfc6c0f9e6eef68f9d03594a8bd10f6243a2137776527bb5c849cc9de2","libgit2/src/xdiff/xmerge.c":"298449a91944edf198b8d4dd9c930814587c5ba29e914f7484f7421683615301","libgit2/src/xdiff/xpatience.c":"9a8158556fddb9432e213f189c7c9c6426003f56dccf9e7f5e494ec5f800a345","libgit2/src/xdiff/xprepare.c":"a99e59dfd2adff23a5f3f2b3920ee384eb6665cfbc40eddde11b87dfb0c51bc7","libgit2/src/xdiff/xprepare.h":"4945e8fffe620cd4d687c12618d1a4b2aa95a7a8097abf3e5e341abf96c76e1b","libgit2/src/xdiff/xtypes.h":"3336d046bf60e0dc99f3686dfe9ecf098456f0aebe96486be5d1cd64b5d9cefa","libgit2/src/xdiff/xutils.c":"6928247d6adee0f64a63c6ba103a47abe3a83dca12577552d23094f53d4a55f7","libgit2/src/xdiff/xutils.h":"78e2813f0d604d4deaf29583f6709111d8368b4bbd71cfdc55d56769570abe3e","libgit2/src/zstream.c":"6505d13ec25bec254f68c7ce5a38aa5380accf2ace21b3e938d71354cd941d7a","libgit2/src/zstream.h":"b5037f14aefdf2d75a3079850a8077717a6a648821950eded8ee2f980abcdcf8"},"package":"4c179ed6d19cd3a051e68c177fbbc214e79ac4724fac3a850ec9f3d3eb8a5578"} +\ No newline at end of file ++{"files":{"Cargo.toml":"b709e77341081de5e34db50729c6826a578f320c2a9f5d81b7284a56019d3d09","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","build.rs":"27933b630cb17fc4f6a1f6bc37ff3cc90a9ab6135b9fbe2b2d2739ede5989164","lib.rs":"752faef96949ec393ebc7933d1d390e3c39b0f0e711d6a6e1c99f17fdcc21e90","libgit2/AUTHORS":"d7d4f16a8e4303cc515fd4410b2c64b7ded924b1e8784a125d15195555e986b2","libgit2/CMakeLists.txt":"bfbb833581dff2cc7b5a1d3289a901d1e299cb3f1be42c5378fe2d357d700d74","libgit2/COPYING":"afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42","libgit2/README.md":"b0dfffa6e8fd55bad09c7d5febae66532042dc8ec2a62da4c23e0cfbf82476ac","libgit2/SECURITY.md":"566da5b3e26904232486c2b7107a1ebb0dc90e8eb2f32b9468d0da41e1cd5543","libgit2/api.docurium":"c77dc54504945864b3270877a9ddcabe85d6d1a742c07232f6faf847958c0dd2","libgit2/azure-pipelines.yml":"0a5df837569a4ef6e87ee91bae81c01c17f69575d5e522118089bf105135761a","libgit2/azure-pipelines/bash.yml":"e05b1f9e4ccba24fb03107430c54302e89a9784943830589d183f31aab178c32","libgit2/azure-pipelines/build.sh":"8def8c219506aee6fdf49bed20f963faf6a2f248be20aa86f901eea7075cf578","libgit2/azure-pipelines/coverity-build.sh":"744239da1e6c88096821bede9f9fc9ccf25f94d8c3213520a0d15a40b9c108df","libgit2/azure-pipelines/coverity-publish.sh":"537ce168698d02e84260af73f3a0e627c5842730bc134de34b807b850108d4e7","libgit2/azure-pipelines/coverity.yml":"369f63a0470aeba9f9e5d94e10def2e498f1e50962dbd467e3905d2238cdaa06","libgit2/azure-pipelines/docker.yml":"48b6691f14ede0d67b2d54cd95b104ebdd0f78dc689c333f1b3b327c3fac9574","libgit2/azure-pipelines/nightly.yml":"4c69c2c76a534accfd2f580d52ebd2d0a9540d0e239941c8f6b873dc2a70ebab","libgit2/azure-pipelines/setup-linux.sh":"9dfb203689438473c0efe8cd45d7d64855023bed9e0d4a2a90fe5255566f5f66","libgit2/azure-pipelines/setup-mingw.sh":"ccb61d09c1bc7cdcf802c6edd41b174699c1cffe1305982aa92d70d45eeb5139","libgit2/azure-pipelines/setup-osx.sh":"ae394f829b323461ed611f75c36124a392855bb3fc8010f443bab6b67ee86a87","libgit2/azure-pipelines/test.sh":"c3e1d86e03b7f53b8010d183b9876a8e5a43ce8b729d93222b02e88ebde2751e","libgit2/cmake/Modules/AddCFlagIfSupported.cmake":"6c2fa4ffebe595428f06d8332330e832c7c7352a006705ac811621b9b4d50f73","libgit2/cmake/Modules/CheckPrototypeDefinition.c.in":"9ebefd8410cc69c52e2f5e450a13269307567f0b5a5b5b02694b180dffb30167","libgit2/cmake/Modules/CheckPrototypeDefinition.cmake":"a78c83e4b6da0dfc5307254592162e75abd4f4caa7e8ff1f3a85429358e6a617","libgit2/cmake/Modules/EnableWarnings.cmake":"e98c7d862caf629dbefdd2a2911b636cfcd1e3a08902fef01a87335b87328fc1","libgit2/cmake/Modules/FindCoreFoundation.cmake":"8e1ace5fe47ea5a457855cad091a0641f7311537bcdf71a1b16ce58ac9952f9a","libgit2/cmake/Modules/FindGSSAPI.cmake":"eda9f076dc7aaed50ab81734110c3a15c80b1ed15cbf8d4ab742af166e136410","libgit2/cmake/Modules/FindHTTP_Parser.cmake":"ae7c457f673470a1e20397667555778515e5b5dd4263d3ed8816c7ac5e67d5a5","libgit2/cmake/Modules/FindIconv.cmake":"3ab0b707bb56daf770d74231d0530883296b28c61e8a99444c928db47478f929","libgit2/cmake/Modules/FindPCRE.cmake":"b94df6fd44724b5d8cd968d4f4353adc5eb035e5dfcc46b698d7d6bbab059b69","libgit2/cmake/Modules/FindPCRE2.cmake":"a98eecc6e48947de0f36aa10d8a7f5941986492a6a50fd031e5d87b3957758a0","libgit2/cmake/Modules/FindPkgLibraries.cmake":"9132bb80cb6d9f7925be275c4a267f91fef82b383e9f0f1214b5e4726c76567b","libgit2/cmake/Modules/FindSecurity.cmake":"ccc6fd877175e4319fb972942ec4775457f4437357e74895298ec9e236244fff","libgit2/cmake/Modules/FindStatNsec.cmake":"92dd6a058ecb45ce0fe294031f592383100baaeed6d84050734baf396cac4f47","libgit2/cmake/Modules/FindmbedTLS.cmake":"dddc209a1d02b7599d4bb6a49cd4315fabe32c816190fdb0abfd5c214a470362","libgit2/cmake/Modules/IdeSplitSources.cmake":"0fd931f46f32392f2507ff0ffbdc66c51dc415fe00b72ef44ae3c4776fab1074","libgit2/cmake/Modules/SelectHTTPSBackend.cmake":"c08c1aa1e9a4e61f9f913b4f969bde42d9531c50720a856a04b1f8b3ea0e9fa2","libgit2/cmake/Modules/SelectHashes.cmake":"dc3945858da6c2fcb5cc9f2bfb17343c60e162fc80c9d7853dfe09857bd50d70","libgit2/deps/http-parser/CMakeLists.txt":"5d606f3ef349fed9f555ddb45c4e893d1aee6002f1beaa3c47b4d305c32c9576","libgit2/deps/http-parser/COPYING":"2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87","libgit2/deps/http-parser/http_parser.c":"80930f8b6c15827a3ae571e77ddbdccca366e8f6c98874062cb8c0c6dc877ee2","libgit2/deps/http-parser/http_parser.h":"d3fd211486e4352f57a47e856a5a10dfce06c46211119d0f6d9935713d2ad08a","libgit2/deps/ntlmclient/CMakeLists.txt":"494792dadd723e57e73e6d34770ad62687b81181a69e66696e93a5ee82187ebc","libgit2/deps/ntlmclient/compat.h":"28c0d6a79a98311619886106928161154d8d30fbae4d975363948542a0a3864a","libgit2/deps/ntlmclient/crypt.h":"8037a8b1f4066a6459b7d3bb87fba0840ad11b82a75ec28ec047055df566adfc","libgit2/deps/ntlmclient/crypt_commoncrypto.c":"f572238c92ae8c3fef63f8ed7c3932976016565647994659feccfcdd91764f4b","libgit2/deps/ntlmclient/crypt_commoncrypto.h":"ce71d0afc3434aba6e6d501d4cea7b0b7260d34499b41251cb2263cb0b968441","libgit2/deps/ntlmclient/crypt_mbedtls.c":"2446615bb0556331acf109c41970a4dc95db3c07c1f7906753d266d2d699b578","libgit2/deps/ntlmclient/crypt_mbedtls.h":"ca64a3511eafd516b27354aa713623e53bbed475b01cd6989e4f9ba7b28b84b3","libgit2/deps/ntlmclient/crypt_openssl.c":"30686ed81c2f7e2f00a2cb12fc08a77ce14bab0e5e79c9441c7a82fa3bef46d6","libgit2/deps/ntlmclient/crypt_openssl.h":"6b436be864780013af7257ce917f96a8a03c4b520189982fa64900867b9bf730","libgit2/deps/ntlmclient/ntlm.c":"860de6c763efcacaa7f708f234d698721c154a420094f959e128e0d0aec2d36f","libgit2/deps/ntlmclient/ntlm.h":"bfc570598a36dd463e3b304c2309b00aa2e5ea453bdb15847b7e99b26d0838a8","libgit2/deps/ntlmclient/ntlmclient.h":"365ba1d3c8c745e176697726029123a6263cf9cba44b125b7ff99d72afc3fe9b","libgit2/deps/ntlmclient/unicode.h":"8b37d53c6ddcbc4072dd103cd9b50a1524db25d19e340b1d60fbe7e9bac7c583","libgit2/deps/ntlmclient/unicode_builtin.c":"85c57f301a8f0f46de7cc4fb5a45117f056ee808b1798c9fd6ad8b4f5d5acb9c","libgit2/deps/ntlmclient/unicode_iconv.c":"dc00df55970e7cff5c97cc201acb35e1881b58c3abfcb546511bdcd011fc3805","libgit2/deps/ntlmclient/utf8.h":"0b57540746cfe500009216ba3bb7bcbd1555c158648ec82fe26f16bef75adb97","libgit2/deps/ntlmclient/util.c":"5961cd25fd61ec503b2a8d4901b55214782a825b8cf90331122ab2d7767181e9","libgit2/deps/ntlmclient/util.h":"70c768d11767ab0901b4eb9701a669e0d5601ba421fd0fd82dc34246cd5bf9bb","libgit2/deps/pcre/CMakeLists.txt":"f6c89cc6c4b33e2dd24e1ee33b5af92eb89ffe52075d089eef439c9d6be8c9cf","libgit2/deps/pcre/COPYING":"17abe1dbb92b21ab173cf9757dd57b0b15cd8d863b2ccdef635fdbef03077fb0","libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS":"46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b","libgit2/deps/pcre/cmake/FindEditline.cmake":"44788ac3e7c8c4b4da3e5e0f467c7ee49de7ba9e1c13024dcf1e2501f8fe9684","libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake":"aa3ef1f1c8742da54813aab0ac58c71edd1e58cd3b6b157b856bfd525adc2e5d","libgit2/deps/pcre/cmake/FindReadline.cmake":"055e1df8bd29e6837d8ebb8c15dd5dcb28c88e23aabda8538b76a249dff829b0","libgit2/deps/pcre/config.h.in":"480e3e1a1eea810516e59f19375575e83f62980d20b9cfc990ecf8e8cb17f79f","libgit2/deps/pcre/pcre.h":"e83e434fc470e3f985659b5b400bf9f2d818bd2e122583ef52ffe5e914fcf09a","libgit2/deps/pcre/pcre_byte_order.c":"4030a1156da8690352226b5de2c9c5f52cc6955409e4a7ab9ba4d6b223e74b3c","libgit2/deps/pcre/pcre_chartables.c":"3386fd60b4a4175a7baf474223522540abd6e006e8507a04d3485f84973424ae","libgit2/deps/pcre/pcre_compile.c":"b8eada6b71d793713189e16037148a3ac77beaa29cb90357b3171ac588289f81","libgit2/deps/pcre/pcre_config.c":"fb9e1e766291b2b4b3066ecfd0795db398762b9597fb2af23cc784617984609e","libgit2/deps/pcre/pcre_dfa_exec.c":"1cbf3a680388110bddff833983d3653630eedf6e6e9d9e656a737e3b85de9dd0","libgit2/deps/pcre/pcre_exec.c":"2a6871b9a56de682ce28a467d26b42caf71f4323e44b555db720cd51c0f2c505","libgit2/deps/pcre/pcre_fullinfo.c":"a84fc4cb4d22b2ddfcd4d0f0a0ff333cc9f623e1fbf2a7c90623a212e0bde54d","libgit2/deps/pcre/pcre_get.c":"c93ded768f96cc392f911776e6d993b565114936e08247dfa79080b35dada4e7","libgit2/deps/pcre/pcre_globals.c":"8b2fda23b42715eff2f01188c4911dd8453868ff77fccfe34b99126aa775fa5d","libgit2/deps/pcre/pcre_internal.h":"f713de1fa2c20b5414f6746c80d10878ab48c9186462b074c5bb6a74a822fa80","libgit2/deps/pcre/pcre_jit_compile.c":"d014f896dc55365ac48f481067a048a36117fba48fdad1379eda46807f84fb67","libgit2/deps/pcre/pcre_maketables.c":"8564fab861c7eb4037ffcd53fda789a747a30c4a462f460a5ef824f534fb06dc","libgit2/deps/pcre/pcre_newline.c":"3163ed2193fa74d8cc9e1db2bba672bcebf8efe85c2465cc0aefda51966bd929","libgit2/deps/pcre/pcre_ord2utf8.c":"fa926e32ae8d6e5610c500e7b6971a5149765a1881f798b18904a0a88bf549de","libgit2/deps/pcre/pcre_printint.c":"71751d151efbe935e9d8bbf58bbe143d617b34acd13d1bf237330c7c7736c422","libgit2/deps/pcre/pcre_refcount.c":"0dd8b7273243545fdafab585890fa12e210cf526030eb6b877325ce89250fa39","libgit2/deps/pcre/pcre_string_utils.c":"b83225f9cf2658654d6a0af01199050f6fb36d903041b33cd4d0c06e762b66df","libgit2/deps/pcre/pcre_study.c":"f5285714b59af9503dacff268cb37ab4944fbdf74a78c5a7b9bc49043a00ba40","libgit2/deps/pcre/pcre_tables.c":"fcdd9f705a7a1640ae5e5e5b7148761fc5e82896d84b1a287dd7e55b8b87eb15","libgit2/deps/pcre/pcre_ucd.c":"b35ad7e532f52c5fb1f4ab1d48f5d80618abff2a115099220d95cd13ac64c346","libgit2/deps/pcre/pcre_valid_utf8.c":"4265abf04c03acba9ea90351da662eb89aaed79e7eef03329ccf030ef28ef907","libgit2/deps/pcre/pcre_version.c":"5bb67c3373a934a2d9263ba9f9fe3cd79e381e6aed8507e5319202330bc5275e","libgit2/deps/pcre/pcre_xclass.c":"b2c3b2c7600e18e562a333df017ee35c69233e9427b866726d944122a9560e28","libgit2/deps/pcre/pcreposix.c":"1fbdfce483e2af30c2791023c0b55ca75b23595543e62e0eeff5287b104551d0","libgit2/deps/pcre/pcreposix.h":"85a6a09b806d8506e5710e9862b6716b2b88761abe0d05aeda5071257537d9c3","libgit2/deps/pcre/ucp.h":"ea98e4eb999d8e777f2ba709e68b5aff7108a4eaa169f4eefa4510056551b724","libgit2/deps/winhttp/CMakeLists.txt":"6c641c08d2cb1719c533ac20577f317bfc5ecf27e4ffdd0ea940e26e25dfbf2c","libgit2/deps/winhttp/COPYING.GPL":"d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813","libgit2/deps/winhttp/COPYING.LGPL":"dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551","libgit2/deps/winhttp/urlmon.h":"6cdb0f5ce5f0aea2daefc44c4806697ed31ad759f8baa18fb38a5b220ddc7d7f","libgit2/deps/winhttp/winhttp.def":"89601b95ac2515619426ea52ca093fac1a16ef0bfb5586c1385a028947ab6513","libgit2/deps/winhttp/winhttp.h":"a51828d65b1b260a727f596c41cf3257cac2ef6cfebb11726234fd7ccb1537f6","libgit2/deps/winhttp/winhttp64.def":"7cd0bc8dd2c06d288c241d175da06146e940c28d7201fb63de8a75730d09fcd4","libgit2/deps/zlib/CMakeLists.txt":"abc8b7178f398b88591e04b1df9e8a2389c6705fe9e1607d96afc580a5c38018","libgit2/deps/zlib/COPYING":"864943392878a2479350e12a04f6e8e0ae434b5573bae350823c4d6c4474c755","libgit2/deps/zlib/adler32.c":"47a05d4213c9694e821027225aa8ccf5975b58d7ecfd2877008b44dc8f53983e","libgit2/deps/zlib/crc32.c":"0e842875b2822122efbf822a15483ccbf0cf2d1a39f21f70a78492738f7f2fe5","libgit2/deps/zlib/crc32.h":"407af59d0abfea84a6507c603eb29809411797f98249614fe76a661def783ce1","libgit2/deps/zlib/deflate.c":"11fd6b0328b65c4ad4b5c204d892a97a9083628a7e77dc47836c8e0c799f8da0","libgit2/deps/zlib/deflate.h":"0ca7fb0cf1dd63001c6e9e4ff93c8dbff2fe521199be51a4dda38a11b44919f6","libgit2/deps/zlib/gzguts.h":"1ef4741cf10441feeca5c8dde2b6c754f0cbd96fcae697d54a604757289a5e9b","libgit2/deps/zlib/infback.c":"abe44873b5af2ea68ea1d281d915b2800f1832f846d2c05442a4711adbe6f269","libgit2/deps/zlib/inffast.c":"4d496ab2a3d29df5fadc3dbff6067e039806aaceae6cfcd09ea77d46c2b848fd","libgit2/deps/zlib/inffast.h":"7d8c1c873ce9bc346ad6005bb9d75cce5c6352aaf7395385be216a9452a34908","libgit2/deps/zlib/inffixed.h":"237ba710f090e432b62ebf963bee8b302867e9691406b2d3f8ee89ee7bfef9b0","libgit2/deps/zlib/inflate.c":"8b6c599c3563c14c447c47db0d7dc9a16e8c246a078ec95a169ddcebaaebd811","libgit2/deps/zlib/inflate.h":"8ec9ac297790276f7e46a961d4c6f9f944fb1dec92401339ec2666973cc5983c","libgit2/deps/zlib/inftrees.c":"1960ca67384376f65b6ce8c08fdb501f8eb33923e11ef5f61a855708c6cb0a8a","libgit2/deps/zlib/inftrees.h":"c510b36402784b1f898be3b049b923469aa92701de2d9195aed19f6b65c0dce2","libgit2/deps/zlib/trees.c":"f2a5f949ea70dde7c23a54c793aeed630a03df4bb72417cd3aa008000c44699b","libgit2/deps/zlib/trees.h":"bb0a9d3ca88ee00c81adb7c636e73b97085f6ef1b52d6d58edbe2b6dc3adeb4d","libgit2/deps/zlib/zconf.h":"9c0087f31cd45fe4bfa0ca79b51df2c69d67c44f2fbb2223d7cf9ab8d971c360","libgit2/deps/zlib/zlib.h":"4ddc82b4af931ab55f44d977bde81bfbc4151b5dcdccc03142831a301b5ec3c8","libgit2/deps/zlib/zutil.c":"f7fdc9ef326a2683eb33c794face54e83c751ec17f3d1ba581847a62af36ddcd","libgit2/deps/zlib/zutil.h":"9a63f6690fac1620aa3cecee5752af618806da438a256b4a047fbcd289cac159","libgit2/docs/changelog.md":"56f630a19ffbcd1f2f2070500fd7d85e5baa15adeeb5d40b5cb8d780d3078b23","libgit2/docs/checkout-internals.md":"221b9821d89ef60b6b71d5c6b80200bbd911895649bb4961b3dcaa4f5c32d8c9","libgit2/docs/code_of_conduct.md":"bbb42da81b2c2261fe2781d22179224c5e203144535d33f49a61d4ad322b2217","libgit2/docs/contributing.md":"3cfc5254abdb4db04926d420c0e8c1a44bf2d0a3327528ccb3521cbb49223ef2","libgit2/docs/conventions.md":"b1707aead63c217fbdfbfe5d29257a5324bcef95df8f1fcec0d0a785c65c1cdf","libgit2/docs/diff-internals.md":"4186480a0882c2ba6177e940be9f04d804d7206cd51467e8226aa964bc090753","libgit2/docs/differences-from-git.md":"30c36445bca9a377db72bd2ffeddf68d392a61fbc60561f17e3590873a372e02","libgit2/docs/error-handling.md":"d4b0a7e66b7f289ba6d16cbe08899326646be8d2ed33aae5884a23fccbad57e2","libgit2/docs/fuzzing.md":"f933b83f82b8d3145b6b045d7539b6ff11724c76ee8eb96d91592b42da4781f5","libgit2/docs/merge-df_conflicts.txt":"1d22b5791b72b4c084244888eea37b80b4f0a1dcee9d76991edbc18ecb1df057","libgit2/docs/projects.md":"220fec1464316bc7efcae1bdbe1057e7e53a56cc0ca8cc565ce1e0df73580cb1","libgit2/docs/release.md":"ebc2a3f234c987e348f3f59c62d3791af1070992639f10b8e38ab6a0ef546e80","libgit2/docs/threading.md":"3ecf0560141ccf2814d93f73fd26390e45e173e3c6841c1ca5c07d8c53ac6413","libgit2/docs/troubleshooting.md":"38719af0af50ed2c328c692fe9521f2fe46eef55381b5a4d0346b2a10f501a5d","libgit2/examples/CMakeLists.txt":"899510cd04b24af25ef75fbec48e1ca8cc09f71bf93082f19a53bf4cc9f4fb0f","libgit2/examples/COPYING":"a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499","libgit2/examples/README.md":"418026aef6c3f2870b7c000df5b4cd7847f644f2fbe52dc9ea0ccacbbe37cd64","libgit2/examples/add.c":"48e33612ae6570b3ba3a123a16189819c6e292e64a9ca0e3ff578f5afc15eaed","libgit2/examples/blame.c":"9d75ef2b5e9923d85bc6efb4163722c274ae2a0fabf0b67bcf7670afeed44be3","libgit2/examples/cat-file.c":"453c970d320c5e57821986efadbc39bae1fb2f1c985e6b0708d1878cf5cdf211","libgit2/examples/checkout.c":"35e50e65bfb237965b9fb891a5e62044dc0b86c68840d6fd5d1f1ba6d0c84509","libgit2/examples/clone.c":"7ae0dd13b987fc1a372d7cc64603c4f0274124cd9ff96f82bd51585b8c4642bc","libgit2/examples/common.c":"03e87d15e256477b49e34c1780dda6995560ca77a916631956c9a7d8be72e342","libgit2/examples/common.h":"dbb3f1f9a66386b206e41585b8a020f0b9181716bf7d4fa92b1679b4e483072b","libgit2/examples/config.c":"43962ad38ceb56a96c36fd143a3219612907d54734ddb680e2fd0cf743974337","libgit2/examples/describe.c":"0970388d3afc3c27f0fbeb1a5eb3439ff4361a718b4a67ea2e70b1f7f4195575","libgit2/examples/diff.c":"7820c56f6fef841ead2e41fc620bfd0f68aef5c6c4d85f39286d584d442703fa","libgit2/examples/fetch.c":"efd4cea0c903573773870ab87b5cab41e5bb6788a33018414d159b56421643f0","libgit2/examples/for-each-ref.c":"a83b67cf6bb3782d732bfabbed8a8e7d6531a58daed4c077bfffb78aff9af97b","libgit2/examples/general.c":"5e46e6de31a93321ca963dee9ede0f436cd75edd77d400321a8cec1b46973d34","libgit2/examples/index-pack.c":"23e5ef954f128d97a2b60901587e49bd28ca53e3206de4f069fe4d617c2da525","libgit2/examples/init.c":"0a222d517a4c31c68fa9a427f64894e12e88e488c6b535d9014ff995888e33f4","libgit2/examples/lg2.c":"dac3bd396a3efc1f9ad8ab0f61f3567b2a96cd563e16e40ec546e8d9f9d7fb45","libgit2/examples/log.c":"8d5208854530e497fe2f28aa71326e1eceacc1d7395b72e83d6a84d7ede73af7","libgit2/examples/ls-files.c":"0fad182dc579caf7984140a6aadd01dfc11c46d2bea282e6e73e0046bc3ae559","libgit2/examples/ls-remote.c":"5cdebdc24ff4a07657da50137fed2031f9084567f2050907219bb3dcb0b9a645","libgit2/examples/merge.c":"240564109b712ed36fdce863bfe34e7cd69022ed04e68706477821e6098587af","libgit2/examples/remote.c":"c888ab7c04090303f9062880fcd855f03a554a501380717f0ca7a1ec7a274a26","libgit2/examples/rev-list.c":"95594807e980779da2ab63dd89fb77b092705cce895d7b4ef100389bae49c366","libgit2/examples/rev-parse.c":"dab1ec057afdf12a22b112005c24ff717ab28ff3455cf1da47f8c2d8a217efea","libgit2/examples/show-index.c":"8f3742413429869e7e4e4334933c71dcb58bb571dcf4f76461fd77bd946f8656","libgit2/examples/status.c":"9143c897090fa59f8d75fa9c9312ba9c7ce40cc575f268affadc4f02e62ce463","libgit2/examples/tag.c":"4f8792e6f3426bfcc8b452f1a464d91af4506bc9685cb211a9970a3847ff2ffe","libgit2/fuzzers/CMakeLists.txt":"db67c2dbdb4f7486dcbe9e6848dcf1bcd9d5159dc91c93711c52d5a4f558122c","libgit2/fuzzers/config_file_fuzzer.c":"caf8a146c5b2398b360b2b2be675b5ea16af4c9a8ba2b8db682241666ebafb92","libgit2/fuzzers/corpora/config_file/git2.dat":"dc7279649a38a8c9fa9c859db5f3d804f4295f987d65319e3c2a7599e5379d5b","libgit2/fuzzers/corpora/download_refs/clone.dat":"dd2d1d94c97d7922eeb46b8f3929c60a287ab207c04cb4ee42996a263044f01b","libgit2/fuzzers/corpora/objects/blob":"7c35c725ea9288083740ea6b4c23bc92b143f82a0ca88b16506518b14b8f2934","libgit2/fuzzers/corpora/objects/commit":"8ea04ab56b78a68e3bccd0c98381ea82465e9bb2e4ef7f34228c8e3ba5dded61","libgit2/fuzzers/corpora/objects/tag":"ea7433d733b2b023a637912d00344a58d1ff32beb9b80d52dd81881a60a2cc98","libgit2/fuzzers/corpora/objects/tree":"ff780663747cd2aab987830cb72aef5e1dcc66325fc0ba3a53056e99403e1e6b","libgit2/fuzzers/corpora/packfile/004bd06c91c0dc8ab7e963f4b5e87be00292911e":"53bd8407a18fe3aed0680e230707d6e13bf0d3874111e75b299bf94940f67a26","libgit2/fuzzers/corpora/packfile/00b67414c7b17916b3bd0a3d02284937fa0c4378":"478db1c2dda7b9a110a7a576454e4dcf9f3ca3bacbf21f8813de81aaf5619333","libgit2/fuzzers/corpora/packfile/02eaeb43f0ec7dbfd91bd75e7ddcc7fd590dbc77":"e76379873411c1eed3591cc3eea3e26c9e293f9064f777957cfa4b6536fc538d","libgit2/fuzzers/corpora/packfile/02f4286569be24124d8ab209733b7492f7560310":"e3b9c84ef171ba753b8b5a1025bba400c7bfba38d28799ff0ce623727e748efb","libgit2/fuzzers/corpora/packfile/037ba5f9d6d695aa4739810f8bea6e795c1d7614":"2839cb89e35f3ef5a81c7c2424d37b8d8eb37c8a7dd815ad29628ab7de5347b4","libgit2/fuzzers/corpora/packfile/038e06289ac876f109fc12ca4b8284497ca26821":"ada4b1da277233b00aff0234dd58bb3272310094be8731748ea2e186cbe11f9a","libgit2/fuzzers/corpora/packfile/042dc4512fa3d391c5170cf3aa61e6a638f84342":"de7d1b721a1e0632b7cf04edf5032c8ecffa9f9a08492152b926f1a5a7e765d7","libgit2/fuzzers/corpora/packfile/044bf19babf3f9cde07adbfa2a45c7508538cbe8":"2812d369d21d23341a09e9096fc09230bf8f43a31c78829e736cc8345306762c","libgit2/fuzzers/corpora/packfile/044e12ea43bee3c4befe27ba4687bee98d505fd7":"92e2000f3a1b17f88fc961b602d03984ac45ae834419dd792ff7c23416f908b5","libgit2/fuzzers/corpora/packfile/061fb208431db793bbd3645b7a16058a1e2a2412":"281c93990bac2c69cf372c9a3b66c406c86cca826d6407b68e644da22eef8186","libgit2/fuzzers/corpora/packfile/06576556d1ad802f247cad11ae748be47b70cd9c":"8c2574892063f995fdf756bce07f46c1a5193e54cd52837ed91e32008ccf41ac","libgit2/fuzzers/corpora/packfile/06ceea0c98756d302c302410fffe0dc54a055486":"2a725ce1affc914fe150ea64760a14b5a5a182c7cfbab98fd388e99539af9b55","libgit2/fuzzers/corpora/packfile/071e65ac0bf08f2424a89a4a499004c1bb9f3f6c":"4f3fc765b7e20cf28450a80afba60cfe388b822290fdd23dab75de5195f92ba9","libgit2/fuzzers/corpora/packfile/0739ff2f064568a4d775c8061958e66c419dbea0":"e74301692772a42d8b0c8eee1b9291ceee323cb4f2d367b4eaaa253d3ff14729","libgit2/fuzzers/corpora/packfile/077760469bf8392342d09329c732b98d24be2c30":"2bd0e3544fad2fdeefa1c666128aaf920459b40956cd2975dcc5bf265046f84a","libgit2/fuzzers/corpora/packfile/08534f33c201a45017b502e90a800f1b708ebcb3":"a9253dc8529dd214e5f22397888e78d3390daa47593e26f68c18f97fd7a3876b","libgit2/fuzzers/corpora/packfile/09e9046a7d6125cf2915a326a1504dd75d0543b5":"48c5450fb1e339467e4a978d4b8813620502972d8de03600609cee031cc53059","libgit2/fuzzers/corpora/packfile/0ade7c2cf97f75d009975f4d720d1fa6c19f4897":"19581e27de7ced00ff1ce50b2047e7a567c76b1cbaebabe5ef03f7c3017bb5b7","libgit2/fuzzers/corpora/packfile/0c316c67c1450aee57ffa3f74c19ea5d32d44622":"439028232b268acb647229425e5c96578bf0995d1115efa60051bbf8c4b3003b","libgit2/fuzzers/corpora/packfile/0c395c44e4dd5b67caae8a98a66741e17e8af136":"3e19373a3ede76263f06643b4f839cf74ef98d08f38e691a3463f90bd504ffc2","libgit2/fuzzers/corpora/packfile/0cb9120e5ae00b0d660a111ef85fc9194a5f244a":"83bced3abf6a2e333400c01cd3003ea8cb54b11c527e8f1fdbe9936fb23614d8","libgit2/fuzzers/corpora/packfile/0d44e7156d04cd269fd1219c58c3b79dc8c41d60":"bcf0909af34f683f23f673133bfdbff210ca2a179296e7c52893b5a615d11661","libgit2/fuzzers/corpora/packfile/0d77a48bea1dde6e5d391a65456dc0aa3d9cc5e3":"4b3f1c6b712242de5c763620e21cb3efe8f7106f8e5e3bd156d9e96a02ad2397","libgit2/fuzzers/corpora/packfile/0db25107ff248616cadc75b7819b21d06394cf25":"50dd927afa481af5375dfd80e7af505456b4b1d06ba32aa07dc2cc60c69775f7","libgit2/fuzzers/corpora/packfile/0debae2db7ef2933f386bac21a2d3bebb473070e":"e3be301e3f1e1023743f258b7cb7184f93c7ad35d5c87b1ed4befa77e5f2f7ec","libgit2/fuzzers/corpora/packfile/0e2d48524de33394ca82ea3a43f5f04aac6e86c7":"b130835bfff3633ef53407c63aa4d0b2c87d8a8990b5b160f0f1a8924413a1b6","libgit2/fuzzers/corpora/packfile/0e49f6aa78f3b2f6c3fa5d281d5b1052fa9951dc":"6a5c5265c65305802d683bfd935bbcbaf9900ebfd1ab6ff2bde2858a8f416dd1","libgit2/fuzzers/corpora/packfile/0f2982027f0b3b05250267b19e3969f8797e389e":"8bbc525a26fd6b78fbcb3681d51e28b3c0066e4fc2ace368879177d58263ddc2","libgit2/fuzzers/corpora/packfile/11f6ad8ec52a2984abaafd7c3b516503785c2072":"2d711642b726b04401627ca9fbac32f5c8530fb1903cc4db02258717921a4881","libgit2/fuzzers/corpora/packfile/123ca693d81a8cfd99760ff5ca9e152ded878537":"0f4ae7ab5e78841c6dc1663e18aff88f08416a12bdead9f0cd3fefc094abd39e","libgit2/fuzzers/corpora/packfile/12878ca5643ab15a4a847e74ddd84fb365736af2":"bd3c97f4745454c2cd65ed4dc035baff588820563802d1819c937bc838fe0f6c","libgit2/fuzzers/corpora/packfile/13f292a24a9e79ae911f5d5e1ef7db0112601e64":"cd381288d45705c0921a95d2d54addc90a20e00cee9dd1d93b342845b6e0029f","libgit2/fuzzers/corpora/packfile/13facd9b4b5b4509fee92c7ccc1c82ed90624172":"3bf9d518c3145d933736fcb2ac8da1ebb0e9d1ee6051e9775a7f6390603b3f9f","libgit2/fuzzers/corpora/packfile/140092a21903fdc56c98de126725fa6bead98ab1":"0f9a0a76c4dfc13d9258ae52f791ae798f14a0e975ef4c5dad461042558b92f2","libgit2/fuzzers/corpora/packfile/1489f923c4dca729178b3e3233458550d8dddf29":"96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7","libgit2/fuzzers/corpora/packfile/1501a58834f24f95442f190653a50dd67d01e19d":"65251eb45556a09eea80a69d17c264b2f09f3eac007940753f1433213700d0d2","libgit2/fuzzers/corpora/packfile/15eddee57cafb11e927810d62230a6e104de1d5c":"78ca8145949f63e2e186fa4092058eec188b8db0bbeeb081345d3836517da7ff","libgit2/fuzzers/corpora/packfile/1632aa4b049f1118306485b11c70c499a0200dd5":"b952e334fe7a107da4bfe40b88d51f139b6d75c43cb9c0f19ae154c468acf560","libgit2/fuzzers/corpora/packfile/18e1cf33b179a5cbaaf0baac8279ec4ed1cbdcf3":"25c46585e4f8ec8a2ee1658a190e1464b94965f84e14c6e33e042805c6d8052c","libgit2/fuzzers/corpora/packfile/18e768865207e0b90047487b66532b20bc74b1a2":"1cc65615d187bd8e93318580cc99a9deb66d51e94e46da6797d1cc94b03aa070","libgit2/fuzzers/corpora/packfile/1940c66b45a3bd5c847330b207fd87aee6e96194":"6707b736a22859b83191585476b94fa93bda06294c6143a2ba23d2f4b4b903e5","libgit2/fuzzers/corpora/packfile/1966ab31dc80ab75196b0cbf28e3960a0eb3f6c5":"5ca418aabf800a0b6fd9434fd9c1305cd34804d4e2ac9d2745b0d183c80bab35","libgit2/fuzzers/corpora/packfile/19da91f2603889267dfd77786e07a5b8f067d62a":"9e8e8c37a53bac77a653d590b783b2508e8ed2fed040a278bf4f4703bbd5d82d","libgit2/fuzzers/corpora/packfile/1a72795a3dffdfc999b030d9aab7237dea1e2bc1":"3607f472af344b7265812a5bc63636affe2093476b275aaa51d655fbbf97799c","libgit2/fuzzers/corpora/packfile/1e29cf67a66f225b338610fbcdf1b8185a8f5b7d":"1d49b7dda1d3666529a3eb5153856d5233f73e0cffc0515c08974213f1fe65dd","libgit2/fuzzers/corpora/packfile/1eb8977ef8c3be9ee896d785663c762c7e32be28":"f5476d5e86ea8ad32b1bcabe5ba3859de2e86c54daa16a73b6913c653fd93901","libgit2/fuzzers/corpora/packfile/1f0837530c1c3d122157f2eaa9c2178dcc3580df":"698ae799e3798740b8e4f629b3f3868a705be03b884203eec888aa25ca92e039","libgit2/fuzzers/corpora/packfile/1f3c5fd6dc091faa397bce776aa97b457388fdae":"71a5ec30430d204ed5c01f0e672a57e1889167178d5ffae5354c75624987df95","libgit2/fuzzers/corpora/packfile/20528983163f834108150a7191600ff94ae2c1d2":"e368f886a5ca3b74c94a676564d6456bd49fe11d0d398c51919006e472dffb7e","libgit2/fuzzers/corpora/packfile/20a725140a8ffbe11bb71c1b83f19452147e5180":"d2bd4261bc94f30d398fca196bd437c17ebcb8c04f9e5576563c0f12c3b7b067","libgit2/fuzzers/corpora/packfile/2149aa9e07dda9bbf502e088d8d0a38e8fb94f2e":"e4ff5e7d7a7f08e9800a3e25cb774533cb20040df30b6ba10f956f9acd0eb3f7","libgit2/fuzzers/corpora/packfile/21b664aa8c86aaee4007d9bdbc2d63bf82bd5109":"ec9d63310fbd63348e59d583141b89732779396afe1566564b64bd7da9082f3d","libgit2/fuzzers/corpora/packfile/21b9ec8a7d7ac4d542c9bf7b2e26581cfcfaaab6":"21c38a293c893f05b2b9e4ec34bf760b9f087731518956692bb981da9073228b","libgit2/fuzzers/corpora/packfile/21c07e2affed6b0134d5dc28ea6c4937e691c761":"25267d1a884ed6531ea19a2159b6df6450ba48af719b2d715f6c40b46ed7d985","libgit2/fuzzers/corpora/packfile/23841d4076641ebcb4f58d1fd03047528c9d359b":"9183e06bddef18c75dc49aee2bef20370343e9e0dce6e33031c5d93f29a16374","libgit2/fuzzers/corpora/packfile/23b9174c42560de6525b1f103125f599479f95cb":"c320649ca4c2d85097033bbd174a638b3802295c0dea94d6d5d5866aa3c5f683","libgit2/fuzzers/corpora/packfile/241cbd6dfb6e53c43c73b62f9384359091dcbf56":"22adaf058a2cb668b15cb4c1f30e7cc720bbe38c146544169db35fbf630389c4","libgit2/fuzzers/corpora/packfile/245a2ddea41e6531944933c4420b8c9790ac351b":"4284d20ab66448370b817d51ea50dbe96309ccce97a53f42ffe63415f8084755","libgit2/fuzzers/corpora/packfile/2541e340271ea496a392870bcc20d3510287b9e9":"434f1a0417137e5113f164323e55a450ca5f57e87c9358438761f8f01d0af5ef","libgit2/fuzzers/corpora/packfile/276af22d5bf94344737fb1a5eb5de7d335004493":"8afa3222e3410659809c95605ed3115090c6a664a36f70dadc57596efcbf2a99","libgit2/fuzzers/corpora/packfile/27d5482eebd075de44389774fce28c69f45c8a75":"aaa9402664f1a41f40ebbc52c9993eb66aeb366602958fdfaa283b71e64db123","libgit2/fuzzers/corpora/packfile/28334bd612cb539de776370995f60c8032215434":"8b0f7fe9edb2df6a4f93288b360676d42c319dd2f11b1a872526a788e79c53f6","libgit2/fuzzers/corpora/packfile/2973e2ac092cba077d7350bfffe1cf2e0644a6e1":"43dada443793c736696b140f443efab8190d2d6d18fcc35b2185311de7f7c1be","libgit2/fuzzers/corpora/packfile/2adcd01e876b12d867c858ffaec38c42c59c36c7":"111d33da364d8929a5647a956ad3d1b79e68c6cfda976ac379bd498325513ebb","libgit2/fuzzers/corpora/packfile/2b28470644f5d0323643da99c831d82f20a7a74f":"db8a786bfd5f6b9b8ab68c34cf48872df23e555e47ab390c96a22ee8c648e9c0","libgit2/fuzzers/corpora/packfile/2b86229020ba808df84e16f800dc152254f18f64":"249f9289ddc8d44e8f97c2d6a0e3b9403366126e2e82aeb852ef12c25e93473e","libgit2/fuzzers/corpora/packfile/2cc5bf2f780cd85ad93d232890f418625f4d1274":"40f131c3db3d68f63e653e512ab2303682dace69e6d0e6d319e8c0ac5469900f","libgit2/fuzzers/corpora/packfile/2d6ae8fa82b656879dd3371d0a6899e88ef34e76":"58d924c47d9c5746a411fb157ffac3f473ae62499fb1d0af21447f3a6693b273","libgit2/fuzzers/corpora/packfile/2e74d24e887678f0681d4c7c010477b8b9697f1a":"4f362f9093bb8e7012f466224ff1237c0746d8c8f660b16699f5036ccba9c64a","libgit2/fuzzers/corpora/packfile/2f436c68a7b0be43aa6d4ad5126ec9401a9f9211":"fc257692f52f2a9e94ed3bda610e17569bbb1b3bbae7414fe05464eb1cbc4fde","libgit2/fuzzers/corpora/packfile/2fec48b0dcb45b98597bfec12bf0dc650543b3e3":"d2d4fc8fc2f6022fd04b52de7e94ae9f86ab2fbe6ee351a0e713cb5e5be60f7d","libgit2/fuzzers/corpora/packfile/31bd25636a9807d6024e78b9b3d02fbb1a02835e":"8c568bd48de3ba2260e036b550c34e78471aca68564224d2e590d2c8e6f3b378","libgit2/fuzzers/corpora/packfile/323c88be36ecc20ff30b21cf417106554042db04":"ed4ec49f015e93fe11d8a3b0e3cbc84f77ff0cee5fe68b514e2048688a20583a","libgit2/fuzzers/corpora/packfile/33b3aa957ca4fb31873033a7f460617f1fe81e32":"697219e8ba5c5a4a035cfa9dc55131a29c4c9690f1cef712576f38d059c99c0f","libgit2/fuzzers/corpora/packfile/34303d14e37c9ddfb0bad130e006fec927e13785":"90a24cc8e507f74cfc6b6bb8b82ed8ef8106cf816f6e0564f15db6cdb7bba70c","libgit2/fuzzers/corpora/packfile/34dac9466a4a2c15aaeef13a9567f6827ace7748":"78bbce625718a94a1cc618416122a23fe015b5a78968036df580bf6e30568941","libgit2/fuzzers/corpora/packfile/356a192b7913b04c54574d18c28d46e6395428ab":"6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b","libgit2/fuzzers/corpora/packfile/35bf585248be2c6d3940e15b85f72c4146903097":"68374528eb7a497146e7f93de6a838a358c546aacfa671d64187eff8f07fcb43","libgit2/fuzzers/corpora/packfile/3725a1c4431714019827277deac8ec2efeed8f1d":"04c0c1e3085f812adca4a6da63d3559ff21fbfbc2730bc819a5399eb81eb2bc1","libgit2/fuzzers/corpora/packfile/37a2b7de1fadc9eab2d5fabf5dfe7007c245dbee":"8085a4294993e8f8508fd35480164c6db6c8e410d3c127824057b420b1e4325d","libgit2/fuzzers/corpora/packfile/37ab8a0ca81fc62279057401761f7730a5a8f1b2":"742ef3ee518cf16165dee1d0024c594da8a42f295e61a11081bde66b161aae5a","libgit2/fuzzers/corpora/packfile/38011be20a664dcd2594e712a26c063c2d50efcd":"40e9a20f3b7d1bb25d81aca5d5a2549773d081c42654b007043a9703fc4e152a","libgit2/fuzzers/corpora/packfile/3838851a5da8239c2ae6cbbe869c81446c720e87":"6f8955ff64e3c7012f4f6a6da65b937914b1a695e1b90999542308a70b855f8a","libgit2/fuzzers/corpora/packfile/3921322ac01429b001f88d64c8319088fe49218e":"71ec12ef6dcd10aa15cc10d34bc2f91462f4507435f98eea77f9e67989de3298","libgit2/fuzzers/corpora/packfile/395df8f7c51f007019cb30201c49e884b46b92fa":"594e519ae499312b29433b7dd8a97ff068defcba9755b6d5d00e84c524d67b06","libgit2/fuzzers/corpora/packfile/3e98eb4fd65d3f2c41fa979db0f5678b310e51fe":"663be3787d61eaaff1def59f73dfcbc54d3a53df6b17af6301d4bdbc9aab52c5","libgit2/fuzzers/corpora/packfile/3f9ec359d0cb573cb6d2b2df64c9f4048ea298b8":"50fc019118f159ff1b6e034afe2cc8025a3bd55fa847de321c75ccaefbc5b1cf","libgit2/fuzzers/corpora/packfile/4067250457728bf775aa310ef253b223ae2fe4dc":"f358e46e11888cb4b5d6add27dfe048f6af335ad1f3c8915cd8daf9a8066bd19","libgit2/fuzzers/corpora/packfile/40818db87e110b29cb864f73265586cc054f5bbb":"50c36f3b6a3fc275f77079241e1f6153b3106af3974730cecf6b4af774607795","libgit2/fuzzers/corpora/packfile/418f9fb9ce1d4efdf481ca8fff9dadd09caee9fc":"4ec2274775773a5bd01d038018c1903c47a6602bdd8244569b2910f196dbaed4","libgit2/fuzzers/corpora/packfile/41ca0ae865b686089b8d99e9d661da291ce51019":"7fafdc296890bc117b37b604daf3327643422e66a0bb6a5380ef114ba0180c0e","libgit2/fuzzers/corpora/packfile/42099b4af021e53fd8fd4e056c2568d7c2e3ffa8":"8a5edab282632443219e051e4ade2d1d5bbc671c781051bf1437897cbdfea0f1","libgit2/fuzzers/corpora/packfile/420ce645ce1c93cee59a06da2159cbbb251e4c01":"da948e44d9191c43e3a0a943b2386f2034234205a28bbfaf431d57ae90d29050","libgit2/fuzzers/corpora/packfile/4345cb1fa27885a8fbfe7c0c830a592cc76a552b":"bbf3f11cb5b43e700273a78d12de55e4a7eab741ed2abf13787a4d2dc832b8ec","libgit2/fuzzers/corpora/packfile/450718a71a93a1b5ff982595432400b0fa876fb6":"c69f9f32570fb3a788ca2aeb60ae7696117229e6cd6242098f1dce13bcfe3b42","libgit2/fuzzers/corpora/packfile/453a312eb77b9d4198ac62faef10ecf3e283120c":"b6487bd1bda62379fd5b0adfb1c1fa600e99ef15f4c1b42c001acbe31dad3c77","libgit2/fuzzers/corpora/packfile/45470317334b614ce4d119c05ed2d6250dbc6061":"a1a8655e3884227fc028023592ce5c2296b42e8492dcc880b84e48e669bbb1d6","libgit2/fuzzers/corpora/packfile/45a65193e30784b0124f4fed659eb7e46552c2d0":"ca41841c5c98e34f4a3ae83d9220940395301a9616f69d6672b04ea322f28eb0","libgit2/fuzzers/corpora/packfile/45cff3494791ded181e1e3dab1c7a0e40130b57b":"e703c884ab644527abc3568c8392f6275f20f64fc498dc4501e1cb11f3c7b80a","libgit2/fuzzers/corpora/packfile/481dedc2855981510024d48828af0fe35a1503dd":"1d558ad1097cab5516d172d3fc0fc572b03f57ddde47c4532669b79ea08847a1","libgit2/fuzzers/corpora/packfile/49a6448a722742b1b392f0471542ee0c572c5a9a":"1d3711dde2925c70845e729d0094faed7b06a087d309ed4dc75947f49e110e71","libgit2/fuzzers/corpora/packfile/4a6e6af93dea13a5720be52b95f2948e0cab4602":"94ae66af388edcaf2d0edd6d5eeaa14ad281122c96e6caff19720786983b598e","libgit2/fuzzers/corpora/packfile/4ac25548f35e06eb9f91b0f15b89db3cb5bcb283":"f84a6b5a55d2556f6ce03ae318774057331ea7c51435f1b92e090a52af43ddc2","libgit2/fuzzers/corpora/packfile/4b586169f192749a0aa023ad6e4edd2e15d67f53":"2cd7ba150c2bc318d6cab52de107c70f4ab6abc9e2af160098398b2bb0c205e9","libgit2/fuzzers/corpora/packfile/4c3c8ec0e25da9342dc87c2e78d3040c381514ce":"4e0e3847ad9742d0a217e23b7be39fdba727121b1e6b5a3af80595ba46f34e51","libgit2/fuzzers/corpora/packfile/4d5189cd1411daaa579df34591c6a5946204c9a0":"5adb597fd88f1f7e802382f3cf903e0b2c54d3c84ab4e1f728ad89f62bbb208f","libgit2/fuzzers/corpora/packfile/4d7f1bfa928c0d3399598d562e346c6e23de6a03":"acef8db9a20a8933e65d85cbdb5e29903dd55eb3f6267082164db103855b0b01","libgit2/fuzzers/corpora/packfile/4eee38183d6fce3f42224738be58d0e3975300f4":"372f98baaf19ecad27e909d6d9a21c5a8fe3df7c57eb370bf9b3d49eed7adc39","libgit2/fuzzers/corpora/packfile/4f2e2af611d6567abcf5b6bfc579487ac417a8d4":"d5527cff4b9cf19971d975ed17891d50e6e59d83025e33d847ac2d00974a1cac","libgit2/fuzzers/corpora/packfile/4fa04b2c3ac839c36c4a3b51bf882eb99b7cd097":"cc5cd22723dbce40b45e360c72c0bb6abfac849c38ffc5bd2de02b125475a7ea","libgit2/fuzzers/corpora/packfile/4fbe10aede9fd9ce2030c6e567a9281e1a5338f4":"0eb79f0e16c8dcf59840ce9f2a0e52b276079168eba539f18d26eae6e5f92026","libgit2/fuzzers/corpora/packfile/5037f4f74273aed9a09122af5f4acc10f42c033a":"2c6e703f821f20b073261714cf3c58c09cb856efdcfad65f82a90c4f90c6b9fc","libgit2/fuzzers/corpora/packfile/511993d3c99719e38a6779073019dacd7178ddb9":"5c62e091b8c0565f1bafad0dad5934276143ae2ccef7a5381e8ada5b1a8d26d2","libgit2/fuzzers/corpora/packfile/520aa436eab6343c3729f51f0f8048e6b87f6aeb":"61417f153c5e6fa362868a13c2561ea05511962e2446089cf197c77628b8499d","libgit2/fuzzers/corpora/packfile/521e228f3b62dca81d87d2e7d5476657d7b5e0a9":"a3f99b1d6a58379342d2569fe7ac15d5116c1fadcdf9f55497dccfecc2ec47d1","libgit2/fuzzers/corpora/packfile/52e37dfd77d56769dc8a96388aa26695a8108dac":"34b93ac37ef5c0780c8aa96852cb1ca99071e45f2207ef83c625d08fd6abead3","libgit2/fuzzers/corpora/packfile/5374fb6be0a406cf8d0e95771ecb032254d21305":"b87d96b116f8d1c143dddbf3620435bf5c39a340768b3661dc1ec2e412b1ad2c","libgit2/fuzzers/corpora/packfile/53e1d4898c15c8ee3ef5e2fb279d151108725731":"475b82ad183afbfecb3e095a41595a3337c6edf03f79d831f623678e7673cab1","libgit2/fuzzers/corpora/packfile/53e61ad37ca92b7f6c0396e5fab1ed8743e73da0":"8a731c352c4a868851779b032413b4f87feb30ca196a99c505e052fe4413ff22","libgit2/fuzzers/corpora/packfile/55df2a59ed6a888ee2f0cdfdcc8582696702de7a":"4d4d75d742863ab9656f3d5f76dff8589c3922e95a24ea6812157ffe4aaa3b6b","libgit2/fuzzers/corpora/packfile/56a2020f68c5eb72786ea168cc2a7e8ea34ad9c2":"cf03ac39c4d5f13fa697d63b533482821e359dc5cbdb7e63c649ee75d11b0092","libgit2/fuzzers/corpora/packfile/578678e78b72f8bcb9f414e4129ae5d85a4af914":"c1969918521df12d3cc28ff4c78d96b32f1048b77be7be5ed92d7203a22afa55","libgit2/fuzzers/corpora/packfile/5a8bc5597fd0b2b44194ffabce46e2fa94c1ffd7":"95be31bd34da5678c631d7c3e95a588001c637470e3dc0ceec83ba2ac25e3a51","libgit2/fuzzers/corpora/packfile/5bab61eb53176449e25c2c82f172b82cb13ffb9d":"8a8de823d5ed3e12746a62ef169bcf372be0ca44f0a1236abc35df05d96928e1","libgit2/fuzzers/corpora/packfile/5c2dd944dde9e08881bef0894fe7b22a5c9c4b06":"189f40034be7a199f1fa9891668ee3ab6049f82d38c68be70f596eab2e1857b7","libgit2/fuzzers/corpora/packfile/5cb4674f4468d39f061d1df3c95b9c2dca529c54":"0534e4376f12cd0b5e4d1b424978488667df7b75873867529a0938bb8dd88871","libgit2/fuzzers/corpora/packfile/60b6fbfe65dc1796a09a734e054223aba8c90260":"903ea589b57575eb4314db42d2c3a53a88a7b13fb2e6286aa3045b8cc8f0627d","libgit2/fuzzers/corpora/packfile/611f5b9368427ef823f7ed89ad23667b02a06435":"028e95996ce886b73dbd2a9e974a064f51bda3d523357b867e89d2d17efe9885","libgit2/fuzzers/corpora/packfile/6214b4afdbfe63400ce428d47a58a2e29f682738":"43be55c6bfae3ed5135a1f62d76698adfb199624ecf57413976b76146d757e61","libgit2/fuzzers/corpora/packfile/634b675b80d51b52c3c6fbc73181ed47f61749ba":"64a2cf0bda2138cf4e271b0f78da9441e966e54cd0b7df8c9ca7d47f7d166586","libgit2/fuzzers/corpora/packfile/6431f1b31dc492fad89732b7d3e511fa7361985d":"86143d8fdd6193e2bba055dcf209e5dd2317b543981b2ab58480154d818bb232","libgit2/fuzzers/corpora/packfile/6442fd4bbb7656f142c92050da17b0e81e79fad1":"af45fcd37a8cace71612fd940de118cf73b0acf8b75fee786c5eb435f2eda40f","libgit2/fuzzers/corpora/packfile/6486c8cf6bcc2fca60502564924f6b266399df3d":"e33e0d446df6c82751725194a5815fc278004cbf76d4084c0e9394d139a95146","libgit2/fuzzers/corpora/packfile/651c573b6fdd393e97536a47f8b9e65226e29c33":"6857ae51d2535d3c50d4dc20d7a76325ad5fb5f3dab4ae5e9f39b062d95ca43d","libgit2/fuzzers/corpora/packfile/657fc646e93cb999417f43f0ec77fbad694e3e18":"fe035e27dd216ed91db51fc611a739bfd5e50f1bb0ebb1f1329fac4bc81f67dc","libgit2/fuzzers/corpora/packfile/65cc90263dec0020ceabc727d33aa587e57fc175":"a39c28b283be82be09a64ed16eca831cf6343a77ad6cf8308f3bc7bf0b58e5d9","libgit2/fuzzers/corpora/packfile/688934845f22049cb14668832efa33d45013b6b9":"9b4fb24edd6d1d8830e272398263cdbf026b97392cc35387b991dc0248a628f9","libgit2/fuzzers/corpora/packfile/6b0d31c0d563223024da45691584643ac78c96e8":"62c66a7a5dd70c3146618063c344e531e6d4b59e379808443ce962b3abd63c5a","libgit2/fuzzers/corpora/packfile/6b4dc6028a3a684a20dbc427b15a37ea2fd12dd1":"eb684863e4b67a8d7dbe72ebe8f4ccd002a28185cb386cd2f9cb03d2c83e2b29","libgit2/fuzzers/corpora/packfile/6b7486fc2a47a40eb5a85a5edf53af60d48be7d5":"aca5cfab2b6b34bce54c817b0cfccb483596942e4fbd3bc5609fc480afba8700","libgit2/fuzzers/corpora/packfile/6bace82ea640ac0a78963c79483faf0faa7fd168":"149488d869cbef080602a371ab0d39d97af103fb726aaeb02ccd36c06f494e5d","libgit2/fuzzers/corpora/packfile/6ca38da5f096a5847776e4d50cb63121341fd67c":"6a4bbda5b6050c45b9e10ccf495315716494372ab38c7518fd2bb9a01210ebf4","libgit2/fuzzers/corpora/packfile/6d344a65b9edced36045f94215b6810799789334":"298d915bda9804fc3984f389087f1e60ad128d69f91283a59fac523a26b4eb7d","libgit2/fuzzers/corpora/packfile/6dd655e8ef0573eb1c41151af924974aa1e9c454":"dbdbf9bf608f3df41d2a596a936f2cd8de0307c9dbc8e786a001d6fae2b86f16","libgit2/fuzzers/corpora/packfile/6e118259c2940fafba0a9ceeef6308e12e881ae1":"a73992db63e191ba5105ee3e682ada13e8f6d6611cc57343d06dd3b2a6f5bf81","libgit2/fuzzers/corpora/packfile/6e4b5ef83333606a16a63b579f221f6ffb7b48ee":"0083ad63ced55982ecdeb9312193e38dc473ba8ff1fd09976ce217ce737aa854","libgit2/fuzzers/corpora/packfile/6f47ff60d54c012103a0c28851ffa9eab3002511":"aeec1d01c3267edf30e2e1ed652a8808c034f212cae4fa5d6e4a8b02e65548c8","libgit2/fuzzers/corpora/packfile/701a765befff451207517d56c3fe8609d059867d":"ffd178a6ae2eaf3899396852b8259ec26a2b3fe269a94e47146450a5cdd38ab1","libgit2/fuzzers/corpora/packfile/7050f56d64b28499c89d5430761f18a8a2a933d4":"7ee42d5b88c8af97d2fe05970c441631f60b3a5febcf596ba0874bafbdc098ef","libgit2/fuzzers/corpora/packfile/724fa0194f615e1a0f08184a9f1520123f8e2833":"41f525525aa4c452e6fe17b85d2319d985f2dd4fb1a7d354989e77d8c580f7f2","libgit2/fuzzers/corpora/packfile/72c52d0d98717e21dfee45418a046a19198b5d5d":"a76de76465190214abd08d4578e799f74efc32465ba7add89473b4d37336f380","libgit2/fuzzers/corpora/packfile/72cec0949c5743ee1df67b41ece5d6806f9bede6":"790bbfd0fa86ee71fcb094b8f88719504d77dec1f13a99d9ac0835eba8e5a97d","libgit2/fuzzers/corpora/packfile/72e6bfb7b881befc0b461334411d70ae227a426a":"3c30f9822160fcc2ec4af7c763ab0160de24db5883767c98aa398e6ab6394965","libgit2/fuzzers/corpora/packfile/73b74736664ad85828ce1be2e29fb4a68d24402b":"50868f20258bbc9cce0da2719e8654c108733dd2f663b8737c574ec0ead93eb3","libgit2/fuzzers/corpora/packfile/745bedb79413d20844a8b0e96fbec51b4989c65d":"e596a8e5c49dd20a79bd0c1a7dd190a674507d1129785746fcc1c5e64cd8416c","libgit2/fuzzers/corpora/packfile/748142c17e56d0f0ad9e4d6525b39294d81261d6":"f12d4073f20d8e09e0cd213f88e486f0a019f36829a9c3993f197200e94f5b45","libgit2/fuzzers/corpora/packfile/74dfea2e26741a8778fb942d1d60a84d0759d7a0":"432bf29d5062e65fd5dbc9cd7ff4b331398441fa5b24ab866c13018c779abb74","libgit2/fuzzers/corpora/packfile/767b2efbb7502a2f652a448b471693d32c128677":"decb68b8c054c9c71c1995a66d0ff661b8b66ba439f99e3c3fa1818b1e41d791","libgit2/fuzzers/corpora/packfile/78abe558c4277852128d4b91282edcb68f86bdea":"844a46be5eb4445d754b43acf1b47d128f0fee9ccff9dda7f937b5e15b7771ee","libgit2/fuzzers/corpora/packfile/7960246c2db6d39e68dfe93ded358a3acba8f896":"833e8146ea91d1aa35ac0464900c8d9aab772ada99b24bcff3a6ac5cbe7d4de4","libgit2/fuzzers/corpora/packfile/7a4ff814176b55af008ad9580201d5e659242f05":"9981721ea3de1ceaec7a653b556de1ece3a9ebab8caae9ca1245460610ff6b81","libgit2/fuzzers/corpora/packfile/7a752694fce29ded083fbabbc9ff95f5b92a3d9c":"053e08c1c12476ec8107a1a1306cfe3800b8d6440dc2cf6d1fcaba9584469cd5","libgit2/fuzzers/corpora/packfile/7a81af3e591ac713f81ea1efe93dcf36157d8376":"65c74c15a686187bb6bbf9958f494fc6b80068034a659a9ad44991b08c58f2d2","libgit2/fuzzers/corpora/packfile/7c957a1fd650f9ae0eadc112837ea451a692affc":"51a4b3d09d4f755909793e56fd4416bebc90dd36d2d87c0cf6821bcdf324db4d","libgit2/fuzzers/corpora/packfile/7cda4ab6a0daf50f675d5225cbc166c86a8ef95f":"e6b39029b9173136a0c71578a76e66ff08810c37a3a8e96a0e03ded1b20d0c6f","libgit2/fuzzers/corpora/packfile/7cf184f4c67ad58283ecb19349720b0cae756829":"44bd7ae60f478fae1061e11a7739f4b94d1daf917982d33b6fc8a01a63f89c21","libgit2/fuzzers/corpora/packfile/7df1ea8d86d601c3bd39977ea85e5f74c9db6acb":"5e39875072bb19878194ccd25af26ff9d76e935d87935f5fd8a6b81a7259bd14","libgit2/fuzzers/corpora/packfile/820ec3e39089d863641a1be6942445db3ff34270":"ae12ee9fab37804a48400f691f8833377604f8bd78a6af2bc12f6570aa49d113","libgit2/fuzzers/corpora/packfile/827704fd978bd02a46268b7396b202a52ad261ed":"f23807c78d7b02a51f8c5d40dd9f2d1b4af69f46b4761f396344d180a4e76c82","libgit2/fuzzers/corpora/packfile/828acfc1d49a0fdbcd9f238138ff65582c2a9fc8":"3fd40365a317580c8802c296b8170d685a6cca0b9a6eb2ef3b08e9cb2e77157c","libgit2/fuzzers/corpora/packfile/8306a2f04a47fe4c95098675ffa25c074ecd89de":"cceed482f57105ee1101dda0c4f1d6c288a7527d7caf1e459ba679700ac2e171","libgit2/fuzzers/corpora/packfile/8327db1c6a884d8b3e3cefd94cec9eb94bffae0a":"8bf49c7443551ea96499f3b4d513281e27013f879ce27f162f5888524ce6d91c","libgit2/fuzzers/corpora/packfile/847f4e42f8f2730a48d19951d8829621b2e70082":"5ab289da1abf6db7952d39963192576ae50726816a9ab9e1b6e14cfe857ad0ea","libgit2/fuzzers/corpora/packfile/84a516841ba77a5b4648de2cd0dfcb30ea46dbb4":"2e7d2c03a9507ae265ecf5b5356885a53393a2029d241394997265a1a25aefc6","libgit2/fuzzers/corpora/packfile/8552526f5aba95119c0b95b61cd40386e7a3738b":"764a16d99c81df12829f07c5c031738b060ec15634c75fb0597b8573c14baffd","libgit2/fuzzers/corpora/packfile/8565db62ac64209ff009ac40e7c2d2ac4ae944eb":"a1a9fa92caafd4a5503a892fc6e39cf5f02fe055f2093a8de03966dab782d359","libgit2/fuzzers/corpora/packfile/859b3346967c5c3c136459e565b402f9a936aa0d":"32d71a6f68ce27fa4fa63bceff0aa7064adf4b394acb98bbe5340b53a2e32c83","libgit2/fuzzers/corpora/packfile/86a69caf3c5866d78d80da087b1b843cfea5e907":"7250bdfb69dfc731ea08d8465280ec47ef4fb3b867666c6181ae54a340dc394f","libgit2/fuzzers/corpora/packfile/86e1fb54a04fc18ee482b794ba3b2b306f6515d4":"d5e1fa07bb72903dc23ff979823b0484844a66e2fbd7a2dd7609f810192b9e72","libgit2/fuzzers/corpora/packfile/86f217ee467d31ad9ad2a8c502b91279cd7f1c40":"d15730873e710deba56d2e6acf6c95d65203f5f6a0ac649eff24b2a08b16160f","libgit2/fuzzers/corpora/packfile/8768a53e1d4c182907306300f9ca90cfd8018383":"c00e7f889cfc9216ec818bf2e1682fc6af0d89939c91776669478caf27c9727c","libgit2/fuzzers/corpora/packfile/8834a7aac170c494f45aa4da71b9605a52d82435":"6eb47f3d10f8511006d7e2ce4bae0db37c2408b15b346a3a2144d302d2ae818c","libgit2/fuzzers/corpora/packfile/883f023f38a031d8a8e8ce2cba6614b9bff5d41f":"27047cefdb1afb7679cdfcd2486550f6cfe451040e3c2452a31d376fded309e3","libgit2/fuzzers/corpora/packfile/88738071086eb04e47b77d1ca28b35ddbfaa0968":"518a4a4a69dcfad19e83cfa139700bbb60619562759cb889a0df41299b33b27c","libgit2/fuzzers/corpora/packfile/892aef744c87c6ee4ba3dd457c7ca02ba3d359bd":"680aecd32b417cd8dc27908ceb356cf0841472735593d47ea383ba1806fbd089","libgit2/fuzzers/corpora/packfile/8afb5c282d23c4055500f88a10b26383c682c900":"56bb7177a9753b58d1a91642cc43723dffd3eaa2f452b7ccb8da6cea1066f09f","libgit2/fuzzers/corpora/packfile/8b3dfce4cd7b8942eedb52af0e9ca4caa5c6de61":"d64bdce8a3de44553028d6e67fc9e6bc7e86d13832d2f032ad2bdb6f677f9724","libgit2/fuzzers/corpora/packfile/8c2cccf751bb5844bea8dc63c22e3f8e4489411e":"9e246a7f4fd3d189bba4dee4b60b818e11450346fd4c6debf021811a4bcf1ce1","libgit2/fuzzers/corpora/packfile/8e30894298502ba4d43af98f1ec3088f9b8f29d5":"54273780c0f34503aaebb1b1d9aec1bfefd259e152cbcfad0a7a78f03c936adb","libgit2/fuzzers/corpora/packfile/8eb4d738f7170d2e0594b779f782eb3171c9d421":"f7e7196fc84627c7d552d8878c740ea69e42076607be488f1964987c91ac4ce0","libgit2/fuzzers/corpora/packfile/8f46a043da3aa5d466ade170e62b0b9f362b4c5b":"1dea6c6dce4da36e28a7c14b4afbf425cb04fcc5e432a87b3b671e3ba3ef34f9","libgit2/fuzzers/corpora/packfile/9295f39686016bf3abb1d6e9924d6725c1263920":"b2d4a618a6a37e0340150e07a24456010313a116604dc5418150847fdbaf4f3c","libgit2/fuzzers/corpora/packfile/92fa2c2237724e7ba49e9c59adad8d61ce400bbf":"48a68f4eb5c3f2ad1200c857a537317716cc65780572955b239b8a788ebd369b","libgit2/fuzzers/corpora/packfile/936548b53e1a1e30cb30747a87203abd4eae78ea":"cf00b0f90843c43ff94f36f3fa83dbc268b6aea8eb698ef7d036d74fc846c616","libgit2/fuzzers/corpora/packfile/9835ad3ff27939bc1315632d6a22980b377c36e4":"09a8d7fd4e94e930d9be55f95e235fe863fc5ae3d160f8b6af74a1275cd9e6d0","libgit2/fuzzers/corpora/packfile/9857740c36a95415fa3be04cdf184db7b41a8b3e":"392e7a1bc70abf5219160e19617b1991950e126434d548d4ec36beb82d5daa63","libgit2/fuzzers/corpora/packfile/98c35b9d5e7b430d0d4ef70f642d8e2f3266b6d4":"31255070b27659f258325d5a359eb0944bf1afc78e9803721011c7f308398519","libgit2/fuzzers/corpora/packfile/9929b50ac145c0781a0347be1559764edc668173":"9bca3f4cc3c665d343fbd27104706f4b3bbc149e91e0c061e4bb960eab687ff4","libgit2/fuzzers/corpora/packfile/9bf6a450d87badf2d495c2df37081ea16156915a":"fdb9b6bfe39e368744422405b25d1e6282e69e83f691bfd64ae4211d8287b646","libgit2/fuzzers/corpora/packfile/9bffb3ff7a4429144305b770162074bbffe39ce9":"6acc20a73b586df891d52aeb2e0bc03b0d5913245f6c44841b6f70a43f2a69f4","libgit2/fuzzers/corpora/packfile/9c040d3207196e3aeee0df389170d6e59733ba0f":"d4cc24149d1410975fee6674cedb2ca926c81cb4c7e2f2033be26778f02962b3","libgit2/fuzzers/corpora/packfile/9c740d0f3b8875a3b19f1cf1a88d5192a997a68d":"73ce4744e856ac71aa069b7b202ca58358189f582d03706c39e82f1893700fc5","libgit2/fuzzers/corpora/packfile/9cf72097400efb70d06179e6b00abb4cdec74e66":"5ed855d3fabf5a6799b4201701938b76ec4029184b0466d219ae57687be9f3eb","libgit2/fuzzers/corpora/packfile/9d36c270ef1f14214742562238dc747242d4756e":"30bec7299ee957f8c7f36879728ff14ff45396762071716a8608231515ebea52","libgit2/fuzzers/corpora/packfile/9fb415ccadc8e7b0f38646ec5782d5895111e259":"3c1a049bfe7be1cd5df9c04212b9f787eb546ef32c128c47e3a48921249d7821","libgit2/fuzzers/corpora/packfile/a13b7fbb454fe3bdebd07a51d466484aa41ee142":"3b16feece66e0f53b9ae2a21cd4151b751041f9ed30cb2525b0d9934972e6a7c","libgit2/fuzzers/corpora/packfile/a1a7715c7596c77b892dc6d4debb7c108ca4ef97":"d52022534fa2dba3bb8a45809c425f42a5dd8786ef8d206fcff19c1fd66725b4","libgit2/fuzzers/corpora/packfile/a1ac8b656af02b56aefe6029db36b1af9fb664ef":"60315e08e7127eff65833f43847903f406f6c7601d783891b26d9a49eb57db6c","libgit2/fuzzers/corpora/packfile/a343687e2522222c2d49e8cb18d3feda64cf1d66":"e53612824f7d8ce616d2d90c4241a9dd607151977c3472196951a45aee54e17f","libgit2/fuzzers/corpora/packfile/a6f57425137e9aa54537f0b3f5364ce165aedb0a":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6","libgit2/fuzzers/corpora/packfile/a73df4ce29f75cc638a7a2d823fee57d909ab681":"f50747549fcdad833a87719f700bf3b47fc157160044f11af0b3c38acc7b71a2","libgit2/fuzzers/corpora/packfile/a7ee38bb7be4fc44198cb2685d9601dcf2b9f569":"86be9a55762d316a3026c2836d044f5fc76e34da10e1b45feee5f18be7edb177","libgit2/fuzzers/corpora/packfile/a8b9b91157274e617bf4ac5045fc0c6ac97e76f7":"9a5d8b4f20af57dcdcb68417e54980fdbce5464fab2afd860cff614c2a581a43","libgit2/fuzzers/corpora/packfile/a9c697f383f59a3b0642cd55b88190bce6201bae":"9f1429096e79d09fb146e5a033c33f14b75f9f4825f5db3671f2646410777816","libgit2/fuzzers/corpora/packfile/ab064cd6847c0fa546bbec4241eb9b095e0e73da":"a81119e59a92a2f837c142ea8ef50429edbdb6ea2ec5da75d026acca8ec110b2","libgit2/fuzzers/corpora/packfile/ab2c64588d3d9dc5c54c48d414e6d46d6a78cfa6":"7fc4ce8686c82662e06d7e92afffaf32cea8ee9d953f8a9583acd955a8478e03","libgit2/fuzzers/corpora/packfile/abe729b06750880778312618dcebb43257ec03e0":"823dfa841810526b38bf402ef1f84387f1ef79fe1f955057484a82652cc7014a","libgit2/fuzzers/corpora/packfile/ac1bf5a5fe61e5784f72b364ef1bcddfb0d13716":"cb8b5a2e407d61cd94b3ef29269661294ae1100092c48d7423cf55012a0d2c14","libgit2/fuzzers/corpora/packfile/ac47b6d3f0e479df3292131535f8e0d99c288de9":"85903df244183978ad491f5e727f566f9eda84af7d09f448e4e00aeb0d436c32","libgit2/fuzzers/corpora/packfile/ac9231da4082430afe8f4d40127814c613648d8e":"2b4c342f5433ebe591a1da77e013d1b72475562d48578dca8b84bac6651c3cb9","libgit2/fuzzers/corpora/packfile/ace9ffcaa273c01c0eb60381321e47edf4842332":"bfcdee20ad3f3fee73821ed01645e85716a0c3f1fb6e066bc048fc591d4aa7f1","libgit2/fuzzers/corpora/packfile/ad6ba9b0bc076987efbeb11ce3fc92bc1df69d0a":"ef9bed33abc7920236290dc1b50b678d884974bce98d11710a727e3e5f1c6f3d","libgit2/fuzzers/corpora/packfile/ae99dcb9b5e1b09aa5df6bb2fada3a3de61268fe":"e2e1bd67bf91c9c0af409af9a54fc913c21877799c5bc5678a7e90d46c599597","libgit2/fuzzers/corpora/packfile/aeeacf0499ace69549fe2c76757d4948ba65a10b":"bb9d5a1bd871b1793b42dd3070eb5c97e97c806536480085768112384de5734c","libgit2/fuzzers/corpora/packfile/af6614c37604ee5d3f7b00cddca761a8776283b5":"e0dc9a9618cc8656b1c8053fbd78d1be19ca1332203b2a08eb421b05ecd954ec","libgit2/fuzzers/corpora/packfile/afd44f8c385a922c8caacc1ea5688d324bad5b39":"ff18fe7a59d6f955878313af3cc5e0e9c9611d08293caa391bc6e20b9b41ae92","libgit2/fuzzers/corpora/packfile/aff024fe4ab0fece4091de044c58c9ae4233383a":"50e721e49c013f00c62cf59f2163542a9d8df02464efeb615d31051b0fddc326","libgit2/fuzzers/corpora/packfile/b1f86f05d4928c8393fe0f138c0714df3978f0bb":"3f362712695c59536e3e688cca80ae277764a0a05ce28c5cc8ccc91195132de2","libgit2/fuzzers/corpora/packfile/b452cd4b70f2827e3cbd6d5dd20f678b6e55f813":"5b10f1ffaffa3a373290304bdd876e25fa9f96460ea61244b8c31c131cbb3501","libgit2/fuzzers/corpora/packfile/b491dbad4c3edc87aa5a7f12b2c9a447a712c20d":"8c52ee97976acd0e10f5e3ce5546138933f2f43ba00e41bc48f8f56d31759db7","libgit2/fuzzers/corpora/packfile/b54664965911c6fe91e18cd01b68a75c8183b530":"3e151409ace91cb3394fecd59e92b5dc42c0aad29993a1858f2f70a0866a539b","libgit2/fuzzers/corpora/packfile/b68542373c05c0ed25231d09955b2c699d37c45b":"aa687b58b0e73e2e383f8c500d75b591e188efe0168b3ffbcd3771caaa6dd4c7","libgit2/fuzzers/corpora/packfile/b706e78cf7110a78dfccce991cd4ce22c6fd898a":"7b3fefae8d62926959b152b814a31dee7c2ce70fcd6e8b4ed880d1ab914326c0","libgit2/fuzzers/corpora/packfile/b8d3910a75ad8a7058f9c3f202f8eb27419137d7":"1f4fcffd5bda0918550e8b1b5e0106f2bcfce294abc8525f21e943465788a39c","libgit2/fuzzers/corpora/packfile/b93abe6094fb4ebbfa7414fbceb7199ce766075b":"6a8d6b8fce4c36237eefdae3ea8c3b3c16919e6c20c7384d4ef9cb9e8cddf795","libgit2/fuzzers/corpora/packfile/b9a64cc0694f3ac4a3c530c721bbf69026192187":"3301fce5b1142c8d15a7505f756bea29983a91572ccbc3859e1e483ef3517a25","libgit2/fuzzers/corpora/packfile/b9e5319eca8fbc26e5c322e0b151ed8ed60628d1":"fd7a1eef7d0224d9f5558c69f52763fe75863ebc9dd462d80ab1e50c8ce9f739","libgit2/fuzzers/corpora/packfile/ba390745a04c5394601f7aa73fe795097b814d1a":"527ee4c107847f03bf735054864c09358942e137e3b9d44b27e4d9356c9beafc","libgit2/fuzzers/corpora/packfile/bb7d065b776833337d3e1a3071de4d5d2759d78b":"d16bd22f7196c0a70f4b12aa0b290c4c4acecd5d6ba350ecc8447fbdf4c3819b","libgit2/fuzzers/corpora/packfile/bb99cf0bb3e5d75d59300e6ca9cb1f67ce315e3a":"c8c7687cd870980c15d0ceeb8035737e82d2fb95e53c421b3ab3a37ab535f859","libgit2/fuzzers/corpora/packfile/bd9722d91e0615cbdae3cee3476ec6181fbad98d":"6130bd959ddfc70a81745d1e8a84dd163df47c0fc68fcab00f8b3f560f6d3e86","libgit2/fuzzers/corpora/packfile/bf8b4530d8d246dd74ac53a13471bba17941dff7":"4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a","libgit2/fuzzers/corpora/packfile/bffc4698ad4aaddd977fe857da20858aa6654263":"357c417e27c0526868f4b7f7a9cd1cddf8cd2fe14d0e20b3e425b73d5e4298f3","libgit2/fuzzers/corpora/packfile/c0ea828d8f9c4a2c0fc6253908cd283f6c7994a1":"c016406647d3bf5cbdd674defd9a73f0da3871b59e8bf9382286657510d114ec","libgit2/fuzzers/corpora/packfile/c151b760696d665265187501c51f38cd84503634":"528a84ce6b18eb7d0e54be01379122a76dfdca14c97f02e0424aabf0220d9f51","libgit2/fuzzers/corpora/packfile/c16f90096603258174790bc85f076413dad0e228":"3493b717688b6c1743f814be189580aca11e9bd66e8c3f37d50d489445d1c986","libgit2/fuzzers/corpora/packfile/c20fc8fb8f1d44050c281089191b8eac2dc9444c":"8086925c6e2f51d516f2241098600acef7f552fc07b7f08a3c4bf18c81b4203e","libgit2/fuzzers/corpora/packfile/c2143b1a0db17957bec1b41bb2e5f75aa135981e":"452ba1ddef80246c48be7690193c76c1d61185906be9401014fe14f1be64b74f","libgit2/fuzzers/corpora/packfile/c22c3fba53bb2c5579b47852fa9ec54a88c03472":"d3cd0d7533edf8b992042d6be9f8c0b1205349bc69cb5dfcafb8e4b4d41b331c","libgit2/fuzzers/corpora/packfile/c297564cff1bb4f7933221050cfcffa36c59f691":"cc68b55932b8c746566eac4b43c0c6aa579c9aa954293c977c06209b71cc60df","libgit2/fuzzers/corpora/packfile/c2c4da76233acd3efe08eaebb7ae8dc9b3036527":"c3f610f041394931d0c92e7761420c1a4216afcc2b6afd7fc85e0a057977f763","libgit2/fuzzers/corpora/packfile/c3d47118536d19a8d1a601978510cc24344aa8df":"734b0c91bde31b44f8869916f7aa6c8af2f8f065357d28bc7421759b7b02990f","libgit2/fuzzers/corpora/packfile/c4cbb032db94c57061003a85d30bdf4117979b1e":"25b0287732f3e079c3d69a9fd067842324912a804795a1de11018af6f039900c","libgit2/fuzzers/corpora/packfile/c7090127a03c0e7230c11a649e4f98fcb4ca2b75":"3f6933ff9daf5dacfc3d9314be8ef5246aedd998cdcd4a46338283f3c5d73b1f","libgit2/fuzzers/corpora/packfile/c8b839665bd381ff7d006b1b08c35f94f1818556":"90bcfcc55c9e676fce0a6dba512e0b49b224f35bf291dd4a8099d4f2c8f30072","libgit2/fuzzers/corpora/packfile/ca8c7c16d1d6b60e951dcfb558cc97e14231c750":"836f7c7bfaeb1c965c8ab719763d341cecaf76c336fcc2c70b44e5984a54f3ab","libgit2/fuzzers/corpora/packfile/cb46c744c83541a0900e1e61780c18d43031a08b":"d1bbd73bb09190bfb883056771e22e997541ed20079793bf33975fe1654581c3","libgit2/fuzzers/corpora/packfile/cbf1e454dc7ac878bd23e3dfd0b6a28a50b2155d":"81e2325379124dab3e4a96cc3712fce61658e4a752d92fadb7c2c824c67bfab1","libgit2/fuzzers/corpora/packfile/cbfb8cae82ddd82c04996f474fdb4f1b80dcb6db":"0127665b0bc182a350eee4a978422ddf64df676f9c8a60c13b008cdca9e334dc","libgit2/fuzzers/corpora/packfile/cf74f755c004ca634818f8ba44c99fffbaa950a1":"df45a789633238d7b75bf77ffd3317da84344e827de55c364c6c2e24b72d2d63","libgit2/fuzzers/corpora/packfile/d07e4bc786c88b8d2304f84c7db2098666f822c0":"04b8d34e20e604cadb04b9db8f6778c35f45a2d2a3335ea517dafe8c9cd9b06e","libgit2/fuzzers/corpora/packfile/d17ab0db9edea68e8f9f51f471decae84b192a1a":"a3fd68b224e48c35fc35c694f1a5885b905bfd8936c6ca95e3e198ebe770e40b","libgit2/fuzzers/corpora/packfile/d1854cae891ec7b29161ccaf79a24b00c274bdaa":"1b16b1df538ba12dc3f97edbb85caa7050d46c148134290feba80f8236c83db9","libgit2/fuzzers/corpora/packfile/d22aac18f8b435fc34566fe0d3f42464aec9458c":"a6f08f93a50a32c771dbbf344f88a7f526ab57980611ae611372332402288739","libgit2/fuzzers/corpora/packfile/d446a50788c32053358495358696f9d595358bcf":"50a33c54d59026990630fa15ae212ab14bd1cb667fd66d86cc62db4b8a5cd4bf","libgit2/fuzzers/corpora/packfile/d461cbcff85c87b0068f0e9c15d2056197cdfa52":"13322e999c7f0fee54f64452777f11ccba5212b608ff44a1916408d56497c334","libgit2/fuzzers/corpora/packfile/d54709a1b46002c81f57da533379e57f00afe942":"5b5d914df78806af6f0eae28042c8ea46f6329223aee9cac19cce1c1b135dd90","libgit2/fuzzers/corpora/packfile/d567007f84b83e82df7069838bf8b6c5826b18a8":"8a9a2506ee42c512abffb015e844e840855830c8fecd2f217b6c19c782b9be6a","libgit2/fuzzers/corpora/packfile/d5e60b9f94126a9ec865fda83feb6835d294b76b":"39101a8d8a2163a7dcb4016950280bf89438106dd937bc57e93a5e066fbd36e6","libgit2/fuzzers/corpora/packfile/d81092a4f3607ddbba85862facf2285459696078":"b3450940ef5f01f6ca4c62295840bd162c15521a4881ea18fde1c474a2fdc528","libgit2/fuzzers/corpora/packfile/d898eb860ceac044950605db88429e029ea278ef":"fa0e51396fb692eda18a1bc6802acd70fbfb911150e9e48f54eddfa5df254b9d","libgit2/fuzzers/corpora/packfile/d8fc60ccdd8f555c1858b9f0820f263e3d2b58ec":"19753a9b7681b36104c1f79dfc8a6a1eccc088b8c7d2903a446d81694d2fb3a9","libgit2/fuzzers/corpora/packfile/d9b69c63cdc0c1622f2fab84d1307f9e0c0fa3b9":"9c4a4fafd6c2ad4778831b95313194e091f88afe9fac3879e78cf029298dba6b","libgit2/fuzzers/corpora/packfile/db1bb4b7348d387623dcaf0a743d0b11fa18409f":"12244cff24533d52ff3ab0a6c249084a0a751d7b62635c4ce7e94c3ab5c95bd5","libgit2/fuzzers/corpora/packfile/db291360a195c79ae504a3dfb2cd0f71cbc11902":"201ebc02ab846845e609102cd8e73a65a74419f1487cf2fc05f263163857a143","libgit2/fuzzers/corpora/packfile/dc98359b3ef2ced9c3d07636c89d475a564c39d9":"c40b2356ab24d6c4cf18060a662bcc10926e2f7fdf251c126d5a67f687b570eb","libgit2/fuzzers/corpora/packfile/dccc5642917b20b4dd64d3e44b71d08da30445e9":"f1b532b1b192b5e26fd79ec7e7bf82563da500ad8f136672c4b67abb87fd2ee5","libgit2/fuzzers/corpora/packfile/dd79c8cfb8beeacd0460429944b4ecbe95a31561":"30a5bfa58e128af9e5a4955725d8ad26d4d574a537b58b7dc6d357acad578572","libgit2/fuzzers/corpora/packfile/de9550264c4e2dbef14e1281ff3693f2d19dc1c9":"d62a88e4f74022694b8c6117e1ca882da1edeae3704c446ba77159fdb8f754bc","libgit2/fuzzers/corpora/packfile/df8b4d163e9ed75634eb56467343bde73b13263e":"112008b54d05f2aa80a293a94234d7468ac623c15da47d8b5585054c6021a4f2","libgit2/fuzzers/corpora/packfile/e0184adedf913b076626646d3f52c3b49c39ad6d":"a9f51566bd6705f7ea6ad54bb9deb449f795582d6529a0e22207b8981233ec58","libgit2/fuzzers/corpora/packfile/e0905bac594c818b9cfa909269114977c4d6d1b2":"b4714cd84ab0b51293c704acc0f79884259cb139e9f5b9858a4214343420fb5c","libgit2/fuzzers/corpora/packfile/e0bcb16cd6b42128201e1b6454323175a7e412f0":"ae0dbf170be313a1ba07cfec88d7898bf10a8b2b6fa0461efacc02588942c9c3","libgit2/fuzzers/corpora/packfile/e1ac9563c33f4f31b3e147b9d2fef80fca550948":"ebf725be55096adeff694160b4d8cad47c1ebba470614285939fc9e8dd48092b","libgit2/fuzzers/corpora/packfile/e230c91352f1b07f6f34da803d07e75c06897b30":"e8f1a7e7bd2af4cff5632d7d3b8863078bc4c7ea28064115144916dc63ac8c8a","libgit2/fuzzers/corpora/packfile/e26b3bacbfd6603d021d4ddadbac94b7b7aa0034":"322cf637730efb6ef79fca7bba1d07f80cc1944adc63e24437e25e8c833312f9","libgit2/fuzzers/corpora/packfile/e2a6f8dc3dc5d6c859f19d6e0fa64745201df0a6":"764a43d33fb0ab9ed5d7c9cfcec8ef580295483231f14be3db6748f6b7497104","libgit2/fuzzers/corpora/packfile/e2ba004118345660b379df5147bfa7a39d884dbc":"c0b2d8f765e2414743a5b3c74b0a7b9f302de9625517bfbc2405530fd33af43e","libgit2/fuzzers/corpora/packfile/e45aaf139d726366a18dce9e4854ee6c82901677":"a612b1c1cab495d0f15a91ab991637a4c9f059dfba2f5b091d2e2e21d871916f","libgit2/fuzzers/corpora/packfile/e4b3ab7e8c18de815fc8bd6ebfd5d52cf1924a8e":"5ebc6e0563be00d16f467eb3ad50c10066925330d9801e812136d3732980503e","libgit2/fuzzers/corpora/packfile/e6818b96c50bb749911248959af81a9c412a0223":"6957278b7eaeeb4d4c0f3c1221cb5006dc72123b91c49c934a281791e58d984a","libgit2/fuzzers/corpora/packfile/e69f20e9f683920d3fb4329abd951e878b1f9372":"f67ab10ad4e4c53121b6a5fe4da9c10ddee905b978d3788d2723d7bfacbe28a9","libgit2/fuzzers/corpora/packfile/e6eb439fef7d5461bc3552aa7c064d24e44c5f32":"08b43112bb296295a65deb69bc63bc2958d999a9b297bd26ed57cb0585e28ee0","libgit2/fuzzers/corpora/packfile/e9d9930dc3fea44fbc7acb0d1ef4bd867f1c902b":"5be64c7ad54d3db215d0ef3f210b0aee9ae4633b2881f7d0072810bde509f1a3","libgit2/fuzzers/corpora/packfile/eb05b6ad73fb1f69ef750d0b9cb6c606ab9d949f":"60afaa675730f8ec6476db50b3d40686774533ca08f4ce54b058a322fb51edb5","libgit2/fuzzers/corpora/packfile/eb0814ae767e5f28b87c998b0f44dcf80814db1b":"d4322cebd5966ceb5083cc2c31bc7781f79697a5158323896c18a17a62019188","libgit2/fuzzers/corpora/packfile/ebbd9763912dd557d08abd1373c867a4b56e6a41":"d165a3ccd24ec544a957f94ba8703521fa770744eb0699fe34071a8d118a26b3","libgit2/fuzzers/corpora/packfile/ebcdcb7effcc3f06e0d503638ac621de877fc554":"d1211001882d2ce16a8553e449b6c8b7f71e61836efc2e416143808f20e721e7","libgit2/fuzzers/corpora/packfile/eddccafb2716adafb9ad48203f0621bb00ebc73f":"2d39b23388680948e0061be0bb55ceccde983d1e9648e25fb44dc24c13dd4ae9","libgit2/fuzzers/corpora/packfile/edfbf20c83d3cec45470105581f7dc8b7e0889da":"9ca35acacf2da27dea68e300d51034b0bd0c898fee8d0ee44f93f3cd2b87c519","libgit2/fuzzers/corpora/packfile/f03218467b1c74e465cebb3b8092e21a5122f31d":"2c0fd6635a29873006859b664676c0b75ca95b5e46b0b95266877085d29d3452","libgit2/fuzzers/corpora/packfile/f28600befd899a94bed8e62853e90655d614f439":"51adf8866db0f293c43f8c7a96b5414c4e84d7ee8d997bf31aa4e6e5b18a99ad","libgit2/fuzzers/corpora/packfile/f3b15185b7a9a10716752d58434fe656d839092e":"e65fbd6e85c58a5976b116f05a70007aa3eb6ff0381dc64940c87a94fd285238","libgit2/fuzzers/corpora/packfile/f436ed7933482610e08e18b40e9eec102b63b7d4":"3aad42ed5e354244809aa24d1fafb03215ee3d50ee4cfcacbaa87ed69fb3f1e7","libgit2/fuzzers/corpora/packfile/f55ea5b7c1cf5400aae56d7faf65a42320d0323a":"2c5f37766a0c3ff147a264a9c1633ca4418c82b76e8ffc6bb617a303e2b39032","libgit2/fuzzers/corpora/packfile/f5eeab2d009aa4984378df6bfdd89366b7ecbb32":"72636181279c39fee14ca021361f08e0f9c2b4153690906c6e6fd2da3411ce23","libgit2/fuzzers/corpora/packfile/f6250c8b3cc0510e0f8f621100be83f018e2d234":"87033bb0d6c87b837ed9b5fb618a0ac5d807260e30072777583ae6a2431d43ec","libgit2/fuzzers/corpora/packfile/f7168410c7158ff7331698930937f9cdc54f4d8a":"0dbbde31abdb54bd8ba54779851e67dd2d0942a1bde5c26fb35e3651c715b479","libgit2/fuzzers/corpora/packfile/f91847640af285c1b8a6df27f5c50686ed0deb70":"1bde3122ca94ad63260aa702d4146c791bf1cc05d4b2405ac7ce95d40a09e4fe","libgit2/fuzzers/corpora/packfile/fa58a6b2d3286a136a43afeeaac589d2dde0a2a6":"2dc654a3b45efbeb20547537e2b73ee72fb363749625e1a63fb87e4cdf4ed187","libgit2/fuzzers/corpora/packfile/fe3667be5fd2ffdd553ae04a534a2e9ce5445188":"b0c569bab52da58c60d4a6961391d5b372d0c5f699330edb016153d4da9208cf","libgit2/fuzzers/corpora/packfile/ff21cad92ddd105224408fa696e91080a8cf98fb":"338ebb72e8e1cfb7e2e06f7489ac532092b9d65a46aa84b11ab01f7c85d4fdef","libgit2/fuzzers/corpora/packfile/ff9804ac04790bd58cdd124526c00b920469b812":"8cec4157325a1241ec8cfee807c356c5d43f2caacd02ca673f70df3a9f6bee3e","libgit2/fuzzers/corpora/packfile/ffc54ca808e7666f250133ad0ae2185ad688a826":"9be3799f24592e94e1f7991e5f312648a509ce2fb1edbafa50a66b65c916539a","libgit2/fuzzers/download_refs_fuzzer.c":"5f3f912d61cf808a381acf89e06f9f9970d5ec8fb13a3f7f09249553abbd047c","libgit2/fuzzers/objects_fuzzer.c":"294be4de22f1e9ff962ad3da9bbc004538004c95af67375422823511a3dfd9eb","libgit2/fuzzers/packfile_fuzzer.c":"e8dfb5bb36cf4e861f6d22b0a8d534e28a9a4ee8b410a6d9a6d250b285953bee","libgit2/fuzzers/standalone_driver.c":"72972d4d1e4139d1188c4ba35628eb93f4c7729efee9d5be29078afc53960e7d","libgit2/git.git-authors":"3f26949ee933d877d7797c8401c5d1f77780d3822b495fee98bdb085e9e5c7ea","libgit2/include/git2.h":"1a691bf8a76c8c6fcb28e0206ac944f9ea8459d09e14ec671761e30ca1e1a976","libgit2/include/git2/annotated_commit.h":"b12f2427151df5fc98e3b4386590e1f4626a9d63c164043f9de10ae5f1c5a1c5","libgit2/include/git2/apply.h":"b24e7c2dab9a6659afba24ac4feb02b6292e6ce198d79f4420fce34925d4fad7","libgit2/include/git2/attr.h":"7f9b295d892edea98c0db8415ae3d737e48d1f077a1ed01a7f9e3d9d8e0a7b01","libgit2/include/git2/blame.h":"5ca64dece15d1b4eb350e8ec57b0ce46e6047879e721183b6203c2555183a797","libgit2/include/git2/blob.h":"0dcee4bb6a375edc9bf8a15e3836f87860ac0536a71a8b585da622ad7206b34f","libgit2/include/git2/branch.h":"0d5bcf381bd96bb39f8b49b28ad0c64a737655e47909b2ab71a1ffc9f169ba20","libgit2/include/git2/buffer.h":"6123f50ce96972ed89c1a4316ee1b91d4e319002bccb16d79b460f59c0a4524e","libgit2/include/git2/checkout.h":"1173d124aac04c2263ca842f1c8bb5285238757dd220718598b9eedc0ab39b99","libgit2/include/git2/cherrypick.h":"b7992fc8e527ca0839d2e118321d3ae959a04a928ed9c3a1a1a993f796a46607","libgit2/include/git2/clone.h":"4f29df3fbf99ef2b01f796f69bb83f75cdb7e009a35153f1a64e549285600d58","libgit2/include/git2/commit.h":"956328d15708148d554a693d08d1b19004e994d71a428ca04cc190dde612f31b","libgit2/include/git2/common.h":"8139d12115f8d348b41ecb46ee5f6edc151838673b4e20a9a661f1e1fbe9ac05","libgit2/include/git2/config.h":"679a555f7ca32970e7b19f9e68b0c5a7e0ea25d952890766c36aa97e13bb1a76","libgit2/include/git2/cred_helpers.h":"b6cab2f38efd56fe0da379bf9a19493f362018a6ae31243027b1ec5a637d1bd1","libgit2/include/git2/deprecated.h":"1db051eb9ace17425909a996f33f5f8d38699e8c0a842bc0553a978bf95526b7","libgit2/include/git2/describe.h":"08b3280fbb5c38c5b261e317380bd602948ad5c0c94c6073329fdb222c110700","libgit2/include/git2/diff.h":"2a99276dae3c1a321203920cf628058754e9231aa90a60174780d698b9c85460","libgit2/include/git2/errors.h":"12df1c336d588b024a84a733366ddb81942cdf1c6b3625a3ba811ce92079439e","libgit2/include/git2/filter.h":"4013f43c76c36bc5ee562f2ca1d5027b17f40760d6f69543f8ee96c0a9460c63","libgit2/include/git2/global.h":"88e49fa7593012aa9575df08755b907b5b613f43278f477e9ca8e4feedbe6786","libgit2/include/git2/graph.h":"9b70d4c291f69803c51e8859c416f5ff81850738d3c4d1cdca0a44247fbb7086","libgit2/include/git2/ignore.h":"266b8bbef564bec63b4fe7d1d3042ffd273f252f151bdec23cc4f77c0febb883","libgit2/include/git2/index.h":"71d68397c1dcd4c2f42aa62d446ebcadf1faf3d63613b33792abeefb11d7ff21","libgit2/include/git2/indexer.h":"5906bf9d3bbdf4c4f77e51362dace7d769943d8620a62d963b4166b5f8cfd735","libgit2/include/git2/mailmap.h":"4f0d18eb0ab5ffdacdd716a9649319683fb84a33627bb4dfa6fed8aedff55d73","libgit2/include/git2/merge.h":"b526cbceb438feb65753f8c585d9a8b8f733058283df7b22e5794c46639a1d9d","libgit2/include/git2/message.h":"dd9a84083afa7835e4445e444d85756458133ad34c96f8529c2ab942e8ade5a7","libgit2/include/git2/net.h":"aa6ce5cde1a1c0dc586b3ac22bfd68689505d05fd91ee4c128c0225fdc7676ca","libgit2/include/git2/notes.h":"85a249b9ea66da28802dc0e0d93f0217b14e2c5cd621a2d4353e43308f2d905b","libgit2/include/git2/object.h":"1131f42da0ff2fd787b8e11a6813504dccd4816984eefbe872bf438cc8744877","libgit2/include/git2/odb.h":"761e49bde27ca0539f1761566b25eacf959cf6c2f4e9e13b2492fb6162f00ffb","libgit2/include/git2/odb_backend.h":"0b43a7072550a54e2d17494f6d7709d9cf0637643cfc07fe3f2e62296c4ccae4","libgit2/include/git2/oid.h":"8f07c6fad392eb2d50c09dbf64f391d14ca5c752c211a9e3ee248c4a13580927","libgit2/include/git2/oidarray.h":"9b89c71035101bd1c315c192b72ce50307a679d212ed4be53c68af74f1d2908f","libgit2/include/git2/pack.h":"e8db34362fd7e4243cc52e2b1d3733a427772cc78fb10b2d355fb54c9bc90318","libgit2/include/git2/patch.h":"c9dfe91324fa0884c154953f1645b6354dfdca3b551de04032399e6de865945b","libgit2/include/git2/pathspec.h":"5b482e78f28b084ba7b399b1f4612e58c7b8077e56403d5cb8f2cbec8798eb0c","libgit2/include/git2/proxy.h":"f15d319f1eb226aac56bee8a0c739608413e4bcaa6b362a47aa3e1ac2b08f308","libgit2/include/git2/rebase.h":"6fc70640891e32ed1fd4bb8d6b824b3e3600e2b1ebd3e4e58e3a736cf7b93992","libgit2/include/git2/refdb.h":"77a1b09f4ea49607e7dbaadec51680316e67fc574f822e7f5c92e6e0594c3905","libgit2/include/git2/reflog.h":"c3239c314b3d7bdcb056dcaf7fe31834fdc5905bf98f3e6682d11ad7817bcd4b","libgit2/include/git2/refs.h":"3b624a6085b13d09f45b8dcf3c7ae009267e8d0e52f8fae23e8446855f85eb13","libgit2/include/git2/refspec.h":"3fac2002e7bcc36fba7e353e728846423c121520e8caf00836d232493eda2db0","libgit2/include/git2/remote.h":"42a00d82174e4b883a9ab0f73fa097ab41ec4b6e8db372f674165f0d3e84d7ca","libgit2/include/git2/repository.h":"a5a4fe437d2102f79a7c8d316d0572d5e2b60f7cd599ebaa5f84a5cfeac4d6c1","libgit2/include/git2/reset.h":"303c3b9ac582a59000be80c3c2acec5eaa50c207112fd42efae77e6f3a308909","libgit2/include/git2/revert.h":"fdc9b2a8106191b36edac31d586375f82257614050b1d75fdcd0066e36da2243","libgit2/include/git2/revparse.h":"3447f28f4f811c176bcd43040f68a040111e6c46ad18a3b3fbbcab805964ed5f","libgit2/include/git2/revwalk.h":"5e44012562372dfd07905944b5aba5ca7b46112a23b6d01ffe390884bb40628e","libgit2/include/git2/signature.h":"c4562eb9a73f0f58fe575f040bf4a81fb9228eff91a8d4e22bcbb74007ff23af","libgit2/include/git2/stash.h":"0ec25781eeac85f917bcef432f0eef7c96d7552f18a7cb20978004195884ddb8","libgit2/include/git2/status.h":"b93481ba78d6c76c3bacb7549ca2350c39a9cae9f14639bb07b0328fccc633a9","libgit2/include/git2/stdint.h":"f8e051fb82c10f81982ed3df4fb7572245112567c749a8e4b64883f5cddfc45a","libgit2/include/git2/strarray.h":"bc8661586c2ec8259135dec395514777d0be3fe8078a29ee8be8375d6b4b093f","libgit2/include/git2/submodule.h":"fee3e34b5a5eef9d75b2f6d82ad70308f515495170454572308985ae305a78f4","libgit2/include/git2/sys/alloc.h":"9a19fb88e2c70146520d63e01778e22938976a4b754e4bb9e487c4d5a2ca486b","libgit2/include/git2/sys/commit.h":"3d1b2220325a82983ecb271c2eb8383a8db134dfc0da96b1f050f3664871252a","libgit2/include/git2/sys/config.h":"7888b5265f18640820d43f8ffc31e3e6b3153398ee2851d657ae8b28bdcd10a4","libgit2/include/git2/sys/diff.h":"e341f693acb25645f6ed47c041fc4eda8996a6f1d42905ae4f87fffba22520f3","libgit2/include/git2/sys/filter.h":"0c03098a51d5cad022dd317ad5a5837ff624f96fe36ee82da1ed5416426f0a52","libgit2/include/git2/sys/hashsig.h":"5677f86c02e557c7897e98d395e83d8168c532916ecfb7f9ca5bf7b4057141f4","libgit2/include/git2/sys/index.h":"fa99895949c987b7d40f47f5f6ea6e7f2dcfacb6438e59af7bf3630a7c7c4fa9","libgit2/include/git2/sys/mempack.h":"46f849ec737da6bb31bd35f3a8b0cc495d8c7f296d1acb017cab0431928d437f","libgit2/include/git2/sys/merge.h":"0f55133387914d5184ed517f3f929efd69090dbd503d75ad2fddb89e180c4655","libgit2/include/git2/sys/odb_backend.h":"c409d3131c51b1636303e562e070ebb2dac83bba6309f08d5c8a97df76a123c8","libgit2/include/git2/sys/openssl.h":"011d45d1991a7d4467b5de5c574718af5b16198fb1581639845fd8d07bef7758","libgit2/include/git2/sys/path.h":"97adf0e0751e456546c7c0119743e50aa428fad8a29184fcc637db1eaae08b67","libgit2/include/git2/sys/refdb_backend.h":"7526b2a43bc895c18bc164797001d8983f0cdd3e20ae19690b2ca9492793a858","libgit2/include/git2/sys/reflog.h":"c307ce8e9c8b0483ec45ce34a200f74e1ee73bfea9c4c7b0cc3923e3881360ca","libgit2/include/git2/sys/refs.h":"ee98c1aa0596b1cb409795a94de4891392e1675c42e8877a1e38bd0a5c3fd2d0","libgit2/include/git2/sys/repository.h":"7011981874a2325ea62ab21b0b074bfefb0ad729f51fd1d7a762fc3af883c7d8","libgit2/include/git2/sys/stream.h":"6bd6609f2dd2acaf7206c9542a02abad5439a6516f1ff160f1df040da33ad829","libgit2/include/git2/sys/transport.h":"0fc49f1afc74351bc8b106820ba8db8a446867dafec6b22e5f80c48dd41455d7","libgit2/include/git2/tag.h":"340f5aac9a05cbed975f5bc88522206e545fa4ecdb61b74929c8a36aef339f14","libgit2/include/git2/trace.h":"f9aaff56cd6e6ea2dc5f7e221f198016f7d4a947829340a45c12714bf32f6738","libgit2/include/git2/transaction.h":"4c7969130a952134c597e84a06f38ca4b19e0b372df88085cb4f846292681c5b","libgit2/include/git2/transport.h":"6d251fc43464195b1233f0bc4dd4e916cb800fc969a4313e988221c33ba36d0a","libgit2/include/git2/tree.h":"f78fe72f8fb509ee87a6e08bf9710f994c15408674901de8a776270c69f05b6c","libgit2/include/git2/types.h":"72e7d4ee4e4e373f03173c90f4ce44097e0eb553a4d64a2aeff448a4dac9da89","libgit2/include/git2/version.h":"6708c1341871e3ba8a525c63fa536c5b636464cf72f57c06de7b2f5b22d8c2d8","libgit2/include/git2/worktree.h":"03bd587205770db810df538cabda777f60b7e40307180748871ef7ef7dc1d511","libgit2/libgit2.pc.in":"e03f55b445ac78993a06b2dea6018acea775a38161687f8a583d0de371acfe8b","libgit2/package.json":"5b1e6e439e5df09c82cc7cd5160ebe239e5adca51381c2b31f790b89c7f0da15","libgit2/script/backport.sh":"6ef93a8c4a15ef74d2639638db3b24d20a76fc31faa53b1c34b07e3759c78fe6","libgit2/script/leaks.sh":"62532838555750cfdbff91709c40b1c1356e399238fc29379a45802922530a51","libgit2/script/user_model.c":"073e0b631f2d50af9c326dc009c626dfb9d31707d36bc61396ad9960160652bf","libgit2/script/user_nodefs.h":"4287333a6d7484a5a5796e6deadea53ec1ef587e4c571351e3fab61cf8badb45","libgit2/script/valgrind.sh":"13d1e34010c351992ac5950dbadf35928eaabfc9ba3acad336e7677fbda0946c","libgit2/script/valgrind.supp":"2160c174eda0e9a6bf2f9d39e967f601111703a06cc9cbb523a88e73d8a24264","libgit2/src/CMakeLists.txt":"000987699943bb08407eac146c5c08efb8c30dd015d55a43c80d0a1c62c89d61","libgit2/src/alloc.c":"83963ee373f9435e8eeb118bf412db0f96e3a918cf6dfdd0483ec9e26a70a3eb","libgit2/src/alloc.h":"0897973a8dd43caeedf3806771930d163db62554af8efc61b1c536e7daeb4052","libgit2/src/allocators/stdalloc.c":"1b81cf6589dcc7413c1a6ed7d0183689cfea619768b3b7806ba311ce6d6b3cbf","libgit2/src/allocators/stdalloc.h":"fe632f78c5cb6a079cc5f5dab9e7381aa504dc6937a0222f8de996c4f1f74e9c","libgit2/src/allocators/win32_crtdbg.c":"1324acacbee2596b05f79cf594d1f472331cd918633370795f714ffd00c85daa","libgit2/src/allocators/win32_crtdbg.h":"ebe0dcab46def4f3586a0e981b8bd5cc82e0ca35a62e3f17e0470933422135fe","libgit2/src/annotated_commit.c":"47148878a19e73a5f74ede34163af39f6c29ab6d106900845ac450240415a01d","libgit2/src/annotated_commit.h":"0c685dee827676a1d9548cb57d017fbdd20bade9ea78da62a1403e078b1e2fe2","libgit2/src/apply.c":"986250b0e569585b9bb8fa36ce6595283f7276ddbd90593ff54add4cb8c0ef7b","libgit2/src/apply.h":"f506155358417b3d3b9b56599228e28bd757a23713e74cd049c393f4ce9d1a03","libgit2/src/array.h":"97e942c6173c13ce665b5f4d1e6d82b3dec63ee8c0c511d8df31db04e8cd02cc","libgit2/src/attr.c":"44da9b02f6aed86c3481b8018a59d19e0c22df0b7059852ce937d783756eb04b","libgit2/src/attr.h":"c940426d88f00d1510d2698897d5fd1b9270d91ec0c86a7df10b9d07f598171e","libgit2/src/attr_file.c":"5dffde5053b4d0908d81fb8cda2e1e4ce33257d8c96c32de6eefe16bddedcb1e","libgit2/src/attr_file.h":"3237c0e012aaff478627db897e988e412c7ecc7f04147e35678e5bf3b1cc4e1e","libgit2/src/attrcache.c":"dde42365c6e80f9874a1eed7d3ff6b1e0d1df1c59ea4738541ac5e6fc7f2d7ae","libgit2/src/attrcache.h":"4d151f08fdac02168ef71426b8669da440e81925a88e89815efa8a08ddf5d3ca","libgit2/src/bitvec.h":"281444c865be87104cff9c1b3998877a67bfd92af4b0e5b9b034fd48f6569f7a","libgit2/src/blame.c":"d209f7b6d056075b82d7277b0dcd11b3e3f238c0155ed48726833d54f446ac08","libgit2/src/blame.h":"c1b0660a201d27ac53e781606bf51e60e89d8609982e9ef44bcd3c061853f6a7","libgit2/src/blame_git.c":"e786245d10bec4f7fcdbd7db9c2270fbacc19ac82947a07948b47802032f61e2","libgit2/src/blame_git.h":"9b813f16b93512d27d93648e53d1438d5b931024701273b5976c1da41868e286","libgit2/src/blob.c":"bdcbdc49566beaf7a3c5e6689158f29f29a83e776f1a9b9688d62ff56a1fd64f","libgit2/src/blob.h":"d72bcd2f634e3023aeb7ed03375b143377dcc5a79f77bdd42dd99d326d35b5a0","libgit2/src/branch.c":"b08c5a25cb239e338875fd9e226638c318932343713827ab9c91d0e595923e70","libgit2/src/branch.h":"c73beffe8a3a21390d49f5cc99601accb3e03d82c150be70da823548e031b6d3","libgit2/src/buf_text.c":"cb7a63ea17db38ae7f233d18537854a6bc5af73eec41fecf1575a5f22f49718d","libgit2/src/buf_text.h":"4ec92a3613a02bc4ba977680e6d96e2eccf0563d43a9693232f8631866174e96","libgit2/src/buffer.c":"2758b37c0869e9070a16b25df656a58fae45700d84226134e40b63c4204a6fba","libgit2/src/buffer.h":"1c37582179cf04f2746f482ecc0c04629359d942ec37589223a6fd4efb3d9ebf","libgit2/src/cache.c":"0a16103749f996c0c3ffc4ce95183774191269a6b1f8a3165859ca3a9a041255","libgit2/src/cache.h":"90e470b0f5dc2f1c9b61bb9a63970b55111270d93a7daa467b8d0792acc9841f","libgit2/src/cc-compat.h":"18622830881547152755d21f95feeb1cf8fe29203b7e35255979539fc572e4d5","libgit2/src/checkout.c":"c2b03be7b6f0ab7166a9ef15a4bfcec1817d238d05daaf29529ddbe8850f4ca4","libgit2/src/checkout.h":"deeaae59fbd6f4cb3d6c5b67133df66832ad3e49bc9585b6ce9c5d0aa4aa6ef0","libgit2/src/cherrypick.c":"9e5d4e0fcf51c94bb41b00e7ce3fa5ee71e37c39b6a429d5ce76c454594697e3","libgit2/src/clone.c":"7075e2b7ecb9f64af7b82a22caf8b23ab029b57ffbd7e86e6d9ace29213981df","libgit2/src/clone.h":"b6748c9ced7f93eb57f967679b67c8381e2fd038921aa4035a4e24ec482d6f6c","libgit2/src/commit.c":"815d73d0fdeb7b0c84a3c7e1010078543dcd3cc3ec86adca1da38005b31d4504","libgit2/src/commit.h":"6d46760345b792062679a51471449ec69ffe19079a50f312b51c330fe6a0b519","libgit2/src/commit_list.c":"bc5462b92b5152ad1c2f8edb48a173786d4ba2d09eaa825b8412dea784d59ab5","libgit2/src/commit_list.h":"8640d671d1785f1be371f72b06c332675ae85ab03c65db12b7beaea5f9098c11","libgit2/src/common.h":"37ce11f7b107c6255c30fdc72e1395a398dc6783c71fbd081477e2b60c396e06","libgit2/src/config.c":"c75fe3a6963a1958dfc9d86cc4e0e45e29d73620125f625625f9f7ff5a5ef78a","libgit2/src/config.h":"c37e78949ab85b1b4694cc39d494c9990e3b7e21f98eee79325645a1382ecc5b","libgit2/src/config_backend.h":"961abd79ac486562873d45ceb8836eed9b08c7d4f49f8a68705bbae99f635d1f","libgit2/src/config_cache.c":"9c69d28a6ffdbb049b1de1e653ea94f4fa1059c5b11dc5063539bb6e8cf8ede0","libgit2/src/config_entries.c":"c77c69bbd856a1e9718951071595ced785f2da1c6c82bfc53045ccc53ac1d806","libgit2/src/config_entries.h":"e59e5495d52ae8aa55dc5fa50b3ed46f50d72bb66fd1fa89d32cd42891a1c05c","libgit2/src/config_file.c":"628a814ff5b261fb05db87ac45d3d4cff2a977af23aa95f473aa16325c6ff239","libgit2/src/config_mem.c":"93cc70ae2915a209f7f8e0455a261b2269ab9d9487ef69c4256d2496c796ea71","libgit2/src/config_parse.c":"86709c067f116af8902a8c9df794cb9e7bc8612a0022b928f0bbeb582460abe5","libgit2/src/config_parse.h":"ed2e0138e13fc0115fba047c80687eb20778984bb2ee13c261ae69893e11e5a9","libgit2/src/crlf.c":"4b7c6b911b3cc1dbddec34f65f529eef98f7118323252eb1572a70c30cf41713","libgit2/src/date.c":"f25e34b3a37facbac7db64d60708d9021d0fe2a2492ebd32432399e0e3ad7e90","libgit2/src/delta.c":"0496cb9bed8143c043145e30ef7702441d1fa919a48edbdc203f50816e33ce94","libgit2/src/delta.h":"c757526292144083a0e96e7ab259080e83158e28c4819c4fa8bc2523aec12a59","libgit2/src/describe.c":"660cf42bbc1dc405e4e58e0a50f1d82552514be7656d73bc7f06b9bf3f2b9197","libgit2/src/diff.c":"6a7d06a34c2e20c71299cd9f22d02c90ff495125cc5696474aa92b7cca235afe","libgit2/src/diff.h":"06fc73f98ecc56a5788c0ab2ad8aa68e1fa06579ea1695b1fcba0e0e3a0775e3","libgit2/src/diff_driver.c":"70affc564ae415d1d1339365140a2d539da645dd1209deba0145e8f6364e11d4","libgit2/src/diff_driver.h":"a59c56162e5ee30af5a831b45fcf60833a5a622c05a97b6ac052186a507ded01","libgit2/src/diff_file.c":"03f03169b6d9f6c0295e07f699abc94639b1f41ba1e31eb200716adb7c7f4df1","libgit2/src/diff_file.h":"c4155c960e8e6d773b86161ba01c86f2be5b3e7fa0142747ae6ba1e039676044","libgit2/src/diff_generate.c":"66d846160085efa7769f502f92587d82472984e77260aec5e13476f18faa5514","libgit2/src/diff_generate.h":"49d845bd368538b4f255a2248af863f62c60e695668aea1ddb089c66e86716bf","libgit2/src/diff_parse.c":"18044ddb139273030e4c9e1e328d1e74329a75d03bbde3ffe71f616343b9dcfd","libgit2/src/diff_parse.h":"8902d9ba9102f10898c14d0a41a8d5823450527266908cbbb06e676309e23f56","libgit2/src/diff_print.c":"f6894500f810dbe73c29d01ea2c6f11eeeb4dea87d2458364b9899f9f10f03f4","libgit2/src/diff_stats.c":"566944912aadcc49e4cf6de41b85892480a8ed8707d19439c776a7c48cfd7c85","libgit2/src/diff_tform.c":"152940bc118880043cb26011194bfd580d75625ae0a310b970aa581b3f7604fc","libgit2/src/diff_tform.h":"a4a7433036cefffaa9d968ff45244afb4957313cd9c28980cc102f172f9eaf5a","libgit2/src/diff_xdiff.c":"5f4b6667b2cfc4ce04e37dbfb0d3f5e36a98cb6762e45b8182af2f993f9cc07f","libgit2/src/diff_xdiff.h":"8d083e69b9b90a5b937fdbead37dcc8e000495a16a7139ec600dda735285561a","libgit2/src/errors.c":"580330af95d7dea03bc547a48cbede57ff079f1b921a54c773c84c9157368995","libgit2/src/errors.h":"f71e32f9df35e257c371d7249497f698e8f8429352a250a87cb7ae5c37c88979","libgit2/src/features.h.in":"fee4fd59d18c3dc1c85fdf613cb72a500c108df6643269f3f97a7281a7e69fcf","libgit2/src/fetch.c":"6106680e57ad4834905e2afc4646ef94093b670d3ccbbb7c96dfbb1b5135240d","libgit2/src/fetch.h":"93669dbc5007dfe99856c76d35ca82fd25bcc59f3b5308cd0ca15a14d9fa865d","libgit2/src/fetchhead.c":"a305413a856866decc437bf222f36971b7fbaa488a2f298cda161f8c8f9d963f","libgit2/src/fetchhead.h":"65681769629f670afcf739d582bb7ae90f702f0c6085de3f26b79fb3293d1dc7","libgit2/src/filebuf.c":"709731f48a87a4d8e46c40df8697da9da703d6093b5da1c9c94eed9e02c4db94","libgit2/src/filebuf.h":"addc0cc02b56a9e0c60b334d51cc1fe68bcac82ea838d3189dbeaf8da46340b0","libgit2/src/filter.c":"2036db97cc5696e1b15694aa7cb549e3d1d08094bbe8bdcceb6dc0589d0b553b","libgit2/src/filter.h":"cd7edde15a42f16c2c30e431ed407345c7663c1f14a20c4b525ab1bdbd736797","libgit2/src/futils.c":"ca1197653b03f494c60aaad9ea7d0082458c8e5b9e4cd5f1cc99067b34fe41fe","libgit2/src/futils.h":"2c3c19c8077e854f4e060c67766c577a830a3388ec013ef39026003c4356c990","libgit2/src/global.c":"e43d735f0920856afde996c9e17e027cd429919759688ebd4c6b0700965a7592","libgit2/src/global.h":"20e6c01113aa2e0c374f2e2fd538d7e57d781c78e3aec1e15b7da69dd5830032","libgit2/src/graph.c":"796426d52cbf8110cbed8db369ff88752c8100de4fbf53da31dfa9b0044632dc","libgit2/src/hash.c":"e5bfe87d2cfe885ac3fbd39da5984c5001c4570ba08fe658f1cfe1baf5ad5fd2","libgit2/src/hash.h":"21543ccdf119b879313e5b65fe8c3e4e381523f486859c3897cbc05b0a954ddd","libgit2/src/hash/sha1.h":"9349e5886a08c37d57d32e73b83470f9da658a36f06b6bdb79a43d15fbb51093","libgit2/src/hash/sha1/collisiondetect.c":"a2155f06ce5e8b2d6022008402a479b866ddf8795c11779138d6345fff9788b4","libgit2/src/hash/sha1/collisiondetect.h":"5a1a2a35d0fe5a9e61f4c65fa07e68a923601ad12e0bc14de0d64b634dc1270c","libgit2/src/hash/sha1/common_crypto.c":"7b5be0a2eeca2e51722f6019a98d3e815d2f8c1191e14f36baba6c53be140510","libgit2/src/hash/sha1/common_crypto.h":"bde45e520496280b52c9fc7eae9c987f9f0f2a29a0d4c42cc0a451df3907897b","libgit2/src/hash/sha1/generic.c":"4bab2be3f32eebdf1ba71c71b32d1762eed40e1be4b1e012fe7900a88789e00c","libgit2/src/hash/sha1/generic.h":"b754e12eb4ab867b23dbb241b4f0edd277e42591ea9495287f098baa4e2d3fe7","libgit2/src/hash/sha1/mbedtls.c":"dd4e318b134cea917f67f5184b0aaf0266695db24a4da91d83b3cf9ede15201b","libgit2/src/hash/sha1/mbedtls.h":"be359c3f5006ce661cdf344c857f2725c8a5722bf15e300f5bd30a532f0e900b","libgit2/src/hash/sha1/openssl.c":"0c08735687474fe9da3a2cc21633a0b8c3435dc6101da44b45554f37ad9b2885","libgit2/src/hash/sha1/openssl.h":"ee9d4c8091b780c475b1342e2bb7d7934d2948a2938caac197cab7464a67819b","libgit2/src/hash/sha1/sha1dc/sha1.c":"f62247c8406698760eec4dad5e02f5de4e59ecc76cce8d8be05c344802df5e6d","libgit2/src/hash/sha1/sha1dc/sha1.h":"78f97f092c20329d1fa8d9a8cbb3d53bb90be19cbc49f1917605a9ddf520de83","libgit2/src/hash/sha1/sha1dc/ubc_check.c":"7b0db83569ba82965dc0d16e51e9ad85167cdfdab343f9a02c2c475bfdd93956","libgit2/src/hash/sha1/sha1dc/ubc_check.h":"4a140693701da167b4709c4c1b330800a0c29f2a065d0d819567a27b3171a09f","libgit2/src/hash/sha1/win32.c":"168d9ff60a46d1e9c8ad3625aae210a988260d443158d2a952b73b6161e149d6","libgit2/src/hash/sha1/win32.h":"e63dbd03dc247e5673c106a9036cd515efe2e9300f55d324070dbeb8824c7fdc","libgit2/src/hashsig.c":"21f4673d7ee3275aee03f430878939b808e313dc90cef1796fe09e4b4489e357","libgit2/src/ident.c":"b4d8d98ec1cf7e1fb395f365ae8b7c1ca88ca8a66fd9d4da5698f2c6a86e1c12","libgit2/src/idxmap.c":"84747b1521524ea3ceed1be16a27777425d3e7d6fb2a4357c7b1cbdf5046b3bc","libgit2/src/idxmap.h":"162a477b8faa3d37e83fd413bd53f6ba2801c1cf64a03c29513601058a6ed40b","libgit2/src/ignore.c":"c803d7275f9121c9a477a17d86cd6db703b32389fb611b6c1a4b84cda3171ce5","libgit2/src/ignore.h":"8189ffe01ffe66489fa19f26c960823ba781e5eb35d93f8ee655b06da26ea96b","libgit2/src/index.c":"424fa05e251a9c43d14c5fb9fd5ced86c398fbb2be1319489fd44f2e6db764de","libgit2/src/index.h":"d78e2bf5780e913f932f2a6d70fedfb2d81a0c8f00f16eb2db7386feddd90e22","libgit2/src/indexer.c":"114ab3f53705d5aa5905667f9d9a23070aeb4ec64a1b6e32671d6b43a21043d0","libgit2/src/indexer.h":"bd32fd65a3a7c6014e3e9846477b060033102c8c7baeb097506074f99c50a434","libgit2/src/integer.h":"fedd0377cd5959cdff544f03357541b4b0aed80c2d0a960cb7075b2042f4045d","libgit2/src/iterator.c":"0c05fe63247e42e7d0096b4758d677c9647d19e20043b202946d8d4e1624e2b7","libgit2/src/iterator.h":"3c35704a3eed44649d6ee95f99ea6cbe593eae67638f6b4a115c1537cf844bb9","libgit2/src/khash.h":"5ccd2817f881db49681ce72f39a3dcd96044589617df567b8f75b870619f01c5","libgit2/src/mailmap.c":"eaba2e487a28ffcbd6f9d57752e23c597dc1892cda34f0d56c5d6f48e874e1a7","libgit2/src/mailmap.h":"edd8723b4c861c855708f2d7f9ed5e37cbb7523534349b0f69258a3557b93b36","libgit2/src/map.h":"af71c423780870aa68f525aa0db4ebfbc4f84e46bb9105f14a4c60990c54719f","libgit2/src/merge.c":"89882d08b03ff314da664d10825cea6df0587bb51469a4ed62911dd38d7e1e99","libgit2/src/merge.h":"a82c5435c9b9b25cc5a47c5b1396d92349238b561b537184cf7bca57ae2650de","libgit2/src/merge_driver.c":"3e1235159f8b0cde388c4609077bceb4d7b3a32bc17114c392370ba4786d54e3","libgit2/src/merge_driver.h":"4f56c2965330a5cb08b9f26d6b83dc4e15fced9419540d2d793f2e75049bc121","libgit2/src/merge_file.c":"357cedad56215232038c15bd072e0b081a2d87407bb8fdb591d2d25ba9304bc1","libgit2/src/message.c":"3f8b9aa487cd068319c6ace315d77824e28adf2360f8c96182952a3efcd341c2","libgit2/src/message.h":"7cabd6fb3da32197a5564061b2f4461551263c207810add923250d9127e3e537","libgit2/src/mwindow.c":"896bc03ca0b2a9426424862d4d35c61cdc75a76dae79ba2286ee5a62d6fb506a","libgit2/src/mwindow.h":"38a5bd0f5cbcd5d5b2c8fe5b31567c1d5be7d92f615b57b7c139ba2b2e8dff95","libgit2/src/net.c":"c2c1e5d0e259937fea5f94d7e143888c0de61cfec572fd115ef03cd47ecc0adc","libgit2/src/net.h":"6308284bf525458cee607a3039a13fc874a6f4826866c47d5bb68b2d6868cf33","libgit2/src/netops.c":"09dfd2d9df2cc0f3cddeddca55c341abd08c0c33929cd54ade4f6cd6ceada7b8","libgit2/src/netops.h":"e0ea56ce01b021979cacf459846d8292d9528fb2f91577b3ec7b98a0574736f6","libgit2/src/notes.c":"0e207dc3751ba0e2bc437255241d7d1754c67f23d827efe7bb466da18cc7fafd","libgit2/src/notes.h":"650f92bbf875ab194b9e1d041f06fb8332bf5f402ea49cde528a81d2eac05694","libgit2/src/object.c":"a814f850fbf823fd0b2d5b2a892a56ec03612481eedf3010a2b7ffdc085cd0b3","libgit2/src/object.h":"320c9312a016f82c736197e7f7041d4366e2b6f97c60d0931c35523287e72a03","libgit2/src/object_api.c":"ac963762a903ea36adb20f0d4317388159c23828a6e26e9a1b1333b7a9fa1317","libgit2/src/odb.c":"4212ccae93e7440f9463205639045daccd7732791cc8e5ab44b7dfddb182184c","libgit2/src/odb.h":"6691e97525aeba2df13478f8e5a9f5944f40986e1581d4d0656fe7c6b8611264","libgit2/src/odb_loose.c":"82bd4482ea8029a97edc1ac3b1c965191677e36597fa60eb59bbae54566425c8","libgit2/src/odb_mempack.c":"88bbae0267f0b66c1db9a753aa7298eaeca43e8e085aa31eef0553802a93df0e","libgit2/src/odb_pack.c":"1c3b851dd769793ac2506f7354fd2b7e2f24f91715865240ac1caefbeb723f7d","libgit2/src/offmap.c":"64da9efa0f38ba066af8bf29f4c734b0c52cccf728b662a60bcc1b8110c3596d","libgit2/src/offmap.h":"c0f1515c9d67730d448a96ddc86eea76ec28193caf18ccccaf5b9b9a5c94e5f5","libgit2/src/oid.c":"20d95155503e28089a949b8a563f93a7d9816814cbd215909574a81447275402","libgit2/src/oid.h":"322eef4b2dd9b1f78f25b59034491f3547353655d9fcc9b6fe5a1ab348cb1eca","libgit2/src/oidarray.c":"7574a777c9d92ce2ee3f0b24673fe43c4e5fdaf4203a281c2a69f658523f2025","libgit2/src/oidarray.h":"17a745a4d1f2c464b91080279fb4a3163bb39456be5c7e9d6c8195724cc3cba4","libgit2/src/oidmap.c":"72ee7bfcb30cc05e73e49962aa1d09b78060272666420bc2b31083e18cdc2384","libgit2/src/oidmap.h":"7aff6a1568632f38f2acea1a526e11e24b42fffa7b05b75ac53ce18b9dd70e42","libgit2/src/pack-objects.c":"2d50e571b011d82c5899a060da7cd4738d3c68b710961099bcda618ec0a510ed","libgit2/src/pack-objects.h":"aedd54a7fdd13c69c589644e59aecc23daf33dccaba63c1285f4500f06aeeb92","libgit2/src/pack.c":"ffd54bf6f26e25369aebb15751410595589c1a5efa3655c3fc33ba09656922f9","libgit2/src/pack.h":"a419dcb04291bd4a2a78d87999066ef0289b359e9763eb4730482ee97633eaf5","libgit2/src/parse.c":"56cdcbc1b5a260770ac25d0f23c7ad7758f233b651daf8b5c3d3d897777147a6","libgit2/src/parse.h":"562e93ba8278eee0440af1865f2b6fbf3df37c9f2afc938e362f6f932c8f6cf9","libgit2/src/patch.c":"de8939e05e8291f1b8e57125b1ad3a8b849f77a7d40815aa2b8775d8b97b96cd","libgit2/src/patch.h":"b6e844a48af7a8729c37f9bab8dc794907534ff723543260781491c133930120","libgit2/src/patch_generate.c":"1c4b7d0b188a9a31c2909c421e325b59d506ff3733f891db710d45f33b909ef7","libgit2/src/patch_generate.h":"396a726fd8546630bfc85fb4b1a1fcb3e085aca4b7263f0042aea1b12ff02e35","libgit2/src/patch_parse.c":"8f49c4d51645656cbb726e3e4341c14de85e68945211e8f17ea39d22e93f55d7","libgit2/src/patch_parse.h":"6883a184830f4c59427177eba5462d27737706a1be899db35423c5ad9d6c8c4a","libgit2/src/path.c":"82bc8e2d24363d8aa584f64dede20de1623a7c531f20ef04c553a4e493d37a13","libgit2/src/path.h":"43d1eb70c1afd0b5bb9ec706766195fe768ed2d7fbfdf61e3a1fdf41c4cfa467","libgit2/src/pathspec.c":"a26fdc61468915bd88fba19fd333b547157361e660037f8ff9d8d4c7f1cdd30a","libgit2/src/pathspec.h":"405f9c8598735d84951b8adc40e66617dcaf20f5141e5caa187cb638936041c4","libgit2/src/pool.c":"c78c7f735573033fd0482e06af475d749b326e1bc176b7084b37bca39dc340bc","libgit2/src/pool.h":"a7ae90a762be159937bf9399660bb9be585a0dd0f16cd6d95c1a51bce1d6d29d","libgit2/src/posix.c":"b9c8cdf28c7ea2c1e6d135645293f54c36d48ba0734e0b72bce4f39673824d63","libgit2/src/posix.h":"58b304f9cfb3399d90f62d53c08ed4d0c86e5b951ef1f0ca03ea7fc98d934e85","libgit2/src/posix_regex.h":"70be277c3ef62f3fe322b21275d4118d2c69f29337cd36e295026c50a7e7e78c","libgit2/src/pqueue.c":"d5cd8f6c5639b50898fe0f9354dbb29de1a0be1d20c879242c8423907466c7c2","libgit2/src/pqueue.h":"c4c98b6e99fdc1ab33906a1d659ba113a2048890928f158e9031caa35e385991","libgit2/src/proxy.c":"393f47f681916735c25ed844840d9c03e4fda4389cdc59cc3ce5c94ccacb2bb7","libgit2/src/proxy.h":"e195b1b88c11f9d02aa8f02925fd7f11cd68c0361d0e7a6a477f4a3a5cceb896","libgit2/src/push.c":"b6a7b46b79375c4f501620b21d0c46b4d426ee8ca06ee0ca0f2d4eeda0b1a059","libgit2/src/push.h":"aa327d0a24e838330230c10b4b67431e0ea0fd7913c3bb8fbd24441bf72fb8be","libgit2/src/reader.c":"779bb37bb66d36509549a1d286fe8129a84a220832369e874b2ba594f91b3c85","libgit2/src/reader.h":"7c5c2aa3805bcf813d2ef84373fa55d06c7c675b79854c4fa82e77724a5d575b","libgit2/src/rebase.c":"49ea8649966c8b75746277a4b64dd4e5d9aab952d9feba1fb98008cd5b5cc0a6","libgit2/src/refdb.c":"c9531a351c3a59eeb30f19aff48546d970d67e0d19bd19ae1450c888323b387f","libgit2/src/refdb.h":"56c3c500a704fd792eba6bc91546482e97cf038b08158beece1c4cd69c87071f","libgit2/src/refdb_fs.c":"f7b0c1decdc57836fe910c21fe2316290851a1b98150664fbd9230ade98ea731","libgit2/src/refdb_fs.h":"e981d3df86d535ea91561853a7754419a2c95a3f72313171f5f6e0fe6d1ecacd","libgit2/src/reflog.c":"3894d9a1c4a20bb208d33f2376fc592a2c24388ed04aa906fb9a6eecb13d862b","libgit2/src/reflog.h":"898ae0bf378c465673fef1a4221baa2cf6165a0700949952971f743ca73075da","libgit2/src/refs.c":"b339b49b0cb8740698e992bbcd4193cf69eef30a98be66f0832d03df20f0dd91","libgit2/src/refs.h":"3ac8974a6390519a06c58a4e66e346f5231dde9fd423de95c0c8e9a2bbbb6680","libgit2/src/refspec.c":"918487205af0469f4427ba2aca8f0625d9dbb0c86f2825769c9fcb3330c7bdac","libgit2/src/refspec.h":"6ebd69454d6f9942c531cd7dfb976a2a8f7474e4f12eabbc33f741c0f9632d04","libgit2/src/remote.c":"947b6475d877042faf51f893ccf13fc625b41b64e0e48a6f40d4f892b532725a","libgit2/src/remote.h":"4a75b031546aa55c7c7590a32432f5d6d6ffdfb356af8821e7a30b571725caea","libgit2/src/repo_template.h":"bec227c595d193802723f81765487da76beaffafae40ec05b76a4db7de153c01","libgit2/src/repository.c":"fc9fd579beb769a55228aa82a1ca703c3315fa74026cda0f33e5eef75d5da2c1","libgit2/src/repository.h":"346de04989295d6116495a10b3fe0c9251f27d5978ba864bcc55fb2c44dfcfa2","libgit2/src/reset.c":"09c67fe8d1796be91339c2b5eaee002b426105e69558d003bc3129699de503bc","libgit2/src/revert.c":"c29672b11583af9c0ed6ba15b0f3e60c002f3cc66024a177795d762f083aa6d1","libgit2/src/revparse.c":"6deed5093b7faec4a4e6a1250eb6416060ac0060b8526bf06d227ad077ffaa5a","libgit2/src/revwalk.c":"6faf3778faa31928af4fbef6eea695b4bdf34a7c6f1b6a692df28550b9f016bd","libgit2/src/revwalk.h":"8e089dc8f7081f6c6acebedc7b0a49c599da434cf148f3ca14639e7422c86c72","libgit2/src/settings.c":"fe0a67f6f8436c7c7bbfca7772aa549279dcbb91f80fb34878fa51c7263180ca","libgit2/src/sha1_lookup.c":"95d24473120414853e34972e200d24ad14254420b32a1d9213042e3450eb0956","libgit2/src/sha1_lookup.h":"904c09580175aca72ce97e5dd972ca74bcde4df726700f519d21e157a99726ae","libgit2/src/signature.c":"1caf88ac201b3cc607a6437b6cbee0ebb027a19a420225031e8af32c7eebf4da","libgit2/src/signature.h":"766717ad4c2fdaad4b32f5dc5710f14edcda06ac2f98d98c24cf21a6620e6ff9","libgit2/src/sortedcache.c":"07423d4b26cd3dda91395583deab43441a1e3109716eb5262cd0f5d4f3f6e421","libgit2/src/sortedcache.h":"ba88ec37c17752eceae5cc3d63772905d59d68bb2ff395770951c0ac9b024049","libgit2/src/stash.c":"ffac8b441a3592ae69b457b78e779fb21caccb495672efc8691b2d0fd2e40532","libgit2/src/status.c":"70070f5e54dc2a9f8152cba88dc70ba86c14fa6330f2dc91acb7b9e7a98b5a48","libgit2/src/status.h":"68ed612f65430563ad5b3f50973b360f583c5865e54c9b9298eb082d441c4e79","libgit2/src/stream.h":"a7755d211e19ea4a29d7d6151f71efd92bb92906d1668960e076ced663961784","libgit2/src/streams/mbedtls.c":"c153e314cf4458916528b98e7417031258fac15dc941b6e776a744542c2f0a02","libgit2/src/streams/mbedtls.h":"c428f532370d349645886ddcab62559c8a9d1e0e5b95ca11c475f4b793a53cb7","libgit2/src/streams/openssl.c":"023536239d22c54b29f278128a4d8f71baaf3e96b8f7e852b9749d1d992b5971","libgit2/src/streams/openssl.h":"ffa547170bf777dbf62a3c489c6dfedc5086363ed00216c196396f7e1f09a52c","libgit2/src/streams/registry.c":"ba00c9e40284f811e23787c6bcb2140d981631704a67ddd13d50c4b8e9f6f40e","libgit2/src/streams/registry.h":"42a887dd1fff029efa00a04a4e8716905149d3639a6881dc53254170cb8e18be","libgit2/src/streams/socket.c":"f704041b88aad166a3cff4ac7d630a5fd0ff2e0cdb49c2ddda83e662ff98306e","libgit2/src/streams/socket.h":"6ed5745f368fb167f24b8a733be0c2272f5bceb9fc40b5c550463428533c26f9","libgit2/src/streams/stransport.c":"079b00730c02fa9a03e39c2b8201a8a6485f8224b48d9ae0b6ede985d513aa8c","libgit2/src/streams/stransport.h":"01c4555417713c415de10ea16222d44cd9c0c0db4ad5d7e3d5e9863d62f49eb4","libgit2/src/streams/tls.c":"5aa5912429df26642d95522fda866f590599149b09839386f21fd821ab324291","libgit2/src/streams/tls.h":"c989f0a996ba7a11f8732336da77266905ebbc371e5e5969955d096ae16b64ad","libgit2/src/strmap.c":"02ee770dfbcc95f15bfe6755853f1c2795782f906d883d3102a904fedb2cda23","libgit2/src/strmap.h":"66e8c5a84d36cd1e3f3b6693d8c0601824d709f9fd3e27a48f235ae06f71cc39","libgit2/src/strnlen.h":"27e73ccbe8be7c5bac1d022bf59f2458cc2998d0222e7658a687e02f89fcfd17","libgit2/src/submodule.c":"1a5acfe8bd409a7ae9d95d27ff2fbdc5d68eb5e0afd06bdd6f71b716a19ced17","libgit2/src/submodule.h":"a28adcfb13cc51e3a698f6e5424fd64980b560a0f632f92c2e59f891e2fcb9e4","libgit2/src/sysdir.c":"50febcb03dc8fa38fdb29f457bb9aa1010cda6304bf2ac0de682c1226e30dc3a","libgit2/src/sysdir.h":"cea646b34993e9011dcdc132243be3aab7a75d47c4c4ead50c250df9fa35c299","libgit2/src/tag.c":"3757b55326a721561c63c193b6ebf050bceac084a373b9292515d8dda699fbed","libgit2/src/tag.h":"e14485eafab3d4925bb6652158fb2f6abd211dbefe0655607a561b8bc6826ba9","libgit2/src/thread-utils.c":"cf21d34acd4971927ee8b08de4b35cf4bc3bbb05563883c70145438ce7634dc1","libgit2/src/thread-utils.h":"227f69716555c45a9efa5479120d51206f78c5ff1501de8de3988ac7f2b4c03a","libgit2/src/trace.c":"88eb614e8f308d8a67576f510c33ba42d83b1323a677f1c762685e51a49861a3","libgit2/src/trace.h":"e7bee26ffe4524c6a23e8b3471212abd6cc5337af14277bea3bd065671e85203","libgit2/src/trailer.c":"aa302ab08e9dfd8a1319dc44e67d2bb9d8a61e6257315e8a73e34e07e5f84992","libgit2/src/transaction.c":"acdb20268ac5921f11da7e66bef985fae9b90325a27a025a0e0a586f8f1069e6","libgit2/src/transaction.h":"42e4b38d1fc7a8d57513da8230fff2f11ea4e1c2907130f99d77fdd2f099fc62","libgit2/src/transport.c":"7c8f61ca4cd3c057bbb92012c55eb2898e2ca054d19d072df70a79f0d165df80","libgit2/src/transports/auth.c":"cf50add22826c131a043de90003d34820bad514c23c21a2b6808d1a2ea9af938","libgit2/src/transports/auth.h":"bc75aba34c92dd99662ff20425987fe61a9c51903f7818963950c8c63346cc9a","libgit2/src/transports/auth_negotiate.c":"86d90a74648160b3cdf0f58f1bfc2ce4f255b101f5783dd404eb705c4399c65d","libgit2/src/transports/auth_negotiate.h":"85c02c578e6f9886b3296630cb904f96974bf17ebd6a79ea33c312636408586c","libgit2/src/transports/auth_ntlm.c":"1c97a77039c0acbe9f99716572cc5285a21141781515425cb881a5a4c2ea29c2","libgit2/src/transports/auth_ntlm.h":"272e59329188f075d48661618c3e1877936d678c11a376a08c22db2bce858f74","libgit2/src/transports/cred.c":"dfb3cb442113b4e90755615bc51929d3c0a1d3c0d6d8c84b08cc3bc46e4fabc2","libgit2/src/transports/cred.h":"f60f04d5b1c869578bb25959ac1e5480ec628317f82820ddf13a72a245c6de57","libgit2/src/transports/cred_helpers.c":"1173f709504bf2c97dec66ad345c21a913e39f3efda0d195df9e4ff7cee89793","libgit2/src/transports/git.c":"03cb93730bdb0c45dbaffed3fee35556550e213c8972198c2dd93a3444ebbdca","libgit2/src/transports/http.c":"0c1f4cc0560183f63442d73c327db0eb77ef584d4663aedde98095d3184a9c4c","libgit2/src/transports/http.h":"87a661decea83fb3c9cd9cf91431d0f42aeb6c1786147757905efb2b165323e2","libgit2/src/transports/local.c":"7a340e59e866bbba4f0ac8919edf920f1dd9dca883e5bc6fc4feb6cb1db22b79","libgit2/src/transports/smart.c":"352674b723ecc5775370d4d9bf66e541f90c5eeff0b9b37f6593fa7349c52b89","libgit2/src/transports/smart.h":"7788045386f72f71cdd9e60ed6636b28e55c57cad596c2adda34b9374ee75d53","libgit2/src/transports/smart_pkt.c":"85ae97f585e7ab7c9bb723d6838e64f8e33878f703541a3e335f16445f6da64d","libgit2/src/transports/smart_protocol.c":"0f66bb743f5b6b2adf9fd8435401ef4cbc79571859706e1c155fb6ff86e60f1a","libgit2/src/transports/ssh.c":"d421cdfd779bbe6b932950cec2a7c2119beca7d9dfd6ca66e0eec2aa2a5ff8f8","libgit2/src/transports/ssh.h":"a4f6279848362d54f6ba4e9338443d6a3402c1ddb9eb85e2e3befb937cbea2ff","libgit2/src/transports/winhttp.c":"4fcf99e2caa6cd7843a80621b7d4c510399bb828fc27f5d603754fb0bd65985e","libgit2/src/tree-cache.c":"8300f36285dba6d1980b10f30c95a353789c37f079e2e1868c81df64b21ca3ac","libgit2/src/tree-cache.h":"f7fac0fe438958415ccd256e0bf9cbe30aa20aa125e60f3812a7fa0521ddb12a","libgit2/src/tree.c":"15a6bb307e0204308637a4f983de306bfd7db7c72e7a249c60fb0aa872c1390b","libgit2/src/tree.h":"7f0534f6409c6ab5308dc031c441ae5434267e499aaba35c0a51869ec7afb9df","libgit2/src/tsort.c":"7ea74124c4b53afb2397578d197b1d460eff19e3e9b52964dcb8c606e705ef58","libgit2/src/unix/map.c":"18752ce4b1ac9f1f2cfe6c59bba1e0d3c1b88a87cacaa40883ef54c7aa4a08a4","libgit2/src/unix/posix.h":"40efce804aa197d29b39e32945a46d2d468904487dd39065c19c0148d3645771","libgit2/src/unix/pthread.h":"58c92bef5ac49a7846c6ffdf0ae79996a2c6be965fce6fc2056fb5a5c1fdf512","libgit2/src/unix/realpath.c":"e3ed89d4139d62b8a8f37579edb1f262fa02972834603f7b00596cc88240ad2b","libgit2/src/userdiff.h":"0991e3557bfc03b0fe50b2100ab00dab710b90c91ba0c8168920c26b63e8a04b","libgit2/src/util.c":"b727a8a2ddd8ee5ff0de67a83006ff563f8262ec007ec0337f8fdd5603e74b17","libgit2/src/util.h":"6223615d92956c75520793ea9f6b04ceae617f09c4f1f8e4a5556344f18d7719","libgit2/src/varint.c":"f93c5ba3498ac04d98ba13d3a320263892452356f797c4091411e5833dfe82f2","libgit2/src/varint.h":"db8ed46f6049f12058d4b624cb0a5ea9d0b0f1317b6378c8817d6e632b6436cd","libgit2/src/vector.c":"0f25fbd3e423dbe54e397acf65372c1010424403ec36c043b84549e703b76291","libgit2/src/vector.h":"2ebdb354bbabae224773991a097d71fd14262af49eb2ab00a4ca3844ad54102f","libgit2/src/wildmatch.c":"0102685757a40046a5fdee4be5be784989a84d3b4be9160d48120c4485c37133","libgit2/src/wildmatch.h":"c33e23b44b8989a91614563ddc5b6c69ad6f76a91abc081bfbc985d8a7dc4976","libgit2/src/win32/dir.c":"a0490ab8fe3be9213093afca1923a0fc472d368f2907ab23a86bb392520359cc","libgit2/src/win32/dir.h":"8e520dd28e37c333aeb10f745efce8ba48a4db414b1605027787b1a52b75a222","libgit2/src/win32/error.c":"f1d2bcb2b6e60ca76c1ee0ca0f236e928331aa9755afc16926a5dab5de26d255","libgit2/src/win32/error.h":"47faa526d448f222c9ed0cf7c3f1ed2c4f14c166610524c76eeb6f0f83938a63","libgit2/src/win32/findfile.c":"5105c344a82818382be0fdf2d84de0aa7a5a52cfe85f775e8dd616ebb1960b11","libgit2/src/win32/findfile.h":"47842451768d01dec2b7965669ccbc9da6be26449e3b4ebf93caa1ff3f08ab3e","libgit2/src/win32/git2.rc":"fd75d8a9bcb7376d046aa85ae5dd17df18d5d654f635cbd42237a18033fd984d","libgit2/src/win32/map.c":"0ac9476b9fd7ece93f640512ced686ed9429031aadab420335c915a6c4185764","libgit2/src/win32/mingw-compat.h":"f7b0c7e9dd7147e8930782cdf54ce4be385172966dd1e27435446f38cd2f6d68","libgit2/src/win32/msvc-compat.h":"def0c5afff1c44b03848c9ed9c2dc6106fd3998553fd76d963debb3e6cd8d0ba","libgit2/src/win32/path_w32.c":"46f168c4122f27fb95d7517393d188cb227a2d9d53fa5fe09c3b3717dae4a804","libgit2/src/win32/path_w32.h":"7550fb15df1b8615b58ba82d26c2d9411230db430976760a1f6c3cf4e867e4eb","libgit2/src/win32/posix.h":"0869e5473f6add12123492bbc080997d755f773ae9c8da0e9b25cc27b95ac846","libgit2/src/win32/posix_w32.c":"239b7b5f5bbbca2ae529af1135612212df18e4f0fe56783fec85ca8f933135f9","libgit2/src/win32/precompiled.c":"4dff04101bd64b95c8f708d1accd1bedc39e95a263444290f796c63f4734d4cd","libgit2/src/win32/precompiled.h":"37372692ddba209680b9920307580cb3bf9038f161edca7418c7f55362022b3e","libgit2/src/win32/reparse.h":"b0633542864a263dd0a14b260c400a07933fda30fe8619d323a5e97a65d07a26","libgit2/src/win32/thread.c":"5f6ee18aa2b5d695d3a682dd5d4e3ceffd6deadc661d628aa5bbc484865106fa","libgit2/src/win32/thread.h":"cebaa0ed2045a4fa1d4a910db988639e02665b8b299c74454cbcb79de45d02f2","libgit2/src/win32/utf-conv.c":"fce8f7998d93fcd4f043d4d643f466a854b9611389487250e65fbc987a455bca","libgit2/src/win32/utf-conv.h":"46473448949ef66faf32be710f48d3a925e3db1aee27c4cfc4fcd36d344a5404","libgit2/src/win32/version.h":"d9d9546728ee78923ba7ea1c16c000d44450ca80f8c0c3268bf58fa9966ba38f","libgit2/src/win32/w32_buffer.c":"ad140e9fe2363e7b62c0e842a45ceca5fda6b477301749c1b8d4aae867eb32ed","libgit2/src/win32/w32_buffer.h":"f50a4d06e54710e5f0c5a3eca13690d71875339ae7e696455062651e265b6ae5","libgit2/src/win32/w32_common.h":"d1294b69c707e1864dafb3ccae8661c818285c19b5ee8d5877bca6e43a1345c1","libgit2/src/win32/w32_crtdbg_stacktrace.c":"e85cabf5eec4efd809114fd847bc84cb6c0f90c7b9500e9c3091d9174346501e","libgit2/src/win32/w32_crtdbg_stacktrace.h":"6fa94abbd71d08845b2e3f0913ec93f8ea2dea85a241b34966200878ec88d3b6","libgit2/src/win32/w32_stack.c":"8270a4cac03ce33571b35953dab79457072287af4a3c4fdd5fc4793a09c7ccbc","libgit2/src/win32/w32_stack.h":"0bd8a6d74c0bdd534cf02440f16d692c07ff671412fb48936629cd375539c1ed","libgit2/src/win32/w32_util.c":"fbe85eac432d4d1462ba659726557f782e811353170df8838ea1f967950d8711","libgit2/src/win32/w32_util.h":"e864b7c08ddd63f4353aa00896a57dbe261f56266e74448bb12fbee58ac7e531","libgit2/src/win32/win32-compat.h":"5ea7b1837a159d66a89365ee2bf3724b32579a6a78d94b0b205d44c8697a8e6f","libgit2/src/worktree.c":"1b09a5f9b7ff522738e2b35641c612c0cbfc6688a91cdeda8c4a4654a2f599f6","libgit2/src/worktree.h":"8f2e10b231590962e1d43b4dd51085da343f09f3e74245141720de9ff8a8e4c5","libgit2/src/xdiff/xdiff.h":"63fb0e162716c6c30364d24f5be1192a3724e527864e462d2163a904222d0b91","libgit2/src/xdiff/xdiffi.c":"17f4fd29d3e6c5a45fb3e4942d95abfab96e470c5f5bfc6ea16ec14bda318b0c","libgit2/src/xdiff/xdiffi.h":"3429a12de1a8c990005268801706fc2ced0f935813e12493c2dee68ba28dc94e","libgit2/src/xdiff/xemit.c":"588f9867c656b7311006e63ac1c1fc57cfd5f1f2ba5890bc60946d9f638afcb7","libgit2/src/xdiff/xemit.h":"0a8c569eec74bb4d6e8b7b9a50b457532550800e0566cbba6d185974613a2e6c","libgit2/src/xdiff/xhistogram.c":"141e5d993bb0c609de7828a4c3e1e1b26deebb05b0995f1ef4601cbf609050f7","libgit2/src/xdiff/xinclude.h":"26f9a54fefdc2635e31801febb7d44afa8d039d078414d6cd26463e67e5346b5","libgit2/src/xdiff/xmacros.h":"d9cc54bfc6c0f9e6eef68f9d03594a8bd10f6243a2137776527bb5c849cc9de2","libgit2/src/xdiff/xmerge.c":"298449a91944edf198b8d4dd9c930814587c5ba29e914f7484f7421683615301","libgit2/src/xdiff/xpatience.c":"9a8158556fddb9432e213f189c7c9c6426003f56dccf9e7f5e494ec5f800a345","libgit2/src/xdiff/xprepare.c":"a99e59dfd2adff23a5f3f2b3920ee384eb6665cfbc40eddde11b87dfb0c51bc7","libgit2/src/xdiff/xprepare.h":"4945e8fffe620cd4d687c12618d1a4b2aa95a7a8097abf3e5e341abf96c76e1b","libgit2/src/xdiff/xtypes.h":"3336d046bf60e0dc99f3686dfe9ecf098456f0aebe96486be5d1cd64b5d9cefa","libgit2/src/xdiff/xutils.c":"6928247d6adee0f64a63c6ba103a47abe3a83dca12577552d23094f53d4a55f7","libgit2/src/xdiff/xutils.h":"78e2813f0d604d4deaf29583f6709111d8368b4bbd71cfdc55d56769570abe3e","libgit2/src/zstream.c":"6505d13ec25bec254f68c7ce5a38aa5380accf2ace21b3e938d71354cd941d7a","libgit2/src/zstream.h":"b5037f14aefdf2d75a3079850a8077717a6a648821950eded8ee2f980abcdcf8"},"package":"4c179ed6d19cd3a051e68c177fbbc214e79ac4724fac3a850ec9f3d3eb8a5578"} diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD index 50608079b..fd6dd9125 100644 --- a/user/rust/APKBUILD +++ b/user/rust/APKBUILD @@ -3,16 +3,15 @@ # Contributor: Jeizsm <jeizsm@gmail.com> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=rust -pkgver=1.37.0 -_bootcargover=0.37.0 -_bootver=1.36.0 +pkgver=1.38.0 +_bootver=1.37.0 _llvmver=8 pkgrel=0 pkgdesc="The Rust Programming Language" url="https://www.rust-lang.org" arch="all" license="(Apache-2.0 OR MIT) AND (NCSA OR MIT) AND BSD-2-Clause AND BSD-3-Clause" -depends="$pkgname-stdlib=$pkgver-r$pkgrel gcc musl-dev" +depends="$pkgname-std=$pkgver-r$pkgrel gcc musl-dev" makedepends=" curl-dev libgit2-dev @@ -22,11 +21,13 @@ makedepends=" openssl-dev python3 zlib-dev + cargo-bootstrap~$_bootver + $pkgname-bootstrap~$_bootver " provides="$pkgname-bootstrap=$pkgver-r$pkgrel" subpackages=" $pkgname-dbg - $pkgname-stdlib + $pkgname-std $pkgname-analysis $pkgname-doc $pkgname-gdb::noarch @@ -43,9 +44,6 @@ subpackages=" rustfmt " source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz - https://distfiles.adelielinux.org/source/rust/cargo-$_bootcargover-$CBUILD.tar.xz - https://distfiles.adelielinux.org/source/rust/rust-std-$_bootver-$CBUILD.tar.xz - https://distfiles.adelielinux.org/source/rust/rustc-$_bootver-$CBUILD.tar.xz 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch 0002-Fix-LLVM-build.patch 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch @@ -56,44 +54,30 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz 0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch 0009-compiletest-Match-suffixed-environments.patch 0010-test-c-variadic-Fix-patterns-on-powerpc64.patch - 0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch - 0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch - 0013-Ignore-broken-and-non-applicable-tests.patch - 0014-Link-stage-2-tools-dynamically-to-libstd.patch - 0015-Move-debugger-scripts-to-usr-share-rust.patch - 0016-Add-foxkit-target-specs.patch + 0011-Use-rustc-workspace-hack-for-rustbook.patch + 0012-test-failed-doctest-output-Fix-normalization.patch + 0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch + 0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch + 0015-Ignore-broken-and-non-applicable-tests.patch + 0016-Link-stage-2-tools-dynamically-to-libstd.patch + 0017-Move-debugger-scripts-to-usr-share-rust.patch + 0018-Add-foxkit-target-specs.patch 0030-libc-linkage.patch 0031-typenum-pmmx.patch + 0032-libgit2-sys-abi.patch 0040-rls-atomics.patch " builddir="$srcdir/rustc-$pkgver-src" _rlibdir="/usr/lib/rustlib/$CTARGET/lib" -prepare() { - default_prepare - - $srcdir/cargo-$_bootcargover-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig - $srcdir/rust-std-$_bootver-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig - $srcdir/rustc-$_bootver-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig -} - build() { cat > config.toml <<- EOF [build] build = "$CBUILD" host = [ "$CHOST" ] target = [ "$CTARGET" ] - cargo = "$srcdir/prebuilt/bin/cargo" - rustc = "$srcdir/prebuilt/bin/rustc" + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" submodules = false python = "python3" locked-deps = true @@ -137,7 +121,6 @@ build() { check() { LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LLVM_LINK_SHARED=1 \ - RUST_BACKTRACE=1 \ python3 x.py test -j ${JOBS:-2} --no-doc --no-fail-fast \ src/test/codegen \ src/test/codegen-units \ @@ -146,13 +129,12 @@ check() { src/test/mir-opt \ src/test/pretty \ src/test/run-fail \ - src/test/run-fail/pretty \ src/test/run-make \ src/test/run-make-fulldeps \ - src/test/run-pass \ - src/test/run-pass/pretty \ - src/test/run-pass-fulldeps \ - src/test/run-pass-fulldeps/pretty \ + src/test/rustdoc \ + src/test/rustdoc-js \ + src/test/rustdoc-js-std \ + src/test/rustdoc-ui \ src/test/ui \ src/test/ui-fulldeps } @@ -180,7 +162,7 @@ package() { "$pkgdir"/usr/lib/rustlib/uninstall.sh } -stdlib() { +std() { pkgdesc="Standard library for Rust" depends="musl-utils" @@ -192,7 +174,7 @@ stdlib() { analysis() { pkgdesc="Compiler analysis data for the Rust standard library" - depends="$pkgname=$pkgver-r$pkgrel $pkgname-stdlib=$pkgver-r$pkgrel" + depends="$pkgname=$pkgver-r$pkgrel $pkgname-std=$pkgver-r$pkgrel" _mv "$pkgdir"${_rlibdir%/*}/analysis "$subpkgdir"${_rlibdir%/*} } @@ -232,14 +214,14 @@ src() { cargo() { pkgdesc="The Rust package manager" provides="cargo-bootstrap=$pkgver-r$pkgrel" - depends="$pkgname-stdlib=$pkgver-r$pkgrel $pkgname" + depends="$pkgname-std=$pkgver-r$pkgrel $pkgname" _mv "$pkgdir"/usr/bin/cargo "$subpkgdir"/usr/bin } _cargo_clippy() { pkgdesc="A collection of Rust lints (cargo plugin)" - depends="$pkgname-stdlib=$pkgver-r$pkgrel cargo" + depends="$pkgname-std=$pkgver-r$pkgrel cargo" _mv "$pkgdir"/usr/bin/cargo-clippy \ "$pkgdir"/usr/bin/clippy-driver \ @@ -248,7 +230,7 @@ _cargo_clippy() { _cargo_fmt() { pkgdesc="Format Rust code (cargo plugin)" - depends="$pkgname-stdlib=$pkgver-r$pkgrel cargo rustfmt" + depends="$pkgname-std=$pkgver-r$pkgrel cargo rustfmt" install_if="cargo=$pkgver-r$pkgrel rustfmt=$pkgver-r$pkgrel" _mv "$pkgdir"/usr/bin/cargo-fmt "$subpkgdir"/usr/bin @@ -290,7 +272,7 @@ _cargo_doc() { miri() { pkgdesc="An interpreter for Rust's mid-level intermediate representation" license="Apache-2.0 OR MIT" - depends="$pkgname-stdlib=$pkgver-r$pkgrel" + depends="$pkgname-std=$pkgver-r$pkgrel" _mv "$pkgdir"/usr/bin/miri "$subpkgdir"/usr/bin } @@ -298,14 +280,14 @@ miri() { rls() { pkgdesc="The Rust language server" license="Apache-2.0 OR MIT" - depends="$pkgname-stdlib=$pkgver-r$pkgrel" + depends="$pkgname-std=$pkgver-r$pkgrel" _mv "$pkgdir"/usr/bin/rls "$subpkgdir"/usr/bin } rustfmt() { pkgdesc="Format Rust code" - depends="$pkgname-stdlib=$pkgver-r$pkgrel" + depends="$pkgname-std=$pkgver-r$pkgrel" _mv "$pkgdir"/usr/bin/rustfmt "$subpkgdir"/usr/bin } @@ -316,26 +298,26 @@ _mv() { mv "$@" } -sha512sums="bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4 rustc-1.37.0-src.tar.xz -ab0711dafeae76d9718a0c6aaf118f512d295c66191d96198acc3591f5412d4ee6c50ad5cc56df8f1f32a2be3c4d9bb5ead798c6b9f4089c0a624e09825dd6be cargo-0.37.0-powerpc-foxkit-linux-musl.tar.xz -aa97abeccf03d3368b60731845d23ff74fb962818b7d1e6ada2e9a647b442a1b824541402f3a883c9be6e1f8db94ca98244fc4009ff0386403c57f999bd6d263 rust-std-1.36.0-powerpc-foxkit-linux-musl.tar.xz -5078bdd341b145119ba3396892cd8f63c65fafb1b041674e350b2cc02376fd2c32799baca85e916522c34c416a6c67d9d92bf8f44abb575a1ae1fedc4726516e rustc-1.36.0-powerpc-foxkit-linux-musl.tar.xz -5b765a47a49cbab26e5093ebf6dce5b8e3463ebdb0e404b9c952fef7993fd57e9a0d9f7d301c97b76b8bd35e4ea8b72c8768aa384cd215c2a12ddd45727343f8 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch -9b711ee16eed20a0293c1ca6d96c48db3fae5f2f60fdcb04ae2d1acfdc8036fa3b41ca799717aa14279fd7b7db0090861bceddeafd8d41f70433039e4983d9c8 0002-Fix-LLVM-build.patch -7f61bdc7c754379e1675d2f102f1f60f4c29ca2a2293d70741db46a0f29d61008d067166c7576cd0e5fa3c26e811e711e851b22f7df69974a7b53fa316c33777 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch -0f1989e4db3a48fe8718002a58aaecf359bc65bf5a6dae327c062fce0b8a3176a6b70c80c72118d5fcabbc16b67b986ce67ab1fda13ca52899ca320716f3e606 0004-Require-static-native-libraries-when-linking-static-.patch -b27045eb7809438db988979843f68ddfee46a6f889b0fbaaed401b249d6e224940e9d15143e55f8b2df911a8fa24dfec81da0f064b47a86f3ed24010aee309e3 0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch -4662f036e037b99178bb24c32524211eb5fc10ac711d16f13ddb933db84811eab3149cbe943521536d00c765eade1c1df01ca7e8f4fee69fca540546c0fbe806 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch -8742ff1c442dc2c7baad528fd6c51e202d091f24fbd7ac1350241a729a20f6f90818b76bb4de0b36b09afdeaad89b54843f08fb474e2232854cb68cd3d6a57b5 0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch -8eb5c08701cfcdc14ece1c40fa2276e760283ce9228c96ff1dedb5256dcec307c3705a8e27ac1bd767184d0acfc835b9b0b4f02d5fa7ec24a75f04014e67ec61 0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch -20f794339f7a9c048dad2f39b5a3dad9293b07ba0b130354c0e74ec71088d2f2c24f6630543e8e5a41b244c8c1013249403ce8acf1fc2c2b4ab5065049f7f04e 0009-compiletest-Match-suffixed-environments.patch -d3d3250d762b482c93679cbc7a1d5ccf2eb803e271b840a5d426cf77d58d2cb53fd76baf46bfbaf7674c5ef9f18133cf0b48be08864c002171f3547aaa377bd6 0010-test-c-variadic-Fix-patterns-on-powerpc64.patch -d01d27d6f344fd30f75e7acd8f1b967eda382f7ee6387f8b0c52aa1ab083d5d86fa9d8d424c3e2b792502e75df03bacc58bd24ed4e448cfefe6bbfbb57586b06 0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch -e25a4ba32b3b6fbc774c341bb3bda481a9f86917204e7c9bd69f34e2a72b4b3e58256d0619a94ce1d0f4cc17913d7216974b86fe96a776ba4260d0a01dcacaa9 0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch -68f7b35980c7b4b7088e28a7350c847656d4ffecbcec125ac6790a057a8a735563739f0ade8a7cf0283844cd1655114fa7ad6be106993e34b66e520aed34dd6d 0013-Ignore-broken-and-non-applicable-tests.patch -b6d4ce58e540373da797c89ed2ca3b23a8504511ee6bb6d0c52bd04273498aab10c99baf6f4633bb5a246c2612a7a538cbfed494bf901afdc6688f937234b4ac 0014-Link-stage-2-tools-dynamically-to-libstd.patch -fc10130544f7ceda378a9e7fb03a0dc4ea32a6d031061eada60af2d1c688d94f38ab31aad74f8f11b8aec2614415befa2c5e9789eeaf73b998f39b9677886155 0015-Move-debugger-scripts-to-usr-share-rust.patch -2c11c4bee3c6d10de6c2a9937bf3901f4c60dd1d9c50fcf57daa182a9b4d7b40d27632d3ef31ef083ae7903fcd49fdd41413ab8de1021f7d857884b9ac53c724 0016-Add-foxkit-target-specs.patch -7642e95d7f5e5d167a2f3e1300fc63f7bf34b6c0667b4e43e7c2378acd8c293f82d7c5651dfb75b03d717c0c5c369911f595dc641a629024e615d443244e6da1 0030-libc-linkage.patch +sha512sums="b756d29a7a222bc7b5c7f42ff397346ab840f78e559f93e6e36b65e76eea525cf429899fe4de9fb8966623a2225b552feef9fa831bee50f9e25c976fa2af8c0a rustc-1.38.0-src.tar.xz +79ca3a7dcb2e448ab5798f1cfc62bba833c947dad684521c3c77b233ca3ce27301e706848f1b05c3405ebc843684f47a7809d2d9782b4f11be8c9941e1153027 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch +61a7072b554f8e90e65f1b1e9975f7359b8523026129003a51cb216b54d8fe2ffaa6ef6ee5aeb4defcc28fb5b2d874314c61988875bc86edfdaf706efab67cd9 0002-Fix-LLVM-build.patch +30404faeb82fa8236a481c91ba29c6ac6d4276140702164af3ec91eaaa4d13c547f2fce245ac0220a5a64ccc7c79818c2e5d70900f63fa17356e906a5b309915 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +7b1a77764d67c48a2c9054731dff0f245b70c249ff53cdaa0d4c26f6d01ae9522302bc487b889d22c9b82a926cbf08d938a4886e5197ea814d2b0a0f0066cd6e 0004-Require-static-native-libraries-when-linking-static-.patch +9a9d413cf866c44e1eadf51c736d376e87c83cdbee9509526666b01e73030e4e10ced0aca1b8575955f7dd90eb4b246e929ab36a624e212c8ff0ecf726914948 0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch +4183bc73eaa4195d6fbfa79caf4c7bdc5ce9f29eb9e023b11252bd57f3e5daa4ea19753f7bad7db2f7872788e2dfe821aa50c7b1d63cbe42cd024742062f27b5 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +177d54428bb200b6ab08c3ac1abd763c794494b80f25fa81732f1b355ecc0d3cb3ebb187fbc919aea2844577991fb66c308da27453ab1a21529dd6f70f2d2f90 0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch +ad2b8d030576538a59498bbc529da7e4839b3d85d37981c83565ecd8605c0a797d1fc355a01ea05ff617ed6b6bd4c9f344420e9e8bf10374318d1de6df712a94 0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch +aefc44d8610436be9040329cf13fbe5c36f542b2124b533b6797fe239dcf706d004c73e319226ac19fb790c0114cdd3a49e153f66a154804dc84064cbcb32f70 0009-compiletest-Match-suffixed-environments.patch +489b97af8624a434b8267a52c88f1ab2a9f75c668148feb5a6570aaf9696b92cc49946b628089a9e56f22a7e35e6c9b9d1844505a024da14520ae420001c4734 0010-test-c-variadic-Fix-patterns-on-powerpc64.patch +d4711810dff2c59884efb2a141b5bbbdd43041d94b878b69b7fe9667b20e207851403ae1d5c1e100c4f17436bd1b82500207e8a45be5f7dc49449faae7b8d539 0011-Use-rustc-workspace-hack-for-rustbook.patch +f12a6eda193bb8d1bdfae568ade26de519e6d80ffa149ef31f64d052e44eeff3ce46220fe594118d4e4cf277eda19949636472b300226fb1e38ff70a214cbdea 0012-test-failed-doctest-output-Fix-normalization.patch +ae3fb54e0ec3a504cd58ad27159f00d2269266efd8723351df84e1c38d8345fa5ab85a0964b69cd6f0ccca1aa01a92c61f284a97fee7c0a299c1808251a48289 0013-test-use-extern-for-plugins-Don-t-assume-multilib.patch +3ed7fda61e943a110f9c5caa2b5015704f49c18139c86ec3d187faf9191703e5003c16c462e455b2bf889e0c0f7f137de52d8cfa283e78b174089297a89f9a1f 0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +4605c006c6b389672227b836b43e3cecdf808977d3502d0dd335f996ca51aaf5f0993ab23027f523e8b81baeb2ad9aba2775137e445698cf5526f41f0a4689d3 0015-Ignore-broken-and-non-applicable-tests.patch +5be32ec3b3dcbdf8061c57c68a6496b16e049cbcdcc5e17f75a9f76e41d5c309f4c8655ec8af3e2870c3426ded69b64878baad8e565222ea58fdf76b460f32c9 0016-Link-stage-2-tools-dynamically-to-libstd.patch +e8415a50fb981d8bff795ad1c869a791250401e8925f3a89e4b67badcb23938e9f39917bf0bcc298c29f13dc98e48ae1131f79af3cbdb1af3733b7f03ad579af 0017-Move-debugger-scripts-to-usr-share-rust.patch +3fc66d68c316300eafdbdf622aadb8afdbe9b4f8b110db40cac327692ed869b34a623448c3e4409a5bf2c53479a05359ecaa87c8bb65c3939c71346542aeafcf 0018-Add-foxkit-target-specs.patch +453dd39ae08b8fa633016d9a69a675b26edd86c2a881a3f30562f29e5098b86b4ad64804f453c0f9150696315f084555eb6d0c7aad3e72381f8844c7fc27b5ef 0030-libc-linkage.patch 0cb12e9165d198c1e04b258454dbaf5459e192ad24d64c9fa132ebe0f1bcd5da3550eae8dfdaa792fa809b505af62964ecf0219dc4373420ee8ad3e111539a09 0031-typenum-pmmx.patch +ccf6b0f91e39d247c296f5a4330d5dd36385cb58dea6987e8b0d31cc8aa6d6612e6c86a4b2576bde4be026048058dccb71fb87e68e7f72a7e7a4360ce4dce7f5 0032-libgit2-sys-abi.patch ab35bacf45ef5e46be110a8d27867fd4d5deb23cd5cbe8dc7f1da2177469945f9254f2a7915ee4fc430468a4421623429f0a01eb9eba14e047384efe3d3ec152 0040-rls-atomics.patch" diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD index f9c836dde..b9802516b 100644 --- a/user/rxvt-unicode/APKBUILD +++ b/user/rxvt-unicode/APKBUILD @@ -12,16 +12,17 @@ arch="all" options="!check" # No test suite. license="(GPL-2.0+ OR BSD-2-Clause) AND GPL-2.0+ AND GPL-3.0+" depends="$pkgname-terminfo" -makedepends="libx11-dev libxft-dev ncurses fontconfig-dev +makedepends="libx11-dev libxft-dev ncurses fontconfig-dev utmps-dev gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev" subpackages="$pkgname-doc $pkgname-terminfo::noarch" source="http://dist.schmorp.de/$pkgname/$pkgname-$pkgver.tar.bz2 gentables.patch - kerning.patch" + kerning.patch + " build() { - cd "$builddir" - ./configure \ + export CXXFLAGS="$CXXFLAGS -DWTMPX_FILE=\\\"\"/run/utmps/wtmp\"\\\"" + LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -40,10 +41,7 @@ build() { --enable-text-blink \ --enable-fading \ --enable-startup-notification \ - --enable-unicode3 \ - --disable-utmp \ - --disable-wtmp \ - --disable-lastlog + --enable-unicode3 make } @@ -54,7 +52,6 @@ package() { export TERMINFO="$pkgdir/usr/share/terminfo" mkdir -p "$TERMINFO" - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index 7dbace338..ef366ef0f 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.1.0 -pkgrel=1 +pkgver=2.3.2.0 +pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.0.0 -depends= +_skalibs_version=2.9 +depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -28,42 +27,36 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } - libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" } - dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" - mv "$pkgdir/usr/include" "$subpkgdir/usr/" + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" } - libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + default_doc + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="2703a544ab43bc7128e7615d5e8eec6af97c6a579053a100279e5cd53965e85c9ab698f2e787ade0e21c806d57cc6db4a07e7a055ca3e7c600f1b4d2e11bb65c s6-dns-2.3.1.0.tar.gz" +sha512sums="c4b833a944e6c99f52283d7c27c4a4937995b99afb1e9a9d601bb20efec7b23e05fb8500b1653c3a1c045811087acd0bc800cebfdd2fb60c6eba2fd85cfd580d s6-dns-2.3.2.0.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index 73c96b67c..62103295d 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.5.1.0 +pkgver=2.5.1.2 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.0.0 -depends= +_skalibs_version=2.9 +depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --disable-allstatic \ --prefix=/usr \ @@ -24,17 +23,15 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + pkgdesc="$pkgdesc (documentation)" + depends="" + install_if="docs $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="03c63e3772812da99ffaa4c83163626bcdfe4887bb1a9bd576e21b0ff3c2c2a7de49234f9e2fd4d0881758b20ac2ef0cb827a20b32004cd7bf6e05c921f32d0e s6-linux-utils-2.5.1.0.tar.gz" +sha512sums="4557148c3e739471a8846d3e0425da826d77ab3b7fc8d6c777d110152343596d17fde37fddcb099b107663138a5447866c3ff00a05f59d034379d26b1e147331 s6-linux-utils-2.5.1.2.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 66e9ea537..89ef875b6 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,70 +1,65 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.3.1.0 +pkgver=2.3.1.2 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities." url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.0.0 +_skalibs_version=2.9 depends="execline" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ - --enable-shared \ - --enable-static \ - --disable-allstatic \ - --prefix=/usr \ + ./configure \ + --enable-shared \ + --enable-static \ + --disable-allstatic \ + --prefix=/usr \ --libdir=/usr/lib \ - --libexecdir="/usr/lib/$pkgname" \ - --with-dynlib=/lib \ - --enable-ssl=bearssl - make + --libexecdir="/usr/lib/$pkgname" \ + --with-dynlib=/lib \ + --enable-ssl=bearssl + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } - libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" } - dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" - mv "$pkgdir/usr/include" "$subpkgdir/usr/" - mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" + mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" } - libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + pkgdesc="$pkgdesc (documentation)" + depends="" + install_if="docs $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="b4944a80f0e378ffcacd45b8136be9786f168c516a7136a8671340f4a63428846865ccdab538b48ea2efdc6d8ccf2a50fa74b4af1a70c866233817af7f621a4f s6-networking-2.3.1.0.tar.gz" +sha512sums="292bba150fcf4567073690411caebb66b407dbac20dfcc07f8a79d55962ef07f1fcfcf25bac21734605bc171e22805812788b0c12ec01e79f320eef782479d1c s6-networking-2.3.1.2.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 59ddf7559..b738b4c16 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.0 +pkgver=2.2.2.2 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.0.0 -depends= +_skalibs_version=2.9 +depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --disable-allstatic \ --prefix=/usr \ @@ -24,17 +23,14 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + pkgdesc="$pkgdesc (documentation)" + install_if="docs $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0f4400b00e44e984900e6a77fa326b91f472f3a97497d02549f3ec68f40d48438f37e574a3ee026498930449d8fd8de9a908923dcd58e1e99b58052f1fa35c40 s6-portable-utils-2.2.2.0.tar.gz" +sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2 s6-portable-utils-2.2.2.2.tar.gz" diff --git a/user/samurai/APKBUILD b/user/samurai/APKBUILD new file mode 100644 index 000000000..e63de08c9 --- /dev/null +++ b/user/samurai/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=samurai +pkgver=1.0 +pkgrel=0 +pkgdesc="Pure-C drop-in replacement for ninja" +url="https://github.com/michaelforney/samurai" +arch="all" +options="!check" # no test suite and upstream build-tests against Chromium anyhow +license="Apache-2.0 OR ISC" +depends="" +makedepends="" +provides="ninja" +replaces="ninja" +subpackages="$pkgname-doc" +source="https://github.com/michaelforney/samurai/releases/download/$pkgver/samurai-$pkgver.tar.gz" + +build() { + make +} + +package() { + make PREFIX=/usr DESTDIR="$pkgdir" install + cd "$pkgdir/usr/bin" + ln -s samu ninja +} + +sha512sums="87b2a11a39dc36f3582abdc7c9d358c8fce241fe4155b5177d3e8588d1c040a62eb9daafd2365febbfadd6fcc27a3ceacf6f29ca6f871c822aad6f4bad527a51 samurai-1.0.tar.gz" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 73b025de2..6a3e19a8c 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.28 +pkgver=1.0.29 pkgrel=0 pkgdesc="Scanner access library" url="http://www.sane-project.org/" @@ -37,8 +37,9 @@ 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/9e718daff347826f4cfe21126c8d5091/sane-backends-1.0.28.tar.gz +source="https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz saned.initd + endian.patch include.patch network.patch pidfile.patch @@ -137,8 +138,9 @@ _backend() { fi } -sha512sums="84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af sane-backends-1.0.28.tar.gz +sha512sums="9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54 sane-backends-1.0.29.tar.gz 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1 saned.initd +c7523b2684726cf35c0b251fe2e1863120284ff6ea3f93b53feb5dfa020c1e383910ecdd1a0c77a2289912ac4fd355cb3c743ea3706dab1bcf0a3412e1d0fbcc endian.patch 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6 include.patch 9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029 network.patch 8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea pidfile.patch diff --git a/user/sane/endian.patch b/user/sane/endian.patch new file mode 100644 index 000000000..f55f01ecc --- /dev/null +++ b/user/sane/endian.patch @@ -0,0 +1,26 @@ +From e1934720c687ed8c6125c75ac658f55b4e1513ce Mon Sep 17 00:00:00 2001 +From: Luiz Angelo Daros de Luca <luizluca@gmail.com> +Date: Sun, 2 Feb 2020 21:19:15 -0300 +Subject: [PATCH] genesys: fix bigendian build + +Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> +--- + backend/genesys/low.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp +index 1e1b632bf..cbb43b045 100644 +--- a/backend/genesys/low.cpp ++++ b/backend/genesys/low.cpp +@@ -546,7 +546,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Device* dev, const ScanSession& + } + + #ifdef WORDS_BIGENDIAN +- if (depth == 16) { ++ if (session.params.depth == 16) { + dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>(); + } + #endif +-- +2.24.1 + diff --git a/user/sassc/APKBUILD b/user/sassc/APKBUILD index 258dc3e3f..e09466f60 100644 --- a/user/sassc/APKBUILD +++ b/user/sassc/APKBUILD @@ -8,7 +8,7 @@ url="https://sass-lang.com/" arch="all" license="MIT" depends="" -makedepends="libsass-dev" +makedepends="autoconf automake libsass-dev libtool" subpackages="" source="sassc-$pkgver.tar.gz::https://github.com/sass/sassc/archive/$pkgver.tar.gz" @@ -22,8 +22,7 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --enable-shared + --prefix=/usr make } diff --git a/user/sbc/APKBUILD b/user/sbc/APKBUILD index 9a71331ac..457df47ce 100644 --- a/user/sbc/APKBUILD +++ b/user/sbc/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-utils" source="https://www.kernel.org/pub/linux/bluetooth/sbc-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/schismtracker/APKBUILD b/user/schismtracker/APKBUILD index d0fd28f5e..6392b0e6b 100644 --- a/user/schismtracker/APKBUILD +++ b/user/schismtracker/APKBUILD @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="" makedepends="libbsd-dev libtool libx11-dev libxau-dev libxdmcp-dev libxext-dev - python3 sdl-dev" + python3 sdl-dev autoconf automake" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/schismtracker/schismtracker/archive/$pkgver.tar.gz" diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD index 533ee6789..934a09d68 100644 --- a/user/scons/APKBUILD +++ b/user/scons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=scons -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=0 pkgdesc="Python-based software building system" url="https://scons.org/" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54 scons-3.1.1.tar.gz +sha512sums="bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33 scons-3.1.2.tar.gz cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD index 53f650cbd..295e51c7f 100644 --- a/user/screen/APKBUILD +++ b/user/screen/APKBUILD @@ -2,20 +2,21 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=screen -pkgver=4.7.0 +pkgver=4.8.0 pkgrel=0 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" arch="all" -license="GPL-3.0+" options="!check" # No test suite. +license="GPL-3.0+" +depends="" makedepends="ncurses-dev utmps-dev libutempter-dev" subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - utmpx.patch" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + utmpx.patch + " build() { - cd "$builddir" export CFLAGS="-DNONETHACK -DGETUTENT" LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ @@ -29,7 +30,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # remove suid root @@ -40,5 +40,5 @@ package() { install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc } -sha512sums="44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745 screen-4.7.0.tar.gz +sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz 82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch" diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index 81b6e647e..2418064f5 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,11 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=screengrab -pkgver=1.101 +pkgver=2.0.0 pkgrel=0 pkgdesc="Cross-platform Qt-based software for taking screenshots" url="https://github.com/lxqt/screengrab" arch="all" +options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev @@ -14,11 +15,9 @@ subpackages="$pkgname-doc" source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13 screengrab-1.101.tar.xz" +sha512sums="f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 screengrab-2.0.0.tar.xz" diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD index 8c4ae8f36..d6e001f70 100644 --- a/user/scummvm/APKBUILD +++ b/user/scummvm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Tambra Wilcox <Tambra@J30AD.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=scummvm -pkgver=2.0.0 +pkgver=2.1.1 pkgrel=0 pkgdesc="Allows running classic point-and-click adventure games" url="https://www.scummvm.org/" @@ -13,10 +13,11 @@ makedepends="alsa-lib-dev curl-dev flac-dev fluidsynth-dev freetype-dev libjpeg-turbo-dev libmpeg2-dev libogg-dev libpng-dev libvorbis-dev sdl-dev zlib-dev" subpackages="$pkgname-doc" -source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2" +source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2 + fluidsynth.patch + " build() { - cd "$builddir" ./configure \ --prefix=/usr \ --disable-readline @@ -24,8 +25,8 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="66c689d776b8098d752ef696232f80f175f3bff9f523e6dceb246849e785889d135452f48eafa5f2664047297de8592c862677270de4bf83731f10e178ad6847 scummvm-2.0.0.tar.bz2" +sha512sums="c27de3cf226ca6b11b1b431d40ab416c4e10e93244ab96535ead4f704c74267d816545448ae3618be2762ae148b0008952c26784fa4937ac0f3697b2d77f98d9 scummvm-2.1.1.tar.bz2 +20b20a68263c691efb7db83aa8132ec980f2732af728300a641d30c4035d4aa8fcf6efdcebb8c5b924e68fafb50e39ed1825cd64d1f81145259493e858bd50f4 fluidsynth.patch" diff --git a/user/scummvm/fluidsynth.patch b/user/scummvm/fluidsynth.patch new file mode 100644 index 000000000..a815cc705 --- /dev/null +++ b/user/scummvm/fluidsynth.patch @@ -0,0 +1,37 @@ +Backport of upstream commits: + +* 8593a9e +* 68758a8 +* 8014f12 + +--- scummvm-2.1.0/audio/softsynth/fluidsynth.cpp.old 2019-10-04 21:41:29.000000000 +0000 ++++ scummvm-2.1.0/audio/softsynth/fluidsynth.cpp 2020-01-13 08:21:46.705102910 +0000 +@@ -20,10 +20,18 @@ + * + */ + +-#include "common/scummsys.h" ++#if defined(HAVE_CONFIG_H) ++#include "config.h" ++#endif + + #ifdef USE_FLUIDSYNTH + ++// Fluidsynth v2.1+ uses printf in one of it's headers, ++// include/fluidsynth/log.h around line 82 so need to include this ++// prior scummsys.h inclusion and thus forbidden.h ++#include <fluidsynth.h> ++ ++#include "common/scummsys.h" + #include "common/config-manager.h" + #include "common/error.h" + #include "common/system.h" +@@ -35,8 +43,6 @@ + #include "backends/platform/ios7/ios7_common.h" + #endif + +-#include <fluidsynth.h> +- + class MidiDriver_FluidSynth : public MidiDriver_Emulated { + private: + MidiChannel_MPU401 _midiChannels[16]; diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 6a8deccf3..c587a8dab 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=sddm-kcm -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -14,9 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev knewstuff-dev" install_if="systemsettings sddm" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz - qt59.patch - " +source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -29,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbf341868837044a12d50c9292fefaf6a28cd3da48b91a0516f9709c63124ab2ccc73e3472d78dd41209fd07532126bb94059d1b27bf877e61deb1b3cbd5ac64 sddm-kcm-5.12.8.tar.xz -698bdd605b96655dc2038378cb3a749101c0dcc19cf7ba996f4d64ec6281e8541efb313b8dbf6095181766ab5a5bb3d2fecd25267e61b848dc4f08f89cde9bde qt59.patch" +sha512sums="136aa673463fa9621c026af240115d5a6ddb7826f107e7c138f9549eee98b08576333ff09ea7573bb5ce1d9d8cf8a8b582fe8d627e08a0ee9943bf7badee0233 sddm-kcm-5.18.3.tar.xz" diff --git a/user/sddm-kcm/qt59.patch b/user/sddm-kcm/qt59.patch deleted file mode 100644 index 977874172..000000000 --- a/user/sddm-kcm/qt59.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2f7ead351eedf245c2bb1840053288d18d5c0fc Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Tue, 5 Mar 2019 14:05:21 +0000 -Subject: Revert "Fix autologin session loading" - -It introduces Qt API > 5.8 which Plasma 5.12 depends on - -This reverts commit 634a2dd1bef5dd8434db95a391300f68f30fd14e. ---- - src/sessionmodel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp -index 08fe05d..9e52b12 100644 ---- a/src/sessionmodel.cpp -+++ b/src/sessionmodel.cpp -@@ -64,7 +64,7 @@ void SessionModel::loadDir(const QString &path, SessionType type) - QFile inputFile(dir.absoluteFilePath(session)); - if (!inputFile.open(QIODevice::ReadOnly)) - continue; -- SessionPtr si { new Session { session.chopped(strlen(".desktop")), QString(), QString(), QString() } }; -+ SessionPtr si { new Session { session, "", "", "" } }; - bool isHidden = false; - QString current_section; - QTextStream in(&inputFile); --- -cgit v1.1 - diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index b37641257..fa2eef17d 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -5,6 +5,8 @@ pkgver=0.18.1 pkgrel=2 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" @@ -14,8 +16,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev subpackages="$pkgname-lang $pkgname-openrc" install="sddm.post-install" langdir="/usr/share/sddm/translations" -pkgusers="sddm" -pkggroups="sddm" source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz ck2-support.patch pam-path-fix.patch @@ -37,7 +37,7 @@ build() { -DENABLE_JOURNALD=OFF \ -DUID_MIN=500 \ -DUID_MAX=65000 \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/sdl/APKBUILD b/user/sdl/APKBUILD index 176ac36b9..4c3d0084f 100644 --- a/user/sdl/APKBUILD +++ b/user/sdl/APKBUILD @@ -7,11 +7,11 @@ url="http://www.libsdl.org" arch="all" options="!check" # Tests are all interactive. license="LGPL-2.1+" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="libx11-dev" makedepends="$depends_dev libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev libxrandr-dev mesa-dev alsa-lib-dev glu-dev" +subpackages="$pkgname-dev $pkgname-doc" source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz SDL-1.2.10-GrabNotViewable.patch SDL-1.2.15-const_XData32.patch @@ -19,13 +19,11 @@ source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz builddir="$srcdir"/SDL-$pkgver prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -42,7 +40,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index 0ba480012..e11d9d7ae 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -2,41 +2,42 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 pkgver=2.0.10 -pkgrel=0 +pkgrel=1 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" +options="!check" # No test suite. license="zlib" depends="" makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxkbcommon-dev libxrandr-dev libxrender-dev libusb-dev mesa-dev - libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev" + libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake" subpackages="$pkgname-dev" -source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz" +source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + gles.patch + sdl2-soname.patch + " builddir="$srcdir/SDL2-$pkgver" build() { # pmOS needs DirectFB for battery animations and LUKS unlocking - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --enable-alsa \ - --enable-clock_gettime \ - --disable-arts \ - --disable-esd \ - --disable-nas \ - --disable-rpath \ - --with-x \ - make -} - -check() { - [ "$($builddir/sdl2-config --version)" = "$pkgver" ] + 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" \ + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz" +sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz +c345096eb98617c41ea5a7b79864082d869800dd54fb9d4aa565446dfafc9ec345193555c25c03f318fa13ed82f267eab6b164a1870ead5fb98a1216cbfd4a0b gles.patch +23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch" diff --git a/user/sdl2/gles.patch b/user/sdl2/gles.patch new file mode 100644 index 000000000..c400577e1 --- /dev/null +++ b/user/sdl2/gles.patch @@ -0,0 +1,12 @@ +--- SDL2-2.0.10/src/video/SDL_video.c.old 2019-07-25 04:32:37.000000000 +0000 ++++ SDL2-2.0.10/src/video/SDL_video.c 2020-01-20 17:32:52.918453596 +0000 +@@ -37,7 +37,8 @@ + #include "SDL_opengl.h" + #endif /* SDL_VIDEO_OPENGL */ + +-#if SDL_VIDEO_OPENGL_ES ++/* GL and GLES headers conflict on Linux 32 bits */ ++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL + #include "SDL_opengles.h" + #endif /* SDL_VIDEO_OPENGL_ES */ + diff --git a/user/sdl2/sdl2-soname.patch b/user/sdl2/sdl2-soname.patch new file mode 100644 index 000000000..8f040e30c --- /dev/null +++ b/user/sdl2/sdl2-soname.patch @@ -0,0 +1,13 @@ +The library name is SDL2-2.0, not SDL2. This fixes builds against SDL. + +--- SDL2-2.0.10/CMakeLists.txt.old 2019-07-25 04:32:36.000000000 +0000 ++++ SDL2-2.0.10/CMakeLists.txt 2020-01-03 17:23:42.451699149 +0000 +@@ -224,7 +224,7 @@ + + # Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config, + # etc. are created correctly. +-set(SDL_LIBS "-lSDL2") ++set(SDL_LIBS "-lSDL2-2.0") + set(SDL_CFLAGS "") + + # When building shared lib for Windows with MinGW, diff --git a/user/sdl2_image/APKBUILD b/user/sdl2_image/APKBUILD index e29ebdf53..fb0af1ea6 100644 --- a/user/sdl2_image/APKBUILD +++ b/user/sdl2_image/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=sdl2_image +_pkgname=SDL2_image pkgver=2.0.5 pkgrel=0 -_pkgname=SDL2_image pkgdesc="Library to load images of various formats as SDL surfaces" url="https://www.libsdl.org/projects/SDL_image/" arch="all" license="zlib" +depends="" makedepends="sdl2-dev libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev zlib-dev" subpackages="$pkgname-dev" @@ -24,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver" # - CVE-2019-12221 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +39,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_image/APKBUILD b/user/sdl_image/APKBUILD index 16f3d6551..05612a04d 100644 --- a/user/sdl_image/APKBUILD +++ b/user/sdl_image/APKBUILD @@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.ta builddir="$srcdir"/SDL_image-$pkgver prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_mixer/APKBUILD b/user/sdl_mixer/APKBUILD index 2cdb8238e..05972034e 100644 --- a/user/sdl_mixer/APKBUILD +++ b/user/sdl_mixer/APKBUILD @@ -9,13 +9,13 @@ arch="all" options="!check" # No test suite. license="Zlib" depends="" -makedepends="flac-dev fluidsynth-dev libvorbis-dev linux-headers sdl-dev" +makedepends="bash flac-dev fluidsynth-dev libvorbis-dev linux-headers sdl-dev" subpackages="$pkgname-dev" source="https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz" builddir="$srcdir"/SDL_mixer-$pkgver prepare() { - cd "$builddir" + default_prepare update_config_sub sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \ -e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \ @@ -24,20 +24,18 @@ prepare() { } build() { - cd "$builddir" - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --enable-music-mod + --enable-music-mod SHELL=/bin/bash make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_net/APKBUILD b/user/sdl_net/APKBUILD index 6172ddc1e..16a01d234 100644 --- a/user/sdl_net/APKBUILD +++ b/user/sdl_net/APKBUILD @@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar. builddir="$srcdir"/$_pkgname-$pkgver prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_ttf/APKBUILD b/user/sdl_ttf/APKBUILD index 96321243a..3e34063d8 100644 --- a/user/sdl_ttf/APKBUILD +++ b/user/sdl_ttf/APKBUILD @@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar. builddir="$srcdir"/$_pkgname-$pkgver prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD index 06cc98c2a..4ff3c66dd 100644 --- a/user/serf/APKBUILD +++ b/user/serf/APKBUILD @@ -15,18 +15,14 @@ source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2 " build() { - cd "$builddir" scons PREFIX=/usr -j "$JOBS" } check() { - cd "$builddir" scons test } package() { - cd "$builddir" - local _header install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0 ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1 diff --git a/user/sg3_utils/APKBUILD b/user/sg3_utils/APKBUILD index 7dc10d989..35e1a4fb3 100644 --- a/user/sg3_utils/APKBUILD +++ b/user/sg3_utils/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://sg.danny.cz/sg/p/sg3_utils-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index 4c5f6198b..a3361af07 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.14 +pkgver=1.15 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" @@ -11,7 +11,7 @@ makedepends="glib-dev itstool libxml2-dev libxml2-utils" 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/aee9ae9646cbef724bbb1bd2ba146556/shared-mime-info-1.14.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-1.15.tar.xz" build() { ac_cv_func_fdatasync=no ./configure \ @@ -30,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c25a4cec2e5aaa1e6aaef14f48f5910de5ccff1a5f3605da07fffea63e13624b945d7f40dfbe74fbfafd5364f143de88541c7fc5336d000ee16ad2eb06701c11 shared-mime-info-1.14.tar.xz" +sha512sums="3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2 shared-mime-info-1.15.tar.xz" diff --git a/user/showfont/APKBUILD b/user/showfont/APKBUILD index 63af1593b..45168cabb 100644 --- a/user/showfont/APKBUILD +++ b/user/showfont/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/showfont-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/shunit2/APKBUILD b/user/shunit2/APKBUILD index baa658cf8..499f9a53e 100644 --- a/user/shunit2/APKBUILD +++ b/user/shunit2/APKBUILD @@ -8,23 +8,18 @@ url="https://github.com/kward/shunit2" arch="noarch" license="Apache-2.0" depends="/bin/sh" -makedepends="" checkdepends="cmd:which bash dash zsh" +makedepends="" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/kward/shunit2/archive/v$pkgver.tar.gz - dash-negative-lineno.patch" - -build() { - cd "$builddir" -} + dash-negative-lineno.patch + " check() { - cd "$builddir" ./test_runner } package() { - cd "$builddir" install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" install -Dm644 "doc/$pkgname.txt" "$pkgdir/usr/share/doc/$pkgname/$pkgname.rst" } diff --git a/user/skanlite/APKBUILD b/user/skanlite/APKBUILD index 77c06dc04..b639bc7a8 100644 --- a/user/skanlite/APKBUILD +++ b/user/skanlite/APKBUILD @@ -17,7 +17,6 @@ source="https://download.kde.org/stable/skanlite/2.1/skanlite-$pkgver.tar.xz " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,17 +27,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/slang/APKBUILD b/user/slang/APKBUILD index 12929ac2b..430996243 100644 --- a/user/slang/APKBUILD +++ b/user/slang/APKBUILD @@ -8,7 +8,7 @@ url="http://www.jedsoft.org/slang/" arch="all" license="GPL-2.0+ AND NTP" depends="" -makedepends="pcre-dev" +makedepends="pcre-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2" @@ -19,7 +19,10 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --with-zlib=/ \ + --with-zinc=/usr/include \ + --with-pcre=/usr make -j1 } diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD index 9125db241..e035c815d 100644 --- a/user/smartmontools/APKBUILD +++ b/user/smartmontools/APKBUILD @@ -1,22 +1,21 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=smartmontools -pkgver=7.0 +pkgver=7.1 pkgrel=0 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives" url="https://www.smartmontools.org/" arch="all" license="GPL-2.0+" +depends="" makedepends="linux-headers" subpackages="$pkgname-doc $pkgname-openrc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz +source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz smartd.initd smartd.confd " build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,20 +25,16 @@ build() { } check() { - cd "$builddir" - make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir"/ install install -Dm755 "$srcdir"/smartd.initd "$pkgdir"/etc/init.d/smartd install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd } -sha512sums="96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512 smartmontools-7.0.tar.gz +sha512sums="440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 smartmontools-7.1.tar.gz 61cae548fc9f3a9fbea20d684502d3816e7b0b60fcf533ae4e1ab850725c208eb6ba5012ae154a46f0b7bb7285a9e63cbdecafed8db7fd63fda0ba59081260cc smartd.initd ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 smartd.confd" diff --git a/user/smproxy/APKBUILD b/user/smproxy/APKBUILD index 03e3eda4e..95416aa0a 100644 --- a/user/smproxy/APKBUILD +++ b/user/smproxy/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/smproxy-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/snappy/APKBUILD b/user/snappy/APKBUILD index 7f9b35e0d..3662d501e 100644 --- a/user/snappy/APKBUILD +++ b/user/snappy/APKBUILD @@ -8,12 +8,12 @@ url="https://google.github.io/snappy/" arch="all" [ "$CARCH" = "armhf" ] && options="!check" # does not pass testsuite on armhf license="BSD-3-Clause" +depends="" +makedepends="cmake" subpackages="$pkgname-dbg $pkgname-dev" -source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz - " +source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -24,17 +24,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD index e5257103e..dd7aeb4b8 100644 --- a/user/socat/APKBUILD +++ b/user/socat/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=socat -pkgver=1.7.3.3 +pkgver=1.7.3.4 pkgrel=0 pkgdesc="Multipurpose network relay" url="http://www.dest-unreach.org/socat/" @@ -12,10 +12,10 @@ depends="" makedepends="openssl-dev" subpackages="$pkgname-doc" source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz - netdb-internal.patch" + netdb-internal.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,9 +27,8 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b3ea4cb6081f7778a0281a3ec36ea7e5daf07dc19f2e0de08f767417112776e96e1bcac7962ebb6dd8b960ad91fc4a452f0da8327736d50e215e4ab43947ff78 socat-1.7.3.3.tar.gz +sha512sums="c5699fd1a703e90927076599d02323b85722d49e86bc2f627b4301a41d3df72c634af629f378425ff201cde78343da5cd0cad1044bf857665176c91357401fdd socat-1.7.3.4.tar.gz 22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index e5b2b0f5a..994c3bb6f 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/solid-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5728b617d5d6ec6acc71cd4707ab25e3c753c9616c2b5b1d4b1c66899faa526b395c206c3d3b3f36cb4e2f005f1267c12c9f73cf4d9fffd486eae64fbf78d855 solid-5.54.0.tar.xz" +sha512sums="df0a7520b698c28324c1881585d551aac885f43edb6e2dda4e95dc3a9fbb6d7609807a64042acf02bae72c55d6081205033228a1e250ada06b61ede5c3f544b7 solid-5.68.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 80398527a..74ac2fd11 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-aspell" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/sonnet-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # Highlighter test requires X11 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E sonnet-test_highlighter } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -50,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="fe7551fb65fe896a872c3f0af4ce1c60f4b974f993465b5ae7b3eea219a0964f7ae5107aa9346884ffd37c95b4bf7ea0bed05592245978c07fd633af88eeca88 sonnet-5.54.0.tar.xz" +sha512sums="add681532d2cfe371662306376da07bd337446f67d2b375a878bf53355e08407d24e1e63155f313e31b737a70014a052c19a1d120bbc67aeffd6be525f0aada3 sonnet-5.68.0.tar.xz" diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD index ad1f9c0e4..eaf320db8 100644 --- a/user/sound-theme-freedesktop/APKBUILD +++ b/user/sound-theme-freedesktop/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sox/APKBUILD b/user/sox/APKBUILD index efcdeba1e..8e9fe9934 100644 --- a/user/sox/APKBUILD +++ b/user/sox/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=sox pkgver=14.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Convert between various audio formats" url="http://sox.sourceforge.net/" arch="all" @@ -15,18 +15,44 @@ makedepends="alsa-lib-dev ffmpeg-dev file-dev flac-dev gsm-dev lame-dev depends="" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + CVE-2017-11332.patch + CVE-2017-11358.patch + CVE-2017-11359.patch + CVE-2017-15370.patch + CVE-2017-15371.patch + CVE-2017-15372.patch + CVE-2017-15642.patch + CVE-2017-18189.patch + CVE-2019-13590.patch + CVE-2019-8354.patch + CVE-2019-8355.patch + CVE-2019-8356.patch + CVE-2019-8357.patch disable-pipe-file-detection.patch - sox-dynamic.patch " +# secfixes: +# 14.4.2-r2: +# - CVE-2017-11332 +# - CVE-2017-11358 +# - CVE-2017-11359 +# - CVE-2017-15370 +# - CVE-2017-15371 +# - CVE-2017-15372 +# - CVE-2017-15642 +# - CVE-2017-18189 +# - CVE-2019-13590 +# - CVE-2019-8354 +# - CVE-2019-8355 +# - CVE-2019-8356 +# - CVE-2019-8357 + prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,7 +64,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install ln -sf play "$pkgdir"/usr/bin/rec ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7 @@ -46,5 +71,17 @@ package() { } sha512sums="b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca sox-14.4.2.tar.gz -eb90574a7c174a32ac77aa09a2bb4ebbea407463517e55943e16efd8b7c52393c6b7a6b2778d696f708627271f4d2212221a85fc50d2500b32143139a37a957a disable-pipe-file-detection.patch -3950834db26faa0523006c6fd8e0769d080518f127d345c8ec9bf53e9db8a6bd67cd724f0f86492aaf9ce6ede2dfbde167049768f35c14ef3c2b96e7e00302b6 sox-dynamic.patch" +b4bded0b15a2243fbb404a33fccf45ad5634d6c6e0f60b49b967592f00ff9bc3657ebcfa42b18a5af804e7f04a700773bece5951739b8206b2c68c46c9ec4c7f CVE-2017-11332.patch +28ffd5eef149563a1cdfcd920a89a0e2247ddbf4ed10a76c4e34ee57e3a30ec3a98bacf53fe1675da1431dd40c30b13cae0b9a1e26153c1aad6144322b7d78b0 CVE-2017-11358.patch +2c95d85f94877bf1637d2c1297944a77a8854506cad35b1c0d632237133cd970da82cded817696b19acde25b0e570f4c86659cc362a910e4ea76a037e3e56214 CVE-2017-11359.patch +bcbfd0785751372cd959a7419d88af24bb041dd02d3d0cf2f0dab46b6f6b55f284c1d823d20e5a0eae15191f3ccb2eefa2026287fdfbecb064722b006970ee00 CVE-2017-15370.patch +b116887f52eb4b70de9dda5f14e581579c4c1755c39100d88c4b8645bf9e053cfe87de3346eb138edc45fd2c36f0e1755f91e09511d279fe6d4661099c578420 CVE-2017-15371.patch +f8a4d38cfad80a50b9c758b222d83f6b51d96f1491862680e1632eec2a5c2a7c6f968660307f0f403e0b7537f7da19a510945648bdef8f1302fd4683be869581 CVE-2017-15372.patch +259980ea6fe08a2481a478a4a21b11a7fc4390b1b53023009d85fb2185ee63c42d2762e024af20912e7277688fac98e4eaa66b4a4e79840517ff2481ad50327e CVE-2017-15642.patch +de510114a9fbbbabe62149f3c22ebd1fae65ed68e6ed0b818f367bbee806c9e04be6db0c8e64f4985b7bd95dd0cc643e1475767fda4e405931f25104b4a2e39f CVE-2017-18189.patch +eab27e22035bdbe00d0dc4117f98bf9c5dcad4513a27e0e8a83506b94fca8055bc6ce532d24306aa8434942bef111b3511daf260df56fafb7b4ac5ed2075e3f7 CVE-2019-13590.patch +61342fad71dbe7f0ff10a7327eeed901c0defd5aafaace4ac755032ccf687d875856490c30f2af050823fd6ff1a1c7f503ae26670225eab916ab59fa857a8cb3 CVE-2019-8354.patch +3f05ab71680a67c9e8a4b33c70cb19a623f0925a2620ab007dc8d4a82caf5b73b50e3e5d40e242d6f65420d444b91e11bee09e4398e8079ca4af60bd34097593 CVE-2019-8355.patch +6eca5096c658a61939902a70d218b5662b663df84173d09d5b23f497bdcb81c04cd94d8debed2818079c342cec80ec29ff33d572611826bdbc12a5d465a20241 CVE-2019-8356.patch +82fbbf62a7124248ce74cf0daab0cd224a3da80e62923db58b8be31c4f145abe0e653f6968d0f6b862e5554d080d0f85b0bc0bcdb6dea34c130aa4ee9106d915 CVE-2019-8357.patch +eb90574a7c174a32ac77aa09a2bb4ebbea407463517e55943e16efd8b7c52393c6b7a6b2778d696f708627271f4d2212221a85fc50d2500b32143139a37a957a disable-pipe-file-detection.patch" diff --git a/user/sox/CVE-2017-11332.patch b/user/sox/CVE-2017-11332.patch new file mode 100644 index 000000000..511049d8e --- /dev/null +++ b/user/sox/CVE-2017-11332.patch @@ -0,0 +1,28 @@ +From 6e177c455fb554327ff8125b6e6dde1568610abe Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 16:29:28 +0000 +Subject: [PATCH] wav: fix crash if channel count is zero (CVE-2017-11332) + +--- + src/wav.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/wav.c b/src/wav.c +index 5202556c..71fd52ac 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -712,6 +712,11 @@ static int startread(sox_format_t * ft) + else + lsx_report("User options overriding channels read in .wav header"); + ++ if (ft->signal.channels == 0) { ++ lsx_fail_errno(ft, SOX_EHDR, "Channel count is zero"); ++ return SOX_EOF; ++ } ++ + if (ft->signal.rate == 0 || ft->signal.rate == dwSamplesPerSecond) + ft->signal.rate = dwSamplesPerSecond; + else +-- +2.25.0 + diff --git a/user/sox/CVE-2017-11358.patch b/user/sox/CVE-2017-11358.patch new file mode 100644 index 000000000..4fadeda30 --- /dev/null +++ b/user/sox/CVE-2017-11358.patch @@ -0,0 +1,44 @@ +From e410d00c4821726accfbe1f825f2def6376e181f Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 16:43:35 +0000 +Subject: [PATCH] hcom: fix crash on input with corrupt dictionary + (CVE-2017-11358) + +--- + src/hcom.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/src/hcom.c b/src/hcom.c +index e76820e9..be17d9d2 100644 +--- a/src/hcom.c ++++ b/src/hcom.c +@@ -73,6 +73,14 @@ typedef struct { + size_t pos; /* Where next byte goes */ + } priv_t; + ++static int dictvalid(int n, int size, int left, int right) ++{ ++ if (n > 0 && left < 0) ++ return 1; ++ ++ return (unsigned)left < size && (unsigned)right < size; ++} ++ + static int startread(sox_format_t * ft) + { + priv_t *p = (priv_t *) ft->priv; +@@ -150,6 +158,11 @@ static int startread(sox_format_t * ft) + lsx_debug("%d %d", + p->dictionary[i].dict_leftson, + p->dictionary[i].dict_rightson); ++ if (!dictvalid(i, dictsize, p->dictionary[i].dict_leftson, ++ p->dictionary[i].dict_rightson)) { ++ lsx_fail_errno(ft, SOX_EHDR, "Invalid dictionary"); ++ return SOX_EOF; ++ } + } + rc = lsx_skipbytes(ft, (size_t) 1); /* skip pad byte */ + if (rc) +-- +2.25.0 + diff --git a/user/sox/CVE-2017-11359.patch b/user/sox/CVE-2017-11359.patch new file mode 100644 index 000000000..cb96c4a71 --- /dev/null +++ b/user/sox/CVE-2017-11359.patch @@ -0,0 +1,30 @@ +From 7b3f30e13e4845bafc93215a372c6eb7dcf04118 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 17:02:11 +0000 +Subject: [PATCH] wav: fix crash writing header when channel count >64k + (CVE-2017-11359) + +--- + src/wav.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/wav.c b/src/wav.c +index 71fd52ac..eca1cde5 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -1379,6 +1379,12 @@ static int wavwritehdr(sox_format_t * ft, int second_header) + long blocksWritten = 0; + sox_bool isExtensible = sox_false; /* WAVE_FORMAT_EXTENSIBLE? */ + ++ if (ft->signal.channels > UINT16_MAX) { ++ lsx_fail_errno(ft, SOX_EOF, "Too many channels (%u)", ++ ft->signal.channels); ++ return SOX_EOF; ++ } ++ + dwSamplesPerSecond = ft->signal.rate; + wChannels = ft->signal.channels; + wBitsPerSample = ft->encoding.bits_per_sample; +-- +2.25.0 + diff --git a/user/sox/CVE-2017-15370.patch b/user/sox/CVE-2017-15370.patch new file mode 100644 index 000000000..9e6a7f7ee --- /dev/null +++ b/user/sox/CVE-2017-15370.patch @@ -0,0 +1,28 @@ +From e076a7ad504add6e8c3b8699e8587eef0e0d9bc3 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 16:21:23 +0000 +Subject: [PATCH] wav: ima_adpcm: fix buffer overflow on corrupt input + (CVE-2017-15370) + +Add the same check bad block size as was done for MS adpcm in commit +f39c574b ("More checks for invalid MS ADPCM blocks"). +--- + src/wav.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wav.c b/src/wav.c +index eca1cde5..fad334cf 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -127,7 +127,7 @@ static unsigned short ImaAdpcmReadBlock(sox_format_t * ft) + /* work with partial blocks. Specs say it should be null */ + /* padded but I guess this is better than trailing quiet. */ + samplesThisBlock = lsx_ima_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t) 0); +- if (samplesThisBlock == 0) ++ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock) + { + lsx_warn("Premature EOF on .wav input file"); + return 0; +-- +2.25.0 + diff --git a/user/sox/CVE-2017-15371.patch b/user/sox/CVE-2017-15371.patch new file mode 100644 index 000000000..7b38943f2 --- /dev/null +++ b/user/sox/CVE-2017-15371.patch @@ -0,0 +1,40 @@ +From 968c689ad2c4269a1a853434d99aa7ebf0c01354 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 15:57:48 +0000 +Subject: [PATCH] flac: fix crash on corrupt metadata (CVE-2017-15371) + +--- + src/flac.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/flac.c b/src/flac.c +index 0d7829ec..07f45c1b 100644 +--- a/src/flac.c ++++ b/src/flac.c +@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL + p->total_samples = metadata->data.stream_info.total_samples; + } + else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) { ++ const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment; + size_t i; + +- if (metadata->data.vorbis_comment.num_comments == 0) ++ if (vc->num_comments == 0) + return; + + if (ft->oob.comments != NULL) { +@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL + return; + } + +- for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i) +- sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry); ++ for (i = 0; i < vc->num_comments; ++i) ++ if (vc->comments[i].entry) ++ sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry); + } + } + +-- +2.25.0 + diff --git a/user/sox/CVE-2017-15372.patch b/user/sox/CVE-2017-15372.patch new file mode 100644 index 000000000..dd7fcff5d --- /dev/null +++ b/user/sox/CVE-2017-15372.patch @@ -0,0 +1,100 @@ +From 515b986139183326cc40c67c75f83edc60826a9e Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 8 Nov 2017 00:27:46 +0000 +Subject: [PATCH] adpcm: fix stack overflow with >4 channels (CVE-2017-15372) + +--- + src/adpcm.c | 8 +++++++- + src/adpcm.h | 3 +++ + src/wav.c | 5 ++++- + 3 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/adpcm.c b/src/adpcm.c +index 2e13867e..f64b7d5c 100644 +--- a/src/adpcm.c ++++ b/src/adpcm.c +@@ -71,6 +71,11 @@ const short lsx_ms_adpcm_i_coef[7][2] = { + { 392,-232} + }; + ++extern void *lsx_ms_adpcm_alloc(unsigned chans) ++{ ++ return lsx_malloc(chans * sizeof(MsState_t)); ++} ++ + static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state, + sox_sample_t sample1, sox_sample_t sample2) + { +@@ -102,6 +107,7 @@ static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state, + + /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */ + const char *lsx_ms_adpcm_block_expand_i( ++ void *priv, + unsigned chans, /* total channels */ + int nCoef, + const short *coef, +@@ -113,7 +119,7 @@ const char *lsx_ms_adpcm_block_expand_i( + const unsigned char *ip; + unsigned ch; + const char *errmsg = NULL; +- MsState_t state[4]; /* One decompressor state for each channel */ ++ MsState_t *state = priv; /* One decompressor state for each channel */ + + /* Read the four-byte header for each channel */ + ip = ibuff; +diff --git a/src/adpcm.h b/src/adpcm.h +index af4d6f08..db5cc615 100644 +--- a/src/adpcm.h ++++ b/src/adpcm.h +@@ -29,8 +29,11 @@ + /* default coef sets */ + extern const short lsx_ms_adpcm_i_coef[7][2]; + ++extern void *lsx_ms_adpcm_alloc(unsigned chans); ++ + /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */ + extern const char *lsx_ms_adpcm_block_expand_i( ++ void *priv, + unsigned chans, /* total channels */ + int nCoef, + const short *coef, +diff --git a/src/wav.c b/src/wav.c +index fad334cf..066be6d7 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -82,6 +82,7 @@ typedef struct { + /* following used by *ADPCM wav files */ + unsigned short nCoefs; /* ADPCM: number of coef sets */ + short *lsx_ms_adpcm_i_coefs; /* ADPCM: coef sets */ ++ void *ms_adpcm_data; /* Private data of adpcm decoder */ + unsigned char *packet; /* Temporary buffer for packets */ + short *samples; /* interleaved samples buffer */ + short *samplePtr; /* Pointer to current sample */ +@@ -175,7 +176,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft) + } + } + +- errmsg = lsx_ms_adpcm_block_expand_i(ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock); ++ errmsg = lsx_ms_adpcm_block_expand_i(wav->ms_adpcm_data, ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock); + + if (errmsg) + lsx_warn("%s", errmsg); +@@ -791,6 +792,7 @@ static int startread(sox_format_t * ft) + + /* nCoefs, lsx_ms_adpcm_i_coefs used by adpcm.c */ + wav->lsx_ms_adpcm_i_coefs = lsx_malloc(wav->nCoefs * 2 * sizeof(short)); ++ wav->ms_adpcm_data = lsx_ms_adpcm_alloc(wChannels); + { + int i, errct=0; + for (i=0; len>=2 && i < 2*wav->nCoefs; i++) { +@@ -1216,6 +1218,7 @@ static int stopread(sox_format_t * ft) + free(wav->packet); + free(wav->samples); + free(wav->lsx_ms_adpcm_i_coefs); ++ free(wav->ms_adpcm_data); + free(wav->comment); + wav->comment = NULL; + +-- +2.25.0 + diff --git a/user/sox/CVE-2017-15642.patch b/user/sox/CVE-2017-15642.patch new file mode 100644 index 000000000..95beb4f6f --- /dev/null +++ b/user/sox/CVE-2017-15642.patch @@ -0,0 +1,34 @@ +From f56c0dbca8f5bd02ea88970c248c0d087386e807 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Mon, 20 Nov 2017 11:03:15 +0000 +Subject: [PATCH] aiff: fix crash on empty comment chunk (CVE-2017-15642) + +This fixes a use after free and double free if an empty comment +chunk follows a non-empty one. +--- + src/aiff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/aiff.c b/src/aiff.c +index 240d2e1f..11ddb542 100644 +--- a/src/aiff.c ++++ b/src/aiff.c +@@ -62,7 +62,6 @@ int lsx_aiffstartread(sox_format_t * ft) + size_t ssndsize = 0; + char *annotation; + char *author; +- char *comment = NULL; + char *copyright; + char *nametext; + +@@ -270,6 +269,7 @@ int lsx_aiffstartread(sox_format_t * ft) + free(annotation); + } + else if (strncmp(buf, "COMT", (size_t)4) == 0) { ++ char *comment = NULL; + rc = commentChunk(&comment, "Comment:", ft); + if (rc) { + /* Fail already called in function */ +-- +2.25.0 + diff --git a/user/sox/CVE-2017-18189.patch b/user/sox/CVE-2017-18189.patch new file mode 100644 index 000000000..aa3791d01 --- /dev/null +++ b/user/sox/CVE-2017-18189.patch @@ -0,0 +1,33 @@ +From 09d7388c8ad5701ed9c59d1d600ff6154b066397 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Thu, 9 Nov 2017 11:45:10 +0000 +Subject: [PATCH] xa: validate channel count (CVE-2017-18189) + +A corrupt header specifying zero channels would send read_channels() +into an infinite loop. Prevent this by sanity checking the channel +count in open_read(). Also add an upper bound to prevent overflow +in multiplication. +--- + src/xa.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/xa.c b/src/xa.c +index 81a76772..9fc086ec 100644 +--- a/src/xa.c ++++ b/src/xa.c +@@ -143,6 +143,12 @@ static int startread(sox_format_t * ft) + lsx_report("User options overriding rate read in .xa header"); + } + ++ if (ft->signal.channels == 0 || ft->signal.channels > UINT16_MAX) { ++ lsx_fail_errno(ft, SOX_EFMT, "invalid channel count %d", ++ ft->signal.channels); ++ return SOX_EOF; ++ } ++ + /* Check for supported formats */ + if (ft->encoding.bits_per_sample != 16) { + lsx_fail_errno(ft, SOX_EFMT, "%d-bit sample resolution not supported.", +-- +2.25.0 + diff --git a/user/sox/CVE-2019-13590.patch b/user/sox/CVE-2019-13590.patch new file mode 100644 index 000000000..a09b11bae --- /dev/null +++ b/user/sox/CVE-2019-13590.patch @@ -0,0 +1,33 @@ +From 7b6a889217d62ed7e28188621403cc7542fd1f7e Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Tue, 4 Feb 2020 12:55:18 +0000 +Subject: [PATCH] sox-fmt: validate comments_bytes before use (CVE-2019-13590) + [bug #325] + +Cap the comments size to 1 GB to avoid overflows in subsequent +arithmetic. + +The missing null check mentioned in the bug report is bogus since +lsx_calloc() returns a valid pointer or aborts. +--- + src/sox-fmt.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/sox-fmt.c b/src/sox-fmt.c +index aad965cd..11c88771 100644 +--- a/src/sox-fmt.c ++++ b/src/sox-fmt.c +@@ -46,7 +46,9 @@ static int startread(sox_format_t * ft) + lsx_readdw(ft, &comments_bytes)) + return SOX_EOF; + +- if (((headers_bytes + 4) & 7) || headers_bytes < FIXED_HDR + comments_bytes || ++ if (((headers_bytes + 4) & 7) || ++ comments_bytes > 0x40000000 || /* max 1 GB */ ++ headers_bytes < FIXED_HDR + comments_bytes || + (num_channels > 65535)) /* Reserve top 16 bits */ { + lsx_fail_errno(ft, SOX_EHDR, "invalid sox file format header"); + return SOX_EOF; +-- +2.25.0 + diff --git a/user/sox/CVE-2019-8354.patch b/user/sox/CVE-2019-8354.patch new file mode 100644 index 000000000..1fa0e669f --- /dev/null +++ b/user/sox/CVE-2019-8354.patch @@ -0,0 +1,28 @@ +From f70911261a84333b077c29908e1242f69d7439eb Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 24 Apr 2019 14:57:34 +0100 +Subject: [PATCH] fix possible buffer size overflow in lsx_make_lpf() + (CVE-2019-8354) + +The multiplication in the size argument malloc() might overflow, +resulting in a small buffer being allocated. Use calloc() instead. +--- + src/effects_i_dsp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/effects_i_dsp.c b/src/effects_i_dsp.c +index a979b501..e32dfa05 100644 +--- a/src/effects_i_dsp.c ++++ b/src/effects_i_dsp.c +@@ -357,7 +357,7 @@ double * lsx_make_lpf(int num_taps, double Fc, double beta, double rho, + double scale, sox_bool dc_norm) + { + int i, m = num_taps - 1; +- double * h = malloc(num_taps * sizeof(*h)), sum = 0; ++ double * h = calloc(num_taps, sizeof(*h)), sum = 0; + double mult = scale / lsx_bessel_I_0(beta), mult1 = 1 / (.5 * m + rho); + assert(Fc >= 0 && Fc <= 1); + lsx_debug("make_lpf(n=%i Fc=%.7g β=%g ρ=%g dc-norm=%i scale=%g)", num_taps, Fc, beta, rho, dc_norm, scale); +-- +2.25.0 + diff --git a/user/sox/CVE-2019-8355.patch b/user/sox/CVE-2019-8355.patch new file mode 100644 index 000000000..d4d8cb808 --- /dev/null +++ b/user/sox/CVE-2019-8355.patch @@ -0,0 +1,59 @@ +Backport of the following: + +From ec073861aa9c0f779a3741c456e4f97d59366ffb Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Sun, 5 Nov 2017 15:40:16 +0000 +Subject: [PATCH] make: update exported symbol list [bug #266] + +From f8587e2d50dad72d40453ac1191c539ee9e50381 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 24 Apr 2019 17:39:45 +0100 +Subject: [PATCH] fix possible overflow in lsx_(re)valloc() size calculation + (CVE-2019-8355) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@ + + libsox_la_CFLAGS = @WARN_CFLAGS@ + libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ +- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' ++ -export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc.*|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$' + + if HAVE_WIN32_LTDL + libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h +--- sox-14.4.2/src/xmalloc.c 2012-01-23 16:27:33.000000000 -0600 ++++ sox-14.4.2/src/xmalloc.c 2020-03-21 13:24:52.660007611 -0500 +@@ -41,3 +41,13 @@ void *lsx_realloc(void *ptr, size_t news + + return ptr; + } ++ ++void *lsx_realloc_array(void *p, size_t n, size_t size) ++{ ++ if (n > (size_t)-1 / size) { ++ lsx_fail("malloc size overflow"); ++ exit(2); ++ } ++ ++ return lsx_realloc(p, n * size); ++} +--- sox-14.4.2/src/xmalloc.h 2012-01-23 16:27:33.000000000 -0600 ++++ sox-14.4.2/src/xmalloc.h 2020-03-21 13:24:14.610007203 -0500 +@@ -23,12 +23,14 @@ + #include <stddef.h> + #include <string.h> + ++LSX_RETURN_VALID void *lsx_realloc_array(void *p, size_t n, size_t size); ++ + #define lsx_malloc(size) lsx_realloc(NULL, (size)) + #define lsx_calloc(n,s) (((n)*(s))? memset(lsx_malloc((n)*(s)),0,(n)*(s)) : NULL) + #define lsx_Calloc(v,n) v = lsx_calloc(n,sizeof(*(v))) + #define lsx_strdup(p) ((p)? strcpy((char *)lsx_malloc(strlen(p) + 1), p) : NULL) + #define lsx_memdup(p,s) ((p)? memcpy(lsx_malloc(s), p, s) : NULL) +-#define lsx_valloc(v,n) v = lsx_malloc((n)*sizeof(*(v))) +-#define lsx_revalloc(v,n) v = lsx_realloc(v, (n)*sizeof(*(v))) ++#define lsx_valloc(v,n) v = lsx_realloc_array(NULL, n, sizeof(*(v))) ++#define lsx_revalloc(v,n) v = lsx_realloc_array(v, n, sizeof(*(v))) + + #endif diff --git a/user/sox/CVE-2019-8356.patch b/user/sox/CVE-2019-8356.patch new file mode 100644 index 000000000..9375bc5ae --- /dev/null +++ b/user/sox/CVE-2019-8356.patch @@ -0,0 +1,92 @@ +From b7883ae1398499daaa926ae6621f088f0f531ed8 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 24 Apr 2019 16:56:42 +0100 +Subject: [PATCH] fft4g: bail if size too large (CVE-2019-8356) + +Prevent overflowing of fixed-size buffers in bitrv2() and bitrv2conj() +if the transform size is too large. +--- + src/fft4g.c | 18 ++++++++++++++++++ + src/fft4g.h | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/src/fft4g.c b/src/fft4g.c +index 38a8bcc0..88a2a7ec 100644 +--- a/src/fft4g.c ++++ b/src/fft4g.c +@@ -322,6 +322,9 @@ static void rftfsub(int n, double *a, int nc, double const *c); + + void cdft(int n, int isgn, double *a, int *ip, double *w) + { ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + if (n > (ip[0] << 2)) { + makewt(n >> 2, ip, w); + } +@@ -344,6 +347,9 @@ void rdft(int n, int isgn, double *a, int *ip, double *w) + int nw, nc; + double xi; + ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + nw = ip[0]; + if (n > (nw << 2)) { + nw = n >> 2; +@@ -384,6 +390,9 @@ void ddct(int n, int isgn, double *a, int *ip, double *w) + int j, nw, nc; + double xr; + ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + nw = ip[0]; + if (n > (nw << 2)) { + nw = n >> 2; +@@ -435,6 +444,9 @@ void ddst(int n, int isgn, double *a, int *ip, double *w) + int j, nw, nc; + double xr; + ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + nw = ip[0]; + if (n > (nw << 2)) { + nw = n >> 2; +@@ -486,6 +498,9 @@ void dfct(int n, double *a, double *t, int *ip, double *w) + int j, k, l, m, mh, nw, nc; + double xr, xi, yr, yi; + ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + nw = ip[0]; + if (n > (nw << 3)) { + nw = n >> 3; +@@ -576,6 +591,9 @@ void dfst(int n, double *a, double *t, int *ip, double *w) + int j, k, l, m, mh, nw, nc; + double xr, xi, yr, yi; + ++ if (n > FFT4G_MAX_SIZE) ++ return; ++ + nw = ip[0]; + if (n > (nw << 3)) { + nw = n >> 3; +diff --git a/src/fft4g.h b/src/fft4g.h +index 2b8051ca..95ee3413 100644 +--- a/src/fft4g.h ++++ b/src/fft4g.h +@@ -13,6 +13,8 @@ + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#define FFT4G_MAX_SIZE 262144 ++ + void lsx_cdft(int, int, double *, int *, double *); + void lsx_rdft(int, int, double *, int *, double *); + void lsx_ddct(int, int, double *, int *, double *); +-- +2.25.0 + diff --git a/user/sox/CVE-2019-8357.patch b/user/sox/CVE-2019-8357.patch new file mode 100644 index 000000000..ec2b04d30 --- /dev/null +++ b/user/sox/CVE-2019-8357.patch @@ -0,0 +1,28 @@ +From 2ce02fea7b350de9ddfbcf542ba4dd59a8ab255b Mon Sep 17 00:00:00 2001 +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 24 Apr 2019 15:08:51 +0100 +Subject: [PATCH] fix possible null pointer deref in lsx_make_lpf() + (CVE-2019-8357) + +If the buffer allocation fails, return NULL. +--- + src/effects_i_dsp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/effects_i_dsp.c b/src/effects_i_dsp.c +index e32dfa05..88b1b390 100644 +--- a/src/effects_i_dsp.c ++++ b/src/effects_i_dsp.c +@@ -362,6 +362,9 @@ double * lsx_make_lpf(int num_taps, double Fc, double beta, double rho, + assert(Fc >= 0 && Fc <= 1); + lsx_debug("make_lpf(n=%i Fc=%.7g β=%g ρ=%g dc-norm=%i scale=%g)", num_taps, Fc, beta, rho, dc_norm, scale); + ++ if (!h) ++ return NULL; ++ + for (i = 0; i <= m / 2; ++i) { + double z = i - .5 * m, x = z * M_PI, y = z * mult1; + h[i] = x? sin(Fc * x) / x : Fc; +-- +2.25.0 + diff --git a/user/sox/sox-dynamic.patch b/user/sox/sox-dynamic.patch deleted file mode 100644 index 94ac6a282..000000000 --- a/user/sox/sox-dynamic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur sox-14.4.2-orig/src/Makefile.am sox-14.4.2/src/Makefile.am ---- sox-14.4.2-orig/src/Makefile.am 2015-04-08 17:11:09.555343005 -0400 -+++ sox-14.4.2/src/Makefile.am 2015-04-08 17:11:25.115317153 -0400 -@@ -95,7 +95,7 @@ - - libsox_la_CFLAGS = @WARN_CFLAGS@ - libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ -- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' -+ -export-symbols-regex '^(sox_.*|lsx_(error|flush|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' - - if HAVE_WIN32_LTDL - libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h diff --git a/user/spdlog/APKBUILD b/user/spdlog/APKBUILD new file mode 100644 index 000000000..3f25d32bb --- /dev/null +++ b/user/spdlog/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=spdlog +pkgver=1.5.0 +pkgrel=0 +pkgdesc="C++ header-only logging library" +url="https://github.com/gabime/spdlog" +arch="all" +license="MIT AND BSD-2-Clause" +depends="" +makedepends="cmake" +source="$pkgname-$pkgver.tar.gz::https://github.com/gabime/spdlog/archive/v$pkgver.tar.gz" + +build() { + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DSPDLOG_BUILD_SHARED=ON \ + -DSPDLOG_BUILD_TESTS=ON \ + -DSPDLOG_BUILD_BENCH=OFF \ + -DSPDLOG_BUILD_EXAMPLES=OFF + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34 spdlog-1.5.0.tar.gz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 0eab09c31..00793ced6 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -14,9 +14,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$pkgver.tar.xz no-wayland.patch - qt5.9.patch " build() { @@ -31,7 +30,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -43,6 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a03dbe13aa0e0cea07b6505ead130946233574863fc5994d42a971d8a9ae0a24be5e4dfab38640857d5bb89f33dc3736bad7e87a3a76aa83b450156e8db96723 spectacle-19.08.2.tar.xz -36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch -781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" +sha512sums="6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766 spectacle-19.12.3.tar.xz +36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch" diff --git a/user/spectacle/qt5.9.patch b/user/spectacle/qt5.9.patch deleted file mode 100644 index aa830f86b..000000000 --- a/user/spectacle/qt5.9.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- spectacle-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:23.000000000 +0000 -+++ spectacle-19.04.0/CMakeLists.txt 2019-04-18 22:57:10.598054362 +0000 -@@ -11,7 +11,7 @@ - # Spectacle project - project(Spectacle VERSION ${SPECTACLE_VERSION}) - --set(QT_MIN_VERSION "5.10.0") -+set(QT_MIN_VERSION "5.9.0") - set(KF5_MIN_VERSION "5.53.0") - set(PLASMA_MIN_VERSION "5.12.0") - ---- spectacle-19.04.0/src/SpectacleCore.cpp.old 2019-04-11 07:37:14.000000000 +0000 -+++ spectacle-19.04.0/src/SpectacleCore.cpp 2019-04-18 22:57:46.694193923 +0000 -@@ -165,8 +165,7 @@ - break; - case Actions::StartNewInstance: - QProcess newInstance; -- newInstance.setProgram(QStringLiteral("spectacle")); -- newInstance.startDetached(); -+ newInstance.startDetached(QStringLiteral("spectacle")); - break; - } - } diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 7699adf7d..651311cdf 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,13 +1,13 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=spectrwm -pkgver=3.2.0 +pkgver=3.3.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Small dynamic tiling window manager" url="https://github.com/conformal/spectrwm" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="ISC AND MIT" depends="" makedepends="libx11-dev libxcursor-dev libxcb-dev xcb-util-keysyms-dev @@ -17,14 +17,11 @@ source="spectrwm-$pkgver.tar.gz::https://github.com/conformal/spectrwm/archive/S builddir="$srcdir/spectrwm-SPECTRWM_$_pkgver" build() { - cd "$builddir"/linux - CFLAGS="-DSWM_LIB=libswmhack.so" make PREFIX=/usr + CFLAGS="-DSWM_LIB=libswmhack.so" make -C linux PREFIX=/usr } package() { - cd "$builddir"/linux - make PREFIX=/usr DESTDIR="$pkgdir" install - cd .. + make PREFIX=/usr DESTDIR="$pkgdir" -C linux install for i in screenshot.sh baraction.sh; do install -Dm755 $i "$pkgdir"/usr/share/spectrwm/$i done @@ -35,4 +32,4 @@ package() { done } -sha512sums="038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039 spectrwm-3.2.0.tar.gz" +sha512sums="743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc spectrwm-3.3.0.tar.gz" diff --git a/user/speech-dispatcher/APKBUILD b/user/speech-dispatcher/APKBUILD index bb931aa9d..6835f7ace 100644 --- a/user/speech-dispatcher/APKBUILD +++ b/user/speech-dispatcher/APKBUILD @@ -8,8 +8,9 @@ url="https://freebsoft.org/speechd" arch="all" license="LGPL-2.1-only AND (GPL-2.0+ AND LGPL-2.1+) AND LGPL-2.1+ AND GPL-2.0+" depends="flite" +# ltdl makedepends="alsa-lib-dev dotconf-dev flite-dev glib-dev intltool - libsndfile-dev pulseaudio-dev" + libsndfile-dev libtool pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://github.com/brailcom/speechd/releases/download/$pkgver/speech-dispatcher-$pkgver.tar.gz" diff --git a/user/speex/APKBUILD b/user/speex/APKBUILD index c39ae6691..be0584dfa 100644 --- a/user/speex/APKBUILD +++ b/user/speex/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://downloads.us.xiph.org/releases/speex/speex-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +26,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/speexdsp/APKBUILD b/user/speexdsp/APKBUILD index b6a45a1f9..9394edc7a 100644 --- a/user/speexdsp/APKBUILD +++ b/user/speexdsp/APKBUILD @@ -14,8 +14,12 @@ replaces="libspeex" source="https://downloads.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz" build() { - local _neon - [ "$CARCH" = "aarch64" ] && _neon="--disable-neon" + _arch_flags="" + + case $CARCH in + "aarch64") _arch_flags="--disable-neon" + esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +28,11 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ - $_neon + $_arch_flags make } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD index 03b4f65f9..ef57a810c 100644 --- a/user/spice/APKBUILD +++ b/user/spice/APKBUILD @@ -20,7 +20,6 @@ source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver # - CVE-2018-10873 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index 8d30613ad..aa902f9bc 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.0.5 +pkgver=1.5.0 pkgrel=0 pkgdesc="Monospace bitmap typeface from OpenBSD" url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" @@ -14,11 +14,10 @@ subpackages="" source="https://github.com/fcambus/spleen/releases/download/$pkgver/spleen-$pkgver.tar.gz" package() { - local _font - for _font in *.pcf; do + for _font in "$builddir"/*.pcf; do gzip -9 $_font install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz done } -sha512sums="9da587274ba7c26ad4c77fd2e37a3872506b882830c564734e8e3e9d3d720b393d1ad419d04912cbead516335817c923318a97257fb59bffb4d574e3fe20b79a spleen-1.0.5.tar.gz" +sha512sums="0d03ea534f872c3509c1ab7f2947e4a6e2edf4436daa65db23f83622599c820c59c373f1fd97edebfaa728606109736de09a173443054f84259f7c09175d81df spleen-1.5.0.tar.gz" diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD index bc7a3e2df..85003c4b9 100644 --- a/user/sprunge/APKBUILD +++ b/user/sprunge/APKBUILD @@ -11,10 +11,8 @@ depends="curl" makedepends="" subpackages="tpaste dpaste ix" source="" -builddir="$srcdir" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/bin printf "#!/bin/sh\n\nexec curl -F 'sprunge=<-' http://sprunge.us" > \ "$pkgdir"/usr/bin/sprunge @@ -22,7 +20,6 @@ package() { } tpaste() { - cd "$builddir" url="http://tpaste.us" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin @@ -32,7 +29,6 @@ tpaste() { } dpaste() { - cd "$builddir" url="http://dpaste.com" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin @@ -42,7 +38,6 @@ dpaste() { } ix() { - cd "$builddir" url="http://ix.io" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD index 0bf08fdb1..c6fe305e9 100644 --- a/user/sshfs/APKBUILD +++ b/user/sshfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=sshfs -pkgver=3.5.2 +pkgver=3.6.0 pkgrel=0 pkgdesc="FUSE client based on the SSH File Transfer Protocol" url="https://github.com/libfuse/sshfs" @@ -9,8 +9,8 @@ arch="all" options="!check" # Requires fuse kernel module to be loaded and local ssh server license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1-only" depends="openssh-client" -makedepends="fuse3-dev glib-dev meson coreutils py3-docutils" #checkdepends="py3-pytest cmd:which" +makedepends="fuse3-dev glib-dev meson coreutils py3-docutils" subpackages="$pkgname-doc" source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz" @@ -40,4 +40,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272 sshfs-3.5.2.tar.xz" +sha512sums="fe34d7bbb76bea6aedf96b4ce7500ad6d81230cca9a43b831302159e5926797a243b7d1675d23ba101057ef247f64ad7df18a73d20578e84b9524218d9ff97bd sshfs-3.6.0.tar.xz" diff --git a/user/startup-notification/APKBUILD b/user/startup-notification/APKBUILD index a52e6b549..6cc59febc 100644 --- a/user/startup-notification/APKBUILD +++ b/user/startup-notification/APKBUILD @@ -13,12 +13,11 @@ makedepends="libsm-dev libx11-dev xcb-util-dev" source="https://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" + default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 23abb6735..08fb2ce0e 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev knewstuff-dev kplotting-dev gsl-dev libqalculate-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/step-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/step-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8f2a90ef74bad6a3b73470f0342269da2dc6d53f2ce05a14e13762c02e2ff28f621d821f31fdba9733cb0a7cbe0b3ad099e3c36cdfe2198dd50106eaea63b8a6 step-19.08.2.tar.xz" +sha512sums="af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1 step-19.12.3.tar.xz" diff --git a/user/stow/APKBUILD b/user/stow/APKBUILD index 0fa11db7f..4f203e91f 100644 --- a/user/stow/APKBUILD +++ b/user/stow/APKBUILD @@ -8,8 +8,8 @@ url="https://www.gnu.org/software/stow/" arch="noarch" license="GPL-3.0+" depends="perl" -makedepends="perl-test-output" checkdepends="perl-io-stringy" +makedepends="perl-test-output" subpackages="$pkgname-doc" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch b/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch deleted file mode 100644 index cc14dab02..000000000 --- a/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 5a5b26a7dce4c112f62882cfe16dc37659d766e8 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Fri, 17 Jul 2015 11:53:58 +0200 -Subject: [PATCH 1/5] ike: Adhere to IKE_SA limit when checking out by config - -This prevents new SAs from getting created if we hit the global IKE_SA -limit (we still allow checkout_new(), which is used for rekeying). ---- - src/libcharon/sa/ike_sa_manager.c | 71 ++++++++++++++++++++------------------- - 1 file changed, 37 insertions(+), 34 deletions(-) - -diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c -index ce44207..37d49da 100644 ---- a/src/libcharon/sa/ike_sa_manager.c -+++ b/src/libcharon/sa/ike_sa_manager.c -@@ -1419,48 +1419,51 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, - - DBG2(DBG_MGR, "checkout IKE_SA by config"); - -- if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1) -- { /* IKE_SA reuse disabled by config (not possible for IKEv1) */ -- ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE); -- charon->bus->set_sa(charon->bus, ike_sa); -- goto out; -- } -- -- enumerator = create_table_enumerator(this); -- while (enumerator->enumerate(enumerator, &entry, &segment)) -+ if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1) - { -- if (!wait_for_entry(this, entry, segment)) -+ enumerator = create_table_enumerator(this); -+ while (enumerator->enumerate(enumerator, &entry, &segment)) - { -- continue; -- } -- if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || -- entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) -- { /* skip IKE_SAs which are not usable, wake other waiting threads */ -- entry->condvar->signal(entry->condvar); -- continue; -- } -- -- current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa); -- if (current_peer && current_peer->equals(current_peer, peer_cfg)) -- { -- current_ike = current_peer->get_ike_cfg(current_peer); -- if (current_ike->equals(current_ike, peer_cfg->get_ike_cfg(peer_cfg))) -+ if (!wait_for_entry(this, entry, segment)) - { -- entry->checked_out = thread_current(); -- ike_sa = entry->ike_sa; -- DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config", -- ike_sa->get_unique_id(ike_sa), -- current_peer->get_name(current_peer)); -- break; -+ continue; - } -+ if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || -+ entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) -+ { /* skip IKE_SAs which are not usable, wake other waiting threads */ -+ entry->condvar->signal(entry->condvar); -+ continue; -+ } -+ current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa); -+ if (current_peer && current_peer->equals(current_peer, peer_cfg)) -+ { -+ current_ike = current_peer->get_ike_cfg(current_peer); -+ if (current_ike->equals(current_ike, -+ peer_cfg->get_ike_cfg(peer_cfg))) -+ { -+ entry->checked_out = thread_current(); -+ ike_sa = entry->ike_sa; -+ DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config", -+ ike_sa->get_unique_id(ike_sa), -+ current_peer->get_name(current_peer)); -+ break; -+ } -+ } -+ /* other threads might be waiting for this entry */ -+ entry->condvar->signal(entry->condvar); - } -- /* other threads might be waiting for this entry */ -- entry->condvar->signal(entry->condvar); -+ enumerator->destroy(enumerator); - } -- enumerator->destroy(enumerator); - - if (!ike_sa) -- { /* no IKE_SA using such a config, hand out a new */ -+ { /* no IKE_SA using such a config, or reuse disabled, hand out a new */ -+ if (this->ikesa_limit && -+ this->public.get_count(&this->public) >= this->ikesa_limit) -+ { -+ DBG1(DBG_MGR, "IKE_SA creation failed, hitting IKE_SA limit (%u)", -+ this->ikesa_limit); -+ return NULL; -+ } - ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE); - } - charon->bus->set_sa(charon->bus, ike_sa); --- -2.5.0 - diff --git a/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch deleted file mode 100644 index d9aea3c4d..000000000 --- a/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch +++ /dev/null @@ -1,597 +0,0 @@ -From 460e0f52d88433071b27603e47995517514ef8b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 21 Sep 2015 13:41:58 +0300 -Subject: [PATCH] charon: add optional source and remote overrides for initiate -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This introduces support for specifying optional IKE SA specific -source and remote address for child sa initiation. This allows -to initiate wildcard connection for known address via vici. - -In addition this allows impler implementation of trap-any patches -and is a prerequisite for dmvpn support. - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - src/charon-cmd/cmd/cmd_connection.c | 2 +- - src/charon-nm/nm/nm_service.c | 2 +- - src/libcharon/control/controller.c | 43 +++++++++++++++- - src/libcharon/control/controller.h | 3 ++ - src/libcharon/plugins/stroke/stroke_control.c | 5 +- - src/libcharon/plugins/vici/vici_config.c | 2 +- - src/libcharon/plugins/vici/vici_control.c | 63 ++++++++++++++++++++---- - src/libcharon/processing/jobs/start_action_job.c | 2 +- - src/libcharon/sa/ike_sa_manager.c | 51 ++++++++++++++++++- - src/libcharon/sa/ike_sa_manager.h | 8 ++- - src/libcharon/sa/trap_manager.c | 45 +++++++---------- - src/swanctl/commands/initiate.c | 40 ++++++++++++++- - 12 files changed, 218 insertions(+), 48 deletions(-) - -diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c -index 71df92f7e..13b31de8a 100644 ---- a/src/charon-cmd/cmd/cmd_connection.c -+++ b/src/charon-cmd/cmd/cmd_connection.c -@@ -436,7 +436,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this) - child_cfg = create_child_cfg(this, peer_cfg); - - if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg, -- controller_cb_empty, NULL, 0, FALSE) != SUCCESS) -+ NULL, NULL, controller_cb_empty, NULL, 0, FALSE) != SUCCESS) - { - terminate(pid); - } -diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c -index 571c0edba..e7922cf4d 100644 ---- a/src/charon-nm/nm/nm_service.c -+++ b/src/charon-nm/nm/nm_service.c -@@ 6220,7 +622,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, - * Prepare IKE_SA - */ - ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, -- peer_cfg); -+ peer_cfg, NULL, NULL); - if (!ike_sa) - { - peer_cfg->destroy(peer_cfg); -diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c -index 8e7816b39..7d7b3bcbc 100644 ---- a/src/libcharon/control/controller.c -+++ b/src/libcharon/control/controller.c -@@ -15,6 +15,28 @@ - * for more details. - */ - -+/* -+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+ * THE SOFTWARE. -+ */ -+ - #include "controller.h" - - #include <sys/types.h> -@@ -103,6 +125,16 @@ struct interface_listener_t { - ike_sa_t *ike_sa; - - /** -+ * Our host hint. -+ */ -+ host_t *my_host; -+ -+ /** -+ * Other host hint. -+ */ -+ host_t *other_host; -+ -+ /** - * unique ID, used for various methods - */ - uint32_t id; -@@ -409,9 +441,14 @@ METHOD(job_t, initiate_execute, job_requeue_t, - ike_sa_t *ike_sa; - interface_listener_t *listener = &job->listener; - peer_cfg_t *peer_cfg = listener->peer_cfg; -+ host_t *my_host = listener->my_host; -+ host_t *other_host = listener->other_host; - - ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, -- peer_cfg); -+ peer_cfg, my_host, other_host); -+ DESTROY_IF(my_host); -+ DESTROY_IF(other_host); -+ - if (!ike_sa) - { - listener->child_cfg->destroy(listener->child_cfg); -@@ -420,6 +457,7 @@ METHOD(job_t, initiate_execute, job_requeue_t, - listener_done(listener); - return JOB_REQUEUE_NONE; - } -+ - listener->lock->lock(listener->lock); - listener->ike_sa = ike_sa; - listener->lock->unlock(listener->lock); -@@ -492,6 +530,7 @@ METHOD(job_t, initiate_execute, job_requeue_t, - - METHOD(controller_t, initiate, status_t, - private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg, -+ host_t *my_host, host_t *other_host, - controller_cb_t callback, void *param, u_int timeout, bool limits) - { - interface_job_t *job; -@@ -514,6 +553,8 @@ METHOD(controller_t, initiate, status_t, - .status = FAILED, - .child_cfg = child_cfg, - .peer_cfg = peer_cfg, -+ .my_host = my_host ? my_host->clone(my_host) : NULL, -+ .other_host = other_host ? other_host->clone(other_host) : NULL, - .lock = spinlock_create(), - .limits = limits, - }, -diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h -index 9524f53b9..7c51ba4ca 100644 ---- a/src/libcharon/control/controller.h -+++ b/src/libcharon/control/controller.h -@@ -79,6 +79,8 @@ struct controller_t { - * - * @param peer_cfg peer_cfg to use for IKE_SA setup - * @param child_cfg child_cfg to set up CHILD_SA from -+ * @param my_host optional address hint for source -+ * @param other_host optional address hint for destination - * @param cb logging callback - * @param param parameter to include in each call of cb - * @param timeout timeout in ms to wait for callbacks, 0 to disable -@@ -92,6 +94,7 @@ struct controller_t { - */ - status_t (*initiate)(controller_t *this, - peer_cfg_t *peer_cfg, child_cfg_t *child_cfg, -+ host_t *my_host, host_t *other_host, - controller_cb_t callback, void *param, u_int timeout, - bool limits); - -diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c -index ee8306772..0736a6427 100644 ---- a/src/libcharon/plugins/stroke/stroke_control.c -+++ b/src/libcharon/plugins/stroke/stroke_control.c -@@ -108,7 +108,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg - if (msg->output_verbosity < 0) - { - charon->controller->initiate(charon->controller, peer_cfg, child_cfg, -- NULL, NULL, 0, FALSE); -+ NULL, NULL, NULL, NULL, 0, FALSE); - } - else - { -@@ -116,7 +116,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg - status_t status; - - status = charon->controller->initiate(charon->controller, -- peer_cfg, child_cfg, (controller_cb_t)stroke_log, -+ peer_cfg, child_cfg, NULL, NULL, -+ (controller_cb_t)stroke_log, - &info, this->timeout, FALSE); - switch (status) - { -diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c -index 12497ec5e..ba954e5cb 100644 ---- a/src/libcharon/plugins/vici/vici_config.c -+++ b/src/libcharon/plugins/vici/vici_config.c -@@ -1978,7 +1978,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg, - DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg)); - charon->controller->initiate(charon->controller, - peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg), -- NULL, NULL, 0, FALSE); -+ NULL, NULL, NULL, NULL, 0, FALSE); - break; - case ACTION_ROUTE: - DBG1(DBG_CFG, "installing '%s'", child_cfg->get_name(child_cfg)); -diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c -index afee649f7..94bb2eecb 100644 ---- a/src/libcharon/plugins/vici/vici_control.c -+++ b/src/libcharon/plugins/vici/vici_control.c -@@ -16,6 +16,28 @@ - * for more details. - */ - -+/* -+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+ * THE SOFTWARE. -+ */ -+ - #include "vici_control.h" - #include "vici_builder.h" - -@@ -169,9 +191,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out) - CALLBACK(initiate, vici_message_t*, - private_vici_control_t *this, char *name, u_int id, vici_message_t *request) - { -+ vici_message_t* msg; - child_cfg_t *child_cfg = NULL; - peer_cfg_t *peer_cfg; -- char *child, *ike; -+ host_t *my_host = NULL, *other_host = NULL; -+ char *child, *ike, *my_host_str, *other_host_str; - int timeout; - bool limits; - controller_cb_t log_cb = NULL; -@@ -185,6 +209,8 @@ CALLBACK(initiate, vici_message_t*, - timeout = request->get_int(request, 0, "timeout"); - limits = request->get_bool(request, FALSE, "init-limits"); - log.level = request->get_int(request, 1, "loglevel"); -+ my_host_str = request->get_str(request, NULL, "my-host"); -+ other_host_str = request->get_str(request, NULL, "other-host"); - - if (!child) - { -@@ -195,28 +221,47 @@ CALLBACK(initiate, vici_message_t*, - log_cb = (controller_cb_t)log_vici; - } - -- DBG1(DBG_CFG, "vici initiate '%s'", child); -+ if (my_host_str) -+ { -+ my_host = host_create_from_string(my_host_str, 0); -+ } -+ if (other_host_str) -+ { -+ other_host = host_create_from_string(other_host_str, 0); -+ } -+ -+ DBG1(DBG_CFG, "vici initiate '%s', me %H, other %H, limits %d", child, my_host, other_host, limits); - - child_cfg = find_child_cfg(child, ike, &peer_cfg); - if (!child_cfg) - { -- return send_reply(this, "CHILD_SA config '%s' not found", child); -+ msg = send_reply(this, "CHILD_SA config '%s' not found", child); -+ goto ret; - } -- switch (charon->controller->initiate(charon->controller, peer_cfg, -- child_cfg, log_cb, &log, timeout, limits)) -+ switch (charon->controller->initiate(charon->controller, -+ peer_cfg, child_cfg, my_host, other_host, -+ log_cb, &log, timeout, limits)) - { - case SUCCESS: -- return send_reply(this, NULL); -+ msg = send_reply(this, NULL); -+ break; - case OUT_OF_RES: -- return send_reply(this, "CHILD_SA '%s' not established after %dms", -+ msg = send_reply(this, "CHILD_SA '%s' not established after %dms", - child, timeout); -+ break; - case INVALID_STATE: -- return send_reply(this, "establishing CHILD_SA '%s' not possible " -+ msg = send_reply(this, "establishing CHILD_SA '%s' not possible " - "at the moment due to limits", child); -+ break; - case FAILED: - default: -- return send_reply(this, "establishing CHILD_SA '%s' failed", child); -+ msg = send_reply(this, "establishing CHILD_SA '%s' failed", child); -+ break; - } -+ret: -+ if (my_host) my_host->destroy(my_host); -+ if (other_host) other_host->destroy(other_host); -+ return msg; - } - - CALLBACK(terminate, vici_message_t*, -diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c -index 654ec6abe..3d5a48cb8 100644 ---- a/src/libcharon/processing/jobs/start_action_job.c -+++ b/src/libcharon/processing/jobs/start_action_job.c -@@ -61,7 +61,7 @@ METHOD(job_t, execute, job_requeue_t, - charon->controller->initiate(charon->controller, - peer_cfg->get_ref(peer_cfg), - child_cfg->get_ref(child_cfg), -- NULL, NULL, 0, FALSE); -+ NULL, NULL, NULL, NULL, 0, FALSE); - break; - case ACTION_ROUTE: - DBG1(DBG_JOB, "start action: route '%s'", name); -diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c -index 3ee233c1f..def2a6f1b 100644 ---- a/src/libcharon/sa/ike_sa_manager.c -+++ b/src/libcharon/sa/ike_sa_manager.c -@@ -17,6 +17,28 @@ - * for more details. - */ - -+/* -+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+ * THE SOFTWARE. -+ */ -+ - #include <string.h> - #include <inttypes.h> - -@@ -1408,7 +1430,8 @@ out: - } - - METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, -- private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg) -+ private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg, -+ host_t *my_host, host_t *other_host) - { - enumerator_t *enumerator; - entry_t *entry; -@@ -1417,7 +1440,17 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, - ike_cfg_t *current_ike; - u_int segment; - -- DBG2(DBG_MGR, "checkout IKE_SA by config"); -+ if (my_host && my_host->get_port(my_host) == 0) -+ { -+ my_host->set_port(my_host, IKEV2_UDP_PORT); -+ } -+ if (other_host && other_host->get_port(other_host) == 0) -+ { -+ other_host->set_port(other_host, IKEV2_UDP_PORT); -+ } -+ -+ DBG2(DBG_MGR, "checkout IKE_SA by config '%s', me %H, other %H", -+ peer_cfg->get_name(peer_cfg), my_host, other_host); - - if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1) - { -@@ -1434,6 +1457,16 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, - entry->condvar->signal(entry->condvar); - continue; - } -+ -+ if (my_host && !my_host->ip_equals(my_host, entry->ike_sa->get_my_host(entry->ike_sa))) -+ { -+ continue; -+ } -+ if (other_host && !other_host->ip_equals(other_host, entry->ike_sa->get_other_host(entry->ike_sa))) -+ { -+ continue; -+ } -+ - current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa); - if (current_peer && current_peer->equals(current_peer, peer_cfg)) - { -@@ -1465,6 +1508,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, - return NULL; - } - ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE); -+ if (my_host || other_host) -+ { -+ ike_sa->update_hosts(ike_sa, my_host, other_host, TRUE); -+ } - } - charon->bus->set_sa(charon->bus, ike_sa); - -diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h -index 4298c54e2..47d6e6a37 100644 ---- a/src/libcharon/sa/ike_sa_manager.h -+++ b/src/libcharon/sa/ike_sa_manager.h -@@ -93,7 +93,8 @@ struct ike_sa_manager_t { - ike_sa_t* (*checkout_by_message) (ike_sa_manager_t* this, message_t *message); - - /** -- * Checkout an IKE_SA for initiation by a peer_config. -+ * Checkout an IKE_SA for initiation by a peer_config and optional -+ * source and remote host addresses. - * - * To initiate, a CHILD_SA may be established within an existing IKE_SA. - * This call checks for an existing IKE_SA by comparing the configuration. -@@ -103,10 +104,13 @@ struct ike_sa_manager_t { - * the found IKE_SA is in the DELETING state. - * - * @param peer_cfg configuration used to find an existing IKE_SA -+ * @param my_host source host address for wildcard peer_cfg -+ * @param other_host remote host address for wildcard peer_cfg - * @return checked out/created IKE_SA - */ - ike_sa_t* (*checkout_by_config) (ike_sa_manager_t* this, -- peer_cfg_t *peer_cfg); -+ peer_cfg_t *peer_cfg, -+ host_t *my_host, host_t *other_host); - - /** - * Check for duplicates of the given IKE_SA. -diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c -index 40a0682f2..ea79d95ae 100644 ---- a/src/libcharon/sa/trap_manager.c -+++ b/src/libcharon/sa/trap_manager.c -@@ -421,7 +421,7 @@ METHOD(trap_manager_t, acquire, void, - peer_cfg_t *peer; - child_cfg_t *child; - ike_sa_t *ike_sa; -- host_t *host; -+ host_t *host, *my_host = NULL, *other_host = NULL; - bool wildcard, ignore = FALSE; - - this->lock->read_lock(this->lock); -@@ -497,36 +497,27 @@ METHOD(trap_manager_t, acquire, void, - this->lock->unlock(this->lock); - - if (wildcard) -- { /* the peer config would match IKE_SAs with other peers */ -- ike_sa = charon->ike_sa_manager->checkout_new(charon->ike_sa_manager, -- peer->get_ike_version(peer), TRUE); -- if (ike_sa) -- { -- ike_cfg_t *ike_cfg; -- uint16_t port; -- uint8_t mask; -- -- ike_sa->set_peer_cfg(ike_sa, peer); -- ike_cfg = ike_sa->get_ike_cfg(ike_sa); -+ { -+ ike_cfg_t *ike_cfg; -+ uint16_t port; -+ uint8_t mask; - -- port = ike_cfg->get_other_port(ike_cfg); -- dst->to_subnet(dst, &host, &mask); -- host->set_port(host, port); -- ike_sa->set_other_host(ike_sa, host); -+ ike_cfg = peer->get_ike_cfg(peer); - -- port = ike_cfg->get_my_port(ike_cfg); -- src->to_subnet(src, &host, &mask); -- host->set_port(host, port); -- ike_sa->set_my_host(ike_sa, host); -+ port = ike_cfg->get_other_port(ike_cfg); -+ dst->to_subnet(dst, &other_host, &mask); -+ other_host->set_port(other_host, port); - -- charon->bus->set_sa(charon->bus, ike_sa); -- } -- } -- else -- { -- ike_sa = charon->ike_sa_manager->checkout_by_config( -- charon->ike_sa_manager, peer); -+ port = ike_cfg->get_my_port(ike_cfg); -+ src->to_subnet(src, &my_host, &mask); -+ my_host->set_port(my_host, port); - } -+ ike_sa = charon->ike_sa_manager->checkout_by_config( -+ charon->ike_sa_manager, peer, -+ my_host, other_host); -+ DESTROY_IF(my_host); -+ DESTROY_IF(other_host); -+ - if (ike_sa) - { - if (ike_sa->get_peer_cfg(ike_sa) == NULL) -diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c -index 8e452a6f6..b27bb8194 100644 ---- a/src/swanctl/commands/initiate.c -+++ b/src/swanctl/commands/initiate.c -@@ -13,6 +13,28 @@ - * for more details. - */ - -+/* -+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+ * THE SOFTWARE. -+ */ -+ - #include "command.h" - - #include <errno.h> -@@ -37,7 +59,7 @@ static int initiate(vici_conn_t *conn) - vici_req_t *req; - vici_res_t *res; - command_format_options_t format = COMMAND_FORMAT_NONE; -- char *arg, *child = NULL, *ike = NULL; -+ char *arg, *child = NULL, *ike = NULL, *my_host = NULL, *other_host = NULL; - int ret = 0, timeout = 0, level = 1; - - while (TRUE) -@@ -64,6 +86,12 @@ static int initiate(vici_conn_t *conn) - case 'l': - level = atoi(arg); - continue; -+ case 'S': -+ my_host = arg; -+ continue; -+ case 'R': -+ other_host = arg; -+ continue; - case EOF: - break; - default: -@@ -87,6 +115,14 @@ static int initiate(vici_conn_t *conn) - { - vici_add_key_valuef(req, "ike", "%s", ike); - } -+ if (my_host) -+ { -+ vici_add_key_valuef(req, "my-host", "%s", my_host); -+ } -+ if (other_host) -+ { -+ vici_add_key_valuef(req, "other-host", "%s", other_host); -+ } - if (timeout) - { - vici_add_key_valuef(req, "timeout", "%d", timeout * 1000); -@@ -133,6 +169,8 @@ static void __attribute__ ((constructor))reg() - {"help", 'h', 0, "show usage information"}, - {"child", 'c', 1, "initate a CHILD_SA configuration"}, - {"ike", 'i', 1, "name of the connection to which the child belongs"}, -+ {"source", 'S', 1, "override source address"}, -+ {"remote", 'R', 1, "override remote address"}, - {"timeout", 't', 1, "timeout in seconds before detaching"}, - {"raw", 'r', 0, "dump raw response message"}, - {"pretty", 'P', 0, "dump raw response message in pretty print"}, --- -2.12.1 - diff --git a/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch b/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch deleted file mode 100644 index 94814e13d..000000000 --- a/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 61556ac61b9d7c564dfe13d5cf549a53f889ae36 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 21 Sep 2015 13:42:05 +0300 -Subject: [PATCH] vici: send certificates for ike-sa events -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - src/libcharon/plugins/vici/vici_query.c | 48 ++++++++++++++++++++++++++++----- - 1 file changed, 41 insertions(+), 7 deletions(-) - -diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c -index c0f4e2de9..309a11c03 100644 ---- a/src/libcharon/plugins/vici/vici_query.c -+++ b/src/libcharon/plugins/vici/vici_query.c -@@ -337,7 +337,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b, - * List details of an IKE_SA - */ - static void list_ike(private_vici_query_t *this, vici_builder_t *b, -- ike_sa_t *ike_sa, time_t now) -+ ike_sa_t *ike_sa, time_t now, bool add_certs) - { - time_t t; - ike_sa_id_t *id; -@@ -345,6 +345,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b, - proposal_t *proposal; - uint16_t alg, ks; - host_t *host; -+ auth_cfg_t *auth_cfg; -+ enumerator_t *enumerator; - - b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa)); - b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa)); -@@ -354,11 +356,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b, - b->add_kv(b, "local-host", "%H", host); - b->add_kv(b, "local-port", "%d", host->get_port(host)); - b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa)); -+ if (add_certs) -+ { -+ enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, TRUE); -+ if (enumerator->enumerate(enumerator, &auth_cfg)) -+ { -+ certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT); -+ chunk_t encoding; -+ -+ if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding)) -+ { -+ b->add(b, VICI_KEY_VALUE, "local-cert-data", encoding); -+ free(encoding.ptr); -+ } -+ } -+ enumerator->destroy(enumerator); -+ } - - host = ike_sa->get_other_host(ike_sa); - b->add_kv(b, "remote-host", "%H", host); - b->add_kv(b, "remote-port", "%d", host->get_port(host)); - b->add_kv(b, "remote-id", "%Y", ike_sa->get_other_id(ike_sa)); -+ if (add_certs) -+ { -+ enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, FALSE); -+ if (enumerator->enumerate(enumerator, &auth_cfg)) -+ { -+ certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT); -+ chunk_t encoding; -+ -+ if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding)) -+ { -+ b->add(b, VICI_KEY_VALUE, "remote-cert-data", encoding); -+ free(encoding.ptr); -+ } -+ } -+ enumerator->destroy(enumerator); -+ } - - eap = ike_sa->get_other_eap_id(ike_sa); - -@@ -476,7 +510,7 @@ CALLBACK(list_sas, vici_message_t*, - b = vici_builder_create(); - b->begin_section(b, ike_sa->get_name(ike_sa)); - -- list_ike(this, b, ike_sa, now); -+ list_ike(this, b, ike_sa, now, TRUE); - - b->begin_section(b, "child-sas"); - csas = ike_sa->create_child_sa_enumerator(ike_sa); -@@ -1624,7 +1658,7 @@ METHOD(listener_t, ike_updown, bool, - } - - b->begin_section(b, ike_sa->get_name(ike_sa)); -- list_ike(this, b, ike_sa, now); -+ list_ike(this, b, ike_sa, now, up); - b->end_section(b); - - this->dispatcher->raise_event(this->dispatcher, -@@ -1649,10 +1683,10 @@ METHOD(listener_t, ike_rekey, bool, - b = vici_builder_create(); - b->begin_section(b, old->get_name(old)); - b->begin_section(b, "old"); -- list_ike(this, b, old, now); -+ list_ike(this, b, old, now, TRUE); - b->end_section(b); - b->begin_section(b, "new"); -- list_ike(this, b, new, now); -+ list_ike(this, b, new, now, TRUE); - b->end_section(b); - b->end_section(b); - -@@ -1682,7 +1716,7 @@ METHOD(listener_t, child_updown, bool, - } - - b->begin_section(b, ike_sa->get_name(ike_sa)); -- list_ike(this, b, ike_sa, now); -+ list_ike(this, b, ike_sa, now, up); - b->begin_section(b, "child-sas"); - - b->begin_section(b, child_sa->get_name(child_sa)); -@@ -1714,7 +1748,7 @@ METHOD(listener_t, child_rekey, bool, - b = vici_builder_create(); - - b->begin_section(b, ike_sa->get_name(ike_sa)); -- list_ike(this, b, ike_sa, now); -+ list_ike(this, b, ike_sa, now, TRUE); - b->begin_section(b, "child-sas"); - - b->begin_section(b, old->get_name(old)); --- -2.12.1 - diff --git a/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch b/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch deleted file mode 100644 index 06dc121e8..000000000 --- a/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 0e4f1118e68736bb96ae23f4c6cb85f2ebbc998d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 21 Sep 2015 13:42:11 +0300 -Subject: [PATCH] vici: add support for individual sa state changes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Useful for monitoring and tracking full SA. - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - src/libcharon/plugins/vici/vici_query.c | 105 ++++++++++++++++++++++++++++++++ - 1 file changed, 105 insertions(+) - -diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c -index 309a11c03..83a5daaa7 100644 ---- a/src/libcharon/plugins/vici/vici_query.c -+++ b/src/libcharon/plugins/vici/vici_query.c -@@ -1624,8 +1624,16 @@ static void manage_commands(private_vici_query_t *this, bool reg) - this->dispatcher->manage_event(this->dispatcher, "list-cert", reg); - this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg); - this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg); -+ this->dispatcher->manage_event(this->dispatcher, "ike-state-established", reg); -+ this->dispatcher->manage_event(this->dispatcher, "ike-state-destroying", reg); - this->dispatcher->manage_event(this->dispatcher, "child-updown", reg); - this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-installing", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-installed", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-updating", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-rekeying", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-rekeyed", reg); -+ this->dispatcher->manage_event(this->dispatcher, "child-state-destroying", reg); - manage_command(this, "list-sas", list_sas, reg); - manage_command(this, "list-policies", list_policies, reg); - manage_command(this, "list-conns", list_conns, reg); -@@ -1696,6 +1704,45 @@ METHOD(listener_t, ike_rekey, bool, - return TRUE; - } - -+METHOD(listener_t, ike_state_change, bool, -+ private_vici_query_t *this, ike_sa_t *ike_sa, ike_sa_state_t state) -+{ -+ char *event; -+ vici_builder_t *b; -+ time_t now; -+ -+ switch (state) -+ { -+ case IKE_ESTABLISHED: -+ event = "ike-state-established"; -+ break; -+ case IKE_DESTROYING: -+ event = "ike-state-destroying"; -+ break; -+ default: -+ return TRUE; -+ } -+ -+ if (!this->dispatcher->has_event_listeners(this->dispatcher, event)) -+ { -+ return TRUE; -+ } -+ -+ now = time_monotonic(NULL); -+ -+ b = vici_builder_create(); -+ b->begin_section(b, ike_sa->get_name(ike_sa)); -+ list_ike(this, b, ike_sa, now, state != IKE_DESTROYING); -+ b->begin_section(b, "child-sas"); -+ b->end_section(b); -+ b->end_section(b); -+ -+ this->dispatcher->raise_event(this->dispatcher, -+ event, 0, b->finalize(b)); -+ -+ return TRUE; -+} -+ - METHOD(listener_t, child_updown, bool, - private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up) - { -@@ -1771,6 +1818,62 @@ METHOD(listener_t, child_rekey, bool, - return TRUE; - } - -+METHOD(listener_t, child_state_change, bool, -+ private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, child_sa_state_t state) -+{ -+ char *event; -+ vici_builder_t *b; -+ time_t now; -+ -+ switch (state) -+ { -+ case CHILD_INSTALLING: -+ event = "child-state-installing"; -+ break; -+ case CHILD_INSTALLED: -+ event = "child-state-installed"; -+ break; -+ case CHILD_UPDATING: -+ event = "child-state-updating"; -+ break; -+ case CHILD_REKEYING: -+ event = "child-state-rekeying"; -+ break; -+ case CHILD_REKEYED: -+ event = "child-state-rekeyed"; -+ break; -+ case CHILD_DESTROYING: -+ event = "child-state-destroying"; -+ break; -+ default: -+ return TRUE; -+ } -+ -+ if (!this->dispatcher->has_event_listeners(this->dispatcher, event)) -+ { -+ return TRUE; -+ } -+ -+ now = time_monotonic(NULL); -+ -+ b = vici_builder_create(); -+ b->begin_section(b, ike_sa->get_name(ike_sa)); -+ list_ike(this, b, ike_sa, now, state != CHILD_DESTROYING); -+ b->begin_section(b, "child-sas"); -+ -+ b->begin_section(b, child_sa->get_name(child_sa)); -+ list_child(this, b, child_sa, now); -+ b->end_section(b); -+ -+ b->end_section(b); -+ b->end_section(b); -+ -+ this->dispatcher->raise_event(this->dispatcher, -+ event, 0, b->finalize(b)); -+ -+ return TRUE; -+} -+ - METHOD(vici_query_t, destroy, void, - private_vici_query_t *this) - { -@@ -1790,8 +1893,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher) - .listener = { - .ike_updown = _ike_updown, - .ike_rekey = _ike_rekey, -+ .ike_state_change = _ike_state_change, - .child_updown = _child_updown, - .child_rekey = _child_rekey, -+ .child_state_change = _child_state_change, - }, - .destroy = _destroy, - }, --- -2.12.1 - diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index 6c895911a..d933c0639 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=strongswan -pkgver=5.7.1 -pkgrel=2 +pkgver=5.8.2 +pkgrel=0 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="https://www.strongswan.org/" arch="all" @@ -14,13 +14,9 @@ depends="iproute2" depends_dev="" makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev" -install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc" +install="$pkgname.pre-install" source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2 - 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch - 1001-charon-add-optional-source-and-remote-overrides-for-.patch - 1002-vici-send-certificates-for-ike-sa-events.patch - 1003-vici-add-support-for-individual-sa-state-changes.patch strongswan.initd charon.initd @@ -31,8 +27,6 @@ source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2 # - CVE-2018-17540 build() { - cd "$builddir" - # notes about configuration: # - try to keep options in ./configure --help order # - apk depends on openssl, so we use that @@ -86,21 +80,15 @@ build() { } check() { - cd "$builddir" - env TESTS_SUITES_EXCLUDE=printf make check + make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon" } -sha512sums="43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f698f5f5544b9ca563554a344638c953525b0e2d39bc6b71b19055c80e07fc strongswan-5.7.1.tar.bz2 -193d845e2751c23d98cdf84134c7803f2e412197669c6d6c1c9974041608d154b85594ed3d9ffb923ca22a4d5926c7f2373787ddc7da47b52019e284a1d13211 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch -21db8f153f535ef13cc7c9c011f9b90b8c794e0072bd93fda6a0a56dc00d32d04e186b1a72a87a85613b7e511eed5cb96623abf0721c67dd5c96446db969a185 1001-charon-add-optional-source-and-remote-overrides-for-.patch -f7d98fb99b4855e8bfbb7369292c170536b1987e717feeda71f64ab71b35538e7d462609a773c6a6ed08c8e6ee7a186df12e1ea7d64b9dac0b17d4c7af17dab3 1002-vici-send-certificates-for-ike-sa-events.patch -a4235cd07e17ad3441dc391ded11ee9f4debdffa1e8218809731e73a545ca6fcdc0bb87239d41b1102b0b6719a4d31d43758972d2193ebe298b275285de2ce54 1003-vici-add-support-for-individual-sa-state-changes.patch +sha512sums="423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d strongswan-5.8.2.tar.bz2 8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9 strongswan.initd 7182bed917585bce9749b4495ad64d3052d2999dbb505c34d568acd6df7b151232ec10c8efe12f0a07d0555ddfe01aad4e3b767b08f17a55ffcbedc57dc9d934 charon.initd" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index f05892f09..4e8c89514 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.12.2 +pkgver=1.13.0 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" @@ -14,7 +14,7 @@ depends_dev="apr-dev apr-util-dev linux-headers" makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3 - perl-dev swig" + perl-dev swig libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet $pkgname-pl $pkgname-lang" source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 @@ -89,5 +89,5 @@ pl() { mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/ } -sha512sums="b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 +sha512sums="36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 subversion-1.13.0.tar.bz2 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/swig/APKBUILD b/user/swig/APKBUILD index d0be1a058..91e1c5aa3 100644 --- a/user/swig/APKBUILD +++ b/user/swig/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: pkgname=swig -pkgver=3.0.12 -pkgrel=3 +pkgver=4.0.1 +pkgrel=0 pkgdesc="Tool for integrating C and C++ code with other languages" url="http://www.swig.org/" arch="all" -license="GPL-3.0 BSD" -depends="guile" -makedepends="zlib-dev pcre-dev" -checkdepends="boost-dev perl-dev python3-dev diffutils" +license="GPL-3.0+ AND MIT" +depends="" +checkdepends="boost-dev diffutils" +makedepends="pcre-dev perl-dev python3-dev zlib-dev" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,15 +23,13 @@ build() { } check() { - cd "$builddir" env PERL5LIB=. PY3=YES make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES } -sha512sums="5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb swig-3.0.12.tar.gz" +sha512sums="595ef01cb83adfa960ceed9c325a9429192549e8d1e9aa3ab35a4301512a61d82e2e89a8c7939c2a5a0811254ea1832a443bd387e11459eb2b0bafc563ad1308 swig-4.0.1.tar.gz" diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD index db3e5574f..ca43371fa 100644 --- a/user/sword/APKBUILD +++ b/user/sword/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz" build() { - cd "$builddir" CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install_config } diff --git a/user/symboleditor/APKBUILD b/user/symboleditor/APKBUILD index 4491afae5..bba7e7115 100644 --- a/user/symboleditor/APKBUILD +++ b/user/symboleditor/APKBUILD @@ -24,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index a50500eb3..5716c32c0 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -9,14 +9,13 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" +checkdepends="qt5-qtxmlpatterns-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev perl doxygen graphviz" -checkdepends="qt5-qtxmlpatterns-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/syntax-highlighting-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b789db79a75c5bddcabd2e18e04122c91f096df190dee891b6c3441ea79feeb1aee683dda3fb81663cbb0f3a6d16cee52c51664b28bb9e0fe42c70af2c685eae syntax-highlighting-5.54.0.tar.xz" +sha512sums="ffb4b1e57bd912ed76c93b8ea074af3fd8343cd094a584647bef42870366cd089c6ba2070670a57e4997ba6ac122775af5066d5bae4891f3533e4b7bfecf1fee syntax-highlighting-5.68.0.tar.xz" diff --git a/user/sysfsutils/APKBUILD b/user/sysfsutils/APKBUILD index da5f74618..99fde3f4e 100644 --- a/user/sysfsutils/APKBUILD +++ b/user/sysfsutils/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver.tar.gz" prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir"/ install } diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 3fa213be7..f1dd09424 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=systemsettings -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -12,7 +12,8 @@ depends_dev="qt5-qtbase-dev kitemviews-dev kservice-dev kwidgetsaddons-dev" makedepends="$depends_dev cmake extra-cmake-modules kactivities-stats-dev kactivities-dev kauth-dev kcmutils-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev khtml-dev ki18n-dev - kiconthemes-dev kio-dev kirigami2-dev kwindowsystem-dev kxmlgui-dev" + kiconthemes-dev kitemmodels-dev kio-dev kirigami2-dev kwindowsystem-dev + kxmlgui-dev libkworkspace-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz" @@ -27,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="00dc0c39004bfd8938610ef6e0c08dc1d0c8738e7b3f7f4044586c0628d5a574c07f9a69bfa288ab8c3dd7beced4d5fa4b8ba34ace35668a53b364534d929d78 systemsettings-5.12.8.tar.xz" +sha512sums="f3feba2785c7766a48521ee721ac01e51eb8a9de9d3cde484576c6d89c7154eb9f96ca60b2483932e81dba3e24d06c30f82601e1ff702ade6dee9dd9e6f04921 systemsettings-5.18.3.tar.xz" diff --git a/user/taglib/APKBUILD b/user/taglib/APKBUILD index 0b7731116..6569a68e1 100644 --- a/user/taglib/APKBUILD +++ b/user/taglib/APKBUILD @@ -20,17 +20,15 @@ source="http://taglib.org/releases/taglib-$pkgver.tar.gz # - CVE-2018-11439 build() { - cd "$builddir" cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DWITH_ASF=ON \ -DWITH_MP4=ON \ - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=ON . make VERBOSE=1 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD index 4ed262975..58ff19a60 100644 --- a/user/talloc/APKBUILD +++ b/user/talloc/APKBUILD @@ -1,15 +1,15 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=talloc -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=0 pkgdesc="Memory pool management library" url="https://talloc.samba.org" arch="all" license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL" -replaces="samba-common" depends="" makedepends="cmd:which docbook-xsl libxslt python3-dev" +replaces="samba-common" subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc" source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz" @@ -45,4 +45,4 @@ py3() { "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837 talloc-2.3.0.tar.gz" +sha512sums="064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e talloc-2.3.1.tar.gz" diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD index ee876adff..41b8a2e25 100644 --- a/user/tcsh/APKBUILD +++ b/user/tcsh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcsh -pkgver=6.21.00 +pkgver=6.22.02 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${_pkgver#*.} pkgrel=0 @@ -12,15 +12,13 @@ license="BSD-3-Clause" depends="" checkdepends="diffutils autoconf" makedepends="ncurses-dev ncurses-terminfo utmps-dev gettext-tiny-dev" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-doc" -options="!checkroot" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" source="$pkgname-$pkgver.tar.gz::https://github.com/tcsh-org/tcsh/archive/TCSH${_pkgver}.tar.gz 001-sysmalloc.patch" - builddir="$srcdir/${pkgname}-TCSH${_pkgver}" + build() { - cd "$builddir" LIBS="-lutmps -lskarnet -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,14 +33,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="305380fd065ca4703ffba002358b41727056481573a78301cb8c2390d5fe1a4107af5d482db5abf26f0ce9f7193c8aeb0e34fedcc40971499be2e6dc13bf3405 tcsh-6.21.00.tar.gz +sha512sums="8b0bd11c8c297d155ed386fd9552d4d4da79375b1d7801edf20a8cdc8ad797f10e1c28b3f6527a657dc2f38704ba4cea51612aefa0987ee968b385ad8dea5199 tcsh-6.22.02.tar.gz 40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch" diff --git a/user/telegram/APKBUILD b/user/telegram/APKBUILD new file mode 100644 index 000000000..994ed5559 --- /dev/null +++ b/user/telegram/APKBUILD @@ -0,0 +1,63 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=telegram +pkgver=1.9.19 +pkgrel=0 +pkgdesc="Telegram messaging app" +url="https://telegram.org/" +arch="all" +options="!check" # No test suite. +license="GPL-3.0-only WITH OpenSSL-exception" +depends="qt5-qtimageformats" +makedepends="cmake enchant-dev ffmpeg-dev hunspell-dev libdbusmenu-qt-dev + lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev + python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev" +subpackages="" +source="https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz + endian.patch + " +builddir="$srcdir/tdesktop-$pkgver-full" + +build() { + [ -f "$HOME/telegram_credentials.sh" ] || die "You need to have a Telegram API ID." + + . $HOME/telegram_credentials.sh + + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + # Can't use packaged rlottie, API mismatch. + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ + -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ + -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \ + -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \ + -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ + -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \ + -DTDESKTOP_API_ID="${TELEGRAM_API_ID}" \ + -DTDESKTOP_API_HASH="${TELEGRAM_API_HASH}" \ + -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \ + -DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop \ + -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ + -Ddisable_autoupdate=1 \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +package() { + install -D -m755 "$builddir"/bin/telegram-desktop "$pkgdir"/usr/bin/telegram-desktop + install -D -m644 "$builddir"/lib/xdg/telegramdesktop.desktop "$pkgdir"/usr/share/applications/telegramdesktop.desktop + for _icon in 16 32 48 64 128 256 512; do + install -D -m644 "$builddir"/Telegram/Resources/art/icon$_icon.png \ + "$pkgdir"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/telegram.png + done +} + +sha512sums="29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d tdesktop-1.9.19-full.tar.gz +c478bd59187493d60172d805ca19e9e09fa2c81b87d5dbbd5f3cd9aae0f207b463d127e06f2053f7b7b6ac00b3191d59e36ec6c5453a1da4d6535d1caad27242 endian.patch" diff --git a/user/telegram/endian.patch b/user/telegram/endian.patch new file mode 100644 index 000000000..40a3b4478 --- /dev/null +++ b/user/telegram/endian.patch @@ -0,0 +1,25 @@ +From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001 +From: John Zimmermann <johnz@posteo.net> +Date: Thu, 2 Jan 2020 12:57:33 +0100 +Subject: [PATCH] Build on big endian + +--- + Telegram/SourceFiles/config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h +index fb7b54e4d..6a873fbd7 100644 +--- a/Telegram/SourceFiles/config.h ++++ b/Telegram/SourceFiles/config.h +@@ -162,7 +162,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; + #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH + + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +-#error "Only little endian is supported!" ++#warning "Only little endian is supported!" + #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN + + #if (TDESKTOP_ALPHA_VERSION != 0) +-- +2.24.1 + diff --git a/user/telegram/rlottie.patch b/user/telegram/rlottie.patch new file mode 100644 index 000000000..6bd2ff6c3 --- /dev/null +++ b/user/telegram/rlottie.patch @@ -0,0 +1,16 @@ +No CMake config exists for rlottie; use pkgconf instead. + +--- a/cmake/external/rlottie/CMakeLists.txt 2020-01-17 18:21:17.000000000 +0100 ++++ b/cmake/external/rlottie/CMakeLists.txt 2020-01-18 00:37:40.280438388 +0100 +@@ -8,8 +8,9 @@ + add_library(external_rlottie INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_rlottie ALIAS external_rlottie) + +- find_package(rlottie REQUIRED) +- target_link_libraries(external_rlottie INTERFACE rlottie::rlottie) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(RLOTTIE REQUIRED rlottie) ++ target_link_libraries(external_rlottie INTERFACE ${RLOTTIE_LIBRARIES}) + else() + add_library(external_rlottie OBJECT) + add_library(desktop-app::external_rlottie ALIAS external_rlottie) diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index f697dd5b5..65f658c29 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.2.1 -pkgrel=1 +pkgver=3.2.3 +pkgrel=0 pkgdesc="Collection manager" -url="http://tellico-project.org/" +url="https://tellico-project.org/" arch="all" license="GPL-2.0-only OR GPL-3.0-only" depends="" @@ -32,7 +32,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS -std=gnu99" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -48,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b tellico-3.2.1.tar.xz +sha512sums="4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7 tellico-3.2.3.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD index 65f205fb7..fe0609d9c 100644 --- a/user/tf/APKBUILD +++ b/user/tf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=tf pkgver=5.0b8 _pkgver=${pkgver%.*}${pkgver#*.} @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Powerful curses-based MUD client" url="http://tinyfugue.sourceforge.net/" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="openssl-dev ncurses-dev pcre-dev" @@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%20 builddir="$srcdir/tf-$_pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/the_silver_searcher/APKBUILD b/user/the_silver_searcher/APKBUILD index c9f324a69..e906445e6 100644 --- a/user/the_silver_searcher/APKBUILD +++ b/user/the_silver_searcher/APKBUILD @@ -9,14 +9,13 @@ arch="all" options="!check" # Tests are not shipped in the release tarball... license="Apache-2.0" depends="" -makedepends="pcre-dev xz-dev zlib-dev" checkdepends="cram" +makedepends="pcre-dev xz-dev zlib-dev" subpackages="$pkgname-doc" source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz" builddir="$srcdir/the_silver_searcher-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index 91ae58c82..cd127de65 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.54.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/threadweaver-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +26,16 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="aaea9474d1015748600c97ec18d2cac888b468ce6fe66e9c7c8ca4f0a176795839ad74df2a5292bd4ba6004ed6f563825d3be00f87fd56124de0e8765e11c842 threadweaver-5.54.0.tar.xz" +sha512sums="d1473867df5d5143e69f076899159016f489df40b898be79f41e4ea35f4e1b95feab5f145dbabf17af50516a6301db0c8dc9813b9f48f2cb26149c8c09b158a8 threadweaver-5.68.0.tar.xz" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 6a2984dc6..bfbc5a1ce 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=thunar-volman pkgver=0.9.5 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Volume manager for Thunar" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="exo-dev intltool libgudev-dev libnotify-dev libxfce4ui-dev thunar-dev" subpackages="$pkgname-lang" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 28f51c4b0..82e464ee1 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=thunar -pkgver=1.8.9 +pkgver=1.8.12 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ AND GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev vala-dev gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev libexif-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2" -builddir="$srcdir/Thunar-$pkgver" +source="https://archive.xfce.org/src/xfce/thunar/1.8/thunar-$pkgver.tar.bz2" build() { LIBS="-lintl" ./configure \ @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8e1bff80692ee22393a0c0cfa09178aa14cc476a058f406cab7ca873778ac4673cbac2d271f525a51e0120f1b17f8872c58407e8d7b77c6e67b721f4e5318f80 Thunar-1.8.9.tar.bz2" +sha512sums="cd27b26796602ea8623c368cd6c8bb53136c09e4a02c37775bed9918c801741e0adb5784151fbf4b93785967a637ffb8b1214b0721f9457de683ebd7718a8767 thunar-1.8.12.tar.bz2" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 1e9912cfd..b50a1a7e8 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=68.0 +pkgver=68.6.0 pkgrel=0 pkgdesc="Email client from Mozilla" url="https://www.thunderbird.net/" @@ -13,8 +13,8 @@ depends="" # system-libs # actual deps makedepends=" - autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev - perl rust rust-stdlib cmd:which + autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev + perl rust cmd:which ncurses-dev openssl-dev @@ -27,7 +27,7 @@ makedepends=" startup-notification-dev unzip yasm zip gtk+2.0-dev " _py2ver="2.7.16" -source="https://archive.mozilla.org/pub/thunderbird/candidates/$pkgver-candidates/build2/source/thunderbird-$pkgver.source.tar.xz +source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz mozconfig @@ -38,9 +38,11 @@ source="https://archive.mozilla.org/pub/thunderbird/candidates/$pkgver-candidate mozilla-build-arm.patch rust-config.patch shut-up-warning.patch + skia-sucks1.patch + skia-sucks2.patch + skia-sucks3.patch stackwalk-x86-ppc.patch webrtc-broken.patch - yuv-be.patch thunderbird.desktop " @@ -53,6 +55,16 @@ somask="liblgpllibs.so _mozappdir=/usr/lib/thunderbird ldpath="$_mozappdir" +# secfixes: +# 68.6.0-r0: +# - CVE-2020-6805 +# - CVE-2020-6806 +# - CVE-2020-6807 +# - CVE-2020-6811 +# - CVE-2019-20503 +# - CVE-2020-6812 +# - CVE-2020-6814 + unpack() { default_unpack [ -z $SKIP_PYTHON ] || return 0 @@ -81,22 +93,20 @@ unpack() { } prepare() { - cd "$builddir" default_prepare cp "$srcdir"/mozconfig "$builddir"/mozconfig echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig - # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then - JOBS=16 - fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig case "$CARCH" in pmmx|x86*) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; + s390x) + echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -106,8 +116,6 @@ prepare() { } build() { - cd "$builddir" - export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 @@ -120,9 +128,6 @@ build() { export UNIXCONFDIR="$srcdir" - local extra_flags="" - [ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache" - export PATH="$srcdir/python/bin:$PATH" ./mach build } @@ -130,18 +135,16 @@ build() { run() { cd "$builddir"/obj-$CHOST/dist/bin export LD_LIBRARY_PATH=. - ./firefox -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default + ./thunderbird -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default } package() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" DESTDIR="$pkgdir" ./mach install install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - local png for png in comm/mail/branding/thunderbird/default*.png; do local i="${_png%.png}" i=${i##*/default} @@ -155,7 +158,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="5177c11e841f6aa704634ce66fa9f1af02703d8c04dfeabf19829551f997cd80b60e8fa32af71ea64cf27af2be3956971bb6b75645dfc68417bb257a41872e3e thunderbird-68.0.source.tar.xz +sha512sums="3502cc42b594eebf3511219ae8e7fb8a13594534abfe7a40ec32e5a3f60343cfab7c652b161a5f33af46bd5e6f096e3abd4a407c8b307ce4693089b471a42c3e thunderbird-68.6.0.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz 5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -165,7 +168,9 @@ c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch +e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch +9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch +7a1fa27e060b2f025eaebbd39fb5c62960b62450241437e6d057d58cef9faf1cd1a85efe3b6a37b865d686ff18e90605ebea3089b26243f2d14876c2107106a6 skia-sucks3.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch -2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2 yuv-be.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/skia-sucks1.patch b/user/thunderbird/skia-sucks1.patch new file mode 100644 index 000000000..a02c3b775 --- /dev/null +++ b/user/thunderbird/skia-sucks1.patch @@ -0,0 +1,84 @@ +# HG changeset patch +# Parent 548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9 + +diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp +--- a/gfx/2d/ConvolutionFilter.cpp Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/2d/ConvolutionFilter.cpp Thu Jul 25 14:27:59 2019 +0200 +@@ -35,9 +35,38 @@ + return true; + } + ++static void ByteSwapArray(uint8_t *u8Array, int32_t size) { ++ uint32_t *array = reinterpret_cast<uint32_t*>(u8Array); ++ for (int pxl = 0; pxl < size; ++pxl) { ++ // Use an endian swap to move the bytes, i.e. BGRA -> ARGB. ++ uint32_t rgba = array[pxl]; ++ array[pxl] = NativeEndian::swapToLittleEndian(rgba); ++ } ++} ++ + void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst, + bool aHasAlpha) { ++#ifdef MOZ_BIG_ENDIAN ++ int outputSize = mFilter->numValues(); ++ ++ // Input size isn't handed in, so we have to calculate it quickly ++ int inputSize = 0; ++ for (int xx = 0; xx < outputSize; ++xx) { ++ // Get the filter that determines the current output pixel. ++ int filterOffset, filterLength; ++ mFilter->FilterForValue(xx, &filterOffset, &filterLength); ++ inputSize = std::max(inputSize, filterOffset + filterLength); ++ } ++ ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++#endif ++ + SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++ ByteSwapArray(aDst, outputSize); ++#endif + } + + void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst, +@@ -49,8 +78,26 @@ + int32_t filterLength; + auto filterValues = + mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength); ++ ++#ifdef MOZ_BIG_ENDIAN ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ // Skia only knows LE, so we have to swizzle the input ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++#endif ++ + SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst, + aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ // After skia is finished, we swizzle back to BE, in case ++ // the input is used again somewhere else ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++ // The destination array as well ++ ByteSwapArray(aDst, aRowSize); ++#endif + } + + /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's +diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h +--- a/gfx/skia/skia/include/core/SkPreConfig.h Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/skia/skia/include/core/SkPreConfig.h Thu Jul 25 14:27:59 2019 +0200 +@@ -73,7 +73,7 @@ + defined(__ppc__) || defined(__hppa) || \ + defined(__PPC__) || defined(__PPC64__) || \ + defined(_MIPSEB) || defined(__ARMEB__) || \ +- defined(__s390__) || \ ++ defined(__s390__) || defined(__s390x__) || \ + (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ + (defined(__ia64) && defined(__BIG_ENDIAN__)) + #define SK_CPU_BENDIAN diff --git a/user/thunderbird/skia-sucks2.patch b/user/thunderbird/skia-sucks2.patch new file mode 100644 index 000000000..1a498f871 --- /dev/null +++ b/user/thunderbird/skia-sucks2.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 +For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the +right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). + +diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h +--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +@@ -238,7 +238,18 @@ + AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } + AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } + ++ // On Big endian the commented out variant doesn't work, ++ // and honestly, I have no idea why it exists in the first place. ++ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() ++ // which gets a 64-bit integer, and FromBits returns 32-bit, ++ // cutting off the wrong half again. ++ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). ++ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) ++#ifdef SK_CPU_BENDIAN ++ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } ++#else + AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } ++#endif + AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } + AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } + +diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h +--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +@@ -203,7 +203,13 @@ + // ~~~> + // a = 1*aa + d(1-1*aa) = aa + d(1-aa) + // c = 0*aa + d(1-1*aa) = d(1-aa) ++ ++ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 ++#ifdef SK_CPU_BENDIAN ++ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) ++#else + return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) ++#endif + + d.approxMulDiv255(aa.inv()); + }; + while (h --> 0) { diff --git a/user/thunderbird/skia-sucks3.patch b/user/thunderbird/skia-sucks3.patch new file mode 100644 index 000000000..9d2ffc410 --- /dev/null +++ b/user/thunderbird/skia-sucks3.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec +Problem description: Tab-titles that are too long to fit into a tab get faded out. + On big endian this is broken and instead of fading out, the + tab gets white and the font transparent, leading to an unreadable + tab-title +Solution: This is not a real solution, but a hack. The real solution would have been + to byte-swap the correct buffer, but I could not find it. + So the next best thing is to deactivate the fading-effect. Now all tab-titles + are readable, albeit not as pretty to look at as they could be. +Side-effects: I have not yet found an unwanted side-effect. + +diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp +--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +@@ -1861,6 +1861,14 @@ + SkCanvas::kPreserveLCDText_SaveLayerFlag | + (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); + ++#if MOZ_BIG_ENDIAN ++ // Pushing a layer where an aMask is defined produces wrong output. ++ // We _should_ endian swap the data, but I couldn't find a workable way to do so ++ // Therefore I deactivate those layers in the meantime. ++ // The result is: Tab-titles that are longer than the available space should be faded out. ++ // The fading doesn't work, so we deactivate the fading-effect here. ++ if (!aMask) ++#endif + mCanvas->saveLayer(saveRec); + + SetPermitSubpixelAA(aOpaque); diff --git a/user/thunderbird/yuv-be.patch b/user/thunderbird/yuv-be.patch deleted file mode 100644 index ccb0c2fd8..000000000 --- a/user/thunderbird/yuv-be.patch +++ /dev/null @@ -1,48 +0,0 @@ -# HG changeset patch -# User A. Wilcox <AWilcox@Wilcox-Tech.com> -# Date 1543674229 0 -# Sat Dec 01 14:23:49 2018 +0000 -# Node ID 0309ff19e46b126c527e633518d7de8570442114 -# Parent 53107afbc21ec78e7ac46d37af212505f2032d5d -Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines - -diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp ---- a/gfx/ycbcr/YCbCrUtils.cpp Wed Nov 07 04:50:21 2018 +0000 -+++ b/gfx/ycbcr/YCbCrUtils.cpp Sat Dec 01 14:23:49 2018 +0000 -@@ -3,7 +3,9 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#include "mozilla/EndianUtils.h" - #include "gfx2DGlue.h" -+#include "mozilla/gfx/Swizzle.h" - - #include "YCbCrUtils.h" - #include "yuv_convert.h" -@@ -236,6 +238,13 @@ - yuvtype, - srcData.mYUVColorSpace); - } -+#if MOZ_BIG_ENDIAN -+ // libyuv makes endian-correct result, which needs to be swapped to BGRX -+ if (aDestFormat != SurfaceFormat::R5G6B5_UINT16) -+ gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8, -+ aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8, -+ srcData.mPicSize); -+#endif - } - - void -@@ -257,6 +266,12 @@ - aSrcStrideYA, - aSrcStrideUV, - aDstStrideARGB); -+#if MOZ_BIG_ENDIAN -+ // libyuv makes endian-correct result, which needs to be swapped to BGRA -+ gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8, -+ aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8, -+ IntSize(aWidth, aHeight)); -+#endif - } - - } // namespace gfx diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD index c3f0590f9..b3ac5c180 100644 --- a/user/tiff/APKBUILD +++ b/user/tiff/APKBUILD @@ -2,20 +2,18 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tiff -pkgver=4.0.10 -pkgrel=1 +pkgver=4.1.0 +pkgrel=0 pkgdesc="Library to read, create, and manipulate TIFF image files" url="http://www.libtiff.org/" arch="all" license="MIT" -depends= +depends="" depends_dev="zlib-dev libjpeg-turbo-dev" makedepends="libtool autoconf automake $depends_dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" -source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz - CVE-2019-6128.patch - CVE-2019-7663.patch - " +source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz" + # secfixes: libtiff # 4.0.10-r1: # - CVE-2019-6128 @@ -41,7 +39,6 @@ source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz # - CVE-2017-5225 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -54,12 +51,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -69,6 +64,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz -8dc336e6c863524e3622f61ec6583eebe13fde55649cd8c812e3f6752242a23ff72cfb680dfcbe47d1503a058f5f9001415ae112220729e4ab50fe81190e327e CVE-2019-6128.patch -6fb7e9aa0afbae96fd6e78c2401262e496f5d62980ea02712bc43f8749341d030df3625f10413f5ed3e130e88d609c2374ae69807a1f9e54ed91cbd8411aab62 CVE-2019-7663.patch" +sha512sums="fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6 tiff-4.1.0.tar.gz" diff --git a/user/tiff/CVE-2019-6128.patch b/user/tiff/CVE-2019-6128.patch deleted file mode 100644 index 1b15b6f01..000000000 --- a/user/tiff/CVE-2019-6128.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001 -From: Scott Gayou <github.scott@gmail.com> -Date: Wed, 23 Jan 2019 15:03:53 -0500 -Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128. - -pal2rgb failed to free memory on a few errors. This was reported -here: http://bugzilla.maptools.org/show_bug.cgi?id=2836. ---- - tools/pal2rgb.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c -index 01d8502e..9492f1cf 100644 ---- a/tools/pal2rgb.c -+++ b/tools/pal2rgb.c -@@ -118,12 +118,14 @@ main(int argc, char* argv[]) - shortv != PHOTOMETRIC_PALETTE) { - fprintf(stderr, "%s: Expecting a palette image.\n", - argv[optind]); -+ (void) TIFFClose(in); - return (-1); - } - if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) { - fprintf(stderr, - "%s: No colormap (not a valid palette image).\n", - argv[optind]); -+ (void) TIFFClose(in); - return (-1); - } - bitspersample = 0; -@@ -131,11 +133,14 @@ main(int argc, char* argv[]) - if (bitspersample != 8) { - fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n", - argv[optind]); -+ (void) TIFFClose(in); - return (-1); - } - out = TIFFOpen(argv[optind+1], "w"); -- if (out == NULL) -+ if (out == NULL) { -+ (void) TIFFClose(in); - return (-2); -+ } - cpTags(in, out); - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth); - TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength); --- -2.21.0 - diff --git a/user/tiff/CVE-2019-7663.patch b/user/tiff/CVE-2019-7663.patch deleted file mode 100644 index 8049566c6..000000000 --- a/user/tiff/CVE-2019-7663.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 802d3cbf3043be5dce5317e140ccb1c17a6a2d39 Mon Sep 17 00:00:00 2001 -From: Thomas Bernard <miniupnp@free.fr> -Date: Tue, 29 Jan 2019 11:21:47 +0100 -Subject: [PATCH] TIFFWriteDirectoryTagTransferfunction() : fix NULL - dereferencing - -http://bugzilla.maptools.org/show_bug.cgi?id=2833 - -we must check the pointer is not NULL before memcmp() the memory ---- - libtiff/tif_dirwrite.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c -index c15a28db..ef30c869 100644 ---- a/libtiff/tif_dirwrite.c -+++ b/libtiff/tif_dirwrite.c -@@ -1893,12 +1893,14 @@ TIFFWriteDirectoryTagTransferfunction(TIFF* tif, uint32* ndir, TIFFDirEntry* dir - n=3; - if (n==3) - { -- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) -+ if (tif->tif_dir.td_transferfunction[2] == NULL || -+ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) - n=2; - } - if (n==2) - { -- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) -+ if (tif->tif_dir.td_transferfunction[1] == NULL || -+ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) - n=1; - } - if (n==0) --- -2.21.0 - diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD index 3acea2e2d..7e088b1eb 100644 --- a/user/tigervnc/APKBUILD +++ b/user/tigervnc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tigervnc -pkgver=1.9.0 -pkgrel=4 +pkgver=1.10.1 +pkgrel=0 pkgdesc="High-performance, platform-neutral VNC remote desktop application" url="https://tigervnc.org/" arch="all" @@ -15,15 +15,10 @@ makedepends="cmake fltk-dev fontconfig-dev gnutls-dev intltool subpackages="$pkgname-lang $pkgname-doc" source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz use-intltool.patch - endian.patch 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch - null-termination.patch - initialise-var.patch - ensure-throw.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,19 +29,14 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS -faligned-new -Wno-c++11-compat -Wno-maybe-uninitialized" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -Wno-dev \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d tigervnc-1.9.0.tar.gz +sha512sums="3486ff772d39217feb8c075860cae58e1021bdb8095443d8b5c383929cc6c622b57ea61c31d06ff0bd48c7e6889db4b6a99d0742bdd60edf323fb2a3ad328705 tigervnc-1.10.1.tar.gz 5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619 use-intltool.patch -189a51a542b368e4db22174d09f5b656848e94577bbf93b2388f54529f1c7c2d32e5b5283551b3fb067ba21f6464f60989e22d4cd11ed3d87d5c931301555b49 endian.patch -f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch -82566734e5288e899048b918ce47f5abc3b94196e88d54fa0b0ef68c20d1fcd9d5854f36a0043d28f81dc6213c9ee8cf55fb187aeeb8add5fc31765f6a5b23bb null-termination.patch -a7fb612d7e3625b66db66ffc7e3f28f2e47f79b858ff1fd9e403576ef2b8ff7bc8cf83a6f67439de6242e4a11a0144119d040f8f9e917e17a8af512b47067360 initialise-var.patch -4656a617dcb2bd28b653932fa034b7d46c49a08be4ba90501a9d1ddfad2130209664abf7bf5227f0afc926a568eb83e8e5f25e73887bf2561b2077fb1dab84c9 ensure-throw.patch" +f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch" diff --git a/user/tigervnc/endian.patch b/user/tigervnc/endian.patch deleted file mode 100644 index e09edf9c5..000000000 --- a/user/tigervnc/endian.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/vncviewer/Surface_X11.cxx b/vncviewer/Surface_X11.cxx -index 3523da3d..6562634d 100644 ---- a/vncviewer/Surface_X11.cxx -+++ b/vncviewer/Surface_X11.cxx -@@ -109,6 +109,7 @@ void Surface::blend(Surface* dst, int src_x, int src_y, int x, int y, int w, int - - void Surface::alloc() - { -+ XRenderPictFormat templ; - XRenderPictFormat* format; - - // Might not be open at this point -@@ -117,7 +118,37 @@ void Surface::alloc() - pixmap = XCreatePixmap(fl_display, XDefaultRootWindow(fl_display), - width(), height(), 32); - -- format = XRenderFindStandardFormat(fl_display, PictStandardARGB32); -+ // Our code assumes a BGRA byte order, regardless of what the endian -+ // of the machine is or the native byte order of XImage, so make sure -+ // we find such a format -+ templ.type = PictTypeDirect; -+ templ.depth = 32; -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+ templ.direct.alpha = 0; -+ templ.direct.red = 8; -+ templ.direct.green = 16; -+ templ.direct.blue = 24; -+#else -+ templ.direct.alpha = 24; -+ templ.direct.red = 16; -+ templ.direct.green = 8; -+ templ.direct.blue = 0; -+#endif -+ templ.direct.alphaMask = 0xff; -+ templ.direct.redMask = 0xff; -+ templ.direct.greenMask = 0xff; -+ templ.direct.blueMask = 0xff; -+ -+ format = XRenderFindFormat(fl_display, PictFormatType | PictFormatDepth | -+ PictFormatRed | PictFormatRedMask | -+ PictFormatGreen | PictFormatGreenMask | -+ PictFormatBlue | PictFormatBlueMask | -+ PictFormatAlpha | PictFormatAlphaMask, -+ &templ, 0); -+ -+ if (!format) -+ throw rdr::Exception("XRenderFindFormat"); -+ - picture = XRenderCreatePicture(fl_display, pixmap, format, 0, NULL); - - visFormat = XRenderFindVisualFormat(fl_display, fl_visual->visual); diff --git a/user/tigervnc/ensure-throw.patch b/user/tigervnc/ensure-throw.patch deleted file mode 100644 index da873fe21..000000000 --- a/user/tigervnc/ensure-throw.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 78bdd1700c4e42b492286a2af25bea0825848f99 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Tue, 26 Mar 2019 11:10:28 +0100 -Subject: [PATCH] Add missing throws for exception - -It is not enough to create an exception object, you need to throw -it as well. ---- - common/rfb/CSecurityTLS.cxx | 10 +++++----- - win/rfb_win32/Registry.cxx | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx -index c6d1e3103..aa1910909 100644 ---- a/common/rfb/CSecurityTLS.cxx -+++ b/common/rfb/CSecurityTLS.cxx -@@ -391,7 +391,7 @@ void CSecurityTLS::checkSession() - "authority:\n\n%s\n\nDo you want to save it and " - "continue?\n ", info.data); - if (len < 0) -- AuthFailureException("certificate decoding error"); -+ throw AuthFailureException("certificate decoding error"); - - vlog.debug("%s", info.data); - -@@ -417,16 +417,16 @@ void CSecurityTLS::checkSession() - - if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, NULL, &out_size) - == GNUTLS_E_SHORT_MEMORY_BUFFER) -- AuthFailureException("Out of memory"); -+ throw AuthFailureException("Out of memory"); - - // Save cert - out_buf = new char[out_size]; - if (out_buf == NULL) -- AuthFailureException("Out of memory"); -+ throw AuthFailureException("Out of memory"); - - if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, out_buf, &out_size) < 0) -- AuthFailureException("certificate issuer unknown, and certificate " -- "export failed"); -+ throw AuthFailureException("certificate issuer unknown, and certificate " -+ "export failed"); - - char *homeDir = NULL; - if (getvnchomedir(&homeDir) == -1) -diff --git a/win/rfb_win32/Registry.cxx b/win/rfb_win32/Registry.cxx -index 963a36a29..9cd501842 100644 ---- a/win/rfb_win32/Registry.cxx -+++ b/win/rfb_win32/Registry.cxx -@@ -254,7 +254,7 @@ TCHAR* RegKey::getRepresentation(const TCHAR* valname) const { - TCharArray result(required); - length = ExpandEnvironmentStrings(str.buf, result.buf, required); - if (required<length) -- rdr::Exception("unable to expand environment strings"); -+ throw rdr::Exception("unable to expand environment strings"); - return result.takeBuf(); - } else { - return tstrDup(_T("")); diff --git a/user/tigervnc/initialise-var.patch b/user/tigervnc/initialise-var.patch deleted file mode 100644 index f58a4dadc..000000000 --- a/user/tigervnc/initialise-var.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 44cf1d64ecf80c061c0a2b0f0167094e58782102 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 25 Mar 2019 16:14:49 +0100 -Subject: [PATCH] Don't use un-initialized stride to base constructor - -We can use a dummy value here as we set up the buffer and stride -further down in the constructor. ---- - vncviewer/PlatformPixelBuffer.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vncviewer/PlatformPixelBuffer.cxx b/vncviewer/PlatformPixelBuffer.cxx -index 1e9803eb2..ff1935e74 100644 ---- a/vncviewer/PlatformPixelBuffer.cxx -+++ b/vncviewer/PlatformPixelBuffer.cxx -@@ -36,7 +36,7 @@ static rfb::LogWriter vlog("PlatformPixelBuffer"); - PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) : - FullFramePixelBuffer(rfb::PixelFormat(32, 24, false, true, - 255, 255, 255, 16, 8, 0), -- width, height, 0, stride), -+ width, height, NULL, 0), - Surface(width, height) - #if !defined(WIN32) && !defined(__APPLE__) - , shminfo(NULL), xim(NULL) diff --git a/user/tigervnc/null-termination.patch b/user/tigervnc/null-termination.patch deleted file mode 100644 index e80a4f62d..000000000 --- a/user/tigervnc/null-termination.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7240f62ddc06643f982456c05c11d8afe5422069 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Tue, 26 Mar 2019 11:11:20 +0100 -Subject: [PATCH] Handle server name overflow properly - -We need to make sure it is null terminated on truncation. We also -need to avoid giving a too large size argument or modern gcc will -complain. ---- - vncviewer/vncviewer.cxx | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx -index d7cbd6e36..4a8370b95 100644 ---- a/vncviewer/vncviewer.cxx -+++ b/vncviewer/vncviewer.cxx -@@ -411,7 +411,8 @@ potentiallyLoadConfigurationFile(char *vncServerName) - newServerName = loadViewerParameters(vncServerName); - // This might be empty, but we still need to clear it so we - // don't try to connect to the filename -- strncpy(vncServerName, newServerName, VNCSERVERNAMELEN); -+ strncpy(vncServerName, newServerName, VNCSERVERNAMELEN-1); -+ vncServerName[VNCSERVERNAMELEN-1] = '\0'; - } catch (rfb::Exception& e) { - vlog.error("%s", e.str()); - if (alertOnFatalError) -@@ -541,8 +542,10 @@ int main(int argc, char** argv) - try { - const char* configServerName; - configServerName = loadViewerParameters(NULL); -- if (configServerName != NULL) -- strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN); -+ if (configServerName != NULL) { -+ strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN-1); -+ defaultServerName[VNCSERVERNAMELEN-1] = '\0'; -+ } - } catch (rfb::Exception& e) { - vlog.error("%s", e.str()); - if (alertOnFatalError) diff --git a/user/tint2/APKBUILD b/user/tint2/APKBUILD index 5650d304f..ebc94463f 100644 --- a/user/tint2/APKBUILD +++ b/user/tint2/APKBUILD @@ -8,8 +8,8 @@ pkgrel=0 pkgdesc="Simple, unintrusive panel/taskbar" url="https://gitlab.com/o9000/tint2" arch="all" -license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement" options="!check" # No test suite. +license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement" depends="" makedepends="cmake imlib2-dev glib-dev pango-dev cairo-dev libxcomposite-dev libxdamage-dev libxinerama-dev libxrandr-dev @@ -19,11 +19,10 @@ source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/$pkgname/repository/v prepare() { mv "$srcdir/$pkgname-v$pkgver"-* "$builddir" - mkdir "$builddir"/build + default_prepare } build() { - cd "$builddir"/build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ @@ -31,13 +30,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - .. - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bd5cc461199d38028b81d84f30e896e658274e166e344f4bc98bc6e43c4e25790bc80a7d4aac48d4e9e8284137fd31e4019f0c1b956149222e67a66b42379f1d tint2-16.7.tar.bz2" diff --git a/user/tinycdb/APKBUILD b/user/tinycdb/APKBUILD new file mode 100644 index 000000000..434e4273e --- /dev/null +++ b/user/tinycdb/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=tinycdb +pkgver=0.78 +pkgrel=0 +pkgdesc="A constant database" +url="https://www.corpit.ru/mjt/tinycdb.html" +arch="all" +license="Public-Domain" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.corpit.ru/mjt/tinycdb/$pkgname-$pkgver.tar.gz + Makefile.patch" + +build() { + make prefix=/usr sysconfdir=/etc mandir=/usr/share/man localstatedir=/var +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} +sha512sums="8930086b8e7fddcd4dbd3354c5f5ee05171df68fde1cc222b6c402430042b6e761efbad7e5fa8de18e1d36390f1526cc3e605c5086fe1c363ba1df6c03201553 tinycdb-0.78.tar.gz +199774ee259bd6ba91ec000485c959e9632f2766203c479ffb81144d4cec39b25a1df9e9b3b676217044e2d65275ef80fbc1fd97272bce7a91fe0c1232a5dc40 Makefile.patch" diff --git a/user/tinycdb/Makefile.patch b/user/tinycdb/Makefile.patch new file mode 100644 index 000000000..27d32dff6 --- /dev/null +++ b/user/tinycdb/Makefile.patch @@ -0,0 +1,19 @@ +--- a/Makefile 2012-05-11 14:17:47.000000000 +0000 ++++ b/Makefile 2020-02-25 05:56:34.969771664 +0000 +@@ -6,14 +6,14 @@ + + VERSION = 0.78 + +-prefix=/usr/local ++prefix=/usr + exec_prefix=$(prefix) + bindir=$(exec_prefix)/bin + libdir=$(exec_prefix)/lib + syslibdir=$(libdir) + sysconfdir=/etc + includedir=$(prefix)/include +-mandir=$(prefix)/man ++mandir=$(prefix)/share/man + NSSCDB_DIR = $(sysconfdir) + DESTDIR= + diff --git a/user/tinyxml2/APKBUILD b/user/tinyxml2/APKBUILD index 1fb564d19..4b096d670 100644 --- a/user/tinyxml2/APKBUILD +++ b/user/tinyxml2/APKBUILD @@ -8,7 +8,7 @@ url=" " arch="all" license="Zlib" depends="" -makedepends="" +makedepends="cmake" subpackages="$pkgname-dev" source="tinyxml2-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$pkgver.tar.gz" @@ -23,7 +23,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD index 8295ec4fc..007ff7b69 100644 --- a/user/tk/APKBUILD +++ b/user/tk/APKBUILD @@ -7,17 +7,15 @@ url="http://tcl.sourceforge.net/" arch="all" options="!check" # Requires a running X11 server. license="TCL" -depends= +depends="" depends_dev="tcl-dev libx11-dev libxft-dev fontconfig-dev" makedepends="$depends_dev libpng-dev" subpackages="$pkgname-doc $pkgname-dev" -source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz - " +source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz" _major=8.6 builddir="$srcdir"/tk8.6.9/unix build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +25,6 @@ build() { } package() { - cd "$builddir" export LD_LIBRARY_PATH="$builddir" make -j1 INSTALL_ROOT="${pkgdir}" install install-private-headers diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD index 1b1398c9a..ca7208b5e 100644 --- a/user/tlp/APKBUILD +++ b/user/tlp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=tlp _pkgname=TLP -pkgver=1.2.2 +pkgver=1.3.1 pkgrel=0 pkgdesc="Linux Advanced Power Management" url="https://linrunner.de/en/tlp/tlp.html" @@ -13,6 +13,7 @@ depends="/bin/sh perl" makedepends="" subpackages="$pkgname-doc $pkgname-rdw $pkgname-bash-completion:bashcomp $pkgname-openrc" +install="$pkgname.post-upgrade" source="$pkgname-$pkgver.tar.gz::https://github.com/linrunner/$_pkgname/archive/$pkgver.tar.gz $pkgname.initd" builddir="$srcdir/$_pkgname-$pkgver" @@ -33,8 +34,7 @@ rdw() { pkgdesc="Linux Advanced Power Management - Radio Device Wizard" depends="tlp" - cd "$builddir" - make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw + make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 -C "$builddir" install-rdw } bashcomp() { @@ -49,5 +49,5 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/completions } -sha512sums="b01fc2063bf8a87f2b93749c08a5cab53a0a4030b74c7fe62964009fb9d54ca5dc10800971f27cfe6dcdf024ba6d3e21a06caed07e8dc12b09d9d359585a480e tlp-1.2.2.tar.gz +sha512sums="7ebb14ea797ad8aae613c537de51107a3c7430b5c6ee1407e722e2069ed5376f88ab3dac613651fafabd92d219b980452f236bef33e8a655b1abbfed5eded1b1 tlp-1.3.1.tar.gz e6de216b2540413812711b3304cdc29c8729d527080cfd747ba382db50166dd21c6c27ff467f9f2a967e92007c7a311b00e88262952c34a22f417578c66cf4e7 tlp.initd" diff --git a/user/tlp/tlp.post-upgrade b/user/tlp/tlp.post-upgrade new file mode 100644 index 000000000..6adf68850 --- /dev/null +++ b/user/tlp/tlp.post-upgrade @@ -0,0 +1,14 @@ +#!/bin/sh +ver_new="$1" +ver_old="$2" + +if [ "$(apk version -t "$ver_old" "1.3.1")" = "<" ]; then + cat >&2 <<-EOF + * + * tlp has moved its configuration from '/etc/default/tlp' + * to '/etc/tlp.conf' and '/etc/tlp.d'. Additionally, + * these configuration files are now parsed instead of + * executed via the shell, so expansions will no longer work. + * + EOF +fi diff --git a/user/tmux-bash-completion/APKBUILD b/user/tmux-bash-completion/APKBUILD index 8ddbcc875..fe35c7d11 100644 --- a/user/tmux-bash-completion/APKBUILD +++ b/user/tmux-bash-completion/APKBUILD @@ -7,17 +7,18 @@ pkgrel=0 pkgdesc="bash-completion files for tmux" url="https://github.com/imomaliev/tmux-bash-completion" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0-only" depends="bash-completion tmux" makedepends="" subpackages="" +install_if="tmux bash-completion" source="$pkgname-$pkgver.tar.gz::https://github.com/imomaliev/tmux-bash-completion/archive/$_commit.tar.gz" builddir="$srcdir/$pkgname-$_commit" package() { - cd "$builddir" - install -Dm644 ./completions/tmux "$pkgdir"/usr/share/bash-completion/completions/tmux + install -Dm644 "$builddir"/completions/tmux \ + "$pkgdir"/usr/share/bash-completion/completions/tmux } sha512sums="6c4c761aa152d1352a575c91e2c375d3f19ad01263b603b9e0cde4bdd95ce478c93bb55bfcd9fa5332cde12399e1e1e1c062e6be2ed7403b96e808275401effa tmux-bash-completion-1.0.0_git20170805.tar.gz" diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD index eed2ea5e2..b39d4a3b6 100644 --- a/user/tmux/APKBUILD +++ b/user/tmux/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=tmux -pkgver=2.9a -pkgrel=1 +pkgver=3.0a +pkgrel=0 pkgdesc="Tool to control multiple terminals from a single terminal" url="https://tmux.github.io/" arch="all" @@ -10,8 +10,7 @@ license="MIT" depends="ncurses-terminfo" makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz - xterm-DECLRMM.patch" +source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -33,10 +32,8 @@ package() { install -Dm644 example_tmux.conf \ "$pkgdir"/usr/share/doc/$pkgname/examples/$pkgname.conf - for file in CHANGES README TODO; do - install -m644 "$file" "$pkgdir"/usr/share/doc/$pkgname/ - done + install -m644 "CHANGES" "$pkgdir"/usr/share/doc/$pkgname/ + install -m644 "README" "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713 tmux-2.9a.tar.gz -7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773 xterm-DECLRMM.patch" +sha512sums="f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b tmux-3.0a.tar.gz" diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch deleted file mode 100644 index b9bef3455..000000000 --- a/user/tmux/xterm-DECLRMM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001 -From: nicm <nicm> -Date: Thu, 1 Aug 2019 11:45:34 +0000 -Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM - again. - ---- - tty.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tty.c b/tty.c -index ab1da9fd3..024aef271 100644 ---- a/tty.c -+++ b/tty.c -@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty) - tty->rlower = tty->rright = UINT_MAX; - - if (tty->flags & TTY_STARTED) { -+ if (tty_use_margin(tty)) -+ tty_puts(tty, "\033[?69h"); /* DECLRMM */ - tty_putcode(tty, TTYC_SGR0); - - tty->mode = ALL_MODES; diff --git a/user/torcs/APKBUILD b/user/torcs/APKBUILD index ef7c3cb23..d8470bf18 100644 --- a/user/torcs/APKBUILD +++ b/user/torcs/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0+" depends="" makedepends="freealut-dev freeglut-dev libogg-dev libpng-dev libsm-dev libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev libxt-dev mesa-dev - openal-soft-dev plib-dev zlib-dev" + openal-soft-dev plib-dev zlib-dev autoconf automake" subpackages="$pkgname-data::noarch" source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$pkgver.tar.bz2 torcs-1.3.6-as-needed.patch @@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$p " build() { - cd "$builddir" export CXXFLAGS="$CXXFLAGS -fpermissive" # GCC 8 autoreconf ./configure \ @@ -36,16 +35,14 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } data() { pkgdesc="Data files for TORCS" - cd "$builddir" mkdir -p "$subpkgdir"/usr/share/games chgrp games "$subpkgdir"/usr/share/games - make DESTDIR="$subpkgdir" datainstall + make DESTDIR="$subpkgdir" -C "$builddir" datainstall } sha512sums="14b88624803c746b2f356fa185aca5be56b7d7e5192fede11307474100328bfaa67eafa61e84987bbad04590ae5740127e015707723df6d2c3197bb867818101 torcs-1.3.7.tar.bz2 diff --git a/user/traceroute/APKBUILD b/user/traceroute/APKBUILD index 8eac94eb9..278a1d1c8 100644 --- a/user/traceroute/APKBUILD +++ b/user/traceroute/APKBUILD @@ -6,21 +6,18 @@ pkgrel=0 pkgdesc="Utility to trace the network route of packets" url="http://traceroute.sourceforge.net/" arch="all" +options="!check" # No test suite. license="GPL-2.0" depends="" makedepends="" -install="" -options="!check" subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" prefix="/usr" install ln -s traceroute "$pkgdir"/usr/bin/traceroute6 } diff --git a/user/transmission/APKBUILD b/user/transmission/APKBUILD index d7eb95544..9f2a97963 100644 --- a/user/transmission/APKBUILD +++ b/user/transmission/APKBUILD @@ -46,16 +46,14 @@ check() { # check for Qt - this historically has no tests msg "Checking for Transmission Qt" - cd qt - make check + make -C qt check } package() { make DESTDIR="$pkgdir" install # install for Qt - cd "$builddir"/qt - make INSTALL_ROOT="$pkgdir/usr" install + make INSTALL_ROOT="$pkgdir/usr" -C qt install } qt() { diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD index 8b063867c..f5b9ba519 100644 --- a/user/transset/APKBUILD +++ b/user/transset/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/tree/APKBUILD b/user/tree/APKBUILD index 84c872d47..fcbcbf694 100644 --- a/user/tree/APKBUILD +++ b/user/tree/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="http://mama.indstate.edu/users/ice/tree/src/$pkgname-$pkgver.tgz" build() { - cd "$builddir" make } package() { - cd "$builddir" make prefix="$pkgdir/usr" MANDIR="${pkgdir}/usr/share/man/man1" install } diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 07e4de092..9e71972d1 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -14,19 +14,16 @@ makedepends="freealut-dev glew-dev glu-dev openal-soft-dev physfs-dev sdl2-dev subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/trigger-rally/trigger-rally-$pkgver.tar.gz dont-strip.patch + sdl2-compat.patch trigger-rally.desktop " build() { - cd "$builddir"/src - make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr build + make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr -C src build } package() { - local _icon="" - - cd "$builddir"/src - make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr install + make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr -C src install install -D -m644 "$srcdir"/trigger-rally.desktop \ "$pkgdir"/usr/share/applications/trigger-rally.desktop @@ -41,4 +38,5 @@ package() { sha512sums="feed805858ef63907bb10088761f1219b22fe55ead268511ef73b18aa0f18d79e87d4e2cbfb76361b1dec3949b59464af33efe31e81f06ae7e163430f3336669 trigger-rally-0.6.6.1.tar.gz a81781058177e012daaad58d72e4bdbdbc2730b1df76941ba03f06367545b213ba82a33bab46deba31570973deb1802a3d459704c3a963c38eec69ef82f228d5 dont-strip.patch +e16fa74f1554cf8202f1ae5994c8f65eb311bf85ec9e89989911975db54d22c8e7dff559952e730972011b7dfabfd6aedb8c9f1d6292839734bfee54796b743a sdl2-compat.patch ddaf7d89353280f7952d6cffd06182ea28640473e18eff06809c48477349248f57922eaff9bf816261c32f8fdc167d933f345422f9885638041dd9f5e5ac0524 trigger-rally.desktop" diff --git a/user/trigger-rally/sdl2-compat.patch b/user/trigger-rally/sdl2-compat.patch new file mode 100644 index 000000000..ae3f7c609 --- /dev/null +++ b/user/trigger-rally/sdl2-compat.patch @@ -0,0 +1,11 @@ +--- trigger-rally-0.6.6.1/src/GNUmakefile.old 2020-01-12 09:46:17.392027213 +0000 ++++ trigger-rally-0.6.6.1/src/GNUmakefile 2020-01-12 09:56:43.744640443 +0000 +@@ -26,7 +26,7 @@ + INCDIRS := -I'./include' + CXXFLAGS += -std=c++11 $(WARNINGS) $(OPTIMS) + CPPFLAGS += $(DMACROS) $(INCDIRS) +-EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2 ++EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2-2.0 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2 + LDFLAGS += $(EXTRA_LIBS) + INSTALL_PROGRAM := install --mode=0755 + INSTALL_DATA := install --mode=0644 diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD index 429226f42..c55e5453c 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -1,25 +1,23 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=trojita pkgver=0.7 pkgrel=0 pkgdesc="Qt-based IMAP email client" url="http://trojita.flaska.net/" arch="all" -options="!check" license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1 WITH Nokia-Qt-exception-1.1 OR GPL-3.0-only) AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0-only AND LGPL-2.0+ AND LGPL-2.1+" depends="" -depends_dev="" +# Font required: https://github.com/qtwebkit/qtwebkit/issues/933 +checkdepends="ttf-liberation" makedepends="cmake extra-cmake-modules zlib-dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qttools-dev qt5-qtsvg-dev ragel mimetic-dev gpgme-dev - qtkeychain-dev $depends_dev" -install="" + qtkeychain-dev" source="https://sourceforge.net/projects/trojita/files/src/trojita-$pkgver.tar.xz use-qgpgme.patch fix-gpg.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,22 +29,15 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DWITH_GPGMEPP=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } -check() { - cd "$builddir" - make check -} - package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ttc-iosevka/APKBUILD b/user/ttc-iosevka/APKBUILD index c73630ad9..11366476e 100644 --- a/user/ttc-iosevka/APKBUILD +++ b/user/ttc-iosevka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttc-iosevka -pkgver=2.3.1 +pkgver=2.3.3 pkgrel=0 pkgdesc="Monospace sans-serif typeface" url="https://typeof.net/Iosevka/" @@ -13,11 +13,10 @@ makedepends="" subpackages="" source="https://github.com/be5invis/Iosevka/releases/download/v$pkgver/ttc-iosevka-$pkgver.zip https://github.com/be5invis/Iosevka/releases/download/v$pkgver/ttc-iosevka-slab-$pkgver.zip" -builddir="$srcdir" package() { - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttc + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$srcdir"/*.ttc } -sha512sums="09897ca5d7234c552ee1b9121b9a2f7879625a60cc2973cbf486ad30cb1758d4c7fcf1e7ccad882fa966ad3b35fba5ffd16e9c7b8fbb9b8983b0425bff6ee006 ttc-iosevka-2.3.1.zip -6bcb5db07f49db6dd4e6ecf271c203a53293c9f517dcb373c6a7cd9d6c351ee11c59fad99b46197ae705df9801072dd1ee3d2825d32675a05829c2573af82396 ttc-iosevka-slab-2.3.1.zip" +sha512sums="8943c1f8018469091d56adb731337c194e3b0c348a6c8b06a61f53410220aa505aeb03d6afc207c056a31f8e138c326b67595d79475d162bb172f8a812a3fbdb ttc-iosevka-2.3.3.zip +5caea2c5ed7729b3939b7470ad33b9ba0c068ea22e2db36ad46e3fd8cb78c22d917fb083a0efd672b77b12df73bfe6b75cf64742fb769e1fef036e421d4399d0 ttc-iosevka-slab-2.3.3.zip" diff --git a/user/ttf-alee/APKBUILD b/user/ttf-alee/APKBUILD index ffbf879a2..05d3333bc 100644 --- a/user/ttf-alee/APKBUILD +++ b/user/ttf-alee/APKBUILD @@ -15,8 +15,7 @@ source="http://deb.debian.org/debian/pool/main/f/fonts-alee/fonts-alee_$pkgver.t builddir="$srcdir"/fonts-alee-$pkgver package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf } sha512sums="fc91a018c0757fce1b899ecf736260b96c7acc9c8ec626fb8d53f8e002d89ca23bdaf3a5712e747cfa63f53463c5471da292af715968a5612a17d7499222bc45 fonts-alee_13.3.tar.xz" diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD index d4a67e4a0..e6251fcda 100644 --- a/user/ttf-freefont/APKBUILD +++ b/user/ttf-freefont/APKBUILD @@ -13,11 +13,10 @@ source="https://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.zip" builddir="$srcdir/freefont-$pkgver" package() { - cd "$builddir" install -d "$pkgdir/usr/share/fonts/$pkgname/" - install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/" + install -m644 "$builddir"/*.ttf "$pkgdir/usr/share/fonts/$pkgname/" # Licensing exception is discussed in README in pkgver==20120503 - install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" + install -Dm644 "$builddir"/README "$pkgdir/usr/share/licenses/$pkgname/README" } sha512sums="dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e freefont-ttf-20120503.zip" diff --git a/user/ttf-hack/APKBUILD b/user/ttf-hack/APKBUILD index 433d1c1f4..d5fbf1b07 100644 --- a/user/ttf-hack/APKBUILD +++ b/user/ttf-hack/APKBUILD @@ -11,12 +11,10 @@ license="OFL-2.0" depends="" makedepends="" source="https://github.com/source-foundry/Hack/releases/download/v$pkgver/Hack-v$pkgver-ttf.zip" -builddir="$srcdir"/ttf package() { - cd "$builddir" for variant in Regular Bold BoldItalic Italic; do - install -m644 -D Hack-$variant.ttf \ + install -m644 -D "$srcdir"/ttf/Hack-$variant.ttf \ "$pkgdir"/usr/share/fonts/truetype/Hack-$variant.ttf done } diff --git a/user/ttf-sinhala-lklug/APKBUILD b/user/ttf-sinhala-lklug/APKBUILD index c487c96f4..dae2dfe1e 100644 --- a/user/ttf-sinhala-lklug/APKBUILD +++ b/user/ttf-sinhala-lklug/APKBUILD @@ -14,8 +14,8 @@ subpackages="" source="http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-$pkgver.tar.gz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ lklug.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ \ + "$builddir"/lklug.ttf } sha512sums="d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa ttf-sinhala-lklug-0.6.tar.gz" diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 62883e32e..23d44cdb2 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ttf-sudo -pkgver=0.37 +pkgver=0.40 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://www.kutilek.de/sudo-font/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" @@ -14,11 +14,10 @@ source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo builddir="$srcdir/sudo" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} for i in *.ttf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} done } -sha512sums="9622d6f6aaf6724255d62b655b9bdb0fb9b67b66aa367f10df6fec5efd1d68e6da34a8b58bee04fb1d277bb225ed7bf17491e50e27a13383c7c9a79172439b4f sudo.zip" +sha512sums="c585866ff72bf94ed4bd452a238bfd7d603c813b9105d0d57f1c91dc5c14d5bbee6f8707497a1644b5be1657d81f6a337fc4f16a79ddad519d208c7c03a2f045 sudo.zip" diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index ebb4f09f4..fd1543413 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ttf-terminus pkgver=4.47.0 pkgrel=0 pkgdesc="TrueType variant of Terminus Font" url="https://files.ax86.net/terminus-ttf/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" @@ -14,7 +14,6 @@ source="https://files.ax86.net/terminus-ttf/files/$pkgver/terminus-ttf-$pkgver.z builddir="$srcdir/terminus-ttf-$pkgver" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} for i in *.ttf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 98adfba5d..723a1b2ff 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=tumbler -pkgver=0.2.7 -pkgrel=1 +pkgver=0.2.8 +pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d5121da67bc2b1bf115980b6c9ef9fcaf71cdf52976227dd360afa44ac477c305a774a29be876e4fd0874f71bae3682b28c2429864283dd14b9e9bd1790a9083 tumbler-0.2.7.tar.bz2" +sha512sums="cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb tumbler-0.2.8.tar.bz2" diff --git a/user/twm/APKBUILD b/user/twm/APKBUILD index fad37c996..de08c9b46 100644 --- a/user/twm/APKBUILD +++ b/user/twm/APKBUILD @@ -16,7 +16,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index 08770a326..153dfc63b 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=uchardet pkgver=0.0.6 pkgrel=0 @@ -7,14 +7,12 @@ pkgdesc="Universal character encoding detection library" url="https://www.freedesktop.org/wiki/Software/uchardet/" arch="all" 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" -sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" -builddir="$srcdir/uchardet-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,17 +23,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" diff --git a/user/ucpp/APKBUILD b/user/ucpp/APKBUILD index 9d45b1d0a..59f118c41 100644 --- a/user/ucpp/APKBUILD +++ b/user/ucpp/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://gitlab.com/scarabeusiv/ucpp/uploads/79f08e39c676f15ed8a59335f6c9b924/ucpp-1.3.5.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,7 +22,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/udisks2/50-udisks2.rules b/user/udisks2/50-udisks2.rules new file mode 100644 index 000000000..4c6088eaf --- /dev/null +++ b/user/udisks2/50-udisks2.rules @@ -0,0 +1,28 @@ +// Source: https://gist.github.com/Scrumplex/8f528c1f63b5f4bfabe14b0804adaba7 +// Original rules: https://github.com/coldfix/udiskie/wiki/Permissions +// Changes: Added org.freedesktop.udisks2.filesystem-mount-system, as this is used by Dolphin. + +polkit.addRule(function(action, subject) { + var YES = polkit.Result.YES; + // NOTE: there must be a comma at the end of each line except for the last: + var permission = { + // required for udisks2: + "org.freedesktop.udisks2.filesystem-mount": YES, + "org.freedesktop.udisks2.encrypted-unlock": YES, + "org.freedesktop.udisks2.eject-media": YES, + "org.freedesktop.udisks2.power-off-drive": YES, + // Dolphin specific + "org.freedesktop.udisks2.filesystem-mount-system": YES, + // required for udisks2 if using another seat: + "org.freedesktop.udisks2.filesystem-mount-other-seat": YES, + "org.freedesktop.udisks2.filesystem-unmount-others": YES, + "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES, + "org.freedesktop.udisks2.eject-media-other-seat": YES, + "org.freedesktop.udisks2.power-off-drive-other-seat": YES + }; + // This is a terrible group choice, but nobody on the Horizon team wanted to + // give admins 'disk', which would be so much more appropriate... + if (subject.isInGroup("usb")) { + return permission[action.id]; + } +}); diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 07921ae96..02118dcd5 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 pkgver=2.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -13,6 +13,7 @@ depends_dev="acl-dev gobject-introspection-dev libatasmart-dev libblockdev-dev makedepends="$depends_dev glib-dev gtk-doc intltool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://github.com/storaged-project/udisks/releases/download/udisks-$pkgver/udisks-$pkgver.tar.bz2 + 50-udisks2.rules O_CLOEXEC.patch " builddir="$srcdir"/udisks-$pkgver @@ -37,6 +38,8 @@ check() { package() { make DESTDIR="$pkgdir" install + install -D -m644 "$srcdir"/50-udisks2.rules \ + "$pkgdir"/etc/polkit-1/rules.d/50-udisks2.rules } libs() { @@ -49,4 +52,5 @@ libs() { } sha512sums="70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c udisks-2.8.4.tar.bz2 +e2b2cc10868ca341603c3403631b9962c9c776bf96f4ac2c764425363ffdbe1cd9c35233e568f84b276a1f6702b1ac5b9a14b4a62983067c44c433b58d1b7175 50-udisks2.rules 4352d63458ca51b362844d60109948ebeeecdc492a93443b391c0d75b6fff0c0af5018c8a8e441fb37bffd59c734298eaa936fcb0cd4c42ac55c1298b398b1dc O_CLOEXEC.patch" diff --git a/user/ufw/APKBUILD b/user/ufw/APKBUILD new file mode 100644 index 000000000..10ea2ab5e --- /dev/null +++ b/user/ufw/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: +# Maintainer: +pkgname=ufw +pkgver=0.36 +pkgrel=0 +pkgdesc="Uncomplicated Firewall" +url="https://launchpad.net/ufw" +arch="noarch" +options="!check" # No test suite. +license="GPL-3.0-only AND GPL-2.0-only" +depends="python3 iptables" +makedepends="python3-dev gettext-tiny-dev" +subpackages="ufw-doc + ufw-openrc + " +source="http://launchpad.net/ufw/$pkgver/$pkgver/+download/$pkgname-$pkgver.tar.gz + ufw-0.36-bash-completion.patch + ufw-0.36-move-path.patch + + ufw.initd + ufw.confd + " + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --root="$pkgdir" + gzip "$pkgdir"/usr/share/man/man8/ufw.8 + gzip "$pkgdir"/usr/share/man/man8/ufw-framework.8 + install -D -m755 "$srcdir"/ufw.initd \ + "$pkgdir"/etc/init.d/ufw + install -D -m644 "$srcdir"/ufw.confd \ + "$pkgdir"/etc/conf.d/ufw +} + +sha512sums="b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3 ufw-0.36.tar.gz +11a9cf4906fa0bd677e745615b3c4d663512a1d05f9c21149d09624237a88938b9ed83b8ca876dbcf9bbac41a4bf7155eba76ec32778e025f013e1ffb07e4abb ufw-0.36-bash-completion.patch +228ed40f800b8ed4bbc217df9478c1c0be5eb1ec154abd2d3a3cd6c92902632f07ef70c3ca3f2478bfe501735a0f6f0b7fa8d8f4991fdaead4332e4c65bad0c9 ufw-0.36-move-path.patch +f6cb7f6f7713d6f2c78c0b0254f385701f28b997931007997f0702af0dcd0d1b1bf08617dbb3abd21219c23a63ec3286e019896253ff7e9bdbb218a5bb17dd80 ufw.initd +a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 ufw.confd" diff --git a/user/ufw/ufw-0.36-bash-completion.patch b/user/ufw/ufw-0.36-bash-completion.patch new file mode 100644 index 000000000..927af244e --- /dev/null +++ b/user/ufw/ufw-0.36-bash-completion.patch @@ -0,0 +1,16 @@ +--- a/shell-completion/bash 2018-12-14 21:25:55.000000000 +0300 ++++ b/shell-completion/bash 2019-03-21 01:26:46.152181981 +0300 +@@ -57,7 +57,6 @@ + echo "numbered verbose" + } + +-_have ufw && + _ufw() + { + cur=${COMP_WORDS[COMP_CWORD]} +@@ -91,4 +90,4 @@ + fi + } + +-_have ufw && complete -F _ufw ufw ++complete -F _ufw ufw diff --git a/user/ufw/ufw-0.36-move-path.patch b/user/ufw/ufw-0.36-move-path.patch new file mode 100644 index 000000000..1ba9d117b --- /dev/null +++ b/user/ufw/ufw-0.36-move-path.patch @@ -0,0 +1,174 @@ +--- a/doc/ufw-framework.8 2018-12-14 21:25:55.000000000 +0300 ++++ b/doc/ufw-framework.8 2019-03-21 00:12:37.852104313 +0300 +@@ -18,7 +18,7 @@ + parameters and configuration of IPv6. The framework consists of the following + files: + .TP +-#STATE_PREFIX#/ufw\-init ++#SHARE_DIR#/ufw\-init + initialization script + .TP + #CONFIG_PREFIX#/ufw/before.init +@@ -47,7 +47,7 @@ + + .SH "BOOT INITIALIZATION" + .PP +-\fBufw\fR is started on boot with #STATE_PREFIX#/ufw\-init. This script is a ++\fBufw\fR is started on boot with #SHARE_DIR#/ufw\-init. This script is a + standard SysV style initscript used by the \fBufw\fR command and should not be + modified. The #CONFIG_PREFIX#/before.init and #CONFIG_PREFIX#/after.init + scripts may be used to perform any additional firewall configuration that is +--- a/README 2018-07-24 16:42:38.000000000 +0300 ++++ b/README 2019-03-21 00:18:18.253205303 +0300 +@@ -60,7 +60,7 @@ + on your needs, this can be as simple as adding the following to a startup + script (eg rc.local for systems that use it): + +-# /lib/ufw/ufw-init start ++# /usr/share/ufw/ufw-init start + + For systems that use SysV initscripts, an example script is provided in + doc/initscript.example. See doc/upstart.example for an Upstart example and +@@ -74,10 +74,9 @@ + /etc/defaults/ufw high level configuration + /etc/ufw/before[6].rules rules evaluated before UI added rules + /etc/ufw/after[6].rules rules evaluated after UI added rules +-/lib/ufw/user[6].rules UI added rules (not to be modified) ++/etc/ufw/user/user[6].rules UI added rules (not to be modified) + /etc/ufw/sysctl.conf kernel network tunables +-/lib/ufw/ufw-init start script +- ++/usr/share/ufw/ufw-init start script + + Usage + ----- +@@ -152,7 +151,7 @@ + that the primary chains don't move around other non-ufw rules and chains. To + completely flush the built-in chains with this configuration, you can use: + +-# /lib/ufw/ufw-init flush-all ++# /usr/share/ufw/ufw-init flush-all + + Alternately, ufw may also take full control of the firewall by setting + MANAGE_BUILTINS=yes in /etc/defaults/ufw. This will flush all the built-in +@@ -260,7 +259,7 @@ + + Remote Management + ----------------- +-On /lib/ufw/ufw-init start and 'ufw enable' the chains are flushed, so ++On /usr/share/ufw/ufw-init start and 'ufw enable' the chains are flushed, so + ssh may drop. This is needed so ufw is in a consistent state. Once the ufw is + 'enabled' it will insert rules into the existing chains, and therefore not + flush the chains (but will when modifying a rule or changing the default +@@ -303,7 +302,7 @@ + + Distributions + ------------- +-While it certainly ok to use /lib/ufw/ufw-init as the initscript for ++While it certainly ok to use /usr/share/ufw/ufw-init as the initscript for + ufw, this script is meant to be used by ufw itself, and therefore not + particularly user friendly. See doc/initscript.example for a simple + implementation that can be adapted to your distribution. +--- a/setup.py 2018-12-14 21:25:55.000000000 +0300 ++++ b/setup.py 2019-03-21 00:44:49.603002503 +0300 +@@ -55,7 +55,7 @@ + return + + real_confdir = os.path.join('/etc') +- real_statedir = os.path.join('/lib', 'ufw') ++ real_statedir = os.path.join('/etc', 'ufw', 'user') + real_prefix = self.prefix + if self.home != None: + real_confdir = self.home + real_confdir +@@ -132,14 +132,20 @@ + self.copy_file('doc/ufw.8', manpage) + self.copy_file('doc/ufw-framework.8', manpage_f) + +- # Install state files and helper scripts ++ # Install state files + statedir = real_statedir + if self.root != None: + statedir = self.root + real_statedir + self.mkpath(statedir) + +- init_helper = os.path.join(statedir, 'ufw-init') +- init_helper_functions = os.path.join(statedir, 'ufw-init-functions') ++ # Install helper scripts ++ sharedir = real_sharedir ++ if self.root != None: ++ sharedir = self.root + real_sharedir ++ self.mkpath(sharedir) ++ ++ init_helper = os.path.join(sharedir, 'ufw-init') ++ init_helper_functions = os.path.join(sharedir, 'ufw-init-functions') + self.copy_file('src/ufw-init', init_helper) + self.copy_file('src/ufw-init-functions', init_helper_functions) + +@@ -220,14 +226,19 @@ + f]) + + subprocess.call(["sed", ++ "-i", ++ "s%#SHARE_DIR#%" + real_sharedir + "%g", ++ f]) ++ ++ subprocess.call(["sed", + "-i", + "s%#VERSION#%" + ufw_version + "%g", + f]) + + # Install pristine copies of rules files +- sharedir = real_sharedir +- if self.root != None: +- sharedir = self.root + real_sharedir ++ #sharedir = real_sharedir ++ #if self.root != None: ++ # sharedir = self.root + real_sharedir + rulesdir = os.path.join(sharedir, 'iptables') + self.mkpath(rulesdir) + for f in [ before_rules, after_rules, \ +--- a/src/backend_iptables.py 2018-12-14 21:25:55.000000000 +0300 ++++ b/src/backend_iptables.py 2019-03-21 00:52:10.416829220 +0300 +@@ -38,6 +38,7 @@ + files = {} + config_dir = _findpath(ufw.common.config_dir, datadir) + state_dir = _findpath(ufw.common.state_dir, datadir) ++ share_dir = _findpath(ufw.common.share_dir, datadir) + + files['rules'] = os.path.join(config_dir, 'ufw/user.rules') + files['before_rules'] = os.path.join(config_dir, 'ufw/before.rules') +@@ -45,7 +46,7 @@ + files['rules6'] = os.path.join(config_dir, 'ufw/user6.rules') + files['before6_rules'] = os.path.join(config_dir, 'ufw/before6.rules') + files['after6_rules'] = os.path.join(config_dir, 'ufw/after6.rules') +- files['init'] = os.path.join(state_dir, 'ufw-init') ++ files['init'] = os.path.join(share_dir, 'ufw-init') + + ufw.backend.UFWBackend.__init__(self, "iptables", dryrun, files, + rootdir=rootdir, datadir=datadir) +--- a/src/ufw-init 2018-03-30 22:45:52.000000000 +0300 ++++ b/src/ufw-init 2019-03-21 01:06:32.720483789 +0300 +@@ -31,10 +31,11 @@ + fi + export DATA_DIR="$datadir" + +-if [ -s "${rootdir}#STATE_PREFIX#/ufw-init-functions" ]; then +- . "${rootdir}#STATE_PREFIX#/ufw-init-functions" ++if [ -s "${rootdir}#SHARE_DIR#/ufw-init-functions" ]; then ++ . "${rootdir}#SHARE_DIR#/ufw-init-functions" ++ + else +- echo "Could not find ${rootdir}#STATE_PREFIX#/ufw-init-functions (aborting)" ++ echo "Could not find ${rootdir}#SHARE_DIR#/ufw-init-functions (aborting)" + exit 1 + fi + +@@ -83,7 +84,7 @@ + fi + ;; + *) +- echo "Usage: #STATE_PREFIX#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}" ++ echo "Usage: #SHARE_DIR#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}" + exit 1 + ;; + esac diff --git a/user/ufw/ufw.confd b/user/ufw/ufw.confd new file mode 100644 index 000000000..900d3bf67 --- /dev/null +++ b/user/ufw/ufw.confd @@ -0,0 +1,5 @@ +# If equals to "yes", warnings that firewall is disabled +# (using `ufw disable') will be suppressed and the service +# will be considered started. +# Default if unset or another value is "no". +ufw_nonfatal_if_disabled=no diff --git a/user/ufw/ufw.initd b/user/ufw/ufw.initd new file mode 100644 index 000000000..bccd83ddb --- /dev/null +++ b/user/ufw/ufw.initd @@ -0,0 +1,136 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + before net + provide firewall +} + +start() { + ebegin "Starting ufw" + _source_file || { eend $?; return $?; } + + local enabled_in_cfg ret + _check_if_enabled_in_cfg + enabled_in_cfg=$? + + # Avoid "Firewall already started, use 'force-reload'" message that + # appears if `ufw enable' had been run before start(). + if _status_quiet; then + eend 0 + return + fi + + # The ufw_start function does the same: if ufw is disabled using `ufw disable', + # ufw_start would not start ufw and return 0, so let's handle this case. + case $enabled_in_cfg in + 0) + ufw_start + ret=$? + eend $ret "Failed to start ufw." + ;; + 1) + # see /etc/conf.d/<name> + if [ "${ufw_nonfatal_if_disabled:-no}" != "yes" ]; then + ret=1 + eend $ret "Not starting firewall (not enabled), use \"ufw enable\" first." + else + ret=0 + eend 0 + fi + ;; + 2) + ret=1 + eend $ret "Failed to start ufw." + ;; + esac + + return $ret +} + +stop() { + ebegin "Stopping ufw" + _source_file || { eend $?; return $?; } + local enabled_in_cfg ret + _check_if_enabled_in_cfg + enabled_in_cfg=$? + + # Same as above (unless --force is passed to ufw_stop). + case $enabled_in_cfg in + 0) + ufw_stop + ret=$? + ;; + 1) + einfo "INFO: ufw is configured to be disabled" + ufw_stop --force + ret=$? + ;; + 2) + ret=1 + ;; + esac + + eend $ret "Failed to stop ufw." + return $ret +} + +_status_quiet() { + # return values: 0 - started, 1 - stopped, 2 - error + # Does not execute _source_file. + local ret + ufw_status > /dev/null + ret=$? + # Return values for ufw_status come from /usr/share/ufw/ufw-init-functions. + case $ret in + 0) return 0 ;; + 3) return 1 ;; + *) return 2 ;; + esac +} + +_source_file() { + local sourced_f="/usr/share/ufw/ufw-init-functions" + if [ ! -f "$sourced_f" ]; then + eerror "Cannot find file $sourced_f!" + return 1 + fi + + local _path=$PATH + if ! . "$sourced_f"; then + # PATH can be broken here, fix it... + PATH=$_path + eerror "Error sourcing file $sourced_f" + return 1 + fi + + if [ -z "$PATH" ]; then + PATH=$_path + else + PATH="${PATH}:${_path}" + fi + return 0 +} + +_check_if_enabled_in_cfg() { + # Check if user has enabled the firewall with "ufw enable". + # Return 0 if firewall enabled in configuration file, 1 otherwise, 2 on error. + + local sourced_f="/etc/ufw/ufw.conf" + if [ ! -f "$sourced_f" ]; then + eerror "Cannot find file $sourced_f!" + return 2 + fi + + if ! . "$sourced_f"; then + eerror "Error sourcing file $sourced_f" + return 2 + fi + + if [ "$ENABLED" = "yes" ] || [ "$ENABLED" = "YES" ]; then + return 0 + else + return 1 + fi +} diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 67f2fa698..ae1798e8e 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -14,12 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcrash-dev kdoctools-dev kiconthemes-dev kdelibs4support-dev kio-dev ktexteditor-dev kwindowsystem-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/umbrello-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/umbrello-$pkgver.tar.xz hax.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +29,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a251d6e65cb0b177fee88cadaea1cc9105ac5a0b0b8ab09b31a279c4e473fdeea3acf9a7b54b66178b4d77460bc1406caf4bb03844f8c57f46175bff6c587525 umbrello-19.08.2.tar.xz +sha512sums="f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a umbrello-19.12.3.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/umbrello/assertion-fix.patch b/user/umbrello/assertion-fix.patch deleted file mode 100644 index ef86e6546..000000000 --- a/user/umbrello/assertion-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af72e059f728d70e43ac3ea03653865585818e66 Mon Sep 17 00:00:00 2001 -From: Ralf Habacker <ralf.habacker@freenet.de> -Date: Fri, 2 Nov 2018 11:38:37 +0100 -Subject: Fix 'Umbrello fails to start due to ASSERT failure in QVector<T>::at - "index out of range"' - -The backtrace shows that Qt wants to access tree view items that -have already been deleted. To avoid this, graphical updates are -disabled when creating the new document. - -BUG:400501 -FIXED-IN:2.26.3 (KDE Applications 18.08.3) ---- - umbrello/umldoc.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp -index d4099bb..af5c889 100644 ---- a/umbrello/umldoc.cpp -+++ b/umbrello/umldoc.cpp -@@ -442,6 +442,9 @@ void UMLDoc::closeDocument() - */ - bool UMLDoc::newDocument() - { -+ bool state = UMLApp::app()->document()->loading(); -+ UMLApp::app()->document()->setLoading(false); -+ - closeDocument(); - UMLApp::app()->setCurrentView(0); - setUrlUntitled(); -@@ -465,6 +468,7 @@ bool UMLDoc::newDocument() - UMLApp::app()->enableUndoAction(false); - UMLApp::app()->clearUndoStack(); - -+ UMLApp::app()->document()->setLoading(state); - return true; - } - --- -cgit v0.11.2 - diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD index e04ea0459..9883dce69 100644 --- a/user/unbound/APKBUILD +++ b/user/unbound/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=unbound -pkgver=1.9.4 +pkgver=1.9.6 pkgrel=0 pkgdesc="A validating, recursive and caching DNS resolver" url="https://nlnetlabs.nl/projects/unbound/about/" @@ -18,6 +18,10 @@ source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz unbound.confd unbound.initd" +# secfixes: +# 1.9.5-r0: +# - CVE-2019-18934 + build() { # cachedb, dnscrypt and dnstap have yet unpackaged dependencies PYTHON_VERSION=3 ./configure \ @@ -66,6 +70,6 @@ python() { mv "$pkgdir/usr/lib/python"* "$subpkgdir" } -sha512sums="44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c unbound-1.9.4.tar.gz +sha512sums="39a60f51da912ed25d247bc1e882b1242d80a63b0c2b3f753d38ed558f3a24691267375136ff6d85e5945a98ca0c4ac87e43e131c97737a355374dde64259951 unbound-1.9.6.tar.gz de9dc269553f5449c1757690c2a8a3b9f228964f5672d721cfdbc29e6fab8954907fa4fa3761dd6f705b3ccd2f729cc6e2fe870107feb68cca611589f8306b94 unbound.confd 6627cbcbcb4e04f596e7e0ffdbf80ceb54cdb59144cb89896e53503dfb41b99fd77d8b85d05e6670f77023b6eafec8885b00c0c8e4e34e3e638c52c037a7985e unbound.initd" diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD index 310ed9347..799b9fd2c 100644 --- a/user/unicode-data/APKBUILD +++ b/user/unicode-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=unicode-data pkgver=12.1.0 pkgrel=0 @@ -19,20 +19,19 @@ source="https://unicode.org/Public/$pkgver/ucd/Blocks.txt " package() { - cd "$srcdir" mkdir -p "$pkgdir"/usr/share/unicode/$pkgver install -m644 -t "$pkgdir"/usr/share/unicode/$pkgver \ - Blocks.txt \ - DerivedAge.txt \ - NamesList.txt \ - Scripts.txt \ - UnicodeData.txt \ - Unihan.zip + "$srcdir"/Blocks.txt \ + "$srcdir"/DerivedAge.txt \ + "$srcdir"/NamesList.txt \ + "$srcdir"/Scripts.txt \ + "$srcdir"/UnicodeData.txt \ + "$srcdir"/Unihan.zip } -sha512sums="e3ead1233c29a13d46ffcc4b1c8b685144444579fb9231189f2724d9161adcdba39e9dd468c2d791af32538aa6d3f39f1e3f19c6d73eab432ac006526dc6c3ae Blocks.txt -2cfe840bd5c72a7a47a15123e936cf96677ad66e2caecb7f580b98de83054a17cf49cd26b6470084979bdb3cf8818ea9799dab220108b7bf3a813f65bb1ed86e DerivedAge.txt -de087e89be129928de87ebb9370f95ab9964c491a41f306791884c6d0452407b8530b7d47804cb3f0442e29d4c98d84867c82c90b46f3fbc1a7ee3fb6ce97005 NamesList.txt -d25c87b58df3096d1dc26a81edc01eb1d08c62510b38854683ca91978a2a4df12ca0b29731c8d0211555387da604b5e8da7d5f5a5f9d57052f1bc502ecd2154e Scripts.txt -be1844662041d022c57c2f81b971d395a0ba3a5824de4a5c1c8076ed66955f590a9d624d8abc189a66b7d35ba7fa7d63be727e8bdd9c3dff01251a34f2b84729 UnicodeData.txt +sha512sums="2cd8a92ec3feabd77ddd48f7553287c057b9ff968244a91a29754837fe4e02175a0fd9d848bdab946fc44bd249442fe5862bb892d0e714ee3dadd571f1f7b77c Blocks.txt +999db016b6a0bc3628cbdff22f027019f88f00383eff77a6ee0a1eeb92ddc29a30a2c9ab0568f22b412e11598b5953d3d91bd5dadea457d1721b9bf79f637264 DerivedAge.txt +feed2bc6c95042c480ddca92ad2515277314e1937a15603f8a3e816e021adad0662e1fe0d5149d7dbb14f54b13ef9bf433a0306dd63daf7c2fc0907ba4ae4bbd NamesList.txt +17678d900ac545641c214436b36489962be3566d355e2fe08ac30be5759bf68851e34c44100bf3d5dc72833a9a679745829c7772f48a59786cbd87973acfd4ef Scripts.txt +09be79ddcc2e019584522635f7c134bcd0ca50baf3517b6eb8ef76e5ce8109a6a8b20f3af593e7e8ab94e5bec1b98ebf43d79de53890d6bac3f33b9abb0e35c6 UnicodeData.txt 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 Unihan.zip" diff --git a/user/unittest-cpp/APKBUILD b/user/unittest-cpp/APKBUILD index 62a54662c..647b16973 100644 --- a/user/unittest-cpp/APKBUILD +++ b/user/unittest-cpp/APKBUILD @@ -8,12 +8,12 @@ url=" " arch="all" license="MIT" depends="" -makedepends="" +makedepends="bash" subpackages="$pkgname-dev" source="https://github.com/unittest-cpp/unittest-cpp/releases/download/v$pkgver/unittest-cpp-$pkgver.tar.gz" build() { - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/unixodbc/APKBUILD b/user/unixodbc/APKBUILD index e631d0f45..03f3c78cc 100644 --- a/user/unixodbc/APKBUILD +++ b/user/unixodbc/APKBUILD @@ -3,7 +3,7 @@ pkgname=unixodbc pkgver=2.3.7 pkgrel=0 -pkgdesc="Library for accessing ODBC data sources" +pkgdesc="Unix ODBC driver manager and database drivers" url="http://www.unixodbc.org/" arch="all" options="!check" # No test suite. @@ -15,7 +15,6 @@ source="ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${pkgver}.tar.gz" builddir="$srcdir/unixODBC-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index 376ca208c..d74044821 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -9,7 +9,7 @@ options="!check" # Requires running dbus. license="GPL-2.0+" depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev +makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+2.0-dev libgudev-dev libusb-dev libxslt linux-headers polkit-dev" source="https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz" diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD index e92be5366..22e1b57c6 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -1,21 +1,22 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=uptimed pkgver=0.4.2 pkgrel=0 -pkgdesc='System uptime record daemon' +pkgdesc="System uptime record daemon" arch="all" -options="!check" # No tests +options="!check" # No test suite. url="https://github.com/rpodgorny/uptimed" license="GPL-2.0-only" -subpackages="$pkgname-doc $pkgname-openrc" +depends="" makedepends="autoconf automake libtool" +subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/rpodgorny/uptimed/archive/v$pkgver.tar.gz - uptimed.init" + uptimed.init + " build() { - cd "$builddir" autoreconf -vif ./configure \ --build=$CBUILD \ @@ -27,7 +28,6 @@ build() { } package() { - cd "$builddir" make install DESTDIR="$pkgdir" mv "$pkgdir"/etc/uptimed.conf-dist \ "$pkgdir"/etc/uptimed.conf diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD index f15189502..3d1388740 100644 --- a/user/urw-base35-fonts/APKBUILD +++ b/user/urw-base35-fonts/APKBUILD @@ -10,11 +10,10 @@ options="!check" # No tests provided. license="AGPL-3.0-only WITH font-exception" depends="" makedepends="" +subpackages="" source="urw-base35-fonts-$pkgver.tar.gz::https://github.com/ArtifexSoftware/urw-base35-fonts/archive/$pkgver.tar.gz" package() { - local _fconf - mkdir -p "$pkgdir"/usr/share/fonts/ttf-urw-base35 cp -a "$builddir"/fonts/*.otf "$pkgdir"/usr/share/fonts/ttf-urw-base35/ diff --git a/user/usbredir/APKBUILD b/user/usbredir/APKBUILD index ef23e2697..51b5da16c 100644 --- a/user/usbredir/APKBUILD +++ b/user/usbredir/APKBUILD @@ -7,12 +7,12 @@ url="https://www.spice-space.org/usbredir.html" arch="all" options="!check" # No test suite. license="GPL-2.0-or-later AND LGPL-2.1-or-later" +depends="" makedepends="libusb-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-server" source="https://www.spice-space.org/download/usbredir/usbredir-$pkgver.tar.bz2 " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } check() { - cd "$builddir" make check } diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD index 69a6b1618..71386fa2b 100644 --- a/user/usbutils/APKBUILD +++ b/user/usbutils/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="USB utilities" url="http://linux-usb.sourceforge.net/" arch="all" license="GPL-2.0+ AND GPL-2.0-only" -subpackages="$pkgname-doc" depends="hwids-udev" -makedepends="autoconf automake eudev-dev libusb-dev" +makedepends="autoconf automake eudev-dev libtool libusb-dev" +subpackages="$pkgname-doc" source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz hwdata.patch " diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD index cddcb2960..28896f284 100644 --- a/user/user-manager/APKBUILD +++ b/user/user-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=user-manager -pkgver=5.12.8 +pkgver=5.18.3 pkgrel=0 pkgdesc="Manage user accounts from KDE" url="https://www.KDE.org/" @@ -25,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2dd6ce318bede7fea7e80e54e1f9432b0dfa5e99e34def28d91c99230de175a9d84acf6c3a4b0c27fb311a34ddd3d98b0d7dbf3cbacd0e030c880b853279430d user-manager-5.12.8.tar.xz" +sha512sums="58f816767c8c2802a7da4d95d9a06103bface3b2b28846e19c7967a8b1f941deba0de1476c24d4951d1fa77ea13caa4c9ece9a4a4777c108bedb10390bdbaad7 user-manager-5.18.3.tar.xz" diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD index 4b8d6ac3a..459901e02 100644 --- a/user/utf8proc/APKBUILD +++ b/user/utf8proc/APKBUILD @@ -8,7 +8,7 @@ url="http://juliastrings.github.io/utf8proc" arch="all" license="MIT AND Unicode-DFS-2016" depends="" -makedepends="" +makedepends="cmake" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz https://dev.sick.bike/dist/$pkgname-testdata-$pkgver.tar.gz" diff --git a/user/util-macros/APKBUILD b/user/util-macros/APKBUILD index f5b24e8b2..6fd8f59b2 100644 --- a/user/util-macros/APKBUILD +++ b/user/util-macros/APKBUILD @@ -11,7 +11,6 @@ makedepends="" source="https://www.X.Org/releases/individual/util/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,14 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 util-macros-1.19.2.tar.bz2" diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index fa9acbd21..2c6857f78 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" arch="all" license="LGPL-2.0+" +depends="" makedepends="qt5-qtbase-dev libjpeg-turbo-dev argp-standalone linux-headers eudev-dev alsa-lib-dev" subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-libs ir_keytable" @@ -14,6 +15,7 @@ source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2 qv4l2.svg qv4l2.desktop getsubopt.patch + time64.patch types.patch " @@ -78,4 +80,5 @@ sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop a09554deebd7597355c688e52180e0f4030842ccb26a144d1ac8a426836374237725d7b6b555027ca72e10c11e37bd596c7d69d87ee2f6b6d951daf4e50137f8 getsubopt.patch +16154d57ea0b2e231217894495ef4ecf55d45e97c936034d4bbb0dab88f2d3e8779073302fbba759bd60e124a2cefe2b83675952cd50c413d957c81c9b0b8b53 time64.patch ee1228cc06e399923953e5121a683347a7fe881c80c55faae0adf6ed836251da1b2c4d1561454daa6f42220c1171f827ca3e2b72cdac31b379495f23ff6c56bb types.patch" diff --git a/user/v4l-utils/time64.patch b/user/v4l-utils/time64.patch new file mode 100644 index 000000000..42092a773 --- /dev/null +++ b/user/v4l-utils/time64.patch @@ -0,0 +1,11 @@ +--- v4l-utils-1.18.0/utils/keytable/keytable.c.old 2019-09-22 09:22:54.000000000 +0000 ++++ v4l-utils-1.18.0/utils/keytable/keytable.c 2020-01-20 02:38:23.659004998 +0000 +@@ -1533,7 +1533,7 @@ + + for (i = 0; i < rd / sizeof(struct input_event); i++) { + printf(_("%ld.%06ld: event type %s(0x%02x)"), +- ev[i].time.tv_sec, ev[i].time.tv_usec, ++ ev[i].input_event_sec, ev[i].input_event_usec, + get_event_name(events_type, ev[i].type), ev[i].type); + + switch (ev[i].type) { diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index ee82e5241..70bd3ff2a 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,15 +1,16 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vala -pkgver=0.44.7 +pkgver=0.46.6 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" arch="all" license="LGPL-2.1+" +depends="" makedepends="glib-dev flex byacc graphviz-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.gnome.org/sources/vala/0.44/vala-$pkgver.tar.xz" +source="https://download.gnome.org/sources/vala/${pkgver%.*}/vala-$pkgver.tar.xz" build() { ./configure \ @@ -30,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77 vala-0.44.7.tar.xz" +sha512sums="ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992 vala-0.46.6.tar.xz" diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index f676d18e8..4bcc705b9 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -5,14 +5,15 @@ pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="all" -license="GPL-2.0+" -makedepends="autoconf automake libtool bash perl cmd:which" # from README_PACKAGERS: # Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so # in the installation tree. Either Valgrind won't work at all, or it # will still work if you do, but will generate less helpful error # messages. options="!strip !check" +license="GPL-2.0+" +depends="" +makedepends="autoconf automake libtool bash perl cmd:which" subpackages="$pkgname-dev $pkgname-doc" source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 0001-Ensure-ELFv2-is-supported-on-PPC64.patch @@ -24,13 +25,11 @@ source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 prepare() { default_prepare - cd "$builddir" aclocal && autoconf && automake --add-missing echo '#include <linux/a.out.h>' > include/a.out.h } build() { - cd "$builddir" # fails to build with ccache export CC="gcc" export CFLAGS="$CFLAGS -fno-stack-protector -no-pie" @@ -47,12 +46,10 @@ build() { } check() { - cd "$buildir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # we have options=!strip above so we strip the /usr/bin/* manually diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index b97a8c2df..bfeee2132 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/APKBUILD @@ -1,21 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vamp-sdk pkgver=2.7.1 pkgrel=0 pkgdesc="SDK for developing Vamp audio analysis plugins" url="https://vamp-plugins.org/develop.html" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause AND MIT" +depends="" makedepends="libsndfile-dev" subpackages="$pkgname-dev" source="https://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-$pkgver.tar.gz" -sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz" builddir="$srcdir/vamp-plugin-sdk-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +26,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz" diff --git a/user/vde2/APKBUILD b/user/vde2/APKBUILD index b89403bcc..b9a93beb4 100644 --- a/user/vde2/APKBUILD +++ b/user/vde2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=vde2 pkgver=2.3.2 -pkgrel=10 +pkgrel=11 pkgdesc="Virtual Distributed Ethernet - User mode networking for QEMU et al" url="http://vde.sourceforge.net/" arch="all" @@ -14,6 +14,7 @@ install="vde2.pre-install" source="http://downloads.sourceforge.net/project/vde/vde2/$pkgver/vde2-$pkgver.tar.gz gcc8.patch musl-build-fix.patch + openssl11.patch vde2.pre-up vde2.post-down " @@ -52,5 +53,6 @@ libs() { sha512sums="b502ceac8eebd30694a25d913c1d321b58ec8ae97dec0b09acc40455f7a97c05040ff395242c144580a9d9d5cb19292055bc94133ea1bde66bfdab40844533a8 vde2-2.3.2.tar.gz abf09ff1f96998b48225dd0b0bb69b72c3c2cbaa3faa96048977083f0a8c72b16f052a71da22c6fb0712dbad531c5fda6f6e5abeea41c8f33edba2bf5a702dc3 gcc8.patch 52d02c3a5a4f5526ed2e653e5720f012501215c0440e26105c585ea0501423da04047f6bad13a71b7378397a9d9274b191007d839876b675e206ed5be0f25372 musl-build-fix.patch +e24f7728030c1bc89b885c58ecf443d0f7297f6c9f73d87fa37092a691dfac191e65fb07a11ed44b718bbd18011fdb4e034f66ef63a8fbb06dfb06fd51c3826a openssl11.patch 71b29d538bba80b881f239d683215279089c14e8feec05bf27c159ead51094cdfb168281900fa4527f588c624e8f7687df8d3f79377e07d13ad64de613177df3 vde2.pre-up d1cf18146145dbe608842c694b05d2906e36553b0ba3fa1ec2e53dbf06027b9e4937ea61aee77c1ccbb73b818f19d55787051eb6d5b09a38c7d18a1dad629190 vde2.post-down" diff --git a/user/vde2/openssl11.patch b/user/vde2/openssl11.patch new file mode 100644 index 000000000..227312eab --- /dev/null +++ b/user/vde2/openssl11.patch @@ -0,0 +1,92 @@ +--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 ++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 +@@ -22,7 +22,7 @@ + exit(1); + } + +-static EVP_CIPHER_CTX ctx; ++static EVP_CIPHER_CTX *ctx; + static int ctx_initialized = 0; + static int encryption_disabled = 0; + static int nfd; +@@ -30,6 +30,10 @@ + static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; + static int verbose = 0; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) ++#endif ++ + void vc_printlog(int priority, const char *format, ...) + { + va_list arg; +@@ -103,19 +107,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in encrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in encrypt final\n"); + olen = -1; +@@ -124,7 +130,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset(ctx); + return olen; + } + +@@ -138,19 +144,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in decrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in decrypt final\n"); + olen = -1; +@@ -159,7 +167,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset (ctx); + return olen; + } + diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD index db26d40e2..54fa07ad4 100644 --- a/user/volume_key/APKBUILD +++ b/user/volume_key/APKBUILD @@ -9,14 +9,13 @@ arch="all" options="!check" # well, this is busted. license="GPL-2.0+" depends="" +checkdepends="nss-tools" makedepends="cryptsetup-dev glib-dev gpgme-dev nss-dev python3-dev util-linux-dev" -checkdepends="nss-tools" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-$pkgname:py" source="https://releases.pagure.org/volume_key/volume_key-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index 175ee0b40..708f7336e 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vte -pkgver=0.58.1 +pkgver=0.58.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="1f795731fbb7ee76c4274562d5a55668c3b8ecad5a00ff83c762b0a2517ccffb85e796e937407d46e6bdb64327759eabc5878455d1d66cb1b8ff8b6060a4b1b7 vte-0.58.1.tar.xz +sha512sums="b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a vte-0.58.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD index 45fb1c014..702675358 100644 --- a/user/w3m/APKBUILD +++ b/user/w3m/APKBUILD @@ -18,7 +18,6 @@ source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v$_pkgverp.tar.g builddir="$srcdir/$pkgname-$_pkgverm" build() { - cd "$builddir" LIBS="-lX11 -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,7 +30,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/wavpack/APKBUILD b/user/wavpack/APKBUILD index e59ef255e..43aefeb03 100644 --- a/user/wavpack/APKBUILD +++ b/user/wavpack/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter # Maintainer: pkgname=wavpack -pkgver=5.1.0 -pkgrel=4 +pkgver=5.2.0 +pkgrel=1 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" @@ -12,25 +12,33 @@ license="BSD-3-Clause" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wavpack.com/$pkgname-$pkgver.tar.bz2 - cve2018-19840.patch - cve2018-19841.patch - " +source="http://www.wavpack.com/$pkgname-$pkgver.tar.bz2" # secfixes: +# 5.2.0-r0: +# - CVE-2018-6767 +# - CVE-2018-7253 +# - CVE-2018-7254 +# - CVE-2018-10536 +# - CVE-2018-10537 +# - CVE-2018-10538 +# - CVE-2018-10539 +# - CVE-2018-10540 +# - CVE-2019-11498 +# - CVE-2019-1010315 +# - CVE-2019-1010317 +# - CVE-2019-1010319 # 5.1.0-r4: -# - CVE-2018-19840 -# - CVE-2018-19840 +# - CVE-2018-19840 +# - CVE-2018-19841 # 5.1.0-r0: -# - CVE-2016-10169 -# - CVE-2016-10170 -# - CVE-2016-10171 -# - CVE-2016-10172 +# - CVE-2016-10169 +# - CVE-2016-10170 +# - CVE-2016-10171 +# - CVE-2016-10172 build() { - cd "$builddir" - - local _arch_opts= + _arch_opts="" case "$CARCH" in x86 | x86_64) _arch_opts="--enable-mmx" ;; esac @@ -48,10 +56,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 wavpack-5.1.0.tar.bz2 -67d02dd744c638d126cf5a894d1ff2c39726bd4d3771ef7410ea782e5c9a0f9341909432bd4bea9b8959891c38699601c1aac2da6e0eaddaa5a4d679e7f58dd2 cve2018-19840.patch -dba007fa8cb2537b6f6c8ee559a98e501e948260ce7e7af7d3fdc8c9145bbbbf85c8fed8030de354459c4b08d3015a0ea769a948636bdfd66e567c0a2d2493c6 cve2018-19841.patch" +sha512sums="456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 wavpack-5.2.0.tar.bz2" diff --git a/user/wavpack/cve2018-19840.patch b/user/wavpack/cve2018-19840.patch deleted file mode 100644 index 2da022025..000000000 --- a/user/wavpack/cve2018-19840.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 070ef6f138956d9ea9612e69586152339dbefe51 Mon Sep 17 00:00:00 2001 -From: David Bryant <david@wavpack.com> -Date: Thu, 29 Nov 2018 21:00:42 -0800 -Subject: [PATCH] issue #53: error out on zero sample rate - ---- - src/pack_utils.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/pack_utils.c b/src/pack_utils.c -index 2253f0d..2a83497 100644 ---- a/src/pack_utils.c -+++ b/src/pack_utils.c -@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 - int num_chans = config->num_channels; - int i; - -+ if (!config->sample_rate) { -+ strcpy (wpc->error_message, "sample rate cannot be zero!"); -+ return FALSE; -+ } -+ - wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; - - if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/user/wavpack/cve2018-19841.patch b/user/wavpack/cve2018-19841.patch deleted file mode 100644 index 6872ed91e..000000000 --- a/user/wavpack/cve2018-19841.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bba5389dc598a92bdf2b297c3ea34620b6679b5b Mon Sep 17 00:00:00 2001 -From: David Bryant <david@wavpack.com> -Date: Thu, 29 Nov 2018 21:53:51 -0800 -Subject: [PATCH] issue #54: fix potential out-of-bounds heap read - ---- - src/open_utils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/open_utils.c b/src/open_utils.c -index 80051fc..4fe0d67 100644 ---- a/src/open_utils.c -+++ b/src/open_utils.c -@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) - #endif - - if (meta_bc == 4) { -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) - return FALSE; - } - else { - csum ^= csum >> 16; - -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) - return FALSE; - } - diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index d18e9cf69..dfa1a3277 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,32 +1,41 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=weechat -pkgver=2.6 +pkgver=2.7.1 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" options="!check" # requires all plugins be built. license="GPL-3.0+" +depends="" depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev - ncurses-dev perl-dev python3-dev zlib-dev" -makedepends="$depends_dev" + ncurses-dev perl-dev python3-dev ruby-dev tcl-dev zlib-dev guile-dev + tk-dev" checkdepends="cpputest" +makedepends="$depends_dev asciidoctor" subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin - $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" -source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz - libintl-fix.patch - " + $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin + $pkgname-tcl:_plugin $pkgname-guile:_plugin $pkgname-doc" +source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" # secfixes: # 1.7.1-r0: -# - CVE-2017-8073 +# - CVE-2017-8073 # 1.9.1-r0: -# - CVE-2017-14727 +# - CVE-2017-14727 +# 2.7.1-r0: +# - CVE-2020-8955 build() { - cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON -Bbuild . + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_JAVASCRIPT=OFF \ + -DENABLE_MAN=ON \ + -DENABLE_NLS=OFF \ + -DENABLE_PHP=OFF \ + -Bbuild . make -C build } @@ -52,5 +61,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5 weechat-2.6.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" +sha512sums="2d2f555a4c48dbfa60a97845657e041fcd37bdde01974b4a49ff2d0ef6b92f16147f84b0e60772e9f54ba3e05ae1772012d3551a5fbb8bdf8332a08ef63a352d weechat-2.7.1.tar.gz" diff --git a/user/weechat/libintl-fix.patch b/user/weechat/libintl-fix.patch deleted file mode 100644 index a67cb37b6..000000000 --- a/user/weechat/libintl-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -libc gettext is never sufficient on musl - ---- weechat-1.9/CMakeLists.txt.old 2017-06-25 03:20:52.000000000 -0500 -+++ weechat-1.9/CMakeLists.txt 2017-09-13 02:30:43.577284569 -0500 -@@ -162,6 +162,7 @@ - find_package(Gettext) - if(GETTEXT_FOUND) - add_definitions(-DENABLE_NLS) -+ list(APPEND EXTRA_LIBS intl) - endif() - endif() - diff --git a/user/which/APKBUILD b/user/which/APKBUILD deleted file mode 100644 index cea55c32a..000000000 --- a/user/which/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -pkgname=which -pkgver=2.21 -pkgrel=2 -pkgdesc="A utility to show the full path of commands" -url="http://savannah.gnu.org/projects/which" -arch="all" -license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+" -makedepends="" -subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" -provider_priority=1 - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 which-2.21.tar.gz" diff --git a/user/wine/APKBUILD b/user/wine/APKBUILD index ea9384603..87590ebb9 100644 --- a/user/wine/APKBUILD +++ b/user/wine/APKBUILD @@ -16,27 +16,25 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" depends_dev="$pkgname perl" makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex-dev bison - libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev libressl-dev + libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev openssl-dev libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev cups-dev alsa-lib-dev libxml2-dev dbus-dev libxi-dev gnutls-dev tiff-dev v4l-utils-dev udisks2-dev autoconf automake openal-soft-dev pulseaudio-dev sane-dev eudev-dev mpg123-dev - " + autoconf automake libtool" source="http://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$pkgver.tar.xz + dlclose.patch no-pie.patch + printer.patch winhlp32-flex.patch " prepare() { - cd "$builddir" - default_prepare aclocal && autoheader && autoreconf } build() { - cd "$builddir" - case "$CARCH" in x86_64) _win64=--enable-win64;; esac @@ -70,13 +68,10 @@ build() { } check() { - cd "$builddir" make test } package() { - local file - cd "$builddir" make -j1 DESTDIR="$pkgdir" install case "$CARCH" in @@ -88,21 +83,18 @@ package() { "$pkgdir"/usr/bin/wineapploader for file in msiexec notepad regedit regsvr32 wineboot \ - winecfg wineconsole winefile winemine winepath - do + winecfg wineconsole winefile winemine winepath; do rm "$pkgdir"/usr/bin/$file ln -sf /usr/bin/wineapploader "$pkgdir"/usr/bin/$file done } dev() { - local file default_dev install -d "$subpkgdir"/usr/bin for file in widl wmc wrc winebuild winedump function_grep.pl \ - winedbg winemaker winegcc winecpp wineg++ - do + winedbg winemaker winegcc winecpp wineg++; do mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/ done @@ -116,7 +108,6 @@ doc() { } libs() { - local file ext default_libs install -d "$subpkgdir"/usr/lib/wine/fakedlls @@ -131,5 +122,7 @@ libs() { } sha512sums="dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc wine-4.0.1.tar.xz +7e68ffc953f8858538b03d79b78b53b46e33dc01a474cf2eadaa726ff04918eb8675e80da1c82d2d61b12753f10fd6eda9114c5bc263fe373b6900f174bc246f dlclose.patch a96b1e248447912ba522067b67fc920063f355f326eaf3fec760c79a1c6e46019fbdcfa8b95b9d389959a7e3d3ab794f9aaf78913ad6a73be32b5d34ca8a2267 no-pie.patch +05dcc931a3bf5569f0314e3ede9df11a6f2a5806ed9ed66da094f3ee811af316046f177d5190c09007227a455e402b4dc747098fc82cd410574fb241cc5d53ba printer.patch 522a94a31fc459e80ea7dd05f7aee64f6ae666ec05236d06614acde118d5c60002e0f253ae75edb5f02164f22937ca89578504b690d1a5611bd60f703c8f0c00 winhlp32-flex.patch" diff --git a/user/wine/dlclose.patch b/user/wine/dlclose.patch new file mode 100644 index 000000000..a9844ff68 --- /dev/null +++ b/user/wine/dlclose.patch @@ -0,0 +1,66 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1123,6 +1123,12 @@ then + + dnl *** End of X11/Xlib.h check + ++ dnl Check for the unload_after_dlclose libc ++ AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM([[#include <dlfcn.h>]], [[dlclose(dlopen("./conftest", 0)); return 0;]])], ++ ac_save_CPPFLAGS="$ac_save_CPPFLAGS -DNO_UNLOAD_AFTER_DLCLOSE", ++ []) ++ + dnl Check for the presence of OpenGL + opengl_msg="" + if test "x$with_opengl" != "xno" +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -2289,6 +2289,13 @@ + if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle) + { + info.wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); ++#ifdef NO_UNLOAD_AFTER_DLCLOSE ++ if (info.wm->ldr.LoadCount == 0) { ++ RtlEnterCriticalSection( &loader_section ); ++ info.wm->ldr.LoadCount = 1; ++ RtlLeaveCriticalSection( &loader_section ); ++ } ++#endif + TRACE( "Found %s at %p for builtin %s\n", + debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_w(path) ); + break; +@@ -3199,6 +3199,9 @@ + * LdrShutdownProcess (NTDLL.@) + * + */ ++#ifdef NO_UNLOAD_AFTER_DLCLOSE ++static void MODULE_FlushModrefs(void); ++#endif + void WINAPI LdrShutdownProcess(void) + { + TRACE("()\n"); +@@ -3194,6 +3203,12 @@ + TRACE("()\n"); ++#ifdef NO_UNLOAD_AFTER_DLCLOSE ++ RtlEnterCriticalSection( &loader_section ); ++ process_detach(); ++ MODULE_FlushModrefs(); ++ RtlLeaveCriticalSection( &loader_section ); ++#endif + process_detaching = TRUE; + process_detach(); + } + + +@@ -3384,7 +3398,11 @@ + if ( free_lib_count <= 1 ) + { ++#ifdef NO_UNLOAD_AFTER_DLCLOSE ++ TRACE("apply no-op dlclose hacks on this platform\n"); ++#else + process_detach(); + MODULE_FlushModrefs(); ++#endif + } + + TRACE("END\n"); diff --git a/user/wine/printer.patch b/user/wine/printer.patch new file mode 100644 index 000000000..4910e4726 --- /dev/null +++ b/user/wine/printer.patch @@ -0,0 +1,13 @@ + dlls/winspool.drv/info.c | 1 + + 1 file changed, 1 insertion(+) +--- a/dlls/winspool.drv/info.c ++++ a/dlls/winspool.drv/info.c +@@ -1620,6 +1620,7 @@ void WINSPOOL_LoadSystemPrinters(void) + #endif + + /* FIXME: The init code should be moved to spoolsv.exe */ ++ SetLastError(0); + init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); + if (!init_mutex) + { +-- diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD deleted file mode 100644 index 7b6448f8f..000000000 --- a/user/wireguard-module-power8-64k/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> -# KEEP THIS IN SYNC with the other wireguard-module packages. -_kflavour="-power8-64k" -_kver="4.14.138-mc15" -pkgver=0.0.20190913 -pkgrel=0 -_pkgname="wireguard-module$_kflavour" -pkgname="$_pkgname-$_kver" -_pkgreal="WireGuard" -pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" -url="https://www.wireguard.com/" -arch="ppc64" -options="!check !dbg !strip" # no test suite -license="GPL-2.0-only" -provides="$_pkgname=$pkgver" -depends="easy-kernel$_kflavour-modules-$_kver" -makedepends="easy-kernel$_kflavour-src-$_kver" -source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" -builddir="$srcdir/$_pkgreal-$pkgver" - -build() { - cd "$builddir" - make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module -} - -package() { - cd "$builddir" - make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install -} - -sha512sums="0d6e754df2f919c288ffe46131df29624e9958d39220369558089218c386450733f2baf97eb5d14154aa17a8d6b01bb0c34e3a1c4587830ed0d792d6ef06aa05 WireGuard-0.0.20190913.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD deleted file mode 100644 index 87e60b35e..000000000 --- a/user/wireguard-module-power8/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> -# KEEP THIS IN SYNC with the other wireguard-module packages. -_kflavour="-power8" -_kver="4.14.138-mc15" -pkgver=0.0.20190913 -pkgrel=0 -_pkgname="wireguard-module$_kflavour" -pkgname="$_pkgname-$_kver" -_pkgreal="WireGuard" -pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" -url="https://www.wireguard.com/" -arch="ppc64" -options="!check !dbg !strip" # no test suite -license="GPL-2.0-only" -provides="$_pkgname=$pkgver" -depends="easy-kernel$_kflavour-modules-$_kver" -makedepends="easy-kernel$_kflavour-src-$_kver" -source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" -builddir="$srcdir/$_pkgreal-$pkgver" - -build() { - cd "$builddir" - make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module -} - -package() { - cd "$builddir" - make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install -} - -sha512sums="0d6e754df2f919c288ffe46131df29624e9958d39220369558089218c386450733f2baf97eb5d14154aa17a8d6b01bb0c34e3a1c4587830ed0d792d6ef06aa05 WireGuard-0.0.20190913.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index cd6580ef8..4088a7817 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,32 +1,42 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> -# KEEP THIS IN SYNC with the other wireguard-module packages. -_kflavour="" -_kver="4.14.138-mc15" -pkgver=0.0.20190913 +_kver="5.4.5-mc0" +pkgver=0.0.20200121 pkgrel=0 -_pkgname="wireguard-module$_kflavour" +_pkgname="wireguard-module" pkgname="$_pkgname-$_kver" -_pkgreal="WireGuard" +_pkgreal="wireguard-linux-compat" pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" url="https://www.wireguard.com/" arch="all" -options="!check !dbg !strip" # no test suite +options="!check !dbg !strip" # No test suite. license="GPL-2.0-only" +depends="easy-kernel-modules-$_kver" +makedepends="easy-kernel-src-$_kver" provides="$_pkgname=$pkgver" -depends="easy-kernel$_kflavour-modules-$_kver" -makedepends="easy-kernel$_kflavour-src-$_kver" -source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" +subpackages="wireguard-patch:_patch:noarch" +source="https://git.zx2c4.com/$_pkgreal/snapshot/$_pkgreal-$pkgver.tar.xz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" - make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver" module } package() { - cd "$builddir" - make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install + if [ -f $HOME/kernel_key.pem ]; then + /usr/src/linux-$_kver/scripts/sign-file sha512 \ + $HOME/kernel_key.pem $HOME/kernel_key.pem \ + "$builddir"/src/wireguard.ko + fi + make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="0d6e754df2f919c288ffe46131df29624e9958d39220369558089218c386450733f2baf97eb5d14154aa17a8d6b01bb0c34e3a1c4587830ed0d792d6ef06aa05 WireGuard-0.0.20190913.tar.xz" +_patch() { + depends="" + pkgdesc="Kernel patch for the WireGuard VPN" + + mkdir -p "$subpkgdir/usr/share/wireguard" + "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" +} + +sha512sums="fde9ef09032ad2e2ce69814d42cc0abb3b353d5aa95debd39122b3eb25324c8e707dd9f298f8ee276575d932b1f1bd559b3430da6b8c0a5057911937ed85c726 wireguard-linux-compat-0.0.20200121.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index f8b73ca70..5b41e185c 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools -_pkgreal=WireGuard -pkgver=0.0.20190913 +pkgver=1.0.20200121 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -11,18 +10,15 @@ options="!check" # no test suite license="GPL-2.0-only" depends="bash iproute2" makedepends="libmnl-dev" -subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc wireguard-patch:_patch:noarch" -source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" -builddir="$srcdir/$_pkgreal-$pkgver" +subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc" +source="https://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" - make RUNSTATEDIR=/run -C src/tools + make RUNSTATEDIR=/run -C src } package() { - cd "$builddir" - make WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes DESTDIR="$pkgdir" -C src/tools install + make WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes DESTDIR="$pkgdir" -C src install } bashcomp() { @@ -33,14 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -_patch() { - depends="" - pkgdesc="Kernel patch for the WireGuard VPN" - - cd "$builddir" - mkdir -p "$subpkgdir/usr/share/wireguard" - contrib/kernel-tree/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" - -} - -sha512sums="0d6e754df2f919c288ffe46131df29624e9958d39220369558089218c386450733f2baf97eb5d14154aa17a8d6b01bb0c34e3a1c4587830ed0d792d6ef06aa05 WireGuard-0.0.20190913.tar.xz" +sha512sums="cd22467916c59ab53440e072fee6d0b01f2f9ee06fc3b71de4e74bc3aab05caf25519e5f723d9d160c491f917b7f064ee6b491c74edb52d7d2c29a08d86e41c2 wireguard-tools-1.0.20200121.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 610629eb5..7b46e7f29 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: pkgname=wireless-regdb pkgver=2019.06.03 pkgrel=0 diff --git a/user/wireless-tools/APKBUILD b/user/wireless-tools/APKBUILD index 8f327a3e9..e8c000ea5 100644 --- a/user/wireless-tools/APKBUILD +++ b/user/wireless-tools/APKBUILD @@ -17,16 +17,13 @@ depends="" makedepends="linux-headers" subpackages="$pkgname-dev $pkgname-doc" source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$_pkgver.tar.gz" - builddir="$srcdir/$_pkgname.$_pkgmaj" build() { - cd "$builddir" make } package() { - cd "$builddir" make INSTALL_DIR="$pkgdir"/usr/sbin \ INSTALL_LIB="$pkgdir"/usr/lib \ INSTALL_INC="$pkgdir"/usr/include \ diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index dbd22b8c7..c4ae69a6e 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -6,11 +6,11 @@ pkgrel=1 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" +options="!check" # No test suite. license="BSD-3-Clause AND Public-Domain AND (GPL-2.0+ OR BSD-3-Clause)" -options="!check" # No test suite -subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui" depends="" makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" +subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui" source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd diff --git a/user/wv/APKBUILD b/user/wv/APKBUILD index 8211b555d..d86534b82 100644 --- a/user/wv/APKBUILD +++ b/user/wv/APKBUILD @@ -3,14 +3,14 @@ pkgname=wv pkgver=1.2.9 pkgrel=0 -pkgdesc="A library that can load and parse Word 2000, 97, 95 and 6 file formats" +pkgdesc="Library to load and parse Word 2000, 97, 95 and 6 file formats" url="https://sourceforge.net/projects/wvware" arch="all" options="!check" # No test suite. license="GPL-2.0+ AND RSA-MD5" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libgsf-dev libpng-dev bzip2-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.abisource.com/downloads/wv/$pkgver/wv-$pkgver.tar.gz" prepare() { diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 51b93f709..25f20db92 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.2 +pkgver=3.1.3 pkgrel=0 pkgdesc="C++ library for creating applications" url="https://www.wxwidgets.org/" @@ -18,7 +18,6 @@ source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidg builddir="$srcdir/wxWidgets-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6 wxWidgets-3.1.2.tar.bz2" +sha512sums="d19305c96f1a382ec74549f69d6a7c61ecd0abac383623c308c45f0168c670c15262efc4fb64c14fa9d1fdb3579f19abdb5c8247ead72dc926342e586d7b4532 wxWidgets-3.1.3.tar.bz2" diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD index c68858df3..b9154729b 100644 --- a/user/x11vnc/APKBUILD +++ b/user/x11vnc/APKBUILD @@ -7,21 +7,21 @@ pkgdesc="VNC server for X11 sessions" url="http://www.karlrunge.com/x11vnc/" arch="all" license="GPL-2.0-only" +depends="" makedepends="cairo-dev libjpeg-turbo-dev libvncserver-dev libxcursor-dev - openssl-dev utmps-dev zlib-dev" + openssl-dev utmps-dev zlib-dev autoconf automake" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz + time64.patch utmps.patch " prepare() { - cd "$builddir" default_prepare ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,14 +34,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz +764dc0d22f4b167b7683b1551a6d8cc8ea6745fdd9791422404ef604186930615b52ef1bf66fd03dd9c6eed18845ff4a1e5a235eee80810177e082359a8c4766 time64.patch 8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch" diff --git a/user/x11vnc/time64.patch b/user/x11vnc/time64.patch new file mode 100644 index 000000000..663684716 --- /dev/null +++ b/user/x11vnc/time64.patch @@ -0,0 +1,78 @@ +--- x11vnc-0.9.16/src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000 ++++ x11vnc-0.9.16/src/uinput.c 2020-01-24 04:49:39.479206612 +0000 +@@ -710,6 +710,7 @@ + static void ptr_move(int dx, int dy) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tv; + int d = direct_rel_fd < 0 ? fd : direct_rel_fd; + + if (injectable && strchr(injectable, 'M') == NULL) { +@@ -720,7 +721,9 @@ + + if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tv, NULL); ++ ev.input_event_sec = tv.tv_sec; ++ ev.input_event_usec = tv.tv_usec; + ev.type = EV_REL; + ev.code = REL_Y; + ev.value = dy; +@@ -755,6 +758,7 @@ + static void ptr_abs(int x, int y, int p) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tv; + int x0, y0; + int d = direct_abs_fd < 0 ? fd : direct_abs_fd; + +@@ -773,7 +777,9 @@ + + if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tv, NULL); ++ ev.input_event_sec = tv.tv_sec; ++ ev.input_event_usec = tv.tv_usec; + ev.type = EV_ABS; + ev.code = ABS_Y; + ev.value = y; +@@ -950,6 +956,7 @@ + static void button_click(int down, int btn) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tv; + int d = direct_btn_fd < 0 ? fd : direct_btn_fd; + + if (injectable && strchr(injectable, 'B') == NULL) { +@@ -959,7 +966,9 @@ + if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tv, NULL); ++ ev.input_event_sec = tv.tv_sec; ++ ev.input_event_usec = tv.tv_usec; + ev.type = EV_KEY; + ev.value = down; + +@@ -1230,6 +1239,7 @@ + void uinput_key_command(int down, int keysym, rfbClientPtr client) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tv; + int scancode; + allowed_input_t input; + int d = direct_key_fd < 0 ? fd : direct_key_fd; +@@ -1253,7 +1263,9 @@ + if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tv, NULL); ++ ev.input_event_sec = tv.tv_sec; ++ ev.input_event_usec = tv.tv_usec; + ev.type = EV_KEY; + ev.code = (unsigned char) scancode; + ev.value = down; diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD index 4c8b772a0..c7c18cb67 100644 --- a/user/x264/APKBUILD +++ b/user/x264/APKBUILD @@ -1,29 +1,28 @@ # Maintainer: pkgname=x264 -pkgver=20170930 +pkgver=20191105 pkgrel=0 pkgdesc="Library for encoding H264/AVC video streams" url="https://www.videolan.org/developers/x264.html" arch="all" -license="GPL-2.0+" options="textrels" +license="GPL-2.0+" +depends="" makedepends="bash coreutils libx11-dev perl" case $CTARGET_ARCH in x86_64) makedepends="$makedepends yasm";; esac subpackages="$pkgname-dev $pkgname-libs" -source="ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2" +source="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2" builddir="$srcdir/$pkgname-snapshot-$pkgver-2245-stable" build() { - cd "$builddir" - - local asmopts= + _asmopts="" case "$CARCH" in # ppc requires AltiVec, we run on G3s - ppc | pmmx) asmopts="--disable-asm" ;; + ppc | pmmx) _asmopts="--disable-asm" ;; # VSX was added in power8 - ppc64) asmopts="--disable-vsx" ;; + ppc64) _asmopts="--disable-vsx" ;; esac # note: not autotools @@ -33,24 +32,20 @@ build() { --prefix=/usr \ --enable-shared \ --enable-static \ - $asmopts \ + $_asmopts \ --enable-pic \ --extra-cflags=-fno-aggressive-loop-optimizations make } check() { - cd "$builddir" - ./x264 --version } package() { - cd "$builddir" - make DESTDIR="$pkgdir" \ bindir=/usr/bin libdir=/usr/lib includedir=/usr/include \ install } -sha512sums="7f0d33f2955dbc8958ad739cfe69b9083ea376d21a4af469a6a44c8db8089859cf0a94018a1cdea49ce4c3b4a1b635cc304208d0492d901fd99a1337ac2c5d57 x264-snapshot-20170930-2245-stable.tar.bz2" +sha512sums="5a5bc2bd322af8544a6e7d89d6c56d1b609f8a69e177b20964fda1b5c8ad3a0ca77ff00b8ec47412a0c069afac677300c1d26aaaa704cf9be93df27f189171d3 x264-snapshot-20191105-2245-stable.tar.bz2" diff --git a/user/x265/APKBUILD b/user/x265/APKBUILD index 5ec4bbffa..0ca89487e 100644 --- a/user/x265/APKBUILD +++ b/user/x265/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x265 -pkgver=3.0 +pkgver=3.2.1 pkgrel=0 pkgdesc="Open Source H265/HEVC video encoder" url="http://x265.org" arch="all" options="textrels" license="GPL-2.0-only" +depends="" makedepends="cmake yasm" # 2.6+ will use nasm instead of yasm subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/multicoreware/$pkgname/downloads/${pkgname}_${pkgver}.tar.gz @@ -17,7 +18,7 @@ builddir="$srcdir/${pkgname}_$pkgver" build() { cd "$builddir"/build/linux - local cmake_opts="" + cmake_opts="" case "$CARCH" in # unfortunately, AltiVec code is very broken (more than 1000 errors) ppc*) cmake_opts="-DENABLE_ALTIVEC=OFF -DCPU_POWER8=OFF";; @@ -47,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba x265-3.0.tar.gz +sha512sums="5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568 x265-3.2.1.tar.gz ac3ecc613fe4da11672de8f397b5541fe2af29b7dd91a48859bfe8824934a5966c41ca30de242564c46f1a0cdd2a0da9331d9f547fc21120066fb3c45347c4c4 x265-unbreak-my-arm.patch" diff --git a/user/xabacus/APKBUILD b/user/xabacus/APKBUILD index 61bf59e2c..6ab2e4f8b 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.1 +pkgver=8.2.4 pkgrel=0 pkgdesc="Simple X11 abacus widget" url="http://www.sillycycle.com/abacus.html" @@ -11,18 +11,16 @@ license="MIT" depends="" makedepends="libx11-dev libxpm-dev libxt-dev libxml2-dev" subpackages="$pkgname-doc" -# Refuses cURL user agents: 406 Not Acceptable -#source="http://www.sillycycle.com/abacus/$pkgname-$pkgver.tar.xz" -source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.bz2" +source="$pkgname-$pkgver.tar.bz2::http://www.sillycycle.com/abacus/$pkgname-$pkgver.tar.xz" build() { - ./configure --prefix=/usr + ./configure \ + --prefix=/usr make } package() { - make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" install-png install-xpm + make DESTDIR="$pkgdir" install install-png install-xpm } -sha512sums="06f26af541bb7b9a17acce7b56c7edd28aac50ef4c63a1cc73ae8269842d95618cd99eeafb62f045ec4ad543a3ecad529473e138c0933c4674a91027fa32e548 xabacus-8.2.1.tar.bz2" +sha512sums="6a65e36c678cbb39d95932da265d40c61afb21eccc87264e07e80fb98b75c4e4a4777ee2bce458eb2e811b720656732e7c780e61e436287f91df83015c7e58c0 xabacus-8.2.4.tar.bz2" diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index 102f86751..20005d338 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.12 +pkgver=1.4.14 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -13,12 +13,8 @@ depends_dev="zlib-dev util-linux-dev" makedepends="$depends_dev libtool" subpackages="$pkgname-dev $pkgname-doc libxapian" source="http://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz - timeval-t.patch" - -case "$CARCH" in -armhf) options="!check" ;; # FIXME -s390x) options="!check" ;; # FIXME -esac + timeval-t.patch + " # secfixes: # 1.4.6-r0: @@ -46,10 +42,9 @@ package() { libxapian() { pkgdesc="Xapian search engine library" - cd "$builddir" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430 xapian-core-1.4.12.tar.xz +sha512sums="c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b xapian-core-1.4.14.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xautolock/APKBUILD b/user/xautolock/APKBUILD index 71fd17994..a614dfb54 100644 --- a/user/xautolock/APKBUILD +++ b/user/xautolock/APKBUILD @@ -1,29 +1,27 @@ -# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xautolock pkgver=2.2 pkgrel=4 pkgdesc="An automatic X screen-locker/screen-saver" url="http://ibiblio.org/pub/Linux/X11/screensavers/" -arch="all" # this might not build on aarch64? removed from alpine commit -license="GPL-2.0" -options="!check" # This package has no testsuite +arch="all" +options="!check" # This package has no test suite. +license="GPL-2.0-only" depends="" makedepends="$depends_dev imake xorg-server-dev libxscrnsaver-dev xorg-cf-files" subpackages="$pkgname-doc" source="https://www.ibiblio.org/pub/linux/X11/screensavers/xautolock-$pkgver.tgz - processwait.patch" + processwait.patch + " build() { - cd "$builddir" - xmkmf - make + xmkmf + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man + make DESTDIR="$pkgdir" install + make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man } sha512sums="5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 xautolock-2.2.tgz diff --git a/user/xbitmaps/APKBUILD b/user/xbitmaps/APKBUILD index 47ca8efca..3052984ef 100644 --- a/user/xbitmaps/APKBUILD +++ b/user/xbitmaps/APKBUILD @@ -8,10 +8,10 @@ arch="noarch" license="X11" depends="util-macros" makedepends="" +subpackages="" source="https://www.X.Org/releases/individual/data/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,12 +20,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcape/APKBUILD b/user/xcape/APKBUILD index c560795e1..34ddcb85a 100644 --- a/user/xcape/APKBUILD +++ b/user/xcape/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" MANDIR="/share/man/man1" install } diff --git a/user/xcb-proto/APKBUILD b/user/xcb-proto/APKBUILD index 256d44c84..b9af25d42 100644 --- a/user/xcb-proto/APKBUILD +++ b/user/xcb-proto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-proto -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="XCB protocol descriptions" url="https://xcb.freedesktop.org/" @@ -8,10 +8,9 @@ arch="noarch" license="X11" depends="" makedepends="python3" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" +source="https://www.X.org/releases/individual/proto/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,13 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -m644 -Dt "$pkgdir"/usr/share/licenses/$pkgname/ COPYING } -sha512sums="002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 xcb-proto-1.13.tar.bz2" + +sha512sums="de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 xcb-proto-1.14.tar.xz" diff --git a/user/xcb-util-cursor/APKBUILD b/user/xcb-util-cursor/APKBUILD index 76f6d2016..e6b46f9e1 100644 --- a/user/xcb-util-cursor/APKBUILD +++ b/user/xcb-util-cursor/APKBUILD @@ -9,14 +9,12 @@ arch="all" license="MIT" depends="" depends_dev="xcb-util-dev" -makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev" checkdepends="check-dev" +makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.gz" build() { - cd "$builddir" - export CFLAGS="$CFLAGS -std=gnu99" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util-image/APKBUILD b/user/xcb-util-image/APKBUILD index cd4ffccb2..947b9a0f0 100644 --- a/user/xcb-util-image/APKBUILD +++ b/user/xcb-util-image/APKBUILD @@ -9,15 +9,12 @@ arch="all" license="MIT" depends="" depends_dev="xcb-util-dev" -makedepends="$depends_dev m4 util-macros" checkdepends="check-dev" -replaces="xcb-util" +makedepends="$depends_dev m4 util-macros" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz" build() { - cd "$builddir" - export CFLAGS="$CFLAGS -std=gnu99" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util-keysyms/APKBUILD b/user/xcb-util-keysyms/APKBUILD index a1d23fba4..2c0350dd8 100644 --- a/user/xcb-util-keysyms/APKBUILD +++ b/user/xcb-util-keysyms/APKBUILD @@ -9,14 +9,12 @@ arch="all" license="MIT" depends="" depends_dev="xcb-util-dev" -makedepends="$depends_dev m4 util-macros xorgproto-dev" checkdepends="check-dev" -replaces="xcb-util" +makedepends="$depends_dev m4 util-macros xorgproto-dev" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util-renderutil/APKBUILD b/user/xcb-util-renderutil/APKBUILD index 07bafe5ba..b75ab9e8f 100644 --- a/user/xcb-util-renderutil/APKBUILD +++ b/user/xcb-util-renderutil/APKBUILD @@ -9,14 +9,12 @@ arch="all" license="MIT" depends="" depends_dev="xcb-util-dev" -makedepends="$depends_dev m4 util-macros" checkdepends="check-dev" -replaces="xcb-util" +makedepends="$depends_dev m4 util-macros" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util-wm/APKBUILD b/user/xcb-util-wm/APKBUILD index 1443773fa..36cfe41e9 100644 --- a/user/xcb-util-wm/APKBUILD +++ b/user/xcb-util-wm/APKBUILD @@ -9,14 +9,12 @@ arch="all" license="MIT" depends="" depends_dev="xcb-util-dev" -makedepends="$depends_dev m4 util-macros" checkdepends="check" -replaces="xcb-util" +makedepends="$depends_dev m4 util-macros" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util-xrm/APKBUILD b/user/xcb-util-xrm/APKBUILD index d368f1544..dfdefaba7 100644 --- a/user/xcb-util-xrm/APKBUILD +++ b/user/xcb-util-xrm/APKBUILD @@ -8,12 +8,12 @@ pkgdesc="Utility functions for the X resource manager" url="https://github.com/Airblader/xcb-util-xrm" arch="all" license="MIT" +depends="" makedepends="m4 bsd-compat-headers libx11-dev libxcb-dev util-macros xcb-util-dev" -source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-dev" +source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcb-util/APKBUILD b/user/xcb-util/APKBUILD index 90b9053bf..cb0f0046e 100644 --- a/user/xcb-util/APKBUILD +++ b/user/xcb-util/APKBUILD @@ -6,14 +6,14 @@ pkgdesc="Utility libraries for X C-language Binding" url="https://xcb.freedesktop.org/" arch="all" license="X11" +depends="" depends_dev="libxcb-dev util-macros" -makedepends="$depends_dev m4 gperf" checkdepends="check-dev" +makedepends="$depends_dev m4 gperf" subpackages="$pkgname-dev" source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xclip/APKBUILD b/user/xclip/APKBUILD index 19125d29b..dcff75e1e 100644 --- a/user/xclip/APKBUILD +++ b/user/xclip/APKBUILD @@ -10,18 +10,16 @@ arch="all" options="!check" # TODO: this package has tests that require X license="GPL-2.0+" depends="" -makedepends="libx11-dev libxmu-dev" +makedepends="autoconf automake libx11-dev libxmu-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/astrand/${pkgname}/archive/${pkgver}.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/doc/$pkgname/ diff --git a/user/xclipboard/APKBUILD b/user/xclipboard/APKBUILD index b0219ea81..f5f75114e 100644 --- a/user/xclipboard/APKBUILD +++ b/user/xclipboard/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xclipboard-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xcmsdb/APKBUILD b/user/xcmsdb/APKBUILD index 973f006f0..f0f595804 100644 --- a/user/xcmsdb/APKBUILD +++ b/user/xcmsdb/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xcmsdb-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD index 4bbac0359..8c7a64ff7 100644 --- a/user/xconsole/APKBUILD +++ b/user/xconsole/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xconsole-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xdbedizzy/APKBUILD b/user/xdbedizzy/APKBUILD index 5d190e7c5..a16dc62fe 100644 --- a/user/xdbedizzy/APKBUILD +++ b/user/xdbedizzy/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xdbedizzy-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD index e754a868e..241e80519 100644 --- a/user/xdg-user-dirs/APKBUILD +++ b/user/xdg-user-dirs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xdg-user-dirs pkgver=0.17 pkgrel=0 @@ -14,7 +14,6 @@ subpackages="$pkgname-lang $pkgname-doc" source="https://user-dirs.freedesktop.org/releases/xdg-user-dirs-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xdotool/APKBUILD b/user/xdotool/APKBUILD index 3aae63783..af14cc595 100644 --- a/user/xdotool/APKBUILD +++ b/user/xdotool/APKBUILD @@ -11,23 +11,20 @@ options="!check" # Requires running X11 server license="BSD-3-Clause" depends="" depends_dev="libx11-dev libxtst-dev libxinerama-dev libxkbcommon-dev" -makedepends="$depends_dev perl" #checkdepends="xvfb ruby-minitest cmd:which lsof xdpyinfo xterm xwininfo" +makedepends="$depends_dev perl" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/jordansissel/xdotool/releases/download/v$pkgver/xdotool-$pkgver.tar.gz" build() { - cd "$builddir" make WITHOUT_RPATH_FIX=1 } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" PREFIX="/usr" INSTALLMAN="/usr/share/man" install } diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD index 903b9a11d..52dd15d09 100644 --- a/user/xdpyinfo/APKBUILD +++ b/user/xdpyinfo/APKBUILD @@ -7,12 +7,13 @@ url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev libxxf86vm-dev util-macros xorgproto-dev" +makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev + libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev + libxxf86vm-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD index ae39b7f97..fe20244c0 100644 --- a/user/xdriinfo/APKBUILD +++ b/user/xdriinfo/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD index 3ad25658c..6926602ed 100644 --- a/user/xedit/APKBUILD +++ b/user/xedit/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xedit-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD index 76edc0272..253d4738b 100644 --- a/user/xeyes/APKBUILD +++ b/user/xeyes/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xeyes-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-input-evdev/APKBUILD b/user/xf86-input-evdev/APKBUILD index 3339d8caf..0896f48fa 100644 --- a/user/xf86-input-evdev/APKBUILD +++ b/user/xf86-input-evdev/APKBUILD @@ -6,14 +6,13 @@ pkgdesc="X.Org generic input driver" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc $pkgname-dev" depends="" makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev eudev-dev mtdev-dev libevdev-dev" +subpackages="$pkgname-doc $pkgname-dev" source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/user/xf86-input-joystick/APKBUILD b/user/xf86-input-joystick/APKBUILD index c71441234..d2816b435 100644 --- a/user/xf86-input-joystick/APKBUILD +++ b/user/xf86-input-joystick/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-input-joystick-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-input-keyboard/APKBUILD b/user/xf86-input-keyboard/APKBUILD index 600a12ec6..cc6ce0528 100644 --- a/user/xf86-input-keyboard/APKBUILD +++ b/user/xf86-input-keyboard/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-input-keyboard-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-input-mouse/APKBUILD b/user/xf86-input-mouse/APKBUILD index eaefa3bb0..8082ce5f2 100644 --- a/user/xf86-input-mouse/APKBUILD +++ b/user/xf86-input-mouse/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-input-mouse-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-input-synaptics/APKBUILD b/user/xf86-input-synaptics/APKBUILD index 5d45c4602..2ca9e1387 100644 --- a/user/xf86-input-synaptics/APKBUILD +++ b/user/xf86-input-synaptics/APKBUILD @@ -10,10 +10,11 @@ depends="" makedepends="libevdev-dev libxi-dev libxkbfile-dev libxrandr-dev libxtst-dev mtdev-dev xorg-server-dev" subpackages="$pkgname-doc $pkgname-dev" -source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + input-event.patch + " build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -26,14 +27,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2" +sha512sums="978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2 +c2fb26ce6721eddc611fb21cec18bd3a180557deccb5b46e2cdd60c7b10d4c4105dacd6d027ac2e71934df5f51a58a18a12e2c18d16e48768fa56a7dfffd9f90 input-event.patch" diff --git a/user/xf86-input-synaptics/input-event.patch b/user/xf86-input-synaptics/input-event.patch new file mode 100644 index 000000000..38b620f09 --- /dev/null +++ b/user/xf86-input-synaptics/input-event.patch @@ -0,0 +1,27 @@ +--- xf86-input-synaptics-1.9.1/src/eventcomm.c.old 2018-05-29 03:18:45.000000000 +0000 ++++ xf86-input-synaptics-1.9.1/src/eventcomm.c 2020-01-22 02:18:05.881867288 +0000 +@@ -575,9 +575,12 @@ + ev->type = EV_SYN; + ev->code = SYN_REPORT; + ev->value = 0; +- ev->time = last_event_time; +- } else if (ev->type == EV_SYN) +- last_event_time = ev->time; ++ ev->input_event_sec = last_event_time.tv_sec; ++ ev->input_event_usec = last_event_time.tv_usec; ++ } else if (ev->type == EV_SYN) { ++ last_event_time.tv_sec = ev->input_event_sec; ++ last_event_time.tv_usec = ev->input_event_usec; ++ } + + return TRUE; + } +@@ -725,7 +728,7 @@ + case SYN_REPORT: + hw->numFingers = count_fingers(pInfo, comm); + if (proto_data->have_monotonic_clock) +- hw->millis = 1000 * ev.time.tv_sec + ev.time.tv_usec / 1000; ++ hw->millis = 1000 * ev.input_event_sec + ev.input_event_usec / 1000; + else + hw->millis = GetTimeInMillis(); + SynapticsCopyHwState(hwRet, hw); diff --git a/user/xf86-input-void/APKBUILD b/user/xf86-input-void/APKBUILD index 9ce25b0f7..8f559b25f 100644 --- a/user/xf86-input-void/APKBUILD +++ b/user/xf86-input-void/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-input-void-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-input-wacom/APKBUILD b/user/xf86-input-wacom/APKBUILD index 0804b1960..a1d6375a7 100644 --- a/user/xf86-input-wacom/APKBUILD +++ b/user/xf86-input-wacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-wacom -pkgver=0.37.0 +pkgver=0.39.0 pkgrel=0 pkgdesc="X.Org driver for Wacom tablets" url="https://linuxwacom.github.io/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="74167e48be4e2e9e02c71b003bf806c8ba7d35900e8e621084a73142e4d1ea286e16bd190b5385224d3574443b512faa7f49210d63b9662a739433a78fd54bcf xf86-input-wacom-0.37.0.tar.bz2" +sha512sums="9ad92c86c4ba3587d68e2107057c89dfe8628c0a2ec882f5a424ab4983c18ff6048489d7f6d3a8de87403744f74de1982de25327fc955bb5c21346a242e0aaa3 xf86-input-wacom-0.39.0.tar.bz2" diff --git a/user/xf86-video-amdgpu/APKBUILD b/user/xf86-video-amdgpu/APKBUILD index 0228575e4..2a0effefa 100644 --- a/user/xf86-video-amdgpu/APKBUILD +++ b/user/xf86-video-amdgpu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-amdgpu -pkgver=19.0.1 +pkgver=19.1.0 pkgrel=0 pkgdesc="X.Org driver for brand new AMD GPUs" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dda04e3ccee140354f59e04895cf50cd7dc06a105c40ce35069613c5b5fbe083cab6833fd293d96334f64dde1a0c4af6154d473594a144f37404188ae7f37dd5 xf86-video-amdgpu-19.0.1.tar.bz2" +sha512sums="ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2" diff --git a/user/xf86-video-ast/APKBUILD b/user/xf86-video-ast/APKBUILD index 0d90f631b..2ba078de0 100644 --- a/user/xf86-video-ast/APKBUILD +++ b/user/xf86-video-ast/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index 4212237c5..15029c507 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,21 +1,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati -pkgver=19.0.1 -pkgrel=0 +pkgver=19.1.0 +pkgrel=2 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -subpackages="$pkgname-doc" -depends="mesa-dri-ati" +depends="mesa-dri" makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros xorg-server-dev" -source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +subpackages="$pkgname-doc" +source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + null-deref-exa.patch + " build() { export LDFLAGS="$LDFLAGS -Wl,-z,lazy" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,4 +29,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e04c5395e3a49d81b8f7a4b0e11fe8c9ebd17af056a4eab4541873796dce05b103c93fb185f3a00873010df0655cd7311e6d27e177aeb7345c4c8017bbd1eb17 xf86-video-ati-19.0.1.tar.bz2" +sha512sums="73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 +f9c6928f741014b47b302c2f2cf6a0110fcc0935cb3a2725e37f8b48e9cd778639231110b9a4ce67ad38174b21b47864ff0793f9181347c21ef694bedbc44b0b null-deref-exa.patch" diff --git a/user/xf86-video-ati/null-deref-exa.patch b/user/xf86-video-ati/null-deref-exa.patch new file mode 100644 index 000000000..dd13e9b60 --- /dev/null +++ b/user/xf86-video-ati/null-deref-exa.patch @@ -0,0 +1,77 @@ +From a8168153037f2cfb9739285b92896c0e24872518 Mon Sep 17 00:00:00 2001 +From: Alexey Sheplyakov <asheplyakov@altlinux.org> +Date: Wed, 27 Nov 2019 20:50:58 +0400 +Subject: [PATCH] Don't crash X server if GPU acceleration is not available + +Commit d1d8e3c8d0a0a0394d395eba171460501745209b causes X server +to fail on startup when GPU acceleration is not working (or is +disabled). The reason is that `radeon_get_pixmap_bo` function +gets called too early (before EXA has been initialized) and +fails with an assert: + + #0 __GI_raise (sig=<optimized out>) at ../sysdeps/unix/sysv/linux/raise.c:50 + #1 0x76ab1c6c in __GI_abort () at abort.c:79 + #2 0x76ac0b64 in __assert_fail_base (fmt=0x76bfbce4 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7658c80c "key->initialized", file=<optimized out>, line=121, + function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:92 + #3 0x76ac0c0c in __GI___assert_fail (assertion=0x7658c80c "key->initialized", file=0x7658c9d0 "../include/privates.h", line=121, + function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:101 + #4 0x76579e6c in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at ../include/privates.h:121 + #5 0x7657a954 in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at exa.c:70 + #6 dixGetPrivate (key=<optimized out>, privates=<optimized out>) at ../include/privates.h:136 + #7 exaGetPixmapDriverPrivate (pPix=<optimized out>) at exa.c:68 + #8 0x7623d460 in radeon_get_pixmap_bo (pPix=0x71c1b8) at radeon.h:804 + #9 radeon_get_pixmap_handle (pixmap=0x71c1b8, handle=0x7fa22328) at radeon_bo_helper.c:357 + #10 0x76244458 in radeon_pixmap_get_fb (pix=0x71c1b8) at radeon.h:886 + #11 drmmode_set_mode_major (crtc=0x691860, mode=0x69191c, rotation=<optimized out>, x=<optimized out>, y=<optimized out>) at drmmode_display.c:918 + #12 0x762467e8 in drmmode_set_desired_modes (pScrn=0x67c678, drmmode=<optimized out>, set_hw=1) at drmmode_display.c:3128 + #13 0x0047bfa4 in MapWindow (client=0x669ec8, pWin=0x7206c0) at window.c:2722 + #14 MapWindow (pWin=0x7206c0, client=0x669ec8) at window.c:2665 + #15 0x00449650 in dix_main (argc=3, argv=0x7fa22604, envp=<optimized out>) at main.c:247 + #16 0x76ab2198 in __libc_start_main (main=0x42db10 <main>, argc=3, argv=0x7fa22604, init=<optimized out>, fini=0x606434 <__libc_csu_fini>, rtld_fini=0x77229930 <_dl_fini>, + stack_end=0x7fa225e0) at libc-start.c:308 + #17 0x0042db80 in __start () at ../sysdeps/mips/start.S:110 + +Don't call `exaGetPixmapDriverPrivate` if the acceleration (EXA) is not +enabled [yet] to avoid the problem. + +Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188 +Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539 +--- + src/radeon.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/radeon.h b/src/radeon.h +index 2c913466..e4a2ba66 100644 +--- a/src/radeon.h ++++ b/src/radeon.h +@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo + + static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) + { +-#ifdef USE_GLAMOR + RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen)); ++#ifdef USE_GLAMOR + + if (info->use_glamor) { + struct radeon_pixmap *priv; +@@ -799,7 +799,7 @@ static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) + return priv ? priv->bo : NULL; + } else + #endif +- { ++ if (info->accelOn) { + struct radeon_exa_pixmap_priv *driver_priv; + driver_priv = exaGetPixmapDriverPrivate(pPix); + return driver_priv ? driver_priv->bo : NULL; +@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix) + handle); + } + +- return *fb_ptr; ++ return fb_ptr ? *fb_ptr : NULL; + } + + +-- +2.24.1 + diff --git a/user/xf86-video-cirrus/APKBUILD b/user/xf86-video-cirrus/APKBUILD index 1c26532ea..56cdf55fa 100644 --- a/user/xf86-video-cirrus/APKBUILD +++ b/user/xf86-video-cirrus/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-cirrus-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD index 453dda88c..27ac8da62 100644 --- a/user/xf86-video-dummy/APKBUILD +++ b/user/xf86-video-dummy/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-fbdev/APKBUILD b/user/xf86-video-fbdev/APKBUILD index d514f987d..b78739650 100644 --- a/user/xf86-video-fbdev/APKBUILD +++ b/user/xf86-video-fbdev/APKBUILD @@ -6,13 +6,12 @@ pkgdesc="Framebuffer video driver for X11" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc" depends="" makedepends="libxi-dev util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" source="https://www.X.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/user/xf86-video-freedreno/APKBUILD b/user/xf86-video-freedreno/APKBUILD index d46d2b23a..4eb0448e4 100644 --- a/user/xf86-video-freedreno/APKBUILD +++ b/user/xf86-video-freedreno/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.4.0 pkgrel=0 pkgdesc="Libre Adreno video driver for X11" url="https://www.X.Org/" -arch="all" +arch="aarch64 aarch64_be armel armeb armhf armv7" license="X11 AND BSD-3-Clause" depends="" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" @@ -16,7 +16,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-freedreno-$pkgve " build() { - cd "$builddir" CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD index 0ba4f2954..71749e608 100644 --- a/user/xf86-video-geode/APKBUILD +++ b/user/xf86-video-geode/APKBUILD @@ -16,7 +16,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.ta " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index 6727ce394..a7eb064bb 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -2,32 +2,29 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xf86-video-intel verbase=2.99.917 -pkgver=${verbase}_git20180803 +pkgver=${verbase}_git20200224 pkgrel=0 pkgdesc="Legacy X.Org driver for Intel graphics cards" url="https://xorg.freedesktop.org" arch="pmmx x86_64" options="!check" # No test suite. license="MIT" -subpackages="$pkgname-doc" -depends="mesa-dri-intel" +depends="mesa-dri" makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto + libxv-dev " -source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz - pmmx.patch - " +subpackages="$pkgname-doc" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" -reporev="3d395062ce73f85e8340218df01c2ebf4bc25023" +reporev="f66d39544bb8339130c96d282a80f87ca1606caf" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -40,11 +37,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper } -sha512sums="a96e627ed1b3fb6b66f02caaafb0f94967df9a2409158aacc9d8958538ef47bd84176ce71a4785f21944beb764450b1560c6dc59eef435f75959e27704be41f1 xf86-video-intel-2.99.917_git20180803.tar.gz -13694f8829ec59773f764817467052d5d4b93b5de16d8cdacc08ced48608b46008414be1f5f118e5f327c401541477c3418f510ada9cfb290a11ac2e5590b0f3 pmmx.patch" +sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9 xf86-video-intel-2.99.917_git20200224.tar.gz" diff --git a/user/xf86-video-intel/pmmx.patch b/user/xf86-video-intel/pmmx.patch deleted file mode 100644 index 7edddfb96..000000000 --- a/user/xf86-video-intel/pmmx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 0f3775ec..c4056913 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -32,7 +32,7 @@ - #define likely(expr) (__builtin_expect (!!(expr), 1)) - #define unlikely(expr) (__builtin_expect (!!(expr), 0)) - #define noinline __attribute__((noinline)) --#define force_inline inline __attribute__((always_inline)) -+#define force_inline inline - #define fastcall __attribute__((regparm(3))) - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) diff --git a/user/xf86-video-mach64/APKBUILD b/user/xf86-video-mach64/APKBUILD index 2fdbb93c7..0ab4416af 100644 --- a/user/xf86-video-mach64/APKBUILD +++ b/user/xf86-video-mach64/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://www.x.org/releases/individual/driver/xf86-video-mach64-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-mga/APKBUILD b/user/xf86-video-mga/APKBUILD index adfbc5b31..14b891e37 100644 --- a/user/xf86-video-mga/APKBUILD +++ b/user/xf86-video-mga/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-mga-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 40c9b8f82..2f812fc77 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau pkgver=1.0.16 -pkgrel=0 +pkgrel=1 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" license="MIT" -depends="mesa-dri-nouveau" +depends="mesa-dri" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD index 10832e4ae..1b71f0b87 100644 --- a/user/xf86-video-openchrome/APKBUILD +++ b/user/xf86-video-openchrome/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD index 3106debc5..57c54f403 100644 --- a/user/xf86-video-qxl/APKBUILD +++ b/user/xf86-video-qxl/APKBUILD @@ -14,7 +14,6 @@ subpackages="" source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD index 094b11633..0e6702994 100644 --- a/user/xf86-video-r128/APKBUILD +++ b/user/xf86-video-r128/APKBUILD @@ -15,7 +15,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xf86-video-sis/APKBUILD b/user/xf86-video-sis/APKBUILD index 4febae7c9..f07e35f35 100644 --- a/user/xf86-video-sis/APKBUILD +++ b/user/xf86-video-sis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-sis -pkgver=0.11.0 +pkgver=0.12.0 pkgrel=0 pkgdesc="X.Org driver for SiS video cards" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab43765d8daea57ff35c4cffed056fbec6dfe8ce95efcd6269cc7711115ea09c xf86-video-sis-0.11.0.tar.bz2" +sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2" diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index ee024e92d..66e869a55 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -1,19 +1,20 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfburn -pkgver=0.5.5 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="CD burning utility for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" -makedepends="intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev +depends="" +makedepends="bash intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev libxfce4ui-dev exo-dev libgudev-dev gstreamer-dev gst-plugins-base-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/xfburn-$pkgver.tar.bz2" build() { - LIBS="-lintl" ./configure \ + LIBS="-lintl" bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a xfburn-0.5.5.tar.bz2" +sha512sums="8ea747ab248a20e835082bbb89e09c3e4746201a1da956bc87a2eef5359d1508e5461c7d8a35327aa2261fb7cac576e8521596f83011bc2240b2fbebde60b9c2 xfburn-0.6.1.tar.bz2" diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 7044a7dd7..035c79a18 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -1,28 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce-desktop pkgver=4.13 pkgrel=0 arch="noarch" pkgdesc="Complete XFCE desktop environment" url="https://xfce.org" +options="!check" # meta package, no tests needed. license="NCSA" -options="!check" # meta package, no tests needed. depends="xfburn xfce4-power-manager xfce4-settings xfce4-volumed-pulse xfdesktop xfce4-appfinder xfce4-panel xfce4-screenshooter xfce4-taskmanager xfconf xfce4-dict xfce4-panel-profiles xfce4-session xfdashboard xfmpc xfwm4 xfce4-terminal xfce4-notifyd" +makedepends="" source="org.adelie-linux.about-xfce.desktop" -builddir="$srcdir/$pkgname-$pkgver" - -build() { - cd "$srcdir" -} package() { - cd "$srcdir" install -D -m644 "$srcdir"/org.adelie-linux.about-xfce.desktop \ "$pkgdir"/usr/share/applications/org.adelie-linux.about-xfce.desktop } + sha512sums="362793e478e3fb0c6d7dca1f52f582a641ff4582ad0c0d6d1cbe28f1255fc6cd7918ea6b24a5d905a59275f67c44703bf8c78580642c4e0147b539842a6f372f org.adelie-linux.about-xfce.desktop" diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD index 8b9396447..5e4d92920 100644 --- a/user/xfce-plugins/APKBUILD +++ b/user/xfce-plugins/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce-plugins pkgver=0.1 pkgrel=0 @@ -13,12 +13,9 @@ depends="xfce4-battery-plugin xfce4-diskperf-plugin xfce4-netload-plugin xfce4-indicator-plugin xfce4-pulseaudio-plugin xfce4-time-out-plugin xfce4-whiskermenu-plugin xfce4-cpugraph-plugin xfce4-sensors-plugin xfce4-timer-plugin" +makedepends="" source="dummy" -build() { - cd "$srcdir" -} - package() { mkdir -p "$pkgdir" } diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 4a516b885..187e18781 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-appfinder pkgver=4.14.0 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.14/xfce4-appfinder-$pkgver.tar.bz2" diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 867c05676..90aea20eb 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-battery-plugin pkgver=1.1.3 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Battery monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index 2ca1be37e..1e1e5649d 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-clipman-plugin pkgver=1.4.3 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Clipboard management plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 6295a2aa5..5a235a42e 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-cpugraph-plugin pkgver=1.1.0 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Graphical CPU monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.1/xfce4-cpugraph-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index 1aad37ff0..cb9291532 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-dict pkgver=0.8.3 pkgrel=0 @@ -7,12 +7,12 @@ pkgdesc="Dictionary application for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool glib-dev gtk+3.0-dev libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-doc" source="http://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index ef82ecf56..cc66c040c 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-diskperf-plugin pkgver=2.6.2 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Disk performance monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause AND GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index c0d02810f..a8e5f5f97 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-indicator-plugin pkgver=2.3.4 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Application information plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libindicator-dev ido-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 743aa161e..2101b528a 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-netload-plugin pkgver=1.3.2 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Network monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 5bc42afc4..0aa0fdd1f 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-notifyd pkgver=0.4.4 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0-only AND GPL-2.0+" +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" diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD index 503943b62..777ace868 100644 --- a/user/xfce4-panel-profiles/APKBUILD +++ b/user/xfce4-panel-profiles/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-panel-profiles -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=0 pkgdesc="Application for managing XFCE panel layouts" url="https://xfce.org" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a9b381d357482582210e153fdf1ced8055847ace0507dafc29fc952070fc4fe8fd34aff62342f442ec7045cfe87550c56ccf5d78c0f0a7de7ed64e4c303aab45 xfce4-panel-profiles-1.0.9.tar.bz2" +sha512sums="efd59d585cc916cfc9d87961a58f05dad754a70f1971d9c49a071e20b96bb28e6bd5fa13508430e5c0f15976db7c438d2c68e0ae5936563388fbbe02fffdb50a xfce4-panel-profiles-1.0.10.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 8632458d9..043044ffe 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-panel pkgver=4.14.1 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.1+ AND GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev libwnck-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 0d7f38a38..ab652e8c1 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-power-manager pkgver=1.6.5 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev upower-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 77c6f3515..96588826c 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-pulseaudio-plugin pkgver=0.4.2 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Pulseaudio plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-lang" diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index 094922574..e3ad324dd 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-screenshooter -pkgver=1.9.6 +pkgver=1.9.7 pkgrel=0 pkgdesc="Screenshot tool for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libsoup-dev exo-dev" subpackages="$pkgname-doc" -source="http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="17d4afb346f09f97225c0fe65ed2389733e98d58729f15f7ec2b601682d7e15a6d9c67b85840593c17298fc32c250d8eb2e8d349ccd355507f4c18b5e312ae35 xfce4-screenshooter-1.9.6.tar.bz2" +sha512sums="364594bd00172f0becb85f8643e4106b4a7b71ac5dad765850f54de011a77175801bd9e7eaab6a8bbb3b1353299fdfa25cc0a4a52d49017f9b51330377eb9add xfce4-screenshooter-1.9.7.tar.bz2" diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index 781ec965d..eef3b208f 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-sensors-plugin pkgver=1.3.92 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Hardware sensor monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 8ccbb3378..b161b8b8b 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-session -pkgver=4.14.0 +pkgver=4.14.1 pkgrel=0 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fba79ef9727d47514c5e4223376c49057b714f9be9bda6031a1220f4840abb257d31517252180c0af2e7cd6969bbc4e6f525b00cac594e1a3b80f09f3f2335cb xfce4-session-4.14.0.tar.bz2" +sha512sums="af797e33145311015ca6444b929d82c4e321f76defe773aba723d0a373f894399216e043b45e0669dd1c9aa1ad3cd2dcfd422352fd2381b7425bb310be66c92b xfce4-session-4.14.1.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 1246a51a8..2ac50d1a7 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-settings pkgver=4.14.1 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND MIT AND LGPL-2.0+" +depends="" makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev libxklavier-dev xf86-input-libinput-dev" subpackages="$pkgname-lang" diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 32950f105..7600d411e 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-systemload-plugin pkgver=1.2.3 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="System load monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index daac4f234..ef98510e3 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-taskmanager pkgver=1.2.2 pkgrel=0 @@ -7,29 +7,29 @@ pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev gtk+2.0-dev libxmu-dev libwnck-dev" -source="http://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2" +subpackages="$pkgname-lang" +source="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ + --with-locales-dir=/usr/share/locale \ --localstatedir=/var \ --enable-gtk3 make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index 5e09bf24c..9b63b7d46 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -1,13 +1,14 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-terminal -pkgver=0.8.8 +pkgver=0.8.9.1 pkgrel=0 pkgdesc="Terminal for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" -makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev" +depends="" +makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev pcre2-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2" @@ -30,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645 xfce4-terminal-0.8.8.tar.bz2" +sha512sums="c1a68300604d1db205ac52b51dfea38031dfd92b31f7530705ac6bc875c9b4f9819bdf05bca23cbfddd87f7899488ee4dab4c897ceb96efc41a44acfc298ed22 xfce4-terminal-0.8.9.1.tar.bz2" diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 268a7b817..607bdf263 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -1,15 +1,16 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-time-out-plugin -pkgver=1.0.3 +pkgver=1.1.0 pkgrel=0 pkgdesc="Forced computer break plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/${pkgver%.*}/xfce4-time-out-plugin-$pkgver.tar.bz2" build() { LIBS="-lintl" ./configure \ @@ -30,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c2080abef330e9f783b3e9c008a76d11bdbdfe1a666435237b6b06a50e93191a760441a9d343f24234eb4343b550009ed9e2101dbffbec3d8f53c562d4bb3cfc xfce4-time-out-plugin-1.0.3.tar.bz2" +sha512sums="03d27d98a3968daf93357556a5ca63641ceee3ce9f53db5287ce27a282d3f4a068a2c9be14d7690d4188901245521c03b68bb3fe39e1ed0e1f6a95eecc1dc846 xfce4-time-out-plugin-1.1.0.tar.bz2" diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index b59b00931..eb420718a 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-timer-plugin pkgver=1.7.0 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Timer plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index 935a39a5f..432c5cff9 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-verve-plugin pkgver=2.0.0 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Command-line plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD index bfaa8f297..55a0ff0d3 100644 --- a/user/xfce4-volumed-pulse/APKBUILD +++ b/user/xfce4-volumed-pulse/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-volumed-pulse pkgver=0.2.3 pkgrel=0 @@ -7,7 +7,9 @@ pkgdesc="Pulseaudio volume manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-3.0+" -makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev" +depends="" +makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev + libnotify-dev" source="https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-$pkgver.tar.bz2" build() { diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 3c082ed70..6f69cea32 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,15 +1,16 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-whiskermenu-plugin -pkgver=2.3.3 +pkgver=2.4.1 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" url="https://xfce.org" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0+" -makedepends="gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev" +depends="" +makedepends="cmake gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$_pkgmaj/xfce4-whiskermenu-plugin-$pkgver.tar.bz2" @@ -24,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="06e8c0ec623538103974c266c26b8efea94f97093324b5f55305ba6832a8c9eb7fa19c636249dffbc09ed4c7e3f543d338b2bd3455c14601237b2253683f5ac6 xfce4-whiskermenu-plugin-2.3.3.tar.bz2" +sha512sums="090987e78cef1b13944a792eb8584a25f25aaf6777263240dbd3d58beeee363321a7e3ff9e2983d3ffebfa18e8037e5ef75eb82b24815a559eeb8efd984a2dfc xfce4-whiskermenu-plugin-2.4.1.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index d13a4dceb..c211fb629 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfconf pkgver=4.14.1 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" -options="!check" # tests require X11 +options="!check" # Tests require X11. license="LGPL-2.1+ AND GPL-2.0+" depends="dbus" makedepends="intltool gtk+3.0-dev libxfce4util-dev" diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index af4013ff8..db7744791 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -1,12 +1,13 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfdashboard -pkgver=0.7.5 -pkgrel=1 +pkgver=0.7.7 +pkgrel=0 pkgdesc="Gnome dashboard clone for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev libxfce4ui-dev clutter-dev" subpackages="$pkgname-dev $pkgname-lang" @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5d32aa3a49e02d85ca92bee6aa37a3b743e50ca5d992128decea5846e8c9008a9f5bdb98cc0ee3e980761a6538a4867ff28410e066ef22f0aa2c2bd4c5ce1523 xfdashboard-0.7.5.tar.bz2" +sha512sums="561badb0b752dabb095881134050046f98eb4374c8e3c647a4ba7226c1efce650790ef3630b53a30cd48dab190afba31de2faef8991c13af64f7eb980b099989 xfdashboard-0.7.7.tar.bz2" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 7b5083068..a9c3c3d9d 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,12 +1,13 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfdesktop -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=0 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev exo-dev garcon-dev libnotify-dev thunar-dev" subpackages="$pkgname-doc $pkgname-lang" @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c xfdesktop-4.14.1.tar.bz2" +sha512sums="8515fc1c048da50c8c2986ea8590144203fdf3107b81e2d2dd44ee408938fb71281abe52cc098508dc2ae20ef2cbc31903086941206c0cbbc92a661dbfb2c472 xfdesktop-4.14.2.tar.bz2" diff --git a/user/xfindproxy/APKBUILD b/user/xfindproxy/APKBUILD index 430427fb2..bca667899 100644 --- a/user/xfindproxy/APKBUILD +++ b/user/xfindproxy/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xfindproxy-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index dc889ea14..c6f9975a0 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfmpc pkgver=0.3.0 pkgrel=1 @@ -7,6 +7,7 @@ pkgdesc="Graphical music player daemon client for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="" makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2" diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD index e34c9d2ac..2256f0359 100644 --- a/user/xfontsel/APKBUILD +++ b/user/xfontsel/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xfontsel-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD index d7e0fdeb6..e36ce177c 100644 --- a/user/xfs/APKBUILD +++ b/user/xfs/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xfs-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 4dbd07d10..b6c907d50 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfwm4 pkgver=4.14.0 pkgrel=0 @@ -7,6 +7,7 @@ pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev gobject-introspection-dev vala-dev" subpackages="$pkgname-lang" diff --git a/user/xfwp/APKBUILD b/user/xfwp/APKBUILD index 46540f2ce..07d72f7b5 100644 --- a/user/xfwp/APKBUILD +++ b/user/xfwp/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xfwp-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD index d93f3853b..f6f49a5cb 100644 --- a/user/xgamma/APKBUILD +++ b/user/xgamma/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xgc/APKBUILD b/user/xgc/APKBUILD index 8e55f8a4f..472ea5da1 100644 --- a/user/xgc/APKBUILD +++ b/user/xgc/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xgc-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xinit/APKBUILD b/user/xinit/APKBUILD index 37556cb27..9ec540564 100644 --- a/user/xinit/APKBUILD +++ b/user/xinit/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="X.Org initialisation program" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-doc" depends="cmd:mcookie xauth xmodmap xrdb" makedepends="libx11-dev util-macros" +subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.bz2 06_move_serverauthfile_into_tmp.patch xinitrc diff --git a/user/xinput/APKBUILD b/user/xinput/APKBUILD index 8e5dde983..7e4014048 100644 --- a/user/xinput/APKBUILD +++ b/user/xinput/APKBUILD @@ -8,6 +8,7 @@ url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="X11" +depends="" makedepends="util-macros libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev" subpackages="$pkgname-doc" diff --git a/user/xkbcomp/APKBUILD b/user/xkbcomp/APKBUILD index b79b4593d..f1d2a0356 100644 --- a/user/xkbcomp/APKBUILD +++ b/user/xkbcomp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkbcomp -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="Keyboard layout compiler for X11" url="https://www.X.Org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e xkbcomp-1.4.2.tar.bz2" +sha512sums="827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d xkbcomp-1.4.3.tar.bz2" diff --git a/user/xkbevd/APKBUILD b/user/xkbevd/APKBUILD index 2402772b7..6ddef0568 100644 --- a/user/xkbevd/APKBUILD +++ b/user/xkbevd/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xkbevd-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xkbprint/APKBUILD b/user/xkbprint/APKBUILD index 3661c7da9..ce4387c78 100644 --- a/user/xkbprint/APKBUILD +++ b/user/xkbprint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkbprint -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Tool to generate PostScript descriptions of XKB keyboard layouts" url="https://www.X.Org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xkbprint-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bb65a93ae737cd4b78787fef51972f4d0072a272166f82103bfaa92cf275db6363fae3530539b7c9a4139f6b87512019ac15ab3478d4ad05967ad18a8e80033a xkbprint-1.0.4.tar.bz2" +sha512sums="ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f xkbprint-1.0.5.tar.bz2" diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD index d627a69a8..ec291a6e9 100644 --- a/user/xkbutils/APKBUILD +++ b/user/xkbutils/APKBUILD @@ -13,14 +13,12 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xkbutils-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index 35f9769b4..8ede47ac1 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.27 +pkgver=2.29 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" license="X11 AND MIT" depends="" -makedepends="intltool libx11-dev xkbcomp" -subpackages="$pkgname-lang" +makedepends="intltool libx11-dev python3 xkbcomp cmd:xsltproc" +subpackages="$pkgname-doc $pkgname-lang" source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2" build() { @@ -32,4 +32,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e xkeyboard-config-2.27.tar.bz2" +sha512sums="202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670 xkeyboard-config-2.29.tar.bz2" diff --git a/user/xkill/APKBUILD b/user/xkill/APKBUILD index bc4d3cceb..f0fd097e4 100644 --- a/user/xkill/APKBUILD +++ b/user/xkill/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xkill-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xload/APKBUILD b/user/xload/APKBUILD index 71414484b..a89b3a6ca 100644 --- a/user/xload/APKBUILD +++ b/user/xload/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xload-$pkgver.tar.bz2" build() { - cd "$builddir" CFLAGS="$CFLAGS -DRLOADSTUB" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xlsclients/APKBUILD b/user/xlsclients/APKBUILD index 81b470a1d..511d2d152 100644 --- a/user/xlsclients/APKBUILD +++ b/user/xlsclients/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xlsclients-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD index 054386397..d3765c29b 100644 --- a/user/xlsfonts/APKBUILD +++ b/user/xlsfonts/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xlsfonts-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xmag/APKBUILD b/user/xmag/APKBUILD index 85191ca8d..ca81d63c8 100644 --- a/user/xmag/APKBUILD +++ b/user/xmag/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xmag-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xmessage/APKBUILD b/user/xmessage/APKBUILD index 145daeec0..21c5cf84a 100644 --- a/user/xmessage/APKBUILD +++ b/user/xmessage/APKBUILD @@ -6,12 +6,12 @@ pkgdesc="Display a message or query in a window" url="https://www.X.Org/" arch="all" license="X11" +depends="" makedepends="libx11-dev libxaw-dev util-macros" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD index d7594e546..ae460e7ae 100644 --- a/user/xmh/APKBUILD +++ b/user/xmh/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xmh-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index 4b7f83509..5c71b8f19 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec -pkgver=1.2.28 +pkgver=1.2.29 _pkgname="$pkgname${pkgver%%.*}" -pkgrel=1 +pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" url="https://www.aleksey.com/xmlsec/" arch="all" license="MIT" depends="" checkdepends="nss-tools" -makedepends="libxml2-dev libxslt-dev openssl-dev +makedepends="libtool libxml2-dev libxslt-dev openssl-dev gnutls-dev libgcrypt-dev nss-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gcrypt $pkgname-gnutls $pkgname-nss" -source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz - fix-tests.patch" +source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -69,5 +68,4 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 xmlsec1-1.2.28.tar.gz -2f146b31460ae1843a696c77cef03b36a0bf212028189055834e2e50d7a3142f6a069ce18a5c6b2251b5846fad7e96a6d9e26a6445fd182ac4c44c70afc4f8a3 fix-tests.patch" +sha512sums="07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d xmlsec1-1.2.29.tar.gz" diff --git a/user/xmlsec/fix-tests.patch b/user/xmlsec/fix-tests.patch deleted file mode 100644 index 73acdf800..000000000 --- a/user/xmlsec/fix-tests.patch +++ /dev/null @@ -1,176 +0,0 @@ -Backport of the following commits: - -b841f2c0b1e9cf24d991cc8b5d21e5a3b7c6ad80 -f25e8f07428b9475fa576bf78d77fb4fa366bc70 -106e7dbf39d96c46aedecf229d55a09e7593f1ec - -diff --git a/tests/testDSig.sh b/tests/testDSig.sh -index 77372311..f2014464 100755 ---- a/tests/testDSig.sh -+++ b/tests/testDSig.sh -@@ -805,98 +805,98 @@ execDSigTest $res_success \ - "signature-rsa-detached-b64-transform" \ - "base64 sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-detached" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-detached-xpath-transform" \ - "xpath sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-detached-xslt-transform-retrieval-method" \ - "xslt sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-detached-xslt-transform" \ - "xslt sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-enveloped" \ - "enveloped-signature sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-enveloping" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest-x509-data-cert-chain" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest-x509-data-cert" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest-x509-data-issuer-serial" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest-x509-data-ski" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest-x509-data-subject-name" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-manifest" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" - - execDSigTest $res_success \ - "phaos-xmldsig-three" \ - "signature-rsa-xpath-transform-enveloped" \ - "enveloped-signature xpath sha1 rsa-sha1" \ - "rsa x509" \ -- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" -+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" - - - ########################################################################## -@@ -940,7 +940,7 @@ execDSigTest $res_fail \ - "merlin-xmldsig-twenty-three/signature-x509-crt-crl" \ - "sha1 rsa-sha1" \ - "rsa x509" \ -- "--X509-skip-strict-checks --trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018" -+ "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018" - - execDSigTest $res_fail \ - "" \ -diff --git a/tests/testrun.sh b/tests/testrun.sh -index ea65802b..fe0334c7 100755 ---- a/tests/testrun.sh -+++ b/tests/testrun.sh -@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then - elif [ "z$crypto" != "z" ] ; then - xmlsec_params="$xmlsec_params --crypto $crypto" - fi --xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config" -+xmlsec_params="$xmlsec_params --crypto-config $crypto_config" - - # - # Setup keys config -@@ -308,8 +308,8 @@ execDSigTest() { - # run tests - if [ -n "$params1" ] ; then - printf " Verify existing signature " -- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile -- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile -+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile -+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile - printRes $expected_res $? - if [ $? != 0 ]; then - failures=`expr $failures + 1` -@@ -328,8 +328,8 @@ execDSigTest() { - - if [ -n "$params3" -a -z "$PERF_TEST" ] ; then - printf " Verify new signature " -- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile -- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile -+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile -+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile - printRes $res_success $? - if [ $? != 0 ]; then - failures=`expr $failures + 1` -@@ -406,7 +406,7 @@ execEncTest() { - if [ -n "$params1" ] ; then - rm -f $tmpfile - printf " Decrypt existing document " -- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile -+ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile - $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile - res=$? - echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile diff --git a/user/xmodmap/APKBUILD b/user/xmodmap/APKBUILD index abf6c45ba..a37dd7b67 100644 --- a/user/xmodmap/APKBUILD +++ b/user/xmodmap/APKBUILD @@ -12,7 +12,7 @@ makedepends="libx11-dev util-macros" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" -build () { +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/xmoto/APKBUILD b/user/xmoto/APKBUILD index 62bbdd1e7..f13b7d68d 100644 --- a/user/xmoto/APKBUILD +++ b/user/xmoto/APKBUILD @@ -10,7 +10,8 @@ license="GPL-2.0+" depends="" makedepends="bzip2-dev curl-dev glu-dev libjpeg-turbo-dev libpng-dev libxdg-basedir-dev libxml2-dev lua5.3-dev mesa-dev ode-dev sdl-dev - sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev" + sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev + autoconf automake" subpackages="$pkgname-doc $pkgname-lang" source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.gz stupid-lua.patch @@ -18,14 +19,12 @@ source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.g " prepare() { - cd "$builddir" default_prepare update_config_sub rm -r src/ode } build() { - cd "$builddir" ./bootstrap CPPFLAGS="$CPPFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" \ LDFLAGS="$LDFLAGS $(pkg-config --libs lua)" \ @@ -41,12 +40,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m644 "$builddir"/extra/xmoto.desktop \ "$pkgdir"/usr/share/applications/xmoto.desktop diff --git a/user/xorg-apps/APKBUILD b/user/xorg-apps/APKBUILD index be8cce184..a40d9332c 100644 --- a/user/xorg-apps/APKBUILD +++ b/user/xorg-apps/APKBUILD @@ -9,16 +9,15 @@ license="MIT" options="!check" # Metapacakge subpackages="" depends="appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts - fstobdf iceauth ico lbxproxy listres luit mkcomposecache mkfontdir - mkfontscale oclock proxymngr rendercheck rgb setxkbmap showfont smproxy - transset twm viewres x11perf xauth acpilight xbiff xbitmaps xcalc - xclipboard xclock xcmsdb xcompmgr xconsole xcursorgen xdbedizzy - xditview xdpyinfo xdriinfo xedit xev xeyes xfd xfindproxy xfontsel xfs - xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp xkbevd xkbprint - xkbutils xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman - xmessage xmh xmodmap xmore xpr xprop xrandr xrdb xrefresh xrx xscope - xset xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo xwd - xwininfo xwud" + fstobdf iceauth ico listres luit mkcomposecache mkfontscale oclock + rendercheck rgb setxkbmap showfont smproxy transset twm viewres x11perf + xauth acpilight xbiff xbitmaps xcalc xclipboard xclock xcmsdb xcompmgr + xconsole xcursorgen xdbedizzy xditview xdpyinfo xdriinfo xedit xev + xeyes xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xinit + xinput xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms + xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xpr xprop + xrandr xrdb xrefresh xrx xscope xset xsetmode xsetpointer xsetroot xsm + xstdcmap xvidtune xvinfo xwd xwininfo xwud" source="" package() { diff --git a/user/xorg-cf-files/APKBUILD b/user/xorg-cf-files/APKBUILD index 5a438d2bf..f3270a4db 100644 --- a/user/xorg-cf-files/APKBUILD +++ b/user/xorg-cf-files/APKBUILD @@ -1,20 +1,18 @@ -# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xorg-cf-files pkgver=1.0.6 pkgrel=0 pkgdesc="Data files for the imake utility" -url="http://xorg.freedesktop.org/" +url="https://www.X.Org/" arch="noarch" +options="!check" # This package has no test suite. license="X11" -options="!check" # This package has no testsuite depends="" -makedepends="" +makedepends="util-macros" subpackages="$pkgname-doc" -source="http://xorg.freedesktop.org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" +source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname + install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ } -md5sums="28649f34fa23143f1945aa2750e1472a xorg-cf-files-1.0.6.tar.bz2" -sha256sums="4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d xorg-cf-files-1.0.6.tar.bz2" sha512sums="1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa xorg-cf-files-1.0.6.tar.bz2" diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD index 18bd7e6cf..c39fce3ba 100644 --- a/user/xorg-drivers/APKBUILD +++ b/user/xorg-drivers/APKBUILD @@ -13,11 +13,11 @@ depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-void xf86-input-wacom xf86-video-amdgpu xf86-video-ast xf86-video-ati xf86-video-cirrus - xf86-video-dummy xf86-video-fbdev xf86-video-freedreno xf86-video-glint - xf86-video-mach64 xf86-video-mga xf86-video-nouveau - xf86-video-openchrome xf86-video-qxl xf86-video-r128 - xf86-video-rendition xf86-video-sis xf86-video-sisusb xf86-video-tdfx - xf86-video-trident xf86-video-v4l xf86-video-vboxvideo xf86-video-vesa" + xf86-video-dummy xf86-video-fbdev xf86-video-glint xf86-video-mach64 + xf86-video-mga xf86-video-nouveau xf86-video-openchrome xf86-video-qxl + xf86-video-r128 xf86-video-rendition xf86-video-sis xf86-video-sisusb + xf86-video-tdfx xf86-video-trident xf86-video-v4l xf86-video-vboxvideo + xf86-video-vesa" case $CTARGET_ARCH in pmmx) depends="$depends xf86-video-geode xf86-video-intel" ;; @@ -28,7 +28,7 @@ case $CTARGET_ARCH in esac case $CTARGET_ARCH in aarch64*|arm*) - ;; + depends="$depends xf86-video-freedreno";; *) depends="$depends xf86-video-siliconmotion xf86-video-vmware";; esac diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD index 572976147..1dee09b1e 100644 --- a/user/xorg-gtest/APKBUILD +++ b/user/xorg-gtest/APKBUILD @@ -1,15 +1,16 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xorg-gtest pkgver=0.7.1 pkgrel=0 -pkgdesc="X extensions to googletest" +pkgdesc="X11 extensions to Google Test" url="https://gitlab.freedesktop.org/xorg/test/xorg-gtest" arch="noarch" options="!check" # tests require X license="MIT AND BSD-3-Clause" depends="" -makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy" +makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy + autoconf automake" subpackages="$pkgname-dev" source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest-$pkgver/xorg-gtest-xorg-gtest-$pkgver.tar.bz2 remove-ridiculous-va_list-hacks.patch @@ -17,13 +18,11 @@ source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest builddir="$srcdir"/$pkgname-$pkgname-$pkgver prepare() { - cd "$builddir" default_prepare ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,12 +34,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" DESTDIR="$pkgdir" make install for i in gtest gtest-spi; do rm "$pkgdir"/usr/include/gtest/"$i".h diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 2debe9c90..c4b5755fc 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,17 +1,13 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.5 +pkgver=1.20.7 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" -license="MIT" options="suid" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr - $pkgname-xnest" -# the modesetting driver is now shipped with xorg server -replaces="xf86-video-modesetting" +license="MIT" depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit" depends_dev="libepoxy-dev libxfont2-dev mesa-dev" makedepends="$depends_dev autoconf automake libtool util-macros @@ -23,6 +19,10 @@ makedepends="$depends_dev autoconf automake libtool util-macros xtrans openssl-dev perl zlib-dev " +# the modesetting driver is now shipped with xorg server +replaces="xf86-video-modesetting" +subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr + $pkgname-xnest" source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-sis.patch fix-musl-arm.patch @@ -134,6 +134,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2 -30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +sha512sums="c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 xorg-server-1.20.7.tar.bz2 +d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch +a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch" diff --git a/user/xorg-server/autoconfig-sis.patch b/user/xorg-server/autoconfig-sis.patch index e97d82114..2c1824752 100644 --- a/user/xorg-server/autoconfig-sis.patch +++ b/user/xorg-server/autoconfig-sis.patch @@ -1,6 +1,6 @@ --- ./hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 +++ ./hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ +@@ -1231,9 +1231,15 @@ break; } break; diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch index e661ae175..b5a64a4e7 100644 --- a/user/xorg-server/fix-musl-arm.patch +++ b/user/xorg-server/fix-musl-arm.patch @@ -1,7 +1,7 @@ --- ./hw/xfree86/common/compiler.h.orig +++ ./hw/xfree86/common/compiler.h -@@ -721,7 +721,7 @@ - :"r"(val), "r"(addr), "i"(ASI_PL)); +@@ -518,7 +518,7 @@ + barrier(); } -#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) @@ -9,12 +9,3 @@ #if defined(__arm32__) || defined(__mips64) #define PORT_SIZE long #else -@@ -996,7 +996,7 @@ - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/user/xorgproto/APKBUILD b/user/xorgproto/APKBUILD index d41ce1e2b..209642fed 100644 --- a/user/xorgproto/APKBUILD +++ b/user/xorgproto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorgproto -pkgver=2019.1 +pkgver=2019.2 pkgrel=0 pkgdesc="X11 protocol headers (combination)" url="https://www.X.Org/" @@ -71,7 +71,11 @@ check() { package() { make DESTDIR="$pkgdir" install + # libX11 + rm "$pkgdir"/usr/include/X11/extensions/XKBgeom.h + # libXvMC + rm "$pkgdir"/usr/include/X11/extensions/vldXvMC.h } -sha512sums="f26c17f4a027acdc799b532fa65c3ea1b0e8c30794c7b7293060ee9d9dec84b4878966cd2dcda43584849232e73a208abd4213374f89b05c10e5aae92bdc00be xorgproto-2019.1.tar.bz2 +sha512sums="cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904 xorgproto-2019.2.tar.bz2 18fc5228bb53eb15cfa0018f718e06faba0384a41e3aa0006fbf63e2a98779fdab527ea9eb8e22bb6a6f1ca02340ad8dad1260ee16e75f0416461ccefaa6df73 xprint.patch" diff --git a/user/xorriso/APKBUILD b/user/xorriso/APKBUILD index ebaff2e24..438d19a60 100644 --- a/user/xorriso/APKBUILD +++ b/user/xorriso/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorriso -pkgver=1.5.0 +pkgver=1.5.3 pkgrel=0 pkgdesc="ISO 9660 Rock Ridge filesystem manipulator" url="https://www.gnu.org/software/xorriso/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.gnu.org/software/xorriso/xorriso-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="39d74cff30532fba8ac3851245802323babbd2877129ab5bb14d0cab830ee3f2f678f41d922f3c12cb2c642f66f22006bc4ca457e6c1f766f3d1dbce37d29d31 xorriso-1.5.0.tar.gz" +sha512sums="7c0076449a54880e3988879f9c5689d1a0b8edd8b15e037c510aa960f25fba4d27b9fc2fdc0c5d959b7d46fb09ec861f33cf0fa2766aa0b93712ac6663cfa1e1 xorriso-1.5.3.tar.gz" diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD index a8980c5c4..103f60db6 100644 --- a/user/xpr/APKBUILD +++ b/user/xpr/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xpr-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD index 1339105a2..252178ea3 100644 --- a/user/xprop/APKBUILD +++ b/user/xprop/APKBUILD @@ -16,7 +16,10 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var make } diff --git a/user/xrandr/APKBUILD b/user/xrandr/APKBUILD index e9e37a32c..59ffef0ec 100644 --- a/user/xrandr/APKBUILD +++ b/user/xrandr/APKBUILD @@ -9,9 +9,9 @@ url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -subpackages="$pkgname-doc" depends="" makedepends="libxrandr-dev util-macros" +subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD index e942b954b..d84afd58c 100644 --- a/user/xrefresh/APKBUILD +++ b/user/xrefresh/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xrefresh-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xrx/APKBUILD b/user/xrx/APKBUILD index 97e71a06d..f2e79d9fb 100644 --- a/user/xrx/APKBUILD +++ b/user/xrx/APKBUILD @@ -14,13 +14,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xrx-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD index 9b4ce4205..7a51fc97c 100644 --- a/user/xscope/APKBUILD +++ b/user/xscope/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xscope-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 9e68c3eda..047d4eef8 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xscreensaver pkgver=5.43 pkgrel=0 pkgdesc="X Screensaver suite" url="https://www.jwz.org/xscreensaver/" arch="all" -options="!check suid" # no tests +options="!check suid" # No test suite. license="MIT" depends="" makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make install_prefix="$pkgdir" install } diff --git a/user/xset/APKBUILD b/user/xset/APKBUILD index 9abfb3d46..e751862c2 100644 --- a/user/xset/APKBUILD +++ b/user/xset/APKBUILD @@ -7,13 +7,12 @@ pkgdesc="User preference utility for X11" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-doc" depends="" makedepends="libx11-dev libxext-dev libxmu-dev util-macros" +subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsetmode/APKBUILD b/user/xsetmode/APKBUILD index 37615c3f3..09a038202 100644 --- a/user/xsetmode/APKBUILD +++ b/user/xsetmode/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xsetmode-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsetpointer/APKBUILD b/user/xsetpointer/APKBUILD index 0e0d5f697..35ca4aa67 100644 --- a/user/xsetpointer/APKBUILD +++ b/user/xsetpointer/APKBUILD @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xsetpointer-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsetroot/APKBUILD b/user/xsetroot/APKBUILD index d5d6d4d9a..e4ad05a2d 100644 --- a/user/xsetroot/APKBUILD +++ b/user/xsetroot/APKBUILD @@ -6,13 +6,12 @@ pkgdesc="Set the root window (desktop background) of an X11 session" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc" depends="" makedepends="libx11-dev libxcursor-dev libxmu-dev util-macros xbitmaps" +subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD index f3e42cd18..b0a5b9968 100644 --- a/user/xsm/APKBUILD +++ b/user/xsm/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xsm-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsv/APKBUILD b/user/xsv/APKBUILD index dab8647d5..d445d6514 100644 --- a/user/xsv/APKBUILD +++ b/user/xsv/APKBUILD @@ -8,6 +8,7 @@ pkgdesc="A fast CSV command line toolkit written in Rust" url="https://github.com/BurntSushi/xsv" arch="all" license="MIT OR Unlicense" +depends="" makedepends="cargo" source="" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 27760f670..989c75152 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,13 +1,14 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xterm -pkgver=349 +pkgver=353 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="X11" +depends="" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev libxrender-dev libxft-dev freetype-dev ncurses-dev pcre-dev" @@ -44,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d350671a262973b6486dd9785f84c1f09b6a5e52898ce38d39ed2b11cd8208c473c63c3504533e7e9004af4e690d9032828a14fe6c5474523cfb8ec4badcbd0f xterm-349.tgz -e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" +sha512sums="2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611 xterm-353.tgz +6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch" diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch index 351aba9ab..6d1a859cd 100644 --- a/user/xterm/posix-ptmx.patch +++ b/user/xterm/posix-ptmx.patch @@ -1,6 +1,6 @@ --- xterm/main.c.old +++ xterm/main.c -@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) +@@ -2892,7 +2892,7 @@ get_pty(int *pty, char *from GCC_UNUSED) close(opened_tty); opened_tty = -1; } @@ -9,7 +9,7 @@ if ((*pty = posix_openpt(O_RDWR)) >= 0) { char *name = ptsname(*pty); if (name != 0) { -@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) +@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw) /* * now in child process */ diff --git a/user/xvidcore/APKBUILD b/user/xvidcore/APKBUILD index db9e20006..6908df902 100644 --- a/user/xvidcore/APKBUILD +++ b/user/xvidcore/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=xvidcore -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=0 pkgdesc="Open source MPEG-4 video codec" url="https://labs.xvid.com/" @@ -14,7 +14,6 @@ source="https://downloads.xvid.com/downloads/$pkgname-$pkgver.tar.bz2" builddir="$srcdir/$pkgname/build/generic" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,8 +22,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441 xvidcore-1.3.5.tar.bz2" +sha512sums="de319e28c656c8105fa596eb69984b7176e004f617d9e21cb9014e2b26d23e68fe558c69685dd550d891261d79c21d2226cbbaae55e5486255e2089e9f61e6a5 xvidcore-1.3.6.tar.bz2" diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD index 4c4e9d8b7..bcdcb69eb 100644 --- a/user/xvidtune/APKBUILD +++ b/user/xvidtune/APKBUILD @@ -13,14 +13,12 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD index c7bd606be..23cf55fa6 100644 --- a/user/xwd/APKBUILD +++ b/user/xwd/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xwd-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xwud/APKBUILD b/user/xwud/APKBUILD index 72f7e9e50..4a606fc9f 100644 --- a/user/xwud/APKBUILD +++ b/user/xwud/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xwud-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xxhash/APKBUILD b/user/xxhash/APKBUILD new file mode 100644 index 000000000..91c74b4bf --- /dev/null +++ b/user/xxhash/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xxhash +pkgver=0.7.2 +pkgrel=0 +pkgdesc="Fast non-cryptographic hashing algorithm" +url="https://cyan4973.github.io/xxHash/" +arch="all" +license="BSD-2-Clause" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" +source="xxHash-$pkgver.tar.gz::https://github.com/Cyan4973/xxHash/archive/v$pkgver.tar.gz" +builddir="$srcdir"/xxHash-$pkgver + +build() { + make prefix=/usr +} + +check() { + make prefix=/usr check +} + +package() { + make prefix=/usr DESTDIR="$pkgdir" install +} + +tools() { + license="GPL-2.0+" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +sha512sums="90d4e7422729441e5013928b306fd6f394ab6f97628ec88369fbb33891c9a2cfae495516d8dd0741eda9c38859132b1bd78f2c7b8dae1dce80eeca8ea5cba575 xxHash-0.7.2.tar.gz" diff --git a/user/yajl/APKBUILD b/user/yajl/APKBUILD index 6a1f5991d..5be54b007 100644 --- a/user/yajl/APKBUILD +++ b/user/yajl/APKBUILD @@ -7,30 +7,30 @@ url="http://lloyd.github.com/yajl/" arch="all" license="ISC" depends="" -makedepends="cmake" checkdepends="cmd:which" +makedepends="cmake" subpackages="$pkgname-dev $pkgname-tools" source="yajl-$pkgver.tar.gz::https://github.com/lloyd/yajl/archive/$pkgver.tar.gz" build() { - cd "$builddir" - cmake -DCMAKE_INSTALL_PREFIX="/usr" . + cmake \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + . make } -package() { - cd "$builddir" - make install DESTDIR="$pkgdir" - mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ -} - check() { - cd "$builddir" make test # make test-api just checks the return status of gen-extra-close # and also forkbombs, so elide that } +package() { + make install DESTDIR="$pkgdir" + mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ +} + tools() { pkgdesc="JSON tools based on Yajl" mkdir -p "$subpkgdir"/usr/ diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index cc895da1c..b57f1a969 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.08.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kiconthemes-dev kio-dev knewstuff-dev knotifications-dev kparts-dev knotifyconfig-dev kwidgetsaddons-dev kwindowsystem-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/yakuake-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/yakuake-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fba00f8658ed799af1d7fe2e486fb450e456f6161e69bbf61bea344f4b58e9cc5933cf9306a89863440610f5f394431ee14fbd5605b2a929a40073dbdf902351 yakuake-19.08.2.tar.xz" +sha512sums="87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7 yakuake-19.12.3.tar.xz" diff --git a/user/yaml-cpp/APKBUILD b/user/yaml-cpp/APKBUILD new file mode 100644 index 000000000..53f41b87b --- /dev/null +++ b/user/yaml-cpp/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=yaml-cpp +pkgver=0.6.3 +pkgrel=0 +pkgdesc="A YAML parser and emitter in C++" +url="https://github.com/jbeder/yaml-cpp" +arch="all" +license="MIT" +makedepends="cmake" +subpackages="$pkgname-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgname-$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" \ + -DYAML_BUILD_SHARED_LIBS=ON \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49 yaml-cpp-0.6.3.tar.gz" diff --git a/user/yasm/APKBUILD b/user/yasm/APKBUILD index 9452da3c0..3faa73264 100644 --- a/user/yasm/APKBUILD +++ b/user/yasm/APKBUILD @@ -6,17 +6,17 @@ pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, G url="http://yasm.tortall.net/" arch="all" license="(BSD-2-Clause OR BSD-3-Clause) AND (Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only)" +depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://www.tortall.net/projects/$pkgname/releases/$pkgname-$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +25,10 @@ build() { } check() { - cd "$builddir" make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index 335c0de4b..ed99fcb7b 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=2019.09.28 +pkgver=2020.03.08 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -11,11 +11,14 @@ arch="noarch" options="!check" # Takes way too long, and uses network license="Unlicense AND Public-Domain" depends="ffmpeg python3" +makedepends="" subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp $pkgname-bash-completion:bashcomp $pkgname-fish-completion:fishcomp" -source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz + tumblr.patch + " builddir="$srcdir/$pkgname" prepare() { @@ -63,4 +66,5 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94 youtube-dl-2019.09.28.tar.gz" +sha512sums="09636e3ec526dbcb043cf61ed4dda5c5c00fac2ecd741bf3cb338ca8de72d1395a95a6189bccced140ca1c37eb3f693332e757ff01eb1a25279b100ccdf39b65 youtube-dl-2020.03.08.tar.gz +5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch" diff --git a/user/youtube-dl/tumblr.patch b/user/youtube-dl/tumblr.patch new file mode 100644 index 000000000..d34a79da6 --- /dev/null +++ b/user/youtube-dl/tumblr.patch @@ -0,0 +1,49 @@ +From a4a199b4dcc3e778621c4268a5dba615cf6f44ba Mon Sep 17 00:00:00 2001 +From: rafinetiz <rafii.netizz@gmail.com> +Date: Fri, 18 Oct 2019 21:17:00 +0700 +Subject: [PATCH 1/2] Fix tumblr permission denied #22755 + +--- + youtube_dl/extractor/tumblr.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py +index edbb0aa6944b..71ced801859e 100644 +--- a/youtube_dl/extractor/tumblr.py ++++ b/youtube_dl/extractor/tumblr.py +@@ -165,7 +165,8 @@ def _real_extract(self, url): + if iframe_url is None: + return self.url_result(redirect_url, 'Generic') + +- iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page') ++ iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page', ++ headers={'Referer': url}) + + duration = None + sources = [] + +From 43a19105d78c5c297d91936798d341f89919e9b1 Mon Sep 17 00:00:00 2001 +From: rafinetiz <rafii.netizz@gmail.com> +Date: Fri, 18 Oct 2019 21:45:12 +0700 +Subject: [PATCH 2/2] Fix coding style + +--- + youtube_dl/extractor/tumblr.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py +index 71ced801859e..61b0c1db65fe 100644 +--- a/youtube_dl/extractor/tumblr.py ++++ b/youtube_dl/extractor/tumblr.py +@@ -165,7 +165,10 @@ def _real_extract(self, url): + if iframe_url is None: + return self.url_result(redirect_url, 'Generic') + +- iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page', ++ iframe = self._download_webpage( ++ iframe_url, ++ video_id, ++ 'Downloading iframe page', + headers={'Referer': url}) + + duration = None diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 926ecf235..5409c8b37 100644 --- a/user/yubico-c/APKBUILD +++ b/user/yubico-c/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=yubico-c pkgver=1.13 pkgrel=2 @@ -8,19 +8,19 @@ url="https://developers.yubico.com/yubico-c/" arch="all" license="BSD-2-Clause" depends="" -makedepends="asciidoctor" +makedepends="asciidoctor autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="yubico-c-libyubikey-$pkgver.tar.gz::https://github.com/Yubico/yubico-c/archive/libyubikey-$pkgver.tar.gz - use-asciidoctor.patch" + use-asciidoctor.patch + " builddir="$srcdir/$pkgname-libyubikey-$pkgver" prepare() { - cd "$builddir" default_prepare autoreconf -vif } + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir/" install } diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index 7fff47158..1db97be94 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=yubikey-personalization pkgver=1.20.0 pkgrel=0 @@ -8,7 +8,8 @@ url="https://developers.yubico.com/yubikey-personalization/" arch="all" license="BSD-2-Clause AND Public-Domain" depends="" -makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor" +makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor + autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz use-asciidoctor.patch diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 490c9a3e9..adac93a71 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.6 +pkgver=4.8.7 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -37,4 +37,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 z3-4.8.6.tar.gz" +sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD index 234508b94..87343a192 100644 --- a/user/zenity/APKBUILD +++ b/user/zenity/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=zenity pkgver=3.32.0 pkgrel=0 @@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/zenity/${pkgver%.*}/zenity-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD index b3add1099..f61764a01 100644 --- a/user/zola/APKBUILD +++ b/user/zola/APKBUILD @@ -8,6 +8,7 @@ pkgdesc="A fast static site generator in a single binary with everything built i url="https://github.com/getzola/zola" arch="all" license="BSD-3-Clause AND MIT" +depends="" makedepends="cargo oniguruma-dev openssl-dev zlib-dev" subpackages=" $pkgname-doc |