Hello community,
here is the log from the commit of package libqt5-qtimageformats for
openSUSE:Factory checked in at 2013-12-02 09:46:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtimageformats (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtimageformats"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtimageformats/libqt5-qtimageformats.changes
2013-11-04 09:12:57.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new/libqt5-qtimageformats.changes
2013-12-02 09:46:34.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Nov 29 13:42:39 UTC 2013 - [email protected]
+
+- Update to 5.2 rc1
+ * New feature release, please see
+
http://blog.qt.digia.com/blog/2013/11/29/qt-5-2-release-candidate-1-available/
+ and http://qt-project.org/wiki/New-Features-in-Qt-5.2
+- Added mng_version.patch, for recognizing newer (e.g. 2.0.x) libmng
+ versions
+
+-------------------------------------------------------------------
Old:
----
qtimageformats-opensource-src-5.2.0-beta1.tar.xz
New:
----
mng_version.patch
qtimageformats-opensource-src-5.2.0-rc1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.ngCVCq/_old 2013-12-02 09:46:34.000000000 +0100
+++ /var/tmp/diff_new_pack.ngCVCq/_new 2013-12-02 09:46:34.000000000 +0100
@@ -17,16 +17,19 @@
Name: libqt5-qtimageformats
-Version: 5.2.0~beta1
+Version: 5.2.0~rc1
Release: 0
Summary: Qt 5 Image Format Plugins
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
Source: %{tar_version}.tar.xz
+# PATCH-FIX-UPSTREAM mng_version.patch -- libmng 2.0.x has been released and
is compatible and usable, but since
+# it no longer provides a VERSION_MAJOR macro, the config test would fail.
+Patch0: mng_version.patch
BuildRequires: libmng-devel
%define base_name libqt5
-%define real_version 5.2.0-beta1
+%define real_version 5.2.0-rc1
%define so_version 5.2.0
%define tar_version qtimageformats-opensource-src-%{real_version}
BuildRequires: libqt5-qtbase-devel >= %{version}
@@ -60,6 +63,7 @@
%prep
%setup -q -n qtimageformats-opensource-src-%{real_version}
+%patch0 -p1
%build
%qmake5
++++++ mng_version.patch ++++++
From: aavit <[email protected]>
Date: Fri, 22 Nov 2013 14:04:23 +0000
Subject: Recognize newer libmng versions in config test
X-Git-Url:
http://quickgit.kde.org/?p=qt%2Fqtimageformats.git&a=commitdiff&h=9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe
---
Recognize newer libmng versions in config test
libmng 2.0.x has been released and is compatible and usable, but since
it no longer provides a VERSION_MAJOR macro, the config test would fail.
Task-number: QTBUG-34894
Change-Id: I106aa258de0851af01d1bb016c2971dd8e30fd24
Reviewed-by: Liang Qi <[email protected]>
---
--- a/config.tests/libmng/libmng.cpp
+++ b/config.tests/libmng/libmng.cpp
@@ -46,8 +46,10 @@
mng_handle hMNG;
mng_cleanup(&hMNG);
+#if defined(MNG_VERSION_MAJOR)
#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0
&& MNG_VERSION_RELEASE < 9)
#error System libmng version is less than 1.0.9; using built-in version
instead.
+#endif
#endif
return 0;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]