From 60697c0d21e331be3e4e6d99a43253cb20497360 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Feb 2020 07:36:23 +0100 Subject: [PATCH] Python 2 Removal - Round 2 (#1874) * cygrunsrv: Remove Python 2 dependency Looks unused * elinks: Move to Python 3 * gyp: Update and build with Python 3 * doxygen: Build with Python 3 * file: Drop Python 2 module * glib2: Build with Python 3 * libevent: Use Python 3 * setconf: Use Python 3 * jsoncpp: Build with Python 3 --- cygrunsrv/PKGBUILD | 3 +-- doxygen/PKGBUILD | 4 ++-- elinks-git/PKGBUILD | 6 +++--- file/PKGBUILD | 7 ++----- glib2/PKGBUILD | 8 +++++--- gyp-git/PKGBUILD | 6 +++--- jsoncpp/PKGBUILD | 4 ++-- libevent/PKGBUILD | 4 ++-- setconf/PKGBUILD | 8 ++------ 9 files changed, 22 insertions(+), 28 deletions(-) diff --git a/cygrunsrv/PKGBUILD b/cygrunsrv/PKGBUILD index 4e7cb31d..4761769b 100644 --- a/cygrunsrv/PKGBUILD +++ b/cygrunsrv/PKGBUILD @@ -2,13 +2,12 @@ pkgname=cygrunsrv pkgver=1.62 -pkgrel=1 +pkgrel=2 pkgdesc="${pkgname} is a windows services tool" _realname=cygrunsrv arch=('i686' 'x86_64') url="https://cygwin.org/" license=('GPL') -depends=('python2') makedepends=('gcc' 'git' 'make') source=(${pkgname}-${pkgver}::git+https://sourceware.org/git/cygwin-apps/${pkgname}.git#tag=rel${pkgver//./-} msysize.patch) diff --git a/doxygen/PKGBUILD b/doxygen/PKGBUILD index 04a2812a..27c41a7e 100644 --- a/doxygen/PKGBUILD +++ b/doxygen/PKGBUILD @@ -3,14 +3,14 @@ pkgname=doxygen pkgver=1.8.17 -pkgrel=1 +pkgrel=2 pkgdesc="A documentation system for C++, C, Java, IDL and PHP" arch=('i686' 'x86_64') url="http://www.doxygen.org/" options=('strip' 'staticlibs') license=('GPL') depends=("gcc-libs" "libsqlite" "libiconv") -makedepends=("cmake" "gcc" "flex" "python2" "libsqlite-devel" "libiconv-devel") +makedepends=("cmake" "gcc" "flex" "python3" "libsqlite-devel" "libiconv-devel") source=(${pkgname}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz "doxygen-segfault.patch") #noextract=("${pkgname}-${pkgver}.tar.gz") diff --git a/elinks-git/PKGBUILD b/elinks-git/PKGBUILD index 456ee717..e0045602 100644 --- a/elinks-git/PKGBUILD +++ b/elinks-git/PKGBUILD @@ -3,7 +3,7 @@ pkgname=elinks-git _ver_base=0.13 pkgver=0.13.4008.f86be659 -pkgrel=3 +pkgrel=4 epoch= pkgdesc="Full-Featured Text WWW Browser (net-utils)" arch=("i686" "x86_64") @@ -30,7 +30,7 @@ depends=('doxygen' 'libtre' 'libunistring' 'perl' - 'python2' + 'python3' 'xmlto' 'zlib') makedepends=('git' @@ -76,7 +76,7 @@ prepare() { build() { cd ${srcdir}/${pkgname} - export PYTHON=/usr/bin/python2 + export PYTHON=/usr/bin/python3 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/file/PKGBUILD b/file/PKGBUILD index 8dc91c31..cda0d67d 100644 --- a/file/PKGBUILD +++ b/file/PKGBUILD @@ -2,14 +2,14 @@ pkgname=file pkgver=5.38 -pkgrel=1 +pkgrel=2 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') groups=('base' 'base-devel') url="https://www.darwinsys.com/file/" depends=('gcc-libs' 'msys2-runtime' 'zlib') -makedepends=('python2' 'python3' 'zlib-devel') +makedepends=('python3' 'zlib-devel') options=('!libtool') source=(#ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz ftp://ftp.astron.com/pub/file/${pkgname}-${pkgver}.tar.gz @@ -43,12 +43,9 @@ package() { install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - PYTHON_SITELIB=$(python2 -c 'from distutils.sysconfig import * ; print get_python_lib(0,0);') PYTHON3_SITELIB=$(python3 -c 'from distutils.sysconfig import * ; print(get_python_lib(0,0));') - mkdir -p ${pkgdir}/$PYTHON_SITELIB mkdir -p ${pkgdir}/$PYTHON3_SITELIB - cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON_SITELIB cp -f ${srcdir}/${pkgname}-${pkgver}/python/magic.py ${pkgdir}/$PYTHON3_SITELIB cat ${srcdir}/${pkgname}-${pkgver}/magic/Magdir/* > ${pkgdir}/usr/share/misc/magic diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD index fb21ffed..35d28e11 100644 --- a/glib2/PKGBUILD +++ b/glib2/PKGBUILD @@ -3,11 +3,12 @@ pkgbase=glib2 pkgname=(glib2 glib2-devel glib2-docs) pkgver=2.54.3 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" +license=(LGPL2) url="https://www.gtk.org/" arch=('i686' 'x86_64') -makedepends=('pkg-config' 'python' 'libxslt-devel' 'docbook-xsl' 'pcre-devel' 'libffi-devel' 'libiconv-devel' 'gamin-devel' 'gtk-doc' 'zlib-devel') +makedepends=('pkg-config' 'python3' 'libxslt-devel' 'docbook-xsl' 'pcre-devel' 'libffi-devel' 'libiconv-devel' 'gamin-devel' 'gtk-doc' 'zlib-devel') source=(https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz 2.36.3-not-win32.patch 2.36.4-gspawn-cygwin.patch @@ -52,6 +53,7 @@ prepare() { build() { export lt_cv_deplibs_check_method='pass_all' cd glib-${pkgver} + export CFLAGS="$CFLAGS -Wno-error=format-overflow" ./configure \ --build=${CHOST} \ --host=${CHOST} \ @@ -81,7 +83,7 @@ check() { package_glib2() { depends=('libxslt' 'libpcre' 'libffi' 'libiconv' 'zlib') optdepends=('gamin: for gio fam module' - 'python2: for gdbus-codegen and gtester-report') + 'python3: for gdbus-codegen and gtester-report') options=('!docs' '!emptydirs') license=('LGPL') diff --git a/gyp-git/PKGBUILD b/gyp-git/PKGBUILD index 6dc55137..646c857c 100644 --- a/gyp-git/PKGBUILD +++ b/gyp-git/PKGBUILD @@ -3,7 +3,7 @@ _realname=gyp pkgname=${_realname}-git -pkgver=r2114.a2738d85 +pkgver=r2162.2eef1129 pkgrel=1 pkgdesc="GYP can Generate Your Projects." url="https://code.google.com/p/gyp/" @@ -12,7 +12,7 @@ provides=("gyp") conflicts=("gyp") replaces=("gyp-svn") makedepends=('git') -depends=('python2' 'python2-setuptools') +depends=('python3' 'python3-setuptools') license=('custom') source=("git+https://chromium.googlesource.com/external/gyp" '0001-msys-ize.patch') @@ -34,5 +34,5 @@ prepare() { package() { cd "${srcdir}"/${_realname} - python2 setup.py install --root="${pkgdir}" + python3 setup.py install --root="${pkgdir}" } diff --git a/jsoncpp/PKGBUILD b/jsoncpp/PKGBUILD index 61d80226..56c6d30b 100644 --- a/jsoncpp/PKGBUILD +++ b/jsoncpp/PKGBUILD @@ -3,7 +3,7 @@ pkgbase="jsoncpp" pkgname=("${pkgbase}" "${pkgbase}-devel") pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library for interacting with JSON" arch=('any') url="https://github.com/open-source-parsers/jsoncpp" @@ -11,7 +11,7 @@ license=('MIT') depends=("gcc-libs") makedepends=("gcc" "cmake" - "python2") + "python3") options=('staticlibs' '!strip' '!buildflags') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/open-source-parsers/jsoncpp/archive/${pkgver}.tar.gz") sha256sums=('c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697') diff --git a/libevent/PKGBUILD b/libevent/PKGBUILD index 2b2291c6..26744a8b 100644 --- a/libevent/PKGBUILD +++ b/libevent/PKGBUILD @@ -2,7 +2,7 @@ pkgname=('libevent' 'libevent-devel') pkgver=2.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="An event notification library" arch=('i686' 'x86_64') url="https://libevent.org/" @@ -34,7 +34,7 @@ check() { package_libevent() { depends=('openssl') - optdepends=('python2: to use event_rpcgen.py') + optdepends=('python3: to use event_rpcgen.py') mkdir -p $pkgdir/usr/bin cp -rf $srcdir/dest/usr/bin $pkgdir/usr/ diff --git a/setconf/PKGBUILD b/setconf/PKGBUILD index 65699ca3..2f509eb3 100644 --- a/setconf/PKGBUILD +++ b/setconf/PKGBUILD @@ -2,19 +2,15 @@ pkgname=setconf pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc='Utility to easily change settings in configuration files' arch=('any') url='https://setconf.roboticoverlords.org/' license=('GPL2') -depends=('python2') +depends=('python3') source=("https://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") sha256sums=('98bd51861f0141508a20a81fc325204e9500f3b7305bc518f62bf5af91db8486') -prepare() { - sed -i 's:usr/bin/python:usr/bin/python2:' "$pkgname-$pkgver/$pkgname.py" -} - package() { cd "$pkgname-$pkgver"