From a2cea8056cf5147af5c940242cbd1ed5996e831ad65c304cf3768bdb7fc91fa9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 6 Feb 2016 18:03:34 +0000 Subject: [PATCH 1/4] start with 5.19.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=75 --- kimageformats-5.18.0.tar.xz | 3 --- kimageformats-5.19.0.tar.xz | 3 +++ kimageformats.changes | 7 +++++++ kimageformats.spec | 7 ++----- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 kimageformats-5.18.0.tar.xz create mode 100644 kimageformats-5.19.0.tar.xz diff --git a/kimageformats-5.18.0.tar.xz b/kimageformats-5.18.0.tar.xz deleted file mode 100644 index 85d91e4..0000000 --- a/kimageformats-5.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8 -size 85192 diff --git a/kimageformats-5.19.0.tar.xz b/kimageformats-5.19.0.tar.xz new file mode 100644 index 0000000..6b5c73f --- /dev/null +++ b/kimageformats-5.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:656fffdc4fc60535afdbd17f7e031a9d399f88f0080a33bf6a9659b00cfbb1f9 +size 204108 diff --git a/kimageformats.changes b/kimageformats.changes index d2e0143..91f1a87 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 6 18:03:26 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.19.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php + ------------------------------------------------------------------- Fri Jan 8 20:35:13 UTC 2016 - wbauer@tmo.at diff --git a/kimageformats.spec b/kimageformats.spec index 55be577..cc26aed 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -16,9 +16,9 @@ # -%define _tar_path 5.18 +%define _tar_path 5.19 Name: kimageformats -Version: 5.18.0 +Version: 5.19.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -38,8 +38,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM fix-psd.patch kde#354413 -- fixes loading of RLE compressed PSD files -Patch: fix-psd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,7 +48,6 @@ image formats. %prep %setup -q -%patch -p1 %build %cmake_kf5 -d build From 2bd7907605442527472b59d8601144c02f4cbc7adf4a8c8513c4fea0548a83f6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 6 Feb 2016 18:20:55 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=76 --- fix-psd.patch | 31 ------------------------------- kimageformats.changes | 1 + 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 fix-psd.patch diff --git a/fix-psd.patch b/fix-psd.patch deleted file mode 100644 index 477239b..0000000 --- a/fix-psd.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Wolfgang Bauer -Date: Sun, 10 Jan 2016 12:24:35 +0000 -Subject: fix loading of RLE compressed PSD files -X-Git-Url: http://quickgit.kde.org/?p=kimageformats.git&a=commitdiff&h=5d7ef7c38e9f6aa473fec5ee7f1daabcb405ffd7 ---- -fix loading of RLE compressed PSD files - -decodeRLEData() expects a quint16 as length, but the PSD loader calls it -with a quint32. -We do need quint32 for PSD, otherwise it would overflow for images -bigger than 256x256 pixels (it's the pixel count there, i.e. width x -height). - -BUG: 354413 -FIXED-IN: 5.19.0 -REVIEW: 126684 ---- - - ---- a/src/imageformats/rle_p.h -+++ b/src/imageformats/rle_p.h -@@ -75,7 +75,7 @@ - static inline bool decodeRLEData(RLEVariant variant, - QDataStream &stream, - Item *dest, -- quint16 length, -+ quint32 length, - Func1 readData, - Func2 updateItem) - { - diff --git a/kimageformats.changes b/kimageformats.changes index 91f1a87..a2bb95b 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -4,6 +4,7 @@ Sat Feb 6 18:03:26 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.19.0.php +- Drop upstreamed fix-psd.patch ------------------------------------------------------------------- Fri Jan 8 20:35:13 UTC 2016 - wbauer@tmo.at From 58343d86f17e7f88222086583f0a7280b114e3afad19a1681184dc0400214b96 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 13 Feb 2016 19:26:32 +0000 Subject: [PATCH 3/4] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=77 --- kimageformats.changes | 2 ++ kimageformats.spec | 1 + 2 files changed, 3 insertions(+) diff --git a/kimageformats.changes b/kimageformats.changes index a2bb95b..6bf61c6 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -2,9 +2,11 @@ Sat Feb 6 18:03:26 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 + * Add kra and ora imageio plugins (read-only) * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.19.0.php - Drop upstreamed fix-psd.patch +- Add cmake(KF5Archive) BuildRequires ------------------------------------------------------------------- Fri Jan 8 20:35:13 UTC 2016 - wbauer@tmo.at diff --git a/kimageformats.spec b/kimageformats.spec index cc26aed..9a8333a 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -26,6 +26,7 @@ BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: openexr BuildRequires: openexr-devel +BuildRequires: cmake(KF5Archive) >= %{_tar_path} BuildRequires: cmake(Qt5Gui) >= 5.3.0 BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0 BuildRequires: cmake(Qt5Test) >= 5.3.0 From d5b0de76b309fadee4c9499b8eea3e820ec05403a1de491058a1444e7d2745ad Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 22 Feb 2016 16:41:35 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=78 --- kimageformats.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kimageformats.changes b/kimageformats.changes index 6bf61c6..e0d93ee 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Feb 6 18:03:26 UTC 2016 - hrvoje.senjan@gmail.com -- Update to 5.19.0 +- Update to 5.19.0 (boo#967668) * Add kra and ora imageio plugins (read-only) * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.19.0.php