From 4d9832a0cfbf2069a90b7ae0c3ebed0db52c0346f70aaa7037f807ea2aaa5d33 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 27 May 2017 19:09:23 +0000 Subject: [PATCH] Accepting request 498481 from home:wolfi323:branches:KDE:Extra - Update to version 3.1.4 - Add Drop-QForeachContainer-include.patch to fix build with Qt 5.9 OBS-URL: https://build.opensuse.org/request/show/498481 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=43 --- Drop-QForeachContainer-include.patch | 27 +++++++++++++++++++++++++++ krita-3.1.3.tar.gz | 3 --- krita-3.1.4.tar.gz | 3 +++ krita.changes | 25 +++++++++++++++++++++++++ krita.spec | 5 ++++- 5 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Drop-QForeachContainer-include.patch delete mode 100644 krita-3.1.3.tar.gz create mode 100644 krita-3.1.4.tar.gz diff --git a/Drop-QForeachContainer-include.patch b/Drop-QForeachContainer-include.patch new file mode 100644 index 0000000..26d7178 --- /dev/null +++ b/Drop-QForeachContainer-include.patch @@ -0,0 +1,27 @@ +From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Sat, 6 May 2017 16:00:21 +0200 +Subject: Drop QForeachContainer include and fix Qt 5.9 build + +It's not used anywhere. + +Acked by boud. +--- + libs/ui/KisResourceBundleManifest.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp +index e4f94ca..8376165 100644 +--- a/libs/ui/KisResourceBundleManifest.cpp ++++ b/libs/ui/KisResourceBundleManifest.cpp +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + + #include + #include +-- +cgit v0.11.2 + diff --git a/krita-3.1.3.tar.gz b/krita-3.1.3.tar.gz deleted file mode 100644 index 2500c79..0000000 --- a/krita-3.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:816b9fa9717b78d8dc3a9c4efd49f7a5e3b7f2a0965f2434c48b708598d1b288 -size 209606776 diff --git a/krita-3.1.4.tar.gz b/krita-3.1.4.tar.gz new file mode 100644 index 0000000..a2e08f7 --- /dev/null +++ b/krita-3.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa +size 209778186 diff --git a/krita.changes b/krita.changes index f90def1..a905c3c 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri May 26 12:37:54 UTC 2017 - wbauer@tmo.at + +- Update to version 3.1.4: + * Fix a crash when trying to play an animation when OpenGL is + disabled in Krita + * Fix rendering animation frames if the directory you're trying + to render to doesn't exist + * Don't open the tablet/screen resolution conflict dialog + multiple times + * Don't scale down previews that are too small in the transform + tool: this fixes a rare crash with the transform tool + * Don't crash when trying to close the last view on the last + document while the document is modified. + * Fix a crash when cycling quickly through layers that have a + color tag + * Fix loading some Gimp 2.9 files: note that Gimp 2.9's file + format is not officially supported in Krita + * Fully remove the macro recorder plugin: in 3.1.4, only the + menu entries had stayed around. + * Make it impossible to hide the template selector in the new + image dialog; hiding the template selector would also hide the + cancel button in the dialog. +- Add Drop-QForeachContainer-include.patch to fix build with Qt 5.9 + ------------------------------------------------------------------- Mon May 1 12:03:56 UTC 2017 - fabian@ritter-vogt.de diff --git a/krita.spec b/krita.spec index a107352..87c7a75 100644 --- a/krita.spec +++ b/krita.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: krita -Version: 3.1.3 +Version: 3.1.4 Release: 0 Summary: Digital Painting Application License: GPL-2.0+ and LGPL-2.1+ @@ -27,6 +27,8 @@ Group: Productivity/Graphics/Bitmap Editors Url: http://www.krita.org/ Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz Source99: %{name}.changes +# PATCH-FIX-UPSTREAM Drop-QForeachContainer-include.patch -- fixes build with Qt 5.9 +Patch: Drop-QForeachContainer-include.patch BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -130,6 +132,7 @@ Development headers and libraries for Krita. %prep %setup -q -n krita-%{version} +%patch -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y')