From e49b6838791ed678b5c6dbec03e52beebc97f719889fbe6ef48b951be9091fef Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 May 2014 04:38:30 +0000 Subject: [PATCH] Accepting request 235026 from KDE:Qt5 Update to 5.3.0 final OBS-URL: https://build.opensuse.org/request/show/235026 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=19 --- libqt5-qtbase.changes | 19 +++++++++++++++++++ libqt5-qtbase.spec | 17 +++++++++++++---- qtbase-opensource-src-5.3.0-RC.tar.xz | 3 --- qtbase-opensource-src-5.3.0.tar.xz | 3 +++ 4 files changed, 35 insertions(+), 7 deletions(-) delete mode 100644 qtbase-opensource-src-5.3.0-RC.tar.xz create mode 100644 qtbase-opensource-src-5.3.0.tar.xz diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index a40b6aa..6e7eb29 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed May 21 00:32:51 UTC 2014 - hrvoje.senjan@gmail.com + +- Only enable reducing relocations on x86 and x86_64 arches; fixes + build for arm, ppc, etc (QTBUG-36129) + +------------------------------------------------------------------- +Mon May 19 23:42:44 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.3.0 final + * Minor bugfixes over previous RC + +------------------------------------------------------------------- +Sat May 17 17:11:25 UTC 2014 - hrvoje.senjan@gmail.com + +- Disable logging to journald for now, as it creates significant + performance penalty +- Don't pass /usr/include to qmake, not needed + ------------------------------------------------------------------- Thu May 8 17:50:59 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index dd696a4..5cb14a4 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -17,16 +17,17 @@ %define qt5_snapshot 0 +%define journald 0 Name: libqt5-qtbase -Version: 5.3.0~rc +Version: 5.3.0 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.3.0-RC +%define real_version 5.3.0 %define so_version 5.3.0 %if %qt5_snapshot %define tar_version qtbase-%{real_version} @@ -101,7 +102,9 @@ BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 %else BuildRequires: xkeyboard-config %endif +%if %journald BuildRequires: pkgconfig(libsystemd-journal) +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -638,7 +641,11 @@ echo yes | ./configure $platform \ -sysconfdir %{libqt5_sysconfdir} \ -translationdir %{libqt5_translationdir} \ -verbose \ +%ifarch %ix86 x86_64 -reduce-relocations \ +%else + -no-reduce-relocations \ +%endif -optimized-qmake \ -accessibility \ -no-strip \ @@ -677,7 +684,9 @@ echo yes | ./configure $platform \ -system-sqlite \ -no-sql-mysql \ -no-strip \ +%if %journald -journald \ +%endif -xsync \ -xinput \ -gtkstyle \ @@ -692,9 +701,9 @@ echo yes | ./configure $platform \ %endif -release \ -plugin-sql-sqlite -nomake tests \ - -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ + -plugin-sql-psql -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ - -plugin-sql-mysql -I/usr/include/mysql/ -I/usr/include -v + -plugin-sql-mysql -I/usr/include/mysql/ -v make %{?_smp_mflags} diff --git a/qtbase-opensource-src-5.3.0-RC.tar.xz b/qtbase-opensource-src-5.3.0-RC.tar.xz deleted file mode 100644 index fc48f01..0000000 --- a/qtbase-opensource-src-5.3.0-RC.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40c89d5be6257a9006688493d5fb7a4906bd7b7c9ecc644184ec102e4a4f966c -size 46643312 diff --git a/qtbase-opensource-src-5.3.0.tar.xz b/qtbase-opensource-src-5.3.0.tar.xz new file mode 100644 index 0000000..9d8d2f1 --- /dev/null +++ b/qtbase-opensource-src-5.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab +size 46643328