Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-image-editor for
openSUSE:Factory checked in at 2023-04-14 13:14:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-image-editor (Old)
and /work/SRC/openSUSE:Factory/.deepin-image-editor.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-image-editor"
Fri Apr 14 13:14:12 2023 rev:4 rq:1079403 version:1.0.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-image-editor/deepin-image-editor.changes
2022-11-24 12:25:33.062182802 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-image-editor.new.19717/deepin-image-editor.changes
2023-04-14 13:14:17.255978862 +0200
@@ -1,0 +2,11 @@
+Mon Mar 27 07:16:49 UTC 2023 - Hillwood Yang <[email protected]>
+
+- Add fix-gcc-13.patch, fix build by gcc 13
+
+-------------------------------------------------------------------
+Fri Feb 10 13:56:15 UTC 2023 - Hillwood Yang <[email protected]>
+
+- Update version to 1.0.24
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
image-editor-1.0.19.tar.gz
New:
----
fix-gcc-13.patch
image-editor-1.0.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-image-editor.spec ++++++
--- /var/tmp/diff_new_pack.xxeBD0/_old 2023-04-14 13:14:18.015983209 +0200
+++ /var/tmp/diff_new_pack.xxeBD0/_new 2023-04-14 13:14:18.023983254 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-image-editor
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2022 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
@@ -16,11 +16,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define _name image-editor
%define sover 0_1
Name: deepin-image-editor
-Version: 1.0.19
+Version: 1.0.24
Release: 0
Summary: Libraries of Deepin Image editor
License: GPL-3.0-or-later
@@ -32,6 +33,9 @@
%if 0%{?suse_version} <= 1500
# PATCH-FIX-OPENSUSE fix-library-link.patch [email protected] - Neet link
dl for Leap 15.x
Patch1: fix-library-link.patch
+%else
+# PATCH-FIX-UPSTREAM fix-gcc-13.patch [email protected] - Fix build by gcc
13
+Patch2: fix-gcc-13.patch
%endif
BuildRequires: deepin-gettext-tools
BuildRequires: dtkcore >= 5.0.0
@@ -41,19 +45,21 @@
BuildRequires: libqt5-linguist
BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5PrintSupport)
-BuildRequires: pkgconfig(opencv4)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(dtkcore)
-BuildRequires: pkgconfig(dtkwidget)
BuildRequires: pkgconfig(dtkgui)
+BuildRequires: pkgconfig(dtkwidget)
BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(libffmpegthumbnailer)
BuildRequires: pkgconfig(libmediainfo)
+BuildRequires: pkgconfig(libtiff-4)
+BuildRequires: pkgconfig(opencv4)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -125,11 +131,11 @@
%files
%doc README.md
-%license LICENSE
+%license LICENSE.txt
%files -n libimagevisualresult-data
-%doc README.md
-%license LICENSE
+%doc README.md README.zh_CN.md
+%license LICENSE.txt
%dir %{_datadir}/libimagevisualresult
%dir %{_datadir}/libimagevisualresult/filter_cube
%{_datadir}/libimagevisualresult/filter_cube/*.CUBE
@@ -142,15 +148,15 @@
%{_libdir}/libimagevisualresult.so.*
%files -n libimageviewer-devel
-%doc README.md
-%license LICENSE
+%doc README.md README.zh_CN.md
+%license LICENSE.txt
%{_includedir}/libimageviewer
%{_libdir}/libimageviewer.so
%{_libdir}/pkgconfig/libimageviewer.pc
%files -n libimagevisualresult-devel
-%doc README.md
-%license LICENSE
+%doc README.md README.zh_CN.md
+%license LICENSE.txt
%{_includedir}/libimagevisualresult
%{_libdir}/libimagevisualresult.so
%{_libdir}/pkgconfig/libimagevisualresult.pc
++++++ fix-gcc-13.patch ++++++
diff -Nur image-editor-1.0.24/libimagevisualresult/src/utils.h
image-editor-1.0.24-new/libimagevisualresult/src/utils.h
--- image-editor-1.0.24/libimagevisualresult/src/utils.h 2022-11-29
10:21:28.000000000 +0800
+++ image-editor-1.0.24-new/libimagevisualresult/src/utils.h 2023-03-27
15:09:15.364447750 +0800
@@ -8,6 +8,7 @@
#include <vector>
#include <map>
#include <string>
+#include <cstdint>
typedef std::vector<std::vector<uint8_t>> lutData;
typedef std::map<std::string, lutData> map_lut;
++++++ fix-library-link.patch ++++++
--- /var/tmp/diff_new_pack.xxeBD0/_old 2023-04-14 13:14:18.063983483 +0200
+++ /var/tmp/diff_new_pack.xxeBD0/_new 2023-04-14 13:14:18.067983506 +0200
@@ -1,12 +1,12 @@
-diff -Nur image-editor-1.0.19/libimageviewer/CMakeLists.txt
image-editor-1.0.19-new/libimageviewer/CMakeLists.txt
---- image-editor-1.0.19/libimageviewer/CMakeLists.txt 2022-08-08
11:46:06.000000000 +0800
-+++ image-editor-1.0.19-new/libimageviewer/CMakeLists.txt 2022-10-11
20:41:27.350074683 +0800
-@@ -93,7 +93,7 @@
+diff -Nurp image-editor-1.0.24/libimageviewer/CMakeLists.txt
image-editor-1.0.24-new/libimageviewer/CMakeLists.txt
+--- image-editor-1.0.24/libimageviewer/CMakeLists.txt 2022-11-29
10:21:28.000000000 +0800
++++ image-editor-1.0.24-new/libimageviewer/CMakeLists.txt 2023-01-21
20:16:09.285110745 +0800
+@@ -96,7 +96,7 @@ set_target_properties(${TARGET_NAME} PRO
- target_include_directories(${CMD_NAME} PUBLIC ${3rd_lib_INCLUDE_DIRS} )
--target_link_libraries(imageviewer ${3rd_lib_LIBRARIES} freeimage )
-+target_link_libraries(imageviewer ${3rd_lib_LIBRARIES} freeimage dl)
+ target_include_directories(${CMD_NAME} PUBLIC ${3rd_lib_INCLUDE_DIRS}
${TIFF_INCLUDE_DIRS})
+-target_link_libraries(imageviewer ${3rd_lib_LIBRARIES} freeimage
${TIFF_LIBRARIES})
++target_link_libraries(imageviewer ${3rd_lib_LIBRARIES} freeimage
${TIFF_LIBRARIES} dl)
include(GNUInstallDirs)
configure_file(libimageviewer.pc.in ${PROJECT_BINARY_DIR}/libimageviewer.pc
@ONLY)
++++++ image-editor-1.0.19.tar.gz -> image-editor-1.0.24.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-image-editor/image-editor-1.0.19.tar.gz
/work/SRC/openSUSE:Factory/.deepin-image-editor.new.19717/image-editor-1.0.24.tar.gz
differ: char 12, line 1
++++++ recompile-with-fPIC.patch ++++++
--- /var/tmp/diff_new_pack.xxeBD0/_old 2023-04-14 13:14:18.091983643 +0200
+++ /var/tmp/diff_new_pack.xxeBD0/_new 2023-04-14 13:14:18.095983666 +0200
@@ -1,6 +1,6 @@
-diff -Nur image-editor-1.0.13/CMakeLists.txt
image-editor-1.0.13-new/CMakeLists.txt
---- image-editor-1.0.13/CMakeLists.txt 2022-03-30 09:47:20.000000000 +0800
-+++ image-editor-1.0.13-new/CMakeLists.txt 2022-04-07 20:50:43.098078041
+0800
+diff -Nur image-editor-1.0.24/CMakeLists.txt
image-editor-1.0.24-new/CMakeLists.txt
+--- image-editor-1.0.24/CMakeLists.txt 2022-11-29 10:21:28.000000000 +0800
++++ image-editor-1.0.24-new/CMakeLists.txt 2023-02-10 21:45:19.451016506
+0800
@@ -2,6 +2,9 @@
project(imageeditor)
@@ -11,4 +11,30 @@
execute_process(COMMAND uname -m OUTPUT_VARIABLE MACH
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+diff -Nur image-editor-1.0.24/libimageviewer/CMakeLists.txt
image-editor-1.0.24-new/libimageviewer/CMakeLists.txt
+--- image-editor-1.0.24/libimageviewer/CMakeLists.txt 2022-11-29
10:21:28.000000000 +0800
++++ image-editor-1.0.24-new/libimageviewer/CMakeLists.txt 2023-02-10
21:45:56.506879153 +0800
+@@ -10,6 +10,9 @@
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_AUTOUIC ON)
+
++set(CMAKE_C_FLAGS "-fPIC")
++set(CMAKE_CXX_FLAGS "-fPIC")
++
+ #Qtéè¦çå
+ set(QtModule Core Gui Widgets Svg DBus Concurrent PrintSupport LinguistTools)
+
+diff -Nur image-editor-1.0.24/libimagevisualresult/CMakeLists.txt
image-editor-1.0.24-new/libimagevisualresult/CMakeLists.txt
+--- image-editor-1.0.24/libimagevisualresult/CMakeLists.txt 2022-11-29
10:21:28.000000000 +0800
++++ image-editor-1.0.24-new/libimagevisualresult/CMakeLists.txt
2023-02-10 21:45:19.451016506 +0800
+@@ -11,6 +11,9 @@
+
+ set(CMAKE_EXPORT_COMPILE_COMMANDS on)
+
++set(CMAKE_C_FLAGS "-fPIC")
++set(CMAKE_CXX_FLAGS "-fPIC")
++
+ find_package(PkgConfig REQUIRED)
+ find_package(OpenCV REQUIRED)
+
