forked from pool/kimageformats
Accepting request 360969 from KDE:Frameworks5
Update to 5.19.0 OBS-URL: https://build.opensuse.org/request/show/360969 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kimageformats?expand=0&rev=27
This commit is contained in:
commit
9338b84d99
@ -1,31 +0,0 @@
|
|||||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8
|
|
||||||
size 85192
|
|
3
kimageformats-5.19.0.tar.xz
Normal file
3
kimageformats-5.19.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:656fffdc4fc60535afdbd17f7e031a9d399f88f0080a33bf6a9659b00cfbb1f9
|
||||||
|
size 204108
|
@ -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
|
Fri Jan 8 20:35:13 UTC 2016 - wbauer@tmo.at
|
||||||
|
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define _tar_path 5.18
|
%define _tar_path 5.19
|
||||||
Name: kimageformats
|
Name: kimageformats
|
||||||
Version: 5.18.0
|
Version: 5.19.0
|
||||||
Release: 0
|
Release: 0
|
||||||
BuildRequires: cmake >= 2.8.12
|
BuildRequires: cmake >= 2.8.12
|
||||||
BuildRequires: extra-cmake-modules >= %{_tar_path}
|
BuildRequires: extra-cmake-modules >= %{_tar_path}
|
||||||
@ -26,6 +26,7 @@ BuildRequires: fdupes
|
|||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: openexr
|
BuildRequires: openexr
|
||||||
BuildRequires: openexr-devel
|
BuildRequires: openexr-devel
|
||||||
|
BuildRequires: cmake(KF5Archive) >= %{_tar_path}
|
||||||
BuildRequires: cmake(Qt5Gui) >= 5.3.0
|
BuildRequires: cmake(Qt5Gui) >= 5.3.0
|
||||||
BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0
|
BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0
|
||||||
BuildRequires: cmake(Qt5Test) >= 5.3.0
|
BuildRequires: cmake(Qt5Test) >= 5.3.0
|
||||||
@ -38,8 +39,6 @@ Group: System/GUI/KDE
|
|||||||
Url: http://www.kde.org
|
Url: http://www.kde.org
|
||||||
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
||||||
Source1: baselibs.conf
|
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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -50,7 +49,6 @@ image formats.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user