Accepting request 575871 from Publishing

OBS-URL: https://build.opensuse.org/request/show/575871
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuplot?expand=0&rev=66

gnuplot-4.6.0.dif

@@ -9,9 +9,11 @@
  gnuplot-5.2.0/term/linux.trm      |    4 ++--
  8 files changed, 44 insertions(+), 17 deletions(-)
 
---- gnuplot-5.2.0/configure.ac
+Index: gnuplot-5.2.2/configure.ac
-+++ gnuplot-5.2.0/configure.ac	2017-09-27 10:04:22.506816233 +0000
+===================================================================
-@@ -363,7 +363,7 @@ if test "$with_linux_vga" = yes; then
+--- gnuplot-5.2.2.orig/configure.ac
++++ gnuplot-5.2.2/configure.ac
+@@ -365,7 +365,7 @@ if test "$with_linux_vga" = yes; then
      [AC_DEFINE(LINUXVGA,1,
                 [ Define if this is a Linux system with SuperVGA library. ])
       LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
@@ -20,8 +22,10 @@
      with_linux_vga=no)
  fi
  
---- gnuplot-5.2.0/docs/Makefile.am
+Index: gnuplot-5.2.2/docs/Makefile.am
-+++ gnuplot-5.2.0/docs/Makefile.am	2017-09-27 10:05:25.857675880 +0000
+===================================================================
+--- gnuplot-5.2.2.orig/docs/Makefile.am
++++ gnuplot-5.2.2/docs/Makefile.am
 @@ -42,7 +42,7 @@
  #
  
@@ -64,21 +68,10 @@
  
  alldoc2gih_SOURCES = doc2gih.c termdoc.c
  alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
---- gnuplot-5.2.0/docs/gnuplot-fr.doc
+Index: gnuplot-5.2.2/src/gadgets.h
-+++ gnuplot-5.2.0/docs/gnuplot-fr.doc	2017-09-27 10:04:22.510816162 +0000
+===================================================================
-@@ -436,8 +436,8 @@ C
+--- gnuplot-5.2.2.orig/src/gadgets.h
- #Home      & same as \verb~^A~. \\
++++ gnuplot-5.2.2/src/gadgets.h
- #Ctrl Home & same as \verb~^E~. \\
- #Esc       & same as \verb~^U~. \\
--#Help      & `{\bf help}' plus Entrée. \\
--#Ctrl Help & `{\bf help }'. \\
-+#Help      & `{\bf help}` plus Entrée. \\
-+#Ctrl Help & `{\bf help }`. \\
- %c l .
- %Touche fléchée@Fonction
- %_
---- gnuplot-5.2.0/src/gadgets.h
-+++ gnuplot-5.2.0/src/gadgets.h	2017-09-27 10:04:22.510816162 +0000
 @@ -489,7 +489,7 @@ extern TBOOLEAN	clip_lines1;
  extern TBOOLEAN	clip_lines2;
  extern TBOOLEAN	clip_points;
@@ -88,8 +81,10 @@
  extern int samples_1;
  extern int samples_2;
  
---- gnuplot-5.2.0/src/gplt_x11.c
+Index: gnuplot-5.2.2/src/gplt_x11.c
-+++ gnuplot-5.2.0/src/gplt_x11.c	2017-09-27 10:04:22.510816162 +0000
+===================================================================
+--- gnuplot-5.2.2.orig/src/gplt_x11.c
++++ gnuplot-5.2.2/src/gplt_x11.c
 @@ -2526,9 +2526,12 @@ exec_cmd(plot_struct *plot, char *comman
  	}
      }
@@ -106,8 +101,10 @@
      else if (*buffer == 'A')
  	sscanf(buffer + 1, "%lf", &plot->angle);
  
---- gnuplot-5.2.0/src/plot.c
+Index: gnuplot-5.2.2/src/plot.c
-+++ gnuplot-5.2.0/src/plot.c	2017-09-27 10:04:22.510816162 +0000
+===================================================================
+--- gnuplot-5.2.2.orig/src/plot.c
++++ gnuplot-5.2.2/src/plot.c
 @@ -219,6 +219,7 @@ static int asked_privi = 0;
  void
  drop_privilege()
