Hello community, here is the log from the commit of package libkkc for openSUSE:Factory checked in at 2017-04-07 13:54:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkkc (Old) and /work/SRC/openSUSE:Factory/.libkkc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkkc" Fri Apr 7 13:54:37 2017 rev:8 rq:483110 version:0.3.5+git20150522.650f0d6 Changes: -------- --- /work/SRC/openSUSE:Factory/libkkc/libkkc.changes 2015-08-27 08:57:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkkc.new/libkkc.changes 2017-04-07 13:54:40.459887294 +0200 @@ -1,0 +2,17 @@ +Tue Mar 28 13:33:18 UTC 2017 - i@marguerite.su + +- the previous new-op patch didn't pass upstream's travis test. + vala upstream actually merged three warning messages into one. + actually the build failed not due to a missing 'new' operator, + but because of constructer chain-ups. use the official fix from + libkkc upstream. + +------------------------------------------------------------------- +Fri Mar 24 16:04:11 UTC 2017 - i@marguerite.su + +- add vala-0.23.2+-static-const.patch, fix 'the modifier static is + not applicable to constants' warnings +- add vala-0.32-new-operator.patch, fix 'use new operator to create + new objects' error + +------------------------------------------------------------------- Old: ---- _servicedata New: ---- vala-0.23.2+-static-const.patch vala-0.32-new-operator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkkc.spec ++++++ --- /var/tmp/diff_new_pack.uK7O6i/_old 2017-04-07 13:54:44.887261900 +0200 +++ /var/tmp/diff_new_pack.uK7O6i/_new 2017-04-07 13:54:44.887261900 +0200 @@ -1,7 +1,7 @@ # # spec file for package libkkc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,10 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM marguerite@opensuse.org - use correct shared library for typelib generation Patch0: libkkc-typelib-sharelib.patch +# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix "the modifier 'static' is not applicable to constants" +Patch1: vala-0.23.2+-static-const.patch +# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix "use 'new' operator to create new objects" error +Patch2: vala-0.32-new-operator.patch BuildRequires: fdupes BuildRequires: gcc-c++ # for autogen.sh @@ -96,6 +100,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 NOCONFIGURE=1 ./autogen.sh %build ++++++ vala-0.23.2+-static-const.patch ++++++ Index: b/libkkc/encoding.vala =================================================================== --- a/libkkc/encoding.vala +++ b/libkkc/encoding.vala @@ -19,15 +19,15 @@ namespace Kkc { // XXX: we use Vala string to represent byte array, assuming that // it does not contain null element class EncodingConverter : Object, Initable { - static const int BUFSIZ = 4096; - static const string INTERNAL_ENCODING = "UTF-8"; + const int BUFSIZ = 4096; + const string INTERNAL_ENCODING = "UTF-8"; struct EncodingCodingSystemEntry { string key; string value; } - static const EncodingCodingSystemEntry ENCODING_TO_CODING_SYSTEM_RULE[] = { + const EncodingCodingSystemEntry ENCODING_TO_CODING_SYSTEM_RULE[] = { { "UTF-8", "utf-8" }, { "EUC-JP", "euc-jp" }, { "Shift_JIS", "shift_jis" }, Index: b/libkkc/key-event-filter.vala =================================================================== --- a/libkkc/key-event-filter.vala +++ b/libkkc/key-event-filter.vala @@ -53,7 +53,7 @@ namespace Kkc { * @see Rule */ class SimpleKeyEventFilter : KeyEventFilter { - static const uint[] modifier_keyvals = { + const uint[] modifier_keyvals = { Keysyms.Shift_L, Keysyms.Shift_R, Keysyms.Control_L, Index: b/libkkc/keymap.vala =================================================================== --- a/libkkc/keymap.vala +++ b/libkkc/keymap.vala @@ -32,7 +32,7 @@ namespace Kkc { * Object representing a keymap. */ public class Keymap : Object { - static const KeymapCommandEntry Commands[] = { + const KeymapCommandEntry Commands[] = { { "abort", N_("Abort") }, { "first-segment", N_("First Segment") }, { "last-segment", N_("Last Segment") }, Index: b/libkkc/rom-kana-utils.vala =================================================================== --- a/libkkc/rom-kana-utils.vala +++ b/libkkc/rom-kana-utils.vala @@ -38,7 +38,7 @@ namespace Kkc { string? hankaku_katakana; } - static const KanaTableEntry[] KanaTable = { + const KanaTableEntry[] KanaTable = { {'ア', "あ", "ｱ"}, {'イ', "い", "ｲ"}, {'ウ', "う", "ｳ"}, {'エ', "え", "ｴ"}, {'オ', "お", "ｵ"}, {'カ', "か", "ｶ"}, {'キ', "き", "ｷ"}, {'ク', "く", "ｸ"}, {'ケ', "け", "ｹ"}, @@ -73,13 +73,13 @@ namespace Kkc { {'、', "、", "､"}, {'・', "・", "･"}, {'ー', "ー", "ｰ"} }; - static const KanaTableEntry[] HankakuKatakanaSubstitute = { + const KanaTableEntry[] HankakuKatakanaSubstitute = { {'ヮ', null, "ﾜ"}, {'ヵ', null, "ｶ"}, {'ヶ', null, "ｹ"} }; - static const string[] WideLatinTable = { + const string[] WideLatinTable = { " ", "！", "”", "＃", "＄", "％", "＆", "’", "（", "）", "＊", "＋", "，", "−", "．", "／", "０", "１", "２", "３", "４", "５", "６", "７", @@ -94,7 +94,7 @@ namespace Kkc { "ｘ", "ｙ", "ｚ", "｛", "｜", "｝", "〜" }; - static const string[] KanaRomTable = { + const string[] KanaRomTable = { "x", "a", "x", "i", "x", "u", "x", "e", "x", "o", "k", "g", "k", "g", "k", "g", "k", "g", "k", "g", "s", "z", "s", "z", "s", "z", "s", "z", "s", "z", "t", "d", "t", @@ -126,20 +126,20 @@ namespace Kkc { return get_okurigana_prefix_for_char (head); } - static const string[] KanjiNumericTable = { + const string[] KanjiNumericTable = { "〇", "一", "二", "三", "四", "五", "六", "七", "八", "九" }; - static const string[] DaijiNumericTable = { + const string[] DaijiNumericTable = { "零", "壱", "弐", "参", "四", "伍", "六", "七", "八", "九" }; - static const string?[] KanjiNumericalPositionTable = { + const string?[] KanjiNumericalPositionTable = { null, "十", "百", "千", "万", null, null, null, "億", null, null, null, "兆", null, null, null, null, "京" }; - static const string?[] DaijiNumericalPositionTable = { + const string?[] DaijiNumericalPositionTable = { null, "拾", "百", "阡", "萬", null, null, null, "億", null, null, null, "兆", null, null, null, null, "京" }; Index: b/libkkc/rom-kana.vala =================================================================== --- a/libkkc/rom-kana.vala +++ b/libkkc/rom-kana.vala @@ -41,7 +41,7 @@ namespace Kkc { } } - static const string[] PUNCTUATION_RULE = {"。、", "．，", "。，", "．、"}; + const string[] PUNCTUATION_RULE = {"。、", "．，", "。，", "．、"}; class RomKanaNode : Object { internal RomKanaEntry? entry; ++++++ vala-0.32-new-operator.patch ++++++ Index: b/libkkc/key-event.vala =================================================================== --- a/libkkc/key-event.vala +++ b/libkkc/key-event.vala @@ -148,7 +148,7 @@ namespace Kkc { throw new KeyEventFormatError.PARSE_FAILED ( "unknown keyval %s", _name); } - from_x_event (_keyval, 0, _modifiers); + this.from_x_event (_keyval, 0, _modifiers); } /**