commit
63db6e1d43
@ -1,79 +0,0 @@
|
||||
From f10e917b252a809daf9f7650011f68edc6be81b0 Mon Sep 17 00:00:00 2001
|
||||
From: Evgeny Stambulchik <fnevgeny@gmail.com>
|
||||
Date: Sun, 4 Aug 2019 00:50:34 +0300
|
||||
Subject: [PATCH] Make constructors of abstract classes protected
|
||||
|
||||
This should fix #445.
|
||||
---
|
||||
src/classes/action/action_mapping.vala | 2 +-
|
||||
src/classes/drawings/storage.vala | 2 +-
|
||||
src/classes/renderer/cache/base.vala | 2 +-
|
||||
src/classes/timer_label.vala | 2 +-
|
||||
src/classes/view/behaviour/base.vala | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/classes/action/action_mapping.vala b/src/classes/action/action_mapping.vala
|
||||
index 780f80a..0abc307 100644
|
||||
--- a/src/classes/action/action_mapping.vala
|
||||
+++ b/src/classes/action/action_mapping.vala
|
||||
@@ -48,7 +48,7 @@ namespace pdfpc {
|
||||
* methods, and we need blank objects to call them. Thus, this blank
|
||||
* constructor.
|
||||
*/
|
||||
- public ActionMapping() {
|
||||
+ protected ActionMapping() {
|
||||
base();
|
||||
}
|
||||
|
||||
diff --git a/src/classes/drawings/storage.vala b/src/classes/drawings/storage.vala
|
||||
index 6c6e7f9..e5ceaa9 100644
|
||||
--- a/src/classes/drawings/storage.vala
|
||||
+++ b/src/classes/drawings/storage.vala
|
||||
@@ -35,7 +35,7 @@ namespace pdfpc.Drawings.Storage {
|
||||
*/
|
||||
protected Metadata.Pdf metadata;
|
||||
|
||||
- public Base(Metadata.Pdf metadata) {
|
||||
+ protected Base(Metadata.Pdf metadata) {
|
||||
this.metadata = metadata;
|
||||
}
|
||||
|
||||
diff --git a/src/classes/renderer/cache/base.vala b/src/classes/renderer/cache/base.vala
|
||||
index d60730e..2dc39ac 100644
|
||||
--- a/src/classes/renderer/cache/base.vala
|
||||
+++ b/src/classes/renderer/cache/base.vala
|
||||
@@ -37,7 +37,7 @@ namespace pdfpc.Renderer.Cache {
|
||||
/**
|
||||
* Initialize the cache store
|
||||
*/
|
||||
- public Base(Metadata.Pdf metadata) {
|
||||
+ protected Base(Metadata.Pdf metadata) {
|
||||
this.metadata = metadata;
|
||||
}
|
||||
|
||||
diff --git a/src/classes/timer_label.vala b/src/classes/timer_label.vala
|
||||
index 8b55acc..8d689e1 100644
|
||||
--- a/src/classes/timer_label.vala
|
||||
+++ b/src/classes/timer_label.vala
|
||||
@@ -95,7 +95,7 @@ namespace pdfpc {
|
||||
* Default constructor taking the initial time as argument, as well as
|
||||
* the time to countdown until the talk actually starts.
|
||||
*/
|
||||
- public TimerLabel(PresentationController controller, time_t start_time = 0) {
|
||||
+ protected TimerLabel(PresentationController controller, time_t start_time = 0) {
|
||||
this.controller = controller;
|
||||
this.start_time = start_time;
|
||||
}
|
||||
diff --git a/src/classes/view/behaviour/base.vala b/src/classes/view/behaviour/base.vala
|
||||
index 4382ba6..46c8808 100644
|
||||
--- a/src/classes/view/behaviour/base.vala
|
||||
+++ b/src/classes/view/behaviour/base.vala
|
||||
@@ -41,7 +41,7 @@ namespace pdfpc.View {
|
||||
/**
|
||||
* Base constructor not taking any arguments
|
||||
*/
|
||||
- public Base() {
|
||||
+ protected Base() {
|
||||
// Nothing to do here
|
||||
}
|
||||
|
||||
13
pdfpc.spec
13
pdfpc.spec
@ -1,13 +1,15 @@
|
||||
Name: pdfpc
|
||||
Version: 4.3.4
|
||||
Release: 2
|
||||
Version: 4.5.0
|
||||
Release: 1
|
||||
Summary: A GTK based presentation viewer application for GNU/Linux
|
||||
License: GPLv2+
|
||||
URL: https://%{name}.github.io/
|
||||
Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz
|
||||
Patch0: 0001-make-constructors-of-abstract-classes-protected.patch
|
||||
BuildRequires: cmake gcc gtk3-devel gstreamer1-devel gstreamer1-plugins-base-devel
|
||||
BuildRequires: librsvg2-devel libgee-devel pango-devel poppler-glib-devel vala vala-devel
|
||||
BuildRequires: json-glib-devel
|
||||
BuildRequires: libmarkdown-devel
|
||||
BuildRequires: webkit2gtk3-devel
|
||||
|
||||
%description
|
||||
pdfpc is a GTK based presentation viewer application for GNU/Linux which uses
|
||||
@ -30,7 +32,7 @@ make %{?_smp_mflags}
|
||||
%make_install
|
||||
|
||||
%files
|
||||
%doc README.rst CHANGELOG.txt
|
||||
%doc README.rst CHANGELOG.rst
|
||||
%{_bindir}/%{name}
|
||||
%license LICENSE.txt
|
||||
%config(noreplace) %{_sysconfdir}/%{name}rc
|
||||
@ -39,6 +41,9 @@ make %{?_smp_mflags}
|
||||
%{_datadir}/pixmaps/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Jan 04 2022 yaoxin <yaoxin30@huawei.com> - 4.5.0-1
|
||||
- Upgrade pdfpc to 4.5.0
|
||||
|
||||
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.3.4-2
|
||||
- DESC: delete -S git from %autosetup, and delete BuildRequires git-core
|
||||
|
||||
|
||||
BIN
v4.3.4.tar.gz
BIN
v4.3.4.tar.gz
Binary file not shown.
BIN
v4.5.0.tar.gz
Normal file
BIN
v4.5.0.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user