Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2013-12-13 13:10:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-devel-doc.changes 2013-07-18 16:07:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-devel-doc.changes 2013-12-13 13:10:34.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 11 22:03:42 UTC 2013 - [email protected] + +- Added extend-freetype-includes-search.patch: fixes build with + freetype2 2.5.1 (and is compatible with older versions) + +------------------------------------------------------------------- @@ -4,0 +11,5 @@ + +------------------------------------------------------------------- +Mon May 20 12:39:41 UTC 2013 - [email protected] +- force correct data types with new ODBC + * qt-x11-free-3.3.8b-odbc.patch --- /work/SRC/openSUSE:Factory/qt3/qt3-extensions.changes 2013-07-18 16:07:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-extensions.changes 2013-12-13 13:10:34.000000000 +0100 @@ -2 +2,7 @@ -Mon May 20 12:39:41 UTC 2013 - [email protected] +Wed Dec 11 22:03:42 UTC 2013 - [email protected] + +- Added extend-freetype-includes-search.patch: fixes build with + freetype2 2.5.1 (and is compatible with older versions) + +------------------------------------------------------------------- +Tue Jul 16 15:15:43 UTC 2013 - [email protected] @@ -3,0 +10,4 @@ +- no %dir for symlinks + +------------------------------------------------------------------- +Mon May 20 12:39:41 UTC 2013 - [email protected] --- /work/SRC/openSUSE:Factory/qt3/qt3.changes 2013-07-18 16:07:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3.changes 2013-12-13 13:10:34.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 11 22:03:42 UTC 2013 - [email protected] + +- Added extend-freetype-includes-search.patch: fixes build with + freetype2 2.5.1 (and is compatible with older versions) + +------------------------------------------------------------------- @@ -4,0 +11,5 @@ + +------------------------------------------------------------------- +Mon May 20 12:39:41 UTC 2013 - [email protected] +- force correct data types with new ODBC + * qt-x11-free-3.3.8b-odbc.patch New: ---- extend-freetype-includes-search.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.zoHMeI/_old 2013-12-13 13:10:35.000000000 +0100 +++ /var/tmp/diff_new_pack.zoHMeI/_new 2013-12-13 13:10:35.000000000 +0100 @@ -117,6 +117,8 @@ Patch138: qt3-libpng14.diff Patch139: gcc46.diff Patch140: qt-3.3.8-libpng15.patch +Patch141: qt-x11-free-3.3.8b-odbc.patch +Patch142: extend-freetype-includes-search.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -200,7 +202,11 @@ %patch138 -p1 %endif %patch139 +%if %suse_version > 1230 +%patch141 +%endif %patch200 +%patch142 -p1 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.zoHMeI/_old 2013-12-13 13:10:35.000000000 +0100 +++ /var/tmp/diff_new_pack.zoHMeI/_new 2013-12-13 13:10:35.000000000 +0100 @@ -112,6 +112,7 @@ Patch139: gcc46.diff Patch140: qt-3.3.8-libpng15.patch Patch141: qt-x11-free-3.3.8b-odbc.patch +Patch142: extend-freetype-includes-search.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -192,11 +193,12 @@ %else %patch138 -p1 %endif +%patch139 %if %suse_version > 1230 %patch141 %endif -%patch139 %patch200 +%patch142 -p1 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.zoHMeI/_old 2013-12-13 13:10:35.000000000 +0100 +++ /var/tmp/diff_new_pack.zoHMeI/_new 2013-12-13 13:10:35.000000000 +0100 @@ -121,6 +121,8 @@ Patch138: qt3-libpng14.diff Patch139: gcc46.diff Patch140: qt-3.3.8-libpng15.patch +Patch141: qt-x11-free-3.3.8b-odbc.patch +Patch142: extend-freetype-includes-search.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -211,7 +213,11 @@ %patch138 -p1 %endif %patch139 +%if %suse_version > 1230 +%patch141 +%endif %patch200 +%patch142 -p1 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ extend-freetype-includes-search.patch ++++++ diff -Naur qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test qt-x11-free-3.3.8b.new/config.tests/x11/xfreetype.test --- qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test 2008-01-15 20:09:15.000000000 +0100 +++ qt-x11-free-3.3.8b.new/config.tests/x11/xfreetype.test 2013-12-12 13:02:43.482468660 +0100 @@ -116,10 +116,10 @@ # check for freetype2 headers FREETYPE2_INCDIR= if [ "$XFT" = "yes" ]; then - INC="freetype2/freetype/freetype.h" + INC="freetype.h" XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" + INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include/freetype2 /usr/include/freetype2/freetype /usr/include/freetype /usr/include /include" F= for INCDIR in $INCDIRS; do if [ -f $INCDIR/$INC ]; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