@@ -171,8 +168,10 @@
  #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
      /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
       * It is used to parse a 'gnuplot' specific section in '~/.inputrc'
---- gnuplot-5.2.0/src/term.h
+Index: gnuplot-5.2.2/src/term.h
-+++ gnuplot-5.2.0/src/term.h	2017-09-27 10:04:22.514816090 +0000
+===================================================================
+--- gnuplot-5.2.2.orig/src/term.h
++++ gnuplot-5.2.2/src/term.h
 @@ -242,9 +242,9 @@
  #include "emf.trm"
  
@@ -194,8 +193,10 @@
  
  /* Frame Maker MIF 3.00 format driver */
  #ifdef HAVE_MIF
---- gnuplot-5.2.0/term/linux.trm
+Index: gnuplot-5.2.2/term/linux.trm
-+++ gnuplot-5.2.0/term/linux.trm	2017-09-27 10:04:22.514816090 +0000
+===================================================================
+--- gnuplot-5.2.2.orig/term/linux.trm
++++ gnuplot-5.2.2/term/linux.trm
 @@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
  TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
  TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));

gnuplot-gd.patch

@@ -0,0 +1,87 @@
+Index: gnuplot-5.2.2/configure.ac
+===================================================================
+--- gnuplot-5.2.2.orig/configure.ac
++++ gnuplot-5.2.2/configure.ac
+@@ -570,63 +570,13 @@ AC_ARG_WITH(gd,dnl
+   with_gd=yes)
+ 
+ if test "$with_gd" != no; then
+-  AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
+-  if test -n "$GDLIB_CONFIG"; then
+-    libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
+-    libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
+-    libgd_LIBS=`$GDLIB_CONFIG --libs`
+-  elif test -d "$with_gd"; then
+-    libgd_CPPFLAGS="-I$with_gd/include"
+-    libgd_LDFLAGS="-L$with_gd/lib"
+-    libgd_LIBS="-ljpeg -lpng -lfreetype -lz"
+-  fi
+-
+-  _cppflags="$CPPFLAGS"
+-  _ldflags="$LDFLAGS"
+-  _libs="$LIBS"
+-  CPPFLAGS="$CPPFLAGS $libgd_CPPFLAGS"
+-  LDFLAGS="$LDFLAGS $libgd_LDFLAGS"
+-  LIBS="$LIBS $libgd_LIBS"
+-
+-  AC_CHECK_LIB(gd,gdImageCreateTrueColor,
+-    [dnl found gd library
++PKG_CHECK_MODULES([GD], [gdlib], [ 
+      AC_DEFINE(HAVE_LIBGD,1,[ Define if you have gd library. ])
+-     AC_CHECK_HEADERS(gd.h,,
+-       AC_MSG_WARN([please add path to gd.h to CPPFLAGS in Makefile]))
+-
+-     dnl gif support in libgd
+-     AC_CHECK_LIB(gd,gdImageGif,
+-       [AC_DEFINE(HAVE_GD_GIF,1,[ Define if libgd supports gif. ])])
+-     AC_CHECK_LIB(gd,gdImageGifAnimBegin,
+-       [AC_DEFINE(GIF_ANIMATION,1,[ Define if libgd supports animated gifs. ])])
+-
+-     dnl jpeg support in libgd
+-     AC_CHECK_LIB(gd,gdImageJpeg,
+-       [AC_DEFINE(HAVE_GD_JPEG,1,[ Define if libgd supports jpeg. ])])
+-
+-     dnl freetype support in libgd
+-     AC_CHECK_LIB(gd,gdImageStringFT,
+-       AC_DEFINE(HAVE_GD_TTF,1,
+-           [ Define if libgd supports TrueType fonts through libfreetype. ]))
+-
+-     dnl png support in libgd
+-     AC_CHECK_LIB(gd,gdImagePng,
+-       [AC_DEFINE(HAVE_GD_PNG,1,[ Define if libgd supports png. ])])
+-
+-    ],[dnl gd library not found
+-       AC_MSG_WARN([libgd not found or too old, version >= 2.0 is required])
+-       with_gd=no
+-    ])
+-
+-  dnl piece it all together
+-  if test "$with_gd" = no; then
+-    CPPFLAGS="$_cppflags"
+-    LDFLAGS="$_ldflags"
+-    LIBS="$_libs"
+-  else
+-    LIBS="$_libs"
+-    TERMLIBS="$TERMLIBS -lgd $libgd_LIBS"
+-  fi
++     AC_DEFINE(HAVE_GD_GIF,1,[ Define if libgd supports gif. ])
++     AC_DEFINE(GIF_ANIMATION,1,[ Define if libgd supports animated gifs. ])
++     AC_DEFINE(HAVE_GD_JPEG,1,[ Define if libgd supports jpeg. ])
++     AC_DEFINE(HAVE_GD_TTF,1, [ Define if libgd supports TrueType fonts through libfreetype. ])
++     AC_DEFINE(HAVE_GD_PNG,1,[ Define if libgd supports png. ])])
+ 
+ fi
+ dnl end gd
+Index: gnuplot-5.2.2/src/Makefile.am
+===================================================================
+--- gnuplot-5.2.2.orig/src/Makefile.am
++++ gnuplot-5.2.2/src/Makefile.am
+@@ -58,7 +58,7 @@ tabulate.c tabulate.h \
+ template.h term_api.h term.c term.h time.c unset.c util.c util.h \
+ util3d.c util3d.h variable.c variable.h version.c version.h
+ 
+-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
++gnuplot_LDADD = $(GD_LIBS) $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
+ 
+ pkglibexec_PROGRAMS = 
+ 

