Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2017-09-14 21:09:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4" Thu Sep 14 21:09:40 2017 rev:221 rq:523214 version:4.8.7 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2017-03-09 01:28:06.407071361 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2017-09-14 21:09:46.936462811 +0200 @@ -1,0 +2,28 @@ +Sun Sep 10 18:19:39 UTC 2017 - [email protected] + +- BuildRequire libnsl-devel on current TW and CODE15 targets. The + library has been deprecated in glibc and is now in an own + package. + +------------------------------------------------------------------- +Mon Sep 4 13:41:22 UTC 2017 - [email protected] + +- Add fix-medium-font.diff (taken from ubuntu) to fix bolder font + in Qt4 apps (boo#956357) + +------------------------------------------------------------------- +Thu Aug 24 13:50:50 UTC 2017 - [email protected] + +- Force building against openSSL 1.0 (boo#1042657) +- Do not build the MySQL plugin on TW, it would cause an openSSL + version conflict +- Adjust fix-build-icu59.patch to also work if built with c++11 + support + +------------------------------------------------------------------- +Wed May 10 09:04:37 UTC 2017 - [email protected] + +- Add fix-build-icu59.patch to fix building with ICU4C >= 59 +- Invoke configure with sh to fix build on some older distros + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2017-05-18 20:44:08.862590720 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2017-09-14 21:09:47.272415520 +0200 @@ -1,0 +2,22 @@ +Sun Sep 10 18:19:39 UTC 2017 - [email protected] + +- BuildRequire libnsl-devel on current TW and CODE15 targets. The + library has been deprecated in glibc and is now in an own + package. + +------------------------------------------------------------------- +Mon Sep 4 13:41:22 UTC 2017 - [email protected] + +- Add fix-medium-font.diff (taken from ubuntu) to fix bolder font + in Qt4 apps (boo#956357) + +------------------------------------------------------------------- +Thu Aug 24 13:50:50 UTC 2017 - [email protected] + +- Force building against openSSL 1.0 (boo#1042657) +- Do not build the MySQL plugin on TW, it would cause an openSSL + version conflict +- Adjust fix-build-icu59.patch to also work if built with c++11 + support + +------------------------------------------------------------------- New: ---- fix-medium-font.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:21.799555345 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:21.807554220 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt4-devel-doc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,24 +16,26 @@ # # nodebuginfo - Name: libqt4-devel-doc +BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: libpng-devel BuildRequires: sqlite3-devel -BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Summary: Qt documentation License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 -Group: Documentation/HTML +Summary: Qt documentation Url: http://qt.digia.com/ +Group: Documentation/HTML # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 @@ -122,6 +124,10 @@ Patch168: fix-gcc6-detection.diff # PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc parsing correctly glibc 2.25 system headers Patch169: fix-moc-parsing-with-glibc-2.25.patch +# PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement +Patch170: fix-build-icu59.patch +# PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] +Patch171: fix-medium-font.diff 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 @@ -209,6 +215,8 @@ %patch167 -p1 %patch168 -p1 %patch169 -p1 +%patch170 -p1 +%patch171 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:21.839549716 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:21.843549153 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt4-sql-plugins # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,23 +16,33 @@ # # nodebuginfo +%if 0%{?suse_version} >= 1330 +%bcond_with mysql +%else +%bcond_without mysql +%endif Name: libqt4-sql-plugins +BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: gtk2-devel +%if %{with mysql} BuildRequires: libmysqlclient-devel +%endif +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: unixODBC-devel -BuildRequires: pkgconfig(gl) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Summary: Qt 4 SQL related libraries License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 -Group: System/Libraries +Summary: Qt 4 SQL related libraries Url: http://qt.digia.com/ +Group: System/Libraries # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN %define base_name libqt4 @@ -113,6 +123,10 @@ Patch168: fix-gcc6-detection.diff # PATCH-FIX-UPSTREAM fix-moc-parsing-with-glibc-2.25.patch -- Fixes moc parsing correctly glibc 2.25 system headers Patch169: fix-moc-parsing-with-glibc-2.25.patch +# PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement +Patch170: fix-build-icu59.patch +# PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] +Patch171: fix-medium-font.diff 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 @@ -214,6 +228,8 @@ %patch167 -p1 %patch168 -p1 %patch169 -p1 +%patch170 -p1 +%patch171 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} @@ -238,8 +254,13 @@ echo yes | ./configure %common_options $platform \ -no-webkit -no-xmlpatterns -nomake examples \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ - -plugin-sql-odbc \ - -plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2 +%if %{with mysql} + -plugin-sql-mysql -I/usr/include/mysql/ \ +%else + -no-sql-mysql \ +%endif + -no-sql-sqlite -no-sql-sqlite2 \ + -plugin-sql-odbc rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) @@ -286,9 +307,11 @@ %dir %plugindir/sqldrivers %plugindir/sqldrivers/libqsqlpsql*.so +%if %{with mysql} %files -n libqt4-sql-mysql %defattr(-,root,root,755) %dir %plugindir/sqldrivers %plugindir/sqldrivers/libqsqlmysql*.so +%endif %changelog ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:21.871545212 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:21.875544649 +0200 @@ -34,9 +34,15 @@ BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libopenssl-1_0_0-devel +# libnsl has been split out of glibc for CODE15 +BuildRequires: libnsl-devel +%else +BuildRequires: openssl-devel +%endif BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: sqlite3-devel BuildRequires: update-desktop-files @@ -146,6 +152,8 @@ Patch169: fix-moc-parsing-with-glibc-2.25.patch # PATCH-FIX-OPENSUSE fix-build-icu59.patch -- Workaround C++11 requirement Patch170: fix-build-icu59.patch +# PATCH-FIX-UPSTREAM fix bolder fonts in qt4 apps [boo#956357] [QTBUG#27301] +Patch171: fix-medium-font.diff 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 @@ -184,11 +192,15 @@ Requires: freetype2-devel Requires: glib2-devel Requires: libmng-devel +%if 0%{?suse_version} >= 1330 +Requires: libopenssl-1_0_0-devel +%else +Requires: openssl-devel +%endif Requires: libpng-devel Requires: libqt4-sql-sqlite >= %{version} Requires: libtiff-devel Requires: make -Requires: openssl-devel Requires: pkgconfig Requires: sqlite3-devel Requires: xorg-x11-devel @@ -235,9 +247,9 @@ %package x11 Summary: Qt 4 GUI related libraries +# bug437293 License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ -# bug437293 %ifarch ppc64 Obsoletes: qt-x11-64bit %endif @@ -253,9 +265,9 @@ %package qt3support Summary: C++ Program Library, Core Components +# bug437293 License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: System/Libraries -# bug437293 %ifarch ppc64 Obsoletes: qt-qt3support-64bit %endif @@ -274,9 +286,9 @@ %package sql Summary: Qt 4 SQL related libraries +# bug437293 License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Libraries/C and C++ -# bug437293 %ifarch ppc64 Obsoletes: qt-sql-64bit %endif @@ -460,6 +472,7 @@ %patch168 -p1 %patch169 -p1 %patch170 -p1 +%patch171 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} ++++++ fix-build-icu59.patch ++++++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:22.059518753 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:22.059518753 +0200 @@ -11,14 +11,18 @@ src/corelib/tools/qlocale_icu.cpp | 3 +++ 1 file changed, 3 insertions(+) ---- a/src/corelib/tools/qlocale_icu.cpp -+++ b/src/corelib/tools/qlocale_icu.cpp -@@ -43,6 +43,9 @@ +Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/qlocale_icu.cpp ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp +@@ -43,6 +43,11 @@ #include "qlibrary.h" #include "qdebug.h" ++#if __cplusplus < 201103L +// ICU59 requires C++11, work around that +typedef qint16 char16_t; ++#endif + #include "unicode/uversion.h" #include "unicode/ucol.h" ++++++ fix-medium-font.diff ++++++ From: Ken VanDine <[email protected]> Description: Default to regular font in X11 Default to Regular/Normal instead of Medium in QFontDatabase for X11. . Tweak the buckets so that Medium has preference over Bold when DemiBold is requested. Bug-Ubuntu: https://launchpad.net/bugs/744812 Bug: https://bugreports.qt-project.org/browse/QTBUG-27301 Forwarded: https://codereview.qt-project.org/#change,35591 Author: Michał Sawicz<[email protected]> --- a/src/gui/text/qfontdatabase_x11.cpp +++ b/src/gui/text/qfontdatabase_x11.cpp @@ -729,10 +729,17 @@ static int getFCWeight(int fc_weight) { int qtweight = QFont::Black; - if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_MEDIUM) / 2) + if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_REGULAR) / 2) qtweight = QFont::Light; - else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2) + else if (fc_weight <= (FC_WEIGHT_REGULAR + FC_WEIGHT_MEDIUM) / 2) qtweight = QFont::Normal; +#if 0 + // FIXME: Uncomment this when it's safe to expand the Enum to include ::Medium + // Will map Medium to DemiBold via fallthrough for the moment, + // but avoids API/ABI break + else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2) + qtweight = QFont::Medium; +#endif else if (fc_weight <= (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2) qtweight = QFont::DemiBold; else if (fc_weight <= (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK) / 2) @@ -772,9 +779,13 @@ fontDef.styleHint */ + // Default to Regular and thus to the common case. Previous + // versions of Qt requested Medium as default. This is fine until + // a Medium weight is actually provided by a font, and so gets + // promoted to bold fallthrough. int weight; if (FcPatternGetInteger(pattern, FC_WEIGHT, 0, &weight) != FcResultMatch) - weight = FC_WEIGHT_MEDIUM; + weight = FC_WEIGHT_REGULAR; fontDef.weight = getFCWeight(weight); int slant; @@ -1066,16 +1077,19 @@ // capitalize(value); familyName = QString::fromUtf8((const char *)value); slant_value = FC_SLANT_ROMAN; - weight_value = FC_WEIGHT_MEDIUM; + weight_value = FC_WEIGHT_REGULAR; spacing_value = FC_PROPORTIONAL; file_value = 0; index_value = 0; scalable = FcTrue; + // Fallthroughs in case a match was not found. In previous + // versions of Qt, Medium was requested from FontConfig, + // leading to a promotion from Medium to Bold. if (FcPatternGetInteger (fonts->fonts[i], FC_SLANT, 0, &slant_value) != FcResultMatch) slant_value = FC_SLANT_ROMAN; if (FcPatternGetInteger (fonts->fonts[i], FC_WEIGHT, 0, &weight_value) != FcResultMatch) - weight_value = FC_WEIGHT_MEDIUM; + weight_value = FC_WEIGHT_REGULAR; if (FcPatternGetInteger (fonts->fonts[i], FC_SPACING, 0, &spacing_value) != FcResultMatch) spacing_value = FC_PROPORTIONAL; if (FcPatternGetString (fonts->fonts[i], FC_FILE, 0, &file_value) != FcResultMatch) @@ -1487,14 +1501,32 @@ } int weight_value = FC_WEIGHT_BLACK; + // Default and request Regular font weight if none specified + // Previous versions of Qt default to requesting Medium, even + // though this weight does not typically exist. if (request.weight == 0) - weight_value = FC_WEIGHT_MEDIUM; + weight_value = FC_WEIGHT_REGULAR; else if (request.weight < (QFont::Light + QFont::Normal) / 2) weight_value = FC_WEIGHT_LIGHT; - else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2) +#if 0 + // FIXME: Avoid ABI Break; active this full codepath when + // QFont::Medium enum is available in the future + else if (request.weight < (QFont::Normal + QFont::Medium) / 2) + weight_value = FC_WEIGHT_REGULAR; + else if (request.weight < (QFont::Medium + QFont::DemiBold) / 2) weight_value = FC_WEIGHT_MEDIUM; else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2) weight_value = FC_WEIGHT_DEMIBOLD; +#else + // For the moment This may still not full-circle correctly; via + // Medium->DemiBold->Bold promotion. However It's hard to do much + // about this without an ABI/API tweak to include the fuller set + // of standard TTF/CSS/FontConfig weights. + else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2) + weight_value = FC_WEIGHT_REGULAR; + else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2) + weight_value = (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2; +#endif else if (request.weight < (QFont::Bold + QFont::Black) / 2) weight_value = FC_WEIGHT_BOLD; FcPatternDel(pattern, FC_WEIGHT); ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.V2MBlj/_old 2017-09-14 21:10:22.131508619 +0200 +++ /var/tmp/diff_new_pack.V2MBlj/_new 2017-09-14 21:10:22.135508056 +0200 @@ -16,12 +16,20 @@ # # nodebuginfo +%if 0%{?suse_version} >= 1330 +%bcond_with mysql +%else +%bcond_without mysql +%endif + Name: libqt4-sql-plugins BuildRequires: pkgconfig(gl) BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: gtk2-devel +%if %{with mysql} BuildRequires: libmysqlclient-devel +%endif BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: unixODBC-devel @@ -95,8 +103,13 @@ echo yes | ./configure %common_options $platform \ -no-webkit -no-xmlpatterns -nomake examples \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ - -plugin-sql-odbc \ - -plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2 +%if %{with mysql} + -plugin-sql-mysql -I/usr/include/mysql/ \ +%else + -no-sql-mysql \ +%endif + -no-sql-sqlite -no-sql-sqlite2 \ + -plugin-sql-odbc rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) @@ -143,9 +156,11 @@ %dir %plugindir/sqldrivers %plugindir/sqldrivers/libqsqlpsql*.so +%if %{with mysql} %files -n libqt4-sql-mysql %defattr(-,root,root,755) %dir %plugindir/sqldrivers %plugindir/sqldrivers/libqsqlmysql*.so +%endif %changelog
