From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Drop default python_version in xbps-src
Date: Tue, 21 Apr 2020 19:24:13 +0200 [thread overview]
Message-ID: <20200421172413.KddL_M62o2grWjIZK7o1iFl0vTCN-_4CSnXe_vf9DNc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21209@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-04-21 17:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 17:11 [PR PATCH] " ahesford
2020-04-21 17:12 ` [PR PATCH] [Updated] " ahesford
2020-04-21 17:24 ` ahesford [this message]
2020-04-21 18:08 ` Vaelatern
2020-04-21 18:08 ` Chocimier
2020-04-21 18:15 ` q66
2020-04-21 18:40 ` [PR PATCH] [Updated] " ahesford
2020-04-21 18:40 ` ahesford
2020-04-21 18:43 ` ahesford
2020-04-21 18:55 ` [PR PATCH] [Updated] " ahesford
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200421172413.KddL_M62o2grWjIZK7o1iFl0vTCN-_4CSnXe_vf9DNc@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).