gnuplot.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 12 18:26:08 UTC 2018 - crrodriguez@opensuse.org
+
+- Do not use xorg-x11-* as buildrequires
+- Fix broken GD libs detection (gnuplot-gd.patch) 
+- Remove unneeded buildrequires.
+
 -------------------------------------------------------------------
 Thu Nov 16 07:52:31 UTC 2017 - werner@suse.de
 

gnuplot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnuplot
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,15 +27,15 @@ BuildRequires:  ImageMagick
 BuildRequires:  automake
 BuildRequires:  cairo-devel
 BuildRequires:  emacs-nox
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel
+BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  libjpeg-devel
 BuildRequires:  netpbm
 BuildRequires:  pango-devel
 BuildRequires:  readline-devel
 BuildRequires:  pkgconfig(caca)
+BuildRequires:  pkgconfig(x11)
 %if %qtver >= 5
 BuildRequires:  libqt5-linguist-devel
 BuildRequires:  pkgconfig(Qt5Core)
@@ -70,7 +70,6 @@ BuildRequires:  tex(pdftex.def)
 BuildRequires:  tex(subfigure.sty)
 %endif
 BuildRequires:  fdupes
-BuildRequires:  libpng-devel
 BuildRequires:  lua-devel
 BuildRequires:  plotutils-devel
 %if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1310
@@ -80,8 +79,6 @@ BuildRequires:  wxWidgets-devel
 %else
 BuildRequires:  wxWidgets-devel >= 3
 %endif
-BuildRequires:  xorg-x11
-BuildRequires:  xorg-x11-devel
 Url:            http://www.gnuplot.info/
 Version:        5.2.2
 Release:        0
@@ -107,6 +104,7 @@ Patch2:         gnuplot-4.6.0-fonts.diff
 Patch4:         gnuplot-4.6.0-demo.diff
 Patch5:         gnuplot-wx3.diff
 Patch6:         gnuplot-QtCore-PIC.dif
+Patch7:         gnuplot-gd.patch
 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"
@@ -158,7 +156,7 @@ cp %{_sourcedir}/picins.sty docs
 %patch1 -p0 -b .x11ovf
 %patch5 -p1 -b .w3x
 %patch6 -p0 -b .pic
-
+%patch7 -p1 -b .gd
 %build
 autoreconf -fi
 
@@ -205,7 +203,7 @@ autoreconf -fi
 	--enable-h3d-gridbox	\
 %endif
 	--enable-backwards-compatibility\
-	--with-gd		\
+	--with-gd=%{_usr}		\
 	--without-row-help	\
 	--with-kpsexpand	\
 	--with-caca		\