Mailinglist Archive: opensuse-commit (1092 mails)

Next >

Hello community,

here is the log from the commit of package kdebase4
checked in at Thu Feb 28 01:57:48 CET 2008.

--------
--- KDE/kdebase4/kdebase4.changes 2008-02-15 02:42:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2008-02-21
08:46:39.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Feb 21 08:45:33 CET 2008 - coolo@xxxxxxx
+
+- no longer build nsplugin64 - rely on nspluginwrapper
+
+-------------------------------------------------------------------
+Mon Feb 18 17:59:55 CET 2008 - dmueller@xxxxxxx
+
+- fix nspluginscan hang (#362522)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.uz3913/_old 2008-02-28 01:57:37.000000000 +0100
+++ /var/tmp/diff_new_pack.uz3913/_new 2008-02-28 01:57:37.000000000 +0100
@@ -23,7 +23,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.0.1
-Release: 14
+Release: 22
%define rversion 4.0.1
Source0: kdebase-%rversion.tar.bz2
Source1: _upstream
@@ -41,11 +41,7 @@
Suggests: kde4-kdialog
Suggests: kde4-keditbookmarks
Suggests: kdebase4-wallpapers
-%ifarch x86_64 ppc64 s390x ia64
-Suggests: kdebase4-nsplugin64
-%else
Suggests: kdebase4-nsplugin
-%endif
Suggests: kdebase4-libkonq
Suggests: kde4-kdepasswd
Suggests: kde4-kinfocenter
@@ -298,32 +294,17 @@
%files -n kde4-keditbookmarks -f filelists/keditbookmarks
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-%ifarch x86_64 ppc64 s390x ia64
-
-%package nsplugin64
-Conflicts: kdebase4-nsplugin
-%else

%package nsplugin
-Conflicts: kdebase4-nsplugin64
-%endif
+Obsoletes: kdebase4-nsplugin64
+Provides: kdebase4-nsplugin64
# usesubdirs nsplugins
Requires: kdebase4
+%ifarch x86_64 ppc64 s390x ia64
+Requires: nspluginwrapper
+%endif
Summary: Netscape plugin support for KDE
Group: System/GUI/KDE
-%ifarch x86_64 ppc64 s390x ia64
-
-%description nsplugin64
-This package contains support for Netscape plug-ins in konqueror. You
-have to enable JavaScript for this.
-
-
-
-Authors:
---------
- The KDE Team <kde@xxxxxxx>
-
-%else

%description nsplugin
This package contains support for Netscape plug-ins in konqueror. You
@@ -335,14 +316,7 @@
--------
The KDE Team <kde@xxxxxxx>

-%endif
-%ifarch x86_64 ppc64 s390x ia64
-
-%files nsplugin64 -f filelists/nsplugins
-%else
-
%files nsplugin -f filelists/nsplugins
-%endif
%defattr(-,root,root)
%dir /usr/share/kde4/apps/plugin

@@ -471,6 +445,10 @@
%doc COPYING COPYING-DOCS README

%changelog
+* Thu Feb 21 2008 coolo@xxxxxxx
+- no longer build nsplugin64 - rely on nspluginwrapper
+* Mon Feb 18 2008 dmueller@xxxxxxx
+- fix nspluginscan hang (#362522)
* Fri Feb 15 2008 dmueller@xxxxxxx
- update 4_0_BRANCH.diff
* Thu Feb 07 2008 stbinner@xxxxxxx

++++++ 4_0_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.uz3913/_old 2008-02-28 01:57:37.000000000 +0100
+++ /var/tmp/diff_new_pack.uz3913/_new 2008-02-28 01:57:37.000000000 +0100
@@ -3,7 +3,7 @@
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 774998
++current HEAD: 776641
+svn di between /tags/KDE/4.0.1 and /branches/KDE//branches/KDE/4.0
--- apps/cmake/modules/FindRAW1394.cmake
+++ apps/cmake/modules/FindRAW1394.cmake
@@ -28,6 +28,58 @@
+
+MARK_AS_ADVANCED(RAW1394_INCLUDE_DIR RAW1394_LIBRARIES)
+
+--- apps/nsplugins/pluginscan.cpp
++++ apps/nsplugins/pluginscan.cpp
+@@ -284,9 +284,8 @@
+ KLibLoader::self()->unloadLibrary( QFile::encodeName(absFile) );
+
+ // create a QDataStream for our IPC pipe (to send plugin info back to the
parent)
+- FILE *write_pipe = fdopen(write_fd, "w");
+ QFile stream_file;
+- stream_file.open(write_pipe, QIODevice::WriteOnly);
++ stream_file.open(write_fd, QIODevice::WriteOnly);
+ QDataStream stream(&stream_file);
+
+ // return the gathered info to the parent
+@@ -361,20 +360,19 @@
+ QBuffer m_buffer;
+ m_buffer.open(QIODevice::WriteOnly);
+
+- FILE *read_pipe = fdopen(pipes[0], "r");
+ QFile q_read_pipe;
+- q_read_pipe.open(read_pipe, QIODevice::ReadOnly);
++ q_read_pipe.open(pipes[0], QIODevice::ReadOnly);
+
+ char *data = (char *)malloc(4096);
+ if (!data) continue;
++ int size;
+
+ // when the child closes, we'll get an EOF (size == 0)
+- while (int size = q_read_pipe.read(data, 4096)) {
+- if (size > 0)
+- m_buffer.write(data, size);
+- }
++ while ((size = q_read_pipe.read(data, 4096)) > 0)
++ m_buffer.write(data, size);
+ free(data);
+
++ q_read_pipe.close();
+ close(pipes[0]); // we no longer need the pipe's reading end
+
+ // close the buffer and open for reading (from the start)
+--- apps/nsplugins/nspluginloader.cpp
++++ apps/nsplugins/nspluginloader.cpp
+@@ -260,7 +260,9 @@
+ QString stripped = (*suffix).trimmed();
+
+ int p=0;
+- for ( ; p<stripped.length() && stripped[p]=='.'; p++ );
++ for ( ; p<stripped.length() && stripped[p]=='.'; p++ ) {
++ ;
++ }
+ stripped = stripped.right( stripped.length()-p );
+
+ // add filetype to list
--- apps/kappfinder/apps/Editors/emacs.desktop
+++ apps/kappfinder/apps/Editors/emacs.desktop
@@ -21,7 +21,6 @@
@@ -118,6 +170,56 @@
GenericName[es]=Editor de texto
GenericName[et]=Tekstiredaktor
GenericName[eu]=Testu editorea
+--- apps/kappfinder/apps/Multimedia/muse.desktop
++++ apps/kappfinder/apps/Multimedia/muse.desktop
+@@ -11,6 +11,7 @@
+ GenericName=Music Sequencer
+ GenericName[be]=Музычны рэдактар
+ GenericName[ca]=Seqüenciador musical
++GenericName[cs]=Hudební sekvencer
+ GenericName[csb]=Musik-Sequencer
+ GenericName[da]=Musik-sequencer
+ GenericName[de]=Musik-Sequencer
+--- apps/kappfinder/apps/Multimedia/galan.desktop
++++ apps/kappfinder/apps/Multimedia/galan.desktop
+@@ -10,6 +10,7 @@
+ Name[x-test]=xxgAlanxx
+ GenericName=Modular Synth
+ GenericName[ca]=Sintetitzador modular
++GenericName[cs]=Modulární syntéza
+ GenericName[csb]=Mòdułowô syntezatora
+ GenericName[da]=Modulær synth
+ GenericName[de]=Modularer Synthesizer
+--- apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
++++ apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
+@@ -9,6 +9,7 @@
+ Name[x-test]=xxZynaddsubFXxx
+ GenericName=Soft Synth
+ GenericName[ca]=Programa sintetitzador
++GenericName[cs]=Softwérová syntéza
+ GenericName[csb]=Softwôra - syntezatora
+ GenericName[de]=Software-Synthesizer
+ GenericName[eo]=Programa sintezilo
+--- apps/kappfinder/apps/Multimedia/freqtweak.desktop
++++ apps/kappfinder/apps/Multimedia/freqtweak.desktop
+@@ -12,6 +12,7 @@
+ GenericName[be]=Эфенты для Jack
+ GenericName[bg]=Ефекти за Jack
+ GenericName[ca]=Efectes pel Jack
++GenericName[cs]=Efekty pro Jack
+ GenericName[csb]=Efektë dlô Jacka
+ GenericName[da]=Effekter til Jack
+ GenericName[de]=Effekte für Jack
+--- apps/kappfinder/apps/Multimedia/qjackctl.desktop
++++ apps/kappfinder/apps/Multimedia/qjackctl.desktop
+@@ -9,6 +9,7 @@
+ GenericName=Control for Jack
+ GenericName[bg]=Jack контрол
+ GenericName[ca]=Control pel Jack
++GenericName[cs]=Ovládání pro Jack
+ GenericName[csb]=Sprôwianié Jackã
+ GenericName[da]=Kontrol til Jack
+ GenericName[de]=Steuerung für Jack
--- apps/kappfinder/apps/Utilities/xutils/xterm.desktop
+++ apps/kappfinder/apps/Utilities/xutils/xterm.desktop
@@ -109,8 +109,8 @@
@@ -540,6 +642,23 @@
QActionGroup* m_closedTabsGroup;

static QList<KonqMainWindow*> *s_lstViews;
+--- apps/konqueror/src/konqopenurlrequest.h
++++ apps/konqueror/src/konqopenurlrequest.h
+@@ -20,11 +20,13 @@
+ #ifndef __konqopenurlrequest_h
+ #define __konqopenurlrequest_h
+
++#include "konqprivate_export.h"
++
+ #include <QtCore/QStringList>
+
+ #include <kparts/browserextension.h>
+
+-struct KonqOpenURLRequest {
++struct KONQ_TESTS_EXPORT KonqOpenURLRequest {
+
+ KonqOpenURLRequest() :
+ followMode(false), newTab(false), newTabInFront(false),
--- apps/konqueror/src/konqfactory.cpp
+++ apps/konqueror/src/konqfactory.cpp
@@ -212,7 +212,7 @@
@@ -1010,7 +1129,7 @@

// Restore current view if current is passive
if ( (m_oldView != currentView) && (currentView == m_currentView) &&
currentView->isPassiveMode() )
-@@ -4916,230 +4793,112 @@
+@@ -4916,241 +4793,124 @@
}
}

@@ -1320,6 +1439,40 @@
bar->hide();

}
+
+ void KonqMainWindow::closeEvent( QCloseEvent *e )
+ {
+- kDebug(1202) << "KonqMainWindow::closeEvent begin";
+- // This breaks session management (the window is withdrawn in kwin)
+- // so let's do this only when closed by the user.
+- if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() )
+- {
++ // This breaks session management (the window is withdrawn in kwin)
++ // so let's do this only when closed by the user.
++ KonquerorApplication* konqApp = qobject_cast<KonquerorApplication
*>(qApp);
++
++ // konqApp is 0 in unit tests
++ if (konqApp && konqApp->closedByUser()) {
+ KonqFrameTabs* tabContainer = m_pViewManager->tabContainer();
+ if ( tabContainer->count() > 1 )
+ {
+@@ -5236,7 +4996,7 @@
+
+ bool KonqMainWindow::queryExit()
+ {
+- if( kapp->sessionSaving()) // *sigh*
++ if( kapp && kapp->sessionSaving()) // *sigh*
+ return true;
+ return !stayPreloaded();
+ }
+@@ -5701,7 +5461,6 @@
+ // Qt remembers the iconic state if the window was withdrawn while on another
virtual desktop
+ setWindowState( windowState() & ~Qt::WindowMinimized );
+ ignoreInitialGeometry();
+- kapp->setTopWidget( this ); // set again the default window icon
+ }
+
+ bool KonqMainWindow::event( QEvent* e )
@@ -5808,7 +5567,7 @@
int limit;
int usage = current_memory_usage( &limit );
@@ -1360,6 +1513,93 @@
}

void ViewMgrTest::testDuplicateTab()
+--- apps/konqueror/src/tests/CMakeLists.txt
++++ apps/konqueror/src/tests/CMakeLists.txt
+@@ -20,3 +20,8 @@
+
+ kde4_add_unit_test(undomanagertest undomanagertest.cpp)
+ target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTTEST_LIBRARY})
++
++########### konqhtmltest ###############
++
++kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
++target_link_libraries(konqhtmltest kdeinit_konqueror ${QT_QTTEST_LIBRARY})
+--- apps/konqueror/src/tests/konqhtmltest.cpp
++++ apps/konqueror/src/tests/konqhtmltest.cpp
+@@ -0,0 +1,73 @@
++/* This file is part of the KDE project
++ Copyright (C) 2008 David Faure <faure@xxxxxxx>
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#include <QScrollArea>
++#include <qtest_kde.h>
++#include <qtest_gui.h>
++
++#include <konqmainwindow.h>
++#include <konqviewmanager.h>
++#include <konqview.h>
++
++#include <QObject>
++
++class KonqHtmlTest : public QObject
++{
++ Q_OBJECT
++public:
++
++private Q_SLOTS:
++ void loadSimpleHtml()
++ {
++ KonqMainWindow mainWindow;
++ // we specify the mimetype so that we don't have to wait for a KonqRun
++ mainWindow.openUrl(0, KUrl("data:text/html, <p>Hello World</p>"),
"text/html");
++ KonqView* view = mainWindow.currentView();
++ QVERIFY(view);
++ QVERIFY(view->part());
++ QVERIFY(QTest::kWaitForSignal(view, SIGNAL(viewCompleted(KonqView*)),
1000));
++ QCOMPARE(view->serviceType(), QString("text/html"));
++
++ }
++
++ void rightClickClose() // #149736
++ {
++ KonqMainWindow mainWindow;
++ // we specify the mimetype so that we don't have to wait for a KonqRun
++ mainWindow.openUrl(0, KUrl(
++ "data:text/html, <script type=\"text/javascript\">"
++ "function closeMe() { window.close(); } "
++ "document.onmousedown = closeMe; "
++ "</script>"), QString("text/html"));
++ KonqView* view = mainWindow.currentView();
++ QVERIFY(view);
++ QVERIFY(view->part());
++ QVERIFY(QTest::kWaitForSignal(view, SIGNAL(viewCompleted(KonqView*)),
5000));
++ QWidget* widget = view->part()->widget();
++ if ( QScrollArea* scrollArea = qobject_cast<QScrollArea*>(widget))
++ widget = scrollArea->widget();
++ qDebug() << "Clicking on" << widget;
++ QTest::mousePress(widget, Qt::RightButton);
++ QVERIFY(!view->part()); // deleted
++ }
++
++};
++
++
++QTEST_KDEMAIN_WITH_COMPONENTNAME( KonqHtmlTest, GUI, "konqueror" )
++
++#include "konqhtmltest.moc"
--- apps/konqueror/src/konqueror.rc
+++ apps/konqueror/src/konqueror.rc
@@ -109,7 +109,6 @@
@@ -1435,6 +1675,25 @@
load();
}

+--- apps/dolphin/src/dolphin_iconsmodesettings.kcfg
++++ apps/dolphin/src/dolphin_iconsmodesettings.kcfg
+@@ -32,7 +32,7 @@
+ check 'void IconsViewSettingsPage::applySettings()' as
reference (iconsviewsettingspage.cpp):
+ itemHeight += fontHeight * numberOfTextlines + 10;
+ /-->
+- <default code="true">KIconLoader::SizeMedium +
QFontMetrics(KGlobalSettings::generalFont()).height() + 10</default>
++ <default code="true">KIconLoader::SizeMedium +
QFontMetrics(KGlobalSettings::generalFont()).height() * 2 + 10</default>
+ </entry>
+ <entry name="ItemWidth" type="Int">
+ <label context="@label">Item width</label>
+@@ -52,6 +52,7 @@
+ </entry>
+ <entry name="NumberOfTextlines" type="Int">
+ <label context="@label">Number of textlines</label>
++ 
+ <default>2</default>
+ </entry>
+ <entry name="PreviewSize" type="Int">
--- apps/dolphin/src/dolphinpart.cpp
+++ apps/dolphin/src/dolphinpart.cpp
@@ -18,14 +18,15 @@
@@ -2386,7 +2645,7 @@
m_mainWin(mainWin)
--- apps/dolphin/src/dolphinpart.desktop
+++ apps/dolphin/src/dolphinpart.desktop
-@@ -57,3 +57,95 @@
+@@ -57,3 +57,109 @@
X-KDE-BrowserView-Built-Into=konqueror
Icon=view_icon
InitialPreference=7
@@ -2472,12 +2731,26 @@
+
+[Desktop Action details]
+Name=Details
++Name[ca]=Detalls
++Name[da]=Detaljer
++Name[is]=Nánar
++Name[nds]=Enkelheiten
++Name[pt]=Detalhes
++Name[pt_BR]=Detalhes
++Name[zh_CN]=细节
+Icon=view-list-details
+# Dummy
+Exec=dolphin
+
+[Desktop Action columns]
+Name=Columns
++Name[ca]=Columnes
++Name[da]=Kolonner
++Name[is]=Dálkar
++Name[nds]=Striepen
++Name[pt]=Colunas
++Name[pt_BR]=Colunas
++Name[zh_CN]=列
+Icon=view-file-columns
+# Dummy
+Exec=dolphin

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1092 mails)

commit kdebase4

Search this list

List Navigation

This Thread