Hello community, here is the log from the commit of package libqt4 checked in at Tue Apr 17 00:38:12 CEST 2007. -------- --- libqt4/libqt4.changes 2007-04-13 18:38:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-04-16 23:21:56.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 16 23:20:53 CEST 2007 - dmueller@suse.de + +- compile without exceptions +- fix header symlinking +- compile with openssl support +- re-apply -pedantic header patch +- link development tools shared + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change New: ---- link-tools-shared.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.FA3083/_old 2007-04-17 00:37:55.000000000 +0200 +++ /var/tmp/diff_new_pack.FA3083/_new 2007-04-17 00:37:55.000000000 +0200 @@ -13,6 +13,7 @@ Name: libqt4-devel-doc-data BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libqt4-devel pkgconfig +BuildRequires: openssl-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -25,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.91 -Release: 1 +Release: 2 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070413 Source: qt%x11_free%rversion.tar.bz2 @@ -38,11 +39,12 @@ Patch5: lib64.patch Patch6: use-freetype-default.diff Patch7: FIXME.diff +Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations +%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions %description The package contains documentation and examples to develop Qt @@ -65,9 +67,10 @@ %patch5 %patch6 %patch7 +%patch8 %patch20 %patch21 -#%patch24 +%patch24 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -105,6 +108,12 @@ /usr/share/doc/packages/libqt4/examples %changelog +* Mon Apr 16 2007 - dmueller@suse.de +- compile without exceptions +- fix header symlinking +- compile with openssl support +- re-apply -pedantic header patch +- link development tools shared * Fri Apr 13 2007 - dmueller@suse.de - update to 4.3.0-20070413 * fixes dbus error callback ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.FA3083/_old 2007-04-17 00:37:55.000000000 +0200 +++ /var/tmp/diff_new_pack.FA3083/_new 2007-04-17 00:37:55.000000000 +0200 @@ -17,7 +17,7 @@ BuildRequires: update-desktop-files %endif %if %suse_version > 1010 -BuildRequires: dbus-1-devel +BuildRequires: dbus-1-devel openssl-devel %endif %if %suse_version > 1020 BuildRequires: fdupes @@ -31,7 +31,7 @@ Provides: qt # COMMON-BEGIN Version: 4.2.91 -Release: 1 +Release: 2 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070413 Source: qt%x11_free%rversion.tar.bz2 @@ -44,11 +44,12 @@ Patch5: lib64.patch Patch6: use-freetype-default.diff Patch7: FIXME.diff +Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations +%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions %description Qt is a set of libraries for developing applications. @@ -72,9 +73,10 @@ %patch5 %patch6 %patch7 +%patch8 %patch20 %patch21 -#%patch24 +%patch24 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -83,6 +85,7 @@ Summary: Qt Development Kit Requires: xorg-x11-devel zlib-devel c++_compiler pkgconfig Requires: freetype2-devel libmng-devel libpng-devel dbus-1-devel +Requires: openssl-devel Mesa-devel Requires: %name = %version Provides: dbus-1-qt-devel < 0.63 Obsoletes: dbus-1-qt-devel < 0.63 @@ -234,7 +237,7 @@ sed -e "s,$RPM_BUILD_ROOT,," | \ while read target rest; do for f in $rest; do - ln -f $target $f + ln -sf $target $f done done %endif @@ -380,6 +383,12 @@ %_libdir/libQtSql*.so.* %changelog +* Mon Apr 16 2007 - dmueller@suse.de +- compile without exceptions +- fix header symlinking +- compile with openssl support +- re-apply -pedantic header patch +- link development tools shared * Fri Apr 13 2007 - dmueller@suse.de - update to 4.3.0-20070413 * fixes dbus error callback ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.FA3083/_old 2007-04-17 00:37:55.000000000 +0200 +++ /var/tmp/diff_new_pack.FA3083/_new 2007-04-17 00:37:55.000000000 +0200 @@ -12,7 +12,9 @@ # nodebuginfo Name: libqt4-sql-plugins -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libqt4 mysql-devel pkgconfig postgresql-devel sqlite-devel unixODBC-devel +BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel mysql-devel +BuildRequires: libqt4 pkgconfig postgresql-devel sqlite-devel unixODBC-devel +BuildRequires: openssl-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -24,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.2.91 -Release: 1 +Release: 2 %define x11_free -x11-opensource-src- %define rversion 4.3.0-20070413 Source: qt%x11_free%rversion.tar.bz2 @@ -37,11 +39,12 @@ Patch5: lib64.patch Patch6: use-freetype-default.diff Patch7: FIXME.diff +Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff Patch21: 0142-uic3-wordWrapAttribute.diff Patch24: qt4-pedantic-headers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations +%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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions %description Qt 4 libraries that are used for connection with an SQL server. You @@ -63,9 +66,10 @@ %patch5 %patch6 %patch7 +%patch8 %patch20 %patch21 -#%patch24 +%patch24 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib} # COMMON-END @@ -203,6 +207,12 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Mon Apr 16 2007 - dmueller@suse.de +- compile without exceptions +- fix header symlinking +- compile with openssl support +- re-apply -pedantic header patch +- link development tools shared * Fri Apr 13 2007 - dmueller@suse.de - update to 4.3.0-20070413 * fixes dbus error callback ++++++ libqt4-devel-doc-data.spec.in ++++++ --- libqt4/libqt4-devel-doc-data.spec.in 2007-03-28 14:55:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.spec.in 2007-04-16 18:36:08.000000000 +0200 @@ -13,6 +13,7 @@ Name: libqt4-devel-doc-data BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel pkgconfig libqt4-devel +BuildRequires: openssl-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif ++++++ libqt4-sql-plugins.spec.in ++++++ --- libqt4/libqt4-sql-plugins.spec.in 2007-03-28 16:49:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-sql-plugins.spec.in 2007-04-16 18:35:56.000000000 +0200 @@ -12,7 +12,9 @@ # nodebuginfo Name: libqt4-sql-plugins -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel mysql-devel pkgconfig postgresql-devel sqlite-devel unixODBC-devel libqt4 +BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel mysql-devel +BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel libqt4 +BuildRequires: openssl-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif ++++++ link-tools-shared.diff ++++++ --- src/src.pro +++ src/src.pro @@ -49,7 +49,7 @@ src_plugins.target = sub-plugins #CONFIG += ordered !ordered { - src_corelib.depends = src_tools_moc src_tools_rcc + src_corelib.depends = src_tools_moc src_gui.depends = src_corelib src_tools_uic src_xml.depends = src_corelib src_svg.depends = src_xml src_gui @@ -58,7 +58,9 @@ src_plugins.target = sub-plugins src_opengl.depends = src_gui src_sql.depends = src_corelib src_qt3support.depends = src_gui src_xml src_network src_sql + src_tools_rcc.depends = src_corelib src_xml src_tools_uic3.depends = src_qt3support src_xml + src_tools_uic.depends = src_corelib src_xml src_tools_idc.depends = src_corelib src_tools_activeqt.depends = src_tools_idc src_gui src_plugins.depends = src_gui src_sql src_svg --- src/tools/uic/uic.pro +++ src/tools/uic/uic.pro @@ -1,14 +1,12 @@ TEMPLATE = app -QT = xml core -CONFIG += warn_on console no_batch +QT = core xml +CONFIG += warn_on console no_batch core CONFIG -= app_bundle build_all:!build_pass { CONFIG -= build_all CONFIG += release } -unix:!contains(QT_CONFIG, zlib):LIBS += -lz - TARGET = uic DESTDIR = ../../../bin @@ -17,7 +15,6 @@ DEFINES += QT_BOOTSTRAPPED QT_UIC QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT win32:DEFINES += QT_NODLL -CONFIG -= qt INCLUDEPATH = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \ $$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml DEPENDPATH += $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml @@ -27,76 +24,11 @@ include(cpp/cpp.pri) SOURCES += main.cpp - -# Qt tools needed to link rcc -SOURCES += ../../corelib/global/qglobal.cpp \ - ../../corelib/global/qnumeric.cpp \ - ../../corelib/io/qbuffer.cpp \ - ../../corelib/io/qdir.cpp \ - ../../corelib/io/qdiriterator.cpp \ - ../../corelib/io/qfile.cpp \ - ../../corelib/io/qfileinfo.cpp \ - ../../corelib/io/qfsfileengine.cpp \ - ../../corelib/io/qfsfileengine_iterator.cpp \ - ../../corelib/io/qiodevice.cpp \ - ../../corelib/io/qtemporaryfile.cpp \ - ../../corelib/io/qtextstream.cpp \ - ../../corelib/io/qurl.cpp \ - ../../corelib/tools/qbytearraymatcher.cpp \ - ../../corelib/tools/qdatetime.cpp \ - ../../corelib/tools/qhash.cpp \ - ../../corelib/tools/qlistdata.cpp \ - ../../corelib/tools/qlocale.cpp \ - ../../corelib/tools/qmap.cpp \ - ../../corelib/tools/qstring.cpp \ - ../../corelib/tools/qstringlist.cpp \ - ../../corelib/tools/qvector.cpp \ - ../../corelib/io/qabstractfileengine.cpp \ - ../../corelib/tools/qbytearray.cpp \ - ../../corelib/tools/qbitarray.cpp \ - ../../corelib/tools/qvsnprintf.cpp \ - ../../corelib/tools/qregexp.cpp \ - ../../corelib/kernel/qmetatype.cpp \ - ../../corelib/kernel/qvariant.cpp \ - ../../corelib/codecs/qtextcodec.cpp \ - ../../corelib/codecs/qutfcodec.cpp \ - ../../corelib/codecs/qisciicodec.cpp \ - ../../corelib/codecs/qtsciicodec.cpp \ - ../../corelib/codecs/qlatincodec.cpp \ - ../../corelib/codecs/qsimplecodec.cpp \ - ../../xml/qdom.cpp \ - ../../xml/qxmlutils_p.cpp \ - ../../xml/qxml.cpp - -unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp - -win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp - macx: { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported) - SOURCES += ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } -contains(QT_CONFIG, zlib) { - INCLUDEPATH += ../../3rdparty/zlib - SOURCES+= \ - ../3rdparty/zlib/adler32.c \ - ../3rdparty/zlib/compress.c \ - ../3rdparty/zlib/crc32.c \ - ../3rdparty/zlib/deflate.c \ - ../3rdparty/zlib/gzio.c \ - ../3rdparty/zlib/inffast.c \ - ../3rdparty/zlib/inflate.c \ - ../3rdparty/zlib/inftrees.c \ - ../3rdparty/zlib/trees.c \ - ../3rdparty/zlib/uncompr.c \ - ../3rdparty/zlib/zutil.c -} else:!contains(QT_CONFIG, no-zlib) { - unix:LIBS += -lz -# win32:LIBS += libz.lib -} - target.path=$$[QT_INSTALL_BINS] INSTALLS += target --- src/tools/rcc/rcc.pro +++ src/tools/rcc/rcc.pro @@ -1,5 +1,6 @@ TARGET = rcc -CONFIG += console +QT = core xml +CONFIG += console core mac:CONFIG -= app_bundle build_all:!build_pass { CONFIG -= build_all @@ -12,7 +13,6 @@ DEFINES += QT_BOOTSTRAPPED \ win32:DEFINES += QT_NODLL -CONFIG -= qt INCLUDEPATH = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \ $$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml DEPENDPATH += $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml @@ -20,75 +20,12 @@ DEPENDPATH += $$INCLUDEPATH ../../coreli HEADERS += rcc.h SOURCES += main.cpp rcc.cpp -# Qt tools needed to link rcc -SOURCES += ../../corelib/global/qglobal.cpp \ - ../../corelib/global/qnumeric.cpp \ - ../../corelib/io/qbuffer.cpp \ - ../../corelib/io/qdir.cpp \ - ../../corelib/io/qdiriterator.cpp \ - ../../corelib/io/qfile.cpp \ - ../../corelib/io/qfileinfo.cpp \ - ../../corelib/io/qfsfileengine.cpp \ - ../../corelib/io/qfsfileengine_iterator.cpp \ - ../../corelib/io/qiodevice.cpp \ - ../../corelib/io/qtemporaryfile.cpp \ - ../../corelib/io/qtextstream.cpp \ - ../../corelib/tools/qbytearraymatcher.cpp \ - ../../corelib/tools/qdatetime.cpp \ - ../../corelib/tools/qhash.cpp \ - ../../corelib/tools/qlistdata.cpp \ - ../../corelib/tools/qlocale.cpp \ - ../../corelib/tools/qmap.cpp \ - ../../corelib/tools/qstring.cpp \ - ../../corelib/tools/qstringlist.cpp \ - ../../corelib/kernel/qvariant.cpp \ - ../../corelib/kernel/qmetatype.cpp \ - ../../corelib/io/qurl.cpp \ - ../../corelib/tools/qvector.cpp \ - ../../corelib/io/qabstractfileengine.cpp \ - ../../corelib/tools/qbytearray.cpp \ - ../../corelib/tools/qbitarray.cpp \ - ../../corelib/tools/qvsnprintf.cpp \ - ../../corelib/tools/qregexp.cpp \ - ../../corelib/codecs/qtextcodec.cpp \ - ../../corelib/codecs/qutfcodec.cpp \ - ../../corelib/codecs/qisciicodec.cpp \ - ../../corelib/codecs/qtsciicodec.cpp \ - ../../corelib/codecs/qlatincodec.cpp \ - ../../corelib/codecs/qsimplecodec.cpp \ - ../../xml/qdom.cpp \ - ../../xml/qxmlutils_p.cpp \ - ../../xml/qxml.cpp - -unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp - -win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp - macx: { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported) SOURCES += ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } -contains(QT_CONFIG, zlib) { - INCLUDEPATH += ../../3rdparty/zlib - SOURCES+= \ - ../3rdparty/zlib/adler32.c \ - ../3rdparty/zlib/compress.c \ - ../3rdparty/zlib/crc32.c \ - ../3rdparty/zlib/deflate.c \ - ../3rdparty/zlib/gzio.c \ - ../3rdparty/zlib/inffast.c \ - ../3rdparty/zlib/inflate.c \ - ../3rdparty/zlib/inftrees.c \ - ../3rdparty/zlib/trees.c \ - ../3rdparty/zlib/uncompr.c \ - ../3rdparty/zlib/zutil.c -} else:!contains(QT_CONFIG, no-zlib) { - unix:LIBS += -lz -# win32:LIBS += libz.lib -} - target.path=$$[QT_INSTALL_BINS] INSTALLS += target --- src/src.pro +++ src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs # this order is important unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain -SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_gui src_sql src_network src_svg src_script +SRC_SUBDIRS += src_tools_moc src_corelib src_xml src_tools_rcc src_tools_uic src_gui src_sql src_network src_svg src_script contains(QT_CONFIG, opengl): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support !cross_compile { ++++++ qt4-pedantic-headers.diff ++++++ --- /var/tmp/diff_new_pack.FA3083/_old 2007-04-17 00:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FA3083/_new 2007-04-17 00:37:56.000000000 +0200 @@ -97,14 +97,4 @@ addr->setScopeId(QLatin1String(scopeid)); } else #endif ---- src/gui/widgets/qmainwindow.h -+++ src/gui/widgets/qmainwindow.h -@@ -60,7 +60,7 @@ public: - AllowNestedDocks = 0x02, - AllowTabbedDocks = 0x04, - ForceTabbedDocks = 0x08, // implies AllowTabbedDocks, !AllowNestedDocks -- VerticalTabs = 0x10, // implies AllowTabbedDocks -+ VerticalTabs = 0x10 // implies AllowTabbedDocks - }; - Q_DECLARE_FLAGS(DockOptions, DockOption) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org