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

!21 fix error of libkysdk-kabase undefined reference

Browse Source 
From: @peijiankang 
Reviewed-by: @hua_yadong 
Signed-off-by: @hua_yadong
This commit is contained in:
openeuler-ci-bot 2024-06-11 01:24:41 +00:00 committed by Gitee
commit 2b3221745b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,52 @@
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

11
libkysdk-applications.spec
View File

@ -1,12 +1,14 @@
Name: libkysdk-applications
Version: 2.0.0.0
Release: 2
Release: 3
Summary: Kylin Software Development Kit - Applications Layer Kit
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.xz
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
BuildRequires: glib2-devel
@ -163,9 +165,7 @@ Requires: libkysdk-notification
%prep
%setup -q
%patch01 -p1
%patch02 -p1
%autosetup -n %{name}-%{version} -p1
%build
mkdir build && cd build
@ -296,6 +296,9 @@ rm -rf $RPM_BUILD_ROOT
%{_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