diff --git a/0001-fix-compile-error-of-libkysdk-applications.patch b/0001-fix-compile-error-of-libkysdk-applications.patch new file mode 100644 index 0000000..99e3150 --- /dev/null +++ b/0001-fix-compile-error-of-libkysdk-applications.patch @@ -0,0 +1,123 @@ +From 372944e4a6ef23342bc3cb12d72231ff81d3dc2e Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 2 Nov 2022 19:43:28 +0800 +Subject: [PATCH] fix compile error of libkysdk-applications + +--- + development-files/kysdk-kabase.pc | 2 +- + development-files/kysdk-qtwidgets.pc | 2 +- + development-files/kysdk-widgetutils.pc | 2 +- + kysdk-kabase/kabase/kabase.pro | 14 ++++++++++++++ + kysdk-qtwidgets/kysdk-qtwidgets.pro | 10 +++++++++- + kysdk-widgetutils/kysdk-widgetutils.pro | 8 ++++++-- + .../build-testWidgetutils-unknown-Debug/Makefile | 2 +- + 7 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/development-files/kysdk-kabase.pc b/development-files/kysdk-kabase.pc +index 3f32fb3..b96b997 100644 +--- a/development-files/kysdk-kabase.pc ++++ b/development-files/kysdk-kabase.pc +@@ -2,4 +2,4 @@ Name: libkysdk-kabase + Description: Application general interface + Version: 1.0.0 + Cflags: -I/usr/include/kysdk/applications/kabase/ +-Libs: -L/usr/libs/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/libs/kysdk/applications/ ++Libs: -L/usr/lib/kysdk/applications/ -lkysdk-kabase -Wl,-rpath=/usr/lib/kysdk/applications/ +diff --git a/development-files/kysdk-qtwidgets.pc b/development-files/kysdk-qtwidgets.pc +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. ++!isEmpty(target.path): INSTALLS += target ++unix { ++ target.path = /usr/lib/kysdk/applications/ ++ config.files += ../../development-files/kysdk-kabase.pc ++ config.path = /usr/share/pkgconfig ++ include.files += *.hpp kylin_system/*.hpp ++ include.path = /usr/include/kysdk/applications/kabase ++ log.files += ../config/log/kabase-log.conf ++ log.path = /etc/kysdk/kysdk-applications/kabase/ ++} ++!isEmpty(target.path): INSTALLS += target config include log ++ +diff --git a/kysdk-qtwidgets/kysdk-qtwidgets.pro b/kysdk-qtwidgets/kysdk-qtwidgets.pro +index 72c8736..0d08dfa 100644 +--- a/kysdk-qtwidgets/kysdk-qtwidgets.pro ++++ b/kysdk-qtwidgets/kysdk-qtwidgets.pro +@@ -96,7 +96,15 @@ HEADERS += \ + src/xatom-helper.h \ + + # Default rules for deployment. +-!isEmpty(target.path): INSTALLS += target ++unix { ++ 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 +index 7aaad6c..95a4139 100644 +--- a/kysdk-widgetutils/kysdk-widgetutils.pro ++++ b/kysdk-widgetutils/kysdk-widgetutils.pro +@@ -25,6 +25,10 @@ HEADERS += \ + + # Default rules for deployment. + unix { +- target.path = /usr/lib ++ 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 config include +diff --git a/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile b/kysdk-widgetutils/test/build-testWidgetutils-unknown-Debug/Makefile +index f13bb76..6bd9168 100644 +--- 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 + diff --git a/libkysdk-applications-1.0.0.tar.gz b/libkysdk-applications-1.0.0.tar.gz new file mode 100644 index 0000000..f65e8e2 Binary files /dev/null and b/libkysdk-applications-1.0.0.tar.gz differ diff --git a/libkysdk-applications.spec b/libkysdk-applications.spec new file mode 100644 index 0000000..51ef650 --- /dev/null +++ b/libkysdk-applications.spec @@ -0,0 +1,166 @@ +%define debug_package %{nil} + +Name: libkysdk-applications +Version: 1.0.0 +Release: 1 +Summary: Kylin Software Development Kit - Applications Layer Kit +License: GPL-2+ +URL: http://www.ukui.org +Source0: %{name}-%{version}.tar.gz +Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch + +%if 0 +BuildRequires: glib2-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: gsettings-qt-devel +BuildRequires: pkg-config +BuildRequires: qt5-qtbase-devel +BuildRequires: qtchooser +BuildRequires: qt5-qttools-devel +BuildRequires: pkgconf +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-qtwidgets libkysdk-qtwidgets-devel libkysdk-widgetutils libkysdk-widgetutils-devel libkysdk-kabase libkysdk-kabase-devel +%endif +%description +Kylin Software Development Kit - Applications Layer Kit + + +%if 0 +%package -n libkysdk-qtwidgets-devel +Summary: libdevel +Requires: libkysdk-qtwidgets + +%description -n libkysdk-qtwidgets-devel +kysdk-qtwidgets head file + + +%package -n libkysdk-qtwidgets +Summary: libdevel +Requires: glib2 qt5-qtbase-gui qt5-qtbase gsettings-qt + +%description -n libkysdk-qtwidgets +kysdk-qtwidgets shared library + + +%package -n libkysdk-widgetutils-devel +Summary: libdevel +Requires: libkysdk-qtwidgets + +%description -n libkysdk-widgetutils-devel +kysdk-widgetutils head file + + +%package -n libkysdk-widgetutils +Summary: libdevel +Requires: glib2 qt5-qtbase-gui gsettings-qt + +%description -n libkysdk-widgetutils +kysdk-widgetutils shared library + + +%package -n libkysdk-kabase +Summary: libdevel +Requires: ukui-interface libkysdk-config libkysdk-log + +%description -n libkysdk-kabase +kysdk-kabase shared library + + +%package -n libkysdk-kabase-devel +Summary: libdevel +Requires: libkysdk-kabase + +%description -n libkysdk-kabase-devel +kysdk-kabase head file +%endif + + +%prep +%setup -q +%patch01 -p1 +%if 0 +%build +mkdir build && cd build +qmake-qt5 .. +make -j4 + +%install +rm -rf $RPM_BUILD_ROOT +pushd build +make INSTALL_ROOT=%{buildroot} install +popd +%endif +%clean +rm -rf $RPM_BUILD_ROOT + +%files + +%if 0 +%files -n libkysdk-qtwidgets-devel +%{_includedir}/kysdk/applications/gui_g.h +%{_includedir}/kysdk/applications/kaboutdialog.h +%{_includedir}/kysdk/applications/kbadge.h +%{_includedir}/kysdk/applications/kballontip.h +%{_includedir}/kysdk/applications/kborderbutton.h +%{_includedir}/kysdk/applications/kborderlessbutton.h +%{_includedir}/kysdk/applications/kbreadcrumb.h +%{_includedir}/kysdk/applications/kcommentpanel.h +%{_includedir}/kysdk/applications/kdialog.h +%{_includedir}/kysdk/applications/kiconbar.h +%{_includedir}/kysdk/applications/kinputdialog.h +%{_includedir}/kysdk/applications/kmenubutton.h +%{_includedir}/kysdk/applications/knavigationbar.h +%{_includedir}/kysdk/applications/kpasswordedit.h +%{_includedir}/kysdk/applications/kpixmapcontainer.h +%{_includedir}/kysdk/applications/kprogressbar.h +%{_includedir}/kysdk/applications/kprogresscircle.h +%{_includedir}/kysdk/applications/kprogressdialog.h +%{_includedir}/kysdk/applications/ksearchlineedit.h +%{_includedir}/kysdk/applications/ksecuritylevelbar.h +%{_includedir}/kysdk/applications/kslider.h +%{_includedir}/kysdk/applications/kswitchbutton.h +%{_includedir}/kysdk/applications/ktabbar.h +%{_includedir}/kysdk/applications/ktag.h +%{_includedir}/kysdk/applications/ktoolbutton.h +%{_includedir}/kysdk/applications/kuninstalldialog.h +%{_includedir}/kysdk/applications/kwidget.h +%{_includedir}/kysdk/applications/kwindowbuttonbar.h +%{_includedir}/kysdk/applications/themeController.h +%{_includedir}/kysdk/applications/xatom-helper.h + + +%files -n libkysdk-qtwidgets +%{_prefix}/lib/kysdk/applications/libkysdk-qtwidgets.so* +%{_datadir}/pkgconfig/kysdk-qtwidgets.pc + +%files -n libkysdk-widgetutils-devel +%{_includedir}/kysdk/applications/kwidgetutils.h +%{_includedir}/kysdk/applications/kysdk-widgetutils_global.h + +%files -n libkysdk-widgetutils +%{_prefix}/lib/kysdk/applications/libkysdk-widgetutils.so* +%{_datadir}/pkgconfig/kysdk-widgetutils.pc + +%files -n libkysdk-kabase +%{_prefix}/lib/kysdk/applications/libkysdk-kabase.so* +%{_sysconfdir}/kysdk/kysdk-applications/kabase/ +%{_datadir}/pkgconfig/kysdk-kabase.pc + +%files -n libkysdk-kabase-devel +%{_includedir}/kysdk/applications/kabase/*.hpp + +%endif + +%changelog +* Tue Nov 1 2022 peijiankang - 1.0.0-1 +- Init Package for libkysdk-applications