pyrox.dev
Merge pull request #310305 from wineee/dtk6-qt6
deepin.dtk6: init
+5
pkgs/desktops/deepin/default.nix
+5
pkgs/desktops/deepin/default.nix
···
23
image-editor = callPackage ./library/image-editor { };
24
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
25
util-dfm = callPackage ./library/util-dfm { };
26
+
dtk6core = callPackage ./library/dtk6core { };
27
+
dtk6gui = callPackage ./library/dtk6gui { };
28
+
dtk6widget = callPackage ./library/dtk6widget { };
29
+
dtk6declarative = callPackage ./library/dtk6declarative { };
30
+
dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
31
32
#### CORE
33
deepin-kwin = callPackage ./core/deepin-kwin { };
+84
pkgs/desktops/deepin/library/dtk6core/default.nix
+84
pkgs/desktops/deepin/library/dtk6core/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, pkg-config
6
+
, doxygen
7
+
, qt6Packages
8
+
, lshw
9
+
, libuchardet
10
+
, spdlog
11
+
, dtkcommon
12
+
, systemd
13
+
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
14
+
}:
15
+
16
+
stdenv.mkDerivation (finalAttrs: {
17
+
pname = "dtk6core";
18
+
version = "6.0.15";
19
+
20
+
src = fetchFromGitHub {
21
+
owner = "linuxdeepin";
22
+
repo = "dtk6core";
23
+
rev = finalAttrs.version;
24
+
hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM=";
25
+
};
26
+
27
+
patches = [
28
+
./fix-pkgconfig-path.patch
29
+
./fix-pri-path.patch
30
+
];
31
+
32
+
nativeBuildInputs = [
33
+
cmake
34
+
pkg-config
35
+
doxygen
36
+
qt6Packages.qttools
37
+
qt6Packages.wrapQtAppsHook
38
+
];
39
+
40
+
dontWrapQtApps = true;
41
+
42
+
buildInputs = [
43
+
qt6Packages.qtbase
44
+
lshw
45
+
libuchardet
46
+
spdlog
47
+
]
48
+
++ lib.optional withSystemd systemd;
49
+
50
+
propagatedBuildInputs = [ dtkcommon ];
51
+
52
+
cmakeFlags = [
53
+
"-DDTK_VERSION=${finalAttrs.version}"
54
+
"-DBUILD_DOCS=ON"
55
+
"-DBUILD_EXAMPLES=OFF"
56
+
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
57
+
"-DDSG_PREFIX_PATH='/run/current-system/sw'"
58
+
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
59
+
"-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
60
+
"-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
61
+
];
62
+
63
+
preConfigure = ''
64
+
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
65
+
# A workaround is to set QT_PLUGIN_PATH explicitly
66
+
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
67
+
'';
68
+
69
+
outputs = [ "out" "dev" "doc" ];
70
+
71
+
postFixup = ''
72
+
for binary in $out/libexec/dtk6/DCore/bin/*; do
73
+
wrapQtApp $binary
74
+
done
75
+
'';
76
+
77
+
meta = {
78
+
description = "Deepin tool kit core library";
79
+
homepage = "https://github.com/linuxdeepin/dtk6core";
80
+
license = lib.licenses.lgpl3Plus;
81
+
platforms = lib.platforms.linux;
82
+
maintainers = lib.teams.deepin.members;
83
+
};
84
+
})
+14
pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch
+14
pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch
···
···
1
+
diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in
2
+
index 83eecb7..da24ce8 100644
3
+
--- a/misc/dtkcore.pc.in
4
+
+++ b/misc/dtkcore.pc.in
5
+
@@ -1,7 +1,7 @@
6
+
prefix=@CMAKE_INSTALL_PREFIX@
7
+
exec_prefix=${prefix}
8
+
-libdir=${prefix}/@LIBRARY_INSTALL_DIR@
9
+
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
10
+
+libdir=@LIBRARY_INSTALL_DIR@
11
+
+includedir=@INCLUDE_INSTALL_DIR@
12
+
13
+
Name: dtk@DTK_VERSION_MAJOR@core
14
+
Description: Deepin Tool Kit dtkcore header files
+17
pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch
+17
pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch
···
···
1
+
diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in
2
+
index a331f52..ce01dc0 100644
3
+
--- a/misc/qt_lib_dtkcore.pri.in
4
+
+++ b/misc/qt_lib_dtkcore.pri.in
5
+
@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@
6
+
QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@
7
+
QT.dtkcore.name = dtkcore
8
+
QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core
9
+
-QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
10
+
-QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
11
+
-QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
12
+
+QT.dtkcore.tools = @TOOL_INSTALL_DIR@
13
+
+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@
14
+
+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@
15
+
QT.dtkcore.frameworks =
16
+
QT.dtkcore.depends = core dbus xml
17
+
QT.dtkcore.module_config = v2 ltcg
+70
pkgs/desktops/deepin/library/dtk6declarative/default.nix
+70
pkgs/desktops/deepin/library/dtk6declarative/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, pkg-config
6
+
, doxygen
7
+
, qt6Packages
8
+
, dtk6gui
9
+
}:
10
+
11
+
stdenv.mkDerivation (finalAttrs: {
12
+
pname = "dtk6declarative";
13
+
version = "6.0.15";
14
+
15
+
src = fetchFromGitHub {
16
+
owner = "linuxdeepin";
17
+
repo = "dtk6declarative";
18
+
rev = finalAttrs.version;
19
+
hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0=";
20
+
};
21
+
22
+
patches = [
23
+
./fix-pkgconfig-path.patch
24
+
./fix-pri-path.patch
25
+
];
26
+
27
+
nativeBuildInputs = [
28
+
cmake
29
+
pkg-config
30
+
doxygen
31
+
qt6Packages.qttools
32
+
qt6Packages.wrapQtAppsHook
33
+
];
34
+
35
+
propagatedBuildInputs = [
36
+
dtk6gui
37
+
] ++ (with qt6Packages ; [
38
+
qtbase
39
+
qtdeclarative
40
+
qtshadertools
41
+
qt5compat
42
+
]);
43
+
44
+
cmakeFlags = [
45
+
"-DDTK_VERSION=${finalAttrs.version}"
46
+
"-DBUILD_DOCS=ON"
47
+
"-DBUILD_EXAMPLES=ON"
48
+
"-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
49
+
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
50
+
"-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}"
51
+
];
52
+
53
+
preConfigure = ''
54
+
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
55
+
# A workaround is to set QT_PLUGIN_PATH explicitly
56
+
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
57
+
export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix}
58
+
'';
59
+
60
+
outputs = [ "out" "dev" "doc" ];
61
+
62
+
meta = {
63
+
description = "A widget development toolkit based on QtQuick/QtQml";
64
+
mainProgram = "dtk-exhibition";
65
+
homepage = "https://github.com/linuxdeepin/dtk6declarative";
66
+
license = lib.licenses.lgpl3Plus;
67
+
platforms = lib.platforms.linux;
68
+
maintainers = lib.teams.deepin.members;
69
+
};
70
+
})
+14
pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch
+14
pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch
···
···
1
+
diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in
2
+
index dc3827f..fd0949e 100644
3
+
--- a/misc/dtkdeclarative.pc.in
4
+
+++ b/misc/dtkdeclarative.pc.in
5
+
@@ -1,7 +1,7 @@
6
+
prefix=@CMAKE_INSTALL_PREFIX@
7
+
exec_prefix=${prefix}
8
+
-libdir=${prefix}/@LIB_INSTALL_DIR@
9
+
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
10
+
+libdir=@LIB_INSTALL_DIR@
11
+
+includedir=@INCLUDE_INSTALL_DIR@
12
+
13
+
Name: DtkDeclarative
14
+
Description: Deepin Tool Kit DtkDeclarative header files
+15
pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch
+15
pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch
···
···
1
+
diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in
2
+
index 8797802..44e32a3 100644
3
+
--- a/misc/qt_lib_dtkdeclarative.pri.in
4
+
+++ b/misc/qt_lib_dtkdeclarative.pri.in
5
+
@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@
6
+
QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@
7
+
QT.dtkdeclarative.name = dtkdeclarative
8
+
QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative
9
+
-QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
10
+
-QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
11
+
+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@
12
+
+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@
13
+
QT.dtkdeclarative.frameworks =
14
+
QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private
15
+
QT.dtkdeclarative.module_config = v2 ltcg
+74
pkgs/desktops/deepin/library/dtk6gui/default.nix
+74
pkgs/desktops/deepin/library/dtk6gui/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, pkg-config
6
+
, doxygen
7
+
, qt6Packages
8
+
, dtk6core
9
+
, librsvg
10
+
}:
11
+
12
+
stdenv.mkDerivation (finalAttrs: {
13
+
pname = "dtk6gui";
14
+
version = "6.0.15";
15
+
16
+
src = fetchFromGitHub {
17
+
owner = "linuxdeepin";
18
+
repo = "dtk6gui";
19
+
rev = finalAttrs.version;
20
+
hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw=";
21
+
};
22
+
23
+
patches = [
24
+
./fix-pkgconfig-path.patch
25
+
./fix-pri-path.patch
26
+
];
27
+
28
+
nativeBuildInputs = [
29
+
cmake
30
+
pkg-config
31
+
doxygen
32
+
qt6Packages.qttools
33
+
qt6Packages.wrapQtAppsHook
34
+
];
35
+
36
+
buildInputs = [
37
+
qt6Packages.qtbase
38
+
librsvg
39
+
];
40
+
41
+
propagatedBuildInputs = [
42
+
dtk6core
43
+
qt6Packages.qtimageformats
44
+
];
45
+
46
+
cmakeFlags = [
47
+
"-DDTK_VERSION=${finalAttrs.version}"
48
+
"-DBUILD_DOCS=ON"
49
+
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
50
+
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
51
+
];
52
+
53
+
preConfigure = ''
54
+
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
55
+
# A workaround is to set QT_PLUGIN_PATH explicitly
56
+
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
57
+
'';
58
+
59
+
outputs = [ "out" "dev" "doc" ];
60
+
61
+
postFixup = ''
62
+
for binary in $out/libexec/dtk6/DGui/bin/*; do
63
+
wrapQtApp $binary
64
+
done
65
+
'';
66
+
67
+
meta = {
68
+
description = "Deepin Toolkit, gui module for DDE look and feel";
69
+
homepage = "https://github.com/linuxdeepin/dtk6gui";
70
+
license = lib.licenses.lgpl3Plus;
71
+
platforms = lib.platforms.linux;
72
+
maintainers = lib.teams.deepin.members;
73
+
};
74
+
})
+16
pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch
+16
pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch
···
···
1
+
diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in
2
+
index 89fdbbf..ad817c4 100644
3
+
--- a/misc/dtkgui.pc.in
4
+
+++ b/misc/dtkgui.pc.in
5
+
@@ -1,8 +1,8 @@
6
+
prefix=@CMAKE_INSTALL_PREFIX@
7
+
exec_prefix=${prefix}
8
+
-libdir=${prefix}/@LIBRARY_INSTALL_DIR@
9
+
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
10
+
-tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@
11
+
+libdir=@LIBRARY_INSTALL_DIR@
12
+
+includedir=@INCLUDE_INSTALL_DIR@
13
+
+tooldir=@PACKAGE_TOOL_INSTALL_DIR@
14
+
15
+
Name: dtk@DTK_VERSION_MAJOR@gui
16
+
Description: Deepin Tool Kit dtkgui header files
+17
pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch
+17
pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch
···
···
1
+
diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in
2
+
index 28308ee..9fb25e6 100644
3
+
--- a/misc/qt_lib_dtkgui.pri.in
4
+
+++ b/misc/qt_lib_dtkgui.pri.in
5
+
@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@
6
+
QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@
7
+
QT.dtkgui.name = dtkgui
8
+
QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui
9
+
-QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
10
+
-QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
11
+
-QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
12
+
+QT.dtkgui.tools = @TOOL_INSTALL_DIR@
13
+
+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@
14
+
+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@
15
+
QT.dtkgui.frameworks =
16
+
QT.dtkgui.depends = core gui dtkcore gui_private dbus network
17
+
QT.dtkgui.module_config = v2 internal_module ltcg
+63
pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
+63
pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, fetchpatch
5
+
, cmake
6
+
, pkg-config
7
+
, doxygen
8
+
, qt6Packages
9
+
, dtk6core
10
+
, libxcrypt
11
+
}:
12
+
13
+
stdenv.mkDerivation rec {
14
+
pname = "dtk6systemsettings";
15
+
version = "6.0.2";
16
+
17
+
src = fetchFromGitHub {
18
+
owner = "linuxdeepin";
19
+
repo = pname;
20
+
rev = version;
21
+
hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs=";
22
+
};
23
+
24
+
nativeBuildInputs = [
25
+
cmake
26
+
pkg-config
27
+
doxygen
28
+
qt6Packages.qttools
29
+
];
30
+
31
+
dontWrapQtApps = true;
32
+
33
+
buildInputs = [
34
+
qt6Packages.qtbase
35
+
dtk6core
36
+
libxcrypt
37
+
];
38
+
39
+
cmakeFlags = [
40
+
"-DDTK_VERSION=${version}"
41
+
"-DBUILD_DOCS=ON"
42
+
"-DBUILD_EXAMPLES=OFF"
43
+
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
44
+
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
45
+
"-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings"
46
+
];
47
+
48
+
preConfigure = ''
49
+
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
50
+
# A workaround is to set QT_PLUGIN_PATH explicitly
51
+
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
52
+
'';
53
+
54
+
outputs = [ "out" "dev" "doc" ];
55
+
56
+
meta = {
57
+
description = "Qt-based development library for system settings";
58
+
homepage = "https://github.com/linuxdeepin/dtk6systemsettings";
59
+
license = lib.licenses.lgpl3Plus;
60
+
platforms = lib.platforms.linux;
61
+
maintainers = lib.teams.deepin.members;
62
+
};
63
+
}
+83
pkgs/desktops/deepin/library/dtk6widget/default.nix
+83
pkgs/desktops/deepin/library/dtk6widget/default.nix
···
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, pkg-config
6
+
, doxygen
7
+
, qt6Packages
8
+
, dtk6gui
9
+
, cups
10
+
, libstartup_notification
11
+
}:
12
+
13
+
stdenv.mkDerivation (finalAttrs: {
14
+
pname = "dtk6widget";
15
+
version = "6.0.15";
16
+
17
+
src = fetchFromGitHub {
18
+
owner = "linuxdeepin";
19
+
repo = "dtk6widget";
20
+
rev = finalAttrs.version;
21
+
hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ=";
22
+
};
23
+
24
+
patches = [
25
+
./fix-pkgconfig-path.patch
26
+
./fix-pri-path.patch
27
+
./fix-build-on-qt-6_7.patch
28
+
];
29
+
30
+
postPatch = ''
31
+
substituteInPlace src/widgets/dapplication.cpp \
32
+
--replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
33
+
"auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
34
+
'';
35
+
36
+
nativeBuildInputs = [
37
+
cmake
38
+
doxygen
39
+
pkg-config
40
+
qt6Packages.qttools
41
+
qt6Packages.wrapQtAppsHook
42
+
];
43
+
44
+
buildInputs = [
45
+
cups
46
+
libstartup_notification
47
+
] ++ (with qt6Packages; [
48
+
qtbase
49
+
qtmultimedia
50
+
qtsvg
51
+
]);
52
+
53
+
propagatedBuildInputs = [ dtk6gui ];
54
+
55
+
cmakeFlags = [
56
+
"-DDTK_VERSION=${finalAttrs.version}"
57
+
"-DBUILD_DOCS=ON"
58
+
"-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
59
+
"-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc"
60
+
];
61
+
62
+
preConfigure = ''
63
+
# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
64
+
# A workaround is to set QT_PLUGIN_PATH explicitly
65
+
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
66
+
'';
67
+
68
+
outputs = [ "out" "dev" "doc" ];
69
+
70
+
postFixup = ''
71
+
for binary in $out/lib/dtk6/DWidget/bin/*; do
72
+
wrapQtApp $binary
73
+
done
74
+
'';
75
+
76
+
meta = {
77
+
description = "Deepin graphical user interface library";
78
+
homepage = "https://github.com/linuxdeepin/dtk6widget";
79
+
license = lib.licenses.lgpl3Plus;
80
+
platforms = lib.platforms.linux;
81
+
maintainers = lib.teams.deepin.members;
82
+
};
83
+
})
+20
pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch
+20
pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch
···
···
1
+
diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp
2
+
index a99e17ae..0e1c57f6 100644
3
+
--- a/src/widgets/dkeysequenceedit.cpp
4
+
+++ b/src/widgets/dkeysequenceedit.cpp
5
+
@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e)
6
+
}
7
+
8
+
if (e->modifiers() & Qt::ShiftModifier) {
9
+
- QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
10
+
+ auto possibleKeys = QKeyMapper::possibleKeys(e);
11
+
int pkTotal = possibleKeys.count();
12
+
if (!pkTotal)
13
+
return;
14
+
bool found = false;
15
+
for (int i = 0; i < possibleKeys.size(); ++i) {
16
+
- if (possibleKeys.at(i) - nextKey == int(e->modifiers())
17
+
+ if (static_cast<int>(possibleKeys.at(i)) - nextKey == static_cast<int>(e->modifiers())
18
+
|| (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) {
19
+
nextKey = possibleKeys.at(i);
20
+
found = true;
+14
pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch
+14
pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch
···
···
1
+
diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in
2
+
index 3c610669..b6ed04ca 100644
3
+
--- a/misc/DtkWidget.pc.in
4
+
+++ b/misc/DtkWidget.pc.in
5
+
@@ -1,7 +1,7 @@
6
+
prefix=@CMAKE_INSTALL_PREFIX@
7
+
exec_prefix=${prefix}
8
+
-libdir=${prefix}/@LIBRARY_INSTALL_DIR@
9
+
-includedir=${prefix}/@INCLUDE_INSTALL_DIR@
10
+
+libdir=@LIBRARY_INSTALL_DIR@
11
+
+includedir=@INCLUDE_INSTALL_DIR@
12
+
13
+
Name: dtk@DTK_VERSION_MAJOR@widget
14
+
Description: Deepin Tool Kit dtkwidget header files
+17
pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch
+17
pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch
···
···
1
+
diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in
2
+
index 623878d3..561f5186 100644
3
+
--- a/misc/qt_lib_DtkWidget.pri.in
4
+
+++ b/misc/qt_lib_DtkWidget.pri.in
5
+
@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@
6
+
QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@
7
+
QT.dtkwidget.name = dtkwidget
8
+
QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget
9
+
-QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
10
+
-QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
11
+
-QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
12
+
+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@
13
+
+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@
14
+
+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@
15
+
QT.dtkwidget.frameworks =
16
+
QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus
17
+
QT.dtkwidget.module_config = v2 internal_module ltcg