September 2020 - openSUSE Commits - openSUSE Mailing Lists

commit eekboard for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package eekboard for openSUSE:Factory checked in at 2020-09-29 19:01:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eekboard (Old) and /work/SRC/openSUSE:Factory/.eekboard.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eekboard" Tue Sep 29 19:01:38 2020 rev:6 rq:838158 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/eekboard/eekboard.changes 2013-01-31 14:45:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eekboard.new.4249/eekboard.changes 2020-09-29 19:01:59.169786809 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 05:34:45 UTC 2020 - Marguerite Su <i(a)marguerite.su> + +- fix libexecdir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eekboard.spec ++++++ --- /var/tmp/diff_new_pack.kTYuQv/_old 2020-09-29 19:02:00.473788393 +0200 +++ /var/tmp/diff_new_pack.kTYuQv/_new 2020-09-29 19:02:00.477788397 +0200 @@ -116,7 +116,7 @@ %{_bindir}/eekboard %{_bindir}/eekboard-server %{_libdir}/libeek*.so.* -/usr/lib/eekboard-setup +%{_libexecdir}/eekboard-setup %{_datadir}/applications/eekboard.desktop %{_datadir}/dbus-1 %{_datadir}/%{name}

1 0

commit kcm5-fcitx for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package kcm5-fcitx for openSUSE:Factory checked in at 2020-09-29 19:01:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcm5-fcitx" Tue Sep 29 19:01:31 2020 rev:12 rq:838151 version:0.5.6 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2020-02-22 19:08:31.962596953 +0100 +++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249/kcm5-fcitx.changes 2020-09-29 19:01:57.673784991 +0200 @@ -1,0 +2,8 @@ +Mon Sep 28 04:27:56 UTC 2020 - Marguerite Su <i(a)marguerite.su> + +- update version 0.5.6 + * [kcm] try qt5 wrapper before qt4 + * [kcm] use non neg value as role +- drop kcm5-fcitx-po.patch, no more kcm-fcitx + +------------------------------------------------------------------- Old: ---- kcm-fcitx-0.5.5.tar.xz kcm5-fcitx-po.patch New: ---- kcm-fcitx-0.5.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm5-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.X1VuM8/_old 2020-09-29 19:01:58.565786075 +0200 +++ /var/tmp/diff_new_pack.X1VuM8/_new 2020-09-29 19:01:58.565786075 +0200 @@ -18,7 +18,7 @@ %define pkgname kf5-kcm-fcitx Name: kcm5-fcitx -Version: 0.5.5 +Version: 0.5.6 Release: 0 Summary: KF5 control module for Fcitx License: GPL-2.0-or-later @@ -26,8 +26,6 @@ URL: http://github.com/fcitx/kcm-fcitx Source: http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz Source1: input-keyboard.svg -#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx -Patch0: %{name}-po.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx-devel @@ -94,7 +92,6 @@ %prep %setup -q -n kcm-fcitx-%{version} -%patch0 -p1 %build %cmake_kf5 -d build @@ -111,20 +108,19 @@ rsvg-convert -h $i -w $i %{SOURCE1} -o %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/devices/input-keyboard.png done -%find_lang kcm5_fcitx +%find_lang kcm_fcitx %{kf5_post_install} %post -n %{pkgname} -p /sbin/ldconfig %postun -n %{pkgname} -p /sbin/ldconfig -%files -n %{pkgname} -f kcm5_fcitx.lang +%files -n %{pkgname} -f kcm_fcitx.lang %defattr(-,root,root,-) -%config %{_sysconfdir}/xdg/fcitx-skin.knsrc %{_bindir}/kbd-layout-viewer %{_libdir}/qt5/plugins/kcm_fcitx.so %{_datadir}/kservices5/kcm_fcitx.desktop -%{_datadir}/kservices5/kbd-layout-viewer.desktop +%{_datadir}/applications/kbd-layout-viewer.desktop %files -n %{pkgname}-icons %defattr(-,root,root,-) ++++++ kcm-fcitx-0.5.5.tar.xz -> kcm-fcitx-0.5.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/CMakeLists.txt new/kcm-fcitx-0.5.6/CMakeLists.txt --- old/kcm-fcitx-0.5.5/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR) project(kcm-fcitx) -set(QT_MIN_VERSION "5.3.0") +set(QT_MIN_VERSION "5.11.0") find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(KDEInstallDirs) @@ -12,14 +12,13 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X11Extras) -find_package(KF5 REQUIRED COMPONENTS +find_package(KF5 5.64 REQUIRED COMPONENTS CoreAddons WidgetsAddons ConfigWidgets ItemViews I18n KIO - NewStuff ) find_package(FcitxQt5DBusAddons 1.1.0 REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/CMakeLists.txt new/kcm-fcitx-0.5.6/layout/CMakeLists.txt --- old/kcm-fcitx-0.5.5/layout/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -19,4 +19,4 @@ kbd-layout-viewer.desktop.in "${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop" - DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR}) + DESTINATION ${CMAKE_INSTALL_APPDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp --- old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -480,7 +480,7 @@ } } - qSort(keyboardItems.begin(), keyboardItems.end(), DrawingItemCompare()); + std::sort(keyboardItems.begin(), keyboardItems.end(), DrawingItemCompare()); } void KeyboardLayoutWidget::initColors() @@ -1168,14 +1168,14 @@ if (syms[BOTTOMLEFT] == syms[BOTTOMRIGHT] || syms[BOTTOMRIGHT].isNull()) { - syms[BOTTOMRIGHT] = QString::null; + syms[BOTTOMRIGHT] = QString(); end[BOTTOMLEFT] = BOTTOMRIGHT; end[BOTTOMRIGHT] = -1; } if (syms[TOPLEFT] == syms[TOPRIGHT] || syms[TOPRIGHT].isNull()) { - syms[TOPRIGHT] = QString::null; + syms[TOPRIGHT] = QString(); end[TOPLEFT] = TOPRIGHT; end[TOPRIGHT] = -1; } @@ -1184,13 +1184,13 @@ syms[TOPLEFT].isNull()) && ((end[BOTTOMLEFT] == BOTTOMLEFT && end[TOPLEFT] == TOPLEFT) || (end[BOTTOMLEFT] == BOTTOMRIGHT && end[TOPLEFT] == TOPRIGHT))) { - syms[TOPLEFT] = QString::null; + syms[TOPLEFT] = QString(); end[BOTTOMLEFT] = end[TOPLEFT]; end[TOPLEFT] = -1; } if (!syms[BOTTOMRIGHT].isNull() && (syms[BOTTOMRIGHT] == syms[TOPRIGHT] || (syms[TOPRIGHT].isNull() && end[TOPRIGHT] != -1))) { - syms[TOPRIGHT] = QString::null; + syms[TOPRIGHT] = QString(); end[BOTTOMRIGHT] = TOPRIGHT; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.h new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.h --- old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.h 2020-06-01 23:50:20.000000000 +0200 @@ -3,6 +3,7 @@ #ifndef KEYBOARDLAYOUTWIDGET_H #define KEYBOARDLAYOUTWIDGET_H +#include <QPainterPath> #include <QWidget> #include <QMap> #include <QAbstractNativeEventFilter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/CMakeLists.txt new/kcm-fcitx-0.5.6/po/CMakeLists.txt --- old/kcm-fcitx-0.5.5/po/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -1,5 +1,7 @@ -set(PO_LANGS de zh_CN zh_TW ja vi) -foreach(lang ${PO_LANGS}) - fcitx_translate_add_po_file("${lang}" "${lang}.po") +file(GLOB PO_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.po) + +foreach(po_file ${PO_FILES}) + string(REPLACE ".po" "" po_lang "${po_file}") + fcitx_translate_add_po_file("${po_lang}" "${po_file}") endforeach() fcitx_translate_set_pot_target(pot kcm_fcitx kcm_fcitx.pot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ca.po new/kcm-fcitx-0.5.6/po/ca.po --- old/kcm-fcitx-0.5.5/po/ca.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ca.po 2020-06-01 23:50:20.000000000 +0200 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Robert Antoni Buj Gelonch <rbuj(a)fedoraproject.org>, 2017 # Walter Garcia-Fontes <walter.garcia(a)upf.edu>, 2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-07-13 06:44+0000\n" -"Last-Translator: Walter Garcia-Fontes <walter.garcia(a)upf.edu>\n" +"PO-Revision-Date: 2017-12-20 05:52+0000\n" +"Last-Translator: Robert Antoni Buj Gelonch <rbuj(a)fedoraproject.org>\n" "Language-Team: Catalan (http://www.transifex.com/fcitx/fcitx/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,17 +72,17 @@ #: src/configwidget.cpp:450 #, kde-format msgid "Other" -msgstr "Altre" +msgstr "Altres" #: src/configwidget.cpp:560 src/impage.cpp:69 #, kde-format msgid "Other" -msgstr "Altre" +msgstr "Altres" #: src/erroroverlay.cpp:43 #, kde-format msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" -msgstr "No es pot connectar al fcitx per DBus, s'està executant el fcitx?" +msgstr "No es pot connectar a fcitx amb DBus, està fcitx en execució?" #: src/imconfigdialog.cpp:42 #, kde-format @@ -127,17 +128,17 @@ #: src/module.cpp:83 #, kde-format msgid "Fcitx Configuration Module" -msgstr "Mòdul de configuració del fcitx" +msgstr "Mòdul de configuració de fcitx" #: src/module.cpp:85 #, kde-format msgid "Configure Fcitx" -msgstr "Configura el fcitx" +msgstr "Configura fcitx" #: src/module.cpp:87 #, kde-format msgid "Copyright 2012 Xuetian Weng" -msgstr "Copyright 2012 Xuetian Weng" +msgstr "Drets d'autor (c) 2012 Xuetian Weng" #: src/module.cpp:91 #, kde-format @@ -182,7 +183,7 @@ #: src/skinpage.cpp:221 #, kde-format msgid "Other candidate" -msgstr "Una altra candidata" +msgstr "Altres candidats" #: src/skinpage.cpp:390 #, kde-format @@ -219,7 +220,7 @@ #: src/uipage.cpp:16 #, kde-format msgid "Cannot load currently used user interface info" -msgstr "No es pot carregar la informació d'interfície d'usuari usada actualment" +msgstr "No es pot carregar la informació de la interfície d'usuari utilitzada actualment" #: src/uipage.cpp:45 #, kde-format @@ -259,17 +260,17 @@ "Options listed here might be overridden by specific input method, usually " "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." -msgstr "Les opcions que es llisten aquí poden ser anul·lades per mètodes d'entrada específics, generalment incloent-hi el nombre de candidates, la drecera de teclat de pàgina prèvia i pàgina següent. Potser heu d'anar a la configuració del mètode d'entrada corresponent per canviar-les." +msgstr "Les opcions que es llisten aquí poden ser anul·lades per mètodes d'entrada específics, generalment incloent-hi el nombre de candidates, la drecera de teclat Re Pàg i Av Pàg. Potser heu d'anar a la configuració del mètode d'entrada corresponent per canviar-les." #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) msgid "Select &Font..." -msgstr "Seleccioneu el &tipus de lletra" +msgstr "Selecciona la &lletra..." #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) msgid "Keyboard layout to use when no input method active" -msgstr "Disposició de teclat a usar quan no hi ha cap mètode d'entrada actiu" +msgstr "Disposició de teclat que s'ha d'utilitzar quan no hi ha cap mètode d'entrada actiu" #. i18n: file: src/impage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, defaultLayoutButton) @@ -333,7 +334,7 @@ "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Notice:\n" "You need to use Classic UI to use skin function.</body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nNotice:\nHe d'usar la interfície d'usuari clàssica per usar la funció d'aparença.</body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nAvís:\nHeu d'utilitzar la interfície d'usuari clàssica per utilitzar la funció de l'aparença.</body></html>" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/da.po new/kcm-fcitx-0.5.6/po/da.po --- old/kcm-fcitx-0.5.5/po/da.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/da.po 2020-06-01 23:50:20.000000000 +0200 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# scootergrisen, 2017 +# scootergrisen, 2017,2019 +# scootergrisen, 2017,2019-2020 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-09-03 14:18+0000\n" +"PO-Revision-Date: 2020-04-04 07:42+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/fcitx/fcitx/language/da/)\n" "MIME-Version: 1.0\n" @@ -81,7 +82,7 @@ #: src/erroroverlay.cpp:43 #, kde-format msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" -msgstr "Kan ikke oprette forbindelse til Fcitx med DBus. Kører Fcitx?" +msgstr "Kan ikke oprette forbindelse til Fcitx med DBus - kører Fcitx?" #: src/imconfigdialog.cpp:42 #, kde-format @@ -167,7 +168,7 @@ #: src/module.cpp:129 #, kde-format msgid "Addon Config" -msgstr "Tilføjelse-konfiguration" +msgstr "Tilføjelseskonfiguration" #: src/module.cpp:178 #, kde-format @@ -194,7 +195,7 @@ msgid "" "User config doesn't exisits, do you want to open system file or copy system " "file to user file?" -msgstr "Brugerkonfigurationen findes ikke. Vil du åbne systemfilen eller kopiere systemfilen til brugerfilen?" +msgstr "Brugerkonfigurationen findes ikke - vil du åbne systemfilen eller kopiere systemfilen til brugerfilen?" #: src/subconfigwidget.cpp:231 #, kde-format @@ -204,7 +205,7 @@ #: src/subconfigwidget.cpp:232 #, kde-format msgid "Copy" -msgstr "Kopi" +msgstr "Kopiér" #: src/subconfigwidget.cpp:233 #, kde-format @@ -219,7 +220,7 @@ #: src/uipage.cpp:16 #, kde-format msgid "Cannot load currently used user interface info" -msgstr "Kan ikke indlæse nuværende brugte brugerfladeinfo" +msgstr "Kan ikke indlæse information om brugergrænseflade som bruges i øjeblikket" #: src/uipage.cpp:45 #, kde-format @@ -264,7 +265,7 @@ #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) msgid "Select &Font..." -msgstr "Vælg &skrifttype..." +msgstr "Vælg &skrifttype ..." #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) @@ -322,7 +323,7 @@ #. i18n: file: src/skinpage.ui:58 #. i18n: ectx: property (text), widget (QPushButton, installSkinButton) msgid "Get New &Skin..." -msgstr "Hent nyt &skin..." +msgstr "Hent nyt &skin ..." #. i18n: file: src/skinpage.ui:72 #. i18n: ectx: property (text), widget (QLabel, label) @@ -333,7 +334,7 @@ "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Notice:\n" "You need to use Classic UI to use skin function.</body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nNotice:\nDu skal bruge klassisk brugerflade for at bruge skin-funktion.</body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nBemærk:\nDu skal bruge klassisk brugerflade for at bruge skin-funktion.</body></html>" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/de.po new/kcm-fcitx-0.5.6/po/de.po --- old/kcm-fcitx-0.5.5/po/de.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/de.po 2020-06-01 23:50:20.000000000 +0200 @@ -5,15 +5,15 @@ # Translators: # csslayer <wengxt(a)gmail.com>, 2014 # mar well <m.wellendorf(a)gmx.de>, 2012-2013 -# mar well <m.wellendorf(a)gmx.de>, 2014,2017 +# mar well <m.wellendorf(a)gmx.de>, 2014,2017-2018 # csslayer <wengxt(a)gmail.com>, 2014 # csslayer <wengxt(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2017-07-28 04:02-0700\n" -"PO-Revision-Date: 2017-07-28 10:58+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2018-06-25 23:36+0000\n" "Last-Translator: mar well <m.wellendorf(a)gmx.de>\n" "Language-Team: German (http://www.transifex.com/fcitx/fcitx/language/de/)\n" "Language: de\n" @@ -258,10 +258,11 @@ "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." msgstr "" -"Die aufgelisteten Optionen werden möglicherweise wegen Einstellungen der " -"gewählten Eingabemethode außer Kraft gesetzt, wie Anzahl der Kandidaten, " -"Tasten für vorherige oder nächste Kandidaten. Diese Einstellungen müssen " -"möglicherweise in den Einstellungen der Eingabemethode festgelegt werden." +"Die aufgelisteten Optionen - z.B. Anzahl der Kandidaten, Tasten für " +"vorherige oder nächste Kandidaten - werden möglicherweise wegen " +"Einstellungen der gewählten Eingabemethode außer Kraft gesetzt. Diese " +"Einstellungen müssen dann in den Einstellungen der Eingabemethode festgelegt " +"werden." #: src/configwidget.cpp:560 src/impage.cpp:69 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ja.po new/kcm-fcitx-0.5.6/po/ja.po --- old/kcm-fcitx-0.5.5/po/ja.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ja.po 2020-06-01 23:50:20.000000000 +0200 @@ -5,15 +5,16 @@ # Translators: # しろう <>, 2013 # csslayer <wengxt(a)gmail.com>, 2014 +# あわしろいくや <ikunya(a)gmail.com>, 2017 # csslayer <wengxt(a)gmail.com>, 2014 # csslayer <wengxt(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2017-06-09 11:02-0700\n" -"PO-Revision-Date: 2017-06-09 17:50+0000\n" -"Last-Translator: csslayer <wengxt(a)gmail.com>\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-10-28 08:07+0000\n" +"Last-Translator: あわしろいくや <ikunya(a)gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/fcitx/fcitx/language/ja/)\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -25,7 +26,7 @@ #, kde-format msgctxt "%1 is language name, %2 is country name" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #. i18n: file: src/skinpage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, configureSkinButton) @@ -111,7 +112,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "作者" #. i18n: file: src/impage.ui:83 #. i18n: ectx: property (text), widget (QLabel, label) @@ -202,7 +203,7 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "キーボード <layout>" #: layout/main.cpp:74 #, kde-format @@ -212,12 +213,12 @@ #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "" +msgstr "キーボードレイアウト <group> (0-3)" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "" +msgstr "キーボードレイアウト <variant>" #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) @@ -349,7 +350,7 @@ #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "グループ" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" @@ -362,7 +363,7 @@ #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "" +msgstr "レイアウト" #: layout/main.cpp:48 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ko.po new/kcm-fcitx-0.5.6/po/ko.po --- old/kcm-fcitx-0.5.5/po/ko.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ko.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,13 +4,14 @@ # # Translators: # Bon Keun Seo <scobyseo(a)gmail.com>, 2017 +# MarongHappy <daemul72(a)gmail.com>, 2020 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-07-15 12:42+0000\n" -"Last-Translator: Bon Keun Seo <scobyseo(a)gmail.com>\n" +"PO-Revision-Date: 2020-03-24 16:55+0000\n" +"Last-Translator: MarongHappy <daemul72(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/fcitx/fcitx/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +22,12 @@ #: layout/main.cpp:37 #, kde-format msgid "A general keyboard layout viewer" -msgstr "일반 키보드 배열 보이기" +msgstr "일반 키보드 자판 보기도구" #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "키보드 배열 <그룹> (0-3)" +msgstr "키보드 자판 <그룹> (0-3)" #: layout/main.cpp:42 #, kde-format @@ -36,17 +37,17 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "키보드 <배열>" +msgstr "키보드 <자판>" #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "배열" +msgstr "자판" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "키보드 배열 <변형>" +msgstr "키보드 자판 <변형>" #: layout/main.cpp:48 #, kde-format @@ -56,7 +57,7 @@ #: layout/main.cpp:74 #, kde-format msgid "Keyboard Layout viewer" -msgstr "키보드 배열 보이기" +msgstr "키보드 자판 보기도구" #: src/addonselector.cpp:375 #, kde-format @@ -66,7 +67,7 @@ #: src/addonselector.cpp:382 src/configwidget.cpp:606 #, kde-format msgid "Show &Advance option" -msgstr "추가 설정 보이기(&A)" +msgstr "고급 옵션 표시(&A)" #: src/configwidget.cpp:450 #, kde-format @@ -86,7 +87,7 @@ #: src/imconfigdialog.cpp:42 #, kde-format msgid "Keyboard Layout:" -msgstr "키보드 배열:" +msgstr "키보드 자판:" #: src/imconfigdialog.cpp:47 #, kde-format @@ -127,7 +128,7 @@ #: src/module.cpp:83 #, kde-format msgid "Fcitx Configuration Module" -msgstr "Fcitx 설정 모듈" +msgstr "Fcitx 환경설정 모듈" #: src/module.cpp:85 #, kde-format @@ -209,7 +210,7 @@ #: src/subconfigwidget.cpp:233 #, kde-format msgid "View system" -msgstr "시스템 파일 보기" +msgstr "시스템 보기" #: src/subconfigwidget.cpp:245 #, kde-format @@ -224,15 +225,15 @@ #: src/uipage.cpp:45 #, kde-format msgid "No configuration options for %1." -msgstr "%1 에 대한 설정이 없음" +msgstr "%1 에 대한 환경설정이 없음" #: layout/kbd-layout-viewer.desktop.in:6 msgid "Keyboard layout viewer" -msgstr "키보드 배열 표시기" +msgstr "키보드 자판 보기도구" #: layout/kbd-layout-viewer.desktop.in:7 msgid "View keyboard layout" -msgstr "키보드 배열 보이기" +msgstr "키보드 자판 보기" #: layout/kbd-layout-viewer.desktop.in:9 msgid "keyboard;input;im" @@ -259,7 +260,7 @@ "Options listed here might be overridden by specific input method, usually " "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." -msgstr "표시된 옵션은 입력기에 의해 덮어씌워질 수 있습니다. 대체로 후보 개수, 이전 혹은 다음 페이지의 단축기 등이 해당됩니다. 그냥 당연한 거 같아요.해당 입력기의 설정 페이지에서 변경 가능합니다." +msgstr "표시된 옵션은 입력기에 의해 덮어씌워질 수 있습니다. 대체로 후보 개수, 이전 혹은 다음 페이지의 단축기 등이 해당됩니다. 그냥 당연한 거 같아요.해당 입력기의 환경설정 페이지에서 변경 가능합니다." #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) @@ -269,12 +270,12 @@ #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) msgid "Keyboard layout to use when no input method active" -msgstr "활성 입력기가 없을 때 사용할 키보드 배열" +msgstr "활성 입력기가 없을 때 사용할 키보드 자판" #. i18n: file: src/impage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, defaultLayoutButton) msgid "Select default keyboard layout" -msgstr "기본 키보드 배열 선택" +msgstr "기본 키보드 자판 선택" #. i18n: file: src/impage.ui:83 #. i18n: ectx: property (text), widget (QLabel, label) @@ -285,7 +286,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, #. onlyCurrentLanguageCheckBox) msgid "Only &Show Current Language" -msgstr "현재 언어만 보이기(&S)" +msgstr "현재 언어만 표시(&S)" #. i18n: file: src/impage.ui:176 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -297,12 +298,12 @@ msgid "" "The first input method will be inactive state. Usually you need to put " "Keyboard or Keyboard - layout name in the first place." -msgstr "첫 입력 방법이 비활성화 상태입니다. 대체로 키보드 또는 키보드 - 배열명 를 첫 항목으로 하여야 합니다." +msgstr "첫번째 입력기가 비활성화 상태입니다. 대체로 키보드 또는 키보드 - 자판명 을 첫 항목으로 하여야 합니다." #. i18n: file: src/impage.ui:292 #. i18n: ectx: property (text), widget (QLabel, label_3) msgid "Default keyboard layout:" -msgstr "기본 키보드 배열:" +msgstr "기본 키보드 자판:" #. i18n: file: src/impage.ui:302 #. i18n: ectx: property (text), widget (QLabel, label_4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ru.po new/kcm-fcitx-0.5.6/po/ru.po --- old/kcm-fcitx-0.5.5/po/ru.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ru.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,14 +4,14 @@ # # Translators: # TotalCaesar659 <x24cm5b8c54q6szxw(a)yandex.ru>, 2016 -# TotalCaesar659 <x24cm5b8c54q6szxw(a)yandex.ru>, 2016 +# TotalCaesar659 <x24cm5b8c54q6szxw(a)yandex.ru>, 2016-2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-06-09 17:50+0000\n" -"Last-Translator: csslayer <wengxt(a)gmail.com>\n" +"PO-Revision-Date: 2017-10-05 14:02+0000\n" +"Last-Translator: TotalCaesar659 <x24cm5b8c54q6szxw(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/fcitx/fcitx/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,32 +27,32 @@ #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "" +msgstr "Раскладка клавиатуры <group> (0-3)" #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "группа" #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "Клавиатура <layout>" #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "" +msgstr "раскладка" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "" +msgstr "Раскладка клавиатуры <variant>" #: layout/main.cpp:48 #, kde-format msgid "variant" -msgstr "" +msgstr "вариант" #: layout/main.cpp:74 #, kde-format @@ -118,7 +118,7 @@ #, kde-format msgctxt "%1 is language name, %2 is country name" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #: src/impage.cpp:481 #, kde-format @@ -148,7 +148,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "Автор" #: src/module.cpp:104 src/kcm_fcitx.desktop.in:11 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/tr.po new/kcm-fcitx-0.5.6/po/tr.po --- old/kcm-fcitx-0.5.5/po/tr.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/tr.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,7 +4,8 @@ # # Translators: # しろう <>, 2013 -# csslayer <wengxt(a)gmail.com>, 2014 +# abc Def <hdogan1974(a)gmail.com>, 2020 +# csslayer <wengxt(a)gmail.com>, 2014,2017 # Gökhan Kalayci <gkmediagokhan(a)gmail.com>, 2017 # csslayer <wengxt(a)gmail.com>, 2017 msgid "" @@ -12,8 +13,8 @@ "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-06-09 18:01+0000\n" -"Last-Translator: csslayer <wengxt(a)gmail.com>\n" +"PO-Revision-Date: 2020-05-09 22:00+0000\n" +"Last-Translator: abc Def <hdogan1974(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/fcitx/fcitx/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,12 +60,12 @@ #: layout/main.cpp:74 #, kde-format msgid "Keyboard Layout viewer" -msgstr "" +msgstr "Klavye Serilimi görüntüleyici" #: src/addonselector.cpp:375 #, kde-format msgid "Search Addons" -msgstr "" +msgstr "Eklentileri Ara" #: src/addonselector.cpp:382 src/configwidget.cpp:606 #, kde-format @@ -150,7 +151,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "Yazar" #: src/module.cpp:104 src/kcm_fcitx.desktop.in:11 #, kde-format @@ -235,7 +236,7 @@ #: layout/kbd-layout-viewer.desktop.in:7 msgid "View keyboard layout" -msgstr "" +msgstr "Klavye serilimini görüntüler" #: layout/kbd-layout-viewer.desktop.in:9 msgid "keyboard;input;im" @@ -243,7 +244,7 @@ #: src/kcm_fcitx.desktop.in:12 msgid "Configure Input Method" -msgstr "" +msgstr "Giriş Yöntemini Yapılandır" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/vi.po new/kcm-fcitx-0.5.6/po/vi.po --- old/kcm-fcitx-0.5.5/po/vi.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/vi.po 2020-06-01 23:50:20.000000000 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2017-06-09 11:02-0700\n" -"PO-Revision-Date: 2017-06-09 17:51+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-09-19 12:28+0000\n" "Last-Translator: csslayer <wengxt(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/fcitx/fcitx/language/" "vi/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/zh_CN.po new/kcm-fcitx-0.5.6/po/zh_CN.po --- old/kcm-fcitx-0.5.5/po/zh_CN.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/zh_CN.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,7 +4,7 @@ # # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012 -# csslayer <wengxt(a)gmail.com>, 2011,2014 +# csslayer <wengxt(a)gmail.com>, 2011,2014,2017 # marguerite su <i(a)marguerite.su>, 2014 # Ukyoi <ukyoi(a)msn.com>, 2011 # csslayer <wengxt(a)gmail.com>, 2014,2017 @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2017-06-09 11:13-0700\n" -"PO-Revision-Date: 2017-06-09 18:04+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-09-19 10:47+0000\n" "Last-Translator: csslayer <wengxt(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/fcitx/fcitx/" "language/zh_CN/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/zh_TW.po new/kcm-fcitx-0.5.6/po/zh_TW.po --- old/kcm-fcitx-0.5.5/po/zh_TW.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/zh_TW.po 2020-06-01 23:50:20.000000000 +0200 @@ -8,16 +8,17 @@ # csslayer <wengxt(a)gmail.com>, 2014 # PHLin <Cypressyew(a)gmail.com>, 2017 # Gerald Du <frozenmouse(a)gmail.com>, 2015 -# Jeff Huang <s8321414(a)gmail.com>, 2015 +# 黃柏諺 <s8321414(a)gmail.com>, 2015,2017 +# PHLin <Cypressyew(a)gmail.com>, 2017 # csslayer <wengxt(a)gmail.com>, 2014 # csslayer <wengxt(a)gmail.com>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2017-07-12 10:02-0700\n" -"PO-Revision-Date: 2017-07-12 16:38+0000\n" -"Last-Translator: PHLin <Cypressyew(a)gmail.com>\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-11-24 13:52+0000\n" +"Last-Translator: 黃柏諺 <s8321414(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/fcitx/fcitx/" "language/zh_TW/)\n" "Language: zh_TW\n" @@ -207,7 +208,7 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "鍵盤 <layout>" #: layout/main.cpp:74 #, kde-format @@ -355,7 +356,7 @@ #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "群組" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" @@ -373,4 +374,4 @@ #: layout/main.cpp:48 #, kde-format msgid "variant" -msgstr "" +msgstr "變體" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/CMakeLists.txt new/kcm-fcitx-0.5.6/src/CMakeLists.txt --- old/kcm-fcitx-0.5.5/src/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -40,7 +40,6 @@ KF5::I18n KF5::KIOCore KF5::KIOWidgets - KF5::NewStuff FcitxQt5::WidgetsAddons FcitxQt5::DBusAddons ${FCITX4_FCITX_UTILS_LIBRARIES} @@ -57,10 +56,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kcm_fcitx.desktop" DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR}) -message("GHNS DIR : ${CONFIG_INSTALL_DIR}") - -install(FILES fcitx-skin.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) - if(ENABLE_TEST) add_subdirectory(test) endif(ENABLE_TEST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/addonselector.cpp new/kcm-fcitx-0.5.6/src/addonselector.cpp --- old/kcm-fcitx-0.5.5/src/addonselector.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/addonselector.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -272,7 +272,7 @@ QFont font = titleFont(option.font); QFontMetrics fmTitle(font); - return QSize(fmTitle.width(index.model()->data(index, Qt::DisplayRole).toString()) + + return QSize(fmTitle.horizontalAdvance(index.model()->data(index, Qt::DisplayRole).toString()) + 0 + MARGIN * i + pushButton->sizeHint().width() * j, fmTitle.height() + option.fontMetrics.height() + MARGIN * 2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/addonselector_p.h new/kcm-fcitx-0.5.6/src/addonselector_p.h --- old/kcm-fcitx-0.5.5/src/addonselector_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/addonselector_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -87,10 +87,10 @@ AddonModel(AddonSelector::Private *addonSelector_d, QObject* parent = 0); virtual ~AddonModel(); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; void addAddon(FcitxAddon* addon); private: @@ -108,8 +108,8 @@ virtual ~ProxyModel(); protected: - virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - virtual bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const; + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override; + bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const override; private: AddonSelector::Private* addonSelector_d; @@ -124,16 +124,16 @@ AddonDelegate(AddonSelector::Private *addonSelector_d, QObject* parent = 0); virtual ~AddonDelegate(); - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; - virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override; + QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override; Q_SIGNALS: void changed(bool hasChanged); void configCommitted(const QByteArray& addonName); protected: - virtual QList< QWidget* > createItemWidgets(const QModelIndex &index) const; - virtual void updateItemWidgets(const QList< QWidget* > widgets, const QStyleOptionViewItem& option, const QPersistentModelIndex& index) const; + QList< QWidget* > createItemWidgets(const QModelIndex &index) const override; + void updateItemWidgets(const QList< QWidget* > widgets, const QStyleOptionViewItem& option, const QPersistentModelIndex& index) const override; private Q_SLOTS: void slotStateChanged(bool state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/erroroverlay.h new/kcm-fcitx-0.5.6/src/erroroverlay.h --- old/kcm-fcitx-0.5.5/src/erroroverlay.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/erroroverlay.h 2020-06-01 23:50:20.000000000 +0200 @@ -32,7 +32,7 @@ void onConnectStatusChanged(bool connected); protected: - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; private: void reposition(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/impage.cpp new/kcm-fcitx-0.5.6/src/impage.cpp --- old/kcm-fcitx-0.5.5/src/impage.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/impage.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -633,7 +633,7 @@ for (int i = 0; i < m_list.size(); i ++) { if (uniqueName == m_list[i].uniqueName()) { m_list[i].setEnabled(true); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, uniqueName); emit changed(); break; @@ -649,7 +649,7 @@ for (int i = 0; i < m_list.size(); i ++) { if (uniqueName == m_list[i].uniqueName()) { m_list[i].setEnabled(false); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, uniqueName); emit changed(); break; @@ -674,8 +674,8 @@ } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swap(curIMIdx, nextIMIdx); - qStableSort(m_list.begin(), m_list.end()); + m_list.swapItemsAt(curIMIdx, nextIMIdx); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, curIndex.data(FcitxIMUniqueNameRole).toString()); emit changed(); } @@ -720,8 +720,8 @@ } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swap(curIMIdx, nextIMIdx); - qStableSort(m_list.begin(), m_list.end()); + m_list.swapItemsAt(curIMIdx, nextIMIdx); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, curIndex.data(FcitxIMUniqueNameRole).toString()); emit changed(); } @@ -738,7 +738,7 @@ { if (Global::instance()->inputMethodProxy()) { m_list = Global::instance()->inputMethodProxy()->iMList(); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, QString()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/impage_p.h new/kcm-fcitx-0.5.6/src/impage_p.h --- old/kcm-fcitx-0.5.5/src/impage_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/impage_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -179,9 +179,9 @@ IMModel(QObject* parent = 0); virtual ~IMModel(); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; Q_SIGNALS: void select(QModelIndex index); public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/module.cpp new/kcm-fcitx-0.5.6/src/module.cpp --- old/kcm-fcitx-0.5.5/src/module.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/module.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -207,7 +207,7 @@ configDialog->setAttribute(Qt::WA_DeleteOnClose); configDialog->open(); } - m_arg = QString::null; + m_arg = QString(); } if (m_imPage) @@ -239,7 +239,7 @@ if (m_imPage) { m_imPage->defaults(); } - changed(); + markAsChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/module.h new/kcm-fcitx-0.5.6/src/module.h --- old/kcm-fcitx-0.5.5/src/module.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/module.h 2020-06-01 23:50:20.000000000 +0200 @@ -72,17 +72,17 @@ /** * Overloading the KCModule load() function. */ - void load(); + void load() override; /** * Overloading the KCModule save() function. */ - void save(); + void save() override; /** * Overloading the KCModule defaults() function. */ - void defaults(); + void defaults() override; FcitxAddon* findAddonByName(const QString& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.cpp new/kcm-fcitx-0.5.6/src/skinpage.cpp --- old/kcm-fcitx-0.5.5/src/skinpage.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -25,9 +25,6 @@ #include <QPointer> #include <QLineEdit> -// KDE -#include <KNS3/DownloadDialog> - // Fcitx #include <fcitx-config/xdg.h> @@ -167,7 +164,7 @@ endRemoveRows(); QStringList sortedList = list; - qSort(sortedList); + std::sort(sortedList.begin(), sortedList.end()); Q_FOREACH(const QString & im, sortedList) { beginInsertRows(QModelIndex(), m_skins.size(), m_skins.size()); @@ -254,8 +251,8 @@ else resizeHeight = skin.inputbar.iOutputPos; for (int i = 0; i < 2; i++) { - resizeWidth += metrics.width(numberStr[i]); - resizeWidth += metrics.width(candStr[i]); + resizeWidth += metrics.horizontalAdvance(numberStr[i]); + resizeWidth += metrics.horizontalAdvance(candStr[i]); }; int totalWidth = marginLeft + marginRight + resizeWidth; int totalHeight = marginTop + marginBottom + resizeHeight; @@ -286,23 +283,23 @@ QColor otherColor = ConvertColor(skin.inputbar.otherColor); textPainter.setPen(inputColor); - textPainter.drawText(marginLeft, inputPos, metrics.width(inputExample), fontHeight, Qt::AlignVCenter, inputExample); + textPainter.drawText(marginLeft, inputPos, metrics.horizontalAdvance(inputExample), fontHeight, Qt::AlignVCenter, inputExample); // Draw candidate number: textPainter.setPen(indexColor); for (int i = 0; i < 2; i++) { - textPainter.drawText(offset, outputPos, metrics.width(numberStr[i]), fontHeight, Qt::AlignVCenter, numberStr[i]); - offset = offset + metrics.width(numberStr[i]) + metrics.width(candStr[i]) + metrics.width(spaceStr); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(numberStr[i]), fontHeight, Qt::AlignVCenter, numberStr[i]); + offset = offset + metrics.horizontalAdvance(numberStr[i]) + metrics.horizontalAdvance(candStr[i]) + metrics.horizontalAdvance(spaceStr); } - offset = marginLeft + metrics.width(numberStr[0]); + offset = marginLeft + metrics.horizontalAdvance(numberStr[0]); textPainter.setPen(firstCandColor); - textPainter.drawText(offset, outputPos, metrics.width(candStr[0]), fontHeight, Qt::AlignVCenter, candStr[0]); - offset = offset + metrics.width(candStr[0]) + metrics.width(spaceStr) + metrics.width(numberStr[1]); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(candStr[0]), fontHeight, Qt::AlignVCenter, candStr[0]); + offset = offset + metrics.horizontalAdvance(candStr[0]) + metrics.horizontalAdvance(spaceStr) + metrics.horizontalAdvance(numberStr[1]); textPainter.setPen(otherColor); - textPainter.drawText(offset, outputPos, metrics.width(candStr[1]), fontHeight, Qt::AlignVCenter, candStr[1]); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(candStr[1]), fontHeight, Qt::AlignVCenter, candStr[1]); textPainter.end(); @@ -388,7 +385,7 @@ QFont inputFont(qApp->font()); QFontMetrics fm(inputFont); QString errmsg = i18n("Skin %1 Cannot be loaded").arg(skinName); - int w = fm.width(errmsg); + int w = fm.horizontalAdvance(errmsg); QPixmap destPixmap(w, fm.height()); destPixmap.fill(Qt::transparent); @@ -704,7 +701,7 @@ delete m_subConfig; m_subConfig = m_parser.getSubConfig("Skin"); - skinModel->setSkinList(m_subConfig->fileList().toList()); + skinModel->setSkinList(m_subConfig->fileList().values()); QString skinName = skinField->text(); @@ -824,7 +821,6 @@ { m_ui->setupUi(this); - m_ui->installSkinButton->setIcon(QIcon::fromTheme("get-hot-new-stuff")); d->configureSkinButton = m_ui->configureSkinButton; d->deleteSkinButton = m_ui->deleteSkinButton; @@ -836,7 +832,6 @@ d->skinView->setItemDelegate(d->skinDelegate); d->module = module; - connect(m_ui->installSkinButton, SIGNAL(clicked()), this, SLOT(installButtonClicked())); connect(d->deleteSkinButton, SIGNAL(clicked(bool)), d, SLOT(deleteSkin())); connect(d->configureSkinButton, SIGNAL(clicked(bool)), d, SLOT(configureSkin())); connect(d->skinView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), d, SLOT(currentSkinChanged())); @@ -873,15 +868,4 @@ } } -void SkinPage::installButtonClicked() -{ - QPointer<KNS3::DownloadDialog> dialog(new KNS3::DownloadDialog("fcitx-skin.knsrc")); - dialog->exec(); - foreach(const KNS3::Entry & e, dialog->changedEntries()) { - qDebug() << "Changed Entry: " << e.name(); - } - delete dialog; - load(); -} - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.h new/kcm-fcitx-0.5.6/src/skinpage.h --- old/kcm-fcitx-0.5.5/src/skinpage.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.h 2020-06-01 23:50:20.000000000 +0200 @@ -44,8 +44,6 @@ void save(); Q_SIGNALS: void changed(); -protected Q_SLOTS: - void installButtonClicked(); private: class Private; Module* m_module; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.ui new/kcm-fcitx-0.5.6/src/skinpage.ui --- old/kcm-fcitx-0.5.5/src/skinpage.ui 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.ui 2020-06-01 23:50:20.000000000 +0200 @@ -52,13 +52,6 @@ </property> </widget> </item> - <item> - <widget class="QPushButton" name="installSkinButton"> - <property name="text"> - <string>Get New &Skin...</string> - </property> - </widget> - </item> </layout> </item> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage_p.h new/kcm-fcitx-0.5.6/src/skinpage_p.h --- old/kcm-fcitx-0.5.5/src/skinpage_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -101,7 +101,7 @@ { enum { PixmapRole = 0x4532efd3, - PathRole = 0x8F213873 + PathRole = 0x3F213873 }; Q_OBJECT @@ -138,10 +138,10 @@ Q_OBJECT public: SkinModel(Private* d, QObject* parent = 0); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; void setSkinList(const QStringList& list); const QList<SkinInfo>& skinList() const; private: @@ -175,8 +175,8 @@ SkinDelegate(QObject* parent = 0); ~SkinDelegate(); - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; - virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override; + QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override; signals: void regeneratePreview(const QModelIndex& index, const QSize& size) const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/subconfig.cpp new/kcm-fcitx-0.5.6/src/subconfig.cpp --- old/kcm-fcitx-0.5.5/src/subconfig.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/subconfig.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -137,7 +137,7 @@ } QFileInfo info(program); if (!info.isExecutable()) - program = QString::null; + program = QString(); m_progam = program; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/subconfigwidget_p.h new/kcm-fcitx-0.5.6/src/subconfigwidget_p.h --- old/kcm-fcitx-0.5.5/src/subconfigwidget_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/subconfigwidget_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -41,9 +41,9 @@ public: ConfigFileItemModel(QObject* parent = 0); virtual ~ConfigFileItemModel(); - virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; + QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; void addConfigFile(ConfigFile* configfile); private: QList<ConfigFile*> m_files; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/verticalscrollarea.h new/kcm-fcitx-0.5.6/src/verticalscrollarea.h --- old/kcm-fcitx-0.5.5/src/verticalscrollarea.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/verticalscrollarea.h 2020-06-01 23:50:20.000000000 +0200 @@ -29,8 +29,8 @@ explicit VerticalScrollArea(QWidget* parent = 0); void setWidget(QWidget *widget); protected: - virtual bool eventFilter(QObject* o, QEvent* e); + bool eventFilter(QObject* o, QEvent* e) override; }; } -#endif // VERTICALSCROLLAREA_H \ No newline at end of file +#endif // VERTICALSCROLLAREA_H

1 0

commit ibus-rime for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package ibus-rime for openSUSE:Factory checked in at 2020-09-29 19:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-rime (Old) and /work/SRC/openSUSE:Factory/.ibus-rime.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-rime" Tue Sep 29 19:01:24 2020 rev:13 rq:838145 version:1.4.1~git20200712.33b2755 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-rime/ibus-rime.changes 2019-04-04 15:27:03.050889826 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-rime.new.4249/ibus-rime.changes 2020-09-29 19:01:51.117777027 +0200 @@ -1,0 +2,15 @@ +Mon Sep 28 00:52:42 UTC 2020 - i(a)marguerite.su + +- Update to version 1.4.1~git20200712.33b2755: + * fix(rime_engine): ignore keys with super modifier + * feat(ibus_rime.yaml): install config file for ibus-rime, set default UI style + * fix(logging): wrong log file name + * feat(rime_settings): add config options: style/preedit_style, style/cursor_type + * fix(rime_settings.h): compile with gcc 10 + * feat(plugin): dynamically load librime plugins read from `ibus_rime.yaml` (#73) + * chore(CHANGELOG.md): fix typo + * chore(release): 1.4.0 :tada: + * chore(README.md, rime.xml): use https link + * fix(rime_main.cc): deploy ibus_rime.yaml on maintenance + +------------------------------------------------------------------- Old: ---- ibus-rime-1.4.1~git20190223.c80c02f.tar.xz New: ---- ibus-rime-1.4.1~git20200712.33b2755.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-rime.spec ++++++ --- /var/tmp/diff_new_pack.I5TqOl/_old 2020-09-29 19:01:51.901777980 +0200 +++ /var/tmp/diff_new_pack.I5TqOl/_new 2020-09-29 19:01:51.901777980 +0200 @@ -1,7 +1,7 @@ # # spec file for package ibus-rime # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: ibus-rime -Version: 1.4.1~git20190223.c80c02f +Version: 1.4.1~git20200712.33b2755 Release: 0 Summary: Rime for Linux/IBus License: GPL-3.0-or-later Group: System/I18n/Chinese -Url: https://github.com/rime/ibus-rime +URL: https://github.com/rime/ibus-rime Source: %{name}-%{version}.tar.xz %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -36,7 +36,6 @@ BuildRequires: libkyotocabinet-devel BuildRequires: libnotify-devel BuildRequires: librime-devel >= 1.0 -BuildRequires: opencc BuildRequires: opencc-devel Requires: rime @@ -55,8 +54,10 @@ %files %defattr(-,root,root) %doc README.md +%dir %{_datadir}/rime-data %{_ibus_componentdir}/rime.xml %{_datadir}/ibus-rime/ -%{_libexecdir}/ibus-rime/ +%{_datadir}/rime-data/ibus_rime.yaml +%{_prefix}/lib/ibus-rime/ %changelog ++++++ ibus-rime-1.4.1~git20190223.c80c02f.tar.xz -> ibus-rime-1.4.1~git20200712.33b2755.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/Makefile new/ibus-rime-1.4.1~git20200712.33b2755/Makefile --- old/ibus-rime-1.4.1~git20190223.c80c02f/Makefile 2019-02-23 05:01:20.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/Makefile 2020-07-12 09:30:51.000000000 +0200 @@ -28,11 +28,14 @@ install -m 755 -d $(sharedir)/ibus-rime install -m 755 -d $(sharedir)/ibus-rime/icons install -m 644 -t $(sharedir)/ibus-rime/icons/ icons/*.png + install -m 755 -d $(sharedir)/rime-data + install -m 644 -t $(sharedir)/rime-data/ ibus_rime.yaml uninstall: rm $(sharedir)/ibus/component/rime.xml rm -R $(sharedir)/ibus-rime rm -R $(libexecdir)/ibus-rime + rm $(sharedir)/rime-data/ibus_rime.yaml clean: if [ -e $(builddir) ]; then rm -R $(builddir); fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/ibus_rime.yaml new/ibus-rime-1.4.1~git20200712.33b2755/ibus_rime.yaml --- old/ibus-rime-1.4.1~git20190223.c80c02f/ibus_rime.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/ibus_rime.yaml 2020-07-12 09:30:51.000000000 +0200 @@ -0,0 +1,28 @@ +# ibus-rime configuration + +config_version: '1.0' + +style: + # candidate list orientation (false|true). + horizontal: false + + # embed preedit text in the input field (false|true). + inline_preedit: true + + # `preedit_style` specifies what to display as inline preedit text. + # display inline the input under conversion. + preedit_style: composition + # preview the converted text. + # preedit_style: preview + + # `cursor_type` specifies where the inline cursor is located. + # inline cursor is at the insertion point. + cursor_type: insert + # inline cursor is at the beginning of text under conversion. + # cursor_type: select + + # built-in color schemes for highlighting the portion of inline preedit text + # that needs focus. (null|aqua|azure|ink|luna) + # by default highlighting color is not used. + color_scheme: ~ + # color_scheme: aqua diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/rime_engine.c new/ibus-rime-1.4.1~git20200712.33b2755/rime_engine.c --- old/ibus-rime-1.4.1~git20190223.c80c02f/rime_engine.c 2019-02-23 05:01:20.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/rime_engine.c 2020-07-12 09:30:51.000000000 +0200 @@ -90,7 +90,11 @@ ibus_rime_create_session (IBusRimeEngine *rime_engine) { rime_engine->session_id = rime_api->create_session(); - rime_api->set_option(rime_engine->session_id, "soft_cursor", True); + Bool inline_caret = + g_ibus_rime_settings.embed_preedit_text && + g_ibus_rime_settings.preedit_style == PREEDIT_STYLE_COMPOSITION && + g_ibus_rime_settings.cursor_type == CURSOR_TYPE_INSERT; + rime_api->set_option(rime_engine->session_id, "soft_cursor", !inline_caret); } static void @@ -302,60 +306,102 @@ } IBusText* inline_text = NULL; - IBusText* text = NULL; + IBusText* auxiliary_text = NULL; guint inline_cursor_pos = 0; - int offset = 0; - gboolean inline_preedit = - g_ibus_rime_settings.embed_preedit_text && context.commit_text_preview; - gboolean highlighting = + int preedit_offset = 0; + + const gboolean has_highlighted_span = (context.composition.sel_start < context.composition.sel_end); - if (inline_preedit) { + + // display preview text inline, if the commit_text_preview API is supported. + if (g_ibus_rime_settings.embed_preedit_text && + g_ibus_rime_settings.preedit_style == PREEDIT_STYLE_PREVIEW && + RIME_STRUCT_HAS_MEMBER(context, context.commit_text_preview) && + context.commit_text_preview) { inline_text = ibus_text_new_from_string(context.commit_text_preview); - guint inline_text_len = ibus_text_get_length(inline_text); - inline_cursor_pos = inline_text_len; + const guint inline_text_len = ibus_text_get_length(inline_text); + inline_cursor_pos = + g_ibus_rime_settings.cursor_type == CURSOR_TYPE_SELECT ? + g_utf8_strlen(context.composition.preedit, + context.composition.sel_start) : + inline_text_len; inline_text->attrs = ibus_attr_list_new(); ibus_attr_list_append( inline_text->attrs, ibus_attr_underline_new( IBUS_ATTR_UNDERLINE_SINGLE, 0, inline_text_len)); - // hide converted range of auxiliary text if preedit is inline - if (highlighting) { - offset = context.composition.sel_start; - glong highlighting_start = - g_utf8_strlen(context.composition.preedit, offset); + // show the unconverted range of preedit text as auxiliary text + if (has_highlighted_span) { + preedit_offset = context.composition.sel_start; + if (g_ibus_rime_settings.color_scheme) { + const guint start = g_utf8_strlen( + context.composition.preedit, context.composition.sel_start); + const guint end = inline_text_len; + ibus_attr_list_append( + inline_text->attrs, + ibus_attr_foreground_new( + g_ibus_rime_settings.color_scheme->text_color, start, end)); + ibus_attr_list_append( + inline_text->attrs, + ibus_attr_background_new( + g_ibus_rime_settings.color_scheme->back_color, start, end)); + } + } else { + // hide auxiliary text + preedit_offset = context.composition.length; + } + } + // display preedit text inline + else if (g_ibus_rime_settings.embed_preedit_text && + g_ibus_rime_settings.preedit_style == PREEDIT_STYLE_COMPOSITION) { + inline_text = ibus_text_new_from_string(context.composition.preedit); + const guint inline_text_len = ibus_text_get_length(inline_text); + inline_cursor_pos = + g_ibus_rime_settings.cursor_type == CURSOR_TYPE_SELECT ? + g_utf8_strlen(context.composition.preedit, + context.composition.sel_start) : + g_utf8_strlen(context.composition.preedit, + context.composition.cursor_pos); + inline_text->attrs = ibus_attr_list_new(); + ibus_attr_list_append( + inline_text->attrs, + ibus_attr_underline_new( + IBUS_ATTR_UNDERLINE_SINGLE, 0, inline_text_len)); + if (has_highlighted_span && g_ibus_rime_settings.color_scheme) { + const guint start = g_utf8_strlen( + context.composition.preedit, context.composition.sel_start); + const glong end = g_utf8_strlen( + context.composition.preedit, context.composition.sel_end); ibus_attr_list_append( inline_text->attrs, ibus_attr_foreground_new( - g_ibus_rime_settings.color_scheme->text_color, - highlighting_start, - inline_text_len)); + g_ibus_rime_settings.color_scheme->text_color, start, end)); ibus_attr_list_append( inline_text->attrs, ibus_attr_background_new( - g_ibus_rime_settings.color_scheme->back_color, - highlighting_start, - inline_text_len)); - } - else { - offset = context.composition.length; // hide auxiliary text + g_ibus_rime_settings.color_scheme->back_color, start, end)); } + preedit_offset = context.composition.length; } - if (offset < context.composition.length) { - const char* preedit = context.composition.preedit + offset; - text = ibus_text_new_from_string(preedit); - glong preedit_len = g_utf8_strlen(preedit, -1); - glong cursor_pos = - g_utf8_strlen(preedit, context.composition.cursor_pos - offset); - text->attrs = ibus_attr_list_new(); - if (highlighting) { - glong start = g_utf8_strlen( - preedit,context.composition.sel_start - offset); - glong end = g_utf8_strlen(preedit, context.composition.sel_end - offset); + + // calculate auxiliary text + if (preedit_offset < context.composition.length) { + const char* preedit = context.composition.preedit + preedit_offset; + auxiliary_text = ibus_text_new_from_string(preedit); + // glong preedit_len = g_utf8_strlen(preedit, -1); + // glong cursor_pos = g_utf8_strlen( + // preedit, context.composition.cursor_pos - preedit_offset); + if (has_highlighted_span) { + auxiliary_text->attrs = ibus_attr_list_new(); + const glong start = g_utf8_strlen( + preedit, context.composition.sel_start - preedit_offset); + const glong end = g_utf8_strlen( + preedit, context.composition.sel_end - preedit_offset); ibus_attr_list_append( - text->attrs, + auxiliary_text->attrs, ibus_attr_foreground_new(RIME_COLOR_BLACK, start, end)); ibus_attr_list_append( - text->attrs, + auxiliary_text->attrs, ibus_attr_background_new(RIME_COLOR_LIGHT, start, end)); } } @@ -363,14 +409,13 @@ if (inline_text) { ibus_engine_update_preedit_text( (IBusEngine *)rime_engine, inline_text, inline_cursor_pos, TRUE); - } - else { + } else { ibus_engine_hide_preedit_text((IBusEngine *)rime_engine); } - if (text) { - ibus_engine_update_auxiliary_text((IBusEngine *)rime_engine, text, TRUE); - } - else { + if (auxiliary_text) { + ibus_engine_update_auxiliary_text( + (IBusEngine *)rime_engine, auxiliary_text, TRUE); + } else { ibus_engine_hide_auxiliary_text((IBusEngine *)rime_engine); } @@ -458,10 +503,15 @@ guint keycode, guint modifiers) { + // ignore super key + if (modifiers & IBUS_SUPER_MASK) { + return FALSE; + } + IBusRimeEngine *rime_engine = (IBusRimeEngine *)engine; modifiers &= (IBUS_RELEASE_MASK | IBUS_LOCK_MASK | IBUS_SHIFT_MASK | - IBUS_CONTROL_MASK | IBUS_MOD1_MASK | IBUS_SUPER_MASK); + IBUS_CONTROL_MASK | IBUS_MOD1_MASK); if (!rime_api->find_session(rime_engine->session_id)) { ibus_rime_create_session(rime_engine); @@ -481,9 +531,10 @@ guint prop_state) { extern void ibus_rime_start(gboolean full_check); + extern void ibus_rime_stop(); IBusRimeEngine *rime_engine = (IBusRimeEngine *)engine; if (!strcmp("deploy", prop_name)) { - rime_api->finalize(); + ibus_rime_stop(); ibus_rime_start(TRUE); ibus_rime_engine_update(rime_engine); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/rime_main.c new/ibus-rime-1.4.1~git20200712.33b2755/rime_main.c --- old/ibus-rime-1.4.1~git20190223.c80c02f/rime_main.c 2019-02-23 05:01:20.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/rime_main.c 2020-07-12 09:30:51.000000000 +0200 @@ -64,6 +64,117 @@ } } +static int n_plugin_handles = 0; +static void **plugin_handles; +static const char **plugin_modules; + +static void load_plugins(RimeConfig *config) { + void **new_plugin_handles; + + // reserve space new plugins + int n = rime_api->config_list_size(config, "plugins"); + new_plugin_handles = realloc(plugin_handles, sizeof(void *) * (n_plugin_handles + n)); + if (!new_plugin_handles) { + return; + } else { + plugin_handles = new_plugin_handles; + } + + RimeConfigIterator iter; + n = n_plugin_handles; + if (rime_api->config_begin_list(&iter, config, "plugins")) { + while(rime_api->config_next(&iter)) { + const char *file = rime_api->config_get_cstring(config, iter.path); + if (file) { + plugin_handles[n] = dlopen(file, RTLD_LAZY | RTLD_GLOBAL); + if (plugin_handles[n]) { + int k; + for (k = 0; k < n_plugin_handles; k++) + if (plugin_handles[k] == plugin_handles[n]) { + // already in plugin_handles, close + dlclose(plugin_handles[n]); + break; + } + if (k == n_plugin_handles) + n++; + } + } + } + rime_api->config_end(&iter); + } + n_plugin_handles = n; +} + +static void load_modules(RimeConfig *config) { + int m = rime_api->config_list_size(config, "modules"); + if (m == 0) { + return; + } + + plugin_modules = malloc(sizeof(const char *) * (m + 2)); + if (!plugin_modules) { + return; + } + + RimeConfigIterator iter; + m = 1; + plugin_modules[0] = "default"; + if (rime_api->config_begin_list(&iter, config, "modules")) { + while(rime_api->config_next(&iter)) { + const char *mod = rime_api->config_get_cstring(config, iter.path); + if (mod) { + plugin_modules[m] = strdup(mod); + m++; + } + } + rime_api->config_end(&iter); + } + plugin_modules[m] = NULL; +} + +static void load_plugins_modules(const char *config_file) +{ + RimeConfig config = {0}; + + if (!rime_api->config_open(config_file, &config)) { + g_error("error loading settings for %s\n", config_file); + return; + } + + load_plugins(&config); + load_modules(&config); + + rime_api->config_close(&config); +} + +static void unload_plugins() { + if (plugin_handles) { + for (int i = 0; i < n_plugin_handles; i++) { + dlclose(plugin_handles[i]); + } + free(plugin_handles); + plugin_handles = NULL; + } +} + +static void unload_modules() { + if (plugin_modules) { + for (int i = 1; plugin_modules[i]; i++) { + free((void *) plugin_modules[i]); + } + free(plugin_modules); + plugin_modules = NULL; + } +} + +static void fill_traits(RimeTraits *traits) { + traits->shared_data_dir = IBUS_RIME_SHARED_DATA_DIR; + traits->distribution_name = DISTRIBUTION_NAME; + traits->distribution_code_name = DISTRIBUTION_CODE_NAME; + traits->distribution_version = DISTRIBUTION_VERSION; + traits->app_name = "rime.ibus"; +} + void ibus_rime_start(gboolean full_check) { char user_data_dir[512] = {0}; char old_user_data_dir[512] = {0}; @@ -79,29 +190,30 @@ } rime_api->set_notification_handler(notification_handler, NULL); RIME_STRUCT(RimeTraits, ibus_rime_traits); - ibus_rime_traits.shared_data_dir = IBUS_RIME_SHARED_DATA_DIR; + fill_traits(&ibus_rime_traits); ibus_rime_traits.user_data_dir = user_data_dir; - ibus_rime_traits.distribution_name = DISTRIBUTION_NAME; - ibus_rime_traits.distribution_code_name = DISTRIBUTION_CODE_NAME; - ibus_rime_traits.distribution_version = DISTRIBUTION_VERSION; - ibus_rime_traits.app_name = "ibus"; - static RIME_MODULE_LIST(ibus_rime_modules, "default", "legacy"); - ibus_rime_traits.modules = ibus_rime_modules; + + // first initialization (without extra modules) rime_api->initialize(&ibus_rime_traits); if (rime_api->start_maintenance((Bool)full_check)) { // update frontend config rime_api->deploy_config_file("ibus_rime.yaml", "config_version"); } -} -static void* legacy_module_handle = NULL; + // load plugins & modules + load_plugins_modules("ibus_rime"); -static void load_plugin_modules() { - legacy_module_handle = dlopen("librime-legacy.so", RTLD_LAZY); + // reinitialize if we have extra modules + if (plugin_modules) { + rime_api->finalize(); + ibus_rime_traits.modules = plugin_modules; + rime_api->initialize(&ibus_rime_traits); + } } -static void unload_plugin_modules() { - dlclose(legacy_module_handle); +void ibus_rime_stop() { + rime_api->finalize(); + unload_modules(); } static void ibus_disconnect_cb(IBusBus *bus, gpointer user_data) { @@ -135,15 +247,18 @@ exit(1); } - load_plugin_modules(); + RIME_STRUCT(RimeTraits, ibus_rime_traits); + fill_traits(&ibus_rime_traits); + rime_api->setup(&ibus_rime_traits); + gboolean full_check = FALSE; ibus_rime_start(full_check); ibus_rime_load_settings(); ibus_main(); - rime_api->finalize(); - unload_plugin_modules(); + ibus_rime_stop(); + unload_plugins(); notify_uninit(); g_object_unref(factory); @@ -152,7 +267,7 @@ static void sigterm_cb(int sig) { if (rime_api) { - rime_api->finalize(); + ibus_rime_stop(); } notify_uninit(); exit(EXIT_FAILURE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/rime_settings.c new/ibus-rime-1.4.1~git20200712.33b2755/rime_settings.c --- old/ibus-rime-1.4.1~git20190223.c80c02f/rime_settings.c 2019-02-23 05:01:20.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/rime_settings.c 2020-07-12 09:30:51.000000000 +0200 @@ -14,9 +14,11 @@ }; static struct IBusRimeSettings ibus_rime_settings_default = { - FALSE, - IBUS_ORIENTATION_SYSTEM, - &preset_color_schemes[0], + .embed_preedit_text = TRUE, + .preedit_style = PREEDIT_STYLE_COMPOSITION, + .cursor_type = CURSOR_TYPE_INSERT, + .lookup_table_orientation = IBUS_ORIENTATION_SYSTEM, + .color_scheme = NULL, }; struct IBusRimeSettings g_ibus_rime_settings; @@ -34,7 +36,7 @@ } } // fallback to default - settings->color_scheme = &preset_color_schemes[0]; + settings->color_scheme = NULL; } void @@ -54,6 +56,26 @@ g_ibus_rime_settings.embed_preedit_text = !!inline_preedit; } + const char* preedit_style_str = + rime_api->config_get_cstring(&config, "style/preedit_style"); + if(preedit_style_str) { + if(!strcmp(preedit_style_str, "composition")) { + g_ibus_rime_settings.preedit_style = PREEDIT_STYLE_COMPOSITION; + } else if(!strcmp(preedit_style_str, "preview")) { + g_ibus_rime_settings.preedit_style = PREEDIT_STYLE_PREVIEW; + } + } + + const char* cursor_type_str = + rime_api->config_get_cstring(&config, "style/cursor_type"); + if (cursor_type_str) { + if (!strcmp(cursor_type_str, "insert")) { + g_ibus_rime_settings.cursor_type = CURSOR_TYPE_INSERT; + } else if (!strcmp(cursor_type_str, "select")) { + g_ibus_rime_settings.cursor_type = CURSOR_TYPE_SELECT; + } + } + Bool horizontal = False; if (rime_api->config_get_bool(&config, "style/horizontal", &horizontal)) { g_ibus_rime_settings.lookup_table_orientation = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20190223.c80c02f/rime_settings.h new/ibus-rime-1.4.1~git20200712.33b2755/rime_settings.h --- old/ibus-rime-1.4.1~git20190223.c80c02f/rime_settings.h 2019-02-23 05:01:20.000000000 +0100 +++ new/ibus-rime-1.4.1~git20200712.33b2755/rime_settings.h 2020-07-12 09:30:51.000000000 +0200 @@ -8,6 +8,16 @@ #define RIME_COLOR_DARK 0x606060 #define RIME_COLOR_BLACK 0x000000 +enum PreeditStyle { + PREEDIT_STYLE_COMPOSITION, + PREEDIT_STYLE_PREVIEW, +}; + +enum CursorType { + CURSOR_TYPE_INSERT, + CURSOR_TYPE_SELECT, +}; + struct ColorSchemeDefinition { const char* color_scheme_id; int text_color; @@ -16,11 +26,13 @@ struct IBusRimeSettings { gboolean embed_preedit_text; + gint preedit_style; + gint cursor_type; gint lookup_table_orientation; struct ColorSchemeDefinition* color_scheme; }; -struct IBusRimeSettings g_ibus_rime_settings; +extern struct IBusRimeSettings g_ibus_rime_settings; void ibus_rime_load_settings();

1 0

commit libkkc for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package libkkc for openSUSE:Factory checked in at 2020-09-29 19:01:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkkc (Old) and /work/SRC/openSUSE:Factory/.libkkc.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkkc" Tue Sep 29 19:01:16 2020 rev:12 rq:838143 version:0.3.6~git20200818.e33e7fb Changes: -------- --- /work/SRC/openSUSE:Factory/libkkc/libkkc.changes 2020-02-18 15:18:21.908664436 +0100 +++ /work/SRC/openSUSE:Factory/.libkkc.new.4249/libkkc.changes 2020-09-29 19:01:41.993765944 +0200 @@ -1,0 +2,15 @@ +Mon Sep 28 00:49:40 UTC 2020 - i(a)marguerite.su + +- Update to version 0.3.6~git20200818.e33e7fb: + * travis: Enable SYS_PTRACE in Docker + * build: Bump valadoc pkgconfig name + * Update README.md + * travis: Use python3 in coverage build + * build: Bump valadoc pkgconfig name + * build: Declare creation methods of abstract classes as protected + * build: Enable python3 + * README.md: Link to the API references + * travis: Deploy documentation + * user-sentence-dictionary: Fix memleak + +------------------------------------------------------------------- Old: ---- libkkc-0.3.5+git20190809.b2e5a15.tar.xz New: ---- libkkc-0.3.6~git20200818.e33e7fb.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkkc.spec ++++++ --- /var/tmp/diff_new_pack.HWQY8N/_old 2020-09-29 19:01:43.781768116 +0200 +++ /var/tmp/diff_new_pack.HWQY8N/_new 2020-09-29 19:01:43.785768120 +0200 @@ -1,7 +1,7 @@ # # spec file for package libkkc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,15 @@ %define soname 2 -%define data_version 0.2.7 Name: libkkc -Version: 0.3.5+git20190809.b2e5a15 +Version: 0.3.6~git20200818.e33e7fb Release: 0 Summary: Japanese Kana-string to Kana-Kanji-mixed-string converter License: GPL-3.0-only Group: System/I18n/Japanese -Url: https://github.com/ueno/libkkc +URL: https://github.com/ueno/libkkc Source: %{name}-%{version}.tar.xz -# data: https://bitbucket.org/libkkc/libkkc-data/downloads/ -Source1: %{name}-data-%{data_version}.tar.xz +Source1: https://github.com/ueno/libkkc/releases/download/v0.3.5/libkkc-data-0.2.7.t… Source99: baselibs.conf # PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - use correct shared library for typelib generation Patch0: libkkc-typelib-sharelib.patch @@ -111,8 +109,11 @@ # make data cp -r %{SOURCE1} . -tar -xf %{name}-data-%{data_version}.tar.xz -pushd %{name}-data-%{data_version} +tar -xf %{name}-data-0.2.7.tar.xz +OLD=$(pwd) +pushd %{name}-data-0.2.7 +cp -r ${OLD}/data/templates/libkkc-data/tools/genfilter.py tools/ +cp -r ${OLD}/data/templates/libkkc-data/tools/sortlm.py tools/ %configure # %{?_smp_mflags} cost too much memory make @@ -124,7 +125,7 @@ find %{buildroot}%{_libdir} -name "*.la" -delete # install data -pushd %{name}-data-%{data_version} +pushd %{name}-data-0.2.7 make DESTDIR=%{buildroot} install %{?_smp_mflags} popd ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HWQY8N/_old 2020-09-29 19:01:43.825768169 +0200 +++ /var/tmp/diff_new_pack.HWQY8N/_new 2020-09-29 19:01:43.829768174 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/ueno/libkkc</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">0.3.5+git%cd.%h</param> + <param name="versionformat">0.3.6~git%cd.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service>

1 0

commit marisa for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package marisa for openSUSE:Factory checked in at 2020-09-29 19:01:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marisa (Old) and /work/SRC/openSUSE:Factory/.marisa.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marisa" Tue Sep 29 19:01:12 2020 rev:7 rq:838099 version:0.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/marisa/marisa.changes 2020-08-16 20:33:27.774303430 +0200 +++ /work/SRC/openSUSE:Factory/.marisa.new.4249/marisa.changes 2020-09-29 19:01:38.677761915 +0200 @@ -1,0 +2,7 @@ +Sun Sep 27 04:25:30 UTC 2020 - Marguerite Su <i(a)marguerite.su> + +- update version 0.2.6 + * see git commits +- enable python3 binding again + +------------------------------------------------------------------- Old: ---- marisa-0.2.4.tar.gz New: ---- marisa-trie-0.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marisa.spec ++++++ --- /var/tmp/diff_new_pack.NeoLiz/_old 2020-09-29 19:01:39.269762634 +0200 +++ /var/tmp/diff_new_pack.NeoLiz/_new 2020-09-29 19:01:39.273762639 +0200 @@ -16,31 +16,20 @@ # -%define with_python2 0%{?suse_version} < 1550 -%{!?py_ver: %global py_ver %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - -%if 0%{?sles_version} < 1110 -%{!?rb_arch: %global rb_arch %(/usr/bin/ruby -e 'print RUBY_PLATFORUM')} -%{!?rb_ver: %global rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/,"")')} -%{!?rb_vendorarch: %global rb_vendorarch %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}} -%endif - Name: marisa -Version: 0.2.4 +Version: 0.2.6 Release: 0 Summary: Matching Algorithm with Recursively Implemented StorAge License: LGPL-2.1-or-later OR BSD-2-Clause Group: System/I18n/Japanese -URL: https://code.google.com/p/marisa-trie/ -Source: https://marisa-trie.googlecode.com/files/%{name}-%{version}.tar.gz +URL: https://github.com/s-yata/marisa-trie/ +Source: https://github.com/s-yata/marisa-trie/archive/v%{version}/%{name}-trie-%{ve… Source99: baselibs.conf BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: perl BuildRequires: pkg-config -%if %with_python2 -BuildRequires: python-devel -%endif +BuildRequires: python3-devel BuildRequires: ruby-devel BuildRequires: swig Provides: marisa-trie = %{version} @@ -68,25 +57,18 @@ Summary: Perl bindings for %{name} Group: Development/Libraries/Perl Requires: %{name} = %{version} -%if 0%{?suse_version} < 1140 -Requires: perl = %{perl_version} -%else %{perl_requires} -%endif %description -n perl-marisa Perl bindings for %{name}. -%if %with_python2 -%package -n python-marisa -Summary: Python bindings for %{name} +%package -n python3-marisa +Summary: Python3 bindings for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} -%py_requires -%description -n python-marisa -Python bindings for %{name}. -%endif +%description -n python3-marisa +Python3 bindings for %{name}. %package -n ruby-marisa Summary: Ruby bindings for %{name} @@ -102,9 +84,7 @@ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: perl-marisa = %{version} -%if %with_python2 -Requires: python-marisa = %{version} -%endif +Requires: python3-marisa = %{version} Requires: ruby-marisa = %{version} %description devel @@ -112,29 +92,30 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n marisa-trie-%{version} %build +autoreconf -fiv %configure make %{?_smp_mflags} # build ruby pushd bindings/ruby -ruby extconf.rb --with-opt-include="%{_builddir}/%{name}-%{version}/lib" --vendor +ruby extconf.rb --with-opt-include=../../include --with-opt-lib=../../lib/marisa/.libs --vendor make %{?_smp_mflags} popd -%if %with_python2 # build python pushd bindings/python -python setup.py build_ext --include-dirs="%{_builddir}/%{name}-%{version}/lib" --library-dirs="%{_builddir}/%{name}-%{version}/lib/.libs" -python setup.py build +swig -Wall -c++ -python -py3 -outdir . ../marisa-swig.i +mv ../marisa-swig_wrap.cxx . +python3 setup.py build_ext --include-dirs=../../include --library-dirs=../../lib/marisa/.libs +python3 setup.py build popd -%endif # build perl pushd bindings/perl -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" INC="-I%{_builddir}/%{name}-%{version}/lib" LIBS="-L%{_builddir}/%{name}-%{version}/lib/.libs" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" INC="-I../../include" LIBS="-L../../lib/marisa/.libs" make %{?_smp_mflags} popd @@ -148,17 +129,18 @@ make install DESTDIR=%{buildroot} hdrdir=%{_includedir}/ruby-%{rb_ver} rubyhdrdir=%{_includedir}/ruby-%{rb_ver} popd -%if %with_python2 # install python pushd bindings/python -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +rm -rf %{buildroot}%{python3_sitearch}/__pycache__ popd -%endif # install perl pushd bindings/perl make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{perl_vendorarch}/auto/marisa/.packlist +rm -rf %{buildroot}%{perl_vendorarch}/benchmark.pl +rm -rf %{buildroot}%{perl_vendorarch}/sample.pl popd sed -i '1s/^=head2 .*:/=head2/' %{buildroot}%{perl_archlib}/perllocal.pod @@ -168,7 +150,8 @@ %files %defattr(-,root,root) -%doc AUTHORS README COPYING +%doc AUTHORS README.md +%license COPYING.md %{_bindir}/%{name}-benchmark %{_bindir}/%{name}-build %{_bindir}/%{name}-common-prefix-search @@ -184,31 +167,20 @@ %files -n ruby-marisa %defattr(-,root,root) -%if 0%{?suse_version} > 1210 %{rb_vendorarchdir}/%{name}.so -%else -%{rb_vendorarch}/%{name}.so -%endif - -%if %with_python2 -%files -n python-marisa -%defattr(-,root,root) -%{python_sitearch}/_marisa.so -%{python_sitearch}/marisa.* -%if 0%{?suse_version} >= 1110 -%{python_sitearch}/marisa-0.0.0-py%{py_ver}.egg-info -%endif -%endif + +%files -n python3-marisa +%defattr(-,root,root) +%{python3_sitearch}/_marisa.*.so +%{python3_sitearch}/marisa.py +%{python3_sitearch}/marisa-0.0.0-py%{py3_ver}.egg-info %files -n perl-marisa %defattr(-,root,root) %{perl_archlib}/perllocal.pod -%if 0%{?suse_version} >= 1140 %dir %{perl_vendorarch}/auto/ -%endif %{perl_vendorarch}/auto/marisa %{perl_vendorarch}/marisa.pm -%{perl_vendorarch}/sample.pl %files devel %defattr(-,root,root)

1 0

commit brise for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package brise for openSUSE:Factory checked in at 2020-09-29 19:01:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brise (Old) and /work/SRC/openSUSE:Factory/.brise.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brise" Tue Sep 29 19:01:11 2020 rev:15 rq:837999 version:0.39+git20190120.8d5bc2e Changes: -------- --- /work/SRC/openSUSE:Factory/brise/brise.changes 2019-07-21 11:35:20.372766060 +0200 +++ /work/SRC/openSUSE:Factory/.brise.new.4249/brise.changes 2020-09-29 19:01:32.181754024 +0200 @@ -1,0 +2,5 @@ +Sun Sep 27 10:28:06 UTC 2020 - Marguerite Su <i(a)marguerite.su> + +- update rime-plum-go.tar.xz, fix tw build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rime-plum-go.tar.xz ++++++ ++++ 233485 lines of diff (skipped)

1 0

commit librime for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package librime for openSUSE:Factory checked in at 2020-09-29 19:01:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librime (Old) and /work/SRC/openSUSE:Factory/.librime.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librime" Tue Sep 29 19:01:07 2020 rev:22 rq:837815 version:1.6.2~git20200921.4e518b9 Changes: -------- --- /work/SRC/openSUSE:Factory/librime/librime.changes 2020-01-07 23:53:16.908029079 +0100 +++ /work/SRC/openSUSE:Factory/.librime.new.4249/librime.changes 2020-09-29 19:01:24.173744296 +0200 @@ -1,0 +2,12 @@ +Fri Sep 25 03:13:30 UTC 2020 - i(a)marguerite.su + +- Update to version 1.6.2~git20200921.4e518b9: + * chore: fix rime_deployer + * fix(rime_api.cc): dangling pointer returned from RimeGetSharedDataDir + * feat(chord_composer): use Control, Alt, Shift to input chord + * feat(tools/rime_proto_console): demo for proto api + * feat(api): include candidate labels in proto message + * feat(selector): support 4 combinations of horizontal/vertical text + orientation and stacked/linear candidate list layout + +------------------------------------------------------------------- Old: ---- librime-1.5.3.tar.gz New: ---- librime-1.6.2~git20200921.4e518b9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librime.spec ++++++ --- /var/tmp/diff_new_pack.0Wd3zv/_old 2020-09-29 19:01:26.389746988 +0200 +++ /var/tmp/diff_new_pack.0Wd3zv/_new 2020-09-29 19:01:26.393746993 +0200 @@ -17,13 +17,13 @@ Name: librime -Version: 1.5.3 +Version: 1.6.2~git20200921.4e518b9 Release: 0 Summary: Rime Input Method Engine License: BSD-3-Clause Group: System/I18n/Chinese URL: https://github.com/rime/librime -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.xz Source99: baselibs.conf #PATCH-FIX-OPENSUSE workaround for gcc bug 53613 on 12.3 and lower Patch1: librime-1.1-gcc53613.patch @@ -99,8 +99,15 @@ %endif %build -%cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo +# build internal capnproto +mkdir -p thirdparty/src/capnproto/build +pushd thirdparty/src/capnproto/build +cmake -DCMAKE_INSTALL_PREFIX=../../../ -DCMAKE_CXX_FLAGS="%{optflags} -fPIC" .. +make +make install +popd + +%cmake -DCapnProto_DIR=thirdparty/src/%{_lib}/cmake/CapnProto make %{?_smp_mflags} %install @@ -114,10 +121,11 @@ %doc README.md %{_bindir}/rime_deployer %{_bindir}/rime_dict_manager +%{_bindir}/rime_patch %files -n librime1 %{_libdir}/%{name}.so.1 -%{_libdir}/%{name}.so.%{version} +%{_libdir}/%{name}.so.1.6.1 %files devel %{_includedir}/rime_api.h ++++++ _service ++++++ --- /var/tmp/diff_new_pack.0Wd3zv/_old 2020-09-29 19:01:26.429747037 +0200 +++ /var/tmp/diff_new_pack.0Wd3zv/_new 2020-09-29 19:01:26.429747037 +0200 @@ -3,8 +3,9 @@ <param name="url">https://github.com/rime/librime</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.4.1~git%cd.%h</param> + <param name="versionformat">1.6.2~git%cd.%h</param> <param name="revision">master</param> + <param name="submodule">master</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled">

1 0

commit labplot-kf5 for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package labplot-kf5 for openSUSE:Factory checked in at 2020-09-29 19:01:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/labplot-kf5 (Old) and /work/SRC/openSUSE:Factory/.labplot-kf5.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "labplot-kf5" Tue Sep 29 19:01:02 2020 rev:11 rq:837886 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/labplot-kf5/labplot-kf5.changes 2019-10-30 14:43:38.209915524 +0100 +++ /work/SRC/openSUSE:Factory/.labplot-kf5.new.4249/labplot-kf5.changes 2020-09-29 19:01:17.117735725 +0200 @@ -1,0 +2,54 @@ +Fri Sep 25 12:05:16 UTC 2020 - wbauer(a)tmo.at + +- Move english docs from labplot-kf5-lang to the main package again +- Remove unused Qt5Qml BuildRequires + +------------------------------------------------------------------- +Wed Sep 16 14:52:28 UTC 2020 - andy great <andythe_great(a)pm.me> + +- Update to version 2.8.0. + * New features: + * Improved DateTime data support + * Show the size of the members in the JSON file in the import + file dialog + * [worksheet] In the Export Worksheet Dialog allow to export to + the clipboard + * [worksheet] Allow to move plots, text labels and legend with + arrow keys + * [worksheet] Image worksheet element + * [worksheet] Reference line on the plot + * [worksheet] Support for imperial units for geometry and size + settings of objects + * [worksheet] Improve axes major and minor tick settings + * [spreadsheet] show infinite values as such and not as NaN + * [spreadsheet] support big integer (64 bit) as data type + * [spreadsheet] column normalization methods "divide by max", + "divide by min", etc. + * [spreadsheet] Tukey's ladder of powers + * [spreadsheet] added the size of the data set, its mode, 1st + and 3rd quartiles and IQR to the column statistics + * [analysis] calculate and expose the rough values as the + result of a smooth (data = smooth + rough) + * Allow to open Cantor and Jupyter projects + * [Windows] improved craft blueprint and installer package + * [macOS] added support for touchbar + * Support global user specified decimal separator + * Improved locale support in number input fields + * Extended "About"-Dialog + * Bug fixes: + * BUG: 421193 - import float(4) data from hdf5 + * BUG: 418390 - Ignore infinite values (created in CAS + worksheets for example) in curves + * BUG: 412455 - Don't crash (sporadically) when opening the + color scheme menu + * BUG: 415214 - Better algorithm to draw the error bar caps + * BUG: 413397 - Properly handle removal of columns in the + spreadsheet model + * BUG: 413401 - In plot data dialog, don't add new worksheets + as children to workbooks, use the proper parent aspect + * Fix Cantor support and Unicode characters on Windows + * Fix evaluating fit residuals +- Add fix_labplot_assumption_cantor_version.patch to fix Labplot 2.8.0 + wrong assumption that Cantor 20.08.1 has a new interface. + +------------------------------------------------------------------- Old: ---- labplot-2.7.0.tar.xz New: ---- fix_labplot_assumption_cantor_version.patch labplot-2.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ labplot-kf5.spec ++++++ --- /var/tmp/diff_new_pack.ZJC6oU/_old 2020-09-29 19:01:18.065736877 +0200 +++ /var/tmp/diff_new_pack.ZJC6oU/_new 2020-09-29 19:01:18.069736881 +0200 @@ -1,7 +1,7 @@ # # spec file for package labplot-kf5 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,15 @@ %define _kf5_appstreamdir %{_kf5_sharedir}/appdata %endif Name: labplot-kf5 -Version: 2.7.0 +Version: 2.8.0 Release: 0 Summary: KDE Framework 5 data analysis and visualization application License: GPL-2.0-or-later Group: Productivity/Scientific/Other URL: https://labplot.kde.org/ Source: https://download.kde.org/stable/labplot/%{version}/labplot-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix_labplot_assumption_cantor_version.patch andythe_great(a)pm.me -- Fix Labplot 2.8.0 wrong assumption that Cantor 20.08.1 has a new interface. +Patch0: fix_labplot_assumption_cantor_version.patch BuildRequires: bison BuildRequires: cantor-devel BuildRequires: extra-cmake-modules @@ -74,7 +76,6 @@ BuildRequires: pkgconfig(zlib) Provides: labplot = %{version} Obsoletes: labplot < 2.3.0 - %lang_package %description @@ -88,6 +89,7 @@ %prep %setup -q -n labplot-%{version} +%patch0 -p1 %build %cmake_kf5 -d build @@ -127,7 +129,6 @@ %dir %{_kf5_appstreamdir} %{_kf5_appstreamdir}/org.kde.labplot2.appdata.xml %{_kf5_htmldir}/en/labplot2/ -%{_kf5_configdir}/labplot2_themes.knsrc %{_kf5_mandir}/man1/labplot2.1%{?ext_man} %files lang -f labplot2.lang ++++++ fix_labplot_assumption_cantor_version.patch ++++++ https://invent.kde.org/education/labplot/-/commit/4255438c98ce274a4bbb381b7… diff -ruN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2020-09-12 15:17:33.000000000 +0700 +++ b/CMakeLists.txt 2020-09-16 22:29:49.371712613 +0700 @@ -230,7 +230,7 @@ ELSE () MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12") ENDIF () - IF (${Cantor_VERSION} VERSION_GREATER "20.08") + IF (${Cantor_VERSION} VERSION_GREATER "20.08.1") add_definitions (-DHAVE_NEW_CANTOR_LIBS) ENDIF () ELSE () ++++++ labplot-2.7.0.tar.xz -> labplot-2.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/labplot-kf5/labplot-2.7.0.tar.xz /work/SRC/openSUSE:Factory/.labplot-kf5.new.4249/labplot-2.8.0.tar.xz differ: char 17, line 1

1 0

commit pspp for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package pspp for openSUSE:Factory checked in at 2020-09-29 19:01:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pspp (Old) and /work/SRC/openSUSE:Factory/.pspp.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pspp" Tue Sep 29 19:01:01 2020 rev:17 rq:837843 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pspp/pspp.changes 2020-09-25 16:33:01.323969613 +0200 +++ /work/SRC/openSUSE:Factory/.pspp.new.4249/pspp.changes 2020-09-29 19:01:12.373729962 +0200 @@ -1,0 +2,11 @@ +Sun Sep 6 10:27:00 UTC 2020 - opensuse.lietuviu.kalba(a)gmail.com + +- Update to PSPP 1.4.1: + * Bug fixes. + * Translation updates. + * HTML output is now HTML5 instead of HTML4.0 Transitional. + * The HOST command has been reimplemented. It now supports TIMELIMIT. +- Split -lang package. +- Add documentation packages. + +------------------------------------------------------------------- Old: ---- pspp-1.4.0.tar.gz pspp-1.4.0.tar.gz.sig New: ---- pspp-1.4.1.lt.po pspp-1.4.1.tar.gz pspp-1.4.1.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pspp.spec ++++++ --- /var/tmp/diff_new_pack.hJyDkT/_old 2020-09-29 19:01:13.505731337 +0200 +++ /var/tmp/diff_new_pack.hJyDkT/_new 2020-09-29 19:01:13.509731342 +0200 @@ -26,7 +26,7 @@ %define _disable_ld_as_needed 1 %endif Name: pspp -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: A program for statistical analysis of sampled data License: GPL-3.0-or-later @@ -35,6 +35,21 @@ Source0: ftp://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz Source1: ftp://ftp.gnu.org/pub/gnu/pspp/pspp-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/people/viewgpg.php?user_id=245#/%{name}.keyring +Source3: https://translationproject.org/PO-files/lt/pspp-%{version}.lt.po + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?fedora} +BuildRequires: atlas +%endif +%if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: update-desktop-files +PreReq: %install_info_prereq +%endif +%if 0%{?is_opensuse} +# Next package only for "make check", but "free-ttf-fonts" exist only in openSUSE, not in SUSE +BuildRequires: free-ttf-fonts +%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: cairo-devel @@ -42,47 +57,23 @@ BuildRequires: gettext BuildRequires: gsl-devel >= 1.12 BuildRequires: gtk3-devel >= 3.22 +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: m4 BuildRequires: pango-devel +BuildRequires: perl(base) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Text::Diff) +BuildRequires: pkgconfig +BuildRequires: pkgconfig(appstream) +BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: postgresql-devel BuildRequires: readline-devel BuildRequires: spread-sheet-widget-devel >= 0.6 BuildRequires: texinfo BuildRequires: zlib-devel -Requires: yelp -%if 0%{?centos_version} -BuildRequires: gtksourceview3-devel -BuildRequires: perl -BuildRequires: perl-ExtUtils-MakeMaker -BuildRequires: pkgconfig -%endif -%if 0%{?fedora} -BuildRequires: atlas -BuildRequires: gtksourceview3-devel -BuildRequires: perl -BuildRequires: perl-ExtUtils-MakeMaker -BuildRequires: pkgconfig -%endif -%if 0%{?mandriva_version} -BuildRequires: gtksourceview-devel -BuildRequires: perl -BuildRequires: pkgconfig -%endif -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: gtksourceview-devel >= 3.18 -BuildRequires: perl-base -BuildRequires: pkgconfig -BuildRequires: update-desktop-files -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} -%endif -%if 0%{?is_opensuse} -# Next package only for "make check" -# "free-ttf-fonts" exist only in openSUSE, not in SUSE -BuildRequires: free-ttf-fonts -%endif +AutoReqProv: Yes +Recommends: %{name}-doc %description PSPP is a program for statistical analysis of sampled data. It @@ -93,6 +84,22 @@ limited, but growing. At your option, PSPP will produce statistical reports in ASCII, PostScript, PDF, HTML, SVG, or OpenDocument formats. + +%if 0%{?suse_version} +%lang_package +%else +%package lang +Summary: Translations for package pspp +License: GPL-3.0-or-later + +%description lang +PSPP is a program for statistical analysis of sampled data. It +is a free replacement for the proprietary program SPSS. + +This subpackage provides translations for PSPP. +%endif + + %package devel Summary: Development files for pspp, a statistical analysis program License: LGPL-2.1-or-later @@ -105,6 +112,7 @@ %if 0%{?suse_version} Requires: xz-devel %endif +Recommends: %{name}-devel-doc %description devel PSPP is a program for statistical analysis of sampled data. It @@ -113,27 +121,53 @@ This subpackage contains libraries and header files for developing applications that want to build pspp plugins. + +%package doc +Summary: Manual for PSPP +License: GPL-3.0-or-later + +%description doc +PSPP is a program for statistical analysis of sampled data. It +is a free replacement for the proprietary program SPSS. + +This subpackage contains documentation for PSPP. + + +%package devel-doc +Summary: PSPP Developers Guide +License: GPL-3.0-or-later + +%description devel-doc +PSPP is a program for statistical analysis of sampled data. It +is a free replacement for the proprietary program SPSS. + +This subpackage contains development documentation for PSPP. + + %prep %setup -q -n pspp-%{version} +cp -f %{SOURCE3} po/lt.po %build export SUSE_ASNEEDED=0 export CFLAGS="%{optflags} -fgnu89-inline -fcommon" %configure \ --disable-relocatable --disable-static --disable-rpath \ - --enable-debug --without-libreadline-prefix + --without-libreadline-prefix %if 0%{?suse_version} >= 1500 %make_build %else make %endif +make html %install %make_install %if 0%{?suse_version} %suse_update_desktop_file -r org.fsf.%{name} Education Math %endif +cp -r ./doc/pspp.html/ ./doc/pspp-dev.html/ %{buildroot}%{_datadir}/doc/pspp/ # don't own /usr/share/info/dir if it exist [ -f %{buildroot}/%{_infodir}/dir ] && rm %{buildroot}/%{_infodir}/dir @@ -155,6 +189,7 @@ %find_lang pspp %check +export TESTSUITEFLAGS='-v -j128' %make_build check || /bin/true [ -f ./tests/testsuite.log ] || echo "check did not run" > ./tests/testsuite.log mkdir $RPM_BUILD_ROOT/%{_datadir}/pspp/tests @@ -185,10 +220,19 @@ /sbin/ldconfig %desktop_database_postun -%files -f pspp.lang +%files %license COPYING %doc README THANKS AUTHORS %doc %{_datadir}/doc/pspp +%if 0%{?suse_version} +%doc %{_datadir}/doc/pspp/ +%else +%doc %{_datadir}/doc/pspp/pspp.xml +%endif +%exclude %dir %{_datadir}/doc/pspp/pspp.html/ +%exclude %{_datadir}/doc/pspp/pspp.html/*.html +%exclude %dir %{_datadir}/doc/pspp/pspp-dev.html/ +%exclude %{_datadir}/doc/pspp/pspp-dev.html/*.html %config(noreplace) %{_sysconfdir}/ld.so.conf.d/pspp.conf %{_bindir}/pspp %{_bindir}/psppire @@ -250,6 +294,8 @@ %doc %{_mandir}/man1/pspp-output.1.gz %endif +%files lang -f %{name}.lang + %files devel %dir %{_libdir}/pspp/ %{_libdir}/pspp/libpspp-core.la @@ -257,4 +303,15 @@ %dir %{_datadir}/pspp/tests %{_datadir}/pspp/tests/testsuite.log +%files doc +%defattr(-, root, root) +%dir %{_datadir}/doc/pspp/pspp.html/ +%doc %{_datadir}/doc/pspp/pspp.html/*.html + +%files devel-doc +%defattr(-, root, root) +%dir %{_datadir}/doc/pspp/pspp-dev.html/ +%doc %{_datadir}/doc/pspp/pspp-dev.html/*.html + + %changelog ++++++ pspp-1.4.1.lt.po ++++++ ++++ 10618 lines (skipped) ++++++ pspp-1.4.0.tar.gz -> pspp-1.4.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/pspp/pspp-1.4.0.tar.gz /work/SRC/openSUSE:Factory/.pspp.new.4249/pspp-1.4.1.tar.gz differ: char 5, line 1

1 0

commit deluge for openSUSE:Factory
by root 29 Sep '20

29 Sep '20

Hello community, here is the log from the commit of package deluge for openSUSE:Factory checked in at 2020-09-29 19:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deluge (Old) and /work/SRC/openSUSE:Factory/.deluge.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deluge" Tue Sep 29 19:00:48 2020 rev:13 rq:835437 version:2.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/deluge/deluge.changes 2020-03-03 10:18:46.306964618 +0100 +++ /work/SRC/openSUSE:Factory/.deluge.new.4249/deluge.changes 2020-09-29 19:01:09.045725919 +0200 @@ -1,0 +2,5 @@ +Fri Sep 18 12:50:21 UTC 2020 - Luigi Baldoni <aloisio(a)gmx.com> + +- Use legacy libtorrent-rasterbar on Tumbleweed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deluge.spec ++++++ --- /var/tmp/diff_new_pack.ACjSez/_old 2020-09-29 19:01:09.685726696 +0200 +++ /var/tmp/diff_new_pack.ACjSez/_new 2020-09-29 19:01:09.689726702 +0200 @@ -36,7 +36,11 @@ BuildRequires: python-rpm-macros BuildRequires: python3-Twisted >= 17.1 BuildRequires: python3-devel +%if 0%{?suse_version} > 1500 +BuildRequires: python3-libtorrent-rasterbar-1 >= 1.1.1 +%else BuildRequires: python3-libtorrent-rasterbar >= 1.1.1 +%endif BuildRequires: python3-setuptools BuildRequires: python3-wheel BuildRequires: update-desktop-files @@ -46,7 +50,11 @@ Requires: python3-gobject Requires: python3-gobject-Gdk Requires: python3-gobject-cairo +%if 0%{?suse_version} > 1500 +Requires: python3-libtorrent-rasterbar-1 >= 1.1.1 +%else Requires: python3-libtorrent-rasterbar >= 1.1.1 +%endif Requires: python3-pyOpenSSL Requires: python3-rencode Requires: python3-setproctitle @@ -84,6 +92,7 @@ %prep %autosetup -p1 +sed -i '/^#!/d' deluge/path_chooser_common.py deluge/ui/gtk3/path_combo_chooser.py %build %py3_build @@ -106,6 +115,7 @@ fi done popd +%fdupes %{buildroot%}%{_datadir}/icons %files %license LICENSE

1 0