[packages/pacemaker] - added no-common patch (fix build with -fno-common, gcc 10 default) - merged inkscape from DEVEL-pa

[qboosh]

commit 0a61a3d8e15166c1faf3696c3e0081edb392be8d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 31 10:25:01 2020 +0200

    - added no-common patch (fix build with -fno-common, gcc 10 default)
    - merged inkscape from DEVEL-pacemaker-2 branch (adjust for inkscape 1.0 options)

 pacemaker-inkscape.patch  | 19 +++++++++++++++++++
 pacemaker-no-common.patch | 11 +++++++++++
 pacemaker.spec            |  6 +++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 5fcdb06..06656ca 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -30,6 +30,8 @@ Patch1:		%{name}-manpage_xslt.patch
 Patch2:		%{name}-update.patch
 Patch4:		%{name}-libs.patch
 Patch5:		%{name}-heartbeat-libexecdir.patch
+Patch6:		%{name}-no-common.patch
+Patch7:		%{name}-inkscape.patch
 URL:		http://clusterlabs.org/wiki/Main_Page
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel}
 BuildRequires:	asciidoc
@@ -68,7 +70,7 @@ BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	systemd-units
 BuildRequires:	swig
 %if %{with doc}
-BuildRequires:	inkscape
+BuildRequires:	inkscape >= 1.0
 BuildRequires:	publican
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
@@ -204,6 +206,8 @@ Dokumentacja do Pacemakera.
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
diff --git a/pacemaker-inkscape.patch b/pacemaker-inkscape.patch
new file mode 100644
index 0000000..39f5e64
--- /dev/null
+++ b/pacemaker-inkscape.patch
@@ -0,0 +1,19 @@
+--- pacemaker-Pacemaker-2.0.3/doc/Makefile.am.orig	2019-11-25 23:54:47.000000000 +0100
++++ pacemaker-Pacemaker-2.0.3/doc/Makefile.am	2020-05-28 06:15:03.122900431 +0200
+@@ -85,13 +85,13 @@
+ graphics: $(PNGS)
+ 
+ %.png: %.svg
+-	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=90 -C --export-png=$@ $(PCMK_quiet)
++	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=90 -C -o $@ $(PCMK_quiet)
+ 
+ %-small.png: %.svg
+-	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=45 -C --export-png=$@ $(PCMK_quiet)
++	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=45 -C -o $@ $(PCMK_quiet)
+ 
+ %-large.png: %.svg
+-	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=180 -C --export-png=$@ $(PCMK_quiet)
++	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=180 -C -o $@ $(PCMK_quiet)
+ 
+ if IS_ASCIIDOC
+ ASCIIDOC_HTML_ARGS	= --unsafe --backend=xhtml11
diff --git a/pacemaker-no-common.patch b/pacemaker-no-common.patch
new file mode 100644
index 0000000..5f73adf
--- /dev/null
+++ b/pacemaker-no-common.patch
@@ -0,0 +1,11 @@
+--- pacemaker-Pacemaker-1.1.22/lrmd/lrmd_private.h.orig	2019-11-27 01:47:19.000000000 +0100
++++ pacemaker-Pacemaker-1.1.22/lrmd/lrmd_private.h	2020-05-31 09:47:18.614948846 +0200
+@@ -32,7 +32,7 @@
+ 
+ #define LRMD_ISOLATION_PROVIDER ".isolation"
+ 
+-GHashTable *rsc_list;
++extern GHashTable *rsc_list;
+ 
+ typedef struct lrmd_rsc_s {
+     char *rsc_id;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/0a61a3d8e15166c1faf3696c3e0081edb392be8d