Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2013-11-04 09:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2013-10-18 19:22:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2013-11-04 09:12:17.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Oct 24 18:45:14 UTC 2013 - [email protected] + +- gstreamer-0_10-plugins-base-devel are not required for devel + subpackage, so remove the Requires + +------------------------------------------------------------------- +Wed Oct 23 17:11:55 UTC 2013 - [email protected] + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 +- Change obsoletes of new library and sql plugins packages + +------------------------------------------------------------------- +Fri Oct 18 17:48:59 UTC 2013 - [email protected] + +- Added qtbase-opensource-src-5.1.1-bigendian.patch, also needed + for building on PowerPC, otherwise fromWordToBytes is + left undeclared + +------------------------------------------------------------------- Old: ---- qtbase-opensource-src-5.1.1.tar.xz New: ---- qtbase-opensource-src-5.1.1-bigendian.patch qtbase-opensource-src-5.2.0-beta1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.u8dybH/_old 2013-11-04 09:12:22.000000000 +0100 +++ /var/tmp/diff_new_pack.u8dybH/_new 2013-11-04 09:12:22.000000000 +0100 @@ -23,6 +23,7 @@ BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: giflib-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: libmysqlclient-devel @@ -49,15 +50,15 @@ BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xkbcommon) >= 0.2.0 -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 Summary: C++ Program Library, Core Components License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: System/Libraries Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtbase-opensource-src-%{real_version} Source: %{tar_version}.tar.xz # to get mtime of file: @@ -68,6 +69,8 @@ Patch2: qt-never-strip.diff # PATCH-FIX-UPSTREAM qtbase-qatomic-ppc.patch -- fixes build on PPC Patch3: qtbase-qatomic-ppc.patch +# PATCH-FIX-UPSTREAM qtbase-opensource-src-5.1.1-bigendian.patch -- fixes build on big endian arches/PPC +Patch4: qtbase-opensource-src-5.1.1-bigendian.patch # PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build Patch109: libqt5-libtool-nodate.diff # PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path @@ -106,6 +109,7 @@ %setup -q -n qtbase-opensource-src-%{real_version} %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch109 -p1 %patch131 -p1 @@ -121,20 +125,21 @@ Requires: c++_compiler Requires: cups-devel Requires: freetype2-devel -Requires: libQt5Concurrent5 >= %{version} -Requires: libQt5Core5 >= %{version} -Requires: libQt5DBus5 >= %{version} -Requires: libQt5Gui5 >= %{version} -Requires: libQt5Network5 >= %{version} -Requires: libQt5OpenGL5 >= %{version} -Requires: libQt5PrintSupport5 >= %{version} -Requires: libQt5Sql5-mysql >= %{version} -Requires: libQt5Sql5-postgresql >= %{version} -Requires: libQt5Sql5-sqlite >= %{version} -Requires: libQt5Sql5-unixODBC >= %{version} -Requires: libQt5Test5 >= %{version} -Requires: libQt5Widgets5 >= %{version} -Requires: libQt5Xml5 >= %{version} +Requires: giflib-devel +Requires: libQt5Concurrent5 = %{version} +Requires: libQt5Core5 = %{version} +Requires: libQt5DBus5 = %{version} +Requires: libQt5Gui5 = %{version} +Requires: libQt5Network5 = %{version} +Requires: libQt5OpenGL5 = %{version} +Requires: libQt5PrintSupport5 = %{version} +Requires: libQt5Sql5-mysql = %{version} +Requires: libQt5Sql5-postgresql = %{version} +Requires: libQt5Sql5-sqlite = %{version} +Requires: libQt5Sql5-unixODBC = %{version} +Requires: libQt5Test5 = %{version} +Requires: libQt5Widgets5 = %{version} +Requires: libQt5Xml5 = %{version} Requires: libjpeg-devel Requires: libmng-devel Requires: libpng-devel @@ -150,7 +155,6 @@ Requires: pkgconfig(gbm) Requires: pkgconfig(glesv2) %endif -Requires: gstreamer-0_10-plugins-base-devel Requires: libicu-devel Requires: libpulse-devel Requires: libudev-devel @@ -175,8 +179,7 @@ Summary: Qt 5 Core Library Group: Development/Libraries/X11 Provides: libqt5-qtbase = %{version} -# FIXME change to < after Qt 5.2 update -Obsoletes: libqt5-qtbase <= %{version} +Obsoletes: libqt5-qtbase < %{version} %description -n libQt5Core5 The Qt 5 Core library. @@ -243,8 +246,7 @@ Requires: libQt5Sql5 = %{version} Provides: libqt5-sql-sqlite = %{version} Provides: libqt5_sql_backend = %{version} -# FIXME change to < after Qt 5.2 update -Obsoletes: libqt5-sql-sqlite <= %{version} +Obsoletes: libqt5-sql-sqlite < %{version} %description -n libQt5Sql5-sqlite Qt 5 sqlite plugin to be able to use database functionality with Qt @@ -256,8 +258,7 @@ Requires: libQt5Sql5 = %{version} Provides: libqt5-sql-unixODBC = %{version} Provides: libqt5_sql_backend = %{version} -# FIXME change to < after Qt 5.2 update -Obsoletes: libqt5-sql-unixODBC <= %{version} +Obsoletes: libqt5-sql-unixODBC < %{version} %description -n libQt5Sql5-unixODBC Qt unixODBC plugin to support databases via unixODBC within Qt @@ -269,8 +270,7 @@ Requires: libQt5Sql5 = %{version} Provides: libqt5-sql-postgresql = %{version} Provides: libqt5_sql_backend = %{version} -# FIXME change to < after Qt 5.2 update -Obsoletes: libqt5-sql-postgresql <= %{version} +Obsoletes: libqt5-sql-postgresql < %{version} %description -n libQt5Sql5-postgresql Qt SQL plugin to support PostgreSQL servers in Qt applications. @@ -281,8 +281,7 @@ Requires: libQt5Sql5 = %{version} Provides: libqt5-sql-mysql = %{version} Provides: libqt5_sql_backend = %{version} -# FIXME change to < after Qt 5.2 update -Obsoletes: libqt5-sql-mysql <= %{version} +Obsoletes: libqt5-sql-mysql < %{version} %description -n libQt5Sql5-mysql A plugin to support MySQL server in Qt applications. ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.u8dybH/_old 2013-11-04 09:12:22.000000000 +0100 +++ /var/tmp/diff_new_pack.u8dybH/_new 2013-11-04 09:12:22.000000000 +0100 @@ -1,5 +1,5 @@ libQt5Core5 - obsoletes "libqt5-qtbase-<targettype> <= <version>" + obsoletes "libqt5-qtbase-<targettype> < <version>" provides "libqt5-qtbase-<targettype> = <version>" libQt5Concurrent5 libQt5DBus5 @@ -12,16 +12,16 @@ libQt5Test5 libQt5Widgets5 libQt5Sql5-sqlite - obsoletes "libqt5-sql-sqlite-<targettype> <= <version>" + obsoletes "libqt5-sql-sqlite-<targettype> < <version>" provides "libqt5-sql-sqlite-<targettype> = <version>" libQt5Sql5-unixODBC - obsoletes "libqt5-sql-unixODBC-<targettype> <= <version>" + obsoletes "libqt5-sql-unixODBC-<targettype> < <version>" provides "libqt5-sql-unixODBC-<targettype> = <version>" libQt5Sql5-postgresql - obsoletes "libqt5-sql-postgresql-<targettype> <= <version>" + obsoletes "libqt5-sql-postgresql-<targettype> < <version>" provides "libqt5-sql-postgresql-<targettype> = <version>" libQt5Sql5-mysql - obsoletes "libqt5-sql-mysql-<targettype> <= <version>" + obsoletes "libqt5-sql-mysql-<targettype> < <version>" provides "libqt5-sql-mysql-<targettype> = <version>" libqt5-qtbase-devel requires "libQt5Core5-<targettype> = <version>" ++++++ qtbase-opensource-src-5.1.1-bigendian.patch ++++++ diff -up qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c --- qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian 2013-09-23 11:10:42.000000000 +0200 +++ qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c 2013-09-23 11:16:02.000000000 +0200 @@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c KeccakPermutationOnWords((UINT64*)state); } -#if 0 // Unused in the Qt configuration +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) { unsigned int i; @@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char * #endif } -#if 0 // Unused in the Qt configuration +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromWordToBytes(UINT8 *bytes, const UINT64 word) { unsigned int i; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
