diff options
338 files changed, 2059 insertions, 1875 deletions
diff --git a/user/corindon-red/APKBUILD b/legacy/corindon-red/APKBUILD index e099c5de9..0cd8da56a 100644 --- a/user/corindon-red/APKBUILD +++ b/legacy/corindon-red/APKBUILD @@ -11,17 +11,10 @@ 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/ + mv "$srcdir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/ } sha512sums="9be72e3404eac6c7f0093038b1f873064883ed62ab81486133ef1d9ce50a9ede43d68ed61ebc3280289433abf8a794ca6591c906f51636dec5c1fa197626a630 122445-corindon-red.tar.gz" diff --git a/user/dmenu/APKBUILD b/legacy/dmenu/APKBUILD index ec90c9934..36c844132 100644 --- a/user/dmenu/APKBUILD +++ b/legacy/dmenu/APKBUILD @@ -7,10 +7,10 @@ pkgrel=0 pkgdesc="Dynamic menu for X" url="https://tools.suckless.org/dmenu/" arch="all" +options="!check" # This package has no testsuite 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" diff --git a/user/libxfont/APKBUILD b/legacy/libxfont/APKBUILD index c98112974..c98112974 100644 --- a/user/libxfont/APKBUILD +++ b/legacy/libxfont/APKBUILD diff --git a/user/which/APKBUILD b/legacy/which/APKBUILD index ab0d0a5bc..f8360b7b7 100644 --- a/user/which/APKBUILD +++ b/legacy/which/APKBUILD @@ -9,11 +9,10 @@ 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" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" provider_priority=1 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/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/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/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD index 831456f53..466ee7cb7 100644 --- a/user/aspell-dict-sk/APKBUILD +++ b/user/aspell-dict-sk/APKBUILD @@ -11,7 +11,7 @@ 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() { diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 4945c0222..9eef3c5b6 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.9 _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 @@ -150,7 +151,7 @@ tools() { done } -sha512sums="e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740 bind-9.14.7.tar.gz +sha512sums="aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b bind-9.14.9.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd 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/certbot/APKBUILD b/user/certbot/APKBUILD index fc6381b30..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.40.1 +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="e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3 certbot-0.40.1.tar.gz" +sha512sums="649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912 certbot-1.0.0.tar.gz" diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index f1a54aa14..26345d0ac 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -33,8 +33,7 @@ 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" } diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 1194f3c0e..f59ff40e1 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail pkgver=3.17.4 -pkgrel=1 +pkgrel=2 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" arch="all" @@ -11,9 +11,16 @@ depends="compface" makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev gpgme-dev gtk+2.0-dev libcanberra-gtk2 libcanberra-dev libetpan-dev libical-dev libnotify-dev librsvg-dev openldap-dev - startup-notification-dev" + startup-notification-dev autoconf automake libtool" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" +source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz + etpan.patch + " + +prepare() { + default_prepare + autoreconf -vif +} build() { ./configure \ @@ -36,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz" +sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz +39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 etpan.patch" diff --git a/user/claws-mail/etpan.patch b/user/claws-mail/etpan.patch new file mode 100644 index 000000000..572380d2e --- /dev/null +++ b/user/claws-mail/etpan.patch @@ -0,0 +1,97 @@ +diff --git a/configure.ac b/configure.ac +index 412a3f014..6a80c2a92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -908,38 +908,62 @@ fi + dnl Libetpan + AC_MSG_CHECKING([whether to use libetpan]) + if test x"$enable_libetpan" = xyes; then +- AC_MSG_RESULT(yes) +- libetpan_result=no +- AC_PATH_PROG(libetpanconfig, [libetpan-config]) +- if test "x$libetpanconfig" != "x"; then +- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`" +- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) +- if test "x$libetpan_result" = "xyes"; then +- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) +- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`" +- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) +- AC_MSG_RESULT([$libetpan_result]) +- fi +- fi +- if test "x$libetpan_result" = "xyes"; then +- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" +- LIBETPAN_LIBS="`$libetpanconfig --libs`" +- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` +- if test "$LIBETPAN_VERSION" -lt "57"; then +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) ++ AC_MSG_RESULT(yes) ++ ++ libetpan_config=no ++ libetpan_result=no ++ libetpan_versiontype=0 ++ ++ # since 1.9.4, libetpan uses pkg-config ++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4], ++ [ ++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` ++ libetpan_config=yes ++ ], ++ [ ++ # before 1.9.4, libetpan uses its own libetpan-config script ++ AC_PATH_PROG(libetpanconfig, [libetpan-config]) ++ if test "x$libetpanconfig" != "x"; then ++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" ++ LIBETPAN_LIBS="`$libetpanconfig --libs`" ++ # support libetpan version like x.x and x.x.x ++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c` ++ if test $libetpan_versiontype -eq 1; then ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` ++ else ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` ++ fi ++ libetpan_config=yes ++ fi ++ ]) ++ if test "x$libetpan_config" = "xyes"; then ++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS" ++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) ++ if test "x$libetpan_result" = "xyes"; then ++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) ++ LIBS="$LIBS $LIBETPAN_LIBS" ++ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) ++ AC_MSG_RESULT([$libetpan_result]) ++ fi ++ fi ++ if test "x$libetpan_result" = "xyes"; then ++ if test $libetpan_versiontype -eq 1; then ++ if test "$LIBETPAN_VERSION" -lt "57"; then ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) + AC_MSG_ERROR([libetpan 0.57 not found]) +- fi +- AC_SUBST(LIBETPAN_FLAGS) +- AC_SUBST(LIBETPAN_LIBS) +- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) +- else +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) +- AC_MSG_ERROR([libetpan 0.57 not found]) +- fi ++ fi ++ fi ++ AC_SUBST(LIBETPAN_FLAGS) ++ AC_SUBST(LIBETPAN_LIBS) ++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.) ++ else ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) ++ AC_MSG_ERROR([libetpan 0.57 not found]) ++ fi + else +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT(no) + fi + AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes") + 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/compton/APKBUILD b/user/compton/APKBUILD index 0cfae4b52..82b9cc638 100644 --- a/user/compton/APKBUILD +++ b/user/compton/APKBUILD @@ -6,15 +6,15 @@ 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/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/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/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/fontforge/APKBUILD b/user/fontforge/APKBUILD index 949fb702c..2566d470c 100644 --- a/user/fontforge/APKBUILD +++ b/user/fontforge/APKBUILD @@ -8,7 +8,7 @@ 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" @@ -17,7 +17,6 @@ source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./} " 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/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/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/gmime/APKBUILD b/user/gmime/APKBUILD index 1e7db9163..cb1b591b9 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gmime -pkgver=3.2.4 +pkgver=3.2.5 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="37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d gmime-3.2.5.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" 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/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/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index 913d4f749..b3575c955 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -2,7 +2,7 @@ # 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/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/i3status/APKBUILD b/user/i3status/APKBUILD index 5692f27e7..64a2a2f3f 100644 --- a/user/i3status/APKBUILD +++ b/user/i3status/APKBUILD @@ -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/icewm/APKBUILD b/user/icewm/APKBUILD index 411207a14..6be335dc1 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,29 +1,21 @@ # 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" 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/ido/APKBUILD b/user/ido/APKBUILD index 9925e1453..329b48ddd 100644 --- a/user/ido/APKBUILD +++ b/user/ido/APKBUILD @@ -1,43 +1,46 @@ # 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/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/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/iw/APKBUILD b/user/iw/APKBUILD index 760710ea3..4ada251aa 100644 --- a/user/iw/APKBUILD +++ b/user/iw/APKBUILD @@ -1,12 +1,12 @@ # Contributor: 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/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/kcalcore/APKBUILD b/user/kcalendarcore/APKBUILD index 62764c297..759069d42 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.65.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="4222a7223b9c6a45bc6966e547f9caa129e469a21386be271678ac3e6fcc2574593ca9dbb3f00bec30030f3d4511fb219a692607cd3b5fdcecd29be758a6e3ae kcalendarcore-5.65.0.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/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/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/libfm/APKBUILD b/user/libfm/APKBUILD index bddbf32f2..a32925320 100644 --- a/user/libfm/APKBUILD +++ b/user/libfm/APKBUILD @@ -8,6 +8,7 @@ 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" @@ -31,6 +32,9 @@ check() { package() { 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/libindicator/APKBUILD b/user/libindicator/APKBUILD index 9d1c866f3..3c57d570c 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/APKBUILD @@ -1,25 +1,24 @@ # 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/libmbim/APKBUILD b/user/libmbim/APKBUILD index 871c43aad..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.20.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="83fe2dfb4a813c5aa845ec5c8b674f6a0be0b6ea233c51c47b6345dc50200b0b98300157736f1435fcc5d85dc6588dbf837ab2a5e324511ec35c4da0e1c8c9d0 libmbim-1.20.2.tar.xz" +sha512sums="246f601ddda48b10e8a7b337d6e996dc65f6300e87f13d5260a5c903f95e9035e8a8d1c88540101c22fb3c44eca242451ab75bbfdb6503cfbce279c6d4cf99c8 libmbim-1.20.4.tar.xz" diff --git a/user/libnfs/APKBUILD b/user/libnfs/APKBUILD index 4fde5e380..d060df361 100644 --- a/user/libnfs/APKBUILD +++ b/user/libnfs/APKBUILD @@ -7,6 +7,7 @@ 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,12 +29,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/libqmi/APKBUILD b/user/libqmi/APKBUILD index 4b0f96ece..1fd9944e8 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.2 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="ad47cad5804f9af2fc66c79bcda9fcbf87c0b68bff54a0f0d46f190413d4de99167ce2f2c42986f354e17dacaecd5e42743701a2ee3fa98b2ba65bc2185a663e libqmi-1.24.2.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/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/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/APKBUILD b/user/lua-expat/APKBUILD index 9b6295bc1..452404157 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -3,7 +3,7 @@ # 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 +11,22 @@ 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" 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" diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD index 8244f3306..2ab2f12fc 100644 --- a/user/lua-sec/APKBUILD +++ b/user/lua-sec/APKBUILD @@ -6,7 +6,7 @@ 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" diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 645cef44a..7c0197036 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -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/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 05e730aae..a2ffa3160 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -11,10 +11,10 @@ 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 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/mariadb/APKBUILD b/user/mariadb/APKBUILD index 9dced4d5f..786a4e1a6 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.11 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -27,7 +27,6 @@ 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 @@ -262,10 +261,9 @@ doc() { default_doc } -sha512sums="1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42 mariadb-10.4.8.tar.gz +sha512sums="2a1a8d90e326530b41a8a7d6889325cefcba5914451a48c6a20d5d5cd68004835e76e6ecac628554167a014f9c0b1487c15f37151afd771ea0166a4c40afd7d2 mariadb-10.4.11.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 e8781f776..387e30bac 100644 --- a/user/mate-applets/APKBUILD +++ b/user/mate-applets/APKBUILD @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/1.22/mate-applets-$pkgver.tar.xz" build() { - cd "$builddir" rm -r mateweather/docs/ru ./configure \ --build=$CBUILD \ @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD index ec770dd97..a828fd924 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/APKBUILD @@ -3,24 +3,26 @@ 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/mdadm/APKBUILD b/user/mdadm/APKBUILD index d15aefbc9..40e626919 100644 --- a/user/mdadm/APKBUILD +++ b/user/mdadm/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=mdadm pkgver=4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Tool for managing Linux soft RAID arrays" url="http://neil.brown.name/blog/mdadm" arch="all" @@ -17,15 +17,14 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve $pkgname.initd $pkgname.confd $pkgname-raid.initd + sysmacros.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 +44,12 @@ 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" 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/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/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/mimetic/APKBUILD b/user/mimetic/APKBUILD index 058a8d91e..8913eecd8 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -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/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/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index 66c605788..ee6aa8974 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.12.0 +pkgver=1.12.2 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="7c8b123d4f337a9d19726e241c0e52089e9075cb17ea1e8cd9ca60ed5bc135331bcf0bec054f261c5611149bf1838b27abf8dc3fc7aa39be166917156b491bd7 ModemManager-1.12.0.tar.xz +sha512sums="d0a80bcd3cc9ee92af438cf155c49fa645d2e554e600aa50e5c0319a40a3be5378ca7ce3cf070a4ce7f2fec1c53e6be5d14ae8c53ff4e589e4e2a1ebcad7dea8 ModemManager-1.12.2.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/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..7e19f62f4 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.8 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="c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071 mosquitto-1.6.8.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 8e6461482..f7e87a35d 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -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/mpv/APKBUILD b/user/mpv/APKBUILD index ba7c54846..09b6931fe 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mpv -pkgver=0.29.1 -pkgrel=2 +pkgver=0.30.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="2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66 mpv-0.30.0.tar.gz" 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/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..505d0c869 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.2 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="af6eb8d2125dc49391392f350ec44203824a0cea2856ca194e7f8f534e598049185c813a56053491fda221042d1508a48cf46b2167e2ebf44af7b69938dcb829 mutt-1.13.2.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..84ceb64f2 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.7 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="53fc587554ca639f27cfdd81adc8108e38adddae4fda9d73c3ebff57e546feaa45be7a2851da43bcdafd442e4834a42cc1f9eec1a99051a32410a712142f48c3 nano-4.7.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..2ed725ebf 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -8,6 +8,8 @@ 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" 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/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 6023b2ba8..17e6eadab 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.6 +pkgver=1.22.0 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="ecd5fe1f5941e9f15506ba572458ae421336524c674d1147a57e172899c8db29fc79fb8faa00a6789057f3c85f79171131e2581789f9d52ce46a81cfe5a507b9 NetworkManager-1.20.6.tar.xz -a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch -0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch -313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch +sha512sums="f6a2f621b42f7788646c81cc61d17261aa6df6351e6acfbc70d3d1b034416476f1c14b2444565d6abac2ee1b9aa2680fdb513b523fe6cad1bc37102d4bee41d0 NetworkManager-1.22.0.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/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/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/nsd/APKBUILD b/user/nsd/APKBUILD index 230354c34..518fe3501 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: 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/ode/APKBUILD b/user/ode/APKBUILD index 24c1fcc74..9e1f520d1 100644 --- a/user/ode/APKBUILD +++ b/user/ode/APKBUILD @@ -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="302e6f689851acb9ba0db23e13ab59ae0acbbd8dbdfa7e277b57d870c0d3435274e64da16134fb4b7053f951489c138e485165d79664d11764a88b3437d703d3 ode-0.16.tar.gz -8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch" +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/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/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/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/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/orage/APKBUILD b/user/orage/APKBUILD index 42d97b547..9681a20ae 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -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/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/parole/APKBUILD b/user/parole/APKBUILD index 5d9ad60cf..cf55cd657 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -7,6 +7,7 @@ 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" 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/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index 1c18d17de..5c98d4f57 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -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/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD index cd4cc7daf..806d8b65d 100644 --- a/user/pcmanfm/APKBUILD +++ b/user/pcmanfm/APKBUILD @@ -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/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/physfs/APKBUILD b/user/physfs/APKBUILD index 86f57e0cc..187afeeef 100644 --- a/user/physfs/APKBUILD +++ b/user/physfs/APKBUILD @@ -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/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 b74fb608e..289d7d353 100644 --- a/user/picocom/APKBUILD +++ b/user/picocom/APKBUILD @@ -6,7 +6,7 @@ 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/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/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/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/postfix/APKBUILD b/user/postfix/APKBUILD index 338c8ad2d..11c7f70da 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.8 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="782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45 postfix-3.4.8.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index 9efc662a9..028164bd8 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.10.0 +pkgver=3.11.2 _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="8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f protobuf-3.11.2.tar.gz e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" 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/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-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-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-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-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..e06030e11 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.4.2 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3f11469290868f5bd30631020ac170c40da7348853609edf6fc6b00437b053fd774e0dfc6e711703ac5d05398dfa1f31e59a185935c3dc8ef0e1914a518bd049 lxml-4.4.1.tar.gz" +sha512sums="7a3dcbdb6de703ff939cd7e75c4c73f71b3c8b212796303c1a1ab74dc06153968661d69ab379a2c4b8b75e7643a53e09473988e21758643e9ee52819cd1042aa lxml-4.4.2.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-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-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-pillow/APKBUILD b/user/py3-pillow/APKBUILD index c47d31b1e..8012a6fe2 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -43,11 +43,10 @@ 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="757bfdab2ba418195e96e696d2d111de3b38b6bafe4f6f94012f024f59c9bc8542fdab54f643eaf7b2867a9214db806e72eecbdd636bfceb55b47d3164f643ec py3-pillow-6.2.1.tar.gz diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD index 35f0dec94..3acb26611 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.5 +pkgver=5.6.7 pkgrel=0 pkgdesc="Process and system utilities" url="https://pypi.org/project/psutil/" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b psutil-5.6.5.tar.gz +sha512sums="74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503 psutil-5.6.7.tar.gz 5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" 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-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-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-twisted/APKBUILD b/user/py3-twisted/APKBUILD index c1f9a6321..37f2b0976 100644 --- a/user/py3-twisted/APKBUILD +++ b/user/py3-twisted/APKBUILD @@ -10,7 +10,7 @@ pkgdesc="Asynchronous networking framework written in Python" url="https://twistedmatrix.com/" arch="all" license="MIT" -depends="py3-incremental" +depends="python3 py3-incremental" makedepends="python3-dev" subpackages="" source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2" 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-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-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/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/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/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD index e54f1682d..8a61af1eb 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/APKBUILD @@ -6,16 +6,14 @@ 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,22 +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 } -check() { - cd "$builddir" - make check -} - package() { - cd "$builddir" make DESTDIR="$pkgdir" install } 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/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/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/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/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 33a015d32..59bd659fd 100644 --- a/user/redshift/APKBUILD +++ b/user/redshift/APKBUILD @@ -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/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/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 880753eec..2beebf167 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -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/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..2ae70b29c 100644 --- a/user/rpcsvc-proto/APKBUILD +++ b/user/rpcsvc-proto/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$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/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/rtmpdump/APKBUILD b/user/rtmpdump/APKBUILD index eb14d000c..5f5b6e152 100644 --- a/user/rtmpdump/APKBUILD +++ b/user/rtmpdump/APKBUILD @@ -13,7 +13,8 @@ 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 + " build() { make diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD index 2e7275ae7..0a5c2d851 100644 --- a/user/rubberband/APKBUILD +++ b/user/rubberband/APKBUILD @@ -6,15 +6,16 @@ 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..be2ed80b0 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.0.9 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="8a5ccbc4bbe6a546634f939c1cbe42b35d952173bbe914e7a22eb78f3f2e85b48e207ff36b70432fe469a2d07d62b8e59c9827352181122fde76ba89bbc2aca0 ruby-rake-compiler-1.0.9.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..6168bb2ba 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.0 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="c4e1136ea671d51f00c6de3067a479b15785fcb0f580fbdc57a9d35f852f10ec4b86e842a534536cc520175510de559f4d03dbc3fbd34fb22df411e89d06d662 ruby-rspec-core-3.9.0.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..d2b3fab97 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.0 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="bb6bb5d5dc272e0e0726d23069e0087f780f57614840208816867c570173f1980a43c2cc955c68b2ceca58828951229361305551a4b6bf3530880db843a49bf9 ruby-rspec-mocks-3.9.0.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index a91d0d9dc..2e4f838e2 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.0 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="10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5 ruby-rspec-support-3.9.0.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/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 c2d36c2df..4fbbfe04a 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -9,13 +9,12 @@ arch="all" options="!check" license="ISC" _skalibs_version=2.9 -depends= +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="e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9 s6-dns-2.3.1.1.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index e71092f9a..54ff1b005 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -9,13 +9,12 @@ arch="all" options="!check" license="ISC" _skalibs_version=2.9 -depends= +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="59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2 s6-linux-utils-2.5.1.1.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 545b1e9f3..be124a5a8 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -15,56 +15,51 @@ 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="3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b s6-networking-2.3.1.1.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index fb81c7529..5a7a85540 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -9,13 +9,12 @@ arch="all" options="!check" license="ISC" _skalibs_version=2.9 -depends= +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="2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed s6-portable-utils-2.2.2.1.tar.gz" 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/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..85164bbcc 100644 --- a/user/screen/APKBUILD +++ b/user/screen/APKBUILD @@ -7,15 +7,16 @@ 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 diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD index 129c202b5..e9b6b2074 100644 --- a/user/scummvm/APKBUILD +++ b/user/scummvm/APKBUILD @@ -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="5f91a65cdde62e6f996ae8a983d212f3d04edcf1ce3ab0e5273f1dfce155724912f386025959f5b2cc6ba566432845d929503f80f0cee513c774d5e04dafde1f scummvm-2.1.0.tar.bz2" +sha512sums="5f91a65cdde62e6f996ae8a983d212f3d04edcf1ce3ab0e5273f1dfce155724912f386025959f5b2cc6ba566432845d929503f80f0cee513c774d5e04dafde1f scummvm-2.1.0.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/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/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_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/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..d8ce1221e 100644 --- a/user/smartmontools/APKBUILD +++ b/user/smartmontools/APKBUILD @@ -7,16 +7,15 @@ 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,14 +25,10 @@ build() { } check() { - cd "$builddir" - make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir"/ install install -Dm755 "$srcdir"/smartd.initd "$pkgdir"/etc/init.d/smartd 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 52bbd9f3a..e421c558e 100644 --- a/user/socat/APKBUILD +++ b/user/socat/APKBUILD @@ -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,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 15ee54895..651311cdf 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,13 +1,13 @@ # 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/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 2f4eb4f6b..aa902f9bc 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -14,8 +14,7 @@ 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 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/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/APKBUILD b/user/strongswan/APKBUILD index 6c895911a..668224e95 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -14,8 +14,8 @@ 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 @@ -31,8 +31,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,12 +84,10 @@ build() { } check() { - cd "$builddir" env TESTS_SUITES_EXCLUDE=printf 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" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 7e1940785..4e8c89514 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -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 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/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/tellico/APKBUILD b/user/tellico/APKBUILD index 6aae4aa93..bfca90ccc 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=0 pkgdesc="Collection manager" url="http://tellico-project.org/" @@ -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="20af0a3017054c371dbeae7412d66b7f3cc7f0ab5119079c2da4373c23bd2eaa2f457955f8ace7448cbe69d8f0f4971f87127b25e06e3e26b07cfe47cf93b34b tellico-3.2.2.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 b1a09da15..fe0609d9c 100644 --- a/user/tf/APKBUILD +++ b/user/tf/APKBUILD @@ -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/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 036c50b31..bfbc5a1ce 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -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 014ab3ae8..d958f69da 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -7,6 +7,7 @@ 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" 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/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..40613efd9 100644 --- a/user/tlp/APKBUILD +++ b/user/tlp/APKBUILD @@ -33,8 +33,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() { 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/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 8f2088e88..c55e5453c 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -6,20 +6,18 @@ 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/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 c92b41be5..23d44cdb2 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -6,7 +6,7 @@ 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,7 +14,6 @@ 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#*-} diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index 69167790b..fd1543413 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -6,7 +6,7 @@ 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 82886aa02..723a1b2ff 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,8 +1,8 @@ # 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/uchardet/APKBUILD b/user/uchardet/APKBUILD index 05f10ff7b..153dfc63b 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -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/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/uptimed/APKBUILD b/user/uptimed/APKBUILD index 3ae155396..22e1b57c6 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -4,18 +4,19 @@ 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/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/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index 26c4f887b..bfeee2132 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/APKBUILD @@ -6,16 +6,15 @@ 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/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/weechat/APKBUILD b/user/weechat/APKBUILD index a19b53ddc..9daf1fd72 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,22 +2,23 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=weechat -pkgver=2.6 +pkgver=2.7 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 $pkgname-lang" +source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" # secfixes: # 1.7.1-r0: @@ -26,7 +27,12 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz # - CVE-2017-14727 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_PHP=OFF \ + -Bbuild . make -C build } @@ -52,5 +58,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5 weechat-2.6.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" +sha512sums="7a9205b6a3b7e338b14708e1b9aad4f2099506c46b1e86faf4fa94a105bc20b056a53ce3d003ae31ea1cdbab711ddd9dca7258a7d03f0f7af3703ebdbdfeb3d9 weechat-2.7.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/wine/APKBUILD b/user/wine/APKBUILD index ea9384603..ef31fa802 100644 --- a/user/wine/APKBUILD +++ b/user/wine/APKBUILD @@ -21,22 +21,18 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-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 no-pie.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 +66,10 @@ build() { } check() { - cd "$builddir" make test } package() { - local file - cd "$builddir" make -j1 DESTDIR="$pkgdir" install case "$CARCH" in @@ -88,21 +81,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 +106,6 @@ doc() { } libs() { - local file ext default_libs install -d "$subpkgdir"/usr/lib/wine/fakedlls 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/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 192e67cb2..25f20db92 100644 --- a/user/wxwidgets/APKBUILD +++ b/user/wxwidgets/APKBUILD @@ -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,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD index c68858df3..e699202f7 100644 --- a/user/x11vnc/APKBUILD +++ b/user/x11vnc/APKBUILD @@ -7,21 +7,20 @@ 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 utmps.patch " prepare() { - cd "$builddir" default_prepare ./autogen.sh } 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/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/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/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/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/xfburn/APKBUILD b/user/xfburn/APKBUILD index 0dd528edd..66e869a55 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -7,13 +7,14 @@ 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/${pkgver%.*}/xfburn-$pkgver.tar.bz2" build() { - LIBS="-lintl" ./configure \ + LIBS="-lintl" bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 122ea66b2..035c79a18 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -6,23 +6,19 @@ 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 df0c53aca..5e4d92920 100644 --- a/user/xfce-plugins/APKBUILD +++ b/user/xfce-plugins/APKBUILD @@ -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 5e5fc3f30..187e18781 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -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 87d4be1ab..90aea20eb 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -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 dfa5c7cef..1e1e5649d 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -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 c3646f5d3..5a235a42e 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -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 1185b416b..cb9291532 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -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 0d6c2021b..cc66c040c 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -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 4056cf575..a8e5f5f97 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -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 a72fedae8..2101b528a 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -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 c6d9edbd8..0aa0fdd1f 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -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/APKBUILD b/user/xfce4-panel/APKBUILD index 859e8b065..043044ffe 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -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 0af1ac10f..ab652e8c1 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -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 71a3dcb4f..96588826c 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -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 146d3d85c..e3ad324dd 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -7,12 +7,12 @@ 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,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index 15b39e6ea..eef3b208f 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -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-settings/APKBUILD b/user/xfce4-settings/APKBUILD index f6cef7748..2ac50d1a7 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -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 5f20a001c..7600d411e 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -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 16cf945b1..ef98510e3 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -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 fb16a6693..809774459 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -7,7 +7,8 @@ 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" diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 0b34b3d77..607bdf263 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -7,6 +7,7 @@ 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/${pkgver%.*}/xfce4-time-out-plugin-$pkgver.tar.bz2" diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index e17181b87..eb420718a 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -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 b90957cd6..432c5cff9 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -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 070e189e0..55a0ff0d3 100644 --- a/user/xfce4-volumed-pulse/APKBUILD +++ b/user/xfce4-volumed-pulse/APKBUILD @@ -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 f9d1dfeef..c09d74cc3 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -7,9 +7,10 @@ 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 } diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index bbf373200..fd6f315b3 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -7,6 +7,7 @@ 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" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 03c23058a..cb4507523 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -7,6 +7,7 @@ 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" diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index 96e346059..c6f9975a0 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -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/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index b74170b6d..b6c907d50 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -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/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/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-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/xorriso/APKBUILD b/user/xorriso/APKBUILD index eb01714ec..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.2 +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="7247c00cda11a5341ab100f1091200e396b76cb5c852a3958fe3b9b735aa6a9142a0f22d2892275887bf52de175776e731fd853fff8c6ce20a096435fa05daf9 xorriso-1.5.2.tar.gz" +sha512sums="7c0076449a54880e3988879f9c5689d1a0b8edd8b15e037c510aa960f25fba4d27b9fc2fdc0c5d959b7d46fb09ec861f33cf0fa2766aa0b93712ac6663cfa1e1 xorriso-1.5.3.tar.gz" diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 4e8a19fc4..047d4eef8 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -6,7 +6,7 @@ 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/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 96d8d08f7..e8d82939a 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xterm -pkgver=350 +pkgver=351 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="66e6cb37ebedd65c473b04cc31917e509f50652358414787a0a3f0b8f39ae957bf0aefe372576f82a698fccc6c45840cd4e4a2d8ce9f0b1fe5582ed88dae724f xterm-350.tgz -e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" +sha512sums="941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00 xterm-351.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/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index 335c0de4b..70c5800f9 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=2019.11.28 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -11,6 +11,7 @@ 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 @@ -63,4 +64,4 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94 youtube-dl-2019.09.28.tar.gz" +sha512sums="fd3fc9658428ecf96d681dd699db49e02f94343e5c49e370cb68a5764e8ecebc14b3ce5bc44db0a829b0d3c4fbffc96a1f8288fb24cbd21add6e9c7852b0915d youtube-dl-2019.11.28.tar.gz" diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 50e88d1c6..5409c8b37 100644 --- a/user/yubico-c/APKBUILD +++ b/user/yubico-c/APKBUILD @@ -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 74b2a3f2f..1db97be94 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -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/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 |