Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory checked
in at 2013-04-23 11:32:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
and /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "dmuel...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-04-14
10:33:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes
2013-04-23 11:32:56.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 22 06:40:35 UTC 2013 - pgaj...@suse.com
+
+- Added slovak-zero.patch, fixes bug [bnc#812528].
+
+-------------------------------------------------------------------
+Sat Apr 20 16:32:12 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added fix-moc-from-choking-on-boost-headers.patch, workaround for
+ QTBUG#22829
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change
New:
----
fix-moc-from-choking-on-boost-headers.patch
slovak-zero.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.g3h2Og/_old 2013-04-23 11:33:10.000000000 +0200
+++ /var/tmp/diff_new_pack.g3h2Og/_new 2013-04-23 11:33:10.000000000 +0200
@@ -112,6 +112,11 @@
Patch150: check-return-value-of-qt_safe_pipe.patch
Patch151: aarch64-support.diff
Patch152: moc-boost148-workaround.diff
+# PATCH-FIX-UPSTREAM fix-moc-from-choking-on-boost-headers.patch --
Workaround for QTBUG-22829
+Patch153: fix-moc-from-choking-on-boost-headers.patch
+# following patch fixes slovak locale data, e. g. position of slovak zero
symbol in unicode
+# (to be upstreamed)
+Patch154: slovak-zero.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
@@ -198,6 +203,8 @@
%patch150 -p1
%patch151
%patch152
+%patch153 -p1
+%patch154 -p1
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
libqt4-sql-plugins.spec: same change
libqt4.spec: same change
++++++ fix-moc-from-choking-on-boost-headers.patch ++++++
diff -urNB qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/main.cpp
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
--- qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/main.cpp
2013-04-20 18:19:50.777477986 +0200
+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-04-20
18:20:41.070849233 +0200
@@ -187,7 +187,12 @@
Moc moc;
pp.macros["Q_MOC_RUN"];
pp.macros["__cplusplus"];
+
+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
pp.macros["BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"];
+
QByteArray filename;
QByteArray output;
FILE *in = 0;
++++++ slovak-zero.patch ++++++
Index: qt-everywhere-opensource-src-4.8.4/src/corelib/tools/qlocale_data_p.h
===================================================================
--- qt-everywhere-opensource-src-4.8.4.orig/src/corelib/tools/qlocale_data_p.h
+++ qt-everywhere-opensource-src-4.8.4/src/corelib/tools/qlocale_data_p.h
@@ -562,7 +562,7 @@ static const QLocalePrivate locale_data[
{ 106, 0, 198, 46, 44, 59, 37, 48, 45, 43,
101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 572,10 , 959,17 ,
522,7 , 25,12 , 12541,59 , 12600,96 , 12696,32 , 12808,61 , 12869,96 , 12965,32
, 8367,30 , 8397,62 , 8459,19 , 8367,30 , 8397,62 , 8459,19 , 293,5 , 276,4 ,
{76,75,82}, 256,3 , 6172,19 , 4,4 , 13,6 , 2496,5 , 2501,11 , 2, 1,
1, 6, 7 }, // Singhalese/AnyScript/SriLanka
{ 107, 0, 195, 44, 160, 59, 37, 48, 45, 43,
101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5
, 8,10 , 12728,48 , 12776,114 , 1381,27 , 12997,48 , 13045,114 , 134,27 ,
8478,27 , 8505,68 , 708,14 , 8478,27 , 8505,68 , 708,14 , 0,2 , 0,2 ,
{90,65,82}, 11,1 , 0,7 , 4,4 , 4,0 , 2512,7 , 0,0 , 2, 1, 7,
6, 7 }, // Siswati/AnyScript/SouthAfrica
{ 107, 0, 204, 44, 160, 59, 37, 48, 45, 43,
101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5
, 8,10 , 12728,48 , 12776,114 , 1381,27 , 12997,48 , 13045,114 , 134,27 ,
8478,27 , 8505,68 , 708,14 , 8478,27 , 8505,68 , 708,14 , 0,2 , 0,2 ,
{83,90,76}, 259,1 , 0,7 , 4,4 , 4,0 , 2512,7 , 0,0 , 2, 1, 1,
6, 7 }, // Siswati/AnyScript/Swaziland
- { 108, 0, 191, 1643, 1644, 1563, 1642, 1632, 45, 43,
101, 8218, 8216, 8222, 8220, 0,6 , 0,6 , 104,7 , 104,7 , 582,8 , 498,18 ,
165,4 , 195,9 , 12890,48 , 12938,82 , 12028,24 , 13159,48 , 13207,89 , 12295,24
, 8573,21 , 8594,52 , 8646,14 , 8573,21 , 8594,52 , 8646,14 , 298,10 , 280,9 ,
{69,85,82}, 112,1 , 6191,28 , 25,5 , 4,0 , 2519,10 , 2529,19 , 2, 1,
1, 6, 7 }, // Slovak/AnyScript/Slovakia
+ { 108, 0, 191, 44, 160, 59, 37, 48, 45, 43,
101, 8218, 8216, 8222, 8220, 0,6 , 0,6 , 78,7 , 78,7 , 586,8 , 502,18 ,
165,4 , 195,9 , 12975,48 , 13023,82 , 12122,24 , 13119,48 , 13167,89 , 12266,24
, 8476,21 , 8497,52 , 8549,14 , 8476,21 , 8497,52 , 8549,14 , 260,10 , 253,9 ,
{69,85,82}, 113,1 , 3549,11 , 25,5 , 4,0 , 2308,10 , 2318,19 , 2, 1,
1, 6, 7 }, // Slovak/AnyScript/Slovakia
{ 109, 0, 192, 44, 46, 59, 37, 48, 45, 43,
101, 187, 171, 8222, 8220, 0,6 , 0,6 , 367,8 , 367,8 , 976,9 , 590,19 ,
37,5 , 8,10 , 11899,48 , 13020,86 , 12028,24 , 13296,59 , 13355,86 , 12295,24 ,
8660,28 , 8688,52 , 8740,14 , 8754,35 , 8688,52 , 8740,14 , 78,4 , 289,4 ,
{69,85,82}, 112,1 , 6219,28 , 25,5 , 4,0 , 2548,11 , 2559,9 , 2, 1,
1, 6, 7 }, // Slovenian/AnyScript/Slovenia
{ 110, 0, 194, 46, 44, 59, 37, 48, 45, 43,
101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 ,
25,12 , 13106,48 , 13154,189 , 13343,24 , 13441,48 , 13489,189 , 13678,24 ,
8789,28 , 8817,47 , 8864,14 , 8789,28 , 8817,47 , 8864,14 , 308,3 , 293,3 ,
{83,79,83}, 0,0 , 6247,22 , 4,4 , 4,0 , 2568,8 , 2576,10 , 0, 0,
1, 6, 7 }, // Somali/AnyScript/Somalia
{ 110, 0, 59, 46, 44, 59, 37, 48, 45, 43,
101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 ,
25,12 , 13106,48 , 13154,189 , 13343,24 , 13441,48 , 13489,189 , 13678,24 ,
8789,28 , 8817,47 , 8864,14 , 8789,28 , 8817,47 , 8864,14 , 308,3 , 293,3 ,
{68,74,70}, 5,3 , 6269,21 , 4,4 , 4,0 , 2568,8 , 2586,7 , 0, 0, 6,
6, 7 }, // Somali/AnyScript/Djibouti
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
