From 4bc1c6d7455fc159491e67aed75f67019c066128 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Aug 09 2019 16:00:40 +0000 Subject: Fix FTBFS with vala 0.45.1 --- diff --git a/libkkc-vala-abstract-create.patch b/libkkc-vala-abstract-create.patch new file mode 100644 index 0000000..ef81815 --- /dev/null +++ b/libkkc-vala-abstract-create.patch @@ -0,0 +1,59 @@ +From 84f46d6ad7981d10a3c598f19642b12e6036a4da Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 9 Aug 2019 11:38:16 +0200 +Subject: [PATCH] build: Declare creation methods of abstract classes as + protected + +Public creation methods of abstract classes are no longer allowed +since 0.45.1: +https://gitlab.gnome.org/GNOME/vala/commit/9365176e3f4fab737112e957f38c128752c8b504 + +Suggested by Rico Tzschichholz. +--- + libkkc/language-model.vala | 2 +- + libkkc/metadata-file.vala | 2 +- + tests/lib/test-case.vala | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libkkc/language-model.vala b/libkkc/language-model.vala +index 967746a..19860aa 100644 +--- a/libkkc/language-model.vala ++++ b/libkkc/language-model.vala +@@ -101,7 +101,7 @@ namespace Kkc { + public abstract new LanguageModelEntry? @get (string input, + string output); + +- public LanguageModel (LanguageModelMetadata metadata) throws Error { ++ protected LanguageModel (LanguageModelMetadata metadata) throws Error { + Object (metadata: metadata); + init (null); + } +diff --git a/libkkc/metadata-file.vala b/libkkc/metadata-file.vala +index 62b84a3..f52235b 100644 +--- a/libkkc/metadata-file.vala ++++ b/libkkc/metadata-file.vala +@@ -43,7 +43,7 @@ namespace Kkc { + */ + public string filename { get; construct set; } + +- public MetadataFile (string name, string filename) throws Error { ++ protected MetadataFile (string name, string filename) throws Error { + Object (name: name, filename: filename); + init (null); + } +diff --git a/tests/lib/test-case.vala b/tests/lib/test-case.vala +index da74f7e..116a57b 100644 +--- a/tests/lib/test-case.vala ++++ b/tests/lib/test-case.vala +@@ -29,7 +29,7 @@ public abstract class Kkc.TestCase : Object + + public delegate void TestMethod (); + +- public TestCase (string name) ++ protected TestCase (string name) + { + this._suite = new GLib.TestSuite (name); + } +-- +2.21.0 + diff --git a/libkkc.spec b/libkkc.spec index cd8c94a..b2f4532 100644 --- a/libkkc.spec +++ b/libkkc.spec @@ -2,7 +2,7 @@ Name: libkkc Version: 0.3.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Japanese Kana Kanji conversion library License: GPLv3+ @@ -12,6 +12,7 @@ Source0: https://github.com/ueno/libkkc/releases/download/v%{version}/%{name}-%{ Source1: README.md Patch0: libkkc-HEAD.patch Patch1: libkkc-POT.skip.patch +Patch2: libkkc-vala-abstract-create.patch BuildRequires: gcc-c++ BuildRequires: marisa-devel @@ -62,9 +63,7 @@ The %{name}-common package contains the arch-independent data that %prep -%setup -q -%patch0 -p1 -b .HEAD -%patch1 -p1 -b .orig +%autosetup -p1 [ -f README.md ] || cp -p %SOURCE1 . autoreconf -f @@ -111,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Aug 9 2019 Daiki Ueno - 0.3.5-16 +- fix FTBFS with vala 0.45.1 + * Thu Jul 25 2019 Fedora Release Engineering - 0.3.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild