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

2007-05-31 19:34:47 +00:00 · 2007-05-31 19:34:47 +00:00 · d60ff7854f
commit d60ff7854f
parent 541212488f
6 changed files with 101 additions and 32 deletions
--- a/README.whynot
+++ b/README.whynot
@ -1,10 +1,5 @@
-     Why GIF/PDF support is not enabled:
-     ===================================
+     Why PDF support is not enabled:
+     ===============================

-GIF: Support for this terminal has been dropped in favour of the PNG
-     format for legal reasons; under usual configure conditions, old
-     scripts that request gif will work but will produce a  PNG file
-     instead.
-
-PDF: Requires libpdf which is a commercial library and therefore not
-     part of SuSE LINUX.
+Requires libpdf which is a commercial library and therefore not
+part of SuSE LINUX.
--- a/gnuplot-4.0.0-fonts.dif
+++ b/gnuplot-4.0.0-fonts.dif
@ -1,11 +0,0 @@
--- src/variable.c.orig	2006-08-16 05:33:43.000000000 +0200
-+++ src/variable.c	2006-08-16 05:34:54.000000000 +0200
-@@ -257,6 +257,8 @@
-     { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
-     { "$`kpsexpand '$TEXMFLOCAL'`/fonts/type1!" },
-     /* Linux paths */
-+    { "/usr/share/fonts/Type1" },
-+    { "/usr/share/fonts/truetype" },
-     { "/usr/X11R6/lib/X11/fonts/Type1" },
-     { "/usr/X11R6/lib/X11/fonts/truetype" },
-     /* HP-UX */
--- a/gnuplot-4.2.0-fonts.dif
+++ b/gnuplot-4.2.0-fonts.dif
@ -0,0 +1,59 @@
+--- src/variable.c.orig	2006-08-16 05:33:43.000000000 +0200
+++ src/variable.c	2006-08-16 05:34:54.000000000 +0200
+@@ -257,6 +257,8 @@
+     { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
+     { "$`kpsexpand '$TEXMFLOCAL'`/fonts/type1!" },
+     /* Linux paths */
+    { "/usr/share/fonts/Type1" },
+    { "/usr/share/fonts/truetype" },
+     { "/usr/X11R6/lib/X11/fonts/Type1" },
+     { "/usr/X11R6/lib/X11/fonts/truetype" },
+     /* HP-UX */
+--- src/gplt_x11.c
+++ src/gplt_x11.c	2007-05-30 14:16:08.004124402 +0200
+@@ -133,6 +133,8 @@ Error. Incompatible options.
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>
+ #ifdef USE_X11_MULTIBYTE
+# include <locale.h>
+# include <langinfo.h>
+ # include <X11/Xlocale.h>
+ #endif
+ 
+@@ -488,8 +490,8 @@ static char *gpFallbackFont __PROTO((voi
+ static int gpXGetFontascent __PROTO((XFontStruct *cfont));
+ 
+ enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */
+-static char default_font[64] = { '\0' };
+-static char default_encoding[16] = { '\0' };
+static char default_font[256] = { '\0' };
+static char default_encoding[64] = { '\0' };
+ 
+ #define Nwidths 10
+ static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+@@ -2099,6 +2101,8 @@ exec_cmd(plot_struct *plot, char *comman
+ 		/* Save the request default font */
+ 		c = &(buffer[strlen(buffer)-1]);
+ 		while (*c <= ' ') *c-- = '\0';
+		if (strlen(&buffer[2]) == 0)
+			break;
+ 		strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
+ 		FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
+ 		break;
+@@ -5487,6 +5491,16 @@ char *fontname;
+     }
+ 
+ #ifdef USE_X11_MULTIBYTE
+    if ((!fontname || !(*fontname)) && multibyte_fonts_usable) {
+	const char * codeset = nl_langinfo(CODESET);
+	if (strcasestr(codeset, "UTF-8")) {
+		const char* utf8 = "mbfont:sazanami,16 mincho-medium,verdana-medium,16 dejavu,sans,20";
+		strncpy(default_font, utf8, strlen(utf8)+1);
+	}
+    }
+#endif
+
+#ifdef USE_X11_MULTIBYTE
+     if (fontname && strncmp(fontname, "mbfont:", 7) == 0) {
+ 	if (multibyte_fonts_usable) {
+ 	    usemultibyte = 1;
--- a/gnuplot-4.2.0.dif
+++ b/gnuplot-4.2.0.dif
@ -41,7 +41,7 @@
 pause -1 "Hit return to continue"
 
 --- demo/vector.dem
-+++ demo/vector.dem	2007-04-05 17:36:08.325186217 +0200
+++ demo/vector.dem	2007-04-05 17:36:08.325186000 +0200
@@ -62,19 +62,19 @@ splot vtot(x,y) w l
 print "Now create a file with equipotential lines"
 pause -1 "Hit return to continue"
@ -77,7 +77,7 @@
 
 reset
 --- docs/Makefile.in
-+++ docs/Makefile.in	2007-04-05 17:36:47.850365425 +0200
+++ docs/Makefile.in	2007-05-30 15:40:43.577475549 +0200
@@ -37,7 +37,7 @@
 #
 
@ -87,7 +87,16 @@
 
 # this tells GNU make not to export variables into the environment
 # But other makes dont understand its significance, so it must
-@@ -321,12 +321,16 @@ doc2hlp: doc2hlp.o termdoc.o
+@@ -239,6 +239,8 @@ html: htmldocs/gnuplot.html
+ # emacs around to do lisp pre-processing
+ htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
+ 	mkdir -p htmldocs
+	ln -sf ../../VERSION htmldocs/
+	ln -sf ../toc_entr.sty htmldocs/
+ 	latex2html -dir htmldocs -local_icons gnuplot
+ 
+ ### PDF documentation
+@@ -321,12 +323,16 @@ doc2hlp: doc2hlp.o termdoc.o
 	$(LINK) doc2hlp.o termdoc.o $(LIBS)
 
 ### gnuplot interactive help format
@ -105,7 +114,7 @@
 doc2gih: doc2gih.o termdoc.o
 	$(LINK) doc2gih.o termdoc.o $(LIBS)
 
-@@ -415,6 +419,7 @@ install: install-gih install-info
+@@ -415,6 +421,7 @@ install: install-gih install-info
 install-gih: gnuplot.gih
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
 	$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
@ -113,7 +122,7 @@
 
 install-info: gnuplot.info
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-@@ -434,6 +439,7 @@ uninstall: uninstall-gih uninstall-info
+@@ -434,6 +441,7 @@ uninstall: uninstall-gih uninstall-info
 
 uninstall-gih:
 	rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
@ -310,7 +319,7 @@
 		*tm = *tmwhen;
 		break;
 --- term/linux.trm
-+++ term/linux.trm	2007-04-05 17:38:15.433841258 +0200
+++ term/linux.trm	2007-04-05 17:38:15.433841000 +0200
@@ -80,7 +80,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));
--- a/gnuplot.changes
+++ b/gnuplot.changes
@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Wed May 30 16:12:19 CEST 2007 - werner@suse.de
+
+- Overwrite empty default font for UTF-8 locale (bug #277876)
+- Get html docs fully build and installed
+- Correct datadir
+- The patent of gif is expired
+
+------------------------------------------------------------------
 Fri May 11 16:52:57 CEST 2007 - werner@suse.de

 - Use setlocale(..,NULL) instead of gentenv() (bug #272915)
--- a/gnuplot.spec
+++ b/gnuplot.spec
@ -13,19 +13,19 @@
 Name:           gnuplot
 BuildRequires:  cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils readline-devel texlive-latex wxGTK-devel xorg-x11-devel
 URL:            http://www.gnuplot.info/
-License:        BSD License and BSD-like
+License:        BSD License and BSD-like, Einschraenkungen bei modifiziertem Code:
 Group:          Productivity/Graphics/Visualization/Graph
 Autoreqprov:    on
 PreReq:         %install_info_prereq
 Version:        4.2.0
-Release:        13
+Release:        26
 Summary:        Function Plotting Utility
 Source0:        gnuplot-4.2.0.tar.bz2
 Source2:        gnuplot-fr.doc.bz2
 Source3:        README.whynot
 Patch0:         gnuplot-4.2.0.dif
 Patch1:         gnuplot-4.2.0-x11ovf.dif
-Patch2:         gnuplot-4.0.0-fonts.dif
+Patch2:         gnuplot-4.2.0-fonts.dif
 Patch3:         gnuplot-4.2.0-wxt.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@ -87,7 +87,7 @@ test $? -eq 0 || exit 1
 	--mandir=%{_mandir}	\
 	--infodir=%{_infodir}	\
 	--libexecdir=/usr/%_lib	\
-	--datadir=/usr/share/gnuplot	\
+	--datadir=%{_datadir}	\
 	--with-gcc		\
 	--with-x		\
 	--x-includes=%{_x11inc}		\
@ -97,6 +97,7 @@ test $? -eq 0 || exit 1
 	--with-linux-vga	\
 	--with-gif=png		\
 	--with-freetype=/usr/%_lib	\
+	--enable-x11-mbfonts	\
 	--with-zlib		\
 	--with-gd		\
 	--enable-thin-splines	\
@ -121,8 +122,11 @@ test $? -eq 0 || exit 1
    mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc
    mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc/html
    mkdir -p $RPM_BUILD_ROOT/%{_docdir}/gnuplot/demo
+    rm  -vf docs/htmldocs/images.{aux,idx,log,out,tex}
    rm  -vf docs/htmldocs/*.pl
+    rm  -vf docs/htmldocs/*.sty
    rm  -vf docs/htmldocs/WARNINGS
+    rm  -vf docs/htmldocs/VERSION
    rm -rvf demo/html
    install -m 0444 docs/*.info*      $RPM_BUILD_ROOT/%{_infodir}/
    install -m 0444 docs/*.pdf        $RPM_BUILD_ROOT/%{_docdir}/gnuplot/doc/
@ -158,11 +162,16 @@ test $? -eq 0 || exit 1
 /usr/%{_lib}/gnuplot
 %doc %{_infodir}/%{name}.info.gz
 %doc %{_mandir}/man1/gnuplot.1.gz
-/usr/share/gnuplot
-/usr/share/texmf/tex/latex/gnuplot/
+%{_datadir}/gnuplot
+%{_datadir}/texmf/tex/latex/gnuplot/
 %{_appdef}/Gnuplot.app-defaults

 %changelog
+* Wed May 30 2007 - werner@suse.de
+- Overwrite empty default font for UTF-8 locale (bug #277876)
+- Get html docs fully build and installed
+- Correct datadir
+- The patent of gif is expired
 * Fri May 11 2007 - werner@suse.de
 - Use setlocale(..,NULL) instead of gentenv() (bug #272915)
 * Tue Apr 24 2007 - werner@suse.de