* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
@ 2020-04-21 17:12 ` ahesford
2020-04-21 17:24 ` ahesford
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 93222 bytes --]
From 29d1491f7a6a81b9261669266c4a1735335328d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..df832a4166a 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From 302f80b0df80313cff1ab737832ea317ab87cdd7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..18605b317bd 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From de4f201b5b9c19e69ed34bbb79e6c16f6caa3c8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..462f5304686 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2
CXXFLAGS="-Wno-narrowing"
From 8676089dc2c4fa99d48dfd03cfa69a4917ff7566 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..ab6016afe33 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 2d85fd275dbb777742166cc48e18a8f100a00d78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..da1e2ff0ded 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From 3b7c66e4106403e5e4500a53c3be5947dc79aabd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..68daf050f80 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From 1f88684f059ec68b7e5851622a66f002c9385038 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..38ea526bd63 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2
do_configure() {
cd ghidra-Ghidra_${version}_build
From ad131da70d72727c9696c03640128454d4aba704 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..c9e5fbc653b 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From 3a0bd74975c697dde285d3b628d2eca7e6498bd3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..72583eafa79 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -7,12 +7,13 @@ hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2
# Package build options
build_options="qca"
From b734d92fa525dd71ec75091a4d9d74f005cf386d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..6e4bdb5f36b 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From 572b67ae65f1665c7fa86884df3cb8dca4d48a7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..21f79e21c33 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From f1c20c45f022a84f1ca6e2861c48893228d8b32d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..2be00447e97 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -3,12 +3,13 @@ pkgname=linux4.4
version=4.4.218
revision=1
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2
nocross=yes
nodebug=yes
From d7cb1c394831904b3e63a0fd1e6e4730546a8179 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..590b7758194 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From 93f600cbb182bdb9bcdb2034d693566bc16a8009 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..dc00acc5e52 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From 0a1dea214e108841c038d92e6423724d6bd1c761 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..b6c3dfe2bb2 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From c01109e1d5f1f67163af0cd397e730a28933ed3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..a565e0c062b 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From d9393f8668b09189777f899b69d56cd3ce1078b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..d835970330c 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From 138cfe284c11866bc49e58c8429e0aa53f5a7be2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..64a4f793827 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From c227243648fa9a1d3714c3227959b1e60f764a09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..5be053a870f 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2
alternatives="
vi:vi:/usr/bin/nvim
From 60b860e326f3f2ae9cd4ec319213c1933b80060c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..b2116171500 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From f7055016aa393f26e528576b4d8a521772bbf291 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..b5960d9fb50 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2
do_install() {
vmkdir usr/share/$pkgname
From f378a3265aae43cd884aeb11e5e6577827f314fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..a70a73b74d2 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From 10831f8b3de43b094d0f796d895e95bb720a29ec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..018ba319a0a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From ec4c01aab5be9bbec4c007da7f01e47055ea4b6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..b9aeed1bca8 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From 6df04da8bc8ab9e46f0242b5fd6c56be7ee909e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..3a4ac42db8b 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,4 +1,4 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
revision=1
@@ -6,12 +6,13 @@ wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From f7398c05fadb28d8fc0b4a1218473c14f51076f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..2cba01a0183 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -2,7 +2,6 @@
pkgname=telepathy-gabble
version=0.18.4
revision=1
-lib32disabled=yes
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2
nocross=yes
+lib32disabled=yes
From 19e922cbb832ea3961bd7ff6017c507fad6e1492 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..4b64b27c4b6 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From 7483a9b172ff0fac0062fbe4f8ee81f372079f39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..9167d0ad7b8 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From fb9fccab7fa533b6ca0b0fa413a070dd135ca1a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:48 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..34a47cc9952 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -5,12 +5,13 @@ revision=5
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From e47b843781ff0e968be00d2300a6460a0865de4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..f87cf3b1c5c 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From 0a6cdccb85137bb72ca4845fb66b67b9367f8523 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..ad4bee8b18e 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From 329cb1c5836457f44b387235b1c567ed08264b83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..b669493e1c1 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From e7eb4d22003ef56262e6ce6e480c86163cd23722 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..bef977b7c5d 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2
do_configure() {
mkdir build_dedicated
From 5d33b2716d41903d6cfaa58d22464e92b04ef7c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..0dbdc7095ce 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2
make_dirs="/var/log/atop 755 root root"
From c8b48fd1a86e20a071059b20a2c1e00d89e5ad07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..bf85f87eb6b 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 30a8292999f419e006d9179f3f27a0330e173f72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..aa21cd65742 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2
do_configure() {
cd bmake
From 9c0ae22347607765f6de11690c944046067d55d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..4489a23fcf6 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2
From 6d33f0fc060f3a5944cfc891250d02bdd913b75b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..80ff41b62ca 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From efaa0565fef74c7dd0189b9cf94f1cb14d1ee524 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..69370ce1ce0 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2
nocross=yes
pre_configure() {
From 32372c0e62e23498f977d7d66ee1b7b702c0998a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..aa03fd2f959 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2
pre_configure() {
autoreconf -fi
From ebf3d61ac40b0379344bf2899a32af88c19fbe01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..7d2f1990755 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2
post_install() {
vlicense COPYING.TXT
From 850bb37725e8e97fd8ed95b2ba065e95d3bdf57d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..7193ffbeec2 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From 51778abe5afd0b07ecd35785a70a201927a4cda1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..48ffd35347d 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From d3912e86b8b78a1a106ed8c6b0741939e132cddd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..4efb382f241 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From 63f1e6411357d96702fe54c26c0deb2ebf58a50f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..a8ba53e200e 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2
do_install() {
vmkdir usr/lib/eclipse
From 745a75b48ce8c995cce03983e8c0c155396cc750 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..6e61d1e7dfe 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From 24a9b314c8dd25c85817eef8f47a997d4a5d7f26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..f854af7deb8 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2
pre_configure() {
autoreconf -fi
From 6291f01d223f3a81f9e81eb5f0123b64133a9263 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..cfe3d95548e 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From 4e902c0ec9f43e2dac3e9f581704497626d81869 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..c0bbf3e9c56 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2
From 47b6840d25f044d3949ffc39d4ab43af1ea1b17a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..1f224dd1c76 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From c8e86be3a6190fdaf08ac325d10880349a132d31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..37b0f675793 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From d429e7fe6e2c50709b93f1fe178936d0451940be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..7720fe625f2 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From 7ef6121968a8ec4ac64d6ad026ffd66b5bad90aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..046ba51b0ef 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From 44140abbcb9bc48928ec458364715571a3b38fe6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..84d3bd144f1 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2
From a5abca70d1b1014618d5d275f851e3b370988cef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..dd485108550 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2
do_check() {
: #requires xserver
From e2f92f9199b6fbe990d7719e8dd16e12a2437421 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..b49607599b9 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2
From b1352bc8c6c99c9ae10cf84de8a3c52a9392d39d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..2b5163f6701 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From a397c742e78a2959217c981021917d5c23e0d91a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..1f0d5cb4286 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2
post_install() {
vlicense LICENSE.TXT
From 54e4086c470fd3bd65d80716f7c4cb3df5214a1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..77b726aaf1f 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From e58077f90465f3d327ed11c5c686d52405fe807a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..47e0046133c 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From d22987d2c31cd2e2c0ff1d6ed866055a187ae5ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..8575cb4a2d8 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2
From 320808130e1452ea19c50c75ab553b6f72b6e7f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..8d1a2da59ff 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2
From 1abe41b8dd32acb124ffe9e39dfe1558bb142c5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..9c15df374f4 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2
From 0aa96b09ff1eedba29cc2ce7982de601821a3e3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..f56a160fec9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From 66c84fa0db4632917e3b6f39c9068ba233379f8c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..1db8aa41265 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From 426f9d3176d498ee190bb3d91ccbc3f2c93be44b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..09289d38048 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2
build_options="gir"
build_options_default="gir"
From 318bce35321a94dba7c1d2c7d0b1340d65aa56be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..3c2d714f788 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From 2fbfae49b6152df59da50c903d0bd3a064149295 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..b8810c3c181 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From ed336fbe21059b17b2c322ad010a6f398cbb4833 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..1ba56395d85 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From 9e908d30866494c271bf48675f42d0ba6019cb23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..5f92c310624 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 9b7b08d2bd3fd25996c3c76b8a825464b7186b70 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..6ad19d20bb1 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2
lib32disabled=yes
post_install() {
From 97873d98298779311f874293bd24195a2d3a2115 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..6c0426f7ccc 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2
From 10a63438dfa4a5d10b375f229e91202ee9daaafd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..817eb143777 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2
conf_files="
/etc/mc/filehighlight.ini
From 6482c6592201a72f4bb98882f410942f2ab52db9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..88625214944 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2
system_accounts="_mfs"
pre_configure() {
From 38fc3c377825bd73b05c212ed58e0a1f189ee444 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..d063c82bf50 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From d364f0604ebac7721b54ea3db0f95a4e86ad73b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..f51fa69b172 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From a81f37cafd2ebb6ab092690ee28c4febb0d5d59b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..70ed5941bff 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 400744ccd161ea3418bef3d059ea3d6a3ddfc3dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..2f8e9bd83fd 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From b534a8576ca2b0177eb708446f0b1f238482423a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..507fc578173 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From bbaec03deb59a1bedf151ba4853d63ddb34c9c1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..2a684d206cd 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From e4548e3800d1cea163bd02331633604e938776b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..c277f361c4b 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2
# Package build options
build_options="svg"
From 7364c4f418dc8d7e02b44fdf360807ca4583d8a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..240ebc15703 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2
openconnect-devel_package() {
short_desc+=" - development files"
From f53e8569abea0d6758cd84dcfd62409a81e03856 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..74272addedb 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2
post_install() {
vlicense LICENSE
From 48bc39fc8bbab8c14d4c481adcac5d28bf021518 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..e34d648a16c 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From 657ba24b5d060030e05b7096e749ba74c153eadf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..699747e82c8 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 7aa1d6a79a948c459bc26ff0f085319fa4d33258 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..82272abcb99 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2
pre_configure() {
autoreconf -fi
From 920287b676565bc3759835010b15fbc5a4197b02 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..cdac36f947b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From fefc441a6574f1bfe54bc7fa50c5c307d564a2f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..bd73daf145b 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From 8c6474fe558167180090a2e4a3c9704cb96a78a7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..5bfccf0269c 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From b8606e898a90b3656cacd203b76629b7a77a35d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..4ed52a5f301 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From ea5e2df6fee9a63426da8a8417188cb28c4e1e33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..c016f919758 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2
nocross=yes
python-rrdtool_package() {
From 0bee4f0f3a0240d3f5c45691c80a72ea39c0b027 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..3c2dd0d7b30 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From a3fd5331a0c1d495d5165c0e7d89f4a6b710999d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..e09a7ad34fa 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2
nostrip=yes
From 82fd0461f4eaa8dd905d9a1af84ee6f80a2fd35b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..babdbbe4ac3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 4d98e213bb8f01d3dd207e07b22434cdeb4a98c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..739f100ada0 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From ee952ea69b6215812aad9a8bf0618a642ff8bc67 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..43a2edd7c52 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2
post_install() {
vmkdir usr/share/${pkgname}
From 6ca32e11576874f80f9976a6124da7d81c6b1be3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..cf0f288fb46 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From 181803819e94c9e051cf9f6469d9ce46555d9a36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..f1d3736e16f 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From 28270619eccdd2d498bc693c8a1d58a53351fb96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..e4374bec69a 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From 87da72b472ffa57ad7510bba7b7ebf80df825cf6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..9c679f99fba 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From d9d39aff3ad5862f6b6a318455962f40d0bc6bb8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..8749d6efef8 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From f2099339ea12690764cf90aafc3fa9c1b0c9f1d6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..489291fcd60 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2
post_install() {
vlicense LICENSE
From 25ebb2320da285bb3df8fd68d07e1656bb38d014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..fa0cfcb6c08 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From 024a0ccb1430414839afe6602072f72cb41517c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..790b3a9f474 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From 016d8b2798ed711f19e716febe2d2a96771b1b9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..28ae1421029 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2
post_install() {
# Tries to install to /usr/com/currency.units
From b5ff37fec29e3b5477aceb684c1b0d61c1cbb94a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..637e2057959 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2
From ff38b394988f438e94acbc194e663df1d02d4ed5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..83961262366 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From 3fb90d151b9ab01526a08197f29c59ec8ffeed47 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:29:53 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
2020-04-21 17:12 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-21 17:24 ` ahesford
2020-04-21 18:08 ` Vaelatern
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 93515 bytes --]
From 29d1491f7a6a81b9261669266c4a1735335328d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..df832a4166a 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From 302f80b0df80313cff1ab737832ea317ab87cdd7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..18605b317bd 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From de4f201b5b9c19e69ed34bbb79e6c16f6caa3c8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..462f5304686 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2
CXXFLAGS="-Wno-narrowing"
From 8676089dc2c4fa99d48dfd03cfa69a4917ff7566 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..ab6016afe33 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 2d85fd275dbb777742166cc48e18a8f100a00d78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..da1e2ff0ded 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From 3b7c66e4106403e5e4500a53c3be5947dc79aabd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:45 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..68daf050f80 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From 1f88684f059ec68b7e5851622a66f002c9385038 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..38ea526bd63 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2
do_configure() {
cd ghidra-Ghidra_${version}_build
From ad131da70d72727c9696c03640128454d4aba704 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..c9e5fbc653b 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From aec094e7d70af885306cf201e8f82cad61858709 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..6ff90904f06 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,18 +1,19 @@
# Template file for 'konversation'
pkgname=konversation
version=1.7.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2
# Package build options
build_options="qca"
From 9b5cdf565979a6ae368c719a1a135efa76d24725 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..6e4bdb5f36b 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From d74db3bf6b437ee1bd4c9730d539f5a0f524672a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..21f79e21c33 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From ced44f524c676a77f472f1dcf493647a681e1f1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..aecb56e2575 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,15 @@
# Template file for 'linux4.4'
pkgname=linux4.4
version=4.4.218
-revision=1
+revision=2
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2
nocross=yes
nodebug=yes
From 4dcd17601d3d9a2e594d16f2e0f18e4475f75d2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..590b7758194 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From cc5eb329579f003882b189974af40ab9c50442ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..dc00acc5e52 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From f7fecdb3f466d114d4e901a19258e825fe7b2a30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..b6c3dfe2bb2 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From a32f732a73973f8182fbf513210f266d95929d61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..a565e0c062b 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From b0b1f174d05f35d75282edec5de81fd3a1b916a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:46 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..d835970330c 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From 5df00822a7bfe2968431cb51078030fa60cc1511 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..64a4f793827 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From 1549355902fb6c34fc44bd8dd09c7641e90350fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..5be053a870f 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2
alternatives="
vi:vi:/usr/bin/nvim
From ae7360cec839f5164f90738555df1494a628ed79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..b2116171500 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 37f7059cab1d9a28a9590fcf37be6107f6993cf3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..b5960d9fb50 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2
do_install() {
vmkdir usr/share/$pkgname
From e1e773d2b51c3d781267c1ed9a5846a00f3b9562 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..a70a73b74d2 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From 1abd642574243b3e341a43626135b22866778610 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..018ba319a0a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From 951ebdb9a3221343fd74edae4cc8047f96b6d57b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..b9aeed1bca8 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From f8ac09a83712a4bf470aa5806f51ed18113cecb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..4340ec26f14 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,17 +1,18 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
-revision=1
+revision=2
wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From a25231ffe749cc251c6f54667acfaf9a42845b07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..c1ea1725bd3 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-gabble'
pkgname=telepathy-gabble
version=0.18.4
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2
nocross=yes
+lib32disabled=yes
From 1c27aa20760a76ef23883f28848a93303b4cccb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..4b64b27c4b6 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From 928b3d9156f4ba1351b0c999414846afa5e8ff29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:47 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..9167d0ad7b8 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From d49cdb9f1b68336c749d4fee69f4a220afa25ca7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 10:53:48 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..fe12c2e1147 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,16 +1,17 @@
# Template file for 'wmii'
pkgname=wmii
version=3.9.2
-revision=5
+revision=6
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From 854cbe41496a9f266e7394b0f526f313a9842856 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..f87cf3b1c5c 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From a946bf223210772dab4b40a930beea548dbcee49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..ad4bee8b18e 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From d61681b26f0d9c4d9dc6f16ecda2c50639cb21a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..b669493e1c1 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From 7ee4f6e10284f2416e881d8f966e6951bc747b2f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..bef977b7c5d 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2
do_configure() {
mkdir build_dedicated
From 551f4f796429ed681c6173f9dd5f09d754af9401 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..0dbdc7095ce 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2
make_dirs="/var/log/atop 755 root root"
From 2a4b457215c3d75626b0ed92ff52a43d877584e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..bf85f87eb6b 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 3cefb5af7e2da250b5ae726e86282e5010c2a11f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..aa21cd65742 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2
do_configure() {
cd bmake
From 8ce0d9580949dba242394c005e9c82e1c34886ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..4489a23fcf6 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2
From c5b6f3a90006e20cf89cd2d593ed7e06ae8e2287 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..80ff41b62ca 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From 1d755d73dd10f3a1a0d1fe750103fe56f263f9c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:53 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..69370ce1ce0 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2
nocross=yes
pre_configure() {
From efa0fb656b688bd04c8ddf81f65cd4b216c85ccb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..aa03fd2f959 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2
pre_configure() {
autoreconf -fi
From f018926d5066de01d7349b3492fbb03228bc2acc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..7d2f1990755 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2
post_install() {
vlicense COPYING.TXT
From 7d4a9f4023aab6ba607f6c857adc5f699ceb7df4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..7193ffbeec2 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From f62951cf3a3a528f4f8e8d006e63175fbdc61ec8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..48ffd35347d 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From c54090539c6424d5d6dcc36df83ff7dd289d10b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..4efb382f241 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From 16fe228d2feaa1134a3f5edc339e20a49b4b79d6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..a8ba53e200e 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2
do_install() {
vmkdir usr/lib/eclipse
From 22fb05155db4b1103a735db430d2b621f705b1f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..6e61d1e7dfe 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From a749eca41f27517b246dd854b523f47a8955182e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:54 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..f854af7deb8 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2
pre_configure() {
autoreconf -fi
From af928b7a436b1404c63450bbe7df7e0cee47ea79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..cfe3d95548e 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From 6fca622889afc8dffb4385e71d1c415b767bd827 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..c0bbf3e9c56 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2
From b724ddf7fe0165fe480b1cb10d55ce07223f31af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..1f224dd1c76 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From daf35f49d118138eb31beb300bef0ea3ec171e27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..37b0f675793 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2
nocross="tries to execute target binaries"
post_install() {
From 7069368790da993539ecc1a92493d4bbdeae5006 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..7720fe625f2 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From 36785b7b0146ca8604c9a0162056bc0ae0ef2165 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..046ba51b0ef 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From f0fdf8380a0b90f6f21ebaf88e406105ba2c269a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..84d3bd144f1 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2
From fc26a296b2d947fcdda67d84a6da673b686cf6d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..dd485108550 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2
do_check() {
: #requires xserver
From 3a8676ab4157b78f0f45a803c8dea4c67f4c723f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:55 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..b49607599b9 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2
From 799a57836da8f7a4718432a287a668dd30005c87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..2b5163f6701 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From 754200caba02d045648484bd729b47f7e41c2c5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..1f0d5cb4286 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2
post_install() {
vlicense LICENSE.TXT
From 23ec116bf824ff9418cabbf734cae32669f0e100 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..77b726aaf1f 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From 2e00d68ce90f0bdb2d9d65f2279147e711121319 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..47e0046133c 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From 87b5eaa4ec11175a342b38190afbdc58edd680a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..8575cb4a2d8 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2
From a44805b49a5c3782f41e4719825211955562654e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..8d1a2da59ff 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2
From cb9508b637de1a08dd985c20b9a059af7bd5e2f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..9c15df374f4 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2
From 1b482e68be592468471ea65bbb5b3c50ede8a809 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..f56a160fec9 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From 4bde446f59748910831d287b9a90f67f328e7897 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:56 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..1db8aa41265 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From 097aeff4c95811594e75668360ad7972e4f74f41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..09289d38048 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2
build_options="gir"
build_options_default="gir"
From 43d5e5a2e28ea002a298649d07de060f14e91673 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..3c2d714f788 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From d370aca92f9a70fd59a8745da3736f8c5f80d880 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..b8810c3c181 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From 79aec4775b3bd7c9f8a7b9acffd0dc703ceaaa0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:57 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..1ba56395d85 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From ca1b3484ffbb57a43a3d1a2a51d8d1ede8e96081 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..5f92c310624 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 717b02beb2de19f78b53f0429c25b84bdee9b057 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..6ad19d20bb1 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2
lib32disabled=yes
post_install() {
From 87367c68d837d4a022687b08fe8c77ca39d6fc5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..6c0426f7ccc 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2
From 361ef897b0a0bbf40aaddc54853d7471e0ada0a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..817eb143777 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2
conf_files="
/etc/mc/filehighlight.ini
From 663c52b4a2a8e9b18b6f5430cf746d141bdb8c2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..88625214944 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2
system_accounts="_mfs"
pre_configure() {
From 1702cdd0785dff78d3fa412f627381f90e863563 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..d063c82bf50 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From 7681fe28e901813a3af5ffc30800b0a491b8ee5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:58 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..f51fa69b172 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 3c9f58b1c5007d6eda0a28c92f135415df0c24af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..70ed5941bff 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 7e87985e60ae4ace1bf98c9ff14318d2359a1765 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..2f8e9bd83fd 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 6b3665ed0f2531503450b7297f6662cc2e4c5235 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..507fc578173 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From 6bff2baf0468c3780780d515cff7bb14e367efb4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..2a684d206cd 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From f1db30c52497995fb2ab05d5b2127055336e2582 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..c277f361c4b 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2
# Package build options
build_options="svg"
From 88e46222efc52dadf0dab7a41ee7f5ef11351b12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..240ebc15703 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2
openconnect-devel_package() {
short_desc+=" - development files"
From 4b964c53378d90d37fa13fb5c362ac7e5f8b7d03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..74272addedb 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2
post_install() {
vlicense LICENSE
From 83f9f1ea045d201173d477fb7ddb30cfd8ac84bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..e34d648a16c 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From edcf8eba158e1629e592b102c3a40e48447ebd97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:07:59 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..699747e82c8 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 339865ecbf4b040242d847efd1c73abdb8ee0c13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..82272abcb99 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2
pre_configure() {
autoreconf -fi
From 8f12f52a82482d0c942a26241f25dcab90b7bd40 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..cdac36f947b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From 0807cffadc14feb3f287ea29f93e9651853eacad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..bd73daf145b 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From abc0a16e41c90ce8eaa6474e7278737d68ee581f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..5bfccf0269c 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From 25ef77ed6915a0ba9a0ba1b6ce997122c6b74320 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..4ed52a5f301 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From 3e1da210fd21faec2ac957b3073d73b45af5f7ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..c016f919758 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2
nocross=yes
python-rrdtool_package() {
From a2ee349145892e59afd15d8e724ad5882dff0cac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..3c2dd0d7b30 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From 83e9a477e1c6abd81a27202531c6cf2421756752 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:00 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..e09a7ad34fa 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2
nostrip=yes
From ba8d6abfe4f43ecc1368460736464179026ecef6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..babdbbe4ac3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 3952564cd3bfeab21a33aaa6548014ca6113d572 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..739f100ada0 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From a069c3c642289ebecfd5527db77122d2af16a5de Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..43a2edd7c52 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2
post_install() {
vmkdir usr/share/${pkgname}
From b40d26ee51d7890e240d9b2205410d10aca141ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..cf0f288fb46 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From 8885d6497f198cb14b3fe13f5aa2f282a68bb461 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..f1d3736e16f 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From 619cfb32a8cb5b681991939e4eeb4e096ca2b119 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..e4374bec69a 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From 47e078d2f3cf328429e64e5829dbf074911ca32a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..9c679f99fba 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 4259b553949919d6bba440aeee417aa607a921c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:01 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..8749d6efef8 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From a0b04d53e13b6fb9c57d70557e47c480573da396 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..489291fcd60 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2
post_install() {
vlicense LICENSE
From e8716f77a3dcb133f456bca01ef4d56d30af7134 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..fa0cfcb6c08 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From cd155613cd203f498adec13d5df607d28906f946 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..790b3a9f474 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From b15449a8ae03006392f3b14da94327b056540573 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..28ae1421029 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2
post_install() {
# Tries to install to /usr/com/currency.units
From 22c8565924c8b74c4f322bdffc9bfe895d7f8f27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..637e2057959 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2
From 34fb87d3bbbfe0e1d6a041a35c0898072bd42df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:08:02 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..83961262366 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From d99141e19b8979cd737fb7aa63ddb119f53baf6b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 11:29:53 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
2020-04-21 17:12 ` [PR PATCH] [Updated] " ahesford
2020-04-21 17:24 ` ahesford
@ 2020-04-21 18:08 ` Vaelatern
2020-04-21 18:08 ` Chocimier
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Vaelatern @ 2020-04-21 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617325699
Comment:
This looks good to me.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (2 preceding siblings ...)
2020-04-21 18:08 ` Vaelatern
@ 2020-04-21 18:08 ` Chocimier
2020-04-21 18:15 ` q66
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Chocimier @ 2020-04-21 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617325726
Comment:
In templates, it could be `python_version=2 #unverified` to distinguish defaulted, and then check on updates.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (3 preceding siblings ...)
2020-04-21 18:08 ` Chocimier
@ 2020-04-21 18:15 ` q66
2020-04-21 18:40 ` [PR PATCH] [Updated] " ahesford
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: q66 @ 2020-04-21 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617329191
Comment:
what @Chocimier said, that's a good idea
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (4 preceding siblings ...)
2020-04-21 18:15 ` q66
@ 2020-04-21 18:40 ` ahesford
2020-04-21 18:40 ` ahesford
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 18:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 94799 bytes --]
From bef2a8881c21ab92aec5c17b57004135f5e051d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..9340113c23b 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2 #unverified
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From ee4a3987fe605c51c2202456ed76213777415aa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..c4a71024bf1 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2 #unverified
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From 9ed4679b7fe4d3818d4d9a26a2a3c46a8f286d6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..a91443cbc3c 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2 #unverified
CXXFLAGS="-Wno-narrowing"
From ede12f2123a44b762e3e4218e79965ef129455e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..49505193795 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2 #unverified
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 56b67f894a9de157de70bbbb00331c779af492d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..660f8069955 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From bb4fb1b8ecf4b55d2d47c7961eff94ca768a4939 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..352ae9bbff5 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2 #unverified
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From f3c576af33d9c49206ef21df55f0de2036500bc9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..d987431140f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2 #unverified
do_configure() {
cd ghidra-Ghidra_${version}_build
From 25d195497d945f919f4b807ff04bc764f3732c3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..bf1364a9554 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2 #unverified
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From 3bed896f339e7efe7a80b418887ae255a3038598 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..8eea51d8ea4 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,18 +1,19 @@
# Template file for 'konversation'
pkgname=konversation
version=1.7.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2 #unverified
# Package build options
build_options="qca"
From 8001c6231a8602afae2226f8863711a41148c66a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..f9bbef8cfbe 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2 #unverified
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From 59c16917c7146624f72a24414ba7f3458cd464ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..eaf30a9ac81 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From 1ecd5859c9fa07ec9333313a969b218b0ed9ace3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..c32d3532434 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,15 @@
# Template file for 'linux4.4'
pkgname=linux4.4
version=4.4.218
-revision=1
+revision=2
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2 #unverified
nocross=yes
nodebug=yes
From 6ab3eab9a44d173996d8c79e884490e06e999591 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..223860bb2f4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From e62ba02af24a31b299f96ef31ef42a8d65ce72c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..8f40ac4aacb 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From e89745bb778786e8efc73de733cdd2055deea93c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..66ead452a3d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From fb6b7d343a7114d99f9ad9b03403972611a0b9f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..4d62b5ba22f 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2 #unverified
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From d47f55f4f39fb541d1fb02e8b1b422c01e30369a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..7d30388ba39 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2 #unverified
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From ea824854bf5cd3e1097b119573f4ea626e7d8013 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..5bd35e489ba 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2 #unverified
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From f15861f2b071873dcd75f2251e586be38198ac79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..4e361476213 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2 #unverified
alternatives="
vi:vi:/usr/bin/nvim
From 4da118d014a99e6319e18d5d8c6f6ba022944a3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..7b9317f2dc8 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2 #unverified
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 110b9edde3bd436dd28032077ea2019dcf885188 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..02083a3ec5c 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2 #unverified
do_install() {
vmkdir usr/share/$pkgname
From a696fbca4cfef04fdd8748e13063d93a85baec3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..7af458142fd 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2 #unverified
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From 2a9e93838eaeeca23fcd7685c47e7b1f2fbdfd51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..5f9766ae2f9 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From 44285e4605600c2883e1a78e9c84b0ee89753a1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..bc3d44d9428 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2 #unverified
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From a14308dc037c83a90bd090c2cf1538f41fac4919 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..7f1d48acc09 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,17 +1,18 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
-revision=1
+revision=2
wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2 #unverified
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From 7f9c4847ea715969c7606dbbb68363c02623c7e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..7156a96738a 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-gabble'
pkgname=telepathy-gabble
version=0.18.4
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2 #unverified
nocross=yes
+lib32disabled=yes
From 4f188753a8376ab28a4c1365344c57bc2b3c2102 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..075431fcc1a 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2 #unverified
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From a0a7d773e5887a07caafb6b0eec609c6ff199b3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..bca0e7aca34 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2 #unverified
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From 86cefa40909abcfd0b635054fe3364c41ee8f6f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..d04d7470d59 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,16 +1,17 @@
# Template file for 'wmii'
pkgname=wmii
version=3.9.2
-revision=5
+revision=6
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2 #unverified
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From aebbb590cd99716a3f8fa680ab97ba0f7c51febb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..677fff7efc5 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2 #unverified
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From 38e89414f6c9f2c6d413d9a27b81507d30559273 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..d9f68fde12b 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From ac58aeb7ff2c4df95f028b3b4badbb5bf36d9517 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..45593c372fb 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2 #unverified
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From a0dac0aa52ce05d501173976a9734765c4a3eca0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..b6c02bdf7fb 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2 #unverified
do_configure() {
mkdir build_dedicated
From 01806fbe71ca2ffd5ef323bea7628c84452d7ea5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..8c981e65787 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2 #unverified
make_dirs="/var/log/atop 755 root root"
From e4b6597ebce169a4ff88145f4e333a0f6d995ab0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..3458bd484b3 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2 #unverified
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 2b9e2584b64d4af8cf69619db459c399011163ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..ebd99170b00 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2 #unverified
do_configure() {
cd bmake
From 80a00cc63c4e8ca53ba93d860f87a50419f63dc0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..9dc0d982067 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2 #unverified
From 5299266de4c0393887a864e450a6f75244979440 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..a85530e651f 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From 4242b9a96bfe2130a1a367fed240b01e2f43aa89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..8bec5f8bdc9 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2 #unverified
nocross=yes
pre_configure() {
From 39f174c0c49aee4336652901fd2127840071843e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..2fffc648f97 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 0137ea0c97925648d5966a79379c7b40c387cb7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..613f8f39cee 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2 #unverified
post_install() {
vlicense COPYING.TXT
From ccad8149afea63d90c3bb79cdb2293e4e72332a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..e9b9c38eedc 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2 #unverified
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From 60e70f92731bab5cd7e746af72fc8aec0e5f6fbd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..ac9e822ec72 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From 3d8debb9b81129f790183f79ce26c730923f7016 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..42614e599a5 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From 16017538d1e0574722ea3bedbd91c2a09019db7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..6dc98a06c75 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2 #unverified
do_install() {
vmkdir usr/lib/eclipse
From 2ade43aeca225915b1c9a8c997df32993ac641ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..05163cc6ad0 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2 #unverified
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From fb25d67c9d2b64f70c5e15ed14d93f0c46e080d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..e877136d5f7 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From c6742ae9493301abe171fc6f483e3f5b54135cab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..c9f735a541b 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2 #unverified
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From 365183d1245a01172680e2bd3d679880774c772f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..9eea5eb4fb0 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2 #unverified
From 5d37e2c9fdb058abe103d14fbbe922021e5da403 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..024fc662717 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From 314a886663a599f2419463f200667bda4f1b98aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..bccd691a811 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2 #unverified
nocross="tries to execute target binaries"
post_install() {
From 51cd489dc3fe83ce4b09619e20e010b8f395b04a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..a23f876d84b 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2 #unverified
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From 8f0d7d5446ffdc35ad36485460e9848ecd270586 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..39883068d06 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2 #unverified
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From 7be724f1a5f211135ac6017d1bc5de409f3e8f6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..9f0e9dc3a80 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2 #unverified
From 330874184e46a98093430b65920c996c10d62930 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..7b2df2006fe 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2 #unverified
do_check() {
: #requires xserver
From 15b3743bc7492bbdb4a175ad7dad94edc53683cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..82049108ece 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2 #unverified
From aec366d2d4d0052a0f66f310cd07ff31da460bb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..fed24a7e531 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2 #unverified
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From 693d065a3093e8180388da990ac55bb6c6e7ca9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..a33d07095f4 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2 #unverified
post_install() {
vlicense LICENSE.TXT
From 369f3b90406d59a3fc89bccfb2cdd270b7626389 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..45522048afc 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2 #unverified
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From c56db1b1f6044ae69019154c20d6edc61381d8ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..21c23d89d36 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2 #unverified
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From f092589059b8abe95a6fac69f6c6e4851b34a171 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..941803e79ef 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2 #unverified
From 8771d4217b6fcc7b8cee64f8df282a2915ca513e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..66b765a44cb 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2 #unverified
From 28e0a20b723276837c4d3fec981b39660cf868a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..99cdeb2986e 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2 #unverified
From 940c586bbae28bdac07d40e4cd65706b8142f4ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..e32016388f5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2 #unverified
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From e9c2a6997d1e53548380c4ffcbf50173f7c61da0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..d89dc8ac9df 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2 #unverified
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From 0d91cc2a85d89adc9f7f966f8513f026f1b118fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..3af428063d9 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2 #unverified
build_options="gir"
build_options_default="gir"
From 1c06548b9e09bd1cc47be4f944c152b2ffc67270 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..cc74d916644 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From 2a60b2879239f0d81836e3c39609b8ef90d32eae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..ecb36a0d8dc 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2 #unverified
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From 6e96d98ed248805c0bb07e7407273d4a52a75348 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..b635ab6a799 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2 #unverified
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From 185fd4ff81ea3d6eaaf1b772b85c2748a4589a4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..a5822e2be97 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2 #unverified
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 7a256b33321e83b68e878fa5c9409f836dda8f3c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..f4bc17d61c4 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2 #unverified
lib32disabled=yes
post_install() {
From 63a41a872ded8038afa4aa3bab94dddb6460376e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..3141ad54261 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2 #unverified
From 569d155f844d9ee939dbeff5e53ab54ee14e9414 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..b2a4a82349d 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2 #unverified
conf_files="
/etc/mc/filehighlight.ini
From 57e3794626dc973f62c5f8aaf3c2d8e55c28a146 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..1c5b3787d98 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2 #unverified
system_accounts="_mfs"
pre_configure() {
From f621a1d8ef82402c85ca3a5ec3f832d4f440635f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..6d60964ace1 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2 #unverified
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From 7217873c99b79651525e7fdce134679ef5f567e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..ae17643be84 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 3a104d1ce32445c0b7ef7b10e3a7c8f984f35870 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..46bfb77b920 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 540cef51a8f675f04d9872b612ad3a80bf938f99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..5b05948a9e0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 832734a6f9a55b3aa71585618b57410a2ce12200 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..37396577835 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2 #unverified
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From a921b95f26fb427a01c81ea4965eb6681cf47fb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..3b409465c07 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2 #unverified
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From 4ca7af4a7d2cc066b37875ccd8a5c08e33de66e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..fb62d8d4fed 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2 #unverified
# Package build options
build_options="svg"
From b7014fb1f6ce79083282962b7a43d9460c9a1c2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..35f274ed9f8 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2 #unverified
openconnect-devel_package() {
short_desc+=" - development files"
From 2d70fb5c94f8acd8908b71d61454f45e6077987d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..16f8d8b082f 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From fa5c2fbbb55bcaef639099d4b9ad351aaa209d9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..9c2e42199cc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2 #unverified
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From 25f346a7522fa9210f275e99936b1df8df6cad52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..a2668cf685e 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 5c611cd0047ca1168006b0dab15a33cd488dae5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..96cdca543ad 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 014441a0a05cf351ab0d48e7cf24eab065d28fc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..e9e48a87c8c 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2 #unverified
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From 9795e3e31ce5105c46059912366977eaf083e6d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..24cb5bfa089 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From a449096bef1d3326051ee99996b77ee04ebfc19e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..ed30ddeef1b 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2 #unverified
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From 931700c619030ec8308c596be4c9c439559ccb5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..d0c717f8b57 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2 #unverified
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From fc8d79b6cec30bc7c14d56b3ceefd3f681d19222 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..6a5ff2676a3 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2 #unverified
nocross=yes
python-rrdtool_package() {
From d5f9837c74c8ebf945c72655e7d94b9a046bb6cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..c96ce332eb3 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2 #unverified
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From a673c9c3144604be41073b033f28968b7c82eca6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..d0e457f764c 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2 #unverified
nostrip=yes
From ba029ef438f3d2e6f09f389e16517e3424fce5fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..98143972241 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 0e9db327e9298ae2dafecbb1f8f40e9e17c9e010 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..c3a07062541 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2 #unverified
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From c9bb5d02dde59403ee8c79d57e210051251c40a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..f64a5ebf9e6 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2 #unverified
post_install() {
vmkdir usr/share/${pkgname}
From 2e3f810a5c4afa7d3e8f1aace3d4e9aa79da77c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..4deaca61567 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2 #unverified
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From ff5a8342499890c39a72a67bfad1484a81e61074 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..e8e56dcd668 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2 #unverified
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From 2a74d1e52ece788ff241d1d929cd3acccc9514d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..a4d76569dbf 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2 #unverified
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From 5dd6dd0d52238d64585d3f0b9d6a4f7e779bc848 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..823dc0dde05 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2 #unverified
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 5dc6f0d8a7109232c74ce2e5d71503497da676cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..05bd5e14c79 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2 #unverified
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From 3d2788e40f92ed73d51bcbf356ce909cca71a5a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..9095ab7e37c 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From eb3dd87c8df4b8491a2699f8e1e738add6c64840 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..b0484732ea9 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From a3b86497833097c0ee94cb6e8b36e9735bbe35d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..af46e4c9537 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2 #unverified
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From 4b783bd5e05d8995f91c00ba34fc8d20ab3dfc46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..76221833adc 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2 #unverified
post_install() {
# Tries to install to /usr/com/currency.units
From fb1d87505a0a5299cbdfde8fa39383166afd02e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..70f5e6ab78f 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2 #unverified
From 501244480077b4d84124dd08ef19b4a602b4888b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..ab4ec0f9b5d 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2 #unverified
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From 56b4f1490b8bacbdc500b7817f0ac0e902cf7371 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (5 preceding siblings ...)
2020-04-21 18:40 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-21 18:40 ` ahesford
2020-04-21 18:43 ` ahesford
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 18:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 94799 bytes --]
From 1b72957b0d1147af5e64a6aef270d8f1343efc6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..9340113c23b 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2 #unverified
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From fc9d1fe8d260b84cc9c700b6dbf5f2db7cf9405b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..c4a71024bf1 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2 #unverified
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From 15481b4722ce9e7b02010ad644c293712e00e254 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..a91443cbc3c 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2 #unverified
CXXFLAGS="-Wno-narrowing"
From fbca371d237806369910dc7c7a0c301a29e5b82e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:16 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..49505193795 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2 #unverified
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 76bdff47c1c6e1cb7b9bd2c68392fc5ee612a0b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..660f8069955 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From 650732fb44a75611eb53d9a4024109e7ac7c4cc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..352ae9bbff5 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2 #unverified
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From 8dcd1311151d14e64237a09bde19eb6a2d789dab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..d987431140f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2 #unverified
do_configure() {
cd ghidra-Ghidra_${version}_build
From 45409c1684fc8d59dd3076b42d0db457ca00ae57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..bf1364a9554 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2 #unverified
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From 93b626eb8b8c443eb5993a652565897ad5d56b49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..8eea51d8ea4 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,18 +1,19 @@
# Template file for 'konversation'
pkgname=konversation
version=1.7.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2 #unverified
# Package build options
build_options="qca"
From d2a81c26e0a9b4e656099170baa5a39a3e39cd44 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..f9bbef8cfbe 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2 #unverified
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From cb114981d85785bad8dc2dbf06e326bbc9b6d353 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..eaf30a9ac81 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From cb3d297fe258517121ed46891c2dc49aa77b9535 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..c32d3532434 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,15 @@
# Template file for 'linux4.4'
pkgname=linux4.4
version=4.4.218
-revision=1
+revision=2
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2 #unverified
nocross=yes
nodebug=yes
From 8b430472fe422775c913acc49d34891afa70bdbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..223860bb2f4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From 0fbc8d76533703486ef3a296388a84fd2b70dd72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..8f40ac4aacb 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From ea54c6440714c80af7f4a4ebfd35489e6c00e28b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..66ead452a3d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From 71bdd14ec54a2a1e7f077a1dda373217f59d3716 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..4d62b5ba22f 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2 #unverified
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From f66a8f79ceae25d96f788fd7a592b9458013cacb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..7d30388ba39 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2 #unverified
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From cd9e5e270310840a3ace282c96bb34cd5598ee40 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:17 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..5bd35e489ba 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2 #unverified
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From 6edc9d71abdec9bf8fca379940524b5dd4af5610 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..4e361476213 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2 #unverified
alternatives="
vi:vi:/usr/bin/nvim
From d2535d634a1aef3290e1979862ed71b5ce64366a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..7b9317f2dc8 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2 #unverified
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From ee6dd583e0fdf83c517a35de8ba2a1a1f7835c4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..02083a3ec5c 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2 #unverified
do_install() {
vmkdir usr/share/$pkgname
From 5d964891525e77543c0eed9deb8e5feebda13361 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..7af458142fd 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2 #unverified
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From db8ddd5ba114faa4ffc577963c14b44c7d6473a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..5f9766ae2f9 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From 1830b51cf09c7f24452b561d545afe4ad871a988 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..bc3d44d9428 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2 #unverified
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From a4039982f67571487558c58567c9d6937d05f2f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..7f1d48acc09 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,17 +1,18 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
-revision=1
+revision=2
wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2 #unverified
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From ff42edd02671e0a9a71690e0ccbc0544f871641b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..7156a96738a 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-gabble'
pkgname=telepathy-gabble
version=0.18.4
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2 #unverified
nocross=yes
+lib32disabled=yes
From 91c2911a3d2237c614c85b87816a383c38fba541 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..075431fcc1a 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2 #unverified
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From 27de35b233c95fbd413f2254a3b6f0f5a2e192f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..bca0e7aca34 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2 #unverified
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From f725b23f04450807f9bd5e5fa206a08f6b8c1348 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..d04d7470d59 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,16 +1,17 @@
# Template file for 'wmii'
pkgname=wmii
version=3.9.2
-revision=5
+revision=6
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2 #unverified
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From 2f14c80b35151c6f3da11738ba3dee7f8ca7b07b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..677fff7efc5 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2 #unverified
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From fc2d80a97e37ee85b9613c3f36ebaf8b4b808a61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:18 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..d9f68fde12b 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From 49ed78485b260427bbff4f9f25484cd961b0f95d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..45593c372fb 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2 #unverified
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From 028b5acd33bd0c7dfdcdb35928b3241e9700cebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..b6c02bdf7fb 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2 #unverified
do_configure() {
mkdir build_dedicated
From 9cdc85d1fdc51fd7173697ccb2416a9d31789411 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..8c981e65787 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2 #unverified
make_dirs="/var/log/atop 755 root root"
From d093ab3475fb33008088759e11e502388f5770d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..3458bd484b3 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2 #unverified
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 967065eae75c75e9ae48735cbc8ec3d5299a5ab5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..ebd99170b00 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2 #unverified
do_configure() {
cd bmake
From a196bb53497c94bf805e3204bd12e4998af395b5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..9dc0d982067 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2 #unverified
From 0d207715dec42167e4b0a8e7fa8c6c3e6b042c72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..a85530e651f 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From b65e721b14330d53402bbd6a1d54916ecb83cb93 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..8bec5f8bdc9 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2 #unverified
nocross=yes
pre_configure() {
From 54c859832f44e9d55510967a847b78e49ea1d006 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..2fffc648f97 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 38aa6d409332578e417cc9dafff299770e15c9bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..613f8f39cee 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2 #unverified
post_install() {
vlicense COPYING.TXT
From cf2318361e77c2d6d901ed3bdad2b8cab4f2ee19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..e9b9c38eedc 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2 #unverified
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From 42f81b5feeb1a208f9ea3b4f96b8145bb29614e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..ac9e822ec72 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From 61c70346b25028acef9c945bf6bed98ae6d370a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..42614e599a5 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From daad8184d476402805975df7e3710cfa3242d621 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:19 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..6dc98a06c75 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2 #unverified
do_install() {
vmkdir usr/lib/eclipse
From bfe7455346559681fbf7fe3fe748eb28634e0d10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..05163cc6ad0 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2 #unverified
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From b2de9ef0019cb22882a513de8d3711fb6b1df0e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..e877136d5f7 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 9461889c8483916c413b927b36c5fce5e0533d7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..c9f735a541b 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2 #unverified
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From 672d91e1a6f09b8153870cd81a177c5fdaeeb8a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..9eea5eb4fb0 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2 #unverified
From e93c34763d981869dd1eb82e3d410e111ad3cceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..024fc662717 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From 6147cd07150868f0cfafe35d984a10fa46809d06 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..bccd691a811 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2 #unverified
nocross="tries to execute target binaries"
post_install() {
From da36001a7caa3fbd66d361316e575c034b06ac7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..a23f876d84b 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2 #unverified
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From 49b9e52be79bb6f807c8d11876a72f8fe781fd2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..39883068d06 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2 #unverified
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From 1c8c37a23070638b19ad24225ccfd7d90cbe1f59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..9f0e9dc3a80 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2 #unverified
From 77cf2fb7150d9e216e5a6c4df20cbf55a537d18c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..7b2df2006fe 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2 #unverified
do_check() {
: #requires xserver
From c2f7cc2575158865e6a6e1c577b26064daff314c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..82049108ece 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2 #unverified
From 5fb714658f2f6fc7ef8d99eb909639807ec8564a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..fed24a7e531 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2 #unverified
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From 04b57263fefd96092eb81e99204bf0803fa23eb4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:20 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..a33d07095f4 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2 #unverified
post_install() {
vlicense LICENSE.TXT
From 295285d89a3d70b0d3ef51402fe4d0ba72e265a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..45522048afc 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2 #unverified
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From 13d91d92b398076fa831668b4f25702ee894a6ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..21c23d89d36 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2 #unverified
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From 26ddd6d6ed37677a40af56f17ea0ed855ce35ff6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..941803e79ef 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2 #unverified
From 38cc78cdd8e40b84bae4d8e1b901abb76ff64829 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..66b765a44cb 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2 #unverified
From ce83346a56323fefb8901492a513b277b7e4d69f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..99cdeb2986e 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2 #unverified
From c21ed2d11f440a4d432cdb7d050974d343911811 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..e32016388f5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2 #unverified
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From f78597bddbf4f6f2456ce8cfd75caf3a906eb3b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..d89dc8ac9df 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2 #unverified
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From 98fc0d2e7efe37f8ef625f2b6ae19987bf560df4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..3af428063d9 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2 #unverified
build_options="gir"
build_options_default="gir"
From cf93dbc32eb5f45023f0a5ca71bd3a92b436dc9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..cc74d916644 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From 576f1993d692d2a8e4487601c6aa1588aa2b0df9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..ecb36a0d8dc 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2 #unverified
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From 03519af609681bd6d62648859f27e593fd403ddc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..b635ab6a799 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2 #unverified
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From 58a7af90c799b9017da00f067edc07ab75b990ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..a5822e2be97 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2 #unverified
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 0eeebdaed40d89dd7440a26416730a4af737fc0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:21 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..f4bc17d61c4 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2 #unverified
lib32disabled=yes
post_install() {
From a3d2f8a5bec02279a9470ee00b8f5f8bd5cd056d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..3141ad54261 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2 #unverified
From 77b4ddc543be9d0ba1f7749dbd2bb16e9281ad2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..b2a4a82349d 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2 #unverified
conf_files="
/etc/mc/filehighlight.ini
From 035a864b3a5ce077ab992f21424aa9c1d9086905 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..1c5b3787d98 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2 #unverified
system_accounts="_mfs"
pre_configure() {
From a4763bde300c57bea236ca965e2fc59320107dd7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..6d60964ace1 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2 #unverified
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From bba99e3971aa7a832f9f71c392436a099e9a040b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..ae17643be84 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From e75836c93ad1ab663a44d1fd218132bc742ccadf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..46bfb77b920 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 4b0574b80b5b5ebd834d261d521cc1a7fb3ecc7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..5b05948a9e0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From a8dfc68ad42f7038f80e7e3ebb5da2d774303cac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..37396577835 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2 #unverified
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From d55a011c6042b54d886ada679bf4489bc6e97b12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..3b409465c07 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2 #unverified
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From bc5dbbb3c94f8be3a018c2ba95cab37688ea0a31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..fb62d8d4fed 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2 #unverified
# Package build options
build_options="svg"
From ed39ee951163605c7d7fbc414c2f6e4fe1a9a9b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..35f274ed9f8 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2 #unverified
openconnect-devel_package() {
short_desc+=" - development files"
From eeb9312ad846995165f7216c75c2117d58bdd19f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..16f8d8b082f 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From e6f98ccc08048305c0d6c65bced3afd0b08eff71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:22 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..9c2e42199cc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2 #unverified
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From 13f3d5a4e53d6c1fa0256c7f6fcdc6e25f7f4316 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..a2668cf685e 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 666a8e2a019f75f50179ce7a55b5700527bead3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..96cdca543ad 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 7b611529c1ea205a352497fd984ad90c0dffa8df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..e9e48a87c8c 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2 #unverified
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From a54cc6babf20f8befd00f45f08bbf4ec34b95b01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..24cb5bfa089 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From 96ead9675ae946c7e50b698672138008f4fdff61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..ed30ddeef1b 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2 #unverified
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From 9eeb9afe90483c0bb8aaa7bf99524a5751abbe87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..d0c717f8b57 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2 #unverified
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From 7f934e71d5aabb06d4db18127d9487548bbd605d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..6a5ff2676a3 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2 #unverified
nocross=yes
python-rrdtool_package() {
From 18b7fa029c56aa46d0fa20cca7f9cafb34e20beb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..c96ce332eb3 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2 #unverified
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From e47339bcc1b7d3b390a3938e23f29ae8c06bb8dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..d0e457f764c 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2 #unverified
nostrip=yes
From 9d238b717adc8edb8d6df4c8126e1effe9d13a74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..98143972241 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 628491b8922ff1e10cb6c910e6b98d59b6fbb88c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..c3a07062541 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2 #unverified
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From ef693f9379d02bc6479901c2ae444ed80400af36 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..f64a5ebf9e6 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2 #unverified
post_install() {
vmkdir usr/share/${pkgname}
From c59a0499cca7e2a895aea4fe9e7b123bb9fc4e8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..4deaca61567 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2 #unverified
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From 198ebb9a91cf81e8a7e1520610fde002bbb5902d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:23 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..e8e56dcd668 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2 #unverified
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From e7a5ff13125709a58967f45886a02d66dde2634e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..a4d76569dbf 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2 #unverified
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From b60a6c04937168f4a8fa8e6578d28b8e4df93a58 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..823dc0dde05 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2 #unverified
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 3f2e9bfebef1ff91022c1b2677b011218636bc94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..05bd5e14c79 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2 #unverified
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From bd9eb099a5361a4aedf78a5639726c35d7106303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..9095ab7e37c 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From d945b0b4435e18664cafad9303fe5badc5d4ef79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..b0484732ea9 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From 6e9f8c159417d715a4438d8a3106ca3c8d065275 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..af46e4c9537 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2 #unverified
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From 5c9db6e3f26dd8c73809414ce56683cc0e97042d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..76221833adc 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2 #unverified
post_install() {
# Tries to install to /usr/com/currency.units
From efbf07a349abbeb37cb5aa1aa5332bd54d844d75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..70f5e6ab78f 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2 #unverified
From 6618aec42ba3783920cbe004d1df11cb95efcde0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..ab4ec0f9b5d 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2 #unverified
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From 4991860e14baa48cf02ef0ad0dba78206a242882 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:36:24 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (6 preceding siblings ...)
2020-04-21 18:40 ` ahesford
@ 2020-04-21 18:43 ` ahesford
2020-04-21 18:55 ` [PR PATCH] [Updated] " ahesford
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617344505
Comment:
I like the `#unverified` comment. The latest push includes comments on all affected templates.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (7 preceding siblings ...)
2020-04-21 18:43 ` ahesford
@ 2020-04-21 18:55 ` ahesford
2020-04-21 20:52 ` ahesford
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 18:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 94799 bytes --]
From 48a16094ebf778d4ebeca766557358abf6fd83ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..9340113c23b 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2 #unverified
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From bf107fea091a95f9d66931668b878671295fcbaa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..c4a71024bf1 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2 #unverified
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From 4ed1461cbdfb7231fb06763fd2a3db12a97de8f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..a91443cbc3c 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2 #unverified
CXXFLAGS="-Wno-narrowing"
From 4e48da2c53f18fe840e00fa962bff2da91a202f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..49505193795 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2 #unverified
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 260a621b2deeaf5a0489bcbd5f12c1166fc85fcb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..660f8069955 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From 0224ee65147514cd8b166793833a630aebcb709a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..352ae9bbff5 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2 #unverified
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From d0a50a8458fb03691e91e7ef3ec6488aba2d01bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..d987431140f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2 #unverified
do_configure() {
cd ghidra-Ghidra_${version}_build
From d563453aa8ddd3f7c1ca0b2b884108ced4c21f26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..bf1364a9554 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2 #unverified
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From 4dbaa4629fac06d2850e306311307968825aeab1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..8eea51d8ea4 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,18 +1,19 @@
# Template file for 'konversation'
pkgname=konversation
version=1.7.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2 #unverified
# Package build options
build_options="qca"
From 492554f8447031bfa6b4ef79c2f5bdcfa64eda15 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..f9bbef8cfbe 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2 #unverified
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From eb3372e8487d902f7e273704e256628ef5f44e6e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..eaf30a9ac81 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From bf46ebfa7ef0db5178c3fe8ee24211ec01b72f72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..c32d3532434 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,15 @@
# Template file for 'linux4.4'
pkgname=linux4.4
version=4.4.218
-revision=1
+revision=2
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2 #unverified
nocross=yes
nodebug=yes
From a3f7a17d84d5f8df159db42febf33cdb8b13b9ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..223860bb2f4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From f5990aa3cf70a5c6e3b8e6437e648e7628fc43a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..8f40ac4aacb 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From 90f1d5edafcab65ecb4a6e03a023f9c54823c2fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..66ead452a3d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From fd849e3e85737325ae0a6bf7cb439339a343d334 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..4d62b5ba22f 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2 #unverified
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From 4ddb047aa7f335c30939e3d5c8c3fa5296a877b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..7d30388ba39 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2 #unverified
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From ae1cc711b537abb8555be545c60057288b73f5ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..5bd35e489ba 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2 #unverified
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From 1fa6930bf7219b1c0352550728fd811cb3527975 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..4e361476213 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2 #unverified
alternatives="
vi:vi:/usr/bin/nvim
From a88efef60b939e41d231bcf87a24d1d64dd37eb8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..7b9317f2dc8 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2 #unverified
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From c1457e6b0b74a67f6a475c564986de0f51623a9b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..02083a3ec5c 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2 #unverified
do_install() {
vmkdir usr/share/$pkgname
From 04d7a80992040651137fa97208f6b272f395e147 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..7af458142fd 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2 #unverified
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From 5bef7776671e373eb5ba34bc09a1912931757060 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..5f9766ae2f9 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From 80f85d39d1774301799c20e090566956b61fd30a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..bc3d44d9428 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2 #unverified
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From ed2158b1a0a3128d532dfd11719d346fedd8a606 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..7f1d48acc09 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,17 +1,18 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
-revision=1
+revision=2
wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2 #unverified
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From 60587fc241572010830eeb64b9f418803bba741d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..7156a96738a 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-gabble'
pkgname=telepathy-gabble
version=0.18.4
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2 #unverified
nocross=yes
+lib32disabled=yes
From 500ef6eb080a58aeb2a6e813337d7686f126bb5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..075431fcc1a 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2 #unverified
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From d6630950002aeaf1ef6cb1d8aef375010b5320e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..bca0e7aca34 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2 #unverified
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From af0d0eb2c5274ec32e32eb120924032ea431e2cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..d04d7470d59 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,16 +1,17 @@
# Template file for 'wmii'
pkgname=wmii
version=3.9.2
-revision=5
+revision=6
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2 #unverified
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From 5d212e548c054466618650e027dd43fd3725172d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..677fff7efc5 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2 #unverified
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From 59f2e1caf963a640eaccb1338cf720b8e09471c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..d9f68fde12b 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From 6741ec246d65b90db8a90a0cbbfd18ea2c206bbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..45593c372fb 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2 #unverified
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From e8d39bc34ac4a6a18a18e90ea48faa6cacdb3b26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..b6c02bdf7fb 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2 #unverified
do_configure() {
mkdir build_dedicated
From fa8cdb22408cd60336e37fa95fe0fd3fd60fd3a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..8c981e65787 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2 #unverified
make_dirs="/var/log/atop 755 root root"
From 68180237e3877a73b9d1b54a5ad3b4326e1fcbb6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..3458bd484b3 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2 #unverified
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 9cdc42172e33caf3515d3efa8ecfe35fcee91ceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..ebd99170b00 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2 #unverified
do_configure() {
cd bmake
From 4c0580de40e710ca6afde092e590f343905dc6c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..9dc0d982067 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2 #unverified
From 84dd1baffcbbbd5fefb76b93f3a2a036c562d4ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..a85530e651f 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From 4b486ad2a91695388cd738e2dbed78ef4fc52d77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..8bec5f8bdc9 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2 #unverified
nocross=yes
pre_configure() {
From 4bd84cc8e7859bf454dd431a5b17964fbaf478cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..2fffc648f97 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 389443c1b4112dbb71cd569a6e8369eb89aa67e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..613f8f39cee 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2 #unverified
post_install() {
vlicense COPYING.TXT
From 77dd0ff3e889b0e925161775facf8a046fb826fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..e9b9c38eedc 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2 #unverified
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From 912a7a0e2a170b9f72c82e072c159c93e92de16d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..ac9e822ec72 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From 2c19df6c6310a10102d4d25a3abd843152c89fb6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..42614e599a5 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From 7c52af22e3862f5f28d348a0cc2a86a8322b5e50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..6dc98a06c75 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2 #unverified
do_install() {
vmkdir usr/lib/eclipse
From cff5c930c9d0e934251bc7552784138d4628fdd2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..05163cc6ad0 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2 #unverified
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From f4c9d4312ce8e3cb6020bb05bcd2eb13538bd61e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..e877136d5f7 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 197b190040fa0d9ba2d68de205198b8bd7f29cc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..c9f735a541b 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2 #unverified
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From f373f58063e3f43ea8652b30e8c444e4277ed1b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..9eea5eb4fb0 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2 #unverified
From 8cd29c658ba34b6b22c3f185da81e40c872cc799 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..024fc662717 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From 6c9540ad238717cea849a6f50a610b1608ec99a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..bccd691a811 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2 #unverified
nocross="tries to execute target binaries"
post_install() {
From 951f7a1ca45bcc1f3e3d446adf836ae15b49c15d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..a23f876d84b 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2 #unverified
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From b252414bc5281bb3362245899832a0928ec827cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..39883068d06 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2 #unverified
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From 80301d37665eadec33a57afe4a82608cb462be03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..9f0e9dc3a80 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2 #unverified
From a3bd69faa8dab151fd9b134b14aa70201d8721d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..7b2df2006fe 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2 #unverified
do_check() {
: #requires xserver
From ce7804dee4d8f321d85ba0d3a07a9e9469580a14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..82049108ece 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2 #unverified
From 2447d57e07377c946619c8f1667c1a808eae2965 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..fed24a7e531 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2 #unverified
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From 5442acb82b308e38ea0a564fb28cd6b680579e3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..a33d07095f4 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2 #unverified
post_install() {
vlicense LICENSE.TXT
From 088219a6ae22ba9d57cfe4cecb4159c61ee187ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..45522048afc 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2 #unverified
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From d699cb8a5859fcfe203a6c9d4aa09cc80ab35912 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..21c23d89d36 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2 #unverified
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From 524c8ebe5f7d21d1f484ebbed56c7715a62c4b49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..941803e79ef 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2 #unverified
From 261dbbf80f137e1c8190540b5ea35dc6facbebc5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..66b765a44cb 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2 #unverified
From f47aaba4f8bdf984c940c70ca3b679b60a6bb0b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..99cdeb2986e 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2 #unverified
From 3da31aab7c742085625b026da32e70ae6c9e6350 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..e32016388f5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2 #unverified
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From 0ea2990e56d2b30399a40d1620eba7bd23b19eeb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..d89dc8ac9df 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2 #unverified
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From 0a56e9187f33c8650f2361fced0ac1213b3961c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..3af428063d9 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2 #unverified
build_options="gir"
build_options_default="gir"
From 77cf932651d489cd9d0e0e6b32e70b12614838d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..cc74d916644 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From 4ba5065fdbe079d3fa59e8528f19379b013ea672 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..ecb36a0d8dc 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2 #unverified
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From fdf919fe0046531205ba0c0e545f628ecf64d184 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..b635ab6a799 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2 #unverified
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From 92fd38ce5e70e5dd12cd9312e4ea1418c990bebe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..a5822e2be97 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2 #unverified
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 824f099698c94d88fa3eabe23623f233662df970 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..f4bc17d61c4 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2 #unverified
lib32disabled=yes
post_install() {
From e2339e5e35982181ce5e843eb14e2cb314a0f71e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..3141ad54261 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2 #unverified
From 8f8cdb6da5172acd924ce4d4ef73e46a6cdfb60c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..b2a4a82349d 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2 #unverified
conf_files="
/etc/mc/filehighlight.ini
From 28f072adda58cf927e5b68e36bb88c9548e245a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..1c5b3787d98 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2 #unverified
system_accounts="_mfs"
pre_configure() {
From 32dac63ddd9725a7f428c7641eb54cb9ba464da2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..6d60964ace1 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2 #unverified
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From f45a7b5936e209052285b3a8cc5586ddad420d93 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..ae17643be84 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 84bd25f5162344f04a27bf400aa806c53645fd12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..46bfb77b920 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From f91657b1720cc07520f71fc36636d5fc720b7d15 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..5b05948a9e0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 6d0e7285ee8338af8c10c3fedd271c3d48e0575e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..37396577835 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2 #unverified
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From 78c5efb4410176f90391b62601dcc56410266d96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..3b409465c07 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2 #unverified
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From 2a6d66496017528eeb766c1812f648316d17aa6d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..fb62d8d4fed 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2 #unverified
# Package build options
build_options="svg"
From ddd72b54d192e1c264591afe8addc4a8909acdbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..35f274ed9f8 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2 #unverified
openconnect-devel_package() {
short_desc+=" - development files"
From fae3985c2196961b118806c1fe45369b6236a1ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..16f8d8b082f 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From 1bf6a0cc4ff7189c6810bb2ec42388eb913f499a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..9c2e42199cc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2 #unverified
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From e9e93a99a93c55bc2c2903fbf02f9dc0e00c86c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..a2668cf685e 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 89eab0f6e21b91264dbbe5fc698cedaf2eda04b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..96cdca543ad 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 2966c826d1e857c4effd8435e7e5d938dfbae9d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..e9e48a87c8c 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2 #unverified
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From 171f030fa4b99f1474613c2d7d9537dc6e41014d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..24cb5bfa089 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From df661d5fcc7b6598ba583c5244ac5bc924b10001 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..ed30ddeef1b 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2 #unverified
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From 47db8f56105fabfb080213ab6b2cb0ea4a724871 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..d0c717f8b57 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2 #unverified
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From ae7c04df05db40db048668dc45613596d8d5d604 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..6a5ff2676a3 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2 #unverified
nocross=yes
python-rrdtool_package() {
From 1d0421b75851211a68c1ed797374a04e6bda2ea4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..c96ce332eb3 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2 #unverified
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From f4b3de2d286c647b971e51dd13730b93c83159b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..d0e457f764c 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2 #unverified
nostrip=yes
From b642ba3c9237f7b1eeb0fbbfb50a87a522742000 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..98143972241 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 99d35202a8a8cb2f4b3238377e123a7e002426b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..c3a07062541 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2 #unverified
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From 2b996bc988cf136d4dcf899e6894432ce0d73f78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..f64a5ebf9e6 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2 #unverified
post_install() {
vmkdir usr/share/${pkgname}
From 8fd2da6bc08ee83e6b05e983c8719965572bee8e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..4deaca61567 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2 #unverified
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From 1fb7e9f58c8183eaa730672c8cccf5ee65d09e73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..e8e56dcd668 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2 #unverified
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From 570efc22b65cec6f1ff68201015c9586b3d05193 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..a4d76569dbf 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2 #unverified
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From 56b531e4759a1739a0401277e93f6b2379b4f572 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..823dc0dde05 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2 #unverified
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From a0c58c99e431ecee6b7783191c80ac326aea7dcd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..05bd5e14c79 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2 #unverified
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From af29f142e3c5f067afdb7d881766b9838b27da03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..9095ab7e37c 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From 3af556791eeecfbf7c905e3667f81413cd16177f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..b0484732ea9 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From ea75356f187cf9606da42c826413372a62b744a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..af46e4c9537 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2 #unverified
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From 933f6b2c14659ceb8fdb09ac934c57caaf862de3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..76221833adc 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2 #unverified
post_install() {
# Tries to install to /usr/com/currency.units
From c64e0376315764fef4ae1f43ac023523ddf5fc78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..70f5e6ab78f 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2 #unverified
From 7a50786bdc9d6f0f3823796a616e829d7276a46c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..ab4ec0f9b5d 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2 #unverified
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From 7e73c5bc6d6d73574ed15a8b2e9ac1427dbb92fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (8 preceding siblings ...)
2020-04-21 18:55 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-21 20:52 ` ahesford
2020-04-21 20:53 ` ahesford
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2823 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/21209
Drop default python_version in xbps-src
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
A patch file from https://github.com/void-linux/void-packages/pull/21209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-21209.patch --]
[-- Type: text/x-diff, Size: 94799 bytes --]
From b91b4b191a8f249ddf6dce713abc255ae8fa4a02 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 001/108] apache-directory-studio-bin: add explicit
python_version
---
srcpkgs/apache-directory-studio-bin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 0353d15dcdd..9340113c23b 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
archs="i686 x86_64"
homepage="http://directory.apache.org/studio/"
nopie=yes
+python_version=2 #unverified
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
_arch="x86_64"
From d947c22a7a206fbf9e741b27fd7e76f1f72c7ea8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 002/108] apache-storm: add explicit python_version
---
srcpkgs/apache-storm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 0bbeb85e9eb..c4a71024bf1 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -10,6 +10,7 @@ license="Apache-2.0"
homepage="https://storm.apache.org/"
distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
checksum=2cdb3530839375bb5f18751ff16ff78b11e9b4f6d23c423c95d78487ad92d38e
+python_version=2 #unverified
system_accounts="storm"
storm_homedir="/var/lib/apache-storm"
storm_shell="/bin/bash"
@@ -33,5 +34,4 @@ do_install() {
ln -s /usr/lib/apache-storm/external ${DESTDIR}/var/lib/apache-storm/external
vdoc README.markdown
vdoc SECURITY.md
- vlicense LICENSE
}
From 2fe824cf98d54c3d717dba175e58257218834d5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 003/108] bitfighter: add explicit python_version
---
srcpkgs/bitfighter/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index 8b4efd3ae04..a91443cbc3c 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -18,6 +18,7 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
http://bitfighter.org/files/classic_level_pack.zip"
checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
+python_version=2 #unverified
CXXFLAGS="-Wno-narrowing"
From 4d7715f5c482cf5c35f168a9b5a2473ba8924a6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 004/108] codelite: add explicit python_version
---
srcpkgs/codelite/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 9ca8123dafe..49505193795 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
+python_version=2 #unverified
archs="i686* x86_64* ppc64le*"
build_options="hunspell lldb mysql sftp"
@@ -30,7 +31,3 @@ pre_configure() {
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}
-
-post_install() {
- vlicense LICENSE
-}
From 2fbd24a2244af0e557ccb427e2937547f6c4f305 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 005/108] fio: add explicit python_version
---
srcpkgs/fio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index b48a89576b4..660f8069955 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -14,6 +14,7 @@ license="GPL-2.0-only"
homepage="https://github.com/axboe/fio"
distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=809963b1d023dbc9ac7065557af8129aee17b6895e0e8c5ca671b0b14285f404
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
@@ -24,7 +25,6 @@ do_configure() {
}
post_install() {
- vlicense MORAL-LICENSE
vdoc HOWTO
for f in examples/*; do
vsconf "$f"
From 0148cfacfb4adecf551c7c6ce221d720313307b5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 006/108] gcc6: add explicit python_version
---
srcpkgs/gcc6/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 06b231ce4b0..352ae9bbff5 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -27,6 +27,7 @@ nopie=yes
lib32disabled=yes
patch_args="-Np1"
nocross=yes
+python_version=2 #unverified
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
From 7116c5e427ca8a18de73dc099058ff279394a099 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 007/108] ghidra: add explicit python_version
---
srcpkgs/ghidra/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 1fa9a82151c..d987431140f 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -41,6 +41,7 @@ skiprdeps="/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/animals
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/sharedReturn
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/switch
/usr/libexec/ghidra/docs/GhidraClass/ExerciseFiles/Advanced/write"
+python_version=2 #unverified
do_configure() {
cd ghidra-Ghidra_${version}_build
From 727f8ea05f3e3d829cf44f9ccbba143c7124d80d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 008/108] gpsd: add explicit python_version
---
srcpkgs/gpsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 1976ab56d5c..bf1364a9554 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause"
homepage="http://www.catb.org/gpsd/"
distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+python_version=2 #unverified
system_accounts="gpsd"
subpackages="gpsd-devel"
@@ -47,7 +48,6 @@ post_install() {
gpsd-python_package() {
short_desc+=" - Python2 tools/bindings"
depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
- pycompile_module="gps"
pkg_install() {
vmove usr/lib/python2.7
vmove usr/bin/gegps
From f3912cf978e1945dc8f0be42da203f3b482df29e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:07 -0400
Subject: [PATCH 009/108] konversation: add explicit python_version
---
srcpkgs/konversation/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 7200e736020..8eea51d8ea4 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,18 +1,19 @@
# Template file for 'konversation'
pkgname=konversation
version=1.7.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools
qt5-qmake"
makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
$(vopt_if qca 'qca-qt5-devel')"
-short_desc="A user friendly IRC client for KDE"
+short_desc="User friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-2.0-or-later"
homepage="https://konversation.kde.org"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=60bf7533062b5fc63a37105461b4776437f4e24859e8ddaed1d48c4ba1470940
+python_version=2 #unverified
# Package build options
build_options="qca"
From 3d7d87114f8f9386455bd930599458f76dc2177d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 010/108] libglade: add explicit python_version
---
srcpkgs/libglade/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 482ebb21359..f9bbef8cfbe 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,4 +1,4 @@
-# Template build file for 'libglade'.
+# Template file for 'libglade'
pkgname=libglade
version=2.6.4
revision=12
@@ -8,11 +8,12 @@ hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
-homepage="http://www.jamesh.id.au/software/libglade/"
-license="LGPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2"
+homepage="http://www.jamesh.id.au/software/libglade/"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
+python_version=2 #unverified
# Register DTDs with xmlcatmgr.
xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
From 6293c967f2276b2a35f88aa28f68b4629900a26f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 011/108] linux4.14: add explicit python_version
---
srcpkgs/linux4.14/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index b668e018122..eaf30a9ac81 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -2,14 +2,15 @@
pkgname=linux4.14
version=4.14.175
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From 1982e714aebef9aed802cbf7df7263539c24968f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 012/108] linux4.4: add explicit python_version
---
srcpkgs/linux4.4/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 12414429b40..c32d3532434 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,15 @@
# Template file for 'linux4.4'
pkgname=linux4.4
version=4.4.218
-revision=1
+revision=2
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="The Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
checksum=ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063
+python_version=2 #unverified
nocross=yes
nodebug=yes
From a987cf1e13ff83a2793a3d6e3611729812f383ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 013/108] linux4.9: add explicit python_version
---
srcpkgs/linux4.9/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index c0937bbf32a..223860bb2f4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -2,14 +2,15 @@
pkgname=linux4.9
version=4.9.218
revision=1
-patch_args="-Np1"
wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel and modules (${version%.*} series)"
+homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd
+python_version=2 #unverified
+patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
nostrip=yes
From 6ad03489078faaf13e24f3299a5aab72f0d7f065 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 014/108] linux4.19: add explicit python_version
---
srcpkgs/linux4.19/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 654f0a39a1d..8f40ac4aacb 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
checksum=8ee65d23ec23abb4ae195ff354a15da7d6d20ed6dcecc40db02bd06b076b7b64
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
From 96d095941655afd05d782b087781751536df9f82 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 015/108] linux5.4: add explicit python_version
---
srcpkgs/linux5.4/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index d7097c63e20..66ead452a3d 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861
+python_version=2 #unverified
patch_args="-Np1"
nodebug=yes # -dbg package is generated below manually
@@ -18,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From f6e5542acd560c15e98f40d8a2765d87101f0f5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 016/108] linux5.5: add explicit python_version
---
srcpkgs/linux5.5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 58a9e429adb..4d62b5ba22f 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
+python_version=2 #unverified
patch_args="-Np1"
# XXX restrict archs until all archs are updated.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From 532b689ed7aad06deb06c17b4fd4a7acf559cbea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 017/108] linux5.6: add explicit python_version
---
srcpkgs/linux5.6/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index 8bb42a816a1..7d30388ba39 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -9,6 +9,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
checksum=6484ced005e4be5696d6ab0438a9674b9eac89831b4019822f1b0155e7a66bd4
+python_version=2 #unverified
patch_args="-Np1"
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -20,7 +21,7 @@ noverifyrdeps=yes
noshlibprovides=yes
preserve=yes
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
libressl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
From b9f024fce36905d91917afb46dc05fdb54124df2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 018/108] neomutt: add explicit python_version
---
srcpkgs/neomutt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 8d3e3707f69..5bd35e489ba 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -24,6 +24,7 @@ distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
+python_version=2 #unverified
# fix:
if [ "${XBPS_CROSS_BASE}" ]; then
From 0ccb3affd68ae837689716430673ac857d4b5cef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 019/108] neovim: add explicit python_version
---
srcpkgs/neovim/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 7d84ad4b19a..4e361476213 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,4 +1,4 @@
-# Template file for 'neovim'.
+# Template file for 'neovim'
pkgname=neovim
version=0.4.3
revision=1
@@ -14,6 +14,7 @@ license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
checksum=91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2
+python_version=2 #unverified
alternatives="
vi:vi:/usr/bin/nvim
From aad94ed75eeda8f864dba6a8590a6ca35f5a3f26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 020/108] oil: add explicit python_version
---
srcpkgs/oil/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 56a2511d860..7b9317f2dc8 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -11,6 +11,7 @@ license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
checksum=a37eb491ffee5766aa8719056d42d5d836309dc26e345ecd6a2a1d240cd18989
+python_version=2 #unverified
register_shell="/usr/bin/osh"
nocross="oil is nocross"
nostrip=yes
@@ -31,7 +32,3 @@ do_install() {
ln -s oil.ovm osh
ln -s oil.ovm oshc
}
-
-post_install() {
- vlicense LICENSE.txt
-}
From 410c8db710dd31dba6eb14ffd4f6c1a2a014ca30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 021/108] playonlinux: add explicit python_version
---
srcpkgs/playonlinux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 8e3b2e67b3a..02083a3ec5c 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -2,9 +2,9 @@
pkgname=playonlinux
version=4.3.4
revision=2
-wrksrc="${pkgname}"
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
+wrksrc="${pkgname}"
depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq"
short_desc="GUI for managing Windows programs under linux"
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.playonlinux.com"
distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz"
checksum=17c3dfd27962ce5a7a0c014850b33188e203d008c9dc71faa230e35fcada2d05
+python_version=2 #unverified
do_install() {
vmkdir usr/share/$pkgname
From 8e0b2fc99ff90c9c6b410d5b138938df2a3ea87b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 022/108] python-gobject2: add explicit python_version
---
srcpkgs/python-gobject2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
index 9e487c69744..7af458142fd 100644
--- a/srcpkgs/python-gobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -9,13 +9,13 @@ configure_args="--disable-introspection PYTHON=/usr/bin/python2"
hostmakedepends="automake libtool pkg-config python-devel glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
depends="cairo python python-cairo"
-pycompile_module="glib gobject gtk-2.0 pygtk.py"
short_desc="Python2 bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
+python_version=2 #unverified
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
From 385c2e0140e9b7e2e025da8a156be0fb7cfc8a1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 023/108] qt5: add explicit python_version
---
srcpkgs/qt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f240d46ecac..5f9766ae2f9 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -2,8 +2,8 @@
pkgname=qt5
version=5.14.2
revision=2
-build_style=meta
wrksrc="qt-everywhere-src-${version}"
+build_style=meta
hostmakedepends="cmake clang flex git glib-devel pkg-config
python re2c ruby which"
makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
@@ -23,6 +23,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
+python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
From 012ddffdf18add1af9471f22354fa0029219d6b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:08 -0400
Subject: [PATCH 024/108] rpm: add explicit python_version
---
srcpkgs/rpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 66f966d55bf..bc3d44d9428 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -16,6 +16,7 @@ homepage="https://rpm.org"
changelog="https://rpm.org/wiki/Releases/${version}.html"
distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230
+python_version=2 #unverified
conflicts="rpmextract>=0" # Both provide rpm2cpio
CFLAGS="-I${XBPS_CROSS_BASE}${py3_inc}"
@@ -49,7 +50,6 @@ librpm-devel_package() {
}
rpm-python3_package() {
- pycompile_module="rpm"
depends="rpm"
short_desc+=" - python bindings"
pkg_install() {
From 84e7f8611027233b38970e3b2d7183af58d2a5a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 025/108] sydbox: add explicit python_version
---
srcpkgs/sydbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index 26c266597b0..7f1d48acc09 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,17 +1,18 @@
-# Template file for 'pinktrace'
+# Template file for 'sydbox'
pkgname=sydbox
version=1.0.7
-revision=1
+revision=2
wrksrc="$pkgname-1-$version"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool pinktrace-devel"
makedepends="pinktrace-devel"
-short_desc="A ptrace() sandbox utility"
+short_desc="Utility for ptrace() sandboxing"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
checksum=dad70162aae2269e7c60093999ab46ef9213dabf39f9b21851307b7f1367612a
+python_version=2 #unverified
# seccomp only implemented on x86
case "$XBPS_TARGET_MACHINE" in
From 07190671faef3da49cdf0809c054cbe0e637dba9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 026/108] telepathy-gabble: add explicit python_version
---
srcpkgs/telepathy-gabble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1bb37b329d0..7156a96738a 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-gabble'
pkgname=telepathy-gabble
version=0.18.4
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
--enable-handle-leak-debug --disable-debug --disable-static"
@@ -11,10 +10,12 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel
libnice-devel ca-certificates"
depends="telepathy-glib>=0.21 ca-certificates"
-short_desc="A Jabber/XMPP connection manager for Telepathy"
+short_desc="Jabber/XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
+python_version=2 #unverified
nocross=yes
+lib32disabled=yes
From ab3869631e4fb7bcaa472a5b84ff3f7b0047174c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 027/108] ulatencyd: add explicit python_version
---
srcpkgs/ulatencyd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 63efc14fa08..075431fcc1a 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,14 +8,15 @@ build_style=cmake
hostmakedepends="pkg-config"
makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
depends="luaposix51"
-nopie=yes
short_desc="Daemon to minimize latency on a linux system using cgroups"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/poelzi/${pkgname}"
distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
+python_version=2 #unverified
broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
+nopie=yes
LDFLAGS+=" -Wl,-Bdynamic -lm -ldl"
From 1c7beeace1a1867f030781bf2764ca22221353a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 028/108] vigra: add explicit python_version
---
srcpkgs/vigra/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e23d90d1ba0..bca0e7aca34 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -2,6 +2,7 @@
pkgname=vigra
version=1.11.1
revision=5
+wrksrc="${pkgname}-Version-$(echo $version | tr '.' '-')"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://ukoethe.github.io/vigra/"
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
-wrksrc=$pkgname-Version-${version//./-}
+python_version=2 #unverified
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -24,6 +25,7 @@ pre_configure() {
}
post_install() {
+ vlicense LICENSE.txt
vmkdir usr/share/$pkgname
mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
}
From a013089853cc93a0b6c5fdc61c3faf74332e2500 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 029/108] wmii: add explicit python_version
---
srcpkgs/wmii/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template
index 2b0f90c797c..d04d7470d59 100644
--- a/srcpkgs/wmii/template
+++ b/srcpkgs/wmii/template
@@ -1,16 +1,17 @@
# Template file for 'wmii'
pkgname=wmii
version=3.9.2
-revision=5
+revision=6
wrksrc=${pkgname}+ixp-${version}
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXft-devel libXinerama-devel"
-short_desc="A lightweight, dynamic window manager for X11"
+short_desc="Lightweight, dynamic window manager for X11"
maintainer="Zach L. <koni@archlinux.us>"
license="GPL-3"
homepage="https://code.google.com/p/wmii/"
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz"
checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
+python_version=2 #unverified
do_build() {
LDFLAGS+=" -lX11 -lXrender"
From 5262e0798958d0bdfcfa383db9a34c8ec44c22d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 030/108] GConf: add explicit python_version
---
srcpkgs/GConf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index e741e1eb471..677fff7efc5 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -18,6 +18,7 @@ license="GPL-2"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
+python_version=2 #unverified
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From 0cf05dda9fad4671f0d6a5580f89ab0fad961b04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 031/108] Ice: add explicit python_version
---
srcpkgs/Ice/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index ebc50447ded..d9f68fde12b 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only, ICE"
homepage="http://www.zeroc.com"
distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
From 8298f2a8e59e85d32326a769b8f6a74c4c6fa413 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 032/108] alsa-tools: add explicit python_version
---
srcpkgs/alsa-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 199d8710cb9..45593c372fb 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
homepage="http://alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
+python_version=2 #unverified
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
From 8e7631c5f25835c7d1a5e15d430ecd05b9288961 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 033/108] armagetronad: add explicit python_version
---
srcpkgs/armagetronad/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template
index 3c8f279c450..b6c02bdf7fb 100644
--- a/srcpkgs/armagetronad/template
+++ b/srcpkgs/armagetronad/template
@@ -15,6 +15,7 @@ license="GPL-2"
homepage="http://armagetronad.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2"
checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef
+python_version=2 #unverified
do_configure() {
mkdir build_dedicated
From 398987fe1e1b73990275a425ebc4d7060be8db3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 034/108] atop: add explicit python_version
---
srcpkgs/atop/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 4810c00a6f7..8c981e65787 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.atoptool.nl/"
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+python_version=2 #unverified
make_dirs="/var/log/atop 755 root root"
From fd74790c28960817bdc9acb081777d5fab8914dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 035/108] bluefish: add explicit python_version
---
srcpkgs/bluefish/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index f8d783f2f7a..3458bd484b3 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2 #unverified
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
From 81aaac581b33ae1633597ae4f29dfcc1217c6976 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 036/108] bmake: add explicit python_version
---
srcpkgs/bmake/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 28167efc036..ebd99170b00 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -9,6 +9,7 @@ license="BSD-3-Clause"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
checksum=cf15f204ad8eea3396c2c7179b5ec0cffb06c9628b6f91050c6f2cbcaabb8928
+python_version=2 #unverified
do_configure() {
cd bmake
From 1fe06624a43a96fdb96f8713f1b4ec629f4bc6e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 037/108] bookworm: add explicit python_version
---
srcpkgs/bookworm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 193b59e9457..9dc0d982067 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -14,3 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://babluboy.github.io/bookworm"
distfiles="https://github.com/babluboy/${pkgname}/archive/${version}.tar.gz"
checksum=6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824
+python_version=2 #unverified
From c0190fb5d0d1dcc5400a39fafe8258c78e64ce16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 038/108] brltty: add explicit python_version
---
srcpkgs/brltty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index aae12b5ac31..a85530e651f 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
From b0c19ad469d9acccd06a2def3354ff0af82e509f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 039/108] bup: add explicit python_version
---
srcpkgs/bup/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 029e6de7881..8bec5f8bdc9 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -11,6 +11,7 @@ license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
+python_version=2 #unverified
nocross=yes
pre_configure() {
From ac171d2052a50d6f9087a19920036b41dc6cdfd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:09 -0400
Subject: [PATCH 040/108] cifs-utils: add explicit python_version
---
srcpkgs/cifs-utils/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index c6baf544d8b..2fffc648f97 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From c7af9fb3cf79481d51db60f96373d4b4893969f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 041/108] cppcms: add explicit python_version
---
srcpkgs/cppcms/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cppcms/template b/srcpkgs/cppcms/template
index b25a0c6e929..613f8f39cee 100644
--- a/srcpkgs/cppcms/template
+++ b/srcpkgs/cppcms/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="http://cppcms.com"
distfiles="${SOURCEFORGE_SITE}/cppcms/cppcms/${version}/cppcms-${version}.tar.bz2"
checksum=10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52
+python_version=2 #unverified
post_install() {
vlicense COPYING.TXT
From 577226b0917a6348e156b0b81787ec068c14a7b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 042/108] dbus: add explicit python_version
---
srcpkgs/dbus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aaca929e31e..e9b9c38eedc 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,6 +17,7 @@ homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
checksum=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
+python_version=2 #unverified
conf_files="/etc/dbus-1/*.conf"
# Create dbus:22 system account.
From c6653367a4aace4e453992925281963f24be7a3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 043/108] dpdk: add explicit python_version
---
srcpkgs/dpdk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 2bd4700e81a..ac9e822ec72 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -16,6 +16,7 @@ license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
armv7l*) configure_args+=" -Dmachine=armv7-a";;
From 307b441ed15ec4ad0fbb7be01382a19cbf7d0b72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 044/108] dtkcore: add explicit python_version
---
srcpkgs/dtkcore/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
index c6aa5cf9d96..42614e599a5 100644
--- a/srcpkgs/dtkcore/template
+++ b/srcpkgs/dtkcore/template
@@ -13,6 +13,7 @@ homepage="https://github.com/linuxdeepin/dtkcore"
changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From e69c8cb15a8422c367a53c75b2f74faed0ac0674 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 045/108] eclipse: add explicit python_version
---
srcpkgs/eclipse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d42c0625cb2..6dc98a06c75 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -19,6 +19,7 @@ _edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
checksum=72fde94154999df569cbd30551bc784341391b9753209cd563829a6c8674383e
+python_version=2 #unverified
do_install() {
vmkdir usr/lib/eclipse
From 599db3ed33f000fb95801079cdd0a001d0a1bcc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 046/108] frr: add explicit python_version
---
srcpkgs/frr/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index fe714af2159..05163cc6ad0 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -22,6 +22,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://frrouting.org"
distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
checksum=40fea6ff007453e27761a0372cde51fd8279f89984dff009092eebe2a7b29be3
+python_version=2 #unverified
nocross="http://ix.io/1rQ6"
system_groups="_frrvty"
system_accounts="_frr"
From f62f1837a99ac1220bf6b52a969163ef2d31f1ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 047/108] geany: add explicit python_version
---
srcpkgs/geany/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index e99051eedb8..e877136d5f7 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.geany.org"
distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 1cfc74b10e6074e419893cb8bccb5cc3842ea590 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 048/108] gimp: add explicit python_version
---
srcpkgs/gimp/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8d1bed18de7..c9f735a541b 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -18,6 +18,7 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716
+python_version=2 #unverified
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
From 62038f018d757ea951eb8ff604ad21aa59643126 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 049/108] global: add explicit python_version
---
srcpkgs/global/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 7495eecbd5b..9eea5eb4fb0 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -13,3 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/global/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
+python_version=2 #unverified
From 836788865d38f529d0e49b8dfb9019337ecbacbb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 050/108] gogglesmm: add explicit python_version
---
srcpkgs/gogglesmm/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 635fd724512..024fc662717 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -15,6 +15,7 @@ license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
From 5a94b5d38fcb317949cc4d6b8921e90eb008185a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 051/108] grass: add explicit python_version
---
srcpkgs/grass/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index c7537ee7cc1..bccd691a811 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+python_version=2 #unverified
nocross="tries to execute target binaries"
post_install() {
From 59b4af347e9eefc1689ac8195c9b005e20c15e20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 052/108] gst1-editing-services: add explicit python_version
---
srcpkgs/gst1-editing-services/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 0f9dad34f19..a23f876d84b 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -14,6 +14,7 @@ license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
+python_version=2 #unverified
gst1-editing-services-devel_package() {
short_desc+=" - development files"
From 36727942a28880460683fe936134da159b3d0674 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 053/108] gtk+: add explicit python_version
---
srcpkgs/gtk+/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 42aa9e57d39..39883068d06 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -18,6 +18,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
+python_version=2 #unverified
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
From fb7d93ac710d66c19440228eabddd0bb20120832 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 054/108] gtkpod: add explicit python_version
---
srcpkgs/gtkpod/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index b42ca10e99d..9f0e9dc3a80 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="http://www.gtkpod.org/libgpod"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
+python_version=2 #unverified
From f4e46b56cfcbd3d205976416941e90b507ef9bd5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 055/108] gtksourceview2: add explicit python_version
---
srcpkgs/gtksourceview2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index b27ecb5167e..7b2df2006fe 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+python_version=2 #unverified
do_check() {
: #requires xserver
From 4ecf3a91adff5bcabbd3edbdad560acec6996410 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 056/108] hatari: add explicit python_version
---
srcpkgs/hatari/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 44c1d27a8f9..82049108ece 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -12,3 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+python_version=2 #unverified
From f68bdffcb6a275a1bf3d291df5d50a32fc95574a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:10 -0400
Subject: [PATCH 057/108] hydrogen: add explicit python_version
---
srcpkgs/hydrogen/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 68a0735fc42..fed24a7e531 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
homepage="http://www.hydrogen-music.org/"
distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
+python_version=2 #unverified
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel"
From 219f13efab32fe7dedb8565b74e7a9366d8025a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 058/108] include-what-you-use: add explicit python_version
---
srcpkgs/include-what-you-use/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 0e0c9fd6b50..a33d07095f4 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -13,6 +13,7 @@ license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
+python_version=2 #unverified
post_install() {
vlicense LICENSE.TXT
From b256a45f32be446f09d3b52e1a600df82519331f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 059/108] inkscape: add explicit python_version
---
srcpkgs/inkscape/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 43a72af154f..45522048afc 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
+python_version=2 #unverified
# Use c++11 mode and reduce log spam due to gcc6 warnings
CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
From 195b8ee6cf5774fe6918c6c2a75365294d9c3c60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 060/108] john: add explicit python_version
---
srcpkgs/john/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a18953b2af9..21c23d89d36 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later with OpenSSL-exception"
homepage="https://www.openwall.com/john/"
distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
+python_version=2 #unverified
# the build system checks the host cpu for features, so when building on
# a modern power9 system, it will attempt to shove in -mvsx and so on,
From 28f5ae75b904ecb7869ad9ebbc9ef2f496940030 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 061/108] kcachegrind: add explicit python_version
---
srcpkgs/kcachegrind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 657028f70d4..941803e79ef 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -13,3 +13,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
homepage="https://kde.org/applications/development/kcachegrind/"
distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
checksum=a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41
+python_version=2 #unverified
From f3b6750104b5020290492fce64ac063379d862f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 062/108] kdeconnect: add explicit python_version
---
srcpkgs/kdeconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 8d3723dd859..66b765a44cb 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -15,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://github.com/KDE/kdeconnect-kde"
distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz"
checksum=06b8b18e5d1030c9005937d79f67b4ebc30309dd7afc84ab6450488a00d7adeb
+python_version=2 #unverified
From 7da86e94cdfe863738792122fe6d1acfcf54e017 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 063/108] kig: add explicit python_version
---
srcpkgs/kig/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f446637a3d..99cdeb2986e 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -12,3 +12,4 @@ license="GPL-2.0-only"
homepage="https://www.kde.org/applications/education/kig/"
distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
checksum=1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3
+python_version=2 #unverified
From 7786565be3b5c9cb7751bedba21dd78ef74c165e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 064/108] kodi: add explicit python_version
---
srcpkgs/kodi/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index edd7f76803f..e32016388f5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c
+python_version=2 #unverified
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From 9dd9ec637b1717827215b12fc877dc6ecb2ad830 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 065/108] krita: add explicit python_version
---
srcpkgs/krita/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 9b654e220ad..d89dc8ac9df 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -19,6 +19,7 @@ license="GPL-3.0-only"
homepage="https://krita.org/"
distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8
+python_version=2 #unverified
replaces="calligra-krita>=0"
case "$XBPS_TARGET_MACHINE" in
From ecbe5a6cc7de57a544526cb740b9c4d56290230f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 066/108] libdbusmenu-glib: add explicit python_version
---
srcpkgs/libdbusmenu-glib/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template
index 3e9a2b024b0..3af428063d9 100644
--- a/srcpkgs/libdbusmenu-glib/template
+++ b/srcpkgs/libdbusmenu-glib/template
@@ -16,6 +16,7 @@ license="GPL-3, LGPL-2.1, LGPL-3"
homepage="https://launchpad.net/libdbusmenu"
distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz"
checksum=b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
+python_version=2 #unverified
build_options="gir"
build_options_default="gir"
From 65f4868e707a9b04ce6c87612e6d0276ea78c55e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 067/108] libgda: add explicit python_version
---
srcpkgs/libgda/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index 1b8e49c63bd..cc74d916644 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -18,6 +18,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
configure_args+=" --disable-binreloc"
From 70271debfb74b90d8c9e2717002ffa97a63b430e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 068/108] lilypond: add explicit python_version
---
srcpkgs/lilypond/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 12432742aae..ecb36a0d8dc 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -18,6 +18,7 @@ license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/sources/v2.20/lilypond-${version}.tar.gz"
checksum=595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
+python_version=2 #unverified
if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8 and python-config
From 0f3f6fc69efca84d7b028659dab4da1402bd7c69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 069/108] linux-tools: add explicit python_version
---
srcpkgs/linux-tools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a2f222c2d01..b635ab6a799 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -15,6 +15,7 @@ license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
+python_version=2 #unverified
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
From ac87af206d92b0963cd9a72144167e41e822ae2f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 070/108] lttng-ust: add explicit python_version
---
srcpkgs/lttng-ust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index b3530b6be2f..a5822e2be97 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -12,6 +12,7 @@ homepage="http://lttng.org"
changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528
+python_version=2 #unverified
lttng-ust-devel_package() {
depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
From 2b67ea5d5962af70cce354932dbe4dd95ece66fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 071/108] lv2: add explicit python_version
---
srcpkgs/lv2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..f4bc17d61c4 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -11,6 +11,7 @@ license="ISC"
homepage="http://lv2plug.in"
distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
+python_version=2 #unverified
lib32disabled=yes
post_install() {
From a7e9cf0b79f05404914332bb6260614544addaf9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 072/108] lyx: add explicit python_version
---
srcpkgs/lyx/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index ecc200d08f7..3141ad54261 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -14,3 +14,4 @@ homepage="https://www.lyx.org/Home"
#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2"
distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2"
checksum=0cda89b9cb17dad219e7bc3efd5f3932ed8c5dc2efb64fb23e630374b9b46b32
+python_version=2 #unverified
From f05e0e0bb3f67ad61347a568f29ae4a92c7333f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:11 -0400
Subject: [PATCH 073/108] mc: add explicit python_version
---
srcpkgs/mc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 0a2d0ff8e1c..b2a4a82349d 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -13,6 +13,7 @@ homepage="http://www.ibiblio.org/mc/"
distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+python_version=2 #unverified
conf_files="
/etc/mc/filehighlight.ini
From a30814c58cb9451209e99ffc98717348ef1b756f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 074/108] moosefs: add explicit python_version
---
srcpkgs/moosefs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index d208c1d3bd6..1c5b3787d98 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -13,6 +13,7 @@ license="GPL-2.0-only"
homepage="http://moosefs.org/"
distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
checksum=68aa5dbcc837ea8f187a2baefa54cd00b2bafd58eb2745c0de98fa10c90c587a
+python_version=2 #unverified
system_accounts="_mfs"
pre_configure() {
From 5884a5d25a8cfebc06ca7a1109fae2563fb42fbe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 075/108] nghttp2: add explicit python_version
---
srcpkgs/nghttp2/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index b529d06771e..6d60964ace1 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -13,6 +13,7 @@ license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
checksum=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
+python_version=2 #unverified
post_install() {
rm -rf ${DESTDIR}/usr/share/man
From bcc8011b77e891fa3cabcfb3ac4d41894c98fa76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 076/108] nodejs-lts-10: add explicit python_version
---
srcpkgs/nodejs-lts-10/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 9c5bff96322..ae17643be84 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -17,6 +17,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
checksum=622721bc3e6b65faf7eb6a22bfb6e3e31817e42212aa6bf5a7991ea7d9b6f169
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 136078f90e61aa2709179bd255c1875b49d20b0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 077/108] nodejs-lts: add explicit python_version
---
srcpkgs/nodejs-lts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 63b9cc4d77b..46bfb77b920 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 7f5c19c710d656633e81c4349b0fa0942bbc801f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 078/108] nodejs: add explicit python_version
---
srcpkgs/nodejs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1b653aa6a59..5b05948a9e0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -18,6 +18,7 @@ license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
From 1e87f7f21e1d91d118cf38acb759ad5f00b73f5f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 079/108] nutty: add explicit python_version
---
srcpkgs/nutty/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index b71d4a45442..37396577835 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
+python_version=2 #unverified
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
From 325b4f29b102c2d5697e8e8a03cb9b3078ae86ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 080/108] nzbget: add explicit python_version
---
srcpkgs/nzbget/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 45451af7362..3b409465c07 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://nzbget.net/"
distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz"
checksum=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+python_version=2 #unverified
post_extract() {
sed -i '1i#include <stdint.h>' daemon/remote/MessageBase.h
From 78c412ac32e26adeb7fdab15c7ad0e786cc17c48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 081/108] openbox: add explicit python_version
---
srcpkgs/openbox/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 32e0f0a7ad4..fb62d8d4fed 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -19,6 +19,7 @@ license="GPL-2"
homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+python_version=2 #unverified
# Package build options
build_options="svg"
From 5fe807e1d0a28943d44f1e4ca62b9289897064bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 082/108] openconnect: add explicit python_version
---
srcpkgs/openconnect/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 369763656c1..35f274ed9f8 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -14,6 +14,7 @@ license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
+python_version=2 #unverified
openconnect-devel_package() {
short_desc+=" - development files"
From 0add725d0791160d789b62de2d0168ba186906d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 083/108] opendkim: add explicit python_version
---
srcpkgs/opendkim/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index a4a20b82939..16f8d8b082f 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause, Sendmail"
homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From 03770045f7594706ee4da8bda909b95eee8935b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 084/108] openvswitch: add explicit python_version
---
srcpkgs/openvswitch/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index 9faaf98854b..9c2e42199cc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -15,6 +15,7 @@ license="Apache-2.0"
homepage="http://openvswitch.org/"
distfiles="http://openvswitch.org/releases/${pkgname}-${version}.tar.gz"
checksum=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
+python_version=2 #unverified
_completiondir="/usr/share/bash-completion/completions"
make_install_args+=" completiondir=${_completiondir}"
From 9a73d62aca7a2111df12412a4716d73139405663 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 085/108] pidgin: add explicit python_version
---
srcpkgs/pidgin/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index e98936ae0ed..a2668cf685e 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
lib32disabled=yes
hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
From 773334657e1d30d4005bb199e4c29b4062ad2598 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 086/108] pluma: add explicit python_version
---
srcpkgs/pluma/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index 2dca33c4d4d..96cdca543ad 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=1964c7fc970f62c2e00977828f6f115995bd60077bcea2fb70130f0f296cb6ee
+python_version=2 #unverified
pre_configure() {
autoreconf -fi
From 8329d82c286459bc42b7a947ad693de902e86353 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 087/108] pulseaudio: add explicit python_version
---
srcpkgs/pulseaudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 69f29bc9f84..e9e48a87c8c 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -24,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
+python_version=2 #unverified
system_groups="pulse-access"
system_accounts="pulse"
pulse_groups="audio"
From 7077a471a747b0256f8b1913dc4cd0143dc1a996 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 088/108] qtcreator: add explicit python_version
---
srcpkgs/qtcreator/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 19f9455d835..24cb5bfa089 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -15,6 +15,7 @@ license="GPL-3.0-only, QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02
+python_version=2 #unverified
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
From 1d28021bee62c1ecebfd3e07769a4e0f9b0e4a9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:12 -0400
Subject: [PATCH 089/108] refind: add explicit python_version
---
srcpkgs/refind/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 47e6493c2c4..ed30ddeef1b 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -10,6 +10,7 @@ license="GPL-3.0-only, BSD-3-Clause"
homepage="https://sourceforge.net/projects/refind/"
distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=39baf140603951da098238c1cbf4176fdd7d4a45fab0399e9985ad7368034dae
+python_version=2 #unverified
conf_files="/etc/default/refind-kernel-hook.conf"
case "$XBPS_TARGET_MACHINE" in
From 5563eaf36bc4143e95474e5c724b0a31842b0094 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 090/108] resynthesizer: add explicit python_version
---
srcpkgs/resynthesizer/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
index d0652cffb67..d0c717f8b57 100644
--- a/srcpkgs/resynthesizer/template
+++ b/srcpkgs/resynthesizer/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bootchk/resynthesizer"
distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
+python_version=2 #unverified
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" glib-devel gettext-devel"
From e32f28f651e9be3ea9b6fcaf6d4783474a65f959 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 091/108] rrdtool: add explicit python_version
---
srcpkgs/rrdtool/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index daf32d3df74..6a5ff2676a3 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+python_version=2 #unverified
nocross=yes
python-rrdtool_package() {
From 70ddd7588f172d6bdc7a5f8038fc1f7aa438c229 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 092/108] scribus: add explicit python_version
---
srcpkgs/scribus/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index d52bf3abe63..c96ce332eb3 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+python_version=2 #unverified
nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
From e372a058bed19930ec695cf2d2e7eccef9a02b7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 093/108] sdcc: add explicit python_version
---
srcpkgs/sdcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index d6f8da0a975..d0e457f764c 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -12,4 +12,5 @@ license="GPL-2.0-or-later"
homepage="http://sdcc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
checksum=94ecae73faf7f3feee307f89dfe3cef2d7866293c7909ea05b3b33c88d67c036
+python_version=2 #unverified
nostrip=yes
From b0b2fece0c79e4541ccc1aaabcdc425b0e204312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 094/108] sigil: add explicit python_version
---
srcpkgs/sigil/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index f4b02fde7dc..98143972241 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -20,6 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/Sigil-Ebook/Sigil"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=34c7c5c707375b561f00341509e59ae7036e893af06859ca8dbcebd5cf125758
+python_version=2 #unverified
case "$XBPS_TARGET_MACHINE" in
arm*) broken="depends on qt5-webengine";;
From 5770b4ecf2a0c32a7d5a8613676a99ade49fe0e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 095/108] sk1: add explicit python_version
---
srcpkgs/sk1/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 377b10dbe1b..c3a07062541 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -14,6 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://sk1project.net"
distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
+python_version=2 #unverified
pre_configure() {
# python2: can't open file 'setup.py': [Errno 2] No such file or directory
From 6dc37629b83336a1f597b26d8b63d90868895912 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 096/108] skktools: add explicit python_version
---
srcpkgs/skktools/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/skktools/template b/srcpkgs/skktools/template
index bef2061d586..f64a5ebf9e6 100644
--- a/srcpkgs/skktools/template
+++ b/srcpkgs/skktools/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://openlab.ring.gr.jp/skk/"
distfiles="http://openlab.ring.gr.jp/skk/tools/${pkgname}-${version}.tar.gz"
checksum=84cc5d3344362372e0dfe93a84790a193d93730178401a96248961ef161f2168
+python_version=2 #unverified
post_install() {
vmkdir usr/share/${pkgname}
From 62cda4dbc82ebd00c64435a9304b31bb4f655488 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 097/108] smem: add explicit python_version
---
srcpkgs/smem/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/smem/template b/srcpkgs/smem/template
index 3f2b436e98e..4deaca61567 100644
--- a/srcpkgs/smem/template
+++ b/srcpkgs/smem/template
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
homepage="https://www.selenic.com/smem"
distfiles="https://selenic.com/repo/smem/archive/${version}.tar.bz2"
checksum=950c39ee8b1e051866564b25c36a6113eae2617e597b8302324bb8ee57d82ba6
+python_version=2 #unverified
do_build() {
$CC $CFLAGS $LDFLAGS -o smemcap smemcap.c
From 33f4c391c4a5af8dea6028a8a7fa544020f51219 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 098/108] sssd: add explicit python_version
---
srcpkgs/sssd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 16a4a85676e..e8e56dcd668 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -28,6 +28,7 @@ license="GPL-3.0-or-later"
homepage="https://pagure.io/SSSD/sssd/"
distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz"
checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586
+python_version=2 #unverified
do_check() {
export CK_TIMEOUT_MULTIPLIER=10
From 5c88abec6b9dfc8eb9ee5e992e8f623e6b1f2e84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 099/108] synfigstudio: add explicit python_version
---
srcpkgs/synfigstudio/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index f87ceac46a8..a4d76569dbf 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/source-synfigstudio-${version}.tar.gz"
checksum=76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
+python_version=2 #unverified
CXXFLAGS="-Wno-deprecated-copy"
if [ -n "$CROSS_BUILD" ]; then
From 1a1b6137194a29f2f2df42b975468977fd5f45e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 100/108] tacacs: add explicit python_version
---
srcpkgs/tacacs/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index c479ca271a2..823dc0dde05 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -12,6 +12,7 @@ license="custom"
homepage="http://www.shrubbery.net/tac_plus/"
distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz"
checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+python_version=2 #unverified
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 5eaaaba1e59c96ccdff5454541c4ebe72fa407a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 101/108] tellico: add explicit python_version
---
srcpkgs/tellico/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 49c541daf5b..05bd5e14c79 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -17,6 +17,7 @@ license="GPL-3.0-or-later"
homepage="http://tellico-project.org/"
distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
checksum=f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
+python_version=2 #unverified
build_options="webcam yaz xmp cdio cddb scanner"
build_options_default="webcam yaz xmp cdio cddb scanner"
desc_option_cdio="Support for reading cdtext from audio CDs"
From 3031fc2bba60d70fad57611b47387597fef9707a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 102/108] timewarrior: add explicit python_version
---
srcpkgs/timewarrior/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/timewarrior/template b/srcpkgs/timewarrior/template
index 29746c74059..9095ab7e37c 100644
--- a/srcpkgs/timewarrior/template
+++ b/srcpkgs/timewarrior/template
@@ -10,6 +10,7 @@ license="MIT"
homepage="https://timewarrior.net"
distfiles="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${version}/timew-${version}.tar.gz"
checksum=2c4d153105a32536ae328038246ebd846a5abd96df7ed29c11100866eaed8e3c
+python_version=2 #unverified
post_install() {
vlicense LICENSE
From 7329578a5a3a011b6c457e722e0b44a80cb68e83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 103/108] uhd: add explicit python_version
---
srcpkgs/uhd/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 8bda2879564..b0484732ea9 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -14,6 +14,7 @@ homepage="https://files.ettus.com/"
changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
+python_version=2 #unverified
case "${XBPS_TARGET_MACHINE}" in
arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
From 8e82e61dff9abfa533100409f2b30527e5c12120 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 104/108] umbrello: add explicit python_version
---
srcpkgs/umbrello/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index d6af584c236..af46e4c9537 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="https://umbrello.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
checksum=b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193
+python_version=2 #unverified
pre_configure() {
vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
From ded8c63125d31f713114d1bd970127c1bb1978b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:13 -0400
Subject: [PATCH 105/108] units: add explicit python_version
---
srcpkgs/units/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/units/template b/srcpkgs/units/template
index 16d38ea7a15..76221833adc 100644
--- a/srcpkgs/units/template
+++ b/srcpkgs/units/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/units/units.html"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556
+python_version=2 #unverified
post_install() {
# Tries to install to /usr/com/currency.units
From 337440f6615df4a054173139f88c1d182e136eb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 106/108] xastir: add explicit python_version
---
srcpkgs/xastir/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 13c6a97d12b..70f5e6ab78f 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -12,3 +12,4 @@ license="GPL-2"
homepage="http://xastir.org"
distfiles="https://github.com/Xastir/Xastir/archive/Release-${version}.tar.gz"
checksum=0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
+python_version=2 #unverified
From e335b1e0bace9a51616e8b303130010ea3aa61da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 107/108] xboxdrv: add explicit python_version
---
srcpkgs/xboxdrv/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index f4fe44b2b85..ab4ec0f9b5d 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
+python_version=2 #unverified
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
From 388d7eb513188d85a069d80a56798e5b6b1e9fcb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 21 Apr 2020 14:55:14 -0400
Subject: [PATCH 108/108] Remove default python_version in xbps-src [ci skip]
---
common/environment/setup/python.sh | 3 ---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 12 +++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ba181d45361..eca368dbf0d 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,9 +2,6 @@
# Useful variables for determining Python version and paths.
#
-# set version 2 as the default Python
-python_version="2"
-
py2_ver="2.7"
py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 4de75da2a76..3450c3a3a8f 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -4,25 +4,23 @@
hook() {
local pyver= shebang= off=
- : ${pyver:=2}
-
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
- if [ -n "$pycompile_version" ]; then
- pyver="$pycompile_version"
+ if [ -n "$python_version" ]; then
+ pyver="$python_version"
fi
- if [ "$python_version" = "3" ]; then
- pyver="$python_version"
+ if [ -n "$pyver" ]; then
+ shebang="#!/usr/bin/python${pyver%.*}"
fi
- shebang="#!/usr/bin/python${pyver%.*}"
find "${PKGDESTDIR}" -type f -print0 | \
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
[ -z "$(sed -n -E -e 2q -e '/^#!.*([[:space:]]|\/)python([0-9]\.[0-9])?([[:space:]]+|$)/p' "$file")" ] && continue
+ [ -n "$shebang" ] || msg_error "cannot convert shebang, set python_version\n"
echo " Shebang converted to '$shebang': ${file#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$file"
done
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (9 preceding siblings ...)
2020-04-21 20:52 ` ahesford
@ 2020-04-21 20:53 ` ahesford
2020-04-21 22:45 ` [PR PATCH] [Closed]: " Vaelatern
2020-04-21 22:46 ` Vaelatern
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-04-21 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617408559
Comment:
Note that I have successfully rebased this branch several times. There are no conflicts locally, so I'm not sure why Github reports conflicts here. I believe this to be an artifact of the Github issue earlier today.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Closed]: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (10 preceding siblings ...)
2020-04-21 20:53 ` ahesford
@ 2020-04-21 22:45 ` Vaelatern
2020-04-21 22:46 ` Vaelatern
12 siblings, 0 replies; 14+ messages in thread
From: Vaelatern @ 2020-04-21 22:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2666 bytes --]
There's a closed pull request on the void-packages repository
Drop default python_version in xbps-src
https://github.com/void-linux/void-packages/pull/21209
Description:
This is a second attempt at #21132 following the recommendation of @q66. With the help of @Duncaen, I've identified (almost) all of the packages that currently rewrite python shebangs to the current default, `python2`. Those packages that do **not** create a `/usr/lib/pythonX.Y` directory have had `python_version=2` explicitly added to their templates. Note that I did not bump the revisions, becasuse there is no need to rebuild the packges for this change. I've also cleaned up a few `xlint` failures in some packages.
All packages that have `python3` shebangs are assumed to satisfy one of two conditions:
1. Any python scripts in the package explicitly use a `python3` shebang, which is never modified by the `xbps-src` rewrite hook. (The hook only modifies `python` or `pythonX.Y` shebangs.)
2. The package explicitly sets `python_version=3` to instruct the hook to use the correct version.
In either case, there is no need to alter these packages.
In addition, I have removed the default `python_version=2` in `common/environment/setup/python.sh` and modified `common/hooks/pre-pkg/03-rewrite-python-shebang.sh` to do the "right" thing with `python_version`:
1. As before, iff the package installs something to exactly one `usr/lib/pythonX.Y` python libdir, a default `python_version` will be inferred from the directory name. (Note: if the package creates more than one python libdir, the test in the hook will fail, so no default `python_version` will be derived in this case.)
2. A manual declaration of `python_version` in a template will override this default (or lack of a default).
3. Iff a default or explicit `python_version` has been specified, an approriate "target" shebang will be created.
4. If any python scripts are detected in the package, their shebangs will be replaced iff the appropriate target shebang was created; otherwise, if no target shebang was determined but at least one python script is found, package building will fail with a hard error.
These changes minimize the chance for package breakage because of the disappearing default `python_version` and, if I've missed anything, it should be detected the next time one of these packages is rebuilt.
Note that some packages may have already installed broken scripts from relying on the default `python_version=2` if the scripts actually target `python3`. This PR does not attempt to detect or fix those, but instead seeks to preserve existing behavior without adding additional breakage.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: Drop default python_version in xbps-src
2020-04-21 17:11 [PR PATCH] Drop default python_version in xbps-src ahesford
` (11 preceding siblings ...)
2020-04-21 22:45 ` [PR PATCH] [Closed]: " Vaelatern
@ 2020-04-21 22:46 ` Vaelatern
12 siblings, 0 replies; 14+ messages in thread
From: Vaelatern @ 2020-04-21 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/21209#issuecomment-617451595
Comment:
Pushed without github's help.
^ permalink raw reply [flat|nested] 14+ messages in thread