[neon/snap-packaging/kde-qt5-core-sdk/work.core24] /: No python2 in core24

Scarlett Moore null at kde.org
Thu Oct 17 12:14:48 BST 2024


Git commit 39d82b5116527b38fcb15c19c8780899692d864d by Scarlett Moore.
Committed on 17/10/2024 at 11:14.
Pushed by scarlettmoore into branch 'work.core24'.

No python2 in core24

M  +1    -2    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt5-core-sdk/-/commit/39d82b5116527b38fcb15c19c8780899692d864d

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6fd05d1..b4c60ca 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1038,7 +1038,6 @@ parts:
       - flex
       - gperf
       - bison
-      - python2
       - node-less
       - libnss3-dev
       - libxkbcommon-x11-dev
@@ -1112,7 +1111,7 @@ parts:
       roundedmem=$(python3 -c "print(round($memtotal/1024000.0))")
       maxcoresformem=$(python3 -c "print(max(1, int(($roundedmem / 2)-2)))")
       numcoreslow=$(python3 -c "print(min($maxcoresformem, $CRAFT_PARALLEL_BUILD_COUNT))")
-      $CRAFT_STAGE/usr/lib/qt5/bin/qmake QMAKE_EXTRA_ARGS+="-proprietary-codecs -feature-webengine-system-libvpx -webengine-jumbo-build 0 -system-opus -system-webp -system-webengine-icu -webengine-kerberos" QMAKE_PYTHON2=python2 -qtconf "$SNAPCRAFT_STAGE/qt.conf"
+      $CRAFT_STAGE/usr/lib/qt5/bin/qmake QMAKE_EXTRA_ARGS+="-proprietary-codecs -feature-webengine-system-libvpx -webengine-jumbo-build 0 -system-opus -system-webp -system-webengine-icu -webengine-kerberos" -qtconf "$SNAPCRAFT_STAGE/qt.conf"
       make -j$CRAFT_PARALLEL_BUILD_COUNT
       make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
       cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"


More information about the Neon-commits mailing list