atim pushed to rust-entities (master). "Update spec file (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:36:41 UTC
From 6fe79f6935c4684018e3d65b697c56dec08400fc Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Jan 31 2020 23:36:33 +0000
Subject: Update spec file
Rebuild for F32 Mass Rebuild
Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> 1.0.1-4
Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
---
diff --git a/rust-entities.spec b/rust-entities.spec
index d769f49..072cace 100644
--- a/rust-entities.spec
+++ b/rust-entities.spec
@@ -1,24 +1,28 @@
-# Generated by rust2rpm
-%bcond_with check
+# Generated by rust2rpm 13
+%bcond_without check
%global debug_package %{nil}
%global crate entities
Name: rust-%{crate}
Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provides the raw data needed to convert to and from HTML entities
+# Upstream license specification: MIT
License: MIT
URL: https://crates.io/crates/entities
Source: %{crates_source}
ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
BuildRequires: rust-packaging
-%global _description \
-Provides the raw data needed to convert to and from HTML entities.
+%global _description %{expand:
+Provides the raw data needed to convert to and from HTML entities.}
%description %{_description}
@@ -34,7 +38,7 @@ which use "%{crate}" crate.
%files devel
%license LICENSE
%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,12 +50,15 @@ This package contains library source intended for building other packages
which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
+%generate_buildrequires
+%cargo_generate_buildrequires
+
%build
%cargo_build
@@ -64,7 +71,11 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-4
+* Sat Feb 01 01:32:57 EET 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 1.0.1-5
+- Update spec file
+- Rebuild for F32 Mass Rebuild
+
+ Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-3
https://src.fedoraproject.org/rpms/rust-entities/c/6fe79f6935c4684018e3d6...
4Â years, 4Â months
atim pushed to rust-letter-avatar (master). "Bump pango to 0.8.0
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:30:32 UTC
From 0d152d7bedd345ff027f3dcea105c1dadf92fe9d Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Jan 31 2020 23:30:24 +0000
Subject: Bump pango to 0.8.0
Bump pangocairo to 0.9.0
Bump cairo-rs to 0.8.0
Rebuild for F32 Mass Rebuild
---
diff --git a/letter-avatar-fix-metadata.diff b/letter-avatar-fix-metadata.diff
new file mode 100644
index 0000000..dfc0b95
--- /dev/null
+++ b/letter-avatar-fix-metadata.diff
@@ -0,0 +1,20 @@
+--- letter-avatar-1.2.0/Cargo.toml 1970-01-01T00:00:00+00:00
++++ letter-avatar-1.2.0/Cargo.toml 2020-01-31T23:16:03.863649+00:00
+@@ -18,14 +18,14 @@
+ license = "GPL-3.0+"
+ repository = "https://gitlab.gnome.org/jsparber/letter-avatar"
+ [dependencies.cairo-rs]
+-version = "0.7.0"
++version = "0.8.0"
+ features = ["png"]
+
+ [dependencies.pango]
+-version = "0.7.0"
++version = "0.8.0"
+
+ [dependencies.pangocairo]
+-version = "0.8.0"
++version = "0.9.0"
+
+ [dependencies.unicode-segmentation]
+ version = "1.2.1"
diff --git a/rust-letter-avatar.spec b/rust-letter-avatar.spec
index 0e2efee..bafeff8 100644
--- a/rust-letter-avatar.spec
+++ b/rust-letter-avatar.spec
@@ -1,18 +1,24 @@
-# Generated by rust2rpm 10
-%bcond_with check
+# Generated by rust2rpm 13
+%bcond_without check
%global debug_package %{nil}
%global crate letter-avatar
Name: rust-%{crate}
Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Generates user avatars using username initials
# Upstream license specification: GPL-3.0+
License: GPLv3+
URL: https://crates.io/crates/letter-avatar
Source: %{crates_source}
+# Initial patched metadata
+# * https://gitlab.gnome.org/World/Rust/letter-avatar/merge_requests/4
+# - Bump pango to 0.8.0
+# - Bump pangocairo to 0.9.0
+# - Bump cairo-rs to 0.8.0
+Patch0: letter-avatar-fix-metadata.diff
ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build}
@@ -37,7 +43,7 @@ which use "%{crate}" crate.
%files devel
%license LICENSE
-%{cargo_registry}/%{crate}-%{version}/
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -49,7 +55,7 @@ This package contains library source intended for building other packages
which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -70,6 +76,12 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Feb 01 01:11:37 EET 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 1.2.0-3
+- Bump pango to 0.8.0
+- Bump pangocairo to 0.9.0
+- Bump cairo-rs to 0.8.0
+- Rebuild for F32 Mass Rebuild
+
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/rust-letter-avatar/c/0d152d7bedd345ff0...
4Â years, 4Â months
rcritten pushed to certmonger (f30). "Update to upstream 0.79.9"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:23:54 UTC
From 1e04cb13b35ad33f228472d44c4f575158f46b91 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten(a)redhat.com>
Date: Jan 31 2020 23:02:50 +0000
Subject: Update to upstream 0.79.9
---
diff --git a/.gitignore b/.gitignore
index 5f86d0a..2e3f99b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ certmonger-0.28.tar.gz
/certmonger-0.79.6.tar.gz
/certmonger-0.79.7.tar.gz
/certmonger-0.79.8.tar.gz
+/certmonger-0.79.9.tar.gz
diff --git a/certmonger.spec b/certmonger.spec
index 56d688f..7b1a5c9 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -25,8 +25,8 @@
%endif
Name: certmonger
-Version: 0.79.8
-Release: 2%{?dist}
+Version: 0.79.9
+Release: 1%{?dist}
Summary: Certificate status monitor and PKI enrollment client
License: GPLv3+
@@ -76,7 +76,7 @@ BuildRequires: /usr/bin/unix2dos
# for which
BuildRequires: /usr/bin/which
# for dbus tests
-BuildRequires: python2-dbus
+BuildRequires: python3-dbus
BuildRequires: popt-devel
# we need a running system bus
@@ -244,6 +244,9 @@ exit 0
%endif
%changelog
+* Thu Jan 30 2020 Rob Crittenden <rcritten(a)redhat.com> - 0.79.9-1
+- Update to upstream 0.79.9
+
* Wed Jul 17 2019 Rob Crittenden <rcritten(a)redhat.com> - 0.79.8-2
- Add BuildRequires for krb5-devel, the buildroot changed.
diff --git a/sources b/sources
index 73c22cc..4ed6c8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (certmonger-0.79.8.tar.gz) = 5e6f9c6a0b9c4a7c68a5f894b9ff3ba20fa42aa4d490c7e5e57c97dab2e152ca6ef7aee64f17a92fce7ca971077011f8f391218098612011be2b4961203db6bc
+SHA512 (certmonger-0.79.9.tar.gz) = d7a783087cdb73426d01255a1da4429c9664267e557373120057fdcbda08e0c2e994a36d525a0a634b62115f76eeab9181ef012d5f38f2fd8711ae6443a8b461
https://src.fedoraproject.org/rpms/certmonger/c/1e04cb13b35ad33f228472d44...
4Â years, 4Â months
spot pushed to check (master). "cleanup condit"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:08:44 UTC
From c69cf8c51e7ca2426780afd3e1e60c59d0ec9156 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 23:08:36 +0000
Subject: cleanup condit
---
diff --git a/check.spec b/check.spec
index ee13a4e..1fb3d14 100644
--- a/check.spec
+++ b/check.spec
@@ -90,12 +90,12 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
%ifnarch s390x
export LD_LIBRARY_PATH=$PWD/src/.libs
make check
+%endif
# Don't need to package the sh, log or trs files
# when we scoop the other checkmk/test files for doc
rm -rf checkmk/test/check_checkmk*
# these files are empty
rm -rf checkmk/test/empty_input
-%endif
%ldconfig_scriptlets
https://src.fedoraproject.org/rpms/check/c/c69cf8c51e7ca2426780afd3e1e60c...
4Â years, 4Â months
spot pushed to sqlite2 (master). "fix FTBFS"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:06:28 UTC
From 90f7f6043dba5b661a48bede516783d16a881237 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 23:06:20 +0000
Subject: fix FTBFS
---
diff --git a/sqlite-2.8.17-gcc10.patch b/sqlite-2.8.17-gcc10.patch
new file mode 100644
index 0000000..5e79c1c
--- /dev/null
+++ b/sqlite-2.8.17-gcc10.patch
@@ -0,0 +1,24 @@
+diff -up sqlite-2.8.17/src/btree.h.gcc10 sqlite-2.8.17/src/btree.h
+--- sqlite-2.8.17/src/btree.h.gcc10 2020-01-31 18:01:50.668986995 -0500
++++ sqlite-2.8.17/src/btree.h 2020-01-31 18:02:22.000333901 -0500
+@@ -149,7 +149,7 @@ int sqliteRbtreeOpen(const char *zFilena
+ (btOps(pBt)->PageDump(pBt, pgno, recursive))
+ #define sqliteBtreeCursorDump(pCur, aResult)\
+ (btCOps(pCur)->CursorDump(pCur, aResult))
+-int btree_native_byte_order;
++extern int btree_native_byte_order;
+ #endif /* SQLITE_TEST */
+
+
+diff -up sqlite-2.8.17/src/pager.h.gcc10 sqlite-2.8.17/src/pager.h
+--- sqlite-2.8.17/src/pager.h.gcc10 2020-01-31 18:02:39.963959449 -0500
++++ sqlite-2.8.17/src/pager.h 2020-01-31 18:02:58.769567449 -0500
+@@ -102,6 +102,6 @@ void sqlitepager_set_codec(Pager*,void(*
+
+ #ifdef SQLITE_TEST
+ void sqlitepager_refdump(Pager*);
+-int pager_refinfo_enable;
+-int journal_format;
++extern int pager_refinfo_enable;
++extern int journal_format;
+ #endif
diff --git a/sqlite2.spec b/sqlite2.spec
index 66d3558..2160daa 100644
--- a/sqlite2.spec
+++ b/sqlite2.spec
@@ -3,7 +3,7 @@
Name: sqlite2
Version: 2.8.17
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: Embeddable SQL engine in a C library
License: Public Domain
@@ -27,6 +27,7 @@ Patch15: sqlite-2.8.17-lemon-snprintf.patch
Patch16: sqlite-2.8.17-fix-sort-syntax.patch
Patch17: sqlite-2.8.17-ldflags.patch
Patch18: sqlite-2.8.17-fix-unsigned-FTBFS.patch
+Patch19: sqlite-2.8.17-gcc10.patch
BuildRequires: gcc-c++
BuildRequires: ncurses-devel, readline-devel, %{_includedir}/tcl.h
@@ -89,6 +90,7 @@ find . -type d -name CVS -print0 | xargs -0 rm -r
%patch16 -p1 -b .fix-sort-syntax
%patch17 -p1 -b .ldflags
%patch18 -p1 -b .unsigned-fix
+%patch19 -p1 -b .gcc10
sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in
# Patch additional /usr/lib locations where we don't have $(libdir)
# to substitute with.
@@ -136,6 +138,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/tclsqlite
%{tcl_sitearch}/sqlite2/
%changelog
+* Fri Jan 31 2020 Tom Callaway <spot(a)fedoraproject.org> - 2.8.17-32
+- fix FTBFS
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.17-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/sqlite2/c/90f7f6043dba5b661a48bede5167...
4Â years, 4Â months
atim pushed to rust-html2pango (master). "Bump linkify to 0.4.0
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 23:05:55 UTC
From 048383f6123ff61d8ee444eac54e8b4eb31bc606 Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Jan 31 2020 23:05:46 +0000
Subject: Bump linkify to 0.4.0
Rebuild for F32 Mass Rebuild
---
diff --git a/html2pango-fix-metadata.diff b/html2pango-fix-metadata.diff
index 4c00538..370c7a5 100644
--- a/html2pango-fix-metadata.diff
+++ b/html2pango-fix-metadata.diff
@@ -1,6 +1,6 @@
---- html2pango-0.3.2/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ html2pango-0.3.2/Cargo.toml 2019-09-13T16:52:19.707960+00:00
-@@ -21,13 +21,13 @@
+--- html2pango-0.3.2/Cargo.toml 1970-01-01T00:00:00+00:00
++++ html2pango-0.3.2/Cargo.toml 2020-01-31T22:34:24.921179+00:00
+@@ -21,19 +21,19 @@
license = "GPL-3.0"
repository = "https://gitlab.gnome.org/World/html2pango"
[dependencies.ammonia]
@@ -16,3 +16,10 @@
[dependencies.lazy_static]
version = "1.3.0"
+
+ [dependencies.linkify]
+-version = "0.3.1"
++version = "0.4.0"
+
+ [dependencies.maplit]
+ version = "1.0.1"
diff --git a/rust-html2pango.spec b/rust-html2pango.spec
index 3d9dfba..6405ff0 100644
--- a/rust-html2pango.spec
+++ b/rust-html2pango.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 10
+# Generated by rust2rpm 13
%bcond_without check
%global debug_package %{nil}
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library to convert html to pango
# Upstream license specification: GPL-3.0
@@ -14,8 +14,10 @@ License: GPLv3
URL: https://crates.io/crates/html2pango
Source: %{crates_source}
# Initial patched metadata
-# - Bump ammonia to 3.0.0
-# - Bump html5ever to 0.24
+# * https://gitlab.gnome.org/World/html2pango/merge_requests/9
+# - Bump ammonia to 3.0.0
+# - Bump html5ever to 0.24
+# - Bump linkify to 0.4.0
Patch0: html2pango-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -42,7 +44,7 @@ which use "%{crate}" crate.
%files devel
%license LICENSE
%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -54,7 +56,7 @@ This package contains library source intended for building other packages
which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -75,6 +77,10 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Feb 01 00:23:14 EET 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.3.2-3
+- Bump linkify to 0.4.0
+- Rebuild for F32 Mass Rebuild
+
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/rust-html2pango/c/048383f6123ff61d8ee4...
4Â years, 4Â months
spot pushed to check (master). "disable tests on s390x"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 22:54:32 UTC
From a2cea5a35a21501b0ac0ef73f92b628b1c19c965 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 22:54:24 +0000
Subject: disable tests on s390x
---
diff --git a/check.spec b/check.spec
index dfda928..ee13a4e 100644
--- a/check.spec
+++ b/check.spec
@@ -1,6 +1,6 @@
Name: check
Version: 0.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A unit test framework for C
Source0: https://github.com/libcheck/%{name}/archive/%{version}/%{name}-%{version}...
License: LGPLv2+
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
%check
+%ifnarch s390x
export LD_LIBRARY_PATH=$PWD/src/.libs
make check
# Don't need to package the sh, log or trs files
@@ -94,6 +95,7 @@ make check
rm -rf checkmk/test/check_checkmk*
# these files are empty
rm -rf checkmk/test/empty_input
+%endif
%ldconfig_scriptlets
@@ -123,6 +125,9 @@ rm -rf checkmk/test/empty_input
%{_mandir}/man1/checkmk.1*
%changelog
+* Fri Jan 31 2020 Tom Callaway <spot(a)fedoraproject.org> - 0.14.0-3
+- disable tests on s390x
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/check/c/a2cea5a35a21501b0ac0ef73f92b62...
4Â years, 4Â months
decathorpe pushed to switchboard-plug-onlineaccounts (master). "add
upstream patch to fix FTBFS with vala 0.47+"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 22:55:09 UTC
From f89f97784f2c05b995df6a09a07bbb461e6e0e2d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Jan 31 2020 22:54:53 +0000
Subject: add upstream patch to fix FTBFS with vala 0.47+
---
diff --git a/00-vala-045-fix.patch b/00-vala-045-fix.patch
new file mode 100644
index 0000000..b67848e
--- /dev/null
+++ b/00-vala-045-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Authentification/Dialog.vala b/src/Authentification/Dialog.vala
+index d3c4a7b..d34f5da 100644
+--- a/src/Authentification/Dialog.vala
++++ b/src/Authentification/Dialog.vala
+@@ -43,7 +43,7 @@ public abstract class OnlineAccounts.Dialog : Gtk.Grid {
+ public string request_id;
+ public OnlineAccounts.SignonUIError error_code;
+
+- public Dialog (HashTable<string, Variant> parameter) {
++ protected Dialog (HashTable<string, Variant> parameter) {
+ error_code = OnlineAccounts.SignonUIError.NONE;
+ this.parameters = parameter;
+ plug.hide_request.connect (() => {
diff --git a/01-vala-047-fix.patch b/01-vala-047-fix.patch
new file mode 100644
index 0000000..7e3810f
--- /dev/null
+++ b/01-vala-047-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Authentification/WebDialog.vala b/src/Authentification/WebDialog.vala
+index 84d0f5c..eeec195 100644
+--- a/src/Authentification/WebDialog.vala
++++ b/src/Authentification/WebDialog.vala
+@@ -109,8 +109,7 @@ public class OnlineAccounts.WebDialog : OnlineAccounts.Dialog {
+ return true;
+ }
+
+- private bool on_load_uri_failed (WebKit.LoadEvent load_event, string failing_uri, void* _error) {
+- var error = (GLib.Error)_error;
++ private bool on_load_uri_failed (WebKit.LoadEvent load_event, string failing_uri, GLib.Error error) {
+ warning ("Loading uri '%s' failed, error : %s", failing_uri, error.message);
+ if (GLib.strcmp (failing_uri, oauth_open_url) == 0) {
+ error_code = OnlineAccounts.SignonUIError.NOT_AVAILABLE;
diff --git a/5fa2882.patch b/5fa2882.patch
deleted file mode 100644
index 06a84b5..0000000
--- a/5fa2882.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5fa2882f765076d20c6ef4886198a34a05159f8a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Mon, 18 Mar 2019 14:55:02 +0100
-Subject: [PATCH] Constructors of abstract classes should not be public
-
----
- src/Authentification/Dialog.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Authentification/Dialog.vala b/src/Authentification/Dialog.vala
-index d3c4a7b..d34f5da 100644
---- a/src/Authentification/Dialog.vala
-+++ b/src/Authentification/Dialog.vala
-@@ -43,7 +43,7 @@ public abstract class OnlineAccounts.Dialog : Gtk.Grid {
- public string request_id;
- public OnlineAccounts.SignonUIError error_code;
-
-- public Dialog (HashTable<string, Variant> parameter) {
-+ protected Dialog (HashTable<string, Variant> parameter) {
- error_code = OnlineAccounts.SignonUIError.NONE;
- this.parameters = parameter;
- plug.hide_request.connect (() => {
diff --git a/switchboard-plug-onlineaccounts.spec b/switchboard-plug-onlineaccounts.spec
index c3aa441..225aa37 100644
--- a/switchboard-plug-onlineaccounts.spec
+++ b/switchboard-plug-onlineaccounts.spec
@@ -6,15 +6,19 @@
Name: switchboard-plug-onlineaccounts
Summary: Switchboard Online Accounts plug
Version: 2.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
URL: https://github.com/elementary/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# upstream patch to fix new compiler errors with vala 0.45+
+# backported patch to fix new compiler errors with vala 0.45+
# https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882
-Patch0: 5fa2882.patch
+Patch0: 00-vala-045-fix.patch
+
+# backported patch to fix new compiler errors with vala 0.47+
+# https://github.com/elementary/switchboard-plug-onlineaccounts/commit/34164a9
+Patch1: 01-vala-047-fix.patch
BuildRequires: gettext
BuildRequires: meson
@@ -82,6 +86,9 @@ Obsoletes: pantheon-online-accounts-devel < %{obsoleted_version}
%changelog
+* Fri Jan 31 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.0.1-6
+- Add upstream patch to fix FTBFS with vala 0.47+.
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/switchboard-plug-onlineaccounts/c/f89f...
4Â years, 4Â months
spot pushed to tkimg (master). "fix FTBFS"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-01-31 22:44:16 UTC
From 282f16eecb7d9d0d0337851b935657be561ca706 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Jan 31 2020 22:44:08 +0000
Subject: fix FTBFS
---
diff --git a/tkimg-gcc10.patch b/tkimg-gcc10.patch
new file mode 100644
index 0000000..06d587a
--- /dev/null
+++ b/tkimg-gcc10.patch
@@ -0,0 +1,12 @@
+diff -up tkimg1.4/libpng/pngtclDecls.h.gcc10 tkimg1.4/libpng/pngtclDecls.h
+--- tkimg1.4/libpng/pngtclDecls.h.gcc10 2020-01-31 17:40:40.391470848 -0500
++++ tkimg1.4/libpng/pngtclDecls.h 2020-01-31 17:40:45.791358236 -0500
+@@ -1104,7 +1104,7 @@ typedef struct PngtclStubs {
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
++extern PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/tkimg.spec b/tkimg.spec
index 7b4d17a..a41cb5c 100644
--- a/tkimg.spec
+++ b/tkimg.spec
@@ -3,7 +3,7 @@
Name: tkimg
Version: 1.4
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: Image support library for Tk
License: BSD
URL: http://sourceforge.net/projects/tkimg
@@ -22,6 +22,8 @@ Patch6: tkimg-zlib127-gzgetc_fix.patch
# changes in libpng16
Patch7: tkimg-libpng16.patch
Patch8: tkimg-libpng-deprecated.patch
+# gcc10 has -fno-common by default
+Patch9: tkimg-gcc10.patch
# A request to allow building with system libraries has been submitted
# https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_i...
@@ -67,6 +69,7 @@ rm -rf compat/libtiff
%patch6 -p1 -b .gzgetc_fix
%patch7 -p1 -b .png16
%patch8 -p1 -b .deprecated
+%patch9 -p1 -b .gcc10
%build
%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
@@ -105,6 +108,9 @@ done
%{tcl_sitearch}/Img1.4/*.a
%changelog
+* Fri Jan 31 2020 Tom Callaway <spot(a)fedoraproject.org> - 1.4-32
+- fix FTBFS
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/tkimg/c/282f16eecb7d9d0d0337851b935657...
4Â years, 4Â months