!8 Synchronize master branch, update to 2.0.0
From: @hua_yadong Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
95919b4d94
@ -1,123 +1,187 @@
|
|||||||
From 372944e4a6ef23342bc3cb12d72231ff81d3dc2e Mon Sep 17 00:00:00 2001
|
From 6d0226bdf0fbf63c80879aa2884fe6f22df7a745 Mon Sep 17 00:00:00 2001
|
||||||
From: peijiankang <peijiankang@kylinos.cn>
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
Date: Wed, 2 Nov 2022 19:43:28 +0800
|
Date: Wed, 30 Nov 2022 13:43:19 +0800
|
||||||
Subject: [PATCH] fix compile error of libkysdk-applications
|
Subject: [PATCH] fix compile error of libkysdk-applications
|
||||||
|
|
||||||
---
|
---
|
||||||
development-files/kysdk-kabase.pc | 2 +-
|
kysdk-alm/kysdk-alm.pro | 12 ++++++++++-
|
||||||
development-files/kysdk-qtwidgets.pc | 2 +-
|
kysdk-application.pro | 6 ++++++
|
||||||
development-files/kysdk-widgetutils.pc | 2 +-
|
kysdk-kabase/kabase/image/utils.cpp | 8 ++++----
|
||||||
kysdk-kabase/kabase/kabase.pro | 14 ++++++++++++++
|
kysdk-kabase/kabase/kabase.pro | 20 +++++++++++++++++--
|
||||||
kysdk-qtwidgets/kysdk-qtwidgets.pro | 10 +++++++++-
|
.../kylin_image_codec/kylinimagecodec.cpp | 4 ++--
|
||||||
kysdk-widgetutils/kysdk-widgetutils.pro | 8 ++++++--
|
kysdk-ukenv/kysdk-ukenv.pro | 12 ++++++++++-
|
||||||
.../build-testWidgetutils-unknown-Debug/Makefile | 2 +-
|
kysdk-waylandhelper/kysdk-waylandhelper.pro | 8 ++++++--
|
||||||
7 files changed, 33 insertions(+), 7 deletions(-)
|
kysdk-widgetutils/kysdk-widgetutils.pro | 5 ++++-
|
||||||
|
8 files changed, 62 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
diff --git a/development-files/kysdk-kabase.pc b/development-files/kysdk-kabase.pc
|
diff --git a/kysdk-alm/kysdk-alm.pro b/kysdk-alm/kysdk-alm.pro
|
||||||
index 3f32fb3..b96b997 100644
|
index d45dc56..63ed0ec 100644
|
||||||
--- a/development-files/kysdk-kabase.pc
|
--- a/kysdk-alm/kysdk-alm.pro
|
||||||
+++ b/development-files/kysdk-kabase.pc
|
+++ b/kysdk-alm/kysdk-alm.pro
|
||||||
@@ -2,4 +2,4 @@ Name: libkysdk-kabase
|
@@ -8,4 +8,14 @@ HEADERS += src/singleapplication/singleapplication.h \
|
||||||
Description: Application general interface
|
src/singleapplication/localpeer.h \
|
||||||
Version: 1.0.0
|
|
||||||
Cflags: -I/usr/include/kysdk/applications/kabase/
|
SOURCES += src/singleapplication/singleapplication.cpp \
|
||||||
-Libs: -L/usr/libs/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/libs/kysdk/applications/
|
- src/singleapplication/localpeer.cpp \
|
||||||
+Libs: -L/usr/lib/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/lib/kysdk/applications/
|
\ No newline at end of file
|
||||||
diff --git a/development-files/kysdk-qtwidgets.pc b/development-files/kysdk-qtwidgets.pc
|
+ src/singleapplication/localpeer.cpp \
|
||||||
index c17b7c2..b123e2f 100644
|
|
||||||
--- a/development-files/kysdk-qtwidgets.pc
|
|
||||||
+++ b/development-files/kysdk-qtwidgets.pc
|
|
||||||
@@ -2,5 +2,5 @@ Name: libkysdk-qtwidgets
|
|
||||||
Description: KYSDK-gui
|
|
||||||
Requires: Qt5Widgets >= 5.12.1 gsettings-qt
|
|
||||||
Version: 1.0.0
|
|
||||||
-Libs: -L/ -L/usr/libs/kysdk/applications/ -lkysdk-qtwidgets -Wl,-rpath=/usr/libs/kysdk/applications/
|
|
||||||
+Libs: -L/ -L/usr/lib/kysdk/applications/ -lkysdk-qtwidgets -Wl,-rpath=/usr/lib/kysdk/applications/
|
|
||||||
Cflags: -I/usr/include/kysdk/applications/
|
|
||||||
diff --git a/development-files/kysdk-widgetutils.pc b/development-files/kysdk-widgetutils.pc
|
|
||||||
index a26df80..8b76ebc 100644
|
|
||||||
--- a/development-files/kysdk-widgetutils.pc
|
|
||||||
+++ b/development-files/kysdk-widgetutils.pc
|
|
||||||
@@ -2,5 +2,5 @@ Name: libkysdk-widgetutils
|
|
||||||
Description: KYSDK-gui
|
|
||||||
Requires: Qt5Widgets >= 5.12.1 gsettings-qt
|
|
||||||
Version: 1.0.0
|
|
||||||
-Libs: -L/ -L/usr/libs/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/libs/kysdk/applications/
|
|
||||||
+Libs: -L/ -L/usr/lib/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/lib/kysdk/applications/
|
|
||||||
Cflags: -I/usr/include/kysdk/applications/
|
|
||||||
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
|
|
||||||
index e92bf08..6e5005e 100644
|
|
||||||
--- a/kysdk-kabase/kabase/kabase.pro
|
|
||||||
+++ b/kysdk-kabase/kabase/kabase.pro
|
|
||||||
@@ -41,3 +41,17 @@ QT += x11extras KWindowSystem
|
|
||||||
LIBS +=-lpthread
|
|
||||||
LIBS +=-lX11
|
|
||||||
LIBS +=-lpeony
|
|
||||||
+
|
+
|
||||||
+# Default rules for deployment.
|
+# Default rules for deployment.
|
||||||
|
+unix {
|
||||||
|
+ target.path = /usr/lib/kysdk/applications/
|
||||||
|
+}
|
||||||
+!isEmpty(target.path): INSTALLS += target
|
+!isEmpty(target.path): INSTALLS += target
|
||||||
|
+
|
||||||
|
+headers.files = $${HEADERS}
|
||||||
|
+headers.path = /usr/include/kysdk/applications/
|
||||||
|
+INSTALLS += headers
|
||||||
|
diff --git a/kysdk-application.pro b/kysdk-application.pro
|
||||||
|
index 90eb59d..eaf57fe 100644
|
||||||
|
--- a/kysdk-application.pro
|
||||||
|
+++ b/kysdk-application.pro
|
||||||
|
@@ -10,6 +10,12 @@ SUBDIRS = \
|
||||||
|
kysdk-alm \
|
||||||
|
kysdk-ukenv
|
||||||
|
|
||||||
|
+pc.files = development-files/*.pc
|
||||||
|
+pc.path = /usr/share/pkgconfig
|
||||||
|
+conf.files = config/kysdk-applications.conf
|
||||||
|
+conf.path = /etc/ld.so.conf.d/
|
||||||
|
+# Default rules for deployment.
|
||||||
|
+INSTALLS += pc conf
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/kysdk-kabase/kabase/image/utils.cpp b/kysdk-kabase/kabase/image/utils.cpp
|
||||||
|
index 2f1d979..96d0bc7 100644
|
||||||
|
--- a/kysdk-kabase/kabase/image/utils.cpp
|
||||||
|
+++ b/kysdk-kabase/kabase/image/utils.cpp
|
||||||
|
@@ -144,9 +144,9 @@ FREE_IMAGE_FORMAT Utils::getImageFiFormat(QString path)
|
||||||
|
return FIF_GIF;
|
||||||
|
case image::ImageFormat::HDR:
|
||||||
|
return FIF_HDR;
|
||||||
|
- case image::ImageFormat::FAX:
|
||||||
|
- case image::ImageFormat::G3:
|
||||||
|
- return FIF_FAXG3;
|
||||||
|
+// case image::ImageFormat::FAX:
|
||||||
|
+// case image::ImageFormat::G3:
|
||||||
|
+// return FIF_FAXG3;
|
||||||
|
case image::ImageFormat::SGI:
|
||||||
|
return FIF_SGI;
|
||||||
|
case image::ImageFormat::CUT:
|
||||||
|
@@ -286,4 +286,4 @@ bool Utils::deleteDir(QString path)
|
||||||
|
}
|
||||||
|
|
||||||
|
} /* namespace kabase */
|
||||||
|
-} /* namespace kdk */
|
||||||
|
\ No newline at end of file
|
||||||
|
+} /* namespace kdk */
|
||||||
|
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
|
||||||
|
index 38dc8b7..07df867 100644
|
||||||
|
--- a/kysdk-kabase/kabase/kabase.pro
|
||||||
|
+++ b/kysdk-kabase/kabase/kabase.pro
|
||||||
|
@@ -14,7 +14,7 @@ CONFIG += c++11 console link_pkgconfig no_keywords
|
||||||
|
LIBS += -ldl -lpthread -lsystemd -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base
|
||||||
|
|
||||||
|
greaterThan(QT_VER_MAJ , 4) {
|
||||||
|
- LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lstb -lfreeimage -lfreeimageplus
|
||||||
|
+ LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lfreeimage -lfreeimageplus
|
||||||
|
} else {
|
||||||
|
message("--- v10 project ---")
|
||||||
|
}
|
||||||
|
@@ -79,4 +79,20 @@ greaterThan(QT_VER_MAJ , 4) {
|
||||||
|
}
|
||||||
|
|
||||||
|
# 窗管模块
|
||||||
|
-QT += x11extras KWindowSystem
|
||||||
|
\ No newline at end of file
|
||||||
|
+QT += x11extras KWindowSystem
|
||||||
|
+
|
||||||
|
+# Default rules for deployment.
|
||||||
+unix {
|
+unix {
|
||||||
+ target.path = /usr/lib/kysdk/applications/
|
+ target.path = /usr/lib/kysdk/applications/
|
||||||
+ config.files += ../../development-files/kysdk-kabase.pc
|
+ include.files += *.hpp kylin_system
|
||||||
+ config.path = /usr/share/pkgconfig
|
|
||||||
+ include.files += *.hpp kylin_system/*.hpp
|
|
||||||
+ include.path = /usr/include/kysdk/applications/kabase
|
+ include.path = /usr/include/kysdk/applications/kabase
|
||||||
+ log.files += ../config/log/kabase-log.conf
|
+ kylin_system.files += kylin_image_codec/*.hpp
|
||||||
+ log.path = /etc/kysdk/kysdk-applications/kabase/
|
+ kylin_image_codec.files += kylin_image_codec/*.hpp
|
||||||
|
+ single_application.files += single_application/*.hpp
|
||||||
|
+ kylin_system.path = /usr/include/kysdk/applications/kabase/kylin_system
|
||||||
|
+ kylin_image_codec.path = /usr/include/kysdk/applications/kabase/kylin_image_codec
|
||||||
|
+ single_application.path = /usr/include/kysdk/applications/kabase/single_application
|
||||||
+}
|
+}
|
||||||
+!isEmpty(target.path): INSTALLS += target config include log
|
+!isEmpty(target.path): INSTALLS += target include kylin_system kylin_image_codec single_application
|
||||||
+
|
+
|
||||||
diff --git a/kysdk-qtwidgets/kysdk-qtwidgets.pro b/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
+
|
||||||
index 72c8736..0d08dfa 100644
|
diff --git a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
|
||||||
--- a/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
index 760e5e3..86d4966 100644
|
||||||
+++ b/kysdk-qtwidgets/kysdk-qtwidgets.pro
|
--- a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
|
||||||
@@ -96,7 +96,15 @@ HEADERS += \
|
+++ b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
|
||||||
src/xatom-helper.h \
|
@@ -75,8 +75,8 @@ QHash<QString, int> KylinImageCodec::creatFormats()
|
||||||
|
tmpFormats.insert("DDS", FIF_DDS);
|
||||||
|
tmpFormats.insert("GIF", FIF_GIF);
|
||||||
|
tmpFormats.insert("HDR", FIF_HDR);
|
||||||
|
- tmpFormats.insert("FAX", FIF_FAXG3);
|
||||||
|
- tmpFormats.insert("G3", FIF_FAXG3);
|
||||||
|
+// tmpFormats.insert("FAX", FIF_FAXG3);
|
||||||
|
+// tmpFormats.insert("G3", FIF_FAXG3);
|
||||||
|
tmpFormats.insert("SGI", FIF_SGI);
|
||||||
|
tmpFormats.insert("CUT", FIF_CUT);
|
||||||
|
tmpFormats.insert("JNG", FIF_JNG);
|
||||||
|
diff --git a/kysdk-ukenv/kysdk-ukenv.pro b/kysdk-ukenv/kysdk-ukenv.pro
|
||||||
|
index 3d7b4ed..177b153 100644
|
||||||
|
--- a/kysdk-ukenv/kysdk-ukenv.pro
|
||||||
|
+++ b/kysdk-ukenv/kysdk-ukenv.pro
|
||||||
|
@@ -12,4 +12,14 @@ HEADERS += src/usermanual.h \
|
||||||
|
|
||||||
|
SOURCES += src/usermanual.cpp \
|
||||||
|
src/currency.cpp \
|
||||||
|
- src/gsettingmonitor.cpp
|
||||||
|
\ No newline at end of file
|
||||||
|
+ src/gsettingmonitor.cpp
|
||||||
|
+
|
||||||
|
+# Default rules for deployment.
|
||||||
|
+unix {
|
||||||
|
+ target.path = /usr/lib/kysdk/applications/
|
||||||
|
+}
|
||||||
|
+!isEmpty(target.path): INSTALLS += target
|
||||||
|
+
|
||||||
|
+headers.files = $${HEADERS}
|
||||||
|
+headers.path = /usr/include/kysdk/applications/
|
||||||
|
+INSTALLS += headers
|
||||||
|
diff --git a/kysdk-waylandhelper/kysdk-waylandhelper.pro b/kysdk-waylandhelper/kysdk-waylandhelper.pro
|
||||||
|
index 790d0d5..bd51d35 100644
|
||||||
|
--- a/kysdk-waylandhelper/kysdk-waylandhelper.pro
|
||||||
|
+++ b/kysdk-waylandhelper/kysdk-waylandhelper.pro
|
||||||
|
@@ -42,8 +42,12 @@ HEADERS += \
|
||||||
|
src/windowmanager/windowmanager.h \
|
||||||
|
src/kysdk-waylandhelper_global.h \
|
||||||
|
|
||||||
|
-headers.files = $${HEADERS}
|
||||||
|
+headers.files = src/*.h src/windowmanager src/ukuistylehelper
|
||||||
|
+windowmanager.files = src/windowmanager/*.h
|
||||||
|
+ukuistylehelper.files = src/ukuistylehelper/*.h
|
||||||
|
headers.path = /usr/include/kysdk/applications/
|
||||||
|
+windowmanager.path = /usr/include/kysdk/applications/windowmanager
|
||||||
|
+ukuistylehelper.path = /usr/include/kysdk/applications/ukuistylehelper
|
||||||
|
target.path = /usr/lib/kysdk/applications/
|
||||||
# Default rules for deployment.
|
# Default rules for deployment.
|
||||||
-!isEmpty(target.path): INSTALLS += target
|
-INSTALLS += target headers
|
||||||
+unix {
|
+INSTALLS += target headers windowmanager ukuistylehelper
|
||||||
+ target.path = /usr/lib/kysdk/applications
|
|
||||||
+ config.files += ../development-files/kysdk-qtwidgets.pc
|
|
||||||
+ config.path = /usr/share/pkgconfig
|
|
||||||
+ include.files += src/*.h
|
|
||||||
+ include.path = /usr/include/kysdk/applications/
|
|
||||||
+ }
|
|
||||||
+!isEmpty(target.path): INSTALLS += target config include
|
|
||||||
+
|
|
||||||
|
|
||||||
RESOURCES += \
|
|
||||||
res.qrc
|
|
||||||
diff --git a/kysdk-widgetutils/kysdk-widgetutils.pro b/kysdk-widgetutils/kysdk-widgetutils.pro
|
diff --git a/kysdk-widgetutils/kysdk-widgetutils.pro b/kysdk-widgetutils/kysdk-widgetutils.pro
|
||||||
index 7aaad6c..95a4139 100644
|
index 7aaad6c..4249aca 100644
|
||||||
--- a/kysdk-widgetutils/kysdk-widgetutils.pro
|
--- a/kysdk-widgetutils/kysdk-widgetutils.pro
|
||||||
+++ b/kysdk-widgetutils/kysdk-widgetutils.pro
|
+++ b/kysdk-widgetutils/kysdk-widgetutils.pro
|
||||||
@@ -25,6 +25,10 @@ HEADERS += \
|
@@ -25,6 +25,9 @@ HEADERS += \
|
||||||
|
|
||||||
# Default rules for deployment.
|
# Default rules for deployment.
|
||||||
unix {
|
unix {
|
||||||
- target.path = /usr/lib
|
- target.path = /usr/lib
|
||||||
+ target.path = /usr/lib/kysdk/applications/
|
+ target.path = /usr/lib/kysdk/applications/
|
||||||
+ config.files += ../development-files/kysdk-widgetutils.pc
|
|
||||||
+ config.path = /usr/share/pkgconfig
|
|
||||||
+ include.files += src/*.h
|
|
||||||
+ include.path = /usr/include/kysdk/applications/
|
|
||||||
}
|
}
|
||||||
-!isEmpty(target.path): INSTALLS += target
|
!isEmpty(target.path): INSTALLS += target
|
||||||
+!isEmpty(target.path): INSTALLS += target config include
|
+headers.files = $${HEADERS}
|
||||||
diff --git a/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile b/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
+headers.path = /usr/include/kysdk/applications/
|
||||||
index f13bb76..6bd9168 100644
|
+INSTALLS += headers
|
||||||
--- a/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
|
||||||
+++ b/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile
|
|
||||||
@@ -40,7 +40,7 @@ DISTNAME = testWidgetutils1.0.0
|
|
||||||
DISTDIR = /home/sunzhen/bianbao/kysdk-application1.0.0kylin8/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/.tmp/testWidgetutils1.0.0
|
|
||||||
LINK = g++
|
|
||||||
LFLAGS =
|
|
||||||
-LIBS = $(SUBLIBS) -L/ -L/usr/libs/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/libs/kysdk/applications/ -lQt5Widgets -lQt5Gui -lQt5Core -lgsettings-qt /usr/lib/aarch64-linux-gnu/libQt5Widgets.so /usr/lib/aarch64-linux-gnu/libQt5Gui.so /usr/lib/aarch64-linux-gnu/libQt5Core.so /usr/lib/aarch64-linux-gnu/libGL.so -lpthread
|
|
||||||
+LIBS = $(SUBLIBS) -L/ -L/usr/lib/kysdk/applications/ -lkysdk-widgetutils -Wl,-rpath=/usr/lib/kysdk/applications/ -lQt5Widgets -lQt5Gui -lQt5Core -lgsettings-qt /usr/lib/aarch64-linux-gnu/libQt5Widgets.so /usr/lib/aarch64-linux-gnu/libQt5Gui.so /usr/lib/aarch64-linux-gnu/libQt5Core.so /usr/lib/aarch64-linux-gnu/libGL.so -lpthread
|
|
||||||
AR = ar cqs
|
|
||||||
RANLIB =
|
|
||||||
SED = sed
|
|
||||||
--
|
--
|
||||||
2.36.1
|
2.36.1
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
libkysdk-applications-2.0.0.tar.gz
Normal file
BIN
libkysdk-applications-2.0.0.tar.gz
Normal file
Binary file not shown.
@ -1,39 +1,57 @@
|
|||||||
%define debug_package %{nil}
|
|
||||||
|
|
||||||
Name: libkysdk-applications
|
Name: libkysdk-applications
|
||||||
Version: 1.0.0
|
Version: 2.0.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Kylin Software Development Kit - Applications Layer Kit
|
Summary: Kylin Software Development Kit - Applications Layer Kit
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch
|
Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch
|
||||||
|
|
||||||
|
BuildRequires: freeimage-devel
|
||||||
|
BuildRequires: giflib-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: qt5-qtx11extras-devel
|
|
||||||
BuildRequires: gsettings-qt-devel
|
BuildRequires: gsettings-qt-devel
|
||||||
|
BuildRequires: kf5-kiconthemes-devel
|
||||||
|
BuildRequires: kf5-kwayland-devel
|
||||||
|
BuildRequires: kf5-kwindowsystem-devel
|
||||||
|
BuildRequires: libkysdk-base-devel
|
||||||
|
BuildRequires: opencv
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
BuildRequires: qt5-qtsvg-devel
|
||||||
|
BuildRequires: qt5-qtx11extras-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: stb-devel
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: wayland-devel
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
|
BuildRequires: pkgconf
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
BuildRequires: qtchooser
|
BuildRequires: qtchooser
|
||||||
BuildRequires: qt5-qttools-devel
|
BuildRequires: qt5-qttools-devel
|
||||||
BuildRequires: pkgconf
|
BuildRequires: chrpath
|
||||||
BuildRequires: kf5-kwindowsystem-devel
|
|
||||||
BuildRequires: libpeony-dev
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
#BuildRequires: kylin-daq
|
|
||||||
BuildRequires: systemd-devel
|
|
||||||
BuildRequires: libkysdk-base libkysdk-base-devel
|
|
||||||
BuildRequires: ukui-interface
|
|
||||||
#compile need but control is not exist
|
|
||||||
BuildRequires: peony
|
|
||||||
|
|
||||||
|
Requires: libkysdk-alm libkysdk-kabase libkysdk-qtwidgets libkysdk-ukenv libkysdk-waylandhelper libkysdk-widgetutils
|
||||||
Requires: libkysdk-qtwidgets libkysdk-qtwidgets-devel libkysdk-widgetutils libkysdk-widgetutils-devel libkysdk-kabase libkysdk-kabase-devel
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Kylin Software Development Kit - Applications Layer Kit
|
Kylin Software Development Kit - Applications Layer Kit
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-appcommon
|
||||||
|
Summary: libdevel
|
||||||
|
|
||||||
|
%description -n libkysdk-appcommon
|
||||||
|
To install ld.so.conf file.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-applications-devel
|
||||||
|
Summary: libdevel
|
||||||
|
Requires: libkysdk-alm-devel libkysdk-kabase-devel libkysdk-qtwidgets-devel libkysdk-ukenv-devel libkysdk-waylandhelper-devel libkysdk-widgetutils-devel
|
||||||
|
|
||||||
|
%description -n libkysdk-applications-devel
|
||||||
|
libkysdk-applications development
|
||||||
|
|
||||||
|
|
||||||
%package -n libkysdk-qtwidgets-devel
|
%package -n libkysdk-qtwidgets-devel
|
||||||
Summary: libdevel
|
Summary: libdevel
|
||||||
Requires: libkysdk-qtwidgets
|
Requires: libkysdk-qtwidgets
|
||||||
@ -44,7 +62,7 @@ kysdk-qtwidgets head file
|
|||||||
|
|
||||||
%package -n libkysdk-qtwidgets
|
%package -n libkysdk-qtwidgets
|
||||||
Summary: libdevel
|
Summary: libdevel
|
||||||
Requires: glib2 qt5-qtbase-gui qt5-qtbase gsettings-qt
|
Requires: glib2 gsettings-qt libkysdk-appcommon qt5-qtbase qt5-qtbase-gui
|
||||||
|
|
||||||
%description -n libkysdk-qtwidgets
|
%description -n libkysdk-qtwidgets
|
||||||
kysdk-qtwidgets shared library
|
kysdk-qtwidgets shared library
|
||||||
@ -52,7 +70,7 @@ kysdk-qtwidgets shared library
|
|||||||
|
|
||||||
%package -n libkysdk-widgetutils-devel
|
%package -n libkysdk-widgetutils-devel
|
||||||
Summary: libdevel
|
Summary: libdevel
|
||||||
Requires: libkysdk-qtwidgets
|
Requires: libkysdk-widgetutils
|
||||||
|
|
||||||
%description -n libkysdk-widgetutils-devel
|
%description -n libkysdk-widgetutils-devel
|
||||||
kysdk-widgetutils head file
|
kysdk-widgetutils head file
|
||||||
@ -60,7 +78,7 @@ kysdk-widgetutils head file
|
|||||||
|
|
||||||
%package -n libkysdk-widgetutils
|
%package -n libkysdk-widgetutils
|
||||||
Summary: libdevel
|
Summary: libdevel
|
||||||
Requires: glib2 qt5-qtbase-gui gsettings-qt
|
Requires: glib2 gsettings-qt libkysdk-appcommon qt5-qtbase-gui
|
||||||
|
|
||||||
%description -n libkysdk-widgetutils
|
%description -n libkysdk-widgetutils
|
||||||
kysdk-widgetutils shared library
|
kysdk-widgetutils shared library
|
||||||
@ -68,7 +86,7 @@ kysdk-widgetutils shared library
|
|||||||
|
|
||||||
%package -n libkysdk-kabase
|
%package -n libkysdk-kabase
|
||||||
Summary: libdevel
|
Summary: libdevel
|
||||||
Requires: ukui-interface libkysdk-config libkysdk-log
|
Requires: libkysdk-appcommon
|
||||||
|
|
||||||
%description -n libkysdk-kabase
|
%description -n libkysdk-kabase
|
||||||
kysdk-kabase shared library
|
kysdk-kabase shared library
|
||||||
@ -82,27 +100,82 @@ Requires: libkysdk-kabase
|
|||||||
kysdk-kabase head file
|
kysdk-kabase head file
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-waylandhelper-devel
|
||||||
|
Summary: libdevel
|
||||||
|
Requires: libkysdk-waylandhelper
|
||||||
|
|
||||||
|
%description -n libkysdk-waylandhelper-devel
|
||||||
|
bkysdk-waylandhelper head file
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-waylandhelper
|
||||||
|
Summary: libdevel
|
||||||
|
Requires: libkysdk-appcommon
|
||||||
|
|
||||||
|
%description -n libkysdk-waylandhelper
|
||||||
|
libkysdk-waylandhelper shared library
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-alm
|
||||||
|
Summary: libdevel
|
||||||
|
|
||||||
|
%description -n libkysdk-alm
|
||||||
|
kysdk-alm shared library
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-alm-devel
|
||||||
|
Summary: libdevel
|
||||||
|
Requires: libkysdk-alm
|
||||||
|
|
||||||
|
%description -n libkysdk-alm-devel
|
||||||
|
kysdk-alm head file
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-ukenv
|
||||||
|
Summary: libdevel
|
||||||
|
|
||||||
|
%description -n libkysdk-ukenv
|
||||||
|
kysdk-ukenv shared library
|
||||||
|
|
||||||
|
|
||||||
|
%package -n libkysdk-ukenv-devel
|
||||||
|
Summary: libdevel
|
||||||
|
Requires: libkysdk-ukenv
|
||||||
|
|
||||||
|
%description -n libkysdk-ukenv-devel
|
||||||
|
kysdk-ukenv head file
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch01 -p1
|
%patch01 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
qmake-qt5 ..
|
%{qmake_qt5} ..
|
||||||
make -j4
|
%{make_build}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
pushd build
|
pushd build
|
||||||
make INSTALL_ROOT=%{buildroot} install
|
%{make_install} INSTALL_ROOT=%{buildroot}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
chrpath -d %{buildroot}/usr/lib/kysdk/applications/libkysdk-qtwidgets.so.1.2.0
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
|
||||||
|
%files -n libkysdk-appcommon
|
||||||
|
%{_sysconfdir}/ld.so.conf.d/kysdk-applications.conf
|
||||||
|
|
||||||
|
%files -n libkysdk-applications-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-applications.pc
|
||||||
|
|
||||||
%files -n libkysdk-qtwidgets-devel
|
%files -n libkysdk-qtwidgets-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-qtwidgets.pc
|
||||||
%{_includedir}/kysdk/applications/gui_g.h
|
%{_includedir}/kysdk/applications/gui_g.h
|
||||||
%{_includedir}/kysdk/applications/kaboutdialog.h
|
%{_includedir}/kysdk/applications/kaboutdialog.h
|
||||||
%{_includedir}/kysdk/applications/kbadge.h
|
%{_includedir}/kysdk/applications/kbadge.h
|
||||||
@ -133,30 +206,74 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/kysdk/applications/kwindowbuttonbar.h
|
%{_includedir}/kysdk/applications/kwindowbuttonbar.h
|
||||||
%{_includedir}/kysdk/applications/themeController.h
|
%{_includedir}/kysdk/applications/themeController.h
|
||||||
%{_includedir}/kysdk/applications/xatom-helper.h
|
%{_includedir}/kysdk/applications/xatom-helper.h
|
||||||
|
%{_includedir}/kysdk/applications/kbubblewidget.h
|
||||||
|
%{_includedir}/kysdk/applications/kitemwidget.h
|
||||||
|
%{_includedir}/kysdk/applications/klistview.h
|
||||||
|
%{_includedir}/kysdk/applications/klistviewdelegate.h
|
||||||
|
%{_includedir}/kysdk/applications/klistwidget.h
|
||||||
|
%{_includedir}/kysdk/applications/kpressbutton.h
|
||||||
|
%{_includedir}/kysdk/applications/kpushbutton.h
|
||||||
|
%{_includedir}/kysdk/applications/kshadowhelper.h
|
||||||
|
%{_includedir}/kysdk/applications/ktranslucentfloor.h
|
||||||
|
|
||||||
%files -n libkysdk-qtwidgets
|
%files -n libkysdk-qtwidgets
|
||||||
%{_prefix}/lib/kysdk/applications/libkysdk-qtwidgets.so*
|
%{_prefix}/lib/kysdk/applications/libkysdk-qtwidgets.so*
|
||||||
%{_datadir}/pkgconfig/kysdk-qtwidgets.pc
|
|
||||||
|
|
||||||
%files -n libkysdk-widgetutils-devel
|
%files -n libkysdk-widgetutils-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-widgetutils.pc
|
||||||
%{_includedir}/kysdk/applications/kwidgetutils.h
|
%{_includedir}/kysdk/applications/kwidgetutils.h
|
||||||
%{_includedir}/kysdk/applications/kysdk-widgetutils_global.h
|
%{_includedir}/kysdk/applications/kysdk-widgetutils_global.h
|
||||||
|
|
||||||
%files -n libkysdk-widgetutils
|
%files -n libkysdk-widgetutils
|
||||||
%{_prefix}/lib/kysdk/applications/libkysdk-widgetutils.so*
|
%{_prefix}/lib/kysdk/applications/libkysdk-widgetutils.so*
|
||||||
%{_datadir}/pkgconfig/kysdk-widgetutils.pc
|
|
||||||
|
|
||||||
%files -n libkysdk-kabase
|
%files -n libkysdk-kabase
|
||||||
%{_prefix}/lib/kysdk/applications/libkysdk-kabase.so*
|
%{_prefix}/lib/kysdk/applications/libkysdk-kabase.so*
|
||||||
%{_sysconfdir}/kysdk/kysdk-applications/kabase/
|
|
||||||
%{_datadir}/pkgconfig/kysdk-kabase.pc
|
|
||||||
|
|
||||||
%files -n libkysdk-kabase-devel
|
%files -n libkysdk-kabase-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-kabase.pc
|
||||||
%{_includedir}/kysdk/applications/kabase/*.hpp
|
%{_includedir}/kysdk/applications/kabase/*.hpp
|
||||||
|
%{_includedir}/kysdk/applications/kabase/kylin_image_codec
|
||||||
|
%{_includedir}/kysdk/applications/kabase/kylin_system
|
||||||
|
%{_includedir}/kysdk/applications/kabase/single_application
|
||||||
|
|
||||||
|
%files -n libkysdk-waylandhelper-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-waylandhelper.pc
|
||||||
|
%{_includedir}/kysdk/applications/kysdk-waylandhelper_global.h
|
||||||
|
%{_includedir}/kysdk/applications/waylandhelper.h
|
||||||
|
%{_includedir}/kysdk/applications/ukuistylehelper
|
||||||
|
%{_includedir}/kysdk/applications/windowmanager
|
||||||
|
|
||||||
|
%files -n libkysdk-waylandhelper
|
||||||
|
%{_prefix}/lib/kysdk/applications/libkysdk-waylandhelper.so*
|
||||||
|
|
||||||
|
%files -n libkysdk-alm-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-alm.pc
|
||||||
|
%{_includedir}/kysdk/applications/singleapplication.h
|
||||||
|
%{_includedir}/kysdk/applications/localpeer.h
|
||||||
|
|
||||||
|
%files -n libkysdk-alm
|
||||||
|
%{_prefix}/lib/kysdk/applications/libkysdk-alm.so*
|
||||||
|
|
||||||
|
%files -n libkysdk-ukenv
|
||||||
|
%{_prefix}/lib/kysdk/applications/libkysdk-ukenv.so*
|
||||||
|
|
||||||
|
%files -n libkysdk-ukenv-devel
|
||||||
|
%{_datadir}/pkgconfig/kysdk-ukenv.pc
|
||||||
|
%{_includedir}/kysdk/applications/currency.h
|
||||||
|
%{_includedir}/kysdk/applications/gsettingmonitor.h
|
||||||
|
%{_includedir}/kysdk/applications/usermanual.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 01 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-3
|
||||||
|
- remove rpath of libkysdk-qtwidgets
|
||||||
|
|
||||||
|
* Thu Feb 09 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-2
|
||||||
|
- add build debuginfo and debugsource
|
||||||
|
|
||||||
|
* Thu Dec 22 2022 peijiankang <peijiankang@kylinos.cn> - 2.0.0-1
|
||||||
|
- update version to 2.0.0
|
||||||
|
|
||||||
* Thu Nov 17 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-2
|
* Thu Nov 17 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-2
|
||||||
- delete if 0 and endif
|
- delete if 0 and endif
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user