Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2014-04-06 07:16:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt3 (Old) and /work/SRC/openSUSE:Factory/.qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3" Changes: -------- qt3-extensions.changes: same change --- /work/SRC/openSUSE:Factory/qt3/qt3.changes 2014-03-25 13:27:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3.changes 2014-04-06 07:16:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 26 09:05:24 UTC 2014 - [email protected] + +- disable the wholeglib main loop patch for now because it causes + kdebindings to fail, disabling the configure option is not enough + +------------------------------------------------------------------- @@ -4 +10 @@ -- disable glib main loop for now because it causes kdebindingd to fail +- disable glib main loop for now because it causes kdebindings to fail ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.0iC2Kk/_old 2014-04-06 07:16:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0iC2Kk/_new 2014-04-06 07:16:10.000000000 +0200 @@ -136,7 +136,7 @@ %prep %setup -q -n qt%{x11_free}%rversion -%patch143 -p1 +#%patch143 -p1 %patch1 %patch2 %patch4 qt3-extensions.spec: same change ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.0iC2Kk/_old 2014-04-06 07:16:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0iC2Kk/_new 2014-04-06 07:16:10.000000000 +0200 @@ -148,7 +148,8 @@ %prep %setup -q -n qt%{x11_free}%rversion -%patch143 -p1 +#causes kdebindings to fail +#%patch143 -p1 %patch1 %patch2 %patch4 ++++++ qt-x11-immodule-unified-qt3.3.8-20060318.diff ++++++ --- /var/tmp/diff_new_pack.0iC2Kk/_old 2014-04-06 07:16:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0iC2Kk/_new 2014-04-06 07:16:10.000000000 +0200 @@ -14788,36 +14788,36 @@ void restoreState(); ---- src/kernel/qt_kernel.pri -+++ src/kernel/qt_kernel.pri -@@ -34,7 +34,6 @@ - $$KERNEL_H/qimage.h \ - $$KERNEL_P/qimageformatinterface_p.h \ - $$KERNEL_H/qimageformatplugin.h \ -- $$KERNEL_P/qinputcontext_p.h \ - $$KERNEL_H/qkeycode.h \ - $$KERNEL_H/qkeysequence.h \ - $$KERNEL_H/qlayout.h \ -@@ -103,6 +102,12 @@ - HEADERS+=$$KERNEL_P/qeventloop_glib_p.h - } - -+ unix:x11 { -+ HEADERS += $$KERNEL_H/qinputcontext.h -+ } else { -+ HEADERS += $$KERNEL_P/qinputcontext_p.h -+ } -+ - win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \ - $$KERNEL_CPP/qclipboard_win.cpp \ - $$KERNEL_CPP/qcolor_win.cpp \ -@@ -130,6 +135,7 @@ - $$KERNEL_CPP/qdnd_x11.cpp \ - $$KERNEL_CPP/qdesktopwidget_x11.cpp \ - $$KERNEL_CPP/qfont_x11.cpp \ -+ $$KERNEL_CPP/qinputcontext.cpp \ - $$KERNEL_CPP/qinputcontext_x11.cpp \ - $$KERNEL_CPP/qmotifdnd_x11.cpp \ +--- src/kernel/qt_kernel.pri ++++ src/kernel/qt_kernel.pri +@@ -34,7 +34,6 @@ + $$KERNEL_H/qimage.h \ + $$KERNEL_P/qimageformatinterface_p.h \ + $$KERNEL_H/qimageformatplugin.h \ +- $$KERNEL_P/qinputcontext_p.h \ + $$KERNEL_H/qkeycode.h \ + $$KERNEL_H/qkeysequence.h \ + $$KERNEL_H/qlayout.h \ +@@ -99,6 +98,12 @@ + $$KERNEL_CPP/qfontengine_p.h \ + $$KERNEL_CPP/qtextlayout_p.h + ++ unix:x11 { ++ HEADERS += $$KERNEL_H/qinputcontext.h ++ } else { ++ HEADERS += $$KERNEL_P/qinputcontext_p.h ++ } ++ + win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \ + $$KERNEL_CPP/qclipboard_win.cpp \ + $$KERNEL_CPP/qcolor_win.cpp \ +@@ -130,6 +135,7 @@ + $$KERNEL_CPP/qdesktopwidget_x11.cpp \ + $$KERNEL_CPP/qeventloop_x11.cpp \ + $$KERNEL_CPP/qfont_x11.cpp \ ++ $$KERNEL_CPP/qinputcontext.cpp \ + $$KERNEL_CPP/qinputcontext_x11.cpp \ + $$KERNEL_CPP/qmotifdnd_x11.cpp \ $$KERNEL_CPP/qpixmap_x11.cpp \ --- src/kernel/qwidget.cpp +++ src/kernel/qwidget.cpp -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
