Attachment 876029 Details for Bug 1077832 – Fix libmng test, build with system one instead of bundled

[patch] Fix libmng test, build with system one instead of bundled

Fix-libmng-test-build-with-system-one-instead-of-b.patch (text/plain), 2.57 KB, created by Ville Skyttä on 2014-03-18 16:32:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 16:32:44 UTC

Size: 2.57 KB

patch

obsolete

>From 56310e22aed9c189b232b69d80046a31c85cc70d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 18:28:52 +0200
>Subject: [PATCH] Fix libmng test, build with system one instead of bundled
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077832
>---
> qt5-qtimageformats.spec                               |  8 +++++++-
> qtimageformats-opensource-src-5.2.1-libmng-test.patch | 11 +++++++++++
> 2 files changed, 18 insertions(+), 1 deletion(-)
> create mode 100644 qtimageformats-opensource-src-5.2.1-libmng-test.patch
>
>diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
>index 8625264..5715da0 100644
>--- a/qt5-qtimageformats.spec
>+++ b/qt5-qtimageformats.spec
>@@ -8,7 +8,7 @@
> Summary: Qt5 - QtImageFormats component
> Name:    qt5-%{qt_module}
> Version: 5.2.1
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> 
> # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details
> License: LGPLv2 with exceptions or GPLv3 with exceptions
>@@ -18,6 +18,7 @@ Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%
> %else
> Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
> %endif
>+Patch0: qtimageformats-opensource-src-5.2.1-libmng-test.patch
> 
> BuildRequires: qt5-qtbase-devel >= %{version}
> BuildRequires: libmng-devel
>@@ -53,6 +54,8 @@ BuildArch: noarch
> 
> %prep
> %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
>+%patch0 -p1
>+rm -r src/3rdparty
> 
> 
> %build
>@@ -91,6 +94,9 @@ make install_docs INSTALL_ROOT=%{buildroot}
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 5.2.1-2
>+- Fix libmng test, build with system one instead of bundled
>+
> * Wed Feb 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-1
> - 5.2.1
> 
>diff --git a/qtimageformats-opensource-src-5.2.1-libmng-test.patch b/qtimageformats-opensource-src-5.2.1-libmng-test.patch
>new file mode 100644
>index 0000000..e035202
>--- /dev/null
>+++ b/qtimageformats-opensource-src-5.2.1-libmng-test.patch
>@@ -0,0 +1,11 @@
>+diff -up qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp~ qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp
>+--- qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp~	2014-02-01 22:38:05.000000000 +0200
>++++ qtimageformats-opensource-src-5.2.1/config.tests/libmng/libmng.cpp	2014-03-18 18:21:32.340722308 +0200
>+@@ -39,6 +39,7 @@
>+ **
>+ ****************************************************************************/
>+ 
>++#include <stdio.h>
>+ #include <libmng.h>
>+ 
>+ int main(int, char **)
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077832: 876029