Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2014-12-03 22:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt3 (Old) and /work/SRC/openSUSE:Factory/.qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3" Changes: -------- --- /work/SRC/openSUSE:Factory/qt3/qt3-extensions.changes 2013-12-13 13:10:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-extensions.changes 2014-12-03 22:52:29.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 6 07:34:23 UTC 2014 - [email protected] + +- add patch to force mysql driver to latin1 encoding (former default!) + qt3-mysql-force-latin1.diff + +------------------------------------------------------------------- New: ---- qt3-mysql-force-latin1.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.WxP5Ve/_old 2014-12-03 22:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.WxP5Ve/_new 2014-12-03 22:52:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3-devel-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.WxP5Ve/_old 2014-12-03 22:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.WxP5Ve/_new 2014-12-03 22:52:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3-extensions # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -114,6 +114,7 @@ Patch141: qt-x11-free-3.3.8b-odbc.patch Patch142: extend-freetype-includes-search.patch Patch143: qt3-trident-add-glib-mainloop-support.patch +Patch188: qt3-mysql-force-latin1.diff # TQt integration Patch200: qt-3.3.8c.diff @@ -201,6 +202,7 @@ %endif %patch200 %patch142 -p1 +%patch188 -p1 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.WxP5Ve/_old 2014-12-03 22:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.WxP5Ve/_new 2014-12-03 22:52:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,13 @@ BuildRequires: c++_compiler BuildRequires: cups-devel BuildRequires: freetype2-devel +BuildRequires: glib2-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(glu) -BuildRequires: glib2-devel Url: http://www.trolltech.com/ BuildRequires: libpng-devel # bug437293 @@ -125,6 +125,7 @@ Patch141: qt-x11-free-3.3.8b-odbc.patch Patch142: extend-freetype-includes-search.patch Patch143: qt3-trident-add-glib-mainloop-support.patch +Patch188: qt3-mysql-force-latin1.diff # TQt integration Patch200: qt-3.3.8c.diff @@ -222,6 +223,7 @@ %endif %patch200 %patch142 -p1 +%patch188 -p1 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ @@ -237,11 +239,11 @@ Requires: c++_compiler Requires: cups-devel Requires: freetype2-devel +Requires: glib2-devel Requires: libjpeg-devel Requires: libmng-devel Requires: libpng-devel Requires: pkgconfig -Requires: glib2-devel Requires: qt3 = %version Requires: xorg-x11-devel Requires: pkgconfig(glu) ++++++ qt3-mysql-force-latin1.diff ++++++ Index: b/src/sql/drivers/mysql/qsql_mysql.cpp =================================================================== --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -530,6 +530,12 @@ bool QMYSQLDriver::open( const QString& setOpenError( TRUE ); return FALSE; } + +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 + // force the communication to be latin1 + mysql_set_character_set(d->mysql, "latin1"); +#endif + setOpen( TRUE ); setOpenError( FALSE ); return TRUE; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
