Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-terminal for openSUSE:Factory
checked in at 2022-01-03 10:49:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-terminal (Old)
and /work/SRC/openSUSE:Factory/.deepin-terminal.new.1896 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-terminal"
Mon Jan 3 10:49:11 2022 rev:8 rq:943288 version:5.4.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-terminal/deepin-terminal.changes
2021-04-17 00:02:24.129654344 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-terminal.new.1896/deepin-terminal.changes
2022-01-03 10:49:33.399583600 +0100
@@ -2 +2 @@
-Fri Apr 16 11:56:42 UTC 2021 - Hillwood Yang <[email protected]>
+Fri Dec 31 01:48:56 UTC 2021 - Hillwood Yang <[email protected]>
@@ -4 +4,2 @@
-- Set version
+- Update version to 5.4.24
+ * Fix bugs
@@ -7 +8 @@
-Fri Feb 5 13:34:08 UTC 2021 - Hillwood Yang <[email protected]>
+Fri Oct 29 02:14:54 UTC 2021 - Hillwood Yang <[email protected]>
@@ -9,9 +10,40 @@
-- Update version to 5.0.4.3
- * Fix issues on VTE 0.60+
- * Fix blur offset in new KWin
- * Fix: crash if distribution.info is missing
- * feat: use GTK menu if deepin-menu is not available to use
- * feat: add support for `allow_hyperlink` which can be enabled from config
- * feat: basic wayland support
- * feat: support distribution.info file for deepin/DDE variant distributions
-- Drop deepin-terminal-system-vte.patch, fixed by upsteam
+- Update version to 5.4.16
+ * Remove some wayland code
+ * Remove .transifexrc
+ * Optimize ut
+ * Update manual documents
+ * Update translations
+ * Fix bugs
+
+-------------------------------------------------------------------
+Sat Jul 31 12:38:23 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 5.4.10
+ * Opimize test
+ * Limit the window's width as the screen's width
+ * Update translations
+ * Fix bugs
+
+-------------------------------------------------------------------
+Fri Jun 4 13:30:48 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Stop owning directories provided by filesystem and other packages
+ (every dir should only have one owner) (boo#1184786)
+
+-------------------------------------------------------------------
+Thu May 6 07:46:08 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update dtk api to 5.5.0
+
+-------------------------------------------------------------------
+Sun Apr 11 14:07:53 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 5.4.0.20
+ * Fix bugs
+- Add recompile-with-fPIC.patch. Fix link failed on 64bit
+
+-------------------------------------------------------------------
+Tue Sep 15 14:15:36 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Update version to 5.2.26, redesign the deepin-terminal by Qt
+- drop
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
Old:
----
deepin-terminal-gtk-5.0.4.3.tar.gz
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
New:
----
deepin-terminal-5.4.24.tar.gz
recompile-with-fPIC.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-terminal.spec ++++++
--- /var/tmp/diff_new_pack.8i4ZWs/_old 2022-01-03 10:49:33.991583827 +0100
+++ /var/tmp/diff_new_pack.8i4ZWs/_new 2022-01-03 10:49:34.011583835 +0100
@@ -2,7 +2,7 @@
# spec file for package deepin-terminal
#
# Copyright (c) 2021 SUSE LLC
-# Copyright (c) 2020 Hillwood Yang <[email protected]>
+# Copyright (c) 2021 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,11 @@
#
+%define _name deepin-terminal-reborn
+%define apiver 5
+%define sover 0
+%define dtkver 5.5.0
+
%if 0%{?is_opensuse}
%define distribution openSUSE-Edition
%else
@@ -24,42 +29,48 @@
%endif
Name: deepin-terminal
-Version: 5.0.4.3
+Version: 5.4.24
Release: 0
Summary: Deepin terminal
-License: GPL-3.0-only AND GPL-3.0-or-later
+License: GPL-3.0-only
Group: System/X11/Terminals
-URL: https://github.com/linuxdeepin/deepin-terminal-gtk
-Source0:
https://github.com/linuxdeepin/deepin-terminal-gtk/archive/%{version}/%{name}-gtk-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
-Patch0:
deepin-terminal-xcb.vapi-missing-return-statement-at-end-of-subroutine-body.patch
+URL: https://github.com/linuxdeepin/deepin-terminal-reborn
+Source0:
https://github.com/linuxdeepin/deepin-terminal-reborn/archive/%{version}/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM recompile-with-fPIC.patch [email protected] - Fix
link failed on 64bit
+Patch1: recompile-with-fPIC.patch
+%ifarch ppc ppc64 ppc64le s390 s390x
+BuildRequires: deepin-desktop-base
+%else
+BuildRequires: deepin-manual
+%endif
BuildRequires: cmake
+BuildRequires: dtkcore
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: gtk-doc
+BuildRequires: gtest
+BuildRequires: gmock
BuildRequires: hicolor-icon-theme
-BuildRequires: intltool >= 0.35.0
-BuildRequires: libxml2-tools
-BuildRequires: readline-devel
+BuildRequires: libQt5Widgets-private-headers-devel
+BuildRequires: lxqt-build-tools-devel
BuildRequires: update-desktop-files
-BuildRequires: vala
+BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Test)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(atspi-2)
+BuildRequires: pkgconfig(dframeworkdbus)
+BuildRequires: pkgconfig(dtkcore) >= 5.5.0
+BuildRequires: pkgconfig(dtkgui) >= 5.5.0
+BuildRequires: pkgconfig(dtkwidget) >= 5.5.0
BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(gdk-x11-3.0)
-BuildRequires: pkgconfig(gee-0.8)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(libpcre2-8)
-BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsecret-1)
-BuildRequires: pkgconfig(libwnck-3.0)
-BuildRequires: pkgconfig(ncurses)
-BuildRequires: pkgconfig(vapigen)
-BuildRequires: pkgconfig(vte-2.91)
-BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xcb-ewmh)
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,13 +80,38 @@
Deepin Terminal is an advanced terminal emulator with workspace, multiple
windows, remote management, quake mode and other features.
+%package -n libterminalwidget%{apiver}-%{sover}
+Summary: Deepin-terminal libraries
+Group: System/Libraries
+
+%description -n libterminalwidget%{apiver}-%{sover}
+This package contains the libraries for deepin-terminal
+
+%package devel
+Summary: Development tools for deepin-terminal
+Group: Development/Libraries/Other
+Requires: libterminalwidget%{apiver}-%{sover}
+
+%description devel
+The deepin-terminal-devel package contains the header files and developer
+docs for deepin-terminal.
+
%prep
-%autosetup -p1 -n %{name}-gtk-%{version}
-sed -i 's|return @@PROJECT_PATH@@;|return "%{_datadir}/%{name}";|'
project_path.c.in
+%autosetup -n %{name}-%{version}
+sed -i '/<QHash>/i#include <QObject>\n#include <QMap>'
3rdparty/terminalwidget/lib/SessionManager.h
+sed -i '/LXQtCompilerSettings/a remove_definitions(-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII)' 3rdparty/terminalwidget/CMakeLists.txt
+sed -i 's|default-config.json|src/assets/other/default-config.json|'
CMakeLists.txt
+sed -i '/#include <QPainter>/a #include <QPainterPath>'
3rdparty/terminalwidget/lib/TerminalDisplay.cpp \
+3rdparty/terminalwidget/lib/konsole_wcwidth.cpp \
+3rdparty/terminalwidget/lib/konsole_wcwidth.h \
+src/views/focusframe.cpp \
+src/views/themepreviewarea.cpp
+
+sed -i '/#include <QDebug>/a #include <QPainterPath>'
src/views/customthemesettingdialog.cpp
%build
%cmake -DCMAKE_INSTALL_DIR=%{_prefix} \
- -DUSE_VENDOR_LIB=OFF \
+ -DDTKCORE_TOOL_DIR=%{_libdir}/libdtk-%{dtkver}/DCore/bin/ \
-DVERSION=%{version}-%{distribution}
%if 0%{?sle_version} > 150000 && 0%{?is_opensuse}
%cmake_build
@@ -87,24 +123,37 @@
%cmake_install
%suse_update_desktop_file %{name}
-%find_lang %{name}
%fdupes %{buildroot}
+%post -n libterminalwidget%{apiver}-%{sover} -p /sbin/ldconfig
+%postun -n libterminalwidget%{apiver}-%{sover} -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
-%doc README.md CHANGELOG.md
+%doc README.md
%license LICENSE
%dir %{_datadir}/%{name}
-%dir %{_prefix}/lib/%{name}
%{_bindir}/%{name}
-%{_prefix}/lib/%{name}/ssh_login.sh
-%{_datadir}/%{name}/style.css
-%{_datadir}/%{name}/theme
-%{_datadir}/%{name}/image
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/terminalwidget%{apiver}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/deepin-manual/manual-assets/application/%{name}
+%exclude %{_datadir}/terminalwidget%{apiver}/translations
-%files lang -f %{name}.lang
+%files -n libterminalwidget%{apiver}-%{sover}
+%defattr(-,root,root,-)
+%{_libdir}/libterminalwidget%{apiver}.so.*
+
+%files lang
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/translations
+%{_datadir}/terminalwidget%{apiver}/translations
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libterminalwidget%{apiver}.so
+%{_libdir}/pkgconfig/terminalwidget%{apiver}.pc
+%{_includedir}/terminalwidget%{apiver}
+%{_libdir}/cmake/terminalwidget%{apiver}
%changelog
++++++ deepin-terminal-gtk-5.0.4.3.tar.gz -> deepin-terminal-5.4.24.tar.gz
++++++
++++ 411643 lines of diff (skipped)
++++++ recompile-with-fPIC.patch ++++++
diff -Nur deepin-terminal-5.4.0.20/CMakeLists.txt
deepin-terminal-5.4.0.20-new/CMakeLists.txt
--- deepin-terminal-5.4.0.20/CMakeLists.txt 2021-03-15 11:37:34.000000000
+0800
+++ deepin-terminal-5.4.0.20-new/CMakeLists.txt 2021-04-17 22:43:54.644398637
+0800
@@ -7,6 +7,9 @@
include (src/DtkSettingsToolsMacros)
option(TERM_RPATH "Do you want to use compiled libraries" ON)
+set(CMAKE_C_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC")
+
if(TERM_RPATH)
set(CMAKE_SKIP_INSTALL_RPATH YES)
set(CMAKE_SKIP_RPATH YES)
