From d50951825de5a06320e26e8dc6ecfbf712ca1140 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 27 May 2024 16:19:49 +0800 Subject: [PATCH] fix error of libkysdk-kabase undefined reference --- ...-libkysdk-kabase-undefined-reference.patch | 52 +++++++++++++++++++ libkysdk-applications.spec | 11 ++-- 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch diff --git a/0002-fix-error-of-libkysdk-kabase-undefined-reference.patch b/0002-fix-error-of-libkysdk-kabase-undefined-reference.patch new file mode 100644 index 0000000..7fc24ab --- /dev/null +++ b/0002-fix-error-of-libkysdk-kabase-undefined-reference.patch @@ -0,0 +1,52 @@ +From 015431686de628651a2ae8aed564dbbbe5b37b0c Mon Sep 17 00:00:00 2001 +From: peijiankang +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 + diff --git a/libkysdk-applications.spec b/libkysdk-applications.spec index 6b7cfe0..aaede19 100644 --- a/libkysdk-applications.spec +++ b/libkysdk-applications.spec @@ -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 - 2.0.0.0-3 +- add 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch + * Wed Apr 24 2024 peijiankang - 2.0.0.0-2 - add 0011-update-changelog.patch