Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-editor for openSUSE:Factory checked in at 2021-02-16 22:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-editor (Old) and /work/SRC/openSUSE:Factory/.deepin-editor.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-editor" Tue Feb 16 22:36:19 2021 rev:4 rq:869748 version:5.9.0.32 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-editor/deepin-editor.changes 2020-06-25 15:09:28.181749658 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-editor.new.28504/deepin-editor.changes 2021-02-16 22:42:13.346091365 +0100 @@ -1,0 +2,10 @@ +Wed Feb 3 14:53:04 UTC 2021 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.9.0.32 + * Add many new feature + * Update ui design +- Drop deepin-editor-qt-5_15.patch, fixed by upstream +- Add Use-librares-system-default.patch, use enca and uchardet in + system default + +------------------------------------------------------------------- Old: ---- deepin-editor-1.2.9.tar.gz deepin-editor-Qt-5_15.patch deepin-editor.svg New: ---- Use-librares-system-default.patch deepin-editor-5.9.0.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-editor.spec ++++++ --- /var/tmp/diff_new_pack.WTr21j/_old 2021-02-16 22:42:13.902092031 +0100 +++ /var/tmp/diff_new_pack.WTr21j/_new 2021-02-16 22:42:13.906092036 +0100 @@ -1,7 +1,7 @@ # # spec file for package deepin-editor # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,39 @@ Name: deepin-editor -Version: 1.2.9 +Version: 5.9.0.32 Release: 0 Summary: A text editor for the Deepin environment License: GPL-3.0-or-later Group: Productivity/Text/Editors URL: https://github.com/linuxdeepin/deepin-editor Source0: https://github.com/linuxdeepin/deepin-editor/archive/%{version}/%{name}-%{version}.tar.gz -Source1: https://raw.githubusercontent.com/linuxdeepin/deepin-icon-theme/master/deepin/apps/256/%{name}.svg -# PATCH-FIX-UPSTEAM deepin-editor-qt-5_15.patch hillw...@opensuse.org - Support Qt 5.15 -Patch0: %{name}-Qt-5_15.patch +# PATCH-FIX-OPENSUSE Use-librares-system-default.patch hillw...@opensuse.org - Use these librares in system default +Patch0: Use-librares-system-default.patch BuildRequires: fdupes +BuildRequires: gmock +BuildRequires: gtest BuildRequires: hicolor-icon-theme BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libqt5-linguist +BuildRequires: recode-devel +BuildRequires: cmake(DFrameworkdbus) BuildRequires: cmake(KF5Codecs) BuildRequires: cmake(KF5SyntaxHighlighting) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtkgui) BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(uchardet) Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,11 +60,10 @@ %lang_package %prep -%setup -%if 0%{?suse_version} > 1500 -%patch0 -p1 -%endif +%autosetup -p1 sed -i 's/lrelease/lrelease-qt5/g' translate_generation.sh +sed -i 's/Exec=deepin-editor/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-editor/g' \ +deepin-editor.desktop %build %cmake @@ -62,16 +71,13 @@ %install %cmake_install -install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -%fdupes %{buildroot} +%fdupes %{buildroot}%{_datadir} %files %defattr(-,root,root,-) -%doc README.md +%doc CHANGELOG.md README.md %license LICENSE -%{_bindir}/dedit %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg ++++++ Use-librares-system-default.patch ++++++ diff -Nur deepin-editor-5.9.0.32/src/CMakeLists.txt deepin-editor-5.9.0.32-new/src/CMakeLists.txt --- deepin-editor-5.9.0.32/src/CMakeLists.txt 2021-01-20 10:56:32.000000000 +0800 +++ deepin-editor-5.9.0.32-new/src/CMakeLists.txt 2021-02-03 21:58:15.662944628 +0800 @@ -35,6 +35,10 @@ find_package(DFrameworkdbus REQUIRED) find_package(Qt5Xml REQUIRED) find_package(Qt5Svg REQUIRED) + +pkg_check_modules(ENCA REQUIRED enca) +pkg_check_modules(UCHARDET REQUIRED uchardet) + include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) # Tell CMake to create the executable @@ -49,13 +53,13 @@ ${DFrameworkdbus_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Svg_LIBRARIES} + uchardet + enca KF5::Codecs KF5::SyntaxHighlighting ${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libcharset.a ${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libiconv.a - ${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libenca.a -lm - ${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libuchardet.a ) set(CMAKE_INSTALL_PREFIX /usr) diff -Nur deepin-editor-5.9.0.32/test/CMakeLists.txt deepin-editor-5.9.0.32-new/test/CMakeLists.txt --- deepin-editor-5.9.0.32/test/CMakeLists.txt 2021-01-20 10:56:32.000000000 +0800 +++ deepin-editor-5.9.0.32-new/test/CMakeLists.txt 2021-02-03 22:02:19.238211229 +0800 @@ -46,8 +46,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/include) link_libraries(${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libcharset.a) link_libraries(${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libiconv.a) -link_libraries(${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libenca.a) -link_libraries(${CMAKE_CURRENT_SOURCE_DIR}/../third/lib/lib/libuchardet.a) set(PROJECT_NAME_TEST ${PROJECT_NAME}_test) @@ -90,6 +88,8 @@ Qt5::Widgets Qt5::DBus Qt5::Test + uchardet + enca ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Concurrent_LIBRARIES} diff -Nur deepin-editor-5.9.0.32/third/CMakeLists.txt deepin-editor-5.9.0.32-new/third/CMakeLists.txt --- deepin-editor-5.9.0.32/third/CMakeLists.txt 2021-01-20 10:56:32.000000000 +0800 +++ deepin-editor-5.9.0.32-new/third/CMakeLists.txt 2021-02-03 21:41:57.841725874 +0800 @@ -1,8 +1,8 @@ #install iconv execute_process(COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/iconv_install.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) #install enca -execute_process(COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/enca_install.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +# execute_process(COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/enca_install.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) #install uchardet -execute_process(COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/uchartdet_install.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +# execute_process(COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/uchartdet_install.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++++++ deepin-editor-1.2.9.tar.gz -> deepin-editor-5.9.0.32.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-editor/deepin-editor-1.2.9.tar.gz /work/SRC/openSUSE:Factory/.deepin-editor.new.28504/deepin-editor-5.9.0.32.tar.gz differ: char 13, line 1
