packages/libkysdk-applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:2b3221745b084490e4d4aeb06f03c1d96ea30536
Branches Tags
packages:main
..
compare: packages:8255b569b4fedf897ddb18ae6ea1d11ee8bf8726
Branches Tags
packages:main

No commits in common. "2b3221745b084490e4d4aeb06f03c1d96ea30536" and "8255b569b4fedf897ddb18ae6ea1d11ee8bf8726" have entirely different histories.
2b3221745b ... 8255b569b4

5 changed files with 13 additions and 8428 deletions
Show Stats Expand all files Collapse all files

52
0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
View File

@ -1,52 +0,0 @@
From 015431686de628651a2ae8aed564dbbbe5b37b0c Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 27 May 2024 16:18:02 +0800
Subject: [PATCH] fix error of libkysdk-kabase undefined reference
---
kysdk-kabase/kabase/kabase.pro | 2 +-
.../kabase/kylin_image_codec/image_load/image_load.cpp | 3 ++-
.../kabase/kylin_image_codec/image_save/image_save.cpp | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
index 07df867..92e0adc 100644
--- a/kysdk-kabase/kabase/kabase.pro
+++ b/kysdk-kabase/kabase/kabase.pro
@@ -11,7 +11,7 @@ TEMPLATE = lib
CONFIG += c++11 console link_pkgconfig no_keywords
-LIBS += -ldl -lpthread -lsystemd -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base
+LIBS += -ldl -lpthread -lsystemd -lgif -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base
greaterThan(QT_VER_MAJ , 4) {
LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lfreeimage -lfreeimageplus
diff --git a/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp b/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
index 1520a2c..6bb8b88 100644
--- a/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
+++ b/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
@@ -1,3 +1,4 @@
+#define STB_IMAGE_IMPLEMENTATION
#include "kylin_image_codec/kylinimagecodec.hpp"
namespace kdk
@@ -379,4 +380,4 @@ FREE_IMAGE_FORMAT KylinImageCodec::get_real_format(const QString &path)
}
} // namespace kabase
-} // namespace kdk
\ No newline at end of file
+} // namespace kdk
diff --git a/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp b/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
index ce1b927..b01014c 100644
--- a/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
+++ b/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
@@ -1,3 +1,4 @@
+#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "kylin_image_codec/kylinimagecodec.hpp"
namespace kdk
--
2.43.0

8318
0011-update-changelog.patch
View File

File diff suppressed because it is too large Load Diff

BIN
libkysdk-applications-2.0.0.0.tar.xz
View File

Binary file not shown.

BIN
libkysdk-applications-2.0.0.tar.gz Normal file
View File

Binary file not shown.

71
libkysdk-applications.spec
View File

@ -1,13 +1,13 @@
%define debug_package %{nil}
Name: libkysdk-applications
Version: 2.0.0.0
Release: 3
Version: 2.0.0
Release: 1
Summary: Kylin Software Development Kit - Applications Layer Kit
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch
Patch02: 0011-update-changelog.patch
Patch03: 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
BuildRequires: freeimage-devel
BuildRequires: giflib-devel
@ -31,9 +31,8 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qtchooser
BuildRequires: qt5-qttools-devel
BuildRequires: chrpath
Requires: libkysdk-alm libkysdk-kabase libkysdk-qtwidgets libkysdk-ukenv libkysdk-waylandhelper libkysdk-widgetutils libkysdk-notification
Requires: libkysdk-alm libkysdk-kabase libkysdk-qtwidgets libkysdk-ukenv libkysdk-waylandhelper libkysdk-widgetutils
%description
Kylin Software Development Kit - Applications Layer Kit
@ -48,7 +47,7 @@ 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 libkysdk-notification-devel
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
@ -148,37 +147,22 @@ Requires: libkysdk-ukenv
kysdk-ukenv head file
%package -n libkysdk-notification
Summary: kysdk-notification shared library
Requires: libkysdk-appcommon
%description -n libkysdk-notification
%{summary}.
%package -n libkysdk-notification-devel
Summary: kysdk-notification head file
Requires: libkysdk-notification
%description -n libkysdk-notification-devel
%{summary}.
%prep
%autosetup -n %{name}-%{version} -p1
%setup -q
%patch01 -p1
%build
mkdir build && cd build
%{qmake_qt5} ..
%{make_build}
qmake-qt5 ..
make -j4
%install
rm -rf $RPM_BUILD_ROOT
pushd build
%{make_install} INSTALL_ROOT=%{buildroot}
make INSTALL_ROOT=%{buildroot} install
popd
chrpath -d %{buildroot}/usr/lib/kysdk/applications/libkysdk-qtwidgets.so.1.2.0
%clean
rm -rf $RPM_BUILD_ROOT
@ -232,7 +216,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/kysdk/applications/kpushbutton.h
%{_includedir}/kysdk/applications/kshadowhelper.h
%{_includedir}/kysdk/applications/ktranslucentfloor.h
%{_includedir}/kysdk/applications/parmscontroller.h
%files -n libkysdk-qtwidgets
%{_prefix}/lib/kysdk/applications/libkysdk-qtwidgets.so*
@ -282,35 +265,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/kysdk/applications/gsettingmonitor.h
%{_includedir}/kysdk/applications/usermanual.h
%files -n libkysdk-notification
%{_prefix}/lib/kysdk/applications/libkysdk-notification.so*
%files -n libkysdk-notification-devel
%{_datadir}/pkgconfig/kysdk-notification.pc
%{_includedir}/kysdk/applications/kbackgroundgroup.h
%{_includedir}/kysdk/applications/kbuttonbox.h
%{_includedir}/kysdk/applications/kcolorbutton.h
%{_includedir}/kysdk/applications/kcolorcombobox.h
%{_includedir}/kysdk/applications/klineframe.h
%{_includedir}/kysdk/applications/kmessagebox.h
%{_includedir}/kysdk/applications/knotifier.h
%changelog
* Mon May 27 2024 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-3
- add 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
* Wed Apr 24 2024 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-2
- add 0011-update-changelog.patch
* Fri May 26 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-1
- update version to 2.0.0.0
* 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