Skip to content

Commit 3d746ae

Browse files
lingmo-dreamlingmo-dream
committed
sync+fix: merge upstream and fix issues
1 parent a970038 commit 3d746ae

202 files changed

Lines changed: 736 additions & 1423 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@ set(CMAKE_AUTORCC ON)
1010
set(CMAKE_CXX_STANDARD 17)
1111
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1212

13-
# add_compile_options(-Wall)
14-
# add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
15-
1613
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
1714

18-
set(QT Core Gui Widgets Quick QuickControls2 DBus Xml LinguistTools)
19-
find_package(Qt6 REQUIRED ${QT})
20-
15+
set(QT Core Gui Widgets Quick QuickControls2 DBus Xml X11Extras LinguistTools)
16+
find_package(Qt5 REQUIRED ${QT})
2117
# find_package(LingmoUI REQUIRED)
2218
find_package(PkgConfig REQUIRED)
2319

‎Desktop/Lingmo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Desktop Config
2-
Version=3.0.0
2+
Version=2.0.0

‎PKGBUILD‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
pkgname="lingmo-core"
2+
pkgver="2.0.0"
3+
pkgrel="1"
4+
pkgdesc="LingmoOS & LingmoDE Core"
5+
arch=("x86_64")
6+
depends=('lingmoui' 'liblingmo' 'qt5-quickcontrols2' 'libpulse' 'libxcursor' 'libxtst' 'polkit-qt5')
7+
makedepends=('extra-cmake-modules' 'ninja' 'qt5-tools' 'xf86-input-libinput' 'xf86-input-synaptics' 'xorg-server-devel' 'git')
8+
license=('GPL')
9+
source=("./*")
10+
sha512sums=("SKIP")
11+
provides=("$pkgname")
12+
conflicts=("$pkgname")
13+
build() {
14+
cmake -DCMAKE_INSTALL_PREFIX=/usr .
15+
make
16+
}
17+
18+
package() {
19+
make DESTDIR="$pkgdir" install
20+
}

‎chotkeys/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
find_package(ECM REQUIRED NO_MODULE)
22
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
33

4+
find_package(Qt5 COMPONENTS Core Widgets DBus X11Extras REQUIRED)
45
find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
56
find_package(X11)
67

@@ -18,10 +19,10 @@ add_executable(lingmo-chotkeys
1819

1920
target_link_libraries(lingmo-chotkeys
2021
PRIVATE
21-
Qt6::Core
22-
Qt6::Widgets
23-
Qt6::DBus
24-
Qt6::GuiPrivate
22+
Qt5::Core
23+
Qt5::Widgets
24+
Qt5::DBus
25+
Qt5::X11Extras
2526
${XCB_LIBS}
2627
${X11_LIBRARIES}
2728
XCB::KEYSYMS

‎chotkeys/application.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ void Application::initSetting()
4747
setting.setValue("Exec","lingmo-debinstaller");
4848
setting.endGroup();
4949

50+
setting.beginGroup("Ctrl+Alt+Del");
51+
setting.setValue("Comment","ShutdownUI");
52+
setting.setValue("Exec","lingmo-shutdown");
53+
setting.endGroup();
54+
5055
}
5156

5257
all = setting.childGroups();

‎chotkeys/hotkeys.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <QApplication>
44
#include <QKeySequence>
5-
#include <QtGui/private/qtx11extras_p.h>
5+
#include <QX11Info>
66
#include <QTimer>
77
#include <QDebug>
88

@@ -27,7 +27,7 @@ Hotkeys::~Hotkeys()
2727
qApp->removeNativeEventFilter(this);
2828
}
2929

30-
bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
30+
bool Hotkeys::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
3131
{
3232
Q_UNUSED(result);
3333

‎chotkeys/hotkeys.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Hotkeys : public QObject, public QAbstractNativeEventFilter
1818
explicit Hotkeys(QObject *parent = nullptr);
1919
~Hotkeys();
2020

21-
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
21+
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
2222

2323
void registerKey(QKeySequence keySequence);
2424
void registerKey(quint32 keycode);

‎clipboard/CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ set(CMAKE_AUTOUIC ON)
88
set(CMAKE_AUTOMOC ON)
99
set(CMAKE_AUTORCC ON)
1010

11-
set(CMAKE_CXX_STANDARD 17)
11+
set(CMAKE_CXX_STANDARD 11)
1212
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1313

14+
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
15+
1416
add_executable(lingmo-clipboard
1517
main.cpp
1618
clipboard.cpp
1719
)
1820
target_link_libraries(lingmo-clipboard
19-
Qt6::Core
20-
Qt6::Gui
21-
Qt6::Widgets
21+
Qt5::Core
22+
Qt5::Gui
23+
Qt5::Widgets
2224
)
2325

2426
install(TARGETS lingmo-clipboard DESTINATION ${CMAKE_INSTALL_BINDIR})

‎cpufreq/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ set(SOURCES
77

88
add_executable(${TARGET} ${SOURCES} ${DBUS_SOURCES})
99
target_link_libraries(${TARGET}
10-
Qt6::Core
11-
Qt6::Quick
12-
Qt6::DBus
13-
Qt6::GuiPrivate
10+
Qt5::Core
11+
Qt5::Quick
12+
Qt5::DBus
13+
Qt5::X11Extras
1414
)
1515

1616
configure_file(

‎cupdatecursor/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
find_package(Qt5 COMPONENTS Core Gui X11Extras REQUIRED)
12
find_package(X11)
23

34
add_executable(cupdatecursor
45
main.cpp
56
)
67
target_link_libraries(cupdatecursor
7-
Qt6::Core
8-
Qt6::Gui
9-
Qt6::GuiPrivate
8+
Qt5::Core
9+
Qt5::Gui
10+
Qt5::X11Extras
1011
${X11_LIBRARIES}
1112
X11::X11
1213
X11::Xi

0 commit comments

Comments
 (0)