Hello community, here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2015-03-30 19:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuplot (Old) and /work/SRC/openSUSE:Factory/.gnuplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2015-02-06 10:16:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2015-03-30 19:10:39.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Mar 22 14:08:18 UTC 2015 - [email protected] + +- Enable CACA output module +- Build with wxWidgets 3. Add patch gnuplot-wx3.diff + +------------------------------------------------------------------- New: ---- gnuplot-wx3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.2tux7G/_old 2015-03-30 19:10:40.000000000 +0200 +++ /var/tmp/diff_new_pack.2tux7G/_new 2015-03-30 19:10:40.000000000 +0200 @@ -36,6 +36,7 @@ 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: 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 @@ 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 @@ %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 @@ %{name} documentation files including the man and info pages %prep -%setup -q -%setup -T -D -a 4 +%setup -qa 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 @@ %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 @@ --with-gd \ --without-row-help \ --with-kpsexpand \ + --with-caca \ --with-qt=qt%{qtver} %if %{qtver} >= 5 ++++++ gnuplot-wx3.diff ++++++ From: Jan Engelhardt <[email protected]> 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
