packages: kde4-kdelibs/kde4-kdelibs-branch.diff, kde4-kdelibs/kde4-kdelibs....

arekm arekm at pld-linux.org
Thu Aug 19 19:11:19 CEST 2010 

Author: arekm                        Date: Thu Aug 19 17:11:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; branch diff is back

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-branch.diff (1.19 -> 1.20) , kde4-kdelibs.spec (1.205 -> 1.206) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.19 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.20
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.19	Tue Mar 16 20:56:29 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff	Thu Aug 19 19:11:13 2010
@@ -1,3520 +1,2756 @@
-Index: cmake/modules/FindBlitz.cmake
+Index: ConfigureChecks.cmake
 ===================================================================
---- cmake/modules/FindBlitz.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ cmake/modules/FindBlitz.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -1,6 +1,6 @@
--################################################################
--########## DEPRECATED, use FindQImageBlitz instead #############
--################################################################
-+########################################################### 
-+######### DEPRECATED, use FindQImageBlitz instead ######### 
-+###########################################################
- # - Try to find blitz lib
- # Once done this will define
- #
-Index: cmake/modules/Qt4ConfigDependentSettings.cmake
-===================================================================
---- cmake/modules/Qt4ConfigDependentSettings.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ cmake/modules/Qt4ConfigDependentSettings.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -77,7 +77,18 @@
- 
- # QtOpenGL dependencies
- QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
--SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
-+IF(Q_WS_MAC)
-+# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be e.g. "-framework OpenGL -framework AGL".
-+# The separate_arguments() call in the other branch makes "-framework;-OpenGL;-framework;-lAGL" appear in the 
-+# linker command. So we need to protect the "-framework foo" as non-separatable strings.
-+# We do this by replacing the space after "-framework" with an underscore, then calling separate_arguments(),
-+# and then we replace the underscores again with spaces. So we get proper linker commands. Alex
-+  STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
-+  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
-+  STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
-+ELSE(Q_WS_MAC)
-+  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
-+ENDIF(Q_WS_MAC)
- SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
- 
- 
-Index: cmake/modules/KDE4Macros.cmake
-===================================================================
---- cmake/modules/KDE4Macros.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ cmake/modules/KDE4Macros.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -1244,22 +1244,23 @@
- # being automatically activated by the system bus.
- # *WARNING* You have to install the helper in ${LIBEXEC_INSTALL_DIR} to make sure everything will work.
- function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
--    
--  if (_kdeBootStrapping)
--    set(_stubFilesDir  ${CMAKE_SOURCE_DIR}/kdecore/auth/backends/dbus/ )
--  else (_kdeBootStrapping)
--    set(_stubFilesDir  ${KDE4_DATA_INSTALL_DIR}/kauth/ )
--  endif (_kdeBootStrapping)
-+    if(KAUTH_HELPER_BACKEND_NAME STREQUAL "DBUS")
-+        if (_kdeBootStrapping)
-+            set(_stubFilesDir  ${CMAKE_SOURCE_DIR}/kdecore/auth/backends/dbus/ )
-+        else (_kdeBootStrapping)
-+            set(_stubFilesDir  ${KDE4_DATA_INSTALL_DIR}/kauth/ )
-+        endif (_kdeBootStrapping)
- 
--  configure_file(${_stubFilesDir}/dbus_policy.stub
--                 ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf 
--          DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
--       
--  configure_file(${_stubFilesDir}/dbus_service.stub
--                 ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)
--  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service 
--          DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR})
-+        configure_file(${_stubFilesDir}/dbus_policy.stub
-+                        ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
-+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf
-+                DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
-+
-+        configure_file(${_stubFilesDir}/dbus_service.stub
-+                        ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)
-+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service
-+                DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR})
-+    endif(KAUTH_HELPER_BACKEND_NAME STREQUAL "DBUS")
- endfunction(KDE4_INSTALL_AUTH_HELPER_FILES)
- 
- # This macro generates an action file, depending on the backend used, for applications using KAuth.
-@@ -1276,7 +1277,7 @@
-   elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-     set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)
-     get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
--    
-+
-     add_custom_command(OUTPUT ${_output} 
-                        COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${_input} > ${_output} 
-                        MAIN_DEPENDENCY ${_input}
-Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
-===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -33,6 +33,7 @@
- Name[km]=កម្មវិធី​វិធី​ផ្ញើសារ​បន្ទាន់
- Name[kn]=ತತ್ಷಣ ಓಲೆಕಾರ
- Name[ko]=인스턴트 메신저
-+Name[lt]=Momentinių žinučių klientas
- Name[lv]=Tūlītējais ziņotājs
- Name[ml]=ഇന്‍സ്റ്റന്റ് മെസഞ്ചര്‍
- Name[ms]=Utusan Segera
-Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
-===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -32,6 +32,7 @@
- Name[km]=កម្មវិធី​និពន្ធ​អត្ថបទ​ដែល​បាន​បង្កប់
- Name[kn]=ಹುದುಗಿಸಲಾದ (ಎಂಬೆಡೆಡ್) ಪಠ್ಯ ಸಂಪಾದಕ
- Name[ko]=끼워넣은 텍스트 편집기
-+Name[lt]=Įtaisyta tekstų rengyklė
- Name[lv]=Iegultais teksta redaktors
- Name[ml]=തുന്നിച്ചേര്‍ത്ത ചെയ്ത എഴുത്തിടം
- Name[ms]=Editor Teks Terbinadalam
-Index: kate/plugins/autobrace/ktexteditor_autobrace.desktop
-===================================================================
---- kate/plugins/autobrace/ktexteditor_autobrace.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/plugins/autobrace/ktexteditor_autobrace.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -36,10 +36,11 @@
- Name[hu]=Automatikus járójelbezáró
- Name[id]=KurawalOtomatis
- Name[is]=SjálfvirkirSvigar
--Name[it]=GraffeAutomatiche
-+Name[it]=Graffe automatiche
- Name[ja]=自動括弧生成
- Name[km]=AutoBrace
- Name[ko]=괄호 닫기
-+Name[lt]=Automatinis kabučių uždarymas
- Name[nb]=AutoBrace
- Name[nds]=AutoKlemmen
- Name[nl]=AutoBrace
-@@ -85,6 +86,7 @@
- Comment[ja]=Enter キーを押すことで閉じる括弧を挿入します
- Comment[km]=បញ្ចូល​រង្វង់ក្រចក​បិទ​នៅ​ពេល​ចុច​គ្រាប់​ចុច​បញ្ចូល (Enter)
- Comment[ko]=Enter 키를 누를 때 닫는 괄호 삽입하기
-+Comment[lt]=Įterpti užveriančias kabutes nuspaudžiant Įvesti (Enter)
- Comment[nb]=Sett inn avsluttende krøllparentes når Enter trykkes
- Comment[nds]=Afsluten Klemmen mit de Ingaavtast infögen
- Comment[nl]=Voert afsluit haakjes in bij indrukken van Enter
-Index: kate/plugins/exporter/exporterpluginview.cpp
-===================================================================
---- kate/plugins/exporter/exporterpluginview.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/plugins/exporter/exporterpluginview.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -83,13 +83,13 @@
-   }
+--- ConfigureChecks.cmake	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ ConfigureChecks.cmake	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -34,6 +34,8 @@
  
