Hello community, here is the log from the commit of package qt checked in at Wed Aug 23 20:53:31 CEST 2006. -------- --- qt/qt-sql-plugins.changes 2006-08-12 00:17:03.000000000 +0200 +++ qt/qt-sql-plugins.changes 2006-08-22 00:05:56.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 22 00:05:27 CEST 2006 - dmueller@suse.de + +- update to Qt 4.2 snapshot 20060820: + * QtDBus API review + * build system overhaul + +------------------------------------------------------------------- qt.changes: same change Old: ---- 0130-coverity-checks.diff fix-plugin-loading.diff qsystemtray-middleclick.diff qt-core-plugins.diff qt-x11-4.2.0-snapshot-20060704.tar.bz2 New: ---- qt-x11-4.2.0-snapshot-20060820.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.GmP2na/_old 2006-08-23 20:53:17.000000000 +0200 +++ /var/tmp/diff_new_pack.GmP2na/_new 2006-08-23 20:53:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qt-sql-plugins (Version 4.1.9_20060704) +# spec file for package qt-sql-plugins (Version 4.1.9_20060820) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,23 +22,19 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.1.9_20060704 -Release: 2 +Version: 4.1.9_20060820 +Release: 1 %define x11_free -x11- -%define rversion 4.2.0-snapshot-20060704 +%define rversion 4.2.0-snapshot-20060820 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop Source13: assistant4.desktop Patch2: qt-never-strip.diff -Patch3: qt-core-plugins.diff -Patch4: qsystemtray-middleclick.diff Patch5: lib64.patch -Patch9: 0130-coverity-checks.diff -Patch13: fix-plugin-loading.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define common_options -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/qt/ -examplesdir %_docdir/qt/examples -demosdir %_docdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -sysconfdir /etc/settings -datadir /usr/share/qt/ +%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/qt -examplesdir %_libdir/qt/examples -demosdir %_libdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt/ %description Qt 4 libraries that are used for connection with an SQL server. You @@ -54,12 +50,8 @@ %define plugindir %_libdir/qt/plugins %setup -q -n qt%x11_free%rversion #%patch -p1 -#%patch2 -%patch3 -%patch4 +%patch2 %patch5 -%patch9 -%patch13 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -194,6 +186,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog -n qt-sql-plugins +* Tue Aug 22 2006 - dmueller@suse.de +- update to Qt 4.2 snapshot 20060820: + * QtDBus API review + * build system overhaul * Sat Aug 12 2006 - dmueller@suse.de - add patch for middle click support in QSystemTrayIcon * Tue Aug 01 2006 - dmueller@suse.de ++++++ qt.spec ++++++ --- /var/tmp/diff_new_pack.GmP2na/_old 2006-08-23 20:53:17.000000000 +0200 +++ /var/tmp/diff_new_pack.GmP2na/_new 2006-08-23 20:53:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qt (Version 4.1.9_20060704) +# spec file for package qt (Version 4.1.9_20060820) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,23 +21,19 @@ Autoreqprov: on Summary: C++ Program Library, Core Components # COMMON-BEGIN -Version: 4.1.9_20060704 -Release: 2 +Version: 4.1.9_20060820 +Release: 1 %define x11_free -x11- -%define rversion 4.2.0-snapshot-20060704 +%define rversion 4.2.0-snapshot-20060820 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop Source13: assistant4.desktop Patch2: qt-never-strip.diff -Patch3: qt-core-plugins.diff -Patch4: qsystemtray-middleclick.diff Patch5: lib64.patch -Patch9: 0130-coverity-checks.diff -Patch13: fix-plugin-loading.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define common_options -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/qt/ -examplesdir %_docdir/qt/examples -demosdir %_docdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -sysconfdir /etc/settings -datadir /usr/share/qt/ +%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/qt -examplesdir %_libdir/qt/examples -demosdir %_libdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt/ %description Qt is a set of libraries for developing applications. @@ -55,12 +51,8 @@ %define plugindir %_libdir/qt/plugins %setup -q -n qt%x11_free%rversion #%patch -p1 -#%patch2 -%patch3 -%patch4 +%patch2 %patch5 -%patch9 -%patch13 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -166,32 +158,23 @@ export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -for f in mkspecs/linux-g*/qmake.conf; do - sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f -done -sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix -echo yes | ./configure -release %common_options -no-sql-sqlite -no-sql-sqlite2 +sed -i -e "s,^\(CXXFLAGS[ \t]*=.*\),\1 $RPM_OPT_FLAGS," qmake/Makefile.unix +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +echo yes | ./configure %common_options -no-sql-sqlite -no-sql-sqlite2 make %{?jobs:-j %jobs} %install -export QTDIR=$PWD make INSTALL_ROOT=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/usr/share/qt/mkspecs/*/qmake.conf.orig # argggh, qmake is such a piece of <censored> mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig -find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \; -# fix more qmake errors -mkdir -p $RPM_BUILD_ROOT/%_libdir/qt -mv $RPM_BUILD_ROOT/%_docdir/%name/demos $RPM_BUILD_ROOT/%_libdir/qt -mv $RPM_BUILD_ROOT/%_docdir/%name/examples $RPM_BUILD_ROOT/%_libdir/qt +mv $RPM_BUILD_ROOT/%_libdir/*.pc $RPM_BUILD_ROOT/%_libdir/pkgconfig # qmake is even a bigger piece of <censored> find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; find $RPM_BUILD_ROOT/%_docdir/%name -type f -name 'lib*.a' -exec rm {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -find $RPM_BUILD_ROOT/usr/share/qt/mkspecs -name 'qmake.conf' -exec chmod -x -- {} \; -find $RPM_BUILD_ROOT/usr/share/qt/mkspecs -name Info.plist.app -exec chmod -x -- {} \; +find $RPM_BUILD_ROOT/%_libdir/ -name 'lib*.a' -exec chmod -x -- {} \; mkdir -p $RPM_BUILD_ROOT/%plugindir/sqldrivers if test -f changes-*; then cp -a changes-* \ @@ -295,6 +278,8 @@ /usr/bin/lrelease /usr/bin/lupdate /usr/bin/qt3to4 +/usr/bin/dbus +/usr/bin/dbuscpp2xml /usr/bin/dbusxml2cpp %_libdir/lib*.prl %_libdir/lib*a @@ -317,8 +302,6 @@ /usr/share/applications/assistant4.desktop /usr/share/pixmaps/linguist.png /usr/share/doc/packages/%name/html -#/usr/share/doc/packages/%name/examples -#/usr/share/doc/packages/%name/demos /usr/%_lib/%name/examples /usr/%_lib/%name/demos %_libdir/libQtAssistantClient.so.* @@ -329,6 +312,10 @@ %_libdir/libQtSql*.so.* %changelog -n qt +* Tue Aug 22 2006 - dmueller@suse.de +- update to Qt 4.2 snapshot 20060820: + * QtDBus API review + * build system overhaul * Sat Aug 12 2006 - dmueller@suse.de - add patch for middle click support in QSystemTrayIcon * Tue Aug 01 2006 - dmueller@suse.de ++++++ lib64.patch ++++++ --- /var/tmp/diff_new_pack.GmP2na/_old 2006-08-23 20:53:17.000000000 +0200 +++ /var/tmp/diff_new_pack.GmP2na/_new 2006-08-23 20:53:17.000000000 +0200 @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -1537,7 +1537,7 @@ +@@ -1750,7 +1750,7 @@ ;; Linux:*) case "$UNAME_MACHINE" in ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.GmP2na/_old 2006-08-23 20:53:17.000000000 +0200 +++ /var/tmp/diff_new_pack.GmP2na/_new 2006-08-23 20:53:17.000000000 +0200 @@ -1,31 +1,28 @@ ---- qmake/generators/makefile.cpp -+++ qmake/generators/makefile.cpp -@@ -1395,7 +1395,7 @@ - QString cmd = QString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" + - wild + "\" \"" + dst_file + "\"\n"; - target += cmd; -- if(!project->isActiveConfig("debug") && -+ if(false && !project->isActiveConfig("debug") && - !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP")) - target += QString("\t-") + var("QMAKE_STRIP") + " \"" + - filePrefixRoot(root, fileFixify(dst + filestr, FileFixifyAbsolute, false)) + "\"\n"; -@@ -1436,7 +1436,7 @@ - QString cmd = QString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" + - dirstr + file + "\" \"" + dst_file + "\"\n"; - target += cmd; -- if(!project->isActiveConfig("debug") && -+ if(false && !project->isActiveConfig("debug") && - !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP")) - target += QString("\t-") + var("QMAKE_STRIP") + " \"" + - filePrefixRoot(root, fileFixify(dst + file, FileFixifyAbsolute, false)) + ---- qmake/generators/unix/unixmake.cpp -+++ qmake/generators/unix/unixmake.cpp -@@ -650,7 +650,7 @@ - if(project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib")) { - if(!project->isEmpty("QMAKE_RANLIB")) - ret += QString("\n\t$(RANLIB) \"") + dst_targ + "\""; -- } else if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP")) { -+ } else if(false && !project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP")) { - ret += "\n\t-" + var("QMAKE_STRIP"); - if(project->first("TEMPLATE") == "lib" && !project->isEmpty("QMAKE_STRIPFLAGS_LIB")) - ret += " " + var("QMAKE_STRIPFLAGS_LIB"); +--- configure ++++ configure +@@ -25,7 +25,6 @@ + + # initialize global variables + QMAKE_SWITCHES= +-QMAKE_VARS= + QMAKE_CONFIG= + QT_CONFIG= + +@@ -927,7 +926,7 @@ + QMakeVar add QMAKE_CFLAGS -pg + QMakeVar add QMAKE_CXXFLAGS -pg + QMakeVar add QMAKE_LFLAGS -pg +- QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip" ++ QMakeVar add CONFIG nostrip + else + UNKNOWN_OPT=yes + fi +@@ -2045,6 +2044,8 @@ + echo "System architecture: '$ARCH'" + fi + ++QMakeVar add CONFIG nostrip ++ + #------------------------------------------------------------------------------- + # tests that don't need qmake (must be run before displaying help) + #------------------------------------------------------------------------------- ++++++ qt-x11-4.2.0-snapshot-20060704.tar.bz2 -> qt-x11-4.2.0-snapshot-20060820.tar.bz2 ++++++ qt/qt-x11-4.2.0-snapshot-20060704.tar.bz2 qt/qt-x11-4.2.0-snapshot-20060820.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org