Date: Friday, July 26, 2019 @ 17:57:20 Author: arojas Revision: 358636
Fix build with python3 scons Added: serf/trunk/scons-python3.patch Modified: serf/trunk/PKGBUILD ---------------------+ PKGBUILD | 18 ++++++++++++------ scons-python3.patch | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-07-26 17:46:17 UTC (rev 358635) +++ PKGBUILD 2019-07-26 17:57:20 UTC (rev 358636) @@ -9,15 +9,21 @@ url="https://serf.apache.org"; license=('Apache') depends=('apr-util') -makedepends=('python2-scons') -source=(https://www.apache.org/dist/serf/${pkgname}-${pkgver}.tar.bz2{,.asc}) +makedepends=('scons') +source=(https://www.apache.org/dist/serf/${pkgname}-${pkgver}.tar.bz2{,.asc} scons-python3.patch) validpgpkeys=('C236283C970D2C3CFEEB4936BF35CF0078383142') sha256sums=('549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc' - 'SKIP') + 'SKIP' + '363732546098b4c9415eb5d38b595d04c660c6324a34159768d334507b7d241f') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../scons-python3.patch +} + build() { cd ${pkgname}-${pkgver} - scons2 CFLAGS="${CFLAGS}" \ + scons CFLAGS="${CFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ PREFIX=/usr GSSAPI=/usr/bin/krb5-config } @@ -25,11 +31,11 @@ check() { cd ${pkgname}-${pkgver} # Runs into infinite loop - #scons2 check + #scons check } package() { cd ${pkgname}-${pkgver} install -d "${pkgdir}/usr" - scons2 install --install-sandbox="${pkgdir}" + scons install --install-sandbox="${pkgdir}" } Added: scons-python3.patch =================================================================== --- scons-python3.patch (rev 0) +++ scons-python3.patch 2019-07-26 17:57:20 UTC (rev 358636) @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000 ++++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU'])
