Accepting request 292328 from home:jengelh:branches:Publishing

- Enable CACA output module
- Build with wxWidgets 3. Add patch gnuplot-wx3.diff

OBS-URL: https://build.opensuse.org/request/show/292328
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=63

gnuplot-wx3.diff

@@ -0,0 +1,22 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2015-03-22 15:21:46.000000000 +0100
+
+gnuplot's wxt_gui.cpp (*not* wxWidgets) uses XInitThreads, but
+the program does not link in X11 and runs into a build error
+otherwise.
+---
+ src/Makefile.am |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gnuplot-5.0.0/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.0.orig/src/Makefile.am
++++ gnuplot-5.0.0/src/Makefile.am
+@@ -93,6 +93,7 @@ $(EXTRA_gnuplot_SOURCES)
+ 
+ if BUILD_WXWIDGETS
+ gnuplot_SOURCES += wxterminal/wxt_gui.cpp
++gnuplot_LDADD += -lX11
+ endif
+ 
+ if BUILD_GPCAIRO

gnuplot.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Mar 22 14:08:18 UTC 2015 - jengelh@inai.de
+
+- Enable CACA output module
+- Build with wxWidgets 3. Add patch gnuplot-wx3.diff
+
 -------------------------------------------------------------------
 Sat Jan 31 12:54:31 UTC 2015 - alinm.elena@gmail.com
 

gnuplot.spec

@@ -36,6 +36,7 @@ BuildRequires:  libqt5-linguist-devel
 BuildRequires:  netpbm
 BuildRequires:  pango-devel
 BuildRequires:  readline-devel
+BuildRequires:  pkgconfig(caca)
 %if %qtver >= 5
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -66,7 +67,13 @@ BuildRequires:  fdupes
 BuildRequires:  libpng-devel
 BuildRequires:  lua-devel
 BuildRequires:  plotutils-devel
+%if 0%{?suse_version} > 0 && %{?suse_version} <= 1310
 BuildRequires:  wxWidgets-devel
+%define _use_internal_dependency_generator 0
+%define __find_requires %wx_requires
+%else
+BuildRequires:  wxWidgets-devel >= 3
+%endif
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-devel
 Url:            http://www.gnuplot.info/
@@ -91,6 +98,7 @@ Patch0:         gnuplot-4.6.0.dif
 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
 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"
@@ -106,8 +114,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _x11inc     %{_includedir}
 %define _appdef     %{_x11data}/app-defaults
 %endif
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
 
 %description
 GNUplot is a command line driven interactive function plotting utility.
@@ -133,8 +139,7 @@ and can easily be extended to include new devices.
 %{name} documentation files including the man and info pages
 
 %prep
-%setup -q
+%setup -qa 4
-%setup -T -D -a 4
 bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
 test $? -eq 0 || exit 1
 cp %{_sourcedir}/picins.sty docs
@@ -142,8 +147,10 @@ cp %{_sourcedir}/picins.sty docs
 %patch4 -p 0 -b .demo
 %patch0 -p 0 -b .0
 %patch1 -p 0 -b .x11ovf
+%patch5 -p1
 
 %build
+autoreconf -fi
 
     SECSVGA="-DSVGA_IS_SECURE=1"
     export  CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
@@ -190,6 +197,7 @@ cp %{_sourcedir}/picins.sty docs
 	--with-gd		\
 	--without-row-help	\
 	--with-kpsexpand	\
+	--with-caca		\
 	--with-qt=qt%{qtver}
 
 %if %{qtver} >= 5