Merge branch 'main' into helium

Author: chun-awa

.devcontainer/devcontainer.json

@@ -0,0 +1,56 @@
+{
+    "image": "ghcr.io/lingmoos/lingmo-dev-container:latest",
+    "remoteUser": "codespace",
+    "containerUser": "codespace",
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    "forwardPorts": [8080],
+    "portsAttributes": {
+        "8080": {
+          "label": "desktop"
+        }
+    },
+    "containerEnv": {
+        "DISPLAY_WIDTH": "1024",
+        "DISPLAY_HEIGHT": "768"
+    },
+    "postStartCommand": "sudo apt install -y clangd",
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": {
+                "jupyter.kernels.filter": [
+                    {
+                        "path": "/opt/conda/bin/python",
+                        "type": "pythonEnvironment"
+                    },
+                    {
+                        "path": "/usr/local/python/current/bin/python3",
+                        "type": "pythonEnvironment"
+                    },
+                    {
+                        "path": "/usr/local/python/current/bin/python",
+                        "type": "pythonEnvironment"
+                    },
+                    {
+                        "path": "/usr/bin/python3",
+                        "type": "pythonEnvironment"
+                    },
+                    {
+                        "path": "/bin/python3",
+                        "type": "pythonEnvironment"
+                    }
+                ],
+                "lldb.executable": "/usr/bin/lldb"
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "GitHub.vscode-pull-request-github",
+                "ms-vscode.cpptools-extension-pack",
+                "llvm-vs-code-extensions.vscode-clangd",
+                "aminer.codegeex"
+            ]
+        }
+    }
+}

.github/workflows/Auto CI Test Build.yml

@@ -0,0 +1,53 @@
+name: Push to CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  debian:
+    name: Debian 13 Trixie
+    runs-on: ubuntu-latest
+    container: docker.io/library/debian:trixie
+    steps:
+    - name: Install Dependencies
+      run: |
+        apt-get update
+        apt-get install -y sudo git
+
+    - name: Checkout Source
+      uses: actions/checkout@v3
+
+    - name: Init Git Repo
+      run: |
+        git config --global --add safe.directory $(realpath .)
+
+
+    - name: Build Debian Src Package
+      uses: LingmoOS/action-package-deb@0.0.5
+      with:
+        add-suffix: true
+        build-binary: false
+        build-source: true
+        output-dir: ./debian-deb-output
+        source-dir: ./
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: Source DEB Artifacts
+        path: debian-deb-output
+        compression-level: 9 # maximum compression
+
+    - name: Upload to OBS
+      if: ${{ !(github.event_name == 'pull_request') }}
+      uses: LingmoOS/action-upload-to-obs@0.0.4
+      with:
+        remove-old-sources: true
+        obs-package-name: 'lingmo-core'
+        obs-project-name: 'home:elysia:LingmoOS:CI'
+        obs-user-name: ${{ secrets.OBS_CI_USERNAME }}
+        obs-password: ${{ secrets.OBS_CI_TOKEN }}
+        obs-instance-url: 'https://api.opensuse.org'
+        local-package-dir: './debian-deb-output'

.github/workflows/build.yml

@@ -7,17 +7,22 @@ on:
     branches: [ main ]
 
 jobs:
-  ubuntu:
-    name: Ubuntu
+  debian:
+    name: Debian Trixie
     runs-on: ubuntu-latest
+    container: docker.io/library/debian:trixie
     steps:
     - name: Checkout Source
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+    
     - name: Update repository
-      run: sudo apt-get update -y
+      run: apt-get update -y
+
     - name: Install the basic dev packages
-      run: sudo apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++
+      run: apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++
+
     - name: Install build dependencies
-      run: sudo mk-build-deps -i -t "apt-get --yes" -r
+      run: mk-build-deps -i -t "apt-get --yes" -r
+
     - name: Build Package
-      run: sudo dpkg-buildpackage -b -uc -us -j$(nproc)
+      run: dpkg-buildpackage -b -uc -us -j$(nproc)

CMakeLists.txt

@@ -10,10 +10,14 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# add_compile_options(-Wall)
+# add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
 
-set(QT Core Gui Widgets Quick QuickControls2 DBus Xml X11Extras LinguistTools)
-find_package(Qt5 REQUIRED ${QT})
+set(QT Core Gui Widgets Quick QuickControls2 DBus Xml LinguistTools)
+find_package(Qt6 REQUIRED ${QT})
+
 # find_package(LingmoUI REQUIRED)
 find_package(PkgConfig REQUIRED)
 

Desktop/Lingmo

@@ -1,2 +1,2 @@
 # Desktop Config
-Version=2.0.0
+Version=3.0.0

PKGBUILD

@@ -1,7 +1,6 @@
 find_package(ECM REQUIRED NO_MODULE)
 list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
-find_package(Qt5 COMPONENTS Core Widgets DBus X11Extras REQUIRED)
 find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
 find_package(X11)
 
@@ -19,10 +18,10 @@ add_executable(lingmo-chotkeys
 
 target_link_libraries(lingmo-chotkeys
     PRIVATE
-    Qt5::Core
-    Qt5::Widgets
-    Qt5::DBus
-    Qt5::X11Extras
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::DBus
+    Qt6::GuiPrivate
     ${XCB_LIBS}
     ${X11_LIBRARIES}
     XCB::KEYSYMS

chotkeys/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 #include <QApplication>
 #include <QKeySequence>
-#include <QX11Info>
+#include <QtGui/private/qtx11extras_p.h>
 #include <QTimer>
 #include <QDebug>
 
@@ -27,7 +27,7 @@ Hotkeys::~Hotkeys()
     qApp->removeNativeEventFilter(this);
 }
 
-bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
 {
     Q_UNUSED(result);
 

chotkeys/hotkeys.cpp

@@ -18,7 +18,7 @@ class Hotkeys : public QObject, public QAbstractNativeEventFilter
     explicit Hotkeys(QObject *parent = nullptr);
     ~Hotkeys();
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
 
     void registerKey(QKeySequence keySequence);
     void registerKey(quint32 keycode);

chotkeys/hotkeys.h

@@ -8,19 +8,17 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
-
 add_executable(lingmo-clipboard
   main.cpp
   clipboard.cpp
 )
 target_link_libraries(lingmo-clipboard
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
 )
 
 install(TARGETS lingmo-clipboard DESTINATION ${CMAKE_INSTALL_BINDIR})