SHA256
1
0
forked from pool/krita

Accepting request 590757 from home:khnazile:branches:KDE:Extra

- Restore openSUSE Leap 42.3 support:
  * boost 1.61 presents in Leap 42.3 repo
  * Added fix_libgif_5_0_build.patch to make krita build against libgif 5.0.x

OBS-URL: https://build.opensuse.org/request/show/590757
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=63
This commit is contained in:
Luca Beltrame 2018-03-24 21:08:58 +00:00 committed by Git OBS Bridge
parent 9831f1f06a
commit c94e1b84c5
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,14 @@
From: Anatoly Bobrov <khnazile@rkmail.ru>
Subject: Trivial fix to make Krita link against libgif 5.0.x in openSUSE Leap 42.3
--- plugins/impex/gif/qgiflibhandler.cpp 2018-03-20 10:49:57.000000000 +0300
+++ plugins/impex/gif/qgiflibhandler.cpp 2018-03-23 15:11:33.890071869 +0300
@@ -314,7 +314,7 @@
}
}
- EGifCloseFile(gif, &err);
+ EGifCloseFile(gif);
return true;
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 23 18:33:32 UTC 2018 - khnazile@rkmail.ru
- Restore openSUSE Leap 42.3 support:
* boost 1.61 presents in Leap 42.3 repo
* Added fix_libgif_5_0_build.patch to make krita build against libgif 5.0.x
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 22 11:55:27 UTC 2018 - wbauer@tmo.at Thu Mar 22 11:55:27 UTC 2018 - wbauer@tmo.at

View File

@ -26,11 +26,17 @@ License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Graphics/Bitmap Editors Group: Productivity/Graphics/Bitmap Editors
Url: http://www.krita.org/ Url: http://www.krita.org/
Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz
# PATCH-FIX-OPENSUSE fix_libgif_5_0_build.patch -- Trivial fix to make Krita link against libgif 5.0.x in openSUSE Leap 42.3
Patch1: fix_libgif_5_0_build.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: OpenColorIO-devel BuildRequires: OpenColorIO-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: Vc-devel-static BuildRequires: Vc-devel-static
%if 0%{?suse_version} < 1320
BuildRequires: boost_1_61-devel
%else
BuildRequires: libboost_system-devel BuildRequires: libboost_system-devel
%endif
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
BuildRequires: giflib-devel BuildRequires: giflib-devel
@ -118,6 +124,9 @@ Development headers and libraries for Krita.
%prep %prep
%setup -q -n krita-%{version} %setup -q -n krita-%{version}
%if 0%{?suse_version} < 1320
%patch1
%endif
%build %build
# install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based) # install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based)