Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2013-07-30 15:57:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2013-07-22 17:11:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2013-07-30 15:57:24.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 25 22:27:52 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 4.10.97 + * KDE 4.11 RC 2 release + * See http://www.kde.org/announcements/announce-4.11-rc2.php + +------------------------------------------------------------------- Old: ---- kate-4.10.95.tar.xz New: ---- kate-4.10.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.GSr0sI/_old 2013-07-30 15:57:25.000000000 +0200 +++ /var/tmp/diff_new_pack.GSr0sI/_new 2013-07-30 15:57:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: kate -Version: 4.10.95 +Version: 4.10.97 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ ++++++ kate-4.10.95.tar.xz -> kate-4.10.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/close-except-like/katecloseexceptplugin.desktop new/kate-4.10.97/addons/kate/close-except-like/katecloseexceptplugin.desktop --- old/kate-4.10.95/addons/kate/close-except-like/katecloseexceptplugin.desktop 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/close-except-like/katecloseexceptplugin.desktop 2013-07-23 10:59:01.000000000 +0200 @@ -7,6 +7,7 @@ X-Kate-Version=2.9 X-Kate-Load=True Name=Close Except/Like +Name[bs]=Zatvori Osim/Kao Name[ca]=Tancament excepte/com Name[cs]=Zavřít kromě/jako Name[da]=Luk undtagen/lignende @@ -38,6 +39,7 @@ Name[x-test]=xxClose Except/Likexx Name[zh_TW]=關閉「例外/喜歡」 Comment=Close group of documents based on a common path or file extension +Comment[bs]=Zatvori grupu dokumenara na bazi zajedniočke staye ili ekstenzije datoteke Comment[ca]=Tanca un grup de documents basats en un camí comú o en l'extensió del fitxer Comment[cs]=Zavřít skupinu dokumentů podle společné cesty nebo přípony Comment[da]=Luk gruppe af dokumenter baseret på en fælles sti eller filendelse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/konsole/katekonsoleplugin.desktop new/kate-4.10.97/addons/kate/konsole/katekonsoleplugin.desktop --- old/kate-4.10.95/addons/kate/konsole/katekonsoleplugin.desktop 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/konsole/katekonsoleplugin.desktop 2013-07-23 10:59:01.000000000 +0200 @@ -67,7 +67,7 @@ Comment[de]=Werkzeugansicht, die ein Terminalelement einbettet Comment[el]=Προβολή εργαλείου που ενσωματώνει ένα συστατικό τερματικού Comment[en_GB]=Toolview embedding a terminal widget -Comment[es]=Vista de herramienta que integra un widget de terminal +Comment[es]=Vista de herramienta que integra una ventana de terminal Comment[et]=Terminalividinat põimiv tööriistavaade Comment[eu]=Terminalaren trepeta kapsulatuta duen ikuspegi-tresna Comment[fi]=Päätesovelman sisältävä työkalunäkymä diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/mailfiles/katemailfilesplugin.desktop new/kate-4.10.97/addons/kate/mailfiles/katemailfilesplugin.desktop --- old/kate-4.10.95/addons/kate/mailfiles/katemailfilesplugin.desktop 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/mailfiles/katemailfilesplugin.desktop 2013-07-23 10:59:01.000000000 +0200 @@ -70,7 +70,7 @@ Comment[de]=Dateien per E-Mail versenden Comment[el]=Αποστολή αρχείων μέσω email Comment[en_GB]=Send files via email -Comment[es]=Enviar archivos por e-mail +Comment[es]=Enviar archivos por correo Comment[et]=Failide saatmine e-postiga Comment[eu]=Bidali fitxategiak posta elektoniko bidez Comment[fi]=Lähetä tiedostoja sähköpostitse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/pate/src/plugins/expand/text_x-c++src.expand new/kate-4.10.97/addons/kate/pate/src/plugins/expand/text_x-c++src.expand --- old/kate-4.10.95/addons/kate/pate/src/plugins/expand/text_x-c++src.expand 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/pate/src/plugins/expand/text_x-c++src.expand 2013-07-23 10:59:01.000000000 +0200 @@ -6,6 +6,7 @@ # import kate +from libkatepate import ui _BRIEF_DOC_TPL = '''/** * \\brief Class \c {0} @@ -50,8 +51,7 @@ ''' _PURE_BRIEF_DOC_TPL = '''/** - * \\brief %{{cursor}} - * + * \\brief %{cursor} */''' _NS_TPL = '''namespace {0} {{ @@ -76,14 +76,14 @@ _MAIN_WITH_ARGS_TPL = '''int main(int argc, const char* const argv[]) { -\t%{{cursor}} +\t%{cursor} \treturn 0; } ''' _MAIN_TPL = '''int main() { -\t%{{cursor}} +\t%{cursor} \treturn 0; }''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/pate/src/plugins/libkatepate/decorators.py new/kate-4.10.97/addons/kate/pate/src/plugins/libkatepate/decorators.py --- old/kate-4.10.95/addons/kate/pate/src/plugins/libkatepate/decorators.py 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/pate/src/plugins/libkatepate/decorators.py 2013-07-23 10:59:01.000000000 +0200 @@ -132,7 +132,6 @@ def has_selection_checker(selectionState, document): view = document.activeView() result = selectionState == view.selection() - print("*** has_selection: result=%s" % repr(result)) if not result: if not selectionState: should = i18nc('@info:tooltip', "This operation cannot be performed while text is selected") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/addons/kate/search/katesearch.desktop new/kate-4.10.97/addons/kate/search/katesearch.desktop --- old/kate-4.10.95/addons/kate/search/katesearch.desktop 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/addons/kate/search/katesearch.desktop 2013-07-23 10:59:01.000000000 +0200 @@ -12,7 +12,7 @@ Name[da]=Søg og erstat Name[de]=Suchen & Ersetzen Name[el]=Αναζήτηση & αντικατάσταση -Name[es]=Buscar y reemplazar +Name[es]=Buscar y remplazar Name[et]=Otsimine ja asendamine Name[fi]=Etsi ja korvaa Name[fr]=Chercher et remplacer @@ -58,7 +58,7 @@ Comment[da]=Søg og erstat i åbne dokumenter eller i filer på disken Comment[de]=Suchen & Ersetzen in geöffneten Dateien oder in Dateien auf der Festplatte Comment[el]=Αναζήτηση & αντικατάσταση σε ανοιγμένα έγγραφα ή σε αρχεία στο δίσκο -Comment[es]=Buscar y reemplazar en los documentos abiertos o en los archivos del disco +Comment[es]=Buscar y remplazar en los documentos abiertos o en los archivos del disco Comment[et]=Otsimine ja asendamine avatud dokumentides või kettal asuvates failides Comment[fi]=Etsi ja korvaa avatuista asiakirjoista tai levytiedostoista Comment[fr]=Trouver et remplacer dans des documents ouverts ou dans des fichiers sur disque diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/kate/app/katemainwindow.cpp new/kate-4.10.97/kate/app/katemainwindow.cpp --- old/kate-4.10.95/kate/app/katemainwindow.cpp 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/kate/app/katemainwindow.cpp 2013-07-23 10:59:01.000000000 +0200 @@ -725,16 +725,23 @@ void KateMainWindow::mSlotFixOpenWithMenu() { + // dh: in bug #307699, this slot is called when launching the Kate application + // unfortunately, noone ever could reproduce except users. + KTextEditor::View *activeView = m_viewManager->activeView(); + if (! activeView) + return; + + // cleanup menu KMenu *menu = documentOpenWith->menu(); menu->clear(); + // get a list of appropriate services. - Q_ASSERT(m_viewManager->activeView() != 0); - KMimeType::Ptr mime = KMimeType::mimeType(m_viewManager->activeView()->document()->mimeType()); + KMimeType::Ptr mime = KMimeType::mimeType(activeView->document()->mimeType()); //kDebug(13001) << "mime type: " << mime->name(); QAction *a = 0; KService::List offers = KMimeTypeTrader::self()->query(mime->name(), "Application"); - // for each one, insert a menu item... + // add all default open-with-actions except "Kate" for(KService::List::Iterator it = offers.begin(); it != offers.end(); ++it) { KService::Ptr service = *it; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/part/view/katemessagewidget.cpp new/kate-4.10.97/part/view/katemessagewidget.cpp --- old/kate-4.10.95/part/view/katemessagewidget.cpp 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/part/view/katemessagewidget.cpp 2013-07-23 10:59:01.000000000 +0200 @@ -110,10 +110,13 @@ { // set text etc. m_messageWidget->setText(message->text()); + m_messageWidget->setIcon(message->icon()); - // connect textChanged(), so it's possible to change text on the fly + // connect textChanged() and iconChanged(), so it's possible to change this on the fly connect(message, SIGNAL(textChanged(const QString&)), m_messageWidget, SLOT(setText(const QString&)), Qt::UniqueConnection); + connect(message, SIGNAL(iconChanged(const QIcon&)), + m_messageWidget, SLOT(setIcon(const QIcon&)), Qt::UniqueConnection); // the enums values do not necessarily match, hence translate with switch switch (message->messageType()) { @@ -235,10 +238,12 @@ disconnect(m_autoHideTimer, SIGNAL(timeout()), 0, 0); m_autoHideTimer->stop(); - // a bit unnice: disconnetc textChanged() signal of previously visible message + // a bit unnice: disconnect textChanged() and iconChanged() signals of previously visible message Q_ASSERT(m_messageList.size() > 1); disconnect(m_messageList[1], SIGNAL(textChanged(const QString&)), m_messageWidget, SLOT(setText(const QString&))); + disconnect(m_messageList[1], SIGNAL(iconChanged(const QIcon&)), + m_messageWidget, SLOT(setIcon(const QIcon&))); m_hideAnimationRunning = true; if (m_fadeEffect) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.10.95/part/view/kateviewhelpers.cpp new/kate-4.10.97/part/view/kateviewhelpers.cpp --- old/kate-4.10.95/part/view/kateviewhelpers.cpp 2013-07-10 00:49:18.000000000 +0200 +++ new/kate-4.10.97/part/view/kateviewhelpers.cpp 2013-07-23 10:59:01.000000000 +0200 @@ -1509,7 +1509,7 @@ if (m_cachedLNWidth != width || m_oldBackgroundColor != m_view->renderer()->config()->iconBarColor()) { int w = 16;// HACK: 16 == style().scrollBarExtent().width() style().scrollBarExtent().width(); - int h = m_view->renderer()->config()->fontMetrics().height(); + int h = m_view->renderer()->lineHeight(); QSize newSize(w, h); if ((m_arrow.size() != newSize || m_oldBackgroundColor != m_view->renderer()->config()->iconBarColor()) && !newSize.isEmpty()) { @@ -1588,7 +1588,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) { - uint h = m_view->renderer()->config()->fontMetrics().height(); + uint h = m_view->renderer()->lineHeight(); uint startz = (y / h); uint endz = startz + 1 + (height / h); uint lineRangesSize = m_viewInternal->cache()->viewCacheLineCount(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
