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-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..e0d93ee 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Feb 6 18:03:26 UTC 2016 - hrvoje.senjan@gmail.com + +- 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 +- 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 55be577..9a8333a 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} @@ -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 @@ -38,8 +39,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 +49,6 @@ image formats. %prep %setup -q -%patch -p1 %build %cmake_kf5 -d build