Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory checked
in at 2015-02-27 11:09:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
and /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2014-11-28
08:46:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes
2015-02-27 11:09:22.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Feb 22 16:47:30 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Added fix-detection-of-GCC5.patch
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change
New:
----
fix-detection-of-GCC5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.DrFDxJ/_old 2015-02-27 11:09:28.000000000 +0100
+++ /var/tmp/diff_new_pack.DrFDxJ/_new 2015-02-27 11:09:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt4-devel-doc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -115,6 +115,8 @@
Patch164: l-qclipboard_delay.patch
# PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect
copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880)
Patch165: fix_qrasterpixmapdata_bnc847880.diff
+# PATCH-FIX-UPSTREAM fix-detection-of-GCC5.patch -- properly detect gcc5
+Patch166: fix-detection-of-GCC5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama
-sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups
-stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir
%_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir
%{_libdir}/qt4/demos -plugindir %plugindir -translationdir
%{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir
%{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -199,6 +201,7 @@
%patch163 -p0
%patch164
%patch165 -p1
+%patch166 -p1
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
libqt4-sql-plugins.spec: same change
libqt4.spec: same change
++++++ fix-detection-of-GCC5.patch ++++++
--- a/configure 2015-02-16 11:33:02.000000000 +0100
+++ b/configure 2015-02-18 13:17:22.000000000 +0100
@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in
*-g++*)
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 4*|3.4*)
+ 5*|4*|3.4*)
;;
3.3*)
canBuildWebKit="no"
@@ -8031,6 +8031,11 @@ g++*)
QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed
's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
QT_GCC_PATCH_VERSION=0
;;
+ *)
+ QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
+ QT_GCC_MINOR_VERSION=0
+ QT_GCC_PATCH_VERSION=0
+ ;;
esac
case "$COMPILER_VERSION" in
@@ -8040,7 +8045,7 @@ g++*)
3.*)
COMPILER_VERSION="3.*"
;;
- 4.*)
+ 5*|4.*)
COMPILER_VERSION="4"
;;
*)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
