Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2011-11-14 14:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2011-10-21 16:31:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2011-11-14 14:05:38.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 11 12:42:56 UTC 2011 - [email protected] + +- Depend on kwebkitpart instead of kwebkitpart-devel + +------------------------------------------------------------------- +Wed Nov 2 20:20:09 CET 2011 - [email protected] + +- update to 4.7.3 + * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for details + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.7.2.tar.bz2 New: ---- kde-baseapps-4.7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Keo55l/_old 2011-11-14 14:05:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Keo55l/_new 2011-11-14 14:05:40.000000000 +0100 @@ -18,7 +18,7 @@ Name: kdebase4 -Version: 4.7.2 +Version: 4.7.3 Release: 1 License: GPLv2+ Summary: The Base KDE Apps @@ -34,7 +34,7 @@ BuildRequires: NetworkManager-devel BuildRequires: bluez-devel BuildRequires: fdupes -BuildRequires: kwebkitpart-devel +BuildRequires: kwebkitpart BuildRequires: libkde4-devel >= %{version} BuildRequires: libqimageblitz-devel BuildRequires: libraw1394-devel ++++++ 4_7_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.Keo55l/_old 2011-11-14 14:05:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Keo55l/_new 2011-11-14 14:05:40.000000000 +0100 @@ -5,44 +5,3 @@ +git diff v4.7.2..origin/KDE/4.7 diff --git a/konqueror/settings/kio/policydlg.cpp b/konqueror/settings/kio/policydlg.cpp index e066286..4f70bd4 100644 ---- a/konqueror/settings/kio/policydlg.cpp -+++ b/konqueror/settings/kio/policydlg.cpp -@@ -75,8 +75,9 @@ PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent, - - enableButtonOk( false ); - connect(m_dlgUI->leDomain, SIGNAL(textChanged(const QString&)), -- SLOT(slotTextChanged(const QString&))); -- -+ SLOT(slotTextChanged(const QString&))); -+ connect(m_dlgUI->cbPolicy,SIGNAL(currentIndexChanged(QString)), -+ SLOT(slotTextChanged(QString))); - setFixedSize (sizeHint()); - m_dlgUI->leDomain->setFocus (); - } -@@ -90,8 +91,11 @@ void PolicyDlg::setEnableHostEdit( bool state, const QString& host ) - - void PolicyDlg::setPolicy (int policy) - { -- if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) ) -+ if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) ) { -+ const bool blocked = m_dlgUI->cbPolicy->blockSignals(true); - m_dlgUI->cbPolicy->setCurrentIndex(policy-1); -+ m_dlgUI->cbPolicy->blockSignals(blocked); -+ } - - if ( !m_dlgUI->leDomain->isEnabled() ) - m_dlgUI->cbPolicy->setFocus(); -diff --git a/konqueror/sidebar/test/test.desktop b/konqueror/sidebar/test/test.desktop -index 7d923c4..5dd33eb 100644 ---- a/konqueror/sidebar/test/test.desktop -+++ b/konqueror/sidebar/test/test.desktop -@@ -85,7 +85,7 @@ Name[te]=పరీక్ష - Name[tg]=Санҷиш - Name[th]=ทดสอบ - Name[tr]=Test --Name[ug]=سىنا -+Name[ug]=سىناق - Name[uk]=Тест - Name[uz]=Sinov - Name[uz@cyrillic]=Синов -/space/work/OBS/kdf/kdebase4 ++++++ kde-baseapps-4.7.2.tar.bz2 -> kde-baseapps-4.7.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/CMakeLists.txt new/kde-baseapps-4.7.3/CMakeLists.txt --- old/kde-baseapps-4.7.2/CMakeLists.txt 2011-10-02 15:52:40.000000000 +0200 +++ new/kde-baseapps-4.7.3/CMakeLists.txt 2011-10-28 09:48:58.000000000 +0200 @@ -4,9 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.7.2") +set(KDE_MIN_VERSION "4.7.3") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.7.2 REQUIRED) +find_package(KDE4 4.7.3 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) Files old/kde-baseapps-4.7.2/doc/dolphin/index.cache.bz2 and new/kde-baseapps-4.7.3/doc/dolphin/index.cache.bz2 differ Files old/kde-baseapps-4.7.2/doc/kdepasswd/index.cache.bz2 and new/kde-baseapps-4.7.3/doc/kdepasswd/index.cache.bz2 differ Files old/kde-baseapps-4.7.2/doc/kfind/index.cache.bz2 and new/kde-baseapps-4.7.3/doc/kfind/index.cache.bz2 differ Files old/kde-baseapps-4.7.2/doc/konqueror/index.cache.bz2 and new/kde-baseapps-4.7.3/doc/konqueror/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/kio/policydlg.cpp new/kde-baseapps-4.7.3/konqueror/settings/kio/policydlg.cpp --- old/kde-baseapps-4.7.2/konqueror/settings/kio/policydlg.cpp 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/kio/policydlg.cpp 2011-10-28 09:42:47.000000000 +0200 @@ -75,8 +75,9 @@ enableButtonOk( false ); connect(m_dlgUI->leDomain, SIGNAL(textChanged(const QString&)), - SLOT(slotTextChanged(const QString&))); - + SLOT(slotTextChanged(const QString&))); + connect(m_dlgUI->cbPolicy,SIGNAL(currentIndexChanged(QString)), + SLOT(slotTextChanged(QString))); setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); } @@ -90,8 +91,11 @@ void PolicyDlg::setPolicy (int policy) { - if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) ) + if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) ) { + const bool blocked = m_dlgUI->cbPolicy->blockSignals(true); m_dlgUI->cbPolicy->setCurrentIndex(policy-1); + m_dlgUI->cbPolicy->blockSignals(blocked); + } if ( !m_dlgUI->leDomain->isEnabled() ) m_dlgUI->cbPolicy->setFocus(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -76,7 +76,7 @@ Name[tg]=UADescription (Firefox 2.0 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 2.0 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 2.0) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 2.0) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 2.0) Name[uk]=UADescription (Firefox 2.0 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 2.0 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 2.0 on current)xx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -64,7 +64,7 @@ Name[tg]=UADescription (Firefox 3.0 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 3.0 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.0) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 3.0) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 3.0) Name[uk]=UADescription (Firefox 3.0 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 3.0 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 3.0 on current)xx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -58,7 +58,7 @@ Name[tg]=UADescription (Firefox 3.6 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 3.6 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.6) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 3.6) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 3.6) Name[uk]=UADescription (Firefox 3.6 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 3.6 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 3.6 on current)xx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/konq/fileappearance.desktop new/kde-baseapps-4.7.3/konqueror/settings/konq/fileappearance.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/konq/fileappearance.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/konq/fileappearance.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -91,7 +91,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/konq/webappearance.desktop new/kde-baseapps-4.7.3/konqueror/settings/konq/webappearance.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/konq/webappearance.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/konq/webappearance.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -92,7 +92,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/settings/konqhtml/khtml_appearance.desktop new/kde-baseapps-4.7.3/konqueror/settings/konqhtml/khtml_appearance.desktop --- old/kde-baseapps-4.7.2/konqueror/settings/konqhtml/khtml_appearance.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/settings/konqhtml/khtml_appearance.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -93,7 +93,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/sidebar/test/test.desktop new/kde-baseapps-4.7.3/konqueror/sidebar/test/test.desktop --- old/kde-baseapps-4.7.2/konqueror/sidebar/test/test.desktop 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/sidebar/test/test.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -85,7 +85,7 @@ Name[tg]=Санҷиш Name[th]=ทดสอบ Name[tr]=Test -Name[ug]=سىنا +Name[ug]=سىناق Name[uk]=Тест Name[uz]=Sinov Name[uz@cyrillic]=Синов diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/src/konqmisc.cpp new/kde-baseapps-4.7.3/konqueror/src/konqmisc.cpp --- old/kde-baseapps-4.7.2/konqueror/src/konqmisc.cpp 2011-06-22 16:30:26.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/src/konqmisc.cpp 2011-10-28 09:42:47.000000000 +0200 @@ -181,8 +181,8 @@ KUrl KonqMisc::konqFilteredURL(KonqMainWindow* parent, const QString& _url, const QString& _path) { Q_UNUSED(parent); // Useful if we want to change the error handling again - if (!_url.startsWith( "about:" )) // Don't filter "about:" URLs - { + + if ( !_url.startsWith( QLatin1String("about:") ) ) { // Don't filter "about:" URLs KUriFilterData data(_url); if( !_path.isEmpty() ) @@ -192,8 +192,7 @@ // from the location bar. data.setCheckForExecutables (false); - if( KUriFilter::self()->filterUri( data ) ) - { + if( KUriFilter::self()->filterUri( data ) ) { if( data.uriType() == KUriFilterData::Error ) { if (data.errorMsg().isEmpty()) { return KParts::BrowserRun::makeErrorUrl(KIO::ERR_MALFORMED_URL, _url, _url); @@ -204,17 +203,17 @@ return data.uri(); } } - } - else if (_url != "about:blank" && _url != "about:plugins" && !_url.startsWith("about:konqueror")) { - return KUrl("about:"); - } - // return the original url if it cannot be filtered. But only if it gives a valid KUrl. - KUrl url(_url); - if (!url.isValid()) { - return KParts::BrowserRun::makeErrorUrl(KIO::ERR_MALFORMED_URL, _url, _url); + // NOTE: a valid URL like http://kde.org always passes the filtering test. + // As such, this point could only be reached when _url is NOT a valid URL. + return KParts::BrowserRun::makeErrorUrl(KIO::ERR_MALFORMED_URL, _url, _url); } - return url; + + const bool isKnownAbout = (_url == QLatin1String("about:blank") + || _url == QLatin1String("about:plugins") + || _url.startsWith(QLatin1String("about:konqueror"))); + + return isKnownAbout ? KUrl(_url) : KUrl("about:"); } QString KonqMisc::defaultProfileName() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/konqueror/src/konqtabs.cpp new/kde-baseapps-4.7.3/konqueror/src/konqtabs.cpp --- old/kde-baseapps-4.7.2/konqueror/src/konqtabs.cpp 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.3/konqueror/src/konqtabs.cpp 2011-10-28 09:42:47.000000000 +0200 @@ -365,9 +365,9 @@ void KonqFrameTabs::slotMouseMiddleClick() { - KonqMainWindow* mainWindow = m_pViewManager->mainWindow(); + KonqMainWindow* mainWindow = m_pViewManager->mainWindow(); KUrl filteredURL ( KonqMisc::konqFilteredURL( mainWindow, QApplication::clipboard()->text(QClipboard::Selection) ) ); - if ( !filteredURL.isEmpty() ) { + if (filteredURL.isValid() && filteredURL.protocol() != QLatin1String("error")) { KonqView* newView = m_pViewManager->addTab("text/html", QString(), false, false); if (newView == 0L) return; mainWindow->openUrl( newView, filteredURL, QString() ); @@ -382,7 +382,7 @@ slotCloseRequest(w); } else { KUrl filteredURL(KonqMisc::konqFilteredURL(m_pViewManager->mainWindow(), QApplication::clipboard()->text(QClipboard::Selection))); - if (!filteredURL.isEmpty()) { + if (filteredURL.isValid() && filteredURL.protocol() != QLatin1String("error")) { KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); if (frame) { m_pViewManager->mainWindow()->openUrl(frame->activeChildView(), filteredURL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.2/lib/konq/Templates/Floppy.desktop new/kde-baseapps-4.7.3/lib/konq/Templates/Floppy.desktop --- old/kde-baseapps-4.7.2/lib/konq/Templates/Floppy.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.3/lib/konq/Templates/Floppy.desktop 2011-10-28 09:42:47.000000000 +0200 @@ -61,7 +61,7 @@ Name[tg]=Формат Name[th]=รูปแบบ Name[tr]=Biçim -Name[ug]=فورماتى +Name[ug]=پىچىمى Name[uk]=Форматувати Name[wa]=Abwesner Name[x-test]=xxFormatxx -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
