Page MenuHomePhorge
Files F113553

D76.1732468480.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D76.1732468480.diff
View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,29 +50,55 @@
- 'packaging/**'
- 'icons/**'
-'build:GNU/Linux-amd64-debug':
+.build:
stage: build
- image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-debug'
+ rules: *build-rules
+
+.build-debug:
+ extends: .build
script: |
env JOBS=2 ./packaging/GNU-Linux/appimage/build.sh
artifacts:
paths:
- kazv-Debug.AppImage
expire_in: 1 week
- rules: *build-rules
-'build:GNU/Linux-amd64-prod':
- stage: build
- image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-prod'
+.build-prod:
+ extends: .build
script: |
env JOBS=2 ./packaging/GNU-Linux/appimage/build-prod.sh
artifacts:
paths:
- kazv-Release.AppImage
expire_in: 1 week
- rules: *build-rules
+
+'build:GNU/Linux-amd64-debug:kf5':
+ extends: .build-debug
+ before_script:
+ - export KF_VER=5
+ image:
+ name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu20.04-debug'
+
+'build:GNU/Linux-amd64-prod:kf5':
+ extends: .build-prod
+ before_script:
+ - export KF_VER=5
+ image:
+ name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu20.04-prod'
+
+'build:GNU/Linux-amd64-debug:kf6':
+ extends: .build-debug
+ before_script:
+ - export KF_VER=6
+ image:
+ name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu22.04-debug'
+
+'build:GNU/Linux-amd64-prod:kf6':
+ extends: .build-prod
+ before_script:
+ - export KF_VER=6
+ image:
+ name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu22.04-prod'
report-success:
extends: .report
diff --git a/packaging/GNU-Linux/appimage/build.sh b/packaging/GNU-Linux/appimage/build.sh
--- a/packaging/GNU-Linux/appimage/build.sh
+++ b/packaging/GNU-Linux/appimage/build.sh
@@ -8,18 +8,76 @@
apt-key add public.key && \
rm public.key
-cp -v packaging/GNU-Linux/appimage/kde-neon.list /etc/apt/sources.list.d/
+DEP_PACKAGES=(
+ extra-cmake-modules
+ wget
+ weston
+ dbus-x11
+ libcmark-dev
+)
+
+if [[ $KF_VER == 5 ]]; then
+ DEP_PACKAGES+=(
+ qtbase5-dev
+ qtdeclarative5-dev
+ qtmultimedia5-dev
+ qml-module-qtmultimedia
+ libqt5concurrent5
+ libqt5gui5
+ libqt5svg5-dev
+ qtquickcontrols2-5-dev
+ qml-module-qtquick-layouts
+ qml-module-qtquick-controls2
+ qml-module-qtquick-controls
+ qml-module-qt-labs-qmlmodels
+ kirigami2-dev
+ libkf5config-dev
+ libqt5multimedia5-plugins
+ qt5-gtk-platformtheme
+ plasma-integration
+ libkf5kio-dev
+ qml-module-qttest
+ qml-module-qt-labs-platform
+ libkf5notifications-dev
+ qml-module-qtquick-dialogs
+ qml-module-org-kde-notification
+ )
+ cp -v packaging/GNU-Linux/appimage/kde-neon-focal.list /etc/apt/sources.list.d/
+else
+ DEP_PACKAGES+=(
+ qt6-base-dev
+ qt6-declarative-dev
+ qt6-multimedia-dev
+ qml6-module-qtmultimedia
+ libqt6concurrent6
+ libqt6gui6
+ libqt6svg6-dev
+ libqt6quickcontrols2-6
+ qml6-module-qtquick-controls
+ qml6-module-qtquick-layouts
+ qml6-module-qt-labs-qmlmodels
+ kf6-kirigami2-dev
+ libkf6config-dev
+ qt6-gtk-platformtheme
+ plasma-integration
+ libkf6kio-dev
+ qml6-module-qttest
+ qml6-module-qt-labs-platform
+ libkf6notifications-dev
+ qml6-module-qtquick-dialogs
+ qml6-module-org-kde-notification
+ kf6-kirigami-addons-dev
+ cmark
+ )
+ export QMAKE=qmake6
+ cp -v packaging/GNU-Linux/appimage/kde-neon-jammy.list /etc/apt/sources.list.d/
+fi
apt-get update && \
apt-get -y upgrade && \
DEBIAN_FRONTEND="noninteractive" \
apt-get -y install aptitude && \
- aptitude -y install extra-cmake-modules \
- qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev qml-module-qtmultimedia libqt5concurrent5 libqt5gui5 \
- libqt5svg5-dev qtquickcontrols2-5-dev qml-module-qtquick-layouts qml-module-qtquick-controls2 \
- qml-module-qtquick-controls qml-module-qt-labs-qmlmodels kirigami2-dev libkf5config-dev wget libqt5multimedia5-plugins \
- qt5-gtk-platformtheme plasma-integration libkf5kio-dev g++-10 weston dbus-x11 qml-module-qttest qml-module-qt-labs-platform \
- libkf5notifications-dev qml-module-qtquick-dialogs qml-module-org-kde-notification libcmark-dev
+ aptitude -y install "${DEP_PACKAGES[@]}"
# Actual build
mkdir -pv /run/user/test
@@ -37,7 +95,7 @@
mkdir build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX="$KAZV_INSTALL_DIR" \
- -DCMAKE_PREFIX_PATH="$LIBKAZV_INSTALL_DIR;$DEPS_INSTALL_DIR" -DCMAKE_BUILD_TYPE=$BUILD_TYPE && \
+ -DCMAKE_PREFIX_PATH="$LIBKAZV_INSTALL_DIR;$DEPS_INSTALL_DIR" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -Dkazv_KF_QT_MAJOR_VERSION=$KF_VER && \
make -j$JOBS && \
make -j$JOBS DESTDIR=AppDir install && \
dbus-launch --exit-with-session -- bash "$thisDir"/test.sh
@@ -56,7 +114,8 @@
# Enable the appimage to use Plasma themes, linuxdeploy-plugin-qt will only copy the gtk3 plugin -((
mkdir -pv AppDir/usr/plugins/platformthemes/
-cp /usr/lib/x86_64-linux-gnu/qt5/plugins/platformthemes/KDEPlasmaPlatformTheme.so AppDir/usr/plugins/platformthemes/
+cp /usr/lib/x86_64-linux-gnu/qt5/plugins/platformthemes/KDEPlasmaPlatformTheme.so AppDir/usr/plugins/platformthemes/ || true
+cp /usr/lib/x86_64-linux-gnu/qt6/plugins/platformthemes/KDEPlasmaPlatformTheme6.so AppDir/usr/plugins/platformthemes/ || true
# Workaround "cannot mix incompatible qt versions" problem
diff --git a/packaging/GNU-Linux/appimage/kde-neon.list b/packaging/GNU-Linux/appimage/kde-neon-focal.list
rename from packaging/GNU-Linux/appimage/kde-neon.list
rename to packaging/GNU-Linux/appimage/kde-neon-focal.list
diff --git a/packaging/GNU-Linux/appimage/kde-neon-jammy.list b/packaging/GNU-Linux/appimage/kde-neon-jammy.list
new file mode 100644
--- /dev/null
+++ b/packaging/GNU-Linux/appimage/kde-neon-jammy.list
@@ -0,0 +1 @@
+deb http://archive.neon.kde.org/release jammy main
diff --git a/src/tests/quick-tests/tst_DevicePopup.qml b/src/tests/quick-tests/tst_DevicePopup.qml
--- a/src/tests/quick-tests/tst_DevicePopup.qml
+++ b/src/tests/quick-tests/tst_DevicePopup.qml
@@ -11,6 +11,7 @@
import 'test-helpers.js' as Helpers
Item {
+ id: item
width: 800
height: 600
@@ -22,6 +23,10 @@
trustLevel: 'unseen'
})
+ function applicationWindow() {
+ return Window.window;
+ }
+
KazvDM.Device {
id: device
item: deviceItem
@@ -36,6 +41,9 @@
}
function test_trustLevelPopup() {
+ if (MK.KazvUtil.kfQtMajorVersion === 6) {
+ device.sheet.parent = item;
+ }
device.sheet.open();
tryVerify(() => device.sheet.getNewTrustLevel() === 'unseen', 1000);
const buttons = findChild(device.sheet, 'trustLevelChoices');

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 9:14 AM (12 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39748
Default Alt Text
D76.1732468480.diff (6 KB)

Event Timeline