Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2014-11-19 20:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2014-10-16 18:11:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2014-11-19 20:26:52.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Nov 11 16:18:13 UTC 2014 - tittiatc...@gmail.com + +- Add upstream patch kimpanel-boo903556.diff to resolve the issue + that kimpanel will confuse IBus for other DE's (BOO#903556) + +------------------------------------------------------------------- +Sun Nov 9 20:28:00 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +- Split kimpanel into a subpackage in order not to disturb + existing installations with ibus-ui-gtk3. + +------------------------------------------------------------------- Old: ---- kdeplasma-addons-4.14.2.tar.xz New: ---- kdeplasma-addons-4.14.3.tar.xz kimpanel-boo903556.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.YZY7Ex/_old 2014-11-19 20:26:53.000000000 +0100 +++ /var/tmp/diff_new_pack.YZY7Ex/_new 2014-11-19 20:26:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: plasma-addons -Version: 4.14.2 +Version: 4.14.3 Release: 0 Summary: Additional Plasma Widgets License: GPL-2.0+ @@ -28,6 +28,8 @@ Patch1: krunner-akonadi-dont-cause-start.diff # PATCH-FIX-OPENSUSE lancelot-suse.diff -- patch adds openSUSE specific items to default lancelot layout, bnc#532377 Patch2: lancelot-suse.diff +# PATCH-FIX-UPSTREAM kimpanel-boo903556.diff -- Don't install kimpanel.xml in order not to confuse IBUS, BOO#903556 +Patch3: kimpanel-boo903556.diff BuildRequires: fdupes BuildRequires: ibus-devel BuildRequires: kdebase4-workspace-devel @@ -47,6 +49,7 @@ Recommends: plasma-addons-akonadi Recommends: plasma-addons-lancelot Recommends: plasma-addons-marble +Recommends: plasma-addons-kimpanel BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -98,10 +101,19 @@ %description marble Additional plasmoids from upstream that require Marble +%package kimpanel +Summary: A generic input method panel for Oriental languages +Group: System/GUI/KDE +%kde4_runtime_requires + +%description kimpanel +kimpanel is a panel Plasmoid for various input methods with concurrent Plasma theme + %prep %setup -q -n kdeplasma-addons-%{version} %patch1 %patch2 +%patch3 -p1 %build %cmake_kde4 -d build @@ -170,6 +182,18 @@ %{_kde4_modulesdir}/plasma_wallpaper_marble.so %{_kde4_servicesdir}/plasma-wallpaper-marble.desktop +%files kimpanel +%defattr(-,root,root) +%{_kde4_libexecdir}/kimpanel-ibus-panel +%{_kde4_sharedir}/config.kcfg/kimpanelconfig.kcfg +%{_kde4_modulesdir}/plasma_engine_kimpanel.so +%{_kde4_appsdir}/plasma/services/kimpanel.operations +%{_kde4_servicesdir}/plasma-dataengine-kimpanel.desktop +%{_kde4_modulesdir}/libexec/kimpanel-ibus-panel +%{_kde4_configkcfgdir}/kimpanelconfig.kcfg +%{_kde4_servicesdir}/plasma-applet-kimpanel.desktop +%{_kde4_modulesdir}/plasma_applet_kimpanel.so + %files %defattr(-,root,root) %doc COPYING @@ -186,6 +210,15 @@ %exclude %{_kde4_servicesdir}/plasma-runner-contacts.desktop %exclude %{_kde4_servicesdir}/plasma-runner-events*.desktop %exclude %{_kde4_servicesdir}/plasma-wallpaper-marble.desktop +%exclude %{_kde4_libexecdir}/kimpanel-ibus-panel +%exclude %{_kde4_sharedir}/config.kcfg/kimpanelconfig.kcfg +%exclude %{_kde4_modulesdir}/plasma_engine_kimpanel.so +%exclude %{_kde4_appsdir}/plasma/services/kimpanel.operations +%exclude %{_kde4_servicesdir}/plasma-dataengine-kimpanel.desktop +%exclude %{_kde4_modulesdir}/libexec/kimpanel-ibus-panel +%exclude %{_kde4_configkcfgdir}/kimpanelconfig.kcfg +%exclude %{_kde4_servicesdir}/plasma-applet-kimpanel.desktop +%exclude %{_kde4_modulesdir}/plasma_applet_kimpanel.so %{_kde4_appsdir}/bball/ %{_kde4_appsdir}/desktoptheme/ %{_kde4_appsdir}/kdeplasma-addons/mediabuttonsrc @@ -208,14 +241,11 @@ %{_kde4_iconsdir}/hicolor/*/actions/*youtube.* %{_kde4_libdir}/libplasma*.so.* %{_kde4_libdir}/librtm.so.* -%{_kde4_libexecdir}/kimpanel-ibus-panel -%{_datadir}/ibus/component/kimpanel.xml %{_kde4_modulesdir}/kcm_*.so %{_kde4_modulesdir}/krunner_*.so %{_kde4_modulesdir}/plasma-applet_systemloadviewer.so %{_kde4_modulesdir}/plasma_* %{_kde4_servicesdir}/* %{_kde4_servicetypes}/plasma_*.desktop -%{_kde4_sharedir}/config.kcfg/kimpanelconfig.kcfg %changelog ++++++ kdeplasma-addons-4.14.2.tar.xz -> kdeplasma-addons-4.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/applets/kimpanel/backend/ibus/ibus15/panel.cpp new/kdeplasma-addons-4.14.3/applets/kimpanel/backend/ibus/ibus15/panel.cpp --- old/kdeplasma-addons-4.14.2/applets/kimpanel/backend/ibus/ibus15/panel.cpp 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/applets/kimpanel/backend/ibus/ibus15/panel.cpp 2014-10-25 09:17:51.000000000 +0200 @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <locale.h> #include <stdlib.h> #include <string.h> #include <ibus.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/applets/kimpanel/src/plasma-applet-kimpanel.desktop new/kdeplasma-addons-4.14.3/applets/kimpanel/src/plasma-applet-kimpanel.desktop --- old/kdeplasma-addons-4.14.2/applets/kimpanel/src/plasma-applet-kimpanel.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/applets/kimpanel/src/plasma-applet-kimpanel.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -65,7 +65,6 @@ Comment[gl]=Un panel de métodos de entrada xenérico para idiomas orientais. Comment[hr]=Generički panel za metode unosa za orijentalne jezike Comment[hu]=Általános beviteli-mód panel keleti nyelvekhez -Comment[it]=Un pannello generico dei metodi di inserimento per le lingue orientali Comment[ja]=東洋言語のための汎用入力方法パネル Comment[kk]=Шығыс тілдердегі негізгі теру әдістер панелі Comment[km]=បន្ទះវិធីសាស្ត្របញ្ចូលទូទៅសម្រាប់ភាសាបច្ចឹមបូពា diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/applets/knowledgebase/plasma-applet-knowledgebase.desktop new/kdeplasma-addons-4.14.3/applets/knowledgebase/plasma-applet-knowledgebase.desktop --- old/kdeplasma-addons-4.14.2/applets/knowledgebase/plasma-applet-knowledgebase.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/applets/knowledgebase/plasma-applet-knowledgebase.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -51,7 +51,7 @@ Comment[bs]=Baza znanja za Opendesktop Comment[ca]=Knowledgebase Opendesktop Comment[ca@valencia]=Knowledgebase Opendesktop -Comment[cs]=Databáze vědomostí Opendesktop +Comment[cs]=Databáze vědomostí openDesktop Comment[da]=Opendesktop Knowledgebase Comment[de]=OpenDesktop-Wissensdatenbank Comment[el]=Βάση γνώσεων Opendesktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/dataengines/kdecommits/plasma-engine-kdecommits.desktop new/kdeplasma-addons-4.14.3/dataengines/kdecommits/plasma-engine-kdecommits.desktop --- old/kdeplasma-addons-4.14.2/dataengines/kdecommits/plasma-engine-kdecommits.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/dataengines/kdecommits/plasma-engine-kdecommits.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -3,6 +3,7 @@ Name[bs]=KDE Commits Engine Name[ca]=Motor de «commits» del KDE Name[ca@valencia]=Motor de «commits» del KDE +Name[cs]=Nástroj pro příspěvky do KDE Name[da]=Motor til KDE Commits Name[de]=KDE-Comic-Datentreiber Name[el]=Μηχανή αλλαγών αποθετηρίου του KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/runners/translator/plasma-runner-translator.desktop new/kdeplasma-addons-4.14.3/runners/translator/plasma-runner-translator.desktop --- old/kdeplasma-addons-4.14.2/runners/translator/plasma-runner-translator.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/runners/translator/plasma-runner-translator.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -45,6 +45,7 @@ Comment[bs]=Prevodi u bilo koji jezik koristeći Google Translate. Za listu podržanih jezika posjetite https://developers.google.com/translate/v2/using_rest?hl=de#language-params Comment[ca]=Tradueix a qualsevol idioma usant el Google Translate. Per la llista d'idiomes acceptats visiteu https://developers.google.com/translate/v2/using_rest?hl=de#language-params Comment[ca@valencia]=Tradueix a qualsevol idioma usant el Google Translate. Per la llista d'idiomes acceptats visiteu https://developers.google.com/translate/v2/using_rest?hl=de#language-params +Comment[cs]=Překládá do jakéhokoliv jazyka pomocí Google Translate. Pro seznam podporovaných jazyků navštivte https://developers.google.com/translate/v2/using_rest?hl=de#language-params Comment[da]=Oversætter til alle sprog med Google Translate. Besøg https://developers.google.com/translate/v2/using_rest?hl=de#language-params for en liste over understøttede sprog Comment[de]=Übersetzt mit „Google Übersetzer“ in beliebige Sprachen. Eine Liste der unterstützten Sprachen finden Sie unter https://developers.google.com/translate/v2/using_rest?hl=de#language-params Comment[el]=Μετάφραση σε οποιαδήποτε γλώσσα με το Google Translate. Για τη λίστα με τις υποστηριζόμενες γλώσσες ανατρέξτε στο https://developers.google.com/translate/v2/using_rest?hl=de#language-params diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/wallpapers/pattern/patterns/persism.desktop new/kdeplasma-addons-4.14.3/wallpapers/pattern/patterns/persism.desktop --- old/kdeplasma-addons-4.14.2/wallpapers/pattern/patterns/persism.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/wallpapers/pattern/patterns/persism.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -4,7 +4,7 @@ Comment[bs]=Damački cvijet Comment[ca]=Flor de Damasc Comment[ca@valencia]=Flor de Damasc -Comment[cs]=Damašská květina +Comment[cs]=Květina z Damašku Comment[da]=Damascus-blomst Comment[de]=Blume aus Damaskus Comment[el]=Το λουλούδι της Δαμασκού diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/wallpapers/pattern/plasma-wallpaper-pattern.desktop new/kdeplasma-addons-4.14.3/wallpapers/pattern/plasma-wallpaper-pattern.desktop --- old/kdeplasma-addons-4.14.2/wallpapers/pattern/plasma-wallpaper-pattern.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/wallpapers/pattern/plasma-wallpaper-pattern.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -57,7 +57,7 @@ Comment[bs]=Uklopivi uzorci Comment[ca]=Patrons en mosaic Comment[ca@valencia]=Patrons en mosaic -Comment[cs]=Dlaždicovatelné vzorky +Comment[cs]=Vzorky jež lze použít do dlaždic Comment[da]=Mønstre der kan lægges som fliser Comment[de]=Muster als Kacheln angeordnet Comment[el]=Μωσαϊκά μοτίβα diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.14.2/wallpapers/qmlwallpapers/wallpapers/animals/metadata.desktop new/kdeplasma-addons-4.14.3/wallpapers/qmlwallpapers/wallpapers/animals/metadata.desktop --- old/kdeplasma-addons-4.14.2/wallpapers/qmlwallpapers/wallpapers/animals/metadata.desktop 2014-10-09 19:06:15.000000000 +0200 +++ new/kdeplasma-addons-4.14.3/wallpapers/qmlwallpapers/wallpapers/animals/metadata.desktop 2014-10-25 09:17:51.000000000 +0200 @@ -45,6 +45,7 @@ Comment[bs]=Nisam siguran je li slatko ili samo čudno Comment[ca]=No se sap si és bonic o només setciències Comment[ca@valencia]=No se sap si és bonic o només setciències +Comment[cs]=Nevím, jestli je to roztomilé nebo ujeté Comment[da]=Er det sødt eller bare nørdet? Comment[de]=Nett oder nur seltsam Comment[el]=Χαριτωμένο ή απλά βαρετό; ++++++ kimpanel-boo903556.diff ++++++ commit fb36fcd45045c3b8c69d07d22fa9c891e2dccb8d Author: Weng Xuetian <wen...@gmail.com> Date: Tue Nov 11 11:08:48 2014 -0500 don't install kimpanel.xml, ibus might pick panel randomly. diff --git a/applets/kimpanel/backend/ibus/CMakeLists.txt b/applets/kimpanel/backend/ibus/CMakeLists.txt index ec6637c..be413f7 100644 --- a/applets/kimpanel/backend/ibus/CMakeLists.txt +++ b/applets/kimpanel/backend/ibus/CMakeLists.txt @@ -28,7 +28,7 @@ if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND) target_link_libraries(kimpanel-ibus-panel ${IBUS_LIBRARIES} ${GLIB2_LIBRARIES} ${GIO_LIBRARIES} ${GOBJECT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY}) endif() install(TARGETS kimpanel-ibus-panel DESTINATION ${LIBEXEC_INSTALL_DIR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kimpanel.xml.in ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ibus/component) + # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kimpanel.xml.in ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml @ONLY) + # install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ibus/component) endif(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
