Hello community,
here is the log from the commit of package deepin-screenshot for
openSUSE:Factory checked in at 2020-06-25 15:09:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-screenshot (Old)
and /work/SRC/openSUSE:Factory/.deepin-screenshot.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-screenshot"
Thu Jun 25 15:09:00 2020 rev:2 rq:816968 version:4.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-screenshot/deepin-screenshot.changes
2019-06-12 13:11:36.708985757 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-screenshot.new.3060/deepin-screenshot.changes
2020-06-25 15:10:30.233944370 +0200
@@ -1,0 +2,15 @@
+Thu Jun 25 06:56:06 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Add deepin-screenshot-Qt-5_15.patch
+ * Support Qt 5.15
+
+-------------------------------------------------------------------
+Mon Jul 29 03:56:53 UTC 2019 - Hillwood Yang <[email protected]>
+
+- Update version to 4.2.2
+ * Update translations
+ * Fix cannot input text
+ * Fix SaveToSpecificDir not select last path
+ * Fix blur: check geometry failed
+
+-------------------------------------------------------------------
Old:
----
deepin-screenshot-4.1.11.tar.gz
deepin-screenshot-appdata.xml
New:
----
deepin-screenshot-4.2.2.tar.gz
deepin-screenshot-Qt-5_15.patch
deepin-screenshot.appdata.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-screenshot.spec ++++++
--- /var/tmp/diff_new_pack.6HAaWl/_old 2020-06-25 15:10:33.885955830 +0200
+++ /var/tmp/diff_new_pack.6HAaWl/_new 2020-06-25 15:10:33.889955843 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-screenshot
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,38 +12,41 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: deepin-screenshot
-Version: 4.1.11
+Version: 4.2.2
Release: 0
Summary: Deepin Screenshot
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: Productivity/Graphics/Convertors
-Url: https://github.com/linuxdeepin/deepin-screenshot
+URL: https://github.com/linuxdeepin/deepin-screenshot
Source0:
https://github.com/linuxdeepin/deepin-screenshot/archive/%{version}/%{name}-%{version}.tar.gz
-Source1: %{name}-appdata.xml
+Source1: %{name}.appdata.xml
+# PATCH-FIX-UPSTEAM deepin-screenshot-Qt-5_15.patch [email protected] -
Support Qt 5.15
+Patch0: %{name}-Qt-5_15.patch
+BuildRequires: appstream-glib
+BuildRequires: cmake
+BuildRequires: deepin-gettext-tools
BuildRequires: fdupes
-BuildRequires: pkgconfig(dtkwidget)
-BuildRequires: pkgconfig(dtkwm)
-BuildRequires: pkgconfig(xtst)
-BuildRequires: pkgconfig(xcb-util)
+BuildRequires: hicolor-icon-theme
+BuildRequires: libqt5-linguist
+BuildRequires: update-desktop-files
+BuildRequires: cmake(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: cmake(Qt5Concurrent)
-BuildRequires: libqt5-linguist
-BuildRequires: appstream-glib
-BuildRequires: hicolor-icon-theme
-BuildRequires: update-desktop-files
-BuildRequires: deepin-gettext-tools
-BuildRequires: cmake
-Requires: desktop-file-utils
+BuildRequires: pkgconfig(dtkwidget)
+BuildRequires: pkgconfig(dtkwm)
+BuildRequires: pkgconfig(xcb-util)
+BuildRequires: pkgconfig(xtst)
Requires: deepin-turbo
+Requires: desktop-file-utils
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,12 +60,15 @@
%prep
%setup -q
+%if 0%{?suse_version} > 1500
+%patch0 -p1
+%endif
sed -i 's/lrelease/lrelease-qt5/g' generate_translations.sh
sed -i
's/Delay_Screenshot/X-Delay_Screenshot/g;s/Full_Screenshot/X-Full_Screenshot/g'
%{name}.desktop
%build
%cmake
-make %{?_smp_mflags}
+%make_build
%install
%cmake_install
++++++ deepin-screenshot-4.1.11.tar.gz -> deepin-screenshot-4.2.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-screenshot/deepin-screenshot-4.1.11.tar.gz
/work/SRC/openSUSE:Factory/.deepin-screenshot.new.3060/deepin-screenshot-4.2.2.tar.gz
differ: char 14, line 1
++++++ deepin-screenshot-Qt-5_15.patch ++++++
diff -Nur deepin-screenshot-4.1.11/src/widgets/shapeswidget.cpp
deepin-screenshot-4.1.11-new/src/widgets/shapeswidget.cpp
--- deepin-screenshot-4.1.11/src/widgets/shapeswidget.cpp 2019-05-09
14:58:09.000000000 +0800
+++ deepin-screenshot-4.1.11-new/src/widgets/shapeswidget.cpp 2020-06-25
14:53:36.679143203 +0800
@@ -21,6 +21,7 @@
#include <QApplication>
#include <QPainter>
+#include <QPainterPath>
#include <QDebug>
#include "src/utils/calculaterect.h"
++++++ deepin-screenshot-appdata.xml -> deepin-screenshot.appdata.xml ++++++
--- /work/SRC/openSUSE:Factory/deepin-screenshot/deepin-screenshot-appdata.xml
2019-06-12 13:11:36.580985892 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-screenshot.new.3060/deepin-screenshot.appdata.xml
2020-06-25 15:10:29.789942977 +0200
@@ -25,8 +25,14 @@
<project_license>GPL-3.0+</project_license>
<developer_name>Linux Deepin</developer_name>
<screenshots>
- <screenshot
type="default">http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/phpPz5DPq.jpg</screenshot>
- <screenshot
type="default">http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/php6aIjJo.jpg</screenshot>
- <screenshot
type="default">http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/phplSPFcv.jpg</screenshot>
+ <screenshot type="default">
+
<image>http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/phpPz5DPq.jpg</image>
+ </screenshot>
+ <screenshot type="default">
+
<image>http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/php6aIjJo.jpg</image>
+ </screenshot>
+ <screenshot type="default">
+
<image>http://api.lastore.deepin.org/static/deepin-screenshot/meta/screenshots/zh_CN/phplSPFcv.jpg</image>
+ </screenshot>
</screenshots>
</component>
