From e0eb87d29c9b73583fc91a5967504dcdcbcaba0b Mon Sep 17 00:00:00 2001 From: OscarL Date: Fri, 2 Jun 2023 17:39:32 -0300 Subject: [PATCH] aquaskk: switch to Python 3. (#8780) --- app-i18n/aquaskk/aquaskk-4.7.0.2.recipe | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app-i18n/aquaskk/aquaskk-4.7.0.2.recipe b/app-i18n/aquaskk/aquaskk-4.7.0.2.recipe index 6fe26448c..e02f889b3 100644 --- a/app-i18n/aquaskk/aquaskk-4.7.0.2.recipe +++ b/app-i18n/aquaskk/aquaskk-4.7.0.2.recipe @@ -19,8 +19,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - cmd:python2 - lib:libpython2.7 + # Neeeded by the "$dataDir/aquaskk/dict_downloader.py" script. + # Haven't tried the script. Leaving it out for now. + # cmd:python3 " BUILD_REQUIRES=" @@ -31,7 +32,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:gyp cmd:ninja - cmd:python2 + cmd:python3 cmd:xres " if [ "$targetArchitecture" = x86_gcc2 ]; then @@ -40,14 +41,22 @@ BUILD_PREREQUIRES+=" " fi +PATCH() +{ + sed -i \ + "s|out = p.stdout.read()|out = p.stdout.read().decode('utf-8')|" \ + platform/haiku/src/tools/gen_pre.py + + find . -name '*.gyp' -type f -print0 | xargs -0 sed -i "s|'python',|'python3',|" +} + BUILD() { cd platform/haiku/src - $portPackageLinksDir/cmd~python2/bin/python2 build.py gyp \ - --platform=Haiku --arch=$targetArchitecture + python3 build.py gyp --platform=Haiku --arch=$targetArchitecture - $portPackageLinksDir/cmd~python2/bin/python2 build.py build \ + python3 build.py build \ -c Release \ method/method.gyp:aquaskk \ preference/preference.gyp:preference