From e5ebeae97efa081560c351d334643de2fab9326220a078d1167e4e9a778bf8cb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 21 May 2015 08:17:45 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=65 --- gnuplot-QtCore-PIC.dif | 18 ++++++++++++++++++ gnuplot.changes | 6 ++++++ gnuplot.spec | 14 ++++++++------ 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 gnuplot-QtCore-PIC.dif diff --git a/gnuplot-QtCore-PIC.dif b/gnuplot-QtCore-PIC.dif new file mode 100644 index 0000000..bc5a684 --- /dev/null +++ b/gnuplot-QtCore-PIC.dif @@ -0,0 +1,18 @@ +Since QtCore is build with -reduce-relocations a -fPIC is required + +--- + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +--- src/Makefile.am ++++ src/Makefile.am 2015-05-21 08:09:36.882019332 +0000 +@@ -158,6 +158,9 @@ clean-local: clean-qt-extra clean-demo + + gnuplot_SOURCES += qtterminal/qt_term.cpp + ++qtterminal/%.$(OBJEXT): qtterminal/%.cpp ++ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -fPIC -c -o $@ $< ++ + pkglibexec_PROGRAMS += gnuplot_qt + + $(gnuplot_qt_OBJECTS) : ui_QtGnuplotSettings.h diff --git a/gnuplot.changes b/gnuplot.changes index a5da128..cff550d 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 21 08:12:01 UTC 2015 - werner@suse.de + +- Since QtCore is build with -reduce-relocations a -fPIC is required + therefore add patch gnuplot-QtCore-PIC.dif + ------------------------------------------------------------------- Sun Mar 22 14:08:18 UTC 2015 - jengelh@inai.de diff --git a/gnuplot.spec b/gnuplot.spec index 0f862fb..d4aa982 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -99,6 +99,7 @@ Patch1: gnuplot-4.4.0-x11ovf.dif Patch2: gnuplot-4.6.0-fonts.diff Patch4: gnuplot-4.6.0-demo.diff Patch5: gnuplot-wx3.diff +Patch6: gnuplot-QtCore-PIC.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -143,11 +144,12 @@ and can easily be extended to include new devices. bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc test $? -eq 0 || exit 1 cp %{_sourcedir}/picins.sty docs -%patch2 -p 0 -b .font -%patch4 -p 0 -b .demo -%patch0 -p 0 -b .0 -%patch1 -p 0 -b .x11ovf -%patch5 -p1 +%patch2 -p0 -b .font +%patch4 -p0 -b .demo +%patch0 -p0 -b .0 +%patch1 -p0 -b .x11ovf +%patch5 -p1 -b .w3x +%patch6 -p0 -b .pic %build autoreconf -fi