From 292a7f5d6f80aa2476d87c0659c74e903a742c13 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 May 2020 00:50:21 +0200 Subject: [PATCH 01/98] tellico: update to 3.3. --- srcpkgs/tellico/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template index 05bd5e14c79..940de3b6b70 100644 --- a/srcpkgs/tellico/template +++ b/srcpkgs/tellico/template @@ -1,12 +1,13 @@ # Template file for 'tellico' pkgname=tellico -version=3.2.3 +version=3.3 revision=1 build_style=cmake configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig - kcoreaddons" + gettext kcoreaddons" makedepends="kfilemetadata5-devel khtml-devel kitemmodels-devel knewstuff-devel + kguiaddons-devel karchive-devel kiconthemes-devel $(vopt_if webcam v4l-utils-devel) $(vopt_if yaz yaz-devel) $(vopt_if xmp exempi-devel) $(vopt_if cdio libcdio-devel) $(vopt_if cddb libkcddb-devel) $(vopt_if scanner libksane-devel) @@ -16,7 +17,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="http://tellico-project.org/" distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz" -checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952 +checksum=de08c27a63f3dd9cab085604fda9f94efb3abfd1ffb1e0ec2f7be9fcf79d2fb6 python_version=2 #unverified build_options="webcam yaz xmp cdio cddb scanner" build_options_default="webcam yaz xmp cdio cddb scanner" From 8f29dd96fb98967a449e26dee0154576b5cddd8d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 May 2020 00:50:45 +0200 Subject: [PATCH 02/98] calligra: update to 3.2.0. --- common/shlibs | 60 ++--- srcpkgs/calligra/files/gemini-webkit.patch | 17 +- srcpkgs/calligra/patches/libgit2-028.patch | 259 --------------------- srcpkgs/calligra/patches/poppler-069.patch | 85 ------- srcpkgs/calligra/patches/poppler-071.patch | 132 ----------- srcpkgs/calligra/patches/poppler-072.patch | 30 --- srcpkgs/calligra/patches/poppler-073.patch | 23 -- srcpkgs/calligra/patches/qt-511.patch | 136 ----------- srcpkgs/calligra/patches/qt5.13.patch | 21 -- srcpkgs/calligra/template | 8 +- 10 files changed, 41 insertions(+), 730 deletions(-) delete mode 100644 srcpkgs/calligra/patches/libgit2-028.patch delete mode 100644 srcpkgs/calligra/patches/poppler-069.patch delete mode 100644 srcpkgs/calligra/patches/poppler-071.patch delete mode 100644 srcpkgs/calligra/patches/poppler-072.patch delete mode 100644 srcpkgs/calligra/patches/poppler-073.patch delete mode 100644 srcpkgs/calligra/patches/qt-511.patch delete mode 100644 srcpkgs/calligra/patches/qt5.13.patch diff --git a/common/shlibs b/common/shlibs index 7a3c3f95696..acc92a8ae8d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2353,37 +2353,37 @@ libcollectdclient.so.1 libcollectdclient-5.5.0_1 libpinktrace_0.9.so.9 pinktrace-0.9.1_1 libsyd_1.0.so.0 sydbox-1.0.2_1 libcsync.so.0 csync-0.50.0_1 -libcalligrasheetsodf.so.16 calligra-sheets-3.1.0_1 -libkotext.so.16 calligra-libs-3.1.0_1 -libkoodf.so.16 calligra-libs-3.1.0_1 -libkarbonui.so.16 calligra-karbon-3.1.0_1 -libkomain.so.16 calligra-libs-3.1.0_1 -libkowidgets.so.16 calligra-libs-3.1.0_1 -libflake.so.16 calligra-libs-3.1.0_1 -libcalligrasheetscommon.so.16 calligra-sheets-3.1.0_1 -libkovectorimage.so.16 calligra-libs-3.1.0_1 -libwordsprivate.so.16 calligra-words-3.1.0_1 -libkotextlayout.so.16 calligra-libs-3.1.0_1 -libkowidgetutils.so.16 calligra-libs-3.1.0_1 -libkundo2.so.16 calligra-libs-3.1.0_1 -libpigmentcms.so.16 calligra-libs-3.1.0_1 -libbasicflakes.so.16 calligra-libs-3.1.0_1 -libarpack.so.2 arpack-ng-3.3.0_2 -libkoplugin.so.16 calligra-libs-3.1.0_1 -libkoversion.so.16 calligra-libs-3.1.0_1 -libkopageapp.so.16 calligra-libs-3.1.0_1 -libkostore.so.16 calligra-libs-3.1.0_1 -libkomsooxml.so.16 calligra-filters-3.1.0_1 -libkoodf2.so.16 calligra-filters-3.1.0_1 +libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1 +libkotext.so.17 calligra-libs-3.2.0_1 +libkoodf.so.17 calligra-libs-3.2.0_1 +libkarbonui.so.17 calligra-karbon-3.2.0_1 +libkomain.so.17 calligra-libs-3.2.0_1 +libkowidgets.so.17 calligra-libs-3.2.0_1 +libflake.so.17 calligra-libs-3.2.0_1 +libcalligrasheetscommon.so.17 calligra-sheets-3.2.0_1 +libkovectorimage.so.17 calligra-libs-3.2.0_1 +libwordsprivate.so.17 calligra-words-3.2.0_1 +libkotextlayout.so.17 calligra-libs-3.2.0_1 +libkowidgetutils.so.17 calligra-libs-3.2.0_1 +libkundo2.so.17 calligra-libs-3.2.0_1 +libpigmentcms.so.17 calligra-libs-3.2.0_1 +libbasicflakes.so.17 calligra-libs-3.2.0_1 +libkoplugin.so.17 calligra-libs-3.2.0_1 +libkoversion.so.17 calligra-libs-3.2.0_1 +libkopageapp.so.17 calligra-libs-3.2.0_1 +libkostore.so.17 calligra-libs-3.2.0_1 +libkomsooxml.so.17 calligra-filters-3.2.0_1 +libkoodf2.so.17 calligra-filters-3.2.0_1 libkowv2.so.9 calligra-filters-2.9.7_1 -libRtfReader.so.16 calligra-filters-3.1.0_1 -libkoodfreader.so.16 calligra-filters-3.1.0_1 -libkoformula.so.16 calligra-plugins-3.1.0_1 -libkarboncommon.so.16 calligra-karbon-3.1.0_1 -libcalligrastageprivate.so.16 calligra-stage-3.1.0_1 -libkookularGenerator_odt.so.16 calligra-extras-3.1.0_1 -libkookularGenerator_odp.so.16 calligra-extras-3.1.0_1 -libgemini.so.16 calligra-gemini-3.1.0_1 +libRtfReader.so.17 calligra-filters-3.2.0_1 +libkoodfreader.so.17 calligra-filters-3.2.0_1 +libkoformula.so.17 calligra-plugins-3.2.0_1 +libkarboncommon.so.17 calligra-karbon-3.2.0_1 +libcalligrastageprivate.so.17 calligra-stage-3.2.0_1 +libkookularGenerator_odt.so.17 calligra-extras-3.2.0_1 +libkookularGenerator_odp.so.17 calligra-extras-3.2.0_1 +libgemini.so.17 calligra-gemini-3.2.0_1 +libarpack.so.2 arpack-ng-3.3.0_2 libfts.so.0 musl-fts-1.2_2 libucontext.so.0 libucontext-0.1.1_1 libgavl.so.1 gavl-1.40_1 diff --git a/srcpkgs/calligra/files/gemini-webkit.patch b/srcpkgs/calligra/files/gemini-webkit.patch index c11c86b3c5a..2459521d76f 100644 --- a/srcpkgs/calligra/files/gemini-webkit.patch +++ b/srcpkgs/calligra/files/gemini-webkit.patch @@ -16,14 +16,12 @@ diff --git a/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml b/gemini/q index 9f4bb7a..3a21379 100644 --- a/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml +++ b/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml -@@ -17,20 +17,20 @@ - */ +@@ -18,18 +18,18 @@ - import QtQuick 2.0 + import QtQuick 2.11 + import QtQuick.Controls 2.5 as QtControls -import QtWebEngine 1.5 +import QtWebKit 3.0 - import org.kde.kirigami 2.1 as Kirigami - import QtQuick.Controls 1.4 as QtControls -WebEngineView { +WebView { @@ -46,14 +44,13 @@ diff --git a/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml b/gemini/qml/we index 6a02f7b..6680beb 100644 --- a/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml +++ b/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml -@@ -17,6 +17,7 @@ - */ +@@ -18,6 +18,7 @@ - import QtQuick 2.0 + import QtQuick 2.11 + import org.kde.kirigami 2.7 as Kirigami +import QtWebKit 3.0 import "../../../components" - Page { + Kirigami.Page { -- 2.24.0 - diff --git a/srcpkgs/calligra/patches/libgit2-028.patch b/srcpkgs/calligra/patches/libgit2-028.patch deleted file mode 100644 index 0a76d556f46..00000000000 --- a/srcpkgs/calligra/patches/libgit2-028.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff --git a/gemini/cloud/git/checkoutcreator.cpp b/gemini/cloud/git/checkoutcreator.cpp -index b6004b1..42e038e 100644 ---- gemini/cloud/git/checkoutcreator.cpp -+++ gemini/cloud/git/checkoutcreator.cpp -@@ -243,7 +243,7 @@ QString CheckoutCreator::createClone(QString userVisibleName, QString url, QStri - - git_repository *repo = NULL; - int error = git_clone(&repo, url.toLatin1(), checkoutLocation.toLatin1(), &clone_opts); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return QString(); } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return QString(); } - - return checkoutLocation; - } -diff --git a/gemini/cloud/git/gitcontroller.cpp b/gemini/cloud/git/gitcontroller.cpp -index 9bbf058..8fc6984 100644 ---- gemini/cloud/git/gitcontroller.cpp -+++ gemini/cloud/git/gitcontroller.cpp -@@ -168,75 +168,75 @@ void GitOpsThread::performPush() - { - git_repository* repository; - int error = git_repository_open(&repository, QString("%1/.git").arg(d->gitDir).toLatin1()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 1, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 1, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Get the current index - git_index* index; - error = git_repository_index(&index, repository); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 2, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 2, error code from git2 was" << error << "which is described as" << err->message; return; } - - // refresh it, and add the file - error = git_index_read(index, true); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 3, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 3, error code from git2 was" << error << "which is described as" << err->message; return; } - #ifdef Q_OS_WIN - QString relative = d->currentFile.mid(d->gitDir.length() + 9); // That is, 1 for the leading slash, and 8 for the file:/// - #else - QString relative = d->currentFile.mid(d->gitDir.length() + 8); // That is, 1 for the leading slash, and 8 for the file:// - #endif - error = git_index_add_bypath(index, relative.toLocal8Bit()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 4, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 4, error code from git2 was" << error << "which is described as" << err->message; return; } - error = git_index_write(index); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 5, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 5, error code from git2 was" << error << "which is described as" << err->message; return; } - - // convert the index to a tree, so we can use that to create the commit - git_tree* tree; - git_oid tree_id; - error = git_index_write_tree(&tree_id, index); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 6, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 6, error code from git2 was" << error << "which is described as" << err->message; return; } - error = git_tree_lookup(&tree, repository, &tree_id); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 7, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 7, error code from git2 was" << error << "which is described as" << err->message; return; } - - // get where we want to parent things to - git_oid obj; - error = git_reference_name_to_id(&obj, repository, "HEAD"); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 8, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 8, error code from git2 was" << error << "which is described as" << err->message; return; } - git_commit *parent = NULL; - error = git_commit_lookup(&parent, repository, &obj); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 9, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 9, error code from git2 was" << error << "which is described as" << err->message; return; } - - // create the commit - git_oid oid; - error = git_commit_create_v(&oid, repository, "HEAD", d->signature, d->signature, "UTF-8", d->message.toLatin1(), tree, 1, parent); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 10, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 10, error code from git2 was" << error << "which is described as" << err->message; return; } - - error = git_repository_state_cleanup(repository); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 11, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 11, error code from git2 was" << error << "which is described as" << err->message; return; } - - - // Find the current branch's upstream remote - git_reference *current_branch; - error = git_repository_head(¤t_branch, repository); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 12, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 12, error code from git2 was" << error << "which is described as" << err->message; return; } - - git_reference *upstream; - error = git_branch_upstream(&upstream, current_branch); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 13, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 13, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Now find the name of the remote - git_buf remote_name = {0,0,0}; - error = git_branch_remote_name(&remote_name, repository, git_reference_name(upstream)); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 14, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 14, error code from git2 was" << error << "which is described as" << err->message; return; } - QString remoteName = QString::fromUtf8(remote_name.ptr); -- git_buf_free(&remote_name); -+ git_buf_dispose(&remote_name); - - // And the upstream and local branch names... - const char *branch_name; - error = git_branch_name(&branch_name, upstream); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 15, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 15, error code from git2 was" << error << "which is described as" << err->message; return; } - QString upstreamBranchName = QString::fromUtf8(branch_name); - upstreamBranchName.remove(0, remoteName.length() + 1); - error = git_branch_name(&branch_name, current_branch); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 16, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 16, error code from git2 was" << error << "which is described as" << err->message; return; } - QString branchName = QString::fromUtf8(branch_name); - - git_remote_callbacks remoteCallbacks = GIT_REMOTE_CALLBACKS_INIT; -@@ -245,7 +245,7 @@ void GitOpsThread::performPush() - remoteCallbacks.credentials = &Private::acquireCredentialsCallback; - git_remote* remote; - error = git_remote_lookup(&remote, repository, "origin"); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 17, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 17, error code from git2 was" << error << "which is described as" << err->message; return; } - - char tempPath[512] = "refs/heads/"; - char tempPath2[512] = "refs/heads/"; -@@ -258,11 +258,11 @@ void GitOpsThread::performPush() - - git_push_options pushOptions; - error = git_push_init_options(&pushOptions, GIT_PUSH_OPTIONS_VERSION); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 18, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 18, error code from git2 was" << error << "which is described as" << err->message; return; } - pushOptions.callbacks = remoteCallbacks; - - error = git_remote_push(remote, &uploadrefs, &pushOptions); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 19, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 19, error code from git2 was" << error << "which is described as" << err->message; return; } - - emit pushCompleted(); - } -@@ -271,21 +271,21 @@ void GitOpsThread::performPull() - { - git_repository* repository; - int error = git_repository_open(&repository, QString("%1/.git").arg(d->gitDir).toLatin1()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Find the current branch's upstream remote - git_reference *current_branch; - error = git_repository_head(¤t_branch, repository); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - git_reference *upstream; - error = git_branch_upstream(&upstream, current_branch); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Now find the name of the remote - git_buf remote_name = {0,0,0}; - error = git_branch_remote_name(&remote_name, repository, git_reference_name(upstream)); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Finally set the credentials on it that we're given, and fetch it - git_remote_callbacks remoteCallbacks = GIT_REMOTE_CALLBACKS_INIT; -@@ -294,15 +294,15 @@ void GitOpsThread::performPull() - remoteCallbacks.credentials = &Private::acquireCredentialsCallback; - git_remote* remote; - error = git_remote_lookup(&remote, repository, remote_name.ptr); -- git_buf_free(&remote_name); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ git_buf_dispose(&remote_name); -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - git_fetch_options fetch_options = GIT_FETCH_OPTIONS_INIT; - fetch_options.callbacks = remoteCallbacks; - error = git_remote_fetch(remote, NULL, &fetch_options, NULL); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - error = git_branch_upstream(&upstream, current_branch); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - // Let's check and see what sort of merge we should be doing... - git_merge_analysis_t analysis; -@@ -480,19 +480,19 @@ public: - { - git_config* configActual; - int error = git_config_open_default(&configActual); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - - git_config* config; - error = git_config_snapshot(&config, configActual); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - - const char* name; - error = git_config_get_string(&name, config, "user.name"); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - - const char* email; - error = git_config_get_string(&email, config, "user.email"); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - - userName = QString::fromLocal8Bit(name); - userEmail = QString::fromLocal8Bit(email); -@@ -512,7 +512,7 @@ public: - } - userName = newName; - error = git_config_set_string(config, "user.name", newName.toLocal8Bit()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - } - if(userEmail.isEmpty()) { - bool ok; -@@ -529,7 +529,7 @@ public: - } - userEmail = newEmail; - error = git_config_set_string(config, "user.email", newEmail.toLocal8Bit()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - } - - git_config_free(config); -@@ -538,7 +538,7 @@ public: - return false; - } - error = git_signature_now(&signature, userName.toLocal8Bit(), userEmail.toLocal8Bit()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; } - return true; - } - -diff --git a/gemini/cloud/git/gitlogmodel.cpp b/gemini/cloud/git/gitlogmodel.cpp -index 7496519..d29c91c 100644 ---- gemini/cloud/git/gitlogmodel.cpp -+++ gemini/cloud/git/gitlogmodel.cpp -@@ -134,19 +134,19 @@ void GitLogModel::refreshLog() - - git_repository* repository; - int error = git_repository_open(&repository, QString("%1/.git").arg(d->repoDir).toLatin1()); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - git_revwalk *walker; - error = git_revwalk_new(&walker, repository); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - error = git_revwalk_push_range(walker, "HEAD~100..HEAD"); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - git_oid oid; - git_commit *commit = NULL; - while (git_revwalk_next(&oid, walker) == 0) { - error = git_commit_lookup(&commit, repository, &oid); -- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } -+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; } - - const git_signature *author = git_commit_author(commit); - - diff --git a/srcpkgs/calligra/patches/poppler-069.patch b/srcpkgs/calligra/patches/poppler-069.patch deleted file mode 100644 index 55c590104dd..00000000000 --- a/srcpkgs/calligra/patches/poppler-069.patch +++ /dev/null @@ -1,85 +0,0 @@ -From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 24 Oct 2018 08:28:00 +0200 -Subject: Fix build with poppler>=0.69 - -Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's - -Differential Revision: https://phabricator.kde.org/D16388 ---- - filters/karbon/pdf/PdfImport.cpp | 3 --- - filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- - filters/karbon/pdf/SvgOutputDev.h | 2 +- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0..48b08df 100644 ---- filters/karbon/pdf/PdfImport.cpp -+++ filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - -- // check for memory leaks -- Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917a..7901317 100644 ---- filters/karbon/pdf/SvgOutputDev.cpp -+++ filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) - .arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") - .arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - -- char * p = s->getCString(); -+ const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55d..2a44908 100644 ---- filters/karbon/pdf/SvgOutputDev.h -+++ filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); -- QString convertMatrix(double * matrix); -+ QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); - --- -cgit v0.11.2 - - diff --git a/srcpkgs/calligra/patches/poppler-071.patch b/srcpkgs/calligra/patches/poppler-071.patch deleted file mode 100644 index 4f31a720efa..00000000000 --- a/srcpkgs/calligra/patches/poppler-071.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index 48b08dfa32d..e910dae0756 100644 ---- filters/karbon/pdf/PdfImport.cpp -+++ filters/karbon/pdf/PdfImport.cpp -@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); - if (dev->isOk()) { - int rotate = 0; -- GBool useMediaBox = gTrue; -- GBool crop = gFalse; -- GBool printing = gFalse; -+ bool useMediaBox = true; -+ bool crop = false; -+ bool printing = false; - pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); - dev->dumpContent(); - } -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 5692824bc45..43205170991 100644 ---- filters/karbon/pdf/SvgOutputDev.cpp -+++ filters/karbon/pdf/SvgOutputDev.cpp -@@ -39,7 +39,7 @@ class SvgOutputDev::Private - { - public: - Private(const QString &fname) -- : svgFile(fname), defs(0), body(0), state(gTrue) -+ : svgFile(fname), defs(0), body(0), state(true) - , brush(Qt::SolidPattern) {} - - ~Private() { -@@ -52,7 +52,7 @@ public: - QString defsData; - QTextStream * defs; - QTextStream * body; -- GBool state; -+ bool state; - QSizeF pageSize; - QPen pen; - QBrush brush; -@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) - : d(new Private(fileName)) - { - if (! d->svgFile.open(QIODevice::WriteOnly)) { -- d->state = gFalse; -+ d->state = false; - return; - } - -@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev() - delete d; - } - --GBool SvgOutputDev::isOk() -+bool SvgOutputDev::isOk() - { - return d->state; - } - --GBool SvgOutputDev::upsideDown() -+bool SvgOutputDev::upsideDown() - { -- return gTrue; -+ return true; - } - --GBool SvgOutputDev::useDrawChar() -+bool SvgOutputDev::useDrawChar() - { -- return gFalse; -+ return false; - } - --GBool SvgOutputDev::interpretType3Chars() -+bool SvgOutputDev::interpretType3Chars() - { -- return gFalse; -+ return false; - } - - void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) -@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool /*inlineImg*/) -+ int *maskColors, bool /*inlineImg*/) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -549,7 +549,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) -+ bool /*interpolate*/, int *maskColors, bool inlineImg) - { - drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); - } -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2a4490848bf..cdb1d4e43b1 100644 ---- filters/karbon/pdf/SvgOutputDev.h -+++ filters/karbon/pdf/SvgOutputDev.h -@@ -44,11 +44,11 @@ public: - explicit SvgOutputDev(const QString &fileName); - virtual ~SvgOutputDev(); - -- GBool isOk(); -+ bool isOk(); - -- virtual GBool upsideDown(); -- virtual GBool useDrawChar(); -- virtual GBool interpretType3Chars(); -+ virtual bool upsideDown(); -+ virtual bool useDrawChar(); -+ virtual bool interpretType3Chars(); - virtual void startPage(int pageNum, GfxState *state, XRef *xref); - virtual void endPage(); - -@@ -63,10 +63,10 @@ public: - // images - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool inlineImg); -+ int *maskColors, bool inlineImg); - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg); -+ bool interpolate, int *maskColors, bool inlineImg); - - // styles - virtual void updateAll(GfxState *state); - diff --git a/srcpkgs/calligra/patches/poppler-072.patch b/srcpkgs/calligra/patches/poppler-072.patch deleted file mode 100644 index 3ef2d10855e..00000000000 --- a/srcpkgs/calligra/patches/poppler-072.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 80f01a5f76f..ea69228dbc1 100644 ---- filters/karbon/pdf/SvgOutputDev.cpp -+++ filters/karbon/pdf/SvgOutputDev.cpp -@@ -407,7 +407,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - QString str; - -- const char * p = s->getCString(); -+ const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -459,11 +459,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - *d->body << " y=\"" << y << "px\""; - - if (font && font->getFamily()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; -+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); - } else if (font && font->getName()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; -+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); - } - *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; - - diff --git a/srcpkgs/calligra/patches/poppler-073.patch b/srcpkgs/calligra/patches/poppler-073.patch deleted file mode 100644 index deae9f3b5d3..00000000000 --- a/srcpkgs/calligra/patches/poppler-073.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index f3b74e3..ffdbf01 100644 ---- filters/karbon/pdf/SvgOutputDev.cpp -+++ filters/karbon/pdf/SvgOutputDev.cpp -@@ -488,7 +488,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - if (maskColors) { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - - for (int x = 0; x < width; x++) { -@@ -507,7 +507,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - } else { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - - diff --git a/srcpkgs/calligra/patches/qt-511.patch b/srcpkgs/calligra/patches/qt-511.patch deleted file mode 100644 index bd608eb2c28..00000000000 --- a/srcpkgs/calligra/patches/qt-511.patch +++ /dev/null @@ -1,136 +0,0 @@ -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure -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 ---- stage/part/KPrPresentationTool.cpp -+++ stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include ---- -From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 ++ - 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 ---- libs/widgets/KoCsvImportDialog.cpp -+++ libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include - #include - #include - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- libs/widgets/KoPageLayoutWidget.cpp -+++ libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - 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 ---- plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include -+#include - - // Calligra - #include -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- plugins/formulashape/FormulaToolWidget.cpp -+++ plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- sheets/dialogs/LayoutDialog.cpp -+++ sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- words/part/dialogs/KWAnchoringProperties.cpp -+++ words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include - -+#include - #include - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- words/part/dialogs/KWRunAroundProperties.cpp -+++ words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include - -+#include -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -cgit v0.11.2 - - diff --git a/srcpkgs/calligra/patches/qt5.13.patch b/srcpkgs/calligra/patches/qt5.13.patch deleted file mode 100644 index ec19e0a0929..00000000000 --- a/srcpkgs/calligra/patches/qt5.13.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 13:02:34 +0200 -Subject: [PATCH] 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 b10b23022a2..0c5eeb68cf3 100644 ---- sheets/plugins/calendar/CalendarToolWidget.cpp -+++ sheets/plugins/calendar/CalendarToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - - #include -+#include - - namespace Calligra - { diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 3e6247a5dee..94a26744fed 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,13 +1,13 @@ # Template file for 'calligra' pkgname=calligra -version=3.1.0 -revision=25 +version=3.2.0 +revision=1 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" hostmakedepends="perl pkg-config extra-cmake-modules gettext" makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 - exiv2-devel kactivities5-devel gsl-devel + exiv2-devel kactivities5-devel gsl-devel qt5-declarative-devel kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel libetonyek-devel libgit2-devel libodfgen-devel libokular-devel @@ -20,7 +20,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="http://www.calligra-suite.org/" distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" -checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 +checksum=7e556228665d79e67c062fd1173d6676f0b0d7ceefdd6e1b0bcf9a781ea70951 replaces="calligra-braindump>=0 calligra-flow>=0" From d700560f07cc13a0332fb7b17233fe3c6fefaefd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 May 2020 00:57:58 +0200 Subject: [PATCH 03/98] kdiagram: update to 2.7.0. --- srcpkgs/kdiagram/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdiagram/template b/srcpkgs/kdiagram/template index 276dd136567..ef8f6c1a86f 100644 --- a/srcpkgs/kdiagram/template +++ b/srcpkgs/kdiagram/template @@ -1,6 +1,6 @@ # Template file for 'kdiagram' pkgname=kdiagram -version=2.6.2 +version=2.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.kde.org/" distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=0ab7d36e8c4602f46f445c615dc42c35afcc7cb7da9a0ca2cb46b16f86f56669 +checksum=63a2eabfa1554ceb1d686d5f17ed6308139b6d9155aaf224e0309585b070fbdd kdiagram-devel_package() { short_desc+=" - development" From 463ea530c67043236b078f6feb1063f14fb80853 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 May 2020 20:13:18 +0200 Subject: [PATCH 04/98] telegram-desktop: update to 2.1.1. --- srcpkgs/telegram-desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 259dbbf11c4..e0922dd3dde 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=2.1.0 -revision=2 +version=2.1.1 +revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake build_helper="qemu" @@ -28,7 +28,7 @@ license="GPL-3.0-or-later WITH OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950 +checksum=52e1ef6aff5d78fa979ed0e31129662decf78e9e317184912a7e39fe9f666200 build_options="spellcheck" build_options_default="spellcheck" From 79db5a2392da102ccb80d856735c99224b9b51c0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 21:29:50 +0200 Subject: [PATCH 05/98] rstudio: update to 1.2.5042. --- srcpkgs/rstudio/patches/boost173.patch | 26 ++++++++++++++++++++++++++ srcpkgs/rstudio/template | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/rstudio/patches/boost173.patch diff --git a/srcpkgs/rstudio/patches/boost173.patch b/srcpkgs/rstudio/patches/boost173.patch new file mode 100644 index 00000000000..cffe1cbaa18 --- /dev/null +++ b/srcpkgs/rstudio/patches/boost173.patch @@ -0,0 +1,26 @@ +--- src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 ++++ - 2020-05-01 18:29:14.359052359 +0200 +@@ -60,7 +60,7 @@ + std::for_each(processes.begin(), + processes.end(), + boost::bind(&ChildProcessTracker::attemptToReapProcess, +- this, _1)); ++ this, boost::placeholders::_1)); + } + + void ChildProcessTracker::attemptToReapProcess( +--- src/cpp/core/system/PosixOutputCapture.cpp 2020-04-01 18:16:24.000000000 +0200 ++++ - 2020-05-01 18:30:02.132088380 +0200 +@@ -80,10 +80,10 @@ + }; + + if (dupStdoutFd != -1) +- outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, _1); ++ outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, boost::placeholders::_1); + + if (dupStderrFd != -1) +- errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, _1); ++ errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, boost::placeholders::_1); + + try + { diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index d219beb9410..ef128b19569 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio -version=1.2.5033 -revision=2 +version=1.2.5042 +revision=1 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_BOOST_SIGNALS_VERSION=2 @@ -25,7 +25,7 @@ distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz ${_aws}/rstudio-dictionaries/core-dictionaries.zip ${_aws}/rstudio-buildtools/gin-${_gin_version}.zip ${_aws}/rstudio-buildtools/gwt-${_gwt_version}.zip" -checksum="ff5115bda56ee0fdee0ae2eb014ce5379774aeb3714a257a52da5b91a95e4408 +checksum="2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7" From 76ad9d363657bdf0f0f8388a9d9779ec23b7f3be Mon Sep 17 00:00:00 2001 From: John Date: Sat, 2 May 2020 20:34:11 +0200 Subject: [PATCH 06/98] python3-xapp: update to 2.0.1, drop py2, orphan --- srcpkgs/python-xapp/template | 25 ------------------------- srcpkgs/python3-xapp | 1 - srcpkgs/python3-xapp/template | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/python-xapp/template delete mode 120000 srcpkgs/python3-xapp create mode 100644 srcpkgs/python3-xapp/template diff --git a/srcpkgs/python-xapp/template b/srcpkgs/python-xapp/template deleted file mode 100644 index 51e248adcf3..00000000000 --- a/srcpkgs/python-xapp/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'python-xapp' -pkgname=python-xapp -version=1.8.1 -revision=2 -archs=noarch -build_style=python-module -pycompile_module="xapp" -hostmakedepends="python python3" -depends="python python-psutil" -short_desc="Python2 Xapp Library" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://github.com/linuxmint/python-xapp" -distfiles="https://github.com/linuxmint/python-xapp/archive/${version}.tar.gz" -checksum=f407edf5db6a30fcdec26a24addc86dc7b7ed891890fb128dd36675a95434355 - -python3-xapp_package() { - archs=noarch - depends="python3 python3-psutil" - pycompile_module="xapp" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-xapp b/srcpkgs/python3-xapp deleted file mode 120000 index bee9b975c3f..00000000000 --- a/srcpkgs/python3-xapp +++ /dev/null @@ -1 +0,0 @@ -python-xapp \ No newline at end of file diff --git a/srcpkgs/python3-xapp/template b/srcpkgs/python3-xapp/template new file mode 100644 index 00000000000..6e746704ad8 --- /dev/null +++ b/srcpkgs/python3-xapp/template @@ -0,0 +1,16 @@ +# Template file for 'python3-xapp' +pkgname=python3-xapp +version=2.0.1 +revision=1 +archs=noarch +build_style=python3-module +pycompile_module="xapp" +hostmakedepends="python3-setuptools" +depends="python3 python3-psutil xapps" +checkdepends="python3-psutil python3-gobject gtk+3 xapps" +short_desc="Python3 Xapp Library" +maintainer="Orphaned " +license="LGPL-2.1-or-later" +homepage="https://github.com/linuxmint/python3-xapp" +distfiles="https://github.com/linuxmint/python3-xapp/archive/${version}.tar.gz" +checksum=ed32ec4e81bfcc1de1d5f33dcc0a3dcfec9583b74a2af22d4c3188cec6ea7f4c From 33bafeda2a451fcb8c60f1b679cdedd11bb50acd Mon Sep 17 00:00:00 2001 From: John Date: Sun, 3 May 2020 14:39:10 +0200 Subject: [PATCH 07/98] DarkRadiant: update to 2.8.0. --- srcpkgs/DarkRadiant/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 79251c17375..8286fdaf540 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,18 +1,18 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant -version=2.7.0 +version=2.8.0 revision=1 build_style=gnu-configure configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext libtool pkg-config" makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel - libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python-devel" + libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python-devel freealut-devel" short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games" maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/codereader/DarkRadiant/" distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz" -checksum=1166a6d87f0a54ca661ba9be83d350d657972a2aaecdde5b92ebfb7bc80458c7 +checksum=8f810016b5110308965dd1b47407a0a385903cd62974b2e53e84f8011786b0e5 pre_configure() { ./autogen.sh From 031367aad94eec26ff4a2c9a7b531cc05d2b860f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:02:11 +0200 Subject: [PATCH 08/98] boost: update to 1.73.0. --- common/shlibs | 73 +++++------ .../{boost-python1.72 => boost-python1.73} | 0 ...{boost-python3-1.72 => boost-python3-1.73} | 0 srcpkgs/boost/patches/mips.patch | 11 -- srcpkgs/boost/template | 120 ++++++++++-------- ...ibboost_atomic1.72 => libboost_atomic1.73} | 0 ...ibboost_chrono1.72 => libboost_chrono1.73} | 0 ...t_container1.72 => libboost_container1.73} | 0 ...boost_context1.72 => libboost_context1.73} | 0 ...ost_contract1.72 => libboost_contract1.73} | 0 ...t_coroutine1.72 => libboost_coroutine1.73} | 0 ...t_date_time1.72 => libboost_date_time1.73} | 0 ...{libboost_fiber1.72 => libboost_fiber1.73} | 0 ...filesystem1.72 => libboost_filesystem1.73} | 0 ...{libboost_graph1.72 => libboost_graph1.73} | 0 ...t_iostreams1.72 => libboost_iostreams1.73} | 0 ...ibboost_locale1.72 => libboost_locale1.73} | 0 .../{libboost_log1.72 => libboost_log1.73} | 0 ...t_log_setup1.72 => libboost_log_setup1.73} | 0 ...ost_math_c991.72 => libboost_math_c991.73} | 0 ...t_math_c99f1.72 => libboost_math_c99f1.73} | 0 ...t_math_c99l1.72 => libboost_math_c99l1.73} | 0 ...ost_math_tr11.72 => libboost_math_tr11.73} | 0 ...t_math_tr1f1.72 => libboost_math_tr1f1.73} | 0 ...t_math_tr1l1.72 => libboost_math_tr1l1.73} | 0 ...g_exec_monitor1.72 => libboost_nowide1.73} | 0 ...ions1.72 => libboost_prg_exec_monitor1.73} | 0 ...andom1.72 => libboost_program_options1.73} | 0 ...libboost_regex1.72 => libboost_random1.73} | 0 ...t_serialization1.72 => libboost_regex1.73} | 0 ...dr2line1.72 => libboost_serialization1.73} | 0 ...1.72 => libboost_stacktrace_addr2line1.73} | 0 ...noop1.72 => libboost_stacktrace_basic1.73} | 0 ...ystem1.72 => libboost_stacktrace_noop1.73} | 0 ...ibboost_thread1.72 => libboost_system1.73} | 0 ...libboost_timer1.72 => libboost_thread1.73} | 0 ...st_type_erasure1.72 => libboost_timer1.73} | 0 ...ramework1.72 => libboost_type_erasure1.73} | 0 ...e1.72 => libboost_unit_test_framework1.73} | 0 ...t_wserialization1.72 => libboost_wave1.73} | 0 srcpkgs/libboost_wserialization1.73 | 1 + 41 files changed, 103 insertions(+), 102 deletions(-) rename srcpkgs/{boost-python1.72 => boost-python1.73} (100%) rename srcpkgs/{boost-python3-1.72 => boost-python3-1.73} (100%) delete mode 100644 srcpkgs/boost/patches/mips.patch rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.73} (100%) rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.73} (100%) rename srcpkgs/{libboost_container1.72 => libboost_container1.73} (100%) rename srcpkgs/{libboost_context1.72 => libboost_context1.73} (100%) rename srcpkgs/{libboost_contract1.72 => libboost_contract1.73} (100%) rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.73} (100%) rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.73} (100%) rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.73} (100%) rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.73} (100%) rename srcpkgs/{libboost_graph1.72 => libboost_graph1.73} (100%) rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.73} (100%) rename srcpkgs/{libboost_locale1.72 => libboost_locale1.73} (100%) rename srcpkgs/{libboost_log1.72 => libboost_log1.73} (100%) rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.73} (100%) rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.73} (100%) rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.73} (100%) rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.73} (100%) rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.73} (100%) rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.73} (100%) rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.73} (100%) rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.73} (100%) rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.73} (100%) rename srcpkgs/{libboost_random1.72 => libboost_program_options1.73} (100%) rename srcpkgs/{libboost_regex1.72 => libboost_random1.73} (100%) rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.73} (100%) rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.73} (100%) rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.73} (100%) rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.73} (100%) rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.73} (100%) rename srcpkgs/{libboost_thread1.72 => libboost_system1.73} (100%) rename srcpkgs/{libboost_timer1.72 => libboost_thread1.73} (100%) rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.73} (100%) rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.73} (100%) rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.73} (100%) rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.73} (100%) create mode 120000 srcpkgs/libboost_wserialization1.73 diff --git a/common/shlibs b/common/shlibs index acc92a8ae8d..5c3163893ff 100644 --- a/common/shlibs +++ b/common/shlibs @@ -651,42 +651,43 @@ libip4tc.so.2 iptables-1.8.3_1 libipq.so.0 iptables-1.4.7_1 libnm.so.0 libnm-1.0.0_1 libKF5ItemModels.so.5 kitemmodels-5.26.0_1 -libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1 -libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1 -libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1 -libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1 -libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1 -libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1 -libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1 -libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 -libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1 -libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1 -libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1 -libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1 -libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1 -libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1 -libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 -libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1 -libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1 -libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1 -libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1 -libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1 -libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 -libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 -libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 -libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1 -libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1 -libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1 -libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1 -libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1 -libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1 -libboost_python38.so.1.72.0 boost-python3-1.72-1.72.0_1 +libboost_context.so.1.73.0 libboost_context1.73-1.73.0_1 +libboost_coroutine.so.1.73.0 libboost_coroutine1.73-1.73.0_1 +libboost_container.so.1.73.0 libboost_container1.73-1.73.0_1 +libboost_prg_exec_monitor.so.1.73.0 libboost_prg_exec_monitor1.73-1.73.0_1 +libboost_timer.so.1.73.0 libboost_timer1.73-1.73.0_1 +libboost_random.so.1.73.0 libboost_random1.73-1.73.0_1 +libboost_filesystem.so.1.73.0 libboost_filesystem1.73-1.73.0_1 +libboost_unit_test_framework.so.1.73.0 libboost_unit_test_framework1.73-1.73.0_1 +libboost_math_c99.so.1.73.0 libboost_math_c991.73-1.73.0_1 +libboost_math_tr1.so.1.73.0 libboost_math_tr11.73-1.73.0_1 +libboost_regex.so.1.73.0 libboost_regex1.73-1.73.0_1 +libboost_serialization.so.1.73.0 libboost_serialization1.73-1.73.0_1 +libboost_chrono.so.1.73.0 libboost_chrono1.73-1.73.0_1 +libboost_wserialization.so.1.73.0 libboost_wserialization1.73-1.73.0_1 +libboost_graph.so.1.73.0 libboost_graph1.73-1.73.0_1 +libboost_log.so.1.73.0 libboost_log1.73-1.73.0_1 +libboost_locale.so.1.73.0 libboost_locale1.73-1.73.0_1 +libboost_math_tr1.so.1.73.0 libboost_math_tr11.73-1.73.0_1 +libboost_program_options.so.1.73.0 libboost_program_options1.73-1.73.0_1 +libboost_iostreams.so.1.73.0 libboost_iostreams1.73-1.73.0_1 +libboost_system.so.1.73.0 libboost_system1.73-1.73.0_1 +libboost_thread.so.1.73.0 libboost_thread1.73-1.73.0_1 +libboost_log_setup.so.1.73.0 libboost_log_setup1.73-1.73.0_1 +libboost_date_time.so.1.73.0 libboost_date_time1.73-1.73.0_1 +libboost_math_c99.so.1.73.0 libboost_math_c991.73-1.73.0_1 +libboost_wave.so.1.73.0 libboost_wave1.73-1.73.0_1 +libboost_math_tr1.so.1.73.0 libboost_math_tr11.73-1.73.0_1 +libboost_atomic.so.1.73.0 libboost_atomic1.73-1.73.0_1 +libboost_math_c99.so.1.73.0 libboost_math_c991.73-1.73.0_1 +libboost_type_erasure.so.1.73.0 libboost_type_erasure1.73-1.73.0_1 +libboost_fiber.so.1.73.0 libboost_fiber1.73-1.73.0_1 +libboost_stacktrace_noop.so.1.73.0 libboost_stacktrace_noop1.73-1.73.0_1 +libboost_stacktrace_addr2line.so.1.73.0 libboost_stacktrace_addr2line1.73-1.73.0_1 +libboost_stacktrace_basic.so.1.73.0 libboost_stacktrace_basic1.73-1.73.0_1 +libboost_nowide.so.1.73.0 libboost_nowide1.73-1.73.0_1 +libboost_python27.so.1.73.0 boost-python1.73-1.73.0_1 +libboost_python38.so.1.73.0 boost-python3-1.73-1.73.0_1 libexempi.so.8 exempi-2.5.0_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2-1.45.so.2 libsgutils-1.45_1 diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python1.73 similarity index 100% rename from srcpkgs/boost-python1.72 rename to srcpkgs/boost-python1.73 diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.73 similarity index 100% rename from srcpkgs/boost-python3-1.72 rename to srcpkgs/boost-python3-1.73 diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch deleted file mode 100644 index 502ae1cf597..00000000000 --- a/srcpkgs/boost/patches/mips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200 -+++ boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100 -@@ -48,7 +48,7 @@ - # define cpu_relax() asm volatile ("nop" ::: "memory"); - # endif - #elif BOOST_ARCH_MIPS --# define cpu_relax() asm volatile ("pause" ::: "memory"); -+# define cpu_relax() asm volatile ("nop" ::: "memory"); - #elif BOOST_ARCH_PPC - // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h - // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 39cc69be512..e7dcc07b7bc 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,36 +1,37 @@ # Template file for 'boost' pkgname=boost -version=1.72.0 +version=1.73.0 revision=1 wrksrc="${pkgname}_${version//\./_}" hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel" -makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel" +makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel + libzstd-devel liblzma-devel" short_desc="Free peer-reviewed portable C++ source libraries" maintainer="John " license="BSL-1.0" homepage="http://www.boost.org/" distfiles="https://dl.bintray.com/boostorg/release/${version}/source/boost_${version//./_}.tar.bz2" -checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 +checksum=4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402 CXXFLAGS="-std=c++14" -subpackages="libboost_program_options1.72 libboost_math_c99f1.72 - libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72 - libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72 - libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72 - libboost_graph1.72 libboost_locale1.72 libboost_regex1.72 - libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72 - libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72 - boost-python3-1.72 libboost_log_setup1.72 boost-devel - libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72 - libboost_serialization1.72 libboost_math_tr11.72 boost-build - libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72 - libboost_date_time1.72 libboost_log1.72 libboost_random1.72 - libboost_thread1.72 libboost_container1.72 boost-jam - libboost_wserialization1.72 libboost_context1.72" +subpackages="libboost_program_options1.73 libboost_math_c99f1.73 + libboost_stacktrace_basic1.73 libboost_stacktrace_noop1.73 + libboost_iostreams1.73 libboost_math_tr1l1.73 libboost_filesystem1.73 + libboost_chrono1.73 libboost_math_tr1f1.73 libboost_wave1.73 + libboost_graph1.73 libboost_locale1.73 libboost_regex1.73 + libboost_fiber1.73 libboost_type_erasure1.73 libboost_coroutine1.73 + libboost_atomic1.73 libboost_prg_exec_monitor1.73 libboost_math_c991.73 + boost-python3-1.73 libboost_log_setup1.73 boost-devel + libboost_timer1.73 libboost_system1.73 libboost_unit_test_framework1.73 + libboost_serialization1.73 libboost_math_tr11.73 boost-build + libboost_math_c99l1.73 boost-python1.73 libboost_contract1.73 + libboost_date_time1.73 libboost_log1.73 libboost_random1.73 + libboost_thread1.73 libboost_container1.73 boost-jam + libboost_wserialization1.73 libboost_context1.73" if [ -z "$CROSS_BUILD" ]; then - subpackages+=" libboost_stacktrace_addr2line1.72" + subpackages+=" libboost_stacktrace_addr2line1.73" fi case "$XBPS_TARGET_MACHINE" in @@ -102,7 +103,7 @@ boost-jam_package() { vmove usr/bin/b2 } } -boost-python1.72_package() { +boost-python1.73_package() { depends="boost python" replaces="boost-python>=0" short_desc+=" - Python bindings" @@ -110,7 +111,7 @@ boost-python1.72_package() { vmove "usr/lib/libboost_python2*.so.*" } } -boost-python3-1.72_package() { +boost-python3-1.73_package() { depends="boost python3" replaces="boost-python3>=0" short_desc+=" - Python3 bindings" @@ -122,6 +123,7 @@ boost-build_package() { archs=noarch conf_files="/etc/site-config.jam" short_desc+=" - Boost.Build framework" + python_version=3 pkg_install() { vmove usr/share/boost-build vmove etc/site-config.jam @@ -138,7 +140,7 @@ boost-devel_package() { } } -libboost_atomic1.72_package() { +libboost_atomic1.73_package() { depends="boost" short_desc+=" - libboost_atomic" pkg_install() { @@ -146,7 +148,7 @@ libboost_atomic1.72_package() { } } -libboost_chrono1.72_package() { +libboost_chrono1.73_package() { depends="boost" short_desc+=" - libboost_chrono" pkg_install() { @@ -154,7 +156,7 @@ libboost_chrono1.72_package() { } } -libboost_container1.72_package() { +libboost_container1.73_package() { depends="boost" short_desc+=" - libboost_container" pkg_install() { @@ -162,7 +164,7 @@ libboost_container1.72_package() { } } -libboost_context1.72_package() { +libboost_context1.73_package() { depends="boost" short_desc+=" - libboost_context" pkg_install() { @@ -170,7 +172,7 @@ libboost_context1.72_package() { } } -libboost_contract1.72_package() { +libboost_contract1.73_package() { depends="boost" short_desc+=" - libboost_contract" pkg_install() { @@ -178,7 +180,7 @@ libboost_contract1.72_package() { } } -libboost_coroutine1.72_package() { +libboost_coroutine1.73_package() { depends="boost" short_desc+=" - libboost_coroutine" pkg_install() { @@ -186,7 +188,7 @@ libboost_coroutine1.72_package() { } } -libboost_date_time1.72_package() { +libboost_date_time1.73_package() { depends="boost" short_desc+=" - libboost_date_time" pkg_install() { @@ -194,7 +196,7 @@ libboost_date_time1.72_package() { } } -libboost_fiber1.72_package() { +libboost_fiber1.73_package() { depends="boost" short_desc+=" - libboost_fiber" pkg_install() { @@ -202,7 +204,7 @@ libboost_fiber1.72_package() { } } -libboost_filesystem1.72_package() { +libboost_filesystem1.73_package() { depends="boost" short_desc+=" - libboost_filesystem" pkg_install() { @@ -210,7 +212,7 @@ libboost_filesystem1.72_package() { } } -libboost_graph1.72_package() { +libboost_graph1.73_package() { depends="boost" short_desc+=" - libboost_graph" pkg_install() { @@ -218,7 +220,7 @@ libboost_graph1.72_package() { } } -libboost_iostreams1.72_package() { +libboost_iostreams1.73_package() { depends="boost" short_desc+=" - libboost_iostreams" pkg_install() { @@ -226,7 +228,7 @@ libboost_iostreams1.72_package() { } } -libboost_locale1.72_package() { +libboost_locale1.73_package() { depends="boost" short_desc+=" - libboost_locale" pkg_install() { @@ -234,7 +236,7 @@ libboost_locale1.72_package() { } } -libboost_log1.72_package() { +libboost_log1.73_package() { depends="boost" short_desc+=" - libboost_log" pkg_install() { @@ -242,7 +244,7 @@ libboost_log1.72_package() { } } -libboost_log_setup1.72_package() { +libboost_log_setup1.73_package() { depends="boost" short_desc+=" - libboost_log_setup" pkg_install() { @@ -250,7 +252,7 @@ libboost_log_setup1.72_package() { } } -libboost_math_c991.72_package() { +libboost_math_c991.73_package() { depends="boost" short_desc+=" - libboost_math_c99" pkg_install() { @@ -258,7 +260,7 @@ libboost_math_c991.72_package() { } } -libboost_math_c99f1.72_package() { +libboost_math_c99f1.73_package() { depends="boost" short_desc+=" - libboost_math_c99f" pkg_install() { @@ -266,7 +268,7 @@ libboost_math_c99f1.72_package() { } } -libboost_math_c99l1.72_package() { +libboost_math_c99l1.73_package() { depends="boost" short_desc+=" - libboost_math_c99l" pkg_install() { @@ -274,7 +276,7 @@ libboost_math_c99l1.72_package() { } } -libboost_math_tr11.72_package() { +libboost_math_tr11.73_package() { depends="boost" short_desc+=" - libboost_math_tr1" pkg_install() { @@ -282,7 +284,7 @@ libboost_math_tr11.72_package() { } } -libboost_math_tr1f1.72_package() { +libboost_math_tr1f1.73_package() { depends="boost" short_desc+=" - libboost_math_tr1f" pkg_install() { @@ -290,7 +292,7 @@ libboost_math_tr1f1.72_package() { } } -libboost_math_tr1l1.72_package() { +libboost_math_tr1l1.73_package() { depends="boost" short_desc+=" - libboost_math_tr1l" pkg_install() { @@ -298,7 +300,7 @@ libboost_math_tr1l1.72_package() { } } -libboost_prg_exec_monitor1.72_package() { +libboost_prg_exec_monitor1.73_package() { depends="boost" short_desc+=" - libboost_prg_exec_monitor" pkg_install() { @@ -306,7 +308,7 @@ libboost_prg_exec_monitor1.72_package() { } } -libboost_program_options1.72_package() { +libboost_program_options1.73_package() { depends="boost" short_desc+=" - libboost_program_options" pkg_install() { @@ -314,7 +316,7 @@ libboost_program_options1.72_package() { } } -libboost_random1.72_package() { +libboost_random1.73_package() { depends="boost" short_desc+=" - libboost_random" pkg_install() { @@ -322,7 +324,7 @@ libboost_random1.72_package() { } } -libboost_regex1.72_package() { +libboost_regex1.73_package() { depends="boost" short_desc+=" - libboost_regex" pkg_install() { @@ -330,7 +332,7 @@ libboost_regex1.72_package() { } } -libboost_serialization1.72_package() { +libboost_serialization1.73_package() { depends="boost" short_desc+=" - libboost_serialization" pkg_install() { @@ -338,7 +340,7 @@ libboost_serialization1.72_package() { } } -libboost_stacktrace_addr2line1.72_package() { +libboost_stacktrace_addr2line1.73_package() { depends="boost" short_desc+=" - libboost_stacktrace_addr2line" pkg_install() { @@ -346,7 +348,7 @@ libboost_stacktrace_addr2line1.72_package() { } } -libboost_stacktrace_basic1.72_package() { +libboost_stacktrace_basic1.73_package() { depends="boost" short_desc+=" - libboost_stacktrace_basic" pkg_install() { @@ -354,7 +356,7 @@ libboost_stacktrace_basic1.72_package() { } } -libboost_stacktrace_noop1.72_package() { +libboost_stacktrace_noop1.73_package() { depends="boost" short_desc+=" - libboost_stacktrace_noop" pkg_install() { @@ -362,7 +364,7 @@ libboost_stacktrace_noop1.72_package() { } } -libboost_system1.72_package() { +libboost_system1.73_package() { depends="boost" short_desc+=" - libboost_system" pkg_install() { @@ -370,7 +372,7 @@ libboost_system1.72_package() { } } -libboost_thread1.72_package() { +libboost_thread1.73_package() { depends="boost" short_desc+=" - libboost_thread" pkg_install() { @@ -378,7 +380,7 @@ libboost_thread1.72_package() { } } -libboost_timer1.72_package() { +libboost_timer1.73_package() { depends="boost" short_desc+=" - libboost_timer" pkg_install() { @@ -386,7 +388,7 @@ libboost_timer1.72_package() { } } -libboost_type_erasure1.72_package() { +libboost_type_erasure1.73_package() { depends="boost" short_desc+=" - libboost_type_erasure" pkg_install() { @@ -394,7 +396,7 @@ libboost_type_erasure1.72_package() { } } -libboost_unit_test_framework1.72_package() { +libboost_unit_test_framework1.73_package() { depends="boost" short_desc+=" - libboost_unit_test_framework" pkg_install() { @@ -402,7 +404,7 @@ libboost_unit_test_framework1.72_package() { } } -libboost_wave1.72_package() { +libboost_wave1.73_package() { depends="boost" short_desc+=" - libboost_wave" pkg_install() { @@ -410,10 +412,18 @@ libboost_wave1.72_package() { } } -libboost_wserialization1.72_package() { +libboost_wserialization1.73_package() { depends="boost" short_desc+=" - libboost_wserialization" pkg_install() { vmove usr/lib/libboost_wserialization.so.* } } + +libboost_nowide1.73_package() { + depends="boost" + short_desc+=" - libboost_nowide" + pkg_install() { + vmove usr/lib/libboost_nowide.so.* + } +} diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.73 similarity index 100% rename from srcpkgs/libboost_atomic1.72 rename to srcpkgs/libboost_atomic1.73 diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.73 similarity index 100% rename from srcpkgs/libboost_chrono1.72 rename to srcpkgs/libboost_chrono1.73 diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.73 similarity index 100% rename from srcpkgs/libboost_container1.72 rename to srcpkgs/libboost_container1.73 diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.73 similarity index 100% rename from srcpkgs/libboost_context1.72 rename to srcpkgs/libboost_context1.73 diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.73 similarity index 100% rename from srcpkgs/libboost_contract1.72 rename to srcpkgs/libboost_contract1.73 diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.73 similarity index 100% rename from srcpkgs/libboost_coroutine1.72 rename to srcpkgs/libboost_coroutine1.73 diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.73 similarity index 100% rename from srcpkgs/libboost_date_time1.72 rename to srcpkgs/libboost_date_time1.73 diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.73 similarity index 100% rename from srcpkgs/libboost_fiber1.72 rename to srcpkgs/libboost_fiber1.73 diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.73 similarity index 100% rename from srcpkgs/libboost_filesystem1.72 rename to srcpkgs/libboost_filesystem1.73 diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.73 similarity index 100% rename from srcpkgs/libboost_graph1.72 rename to srcpkgs/libboost_graph1.73 diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.73 similarity index 100% rename from srcpkgs/libboost_iostreams1.72 rename to srcpkgs/libboost_iostreams1.73 diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.73 similarity index 100% rename from srcpkgs/libboost_locale1.72 rename to srcpkgs/libboost_locale1.73 diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.73 similarity index 100% rename from srcpkgs/libboost_log1.72 rename to srcpkgs/libboost_log1.73 diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.73 similarity index 100% rename from srcpkgs/libboost_log_setup1.72 rename to srcpkgs/libboost_log_setup1.73 diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.73 similarity index 100% rename from srcpkgs/libboost_math_c991.72 rename to srcpkgs/libboost_math_c991.73 diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.73 similarity index 100% rename from srcpkgs/libboost_math_c99f1.72 rename to srcpkgs/libboost_math_c99f1.73 diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.73 similarity index 100% rename from srcpkgs/libboost_math_c99l1.72 rename to srcpkgs/libboost_math_c99l1.73 diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.73 similarity index 100% rename from srcpkgs/libboost_math_tr11.72 rename to srcpkgs/libboost_math_tr11.73 diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.73 similarity index 100% rename from srcpkgs/libboost_math_tr1f1.72 rename to srcpkgs/libboost_math_tr1f1.73 diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.73 similarity index 100% rename from srcpkgs/libboost_math_tr1l1.72 rename to srcpkgs/libboost_math_tr1l1.73 diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.73 similarity index 100% rename from srcpkgs/libboost_prg_exec_monitor1.72 rename to srcpkgs/libboost_nowide1.73 diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.73 similarity index 100% rename from srcpkgs/libboost_program_options1.72 rename to srcpkgs/libboost_prg_exec_monitor1.73 diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.73 similarity index 100% rename from srcpkgs/libboost_random1.72 rename to srcpkgs/libboost_program_options1.73 diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.73 similarity index 100% rename from srcpkgs/libboost_regex1.72 rename to srcpkgs/libboost_random1.73 diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.73 similarity index 100% rename from srcpkgs/libboost_serialization1.72 rename to srcpkgs/libboost_regex1.73 diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.73 similarity index 100% rename from srcpkgs/libboost_stacktrace_addr2line1.72 rename to srcpkgs/libboost_serialization1.73 diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.73 similarity index 100% rename from srcpkgs/libboost_stacktrace_basic1.72 rename to srcpkgs/libboost_stacktrace_addr2line1.73 diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.73 similarity index 100% rename from srcpkgs/libboost_stacktrace_noop1.72 rename to srcpkgs/libboost_stacktrace_basic1.73 diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.73 similarity index 100% rename from srcpkgs/libboost_system1.72 rename to srcpkgs/libboost_stacktrace_noop1.73 diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.73 similarity index 100% rename from srcpkgs/libboost_thread1.72 rename to srcpkgs/libboost_system1.73 diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.73 similarity index 100% rename from srcpkgs/libboost_timer1.72 rename to srcpkgs/libboost_thread1.73 diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.73 similarity index 100% rename from srcpkgs/libboost_type_erasure1.72 rename to srcpkgs/libboost_timer1.73 diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.73 similarity index 100% rename from srcpkgs/libboost_unit_test_framework1.72 rename to srcpkgs/libboost_type_erasure1.73 diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.73 similarity index 100% rename from srcpkgs/libboost_wave1.72 rename to srcpkgs/libboost_unit_test_framework1.73 diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.73 similarity index 100% rename from srcpkgs/libboost_wserialization1.72 rename to srcpkgs/libboost_wave1.73 diff --git a/srcpkgs/libboost_wserialization1.73 b/srcpkgs/libboost_wserialization1.73 new file mode 120000 index 00000000000..baef819c48f --- /dev/null +++ b/srcpkgs/libboost_wserialization1.73 @@ -0,0 +1 @@ +boost \ No newline at end of file From 4633fc57fa5a824e4bbe67040ccc680928c1fb51 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:21 +0200 Subject: [PATCH 09/98] 0ad: rebuild against boost-1.73 --- srcpkgs/0ad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index d4a42a4894d..88314906c9a 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.23b -revision=4 +revision=5 archs="x86_64* i686* aarch64* armv7l* ppc64le*" wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python tar" From 13f9be0915b1e6307e886e332c714df88c1d31a5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:21 +0200 Subject: [PATCH 10/98] Aegisub: rebuild against boost-1.73 --- srcpkgs/Aegisub/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index 838de134f93..7410825542b 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -1,7 +1,7 @@ # Template file for 'Aegisub' pkgname=Aegisub version=3.2.2 -revision=9 +revision=10 build_style=gnu-configure configure_args="--disable-update-checker --with-alsa --with-ffms2 --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal) From 3b580e559599873fc6c0bab6826b6df5b5ef614e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:21 +0200 Subject: [PATCH 11/98] EmulationStation: rebuild against boost-1.73 --- srcpkgs/EmulationStation/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/EmulationStation/template b/srcpkgs/EmulationStation/template index 62b398daf8e..9d47fffc5a4 100644 --- a/srcpkgs/EmulationStation/template +++ b/srcpkgs/EmulationStation/template @@ -1,7 +1,7 @@ # Template file for 'EmulationStation' pkgname=EmulationStation version=2.7.6 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config git" makedepends="libcurl-devel MesaLib-devel freetype-devel freeimage-devel From 14ca7a478eb08c1613f282b3594c7eaebb216a56 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:21 +0200 Subject: [PATCH 12/98] LGOGDownloader: rebuild against boost-1.73 --- srcpkgs/LGOGDownloader/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 9a2fe23e686..f070388056c 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.6 -revision=1 +revision=2 wrksrc="lgogdownloader-${version}" build_style=cmake hostmakedepends="pkg-config" From 7f63fa22b8b779f4496eaa3756eae5348e284a06 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:22 +0200 Subject: [PATCH 13/98] Lucene++: rebuild against boost-1.73 --- srcpkgs/Lucene++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template index d677c1c6c1c..75b12343ed4 100644 --- a/srcpkgs/Lucene++/template +++ b/srcpkgs/Lucene++/template @@ -1,7 +1,7 @@ # Template file for 'Lucene++' pkgname=Lucene++ version=3.0.7 -revision=10 +revision=11 wrksrc=LucenePlusPlus-rel_$version build_style=cmake configure_args="-Wno-dev" From b0448b54e9dc02303f7a5c5560787555264883fa Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:22 +0200 Subject: [PATCH 14/98] PrusaSlicer: rebuild against boost-1.73 --- srcpkgs/PrusaSlicer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index fcae498faf2..aee7d7785f8 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.0.0 -revision=3 +revision=4 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu" From 844484c5d1c8171d08924ba1cd8e620d16ca021f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:22 +0200 Subject: [PATCH 15/98] SMC: rebuild against boost-1.73 --- srcpkgs/SMC/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template index 00f9763bfdd..6f395829c58 100644 --- a/srcpkgs/SMC/template +++ b/srcpkgs/SMC/template @@ -1,7 +1,7 @@ # Template file for 'SMC'. pkgname=SMC version=1.9 -revision=8 +revision=9 wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="automake libtool gettext-devel pkg-config unzip" From 718db8f4b54d48280e9d2b9308d10b1ae007e794 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:22 +0200 Subject: [PATCH 16/98] TSC: rebuild against boost-1.73 --- srcpkgs/TSC/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 50de6757fb6..cfe73fb5610 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC'. pkgname=TSC version=2.0.0 -revision=9 +revision=10 build_style=cmake build_wrksrc=tsc configure_args="-DFIXED_DATA_DIR=/usr/share/TSC -DBINARY_DIR=/usr/bin" From 63302233d6a81baec6cf0f6e30873b3d5314feb3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:23 +0200 Subject: [PATCH 17/98] adriconf: rebuild against boost-1.73 --- srcpkgs/adriconf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template index a616c2d6909..a50f31260e8 100644 --- a/srcpkgs/adriconf/template +++ b/srcpkgs/adriconf/template @@ -1,7 +1,7 @@ # Template file for 'adriconf' pkgname=adriconf version=1.5.1 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_UNIT_TESTS=false" hostmakedepends="pkg-config glib-devel gettext" From 45ab906eb9a644a5a9022fb1d008070dd6daf5cb Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:23 +0200 Subject: [PATCH 18/98] astroid: rebuild against boost-1.73 --- srcpkgs/astroid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index e0c486a4a72..1b16201e5a0 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.15 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel From 54e9fb7dfd19f1774f94b088c13637bd8fb7ebf7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:23 +0200 Subject: [PATCH 19/98] bitcoin: rebuild against boost-1.73 --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 7f21abcfb15..4b74e47916c 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.19.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" From 7296a66868c612db4de7ed71a7033f0649ef86a6 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:24 +0200 Subject: [PATCH 20/98] blender: rebuild against boost-1.73 --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 6b19078183e..c33e88a12eb 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.82 -revision=3 +revision=4 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel From bb3d9374a1c7668b7884c87dda30b4846c57a230 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:24 +0200 Subject: [PATCH 21/98] cclive: rebuild against boost-1.73 --- srcpkgs/cclive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index c43dbb94209..936be99b866 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,7 +1,7 @@ # Template file for 'cclive' pkgname=cclive version=0.9.3 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" From ff2e00ca907480340b0453cdd927c25a1498934d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:24 +0200 Subject: [PATCH 22/98] cgal: rebuild against boost-1.73 --- srcpkgs/cgal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index 60eaa4bc61c..1d0f788506c 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname=cgal version=4.14 -revision=2 +revision=3 wrksrc="CGAL-${version}" build_style=cmake build_helper="qemu" From d92955a50cc7a358a3ef5879dc55a1d1ebbd1737 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:24 +0200 Subject: [PATCH 23/98] chatterino2: rebuild against boost-1.73 --- srcpkgs/chatterino2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 71e8b5d2f36..8cf7487da62 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,7 +1,7 @@ # Template file for 'chatterino2' pkgname=chatterino2 version=2.1.7 -revision=2 +revision=3 _signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be _settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66 _humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587 From cfc18d170327c70193c12ff80c7070cd8ad5d856 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:25 +0200 Subject: [PATCH 24/98] codeblocks: rebuild against boost-1.73 --- srcpkgs/codeblocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 43c9e4127a5..68b3c8da3ed 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" From 93da4813cf4f06c2f36b17210de5e4be3dc3f3d7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:25 +0200 Subject: [PATCH 25/98] facter: rebuild against boost-1.73 --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index e3dd9cd3ef5..e312817646e 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.9 -revision=2 +revision=3 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF" From f7eb9e5f36d3b4087382323420a3b494e1a42c22 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:25 +0200 Subject: [PATCH 26/98] fifengine: rebuild against boost-1.73 --- srcpkgs/fifengine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index cd74d3dd494..ca631983149 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.2 -revision=4 +revision=5 build_style=cmake pycompile_module="fife" hostmakedepends="swig python3" From a5a53b02a4c0c942b04a027f26a2f87b4d284f76 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:25 +0200 Subject: [PATCH 27/98] freecad: rebuild against boost-1.73 --- srcpkgs/freecad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index e57b74d7dd0..da31b8d9e46 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.18.4 -revision=4 +revision=5 wrksrc="FreeCAD-${version}" build_style=cmake From 09519bed1eaf93848f6d3faeb17035f88d011bae Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:26 +0200 Subject: [PATCH 28/98] freeorion: rebuild against boost-1.73 --- srcpkgs/freeorion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 3078bee0d7b..c6ae5a99f3f 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.9 -revision=1 +revision=2 _release=${version}_2020-02-02.db53471 wrksrc=src-tarball build_style=cmake From cbf4f70c4030a1d320fbde44641225019e22bc48 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:26 +0200 Subject: [PATCH 29/98] gnucash: rebuild against boost-1.73 --- srcpkgs/gnucash/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 5145a701ac6..743e4b1b6c2 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=3.10 -revision=1 +revision=2 wrksrc="${pkgname}-${version%b}" build_style=cmake configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" From 49ce863034de82a538cfbadbc82fc11e6b25df5f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:26 +0200 Subject: [PATCH 30/98] gnuradio: rebuild against boost-1.73 --- srcpkgs/gnuradio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index cdc175bdba4..b8323e3a739 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio'. pkgname=gnuradio version=3.8.0.0 -revision=4 +revision=5 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=${py3_sitelib}" From 795b0ddb091144a08ad9e69cc2dde15ce6d14a7f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:26 +0200 Subject: [PATCH 31/98] gnuradio-osmosdr: rebuild against boost-1.73 --- srcpkgs/gnuradio-osmosdr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 17e72935af8..7a3b2026035 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.0 -revision=1 +revision=2 wrksrc="gr-osmosdr-${version}" build_style=cmake hostmakedepends="pkg-config swig" From 61b6642b6197af56f7aa76a2f260568791a06b24 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:27 +0200 Subject: [PATCH 32/98] gource: rebuild against boost-1.73 --- srcpkgs/gource/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index c895031c6cc..577fc4efd27 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.51 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF" hostmakedepends="pkg-config" From 8743e9ae24cbe1c0de7b38b782e0a581d7811bfb Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:27 +0200 Subject: [PATCH 33/98] gqrx: rebuild against boost-1.73 --- srcpkgs/gqrx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index 020e90288ae..d22998a6e82 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,7 +1,7 @@ # Template file for 'gqrx' pkgname=gqrx version=2.12.1 -revision=2 +revision=3 build_style=cmake configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio) $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)" From b92f8989d47191000846d04fdc39212a02c4912a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:27 +0200 Subject: [PATCH 34/98] grive2: rebuild against boost-1.73 --- srcpkgs/grive2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index 140688ee9ae..e416cdc606b 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive2' pkgname=grive2 version=0.5.1 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" From 0596092de61ff2da934d5e9594a77743b711b2eb Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:27 +0200 Subject: [PATCH 35/98] guitarix2: rebuild against boost-1.73 --- srcpkgs/guitarix2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index 90d676554c8..c71a0f77305 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,7 +1,7 @@ # Template file for 'guitarix2' pkgname=guitarix2 version=0.39.0 -revision=1 +revision=2 wrksrc="guitarix-${version}" build_style=waf configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust From 721c75b72cd7410a492ed3cd1abf3b70fb07dfb8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:28 +0200 Subject: [PATCH 36/98] heaptrack: rebuild against boost-1.73 --- srcpkgs/heaptrack/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index 42b73c2dcb1..4ecb62e8a19 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -1,7 +1,7 @@ # Template file for 'heaptrack' pkgname=heaptrack version=1.1.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons gettext" From cac27b9afce16688dc08895d5bc6c0853be7faa3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:28 +0200 Subject: [PATCH 37/98] hugin: rebuild against boost-1.73 --- srcpkgs/hugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 40142a3f79d..d57e7f047ee 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2019.2.0 -revision=2 +revision=3 wrksrc="${pkgname}-${version}" build_style=cmake pycompile_module="hpi.py hsi.py" From 358bd2a05240cd0c657db00f2219388fe1b704f1 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:28 +0200 Subject: [PATCH 38/98] i2pd: rebuild against boost-1.73 --- srcpkgs/i2pd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 37a13c50f6e..e18db810bba 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.31.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USE_UPNP=yes" makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel From 48c1cff7479872365ef6f780c892a7e46eb0850e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:28 +0200 Subject: [PATCH 39/98] icinga2: rebuild against boost-1.73 --- srcpkgs/icinga2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index dd87ceb55a2..5d657999287 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.3 -revision=2 +revision=3 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc From 932ded3653e572140ba15de0693273b336522046 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:29 +0200 Subject: [PATCH 40/98] imagescan: rebuild against boost-1.73 --- srcpkgs/imagescan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index 0a0cb5e2b3f..da780967762 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.55.0 -revision=2 +revision=3 wrksrc=utsushi-0.55.0 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From c2d18e13265821fce324d38d99ec2d52c51119c2 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:29 +0200 Subject: [PATCH 41/98] innoextract: rebuild against boost-1.73 --- srcpkgs/innoextract/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index af8767f9128..e2ca5305be7 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract' pkgname=innoextract version=1.8 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr" hostmakedepends="boost extra-cmake-modules" From a4d76a343182aec307913adf530a8fa0c90d6bb8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:29 +0200 Subject: [PATCH 42/98] juCi++: rebuild against boost-1.73 --- srcpkgs/juCi++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 9decdd72538..73fa7d8b265 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.5.0 -revision=3 +revision=4 _libclangmm_commit="687b9c231d850504ec515acb9ccab73f26c34063" _tiny_commit="a6773276efdbc322f1abb0159301f5502647eb52" wrksrc="jucipp-v${version}" From 8e770c4ca92b05b9b99fe70837f87a46272855c5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:29 +0200 Subject: [PATCH 43/98] kea: rebuild against boost-1.73 --- srcpkgs/kea/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index d7be3da6644..7c6d2fec47b 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=1.7.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-mysql) From 56ac785bd9c56d85326c3bc70199e451fe6ad4a0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:30 +0200 Subject: [PATCH 44/98] kig: rebuild against boost-1.73 --- srcpkgs/kig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index b8e8d00ea8f..d7e73c0d09c 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=20.04.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" From 27d8f662d87153f55ed34cd333a71acffe6463c1 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:30 +0200 Subject: [PATCH 45/98] ledger: rebuild against boost-1.73 --- srcpkgs/ledger/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 1e4941a9310..97c6e5ef525 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.2.0 -revision=1 +revision=2 build_style=cmake makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" short_desc="Double-entry accounting system with a command-line reporting interface" From caad5068e486f9655171c8a8e8dc77ea4086fa0c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:30 +0200 Subject: [PATCH 46/98] libbitcoin-blockchain: rebuild against boost-1.73 --- srcpkgs/libbitcoin-blockchain/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template index a354237b475..8d71f476cf0 100644 --- a/srcpkgs/libbitcoin-blockchain/template +++ b/srcpkgs/libbitcoin-blockchain/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-blockchain' pkgname=libbitcoin-blockchain version=3.6.0 -revision=2 +revision=3 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 4ff428bdde2d59550b549734d4dd0602da8e61a5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:30 +0200 Subject: [PATCH 47/98] libbitcoin-client: rebuild against boost-1.73 --- srcpkgs/libbitcoin-client/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template index 63b4b6339b2..946682406d4 100644 --- a/srcpkgs/libbitcoin-client/template +++ b/srcpkgs/libbitcoin-client/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-client' pkgname=libbitcoin-client version=3.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples" From bfa64d956fbbb288b4405459965f419b0a3928a8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:31 +0200 Subject: [PATCH 48/98] libbitcoin-database: rebuild against boost-1.73 --- srcpkgs/libbitcoin-database/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template index eed919dc230..3ac8c3773e1 100644 --- a/srcpkgs/libbitcoin-database/template +++ b/srcpkgs/libbitcoin-database/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-database' pkgname=libbitcoin-database version=3.6.0 -revision=2 +revision=3 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From c29d1238284fb454f6c49dcbdd0f97295d46b049 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:31 +0200 Subject: [PATCH 49/98] libbitcoin-explorer: rebuild against boost-1.73 --- srcpkgs/libbitcoin-explorer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template index 49a4ff5fe48..8e4b20ab7c3 100644 --- a/srcpkgs/libbitcoin-explorer/template +++ b/srcpkgs/libbitcoin-explorer/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-explorer' pkgname=libbitcoin-explorer version=3.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 259050a745a868a596f782db3ab0af0d2d93dcab Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:31 +0200 Subject: [PATCH 50/98] libbitcoin-network: rebuild against boost-1.73 --- srcpkgs/libbitcoin-network/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template index db8e6e2c91e..8b4d1ce5196 100644 --- a/srcpkgs/libbitcoin-network/template +++ b/srcpkgs/libbitcoin-network/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-network' pkgname=libbitcoin-network version=3.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" From 70593e996b7c165cd5b5ded4e7365d8d49fc51e5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:31 +0200 Subject: [PATCH 51/98] libbitcoin-node: rebuild against boost-1.73 --- srcpkgs/libbitcoin-node/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template index 5aef078cb3b..b5db32a0eed 100644 --- a/srcpkgs/libbitcoin-node/template +++ b/srcpkgs/libbitcoin-node/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-node' pkgname=libbitcoin-node version=3.6.0 -revision=2 +revision=3 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions From 9bbc6e4870b3f310bc7995190fdded753e7ab771 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:32 +0200 Subject: [PATCH 52/98] libbitcoin-protocol: rebuild against boost-1.73 --- srcpkgs/libbitcoin-protocol/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template index e86df2997e7..e6aa4fc2985 100644 --- a/srcpkgs/libbitcoin-protocol/template +++ b/srcpkgs/libbitcoin-protocol/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-protocol' pkgname=libbitcoin-protocol version=3.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" From 99966a70a1015ffc4ac9d2d7bb37adee0c111086 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:32 +0200 Subject: [PATCH 53/98] libbitcoin-server: rebuild against boost-1.73 --- srcpkgs/libbitcoin-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template index 78d8374280e..8c66566117e 100644 --- a/srcpkgs/libbitcoin-server/template +++ b/srcpkgs/libbitcoin-server/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-server' pkgname=libbitcoin-server version=3.6.0 -revision=2 +revision=3 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions From face036ea51634a922e1e128da3c1a52757fd333 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:32 +0200 Subject: [PATCH 54/98] libbitcoin-system: rebuild against boost-1.73 --- srcpkgs/libbitcoin-system/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template index 53ad23e6616..3addeb4e544 100644 --- a/srcpkgs/libbitcoin-system/template +++ b/srcpkgs/libbitcoin-system/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-system' pkgname=libbitcoin-system version=3.6.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png From d0d32b8b8d998aed919dbc80064fac9d8717b04c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:32 +0200 Subject: [PATCH 55/98] libcmis: rebuild against boost-1.73 --- srcpkgs/libcmis/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index fac133d5e4d..43dd0a85612 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="DOCBOOK2MAN=docbook2man --disable-werror" hostmakedepends="pkg-config docbook2x" From 257d3d01da96762ea1f390aabb8690a1dba479ab Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:33 +0200 Subject: [PATCH 56/98] libixion: rebuild against boost-1.73 --- srcpkgs/libixion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 316e90ea740..bf76740007b 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.15.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel mdds python3-devel spdlog" From b9c1ecd2bed2e12c8dfe27929620b85a3b52197c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:33 +0200 Subject: [PATCH 57/98] libogre: rebuild against boost-1.73 --- srcpkgs/libogre/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index d94aa7497b5..c53b829ab1b 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -1,7 +1,7 @@ # Template file for 'ogre' pkgname=libogre version=1.10.11 -revision=5 +revision=6 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr \ -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ From 4fdd7b2096cfe70b809d2b6263a50338541df792 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:33 +0200 Subject: [PATCH 58/98] liborcus: rebuild against boost-1.73 --- srcpkgs/liborcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 11fe4ea1995..df66c07d53d 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus version=0.15.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" From 537e9bc0dba2b95e90837b8285feefb503e12442 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:33 +0200 Subject: [PATCH 59/98] libreoffice: rebuild against boost-1.73 --- srcpkgs/libreoffice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 13b58e7e95a..a4efa2625ae 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=6.4.1.2 -revision=1 +revision=2 build_style=meta make_build_args="build-nocheck" nocross="Several dependencies are nocross=yes" From 1e5be08187ce920adf1b23d7bac668f8daaab704 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:34 +0200 Subject: [PATCH 60/98] librime: rebuild against boost-1.73 --- srcpkgs/librime/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template index 695b03e5fa6..01c298143e7 100644 --- a/srcpkgs/librime/template +++ b/srcpkgs/librime/template @@ -1,7 +1,7 @@ # Template file for 'librime' pkgname=librime version=1.5.3 -revision=3 +revision=4 build_style=cmake configure_args="-DENABLE_LOGGING=OFF -DBUILD_TEST=OFF" makedepends="boost-devel leveldb-devel marisa-devel opencc-devel yaml-cpp-devel" From 42a4666fb59620c6b432cedb740130c16d2c9386 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:34 +0200 Subject: [PATCH 61/98] libtorrent-rasterbar: rebuild against boost-1.73 --- srcpkgs/libtorrent-rasterbar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 88c56d84aa4..3464c75fba0 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,7 +1,7 @@ # Template file for 'libtorrent-rasterbar' pkgname=libtorrent-rasterbar version=1.2.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-examples --enable-python-binding --with-boost=${XBPS_CROSS_BASE}/usr From ac1a73c0176b71c07fc170dce709c75c05e56dd7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:34 +0200 Subject: [PATCH 62/98] linssid: rebuild against boost-1.73 --- srcpkgs/linssid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 3347f193c3e..937c8a0745e 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -1,7 +1,7 @@ # Template file for 'linssid' pkgname=linssid version=3.6 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="boost-devel qwt-devel" From 6062c7661b8677ac2f7642a949b6f8ffcca175b0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:34 +0200 Subject: [PATCH 63/98] litecoin: rebuild against boost-1.73 --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 207b0bff782..c1f9eb22977 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.17.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" From 2d240c9398c973f48dc3547391c84abb23697d37 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:35 +0200 Subject: [PATCH 64/98] luxrays: rebuild against boost-1.73 --- srcpkgs/luxrays/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index c750c684100..10dcbcc85f8 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=17 +revision=18 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-devel" From c019912d8b2a00e44027065359f63e79e916fbd9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:35 +0200 Subject: [PATCH 65/98] mkvtoolnix: rebuild against boost-1.73 --- srcpkgs/mkvtoolnix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 75a1e3ec940..323385dd827 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=46.0.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt From a56b494e6c29a62886191211e5368941af19879f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:35 +0200 Subject: [PATCH 66/98] monero: rebuild against boost-1.73 --- srcpkgs/monero/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index cbc57575cb9..366b4d32d2e 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.15.0.5 -revision=1 +revision=2 _randomx_version="1.1.6" # the revision monero uses as a submodule for the specific version _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c" From 79b68e719f45179f24bf40b4c1e747de69e94605 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:36 +0200 Subject: [PATCH 67/98] monero-gui: rebuild against boost-1.73 --- srcpkgs/monero-gui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index fbc5579fe6d..7b09879a13d 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.15.0.5 -revision=1 +revision=2 build_style=qmake hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel qt5-svg-devel" From 18c8bbf3e8650f157ea247f65c1735c8bf0777ce Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:36 +0200 Subject: [PATCH 68/98] mtxclient: rebuild against boost-1.73 --- srcpkgs/mtxclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index 49bfa455d96..8f13a7d9938 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,7 +1,7 @@ # Template file for 'mtxclient' pkgname=mtxclient version=0.3.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config" From e915bd331c4adcfe59b00a0d68d9fe581a8dcc2a Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:36 +0200 Subject: [PATCH 69/98] mupen64plus: rebuild against boost-1.73 --- srcpkgs/mupen64plus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index e8c034d5234..78159a3cc84 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5 -revision=13 +revision=14 wrksrc="mupen64plus-bundle-src-${version}" hostmakedepends="pkg-config which" makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel" From 6d047cc94e5aa9460554d37429e6a1c277a9a152 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:36 +0200 Subject: [PATCH 70/98] musikcube: rebuild against boost-1.73 --- srcpkgs/musikcube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 5ed3f2112f2..c8536d16983 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,7 +1,7 @@ # Template file for 'musikcube' pkgname=musikcube version=0.90.0 -revision=1 +revision=2 build_style=cmake configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true" hostmakedepends="pkg-config" From 117879f705e7de0b1f558332ac71badb780da96e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:37 +0200 Subject: [PATCH 71/98] namecoin: rebuild against boost-1.73 --- srcpkgs/namecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index c68b4a88884..91ae3c35d9a 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.18.1 -revision=3 +revision=4 wrksrc="${pkgname}-core-nc${version}" build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-static From 2c7eef67357943817bc0df169d27bd6a93e17459 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:37 +0200 Subject: [PATCH 72/98] ncmpcpp: rebuild against boost-1.73 --- srcpkgs/ncmpcpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 7aae1c87cb8..42583230e54 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.8.2 -revision=9 +revision=10 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" From 569db58e0e2ce02b739bc86815e2ccdbe5a67aba Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:37 +0200 Subject: [PATCH 73/98] nix: rebuild against boost-1.73 --- srcpkgs/nix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index fc327774af7..b53ab551709 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.3.3 -revision=2 +revision=3 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" From 5a416c15397ce571dce9e31773c2648d5fadaf92 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:37 +0200 Subject: [PATCH 74/98] nuspell: rebuild against boost-1.73 --- srcpkgs/nuspell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template index 9919f8a71bf..5ce33784cab 100644 --- a/srcpkgs/nuspell/template +++ b/srcpkgs/nuspell/template @@ -1,7 +1,7 @@ # Template file for 'nuspell' pkgname=nuspell version=3.1.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="ruby-ronn" From 908b94de54ea09cba9ac70f85e9e872897024f8f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:38 +0200 Subject: [PATCH 75/98] openimageio: rebuild against boost-1.73 --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index bcab0e90b7d..e25652d2ff7 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=1.8.17 -revision=3 +revision=4 wrksrc="oiio-Release-${version}" build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 From 1ce6d978e8153b31fee586a1d2fa1e157e417d81 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:38 +0200 Subject: [PATCH 76/98] openmw: rebuild against boost-1.73 --- srcpkgs/openmw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 8b8adbd3bdc..a5ddd8f6262 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.45.0 -revision=5 +revision=6 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="-DDESIRED_QT_VERSION=5" From 4ce46077340d6e7976840124cf8ac11b1aceaeac Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:38 +0200 Subject: [PATCH 77/98] openscad: rebuild against boost-1.73 --- srcpkgs/openscad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 48af4eafb53..49fed1660be 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2019.05 -revision=2 +revision=3 build_style=qmake hostmakedepends="bison flex pkg-config gettext qt5-qmake" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel From 6c1772e88fdc20d70e124896e3c3cfa63f1c31a0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:38 +0200 Subject: [PATCH 78/98] openvdb: rebuild against boost-1.73 --- srcpkgs/openvdb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index 72fde5bc637..732937b4cb3 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -1,7 +1,7 @@ # Template file for 'openvdb' pkgname=openvdb version=7.0.0 -revision=1 +revision=2 build_style=cmake configure_args="-DOPENVDB_BUILD_VDB_VIEW=1" hostmakedepends="pkg-config" From 0861f7ad4a5aca04d5ba224b84dbb02f1ec03bea Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:39 +0200 Subject: [PATCH 79/98] pamixer: rebuild against boost-1.73 --- srcpkgs/pamixer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pamixer/template b/srcpkgs/pamixer/template index db1914bbabc..5b351ad1a5e 100644 --- a/srcpkgs/pamixer/template +++ b/srcpkgs/pamixer/template @@ -1,7 +1,7 @@ # Template file for 'pamixer' pkgname=pamixer version=1.4 -revision=2 +revision=3 build_style=gnu-makefile makedepends="pulseaudio-devel boost-devel" short_desc="Pulseaudio command line mixer" From 2e56695f787ae1aa109c143902cf4631b2e8ff06 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:39 +0200 Subject: [PATCH 80/98] poedit: rebuild against boost-1.73 --- srcpkgs/poedit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 78b94349d1f..76a0501bc5d 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=2.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From 4879365e25428497de0b1eea538b9c4e32266e1e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:39 +0200 Subject: [PATCH 81/98] povray: rebuild against boost-1.73 --- srcpkgs/povray/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index 30a2baab203..93ab71f8e0d 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -1,7 +1,7 @@ # Template file for 'povray' pkgname=povray version=3.7.0.8 -revision=5 +revision=6 build_style=gnu-configure _v=${version%.*.*} configure_args="COMPILED_BY=Void --disable-optimiz-arch" From d5a4c4c45582b90824460f86fab566d93b2fe64f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:39 +0200 Subject: [PATCH 82/98] pulseview: rebuild against boost-1.73 --- srcpkgs/pulseview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index 975b69054ac..67009dd3111 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.2 -revision=1 +revision=2 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake" From 82b4e383632b978375a43534738a93dfd385af22 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:40 +0200 Subject: [PATCH 83/98] remwharead: rebuild against boost-1.73 --- srcpkgs/remwharead/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template index ebb6eb27ff8..138162cba34 100644 --- a/srcpkgs/remwharead/template +++ b/srcpkgs/remwharead/template @@ -1,7 +1,7 @@ # Template file for 'remwharead' pkgname=remwharead version=0.10.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="poco-devel asciidoc pkg-config" makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel" From cf65b0936821ee449758cf35636fe175295babfd Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:40 +0200 Subject: [PATCH 84/98] rstudio: rebuild against boost-1.73 --- srcpkgs/rstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index ef128b19569..b685370555c 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.2.5042 -revision=1 +revision=2 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_BOOST_SIGNALS_VERSION=2 From 85a8d3315c93544cebe54f2bc87ee171e7232527 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:40 +0200 Subject: [PATCH 85/98] schroot: rebuild against boost-1.73 --- srcpkgs/schroot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index 85416dee5e9..e68c712f99f 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -2,7 +2,7 @@ pkgname=schroot reverts="1.7.2_9" version=1.6.10 -revision=11 +revision=12 _debian_version=3+deb9u1 build_pie=yes build_style=gnu-configure From b1e7e24fbc019b70f34329e642f87d1bda8c954c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:40 +0200 Subject: [PATCH 86/98] snapper: rebuild against boost-1.73 --- srcpkgs/snapper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 47c72069dfc..01951faa32f 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.8.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" From 01b12e3ab998fc67273727b948d271e34ec59eb5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:41 +0200 Subject: [PATCH 87/98] source-highlight: rebuild against boost-1.73 --- srcpkgs/source-highlight/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index 087b8a3ad03..fba9a2d08fe 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.9 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" From e30eb998ec8197c75755e34d0fecbf1aa9ec0f68 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:41 +0200 Subject: [PATCH 88/98] supercollider: rebuild against boost-1.73 --- srcpkgs/supercollider/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index ce3e204a007..7624e2771a5 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.10.4 -revision=1 +revision=2 wrksrc=SuperCollider-Source build_style=cmake configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" From cfe2204350298ae04bd3532fe6a8ef2b18fe15f5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:41 +0200 Subject: [PATCH 89/98] supertux2: rebuild against boost-1.73 --- srcpkgs/supertux2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index b58e7f27e68..b42c9d598d0 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 version=0.6.1.1 -revision=1 +revision=2 wrksrc="SuperTux-v${version}-Source" build_style=cmake configure_args=" From 1a00da2386e1f1001efc76f0e04a136c9dea44eb Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:42 +0200 Subject: [PATCH 90/98] synfig: rebuild against boost-1.73 --- srcpkgs/synfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index a4a11942dc9..10f9570d880 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig version=1.2.2 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" From 981e491f06053e8f7e071cf093c80044ae4d4357 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:42 +0200 Subject: [PATCH 91/98] tmfs: rebuild against boost-1.73 --- srcpkgs/tmfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 1dbed3e0eb7..ed4fb5fed83 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=7 +revision=8 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" From 115bc99b6c35725d1021b3fe77bbcd4d347e892d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:42 +0200 Subject: [PATCH 92/98] tomahawk: rebuild against boost-1.73 --- srcpkgs/tomahawk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index 3910267caa8..43348e53c91 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=20 +revision=21 wrksrc=${pkgname}-${_commit} _commit=00f602e10203b76fc28b4615868c567e6bd4ced4 build_style=cmake From fdb65463f77159e363c3a236463dee64898a1414 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:42 +0200 Subject: [PATCH 93/98] uhd: rebuild against boost-1.73 --- srcpkgs/uhd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index b0484732ea9..4c85dc36008 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,7 +1,7 @@ # Template file for 'uhd' pkgname=uhd version=3.15.0.0 -revision=1 +revision=2 wrksrc="${pkgname}-${version}" build_wrksrc=host build_style=cmake From f2d03d11334d8b9e26b9577f96889a369b3b9a9e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:43 +0200 Subject: [PATCH 94/98] wesnoth: rebuild against boost-1.73 --- srcpkgs/wesnoth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 6e506b6e44a..b5770fa2995 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.14.11 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" From 784577decb83b82becdc773d174d8ce0c9b48a07 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 14:49:43 +0200 Subject: [PATCH 95/98] widelands: rebuild against boost-1.73 --- srcpkgs/widelands/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index d8c8e996047..798a45847c3 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -1,7 +1,7 @@ # Template file for 'widelands' pkgname=widelands version=20 -revision=3 +revision=4 wrksrc="${pkgname}-build${version}" build_style=cmake configure_args=" From 3d96f7a4e3c58034dcb3bc1d61c23fe7a06b4ed0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 18:42:02 +0200 Subject: [PATCH 96/98] leatherman: rebuild against boost-1.73 --- srcpkgs/leatherman/patches/boost173.patch | 93 +++++++++++++++++++++++ srcpkgs/leatherman/template | 3 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/leatherman/patches/boost173.patch diff --git a/srcpkgs/leatherman/patches/boost173.patch b/srcpkgs/leatherman/patches/boost173.patch new file mode 100644 index 00000000000..6f9f1740d89 --- /dev/null +++ b/srcpkgs/leatherman/patches/boost173.patch @@ -0,0 +1,93 @@ +--- CMakeLists.txt 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 18:46:49.066859724 +0200 +@@ -61,7 +61,6 @@ + add_subdirectory(locales) + + add_leatherman_dir(catch EXCLUDE_FROM_VARS) +-add_leatherman_dir(nowide) + add_leatherman_dir(util) + add_leatherman_dir(locale) + add_leatherman_dir(logging) +--- util/CMakeLists.txt 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 18:47:30.917839499 +0200 +@@ -1,10 +1,8 @@ +-find_package(Boost 1.54 REQUIRED date_time chrono system) ++find_package(Boost 1.54 REQUIRED date_time chrono system nowide) + + add_leatherman_deps(${Boost_LIBRARIES}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) +- + if(WIN32) + set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") + set(PLATFORM_TESTS "tests/windows/environment.cc") +--- logging/CMakeLists.txt 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 18:57:24.405235681 +0200 +@@ -1,10 +1,9 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex) ++find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex nowide) + find_package(Threads) + + add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + + if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") +--- file_util/CMakeLists.txt 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 18:58:57.998279699 +0200 +@@ -3,7 +3,6 @@ + add_leatherman_deps("${Boost_LIBRARIES}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(util) +--- execution/CMakeLists.txt 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 18:59:20.269971679 +0200 +@@ -1,4 +1,4 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.54 REQUIRED COMPONENTS nowide regex filesystem system) + + add_leatherman_deps("${Boost_LIBRARIES}") + if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") +@@ -10,7 +10,6 @@ + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(util) +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(file_util) +--- util/src/environment.cc 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 19:01:46.227582548 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + + using namespace std; + +--- file_util/src/file.cc 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 19:03:19.282695078 +0200 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include + #include + #include +--- util/tests/environment.cc 2020-03-26 21:23:09.000000000 +0100 ++++ - 2020-04-30 19:05:03.589134579 +0200 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + + using namespace std; + using namespace leatherman::util; diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index cf8785bcd17..80bc93352b9 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -2,7 +2,7 @@ # Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman version=1.11.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel" @@ -12,5 +12,6 @@ license="Apache-2.0" homepage="https://github.com/puppetlabs/leatherman" distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=38fe9a272fec824c503a9dc91b79cfe6e05b868e55fba9977de9baff5ad1be7e +python_version=3 CXXFLAGS+=" -Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy" From a93b531ee11960bdc8c93c8ae98931fa23255092 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 18:53:35 +0200 Subject: [PATCH 97/98] cmake: update to 3.17.2. --- srcpkgs/cmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 8f4ec994780..c08df92dbae 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.17.1 +version=3.17.2 revision=1 build_style=configure configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake @@ -14,7 +14,7 @@ maintainer="Nathan Owens " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=3aa9114485da39cbd9665a0bfe986894a282d5f0882b1dea960a739496620727 +checksum=fc77324c4f820a09052a7785549b8035ff8d3461ded5bbd80d252ae7d1cd3aa5 if [ "$CROSS_BUILD" ]; then # XXX ugly :-) From d3f4f0b7364e737a23e1f1873368060aa04a1a91 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 19:08:19 +0200 Subject: [PATCH 98/98] cpp-hocon: rebuild against boost-1.73 [ci skip] --- srcpkgs/cpp-hocon/patches/boost173.patch | 17 +++++++++++++++++ srcpkgs/cpp-hocon/template | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cpp-hocon/patches/boost173.patch diff --git a/srcpkgs/cpp-hocon/patches/boost173.patch b/srcpkgs/cpp-hocon/patches/boost173.patch new file mode 100644 index 00000000000..291d859d499 --- /dev/null +++ b/srcpkgs/cpp-hocon/patches/boost173.patch @@ -0,0 +1,17 @@ +--- lib/src/tokenizer.cc 2018-10-11 18:55:40.000000000 +0200 ++++ - 2020-04-30 20:07:30.043926654 +0200 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + #include + +--- lib/src/path.cc 2018-10-11 18:55:40.000000000 +0200 ++++ - 2020-04-30 20:11:02.119540632 +0200 +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index a1e6f428fa0..66e9e0ee130 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.2.1 -revision=10 +revision=11 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman libcurl-devel"