rpm/gnuplot
SHA256
1
0
Fork 0
forked from pool/gnuplot
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=65
This commit is contained in:
Dr. Werner Fink 2015-05-21 08:17:45 +00:00 committed by Git OBS Bridge
parent 52318a5d62
commit e5ebeae97e
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnuplot-QtCore-PIC.dif Normal file
View File

@ -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

6
gnuplot.changes
View File

@ -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

14
gnuplot.spec
View File

@ -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