-   QMimeData *data = new QMimeData();
--  data->setText(m_view->selectionText());
+ macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS)              # kdecore, khtml, kjs
  
-   QString s;
-   QTextStream output( &s, QIODevice::WriteOnly );
-   exportData(true, output);
- 
-   data->setHtml(s);
-+  data->setText(s);
- 
-   QApplication::clipboard()->setMimeData(data);
- }
++macro_bool_to_01(DBUSMENUQT_FOUND HAVE_DBUSMENUQT)      # kdeui
++
+ # FIXME: Make this changeable!
+ # khtml svg support
+ set(SVG_SUPPORT 1)              # unused yet, but for the future
+Index: kate/data/katemoderc
+===================================================================
+--- kate/data/katemoderc	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kate/data/katemoderc	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -1,5 +1,5 @@
+ [Python]
+-Variables=kate: presave-postdialog python-encoding; indent-mode python;
++Variables=kate: indent-mode python;
+ 
+ [Makefile]
+ Variables=kate: tab-width 8; indent-width 8; replace-tabs off; replace-tabs-save off;
+Index: kate/plugins/autobrace/ktexteditor_autobrace_config.desktop
+===================================================================
+--- kate/plugins/autobrace/ktexteditor_autobrace_config.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kate/plugins/autobrace/ktexteditor_autobrace_config.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -14,6 +14,7 @@
+ Name[en_GB]=AutoBrace Configuration
+ Name[es]=Configuración de los paréntesis automáticos
+ Name[et]=Automaatsete sulgude seadistamine
++Name[eu]=Parentesi automatikoen konfiguraketa
+ Name[fr]=Configuration des accolades automatiques
+ Name[fy]=Ynstellings for automatyske heakjes
+ Name[ga]=Cumraíocht AutoBrace
+Index: kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop
+===================================================================
+--- kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -22,6 +22,7 @@
+ Name[en_GB]=Insane (not ZEN) HTML coding (light edition)
+ Name[es]=Codificación HTML insensata (no zen) (edición ligera)
+ Name[et]=Hullumeelne (mitte ZEN) HTML kodeering (kerge versioon)
++Name[eu]=HTML kodeketa zentzugabea (ez ZEN) (edizio arina)
+ Name[fr]=Codage HTML démentiel (non ZEN, édition simple)
+ Name[fy]=Insane (net ZEN) HTML kode sjen (lighte edysje)
+ Name[ga]=Códú HTML Insane (seachas ZEN) (leagan éadrom)
+@@ -58,6 +59,7 @@
+ Comment[en_GB]=A plugin, which does zen-coding like selector completion
+ Comment[es]=Un complemento que realiza codificación zen, como el selector de terminación
+ Comment[et]=Plugin, mis kasutab zen-kodeerimise laadset selektori lõpetamist
++Comment[eu]=Plugin bat, zen kodeketa egiten duena, osaketa hautaketa bezala
+ Comment[fr]=Un module permettant un codage zen grâce à l'auto-complètement
+ Comment[fy]=In plugyn, dy't zen-kodearring docht lykas kar-foltôging
+ Comment[ga]=Breiseán a dhéanann códú zen mar shampla comhlánú roghnóirí
+Index: kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop
+===================================================================
+--- kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -10,6 +10,7 @@
+ Comment[en_GB]=Select an icon and use it as a KIcon in your source-code
+ Comment[es]=Seleccionar un icono y usarlo como KIcon en su código fuente
+ Comment[et]=Ikooni valimine ja selle kasutamine KIconina oma lähtekoodis
++Comment[eu]=Hautatu ikono bat eta erabili KIcon bezala zure iturburu kodean
+ Comment[fr]=Sélectionner une icône et l'utiliser comme une KIcon dans votre code source
+ Comment[fy]=In byldkaike selektearje en it brûke as Kbyldkaike yn jo boarnekoade
+ Comment[ga]=Roghnaigh deilbhín agus bain úsáid as mar KIcon i do chód foinseach
+@@ -53,6 +54,7 @@
+ Name[en_GB]=IconInserter
+ Name[es]=IconInserter
+ Name[et]=Ikoonilisaja
++Name[eu]=Ikono txertatzailea
+ Name[fr]=InsertionIcone
+ Name[fy]=Byldkaiketaheakker
+ Name[ga]=IconInserter
+@@ -99,6 +101,7 @@
+ GenericName[en_GB]=Insert Code for KIcon-Creation
+ GenericName[es]=Insertar código para la creación de un KIcon
+ GenericName[et]=Koodi lisamine KIconi loomiseks
++GenericName[eu]=Txertatu KIcon sortzeko kodea
+ GenericName[fr]=Insérer le code pour la création du KIcon
+ GenericName[fy]=Koade foar Kbyldkaike-oanmeitsje ynfoegje
+ GenericName[ga]=Ionsáigh cód le haghaidh cruthaithe KIcon
 Index: kate/plugins/exporter/ktexteditor_exporter.desktop
 ===================================================================
