[neon/snap-packaging/kde-qt5-core-sdk] /: Update to qt5 paths

Scarlett Moore null at kde.org
Tue Oct 8 18:17:08 BST 2024


Git commit 9bf21072a7e1f9ebba4c9e18682c6f023b9be211 by Scarlett Moore.
Committed on 08/10/2024 at 17:16.
Pushed by scarlettmoore into branch 'master'.

Update to qt5 paths

M  +13   -13   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt5-core-sdk/-/commit/9bf21072a7e1f9ebba4c9e18682c6f023b9be211

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 5602235..eb1b134 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,4 +1,4 @@
-name: kde-qt6-core22-sdk
+name: kde-qt5-core22-sdk
 base: core22
 version: v5.15.15-lts-lgpl
 summary: KDE fork Qt Framework SDK
@@ -35,7 +35,7 @@ package-repositories:
     key-server: keyserver.ubuntu.com
 
 parts:
-  qt6:
+  qt5:
     plugin: cmake
     source: https://invent.kde.org/qt/qt/qt5.git
     source-tag: $SNAPCRAFT_PROJECT_VERSION
@@ -44,18 +44,18 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DINSTALL_BINDIR=/usr/bin/qt6
+      - -DINSTALL_BINDIR=/usr/bin/qt5
       - -DINSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - -DINSTALL_LIBEXECDIR=lib/qt6/libexec
-      - -DINSTALL_ARCHDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
-      - -DINSTALL_EXAMPLESDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/examples
-      - -DINSTALL_DATADIR=share/qt6
-      - -DINSTALL_HOSTDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
+      - -DINSTALL_LIBEXECDIR=lib/qt5/libexec
+      - -DINSTALL_ARCHDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5
+      - -DINSTALL_EXAMPLESDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/examples
+      - -DINSTALL_DATADIR=share/qt5
+      - -DINSTALL_HOSTDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5
       - -DINSTALL_SYSCONFDIR=/share
-      - -DINSTALL_INCLUDEDIR=include/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
-      - -DINSTALL_PLUGINDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
-      - -DINSTALL_TRANSLATIONDIR=share/qt6/translations
-      - -DINSTALL_MKSPECSDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/mkspecs
+      - -DINSTALL_INCLUDEDIR=include/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5
+      - -DINSTALL_PLUGINDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/plugins
+      - -DINSTALL_TRANSLATIONDIR=share/qt5/translations
+      - -DINSTALL_MKSPECSDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/mkspecs
       - -DINSTALL_PUBLICBINDIR=bin
       - -DBUILD_EXAMPLES=OFF
       - -DBUILD_DOCS=OFF
@@ -254,7 +254,7 @@ parts:
       cp $CRAFT_PART_BUILD/config.summary $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME
 
   debs:
-    after: [qt6]
+    after: [qt5]
     plugin: nil
     stage-packages:
       - bison


More information about the Neon-commits mailing list