---- kate/plugins/exporter/ktexteditor_exporter.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/plugins/exporter/ktexteditor_exporter.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -41,6 +41,7 @@
- Name[ja]=エクスポート
+--- kate/plugins/exporter/ktexteditor_exporter.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kate/plugins/exporter/ktexteditor_exporter.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -46,7 +46,7 @@
+ Name[kk]=Экспорттау
  Name[km]=កម្មវិធីនាំចេញ
  Name[ko]=내보내기
-+Name[lt]=Eksportas
+-Name[lt]=Eksportas
++Name[lt]=Eksportavimas
  Name[nb]=Exporter
  Name[nds]=Export
- Name[nl]=Exporter
-@@ -86,6 +87,7 @@
- Comment[ja]=選択した文書を HTML にエクスポートします
- Comment[km]=នាំចេញ​ឯកសារ​ដែលបានបន្លិច​ទៅ HTML
- Comment[ko]=강조한 문서를 HTML로 내보내기
-+Comment[lt]=Eksportuoti pažymėtą dokumentą į HTML
- Comment[nb]=Eksporterer fremhevede dokumenter til HTML
- Comment[nds]=Syntaxmarkeert Dokment as HTML exporteren
- Comment[nl]=Oplichtend document exporteren naar HTML
-Index: kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop
-===================================================================
---- kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -39,6 +39,7 @@
- Name[kn]=ಪೈಥಾನ್ ಸಂಕೇತೀಕರಣ (ಎಂಕೋಡಿಂಗ್) ಪರಿಶೀಲಕ/ಸೇರಿಸುಗ
- Name[ko]=파이썬 인코딩 검사 및 추가기
- Name[ku]=Python kod kirina kontrolker/lê zêdeker ê
-+Name[lt]=Python koduočių tikrinimo/pridėjimo priemonė
- Name[lv]=Python kodējuma pārbaudītājs/pievienotājs
- Name[mai]=पाइथन एनकोडिंग जाँचकएनिहार/जोड़निहार
- Name[ml]=പൈത്തണ്‍ എന്‍കോഡിങ്ങ് ചെക്കര്‍/ആഡര്‍
-@@ -105,6 +106,7 @@
- Comment[kn]=ಉಳಿಸುವಾಗ ಪೈಥಾನ್ ಕಡತಗಳ ಸಂಕೇತೀಕರಣವನ್ನು (ಎಂಕೋಡಿಂಗ್) ಪರಿಶೀಲಿಸಿ, ಸಂಕೇತೀಕರಣ ಸಾಲನ್ನು ಸೇರಿಸು
- Comment[ko]=파이썬 파일을 저장할 때 인코딩을 검사하여 인코딩 줄 추가하기
- Comment[ku]=Demê tomar kirinê de kod kirina pelên python kontrol bike û rêzekê kod kirinê lê zêde bike
-+Comment[lt]=Įrašant python failus patikrinti koduotę ir pridėti koduotės eilutę
- Comment[lv]=Saglabājot pārbauda kodējumu python failiem un pievieno kodējuma rindu
- Comment[mai]=सहेजबाक काले पाएथनक एनकोडिंग जाँचू आओर कोनो एनकोडिंग फाइलकेँ जोड़ू
- Comment[ml]=സൂക്ഷിയ്ക്കുമ്പോള്‍ പൈത്തണ്‍ ഫയലുകളുടെ എന്‍കോഡിങ്ങ് പരിശോദിയ്ക്കുകയും എന്‍കോഡിങ്ങ് വരി ചേര്‍ക്കുകയും ചെയ്യുക
-Index: kate/vimode/kateviinsertmode.cpp
-===================================================================
---- kate/vimode/kateviinsertmode.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/vimode/kateviinsertmode.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -220,11 +220,6 @@
-       m_view->pageDown();
-       return true;
-     default:
--      // accept completion if active
--      if(m_view->completionWidget()->isCompletionActive()) {
--        m_view->completionWidget()->execute();
--      }
--
-       return false;
-       break;
-     }
-Index: kate/data/katepartpluginsrc
-===================================================================
---- kate/data/katepartpluginsrc	(.../tags/KDE/4.4.1/kdelibs)	(wersja 0)
-+++ kate/data/katepartpluginsrc	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -0,0 +1,2 @@
-+[Kate Part Plugins]
-+ktexteditorexporter=true
-Index: kate/data/CMakeLists.txt
-===================================================================
---- kate/data/CMakeLists.txt	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/data/CMakeLists.txt	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -1,3 +1,3 @@
- install( FILES katepartui.rc katepartsimpleui.rc  DESTINATION  ${DATA_INSTALL_DIR}/katepart )
- install( FILES katepart.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
--install( FILES katemoderc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-+install( FILES katemoderc katepartpluginsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-Index: kate/spellcheck/spellcheckdialog.cpp
+ Name[nl]=Exportprogramma
+Index: includes/CMakeLists.txt
 ===================================================================
---- kate/spellcheck/spellcheckdialog.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/spellcheck/spellcheckdialog.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -1,5 +1,5 @@
- /* This file is part of the KDE libraries
--   Copyright (C) 2009 Michel ludwig <michel.ludwig at kdemail.net>
-+   Copyright (C) 2009-2010 Michel ludwig <michel.ludwig at kdemail.net>
-    Copyright (C) 2008 Mirko Stocker <me at misto.ch>
-    Copyright (C) 2004-2005 Anders Lund <anders at alweb.dk>
-    Copyright (C) 2003 Clarence Dang <dang at kde.org>
-@@ -233,8 +233,6 @@
-   if ( m_spellCheckCancelledByUser
-        || m_currentLanguageRangeIterator == m_languagesInSpellCheckRange.end() )
-   {
--    m_currentSpellCheckRange = KTextEditor::Range::invalid();
--    m_currentDecToEncOffsetList.clear();
-     spellCheckDone();
-     return;
-   }
-@@ -250,7 +248,6 @@
-     const QString& dictionary = (*m_currentLanguageRangeIterator).second;
-     KTextEditor::Range languageSubRange = (nextRangeBegin.isValid() ? KTextEditor::Range(nextRangeBegin, currentLanguageRange.end())
-                                                                     : currentLanguageRange);
--
-     rangeDictionaryPairList = spellCheckManager->spellCheckWrtHighlightingRanges(m_view->doc(),
-                                                                                  languageSubRange,
-                                                                                  dictionary,
-@@ -264,6 +261,30 @@
-       }
-     }
-     else {
-+      m_currentSpellCheckRange = rangeDictionaryPairList.first().first;
-+      const QString& dictionary = rangeDictionaryPairList.first().second;
-+
-+      m_spellPosCursor = m_currentSpellCheckRange.start();
-+      m_spellLastPos = 0;
-+
-+      m_currentDecToEncOffsetList.clear();
-+      KateDocument::OffsetList encToDecOffsetList;
-+      QString text = m_view->doc()->decodeCharacters(m_currentSpellCheckRange,
-+                                                     m_currentDecToEncOffsetList,
-+                                                     encToDecOffsetList);
-+      // ensure that no empty string is passed on to Sonnet as this can lead to a crash
-+      // (bug 228789)
-+      if(text.isEmpty()) {
-+        nextRangeBegin = m_currentSpellCheckRange.end();
-+        continue;
-+      }
-+
-+      if(m_speller->language() != dictionary) {
-+        m_speller->setLanguage(dictionary);
-+        m_backgroundChecker->setSpeller(*m_speller);
-+      }
-+
-+      m_sonnetDialog->setBuffer(text);
-       break;
-     }
-   }
-@@ -272,25 +293,6 @@
-     spellCheckDone();
-     return;
-   }
--
--  const KTextEditor::Range& range = rangeDictionaryPairList.first().first;
--  const QString& dictionary = rangeDictionaryPairList.first().second;
--
--  m_spellPosCursor = range.start();
--  m_spellLastPos = 0;
--
--  if(m_speller->language() != dictionary) {
--    m_speller->setLanguage(dictionary);
--    m_backgroundChecker->setSpeller(*m_speller);
--  }
--
--  KateDocument *kateDocument = m_view->doc();
--  m_currentSpellCheckRange = range;
--  m_currentDecToEncOffsetList.clear();
--  KateDocument::OffsetList encToDecOffsetList;
--  QString text = kateDocument->decodeCharacters(m_currentSpellCheckRange, m_currentDecToEncOffsetList,
--                                                encToDecOffsetList);
--  m_sonnetDialog->setBuffer(text);
- }
- 
- void KateSpellCheckDialog::cancelClicked()
-@@ -300,6 +302,8 @@
- 
- void KateSpellCheckDialog::spellCheckDone()
- {
-+  m_currentSpellCheckRange = KTextEditor::Range::invalid();
-+  m_currentDecToEncOffsetList.clear();
-   m_view->clearSelection();
- }
- 
-Index: kate/document/katedocument.cpp
-===================================================================
---- kate/document/katedocument.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ kate/document/katedocument.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -397,9 +397,6 @@
-     return QString();
-   }
- 
--  if ( blockwise && (range.start().column() > range.end().column()) )
--    return QString ();
--
-   QString s;
- 
-   if (range.start().line() == range.end().line())
-@@ -771,9 +768,6 @@
-   if (!isReadWrite())
-     return false;
- 
--  if ( block && (range.start().column() > range.end().column()) )
--    return false;
--
-   // Should now be impossible to trigger with the new Range class
-   Q_ASSERT( range.start().line() <= range.end().line() );
+--- includes/CMakeLists.txt	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ includes/CMakeLists.txt	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -863,6 +863,7 @@
+   KTextEditor/CommandInterface
+   KTextEditor/ConfigInterface
+   KTextEditor/ConfigPage
++  KTextEditor/ContainerInterface
+   KTextEditor/Cursor
+   KTextEditor/Document
+   KTextEditor/Editor
+@@ -870,6 +871,9 @@
+   KTextEditor/Factory
+   KTextEditor/HighlightInterface
+   KTextEditor/MarkInterface
++  KTextEditor/MovingCursor
++  KTextEditor/MovingInterface
++  KTextEditor/MovingRange
+   KTextEditor/ModificationInterface
+   KTextEditor/Plugin
+   KTextEditor/Range
+@@ -884,6 +888,7 @@
+   KTextEditor/SmartRangeNotifier
+   KTextEditor/SmartRangeWatcher
+   KTextEditor/TemplateInterface
++  KTextEditor/TemplateInterface2
+   KTextEditor/TextHintInterface
+   KTextEditor/VariableInterface
+   KTextEditor/View
+Index: mimetypes/kde.xml
+===================================================================
+--- mimetypes/kde.xml	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ mimetypes/kde.xml	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -102,7 +102,7 @@
+     <glob pattern="*.kug"/>
+   </mime-type>
+   <mime-type type="application/x-webarchive">
+-    <sub-class-of type="application/zip"/>
++    <sub-class-of type="application/x-compressed-tar"/>
+     <comment>web archive</comment>
+     <glob pattern="*.war"/>
+   </mime-type>
+Index: kioslave/http/kcookiejar/kcookiejar.desktop
+===================================================================
+--- kioslave/http/kcookiejar/kcookiejar.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kioslave/http/kcookiejar/kcookiejar.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -11,6 +11,7 @@
+ Name[en_GB]=Cookie Jar
+ Name[es]=Almacén de cookies
+ Name[et]=Küpsisekarp
++Name[eu]=Cookie ontzia
+ Name[fi]=Evästeiden säilytys
+ Name[fr]=Boîte à cookies
+ Name[fy]=Koekjespot
+@@ -57,6 +58,7 @@
+ Comment[en_GB]=Stores network cookies
+ Comment[es]=Almacena cookies de la red
+ Comment[et]=Võrguküpsiste salvestamine
++Comment[eu]=Sareko cookie-ak biltegiratzen ditu
+ Comment[fi]=Säilyttää verkkoevästeitä
+ Comment[fr]=Enregistre les cookies réseaux
+ Comment[fy]=Bewarret netwurk koekjes
+Index: kioslave/http/http_cache_cleaner.desktop
+===================================================================
+--- kioslave/http/http_cache_cleaner.desktop	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ kioslave/http/http_cache_cleaner.desktop	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -160,7 +160,7 @@
+ Comment[pt_BR]=Limpa itens antigos do cache HTTP
+ Comment[ro]=Elimină înregistrările vechi din cache-ul HTTP
+ Comment[ru]=Удаление устаревших элементов из кеша HTTP
+-Comment[se]=Buhtista boares merko3/4iid HTTP gaskarádjosis
++Comment[se]=Buhtista boares merkošiid HTTP gaskarádjosis
+ Comment[sk]=Vyčistí staré položky z vyrovnávacej pamäte HTTP
+ Comment[sl]=Zbriše stare vnose iz pomnilnika HTTP
+ Comment[sr]=Чисти старе ставке из ХТТП кеша
+Index: nepomuk/query/query.cpp
+===================================================================
+--- nepomuk/query/query.cpp	(.../tags/KDE/4.5.0/kdelibs)	(wersja 1165573)
++++ nepomuk/query/query.cpp	(.../branches/KDE/4.5/kdelibs)	(wersja 1165573)
+@@ -65,6 +65,16 @@
+ ORDER BY  desc (?
+ */
  
-@@ -818,8 +812,10 @@
-   else
-   {
-     int startLine = qMax(0, range.start().line());
--    for (int line = qMin(range.end().line(), lastLine()); line >= startLine; --line)
--      editRemoveText(line, range.start().column(), range.end().column() - range.start().column());
-+    for (int line = qMin(range.end().line(), lastLine()); line >= startLine; --line) {
-+      KTextEditor::Range subRange = rangeOnLine(range, line);
-+      editRemoveText(line, subRange.start().column(), subRange.end().column() - subRange.start().column());
++namespace {
++    QStringList urlsToStringList( const KUrl::List& urls, KUrl::AdjustPathOption opt ) {
++        QStringList lst;
++        for( KUrl::List::ConstIterator it = urls.constBegin();
++             it != urls.constEnd(); ++it ) {
++            lst.append( it->url(opt) );
++        }
++        return lst;
 +    }
-   }
++}
  
-   editEnd ();
-@@ -2945,6 +2941,8 @@
-   KTextEditor::Cursor pos = view->cursorPosition();
-   if (!view->config()->persistentSelection() && view->selection()) {
-     pos = view->selectionRange().start();
-+    if (view->blockSelection())
-+      pos = rangeOnLine(view->selectionRange(), pos.line()).start();
-     view->removeSelectedText();
-   }
  
-Index: CreateKDELibsDependenciesFile.cmake
+ QString Nepomuk::Query::QueryPrivate::createFolderFilter( const QString& resourceVarName, QueryBuilderData* qbd ) const
+@@ -73,10 +83,10 @@
+         QString uriVarName = qbd->uniqueVarName();
+         QString filter = resourceVarName + ' ' + Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NIE::url() ) + ' ' + uriVarName + QLatin1String( " . " );
+         if ( !m_includeFolders.isEmpty() ) {
+-            filter += QString( " FILTER(REGEX(STR(%1), \"^(%2/)\")) ." ).arg( uriVarName ).arg( m_includeFolders.toStringList().join( "|" ) );
++            filter += QString( " FILTER(REGEX(STR(%1), \"^(%2)\")) ." ).arg( uriVarName ).arg( urlsToStringList(m_includeFolders, KUrl::AddTrailingSlash).join( "|" ) );
+         }
+         if ( !m_excludeFolders.isEmpty() ) {
+-            filter += QString( " FILTER(!REGEX(STR(%1), \"^(%2/)\")) ." ).arg( uriVarName ).arg( m_excludeFolders.toStringList().join( "|" ) );
++            filter += QString( " FILTER(!REGEX(STR(%1), \"^(%2)\")) ." ).arg( uriVarName ).arg( urlsToStringList(m_excludeFolders,  KUrl::AddTrailingSlash).join( "|" ) );
+         }
+         return filter;
+     }
+@@ -361,7 +371,8 @@
+                               d->m_isFileQuery ? QString() : instanceBaseRestriction );
+ 
+     // add optional order terms
+-    queryBase += qbd.buildOrderString();
++    if( !(flags & CreateCountQuery) )
++        queryBase += qbd.buildOrderString();
+ 
+     // offset and limit
+     if ( d->m_offset > 0 )
+Index: nepomuk/query/query_p.cpp
 ===================================================================
---- CreateKDELibsDependenciesFile.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
-+++ CreateKDELibsDependenciesFile.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
-@@ -19,7 +19,7 @@
- 
- # we need the absolute directories where stuff will be installed too
- # but since the variables which contain the destinations can be relative
--# or absolute paths, we need this macro to make them all absoulte, Alex
-+# or absolute paths, we need this macro to make them all absolute, Alex
- macro(MAKE_INSTALL_PATH_ABSOLUTE out in)
-    if (IS_ABSOLUTE "${in}")    # IS_ABSOLUTE is new since cmake 2.4.8
-       set(${out} "${in}")
-@@ -93,7 +93,7 @@
- ")
- 
- 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branch.diff?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.205&r2=1.206&f=u

More information about the pld-cvs-commit mailing list