From 298cd8eaa21a21eee85f9551a26ad294347b1d5a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Feb 2015 14:52:07 +0100 Subject: package/*: rename patches according to the new policy Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345) Signed-off-by: Samuel Martin Signed-off-by: Peter Korsgaard --- .../0001-configure-add-without-demo-option.patch | 66 ++++++++++++++++++++++ .../gnuplot/0002-use-gdlib-config-properly.patch | 27 +++++++++ ...ot-0001-configure-add-without-demo-option.patch | 66 ---------------------- .../gnuplot-0002-use-gdlib-config-properly.patch | 27 --------- 4 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 package/gnuplot/0001-configure-add-without-demo-option.patch create mode 100644 package/gnuplot/0002-use-gdlib-config-properly.patch delete mode 100644 package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch delete mode 100644 package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch (limited to 'package/gnuplot') diff --git a/package/gnuplot/0001-configure-add-without-demo-option.patch b/package/gnuplot/0001-configure-add-without-demo-option.patch new file mode 100644 index 000000000..ccca4e3aa --- /dev/null +++ b/package/gnuplot/0001-configure-add-without-demo-option.patch @@ -0,0 +1,66 @@ +Add options to enable/disable docs and demos + +Originally written by Anthony Viallard +. + +Signed-off-by: Thomas Petazzoni + +Index: gnuplot-4.6.0/configure.in +=================================================================== +--- gnuplot-4.6.0.orig/configure.in 2012-03-08 05:34:42.000000000 +0100 ++++ gnuplot-4.6.0/configure.in 2013-01-07 11:50:03.003804463 +0100 +@@ -748,6 +748,16 @@ + AC_ARG_WITH(lisp-files,dnl + [ --without-lisp-files do not build emacs lisp files]) + ++dnl Whether we want to build the demo files ++dnl Does nothing here, is passed on to the demo subdir ++AC_ARG_ENABLE(demo,dnl ++[ --disable-demo do not build demo files]) ++ ++dnl Whether we want to build the doc files ++dnl Does nothing here, is passed on to the doc subdir ++AC_ARG_ENABLE(doc,dnl ++[ --disable-doc do not build doc files]) ++ + dnl Sort help/subtopic tables by row or column + AC_ARG_WITH(row-help,dnl + [ --with-row-help format help and subtopic tables by row (default) +@@ -1200,6 +1210,24 @@ + fi + AC_SUBST(LISPDIR) + ++dnl build demo files ++if test "$enable_demo" != no; then ++ AC_CONFIG_SUBDIRS(demo) ++ DEMOSUBDIR=demo ++else ++ DEMOSUBDIR= ++fi ++AC_SUBST(DEMOSUBDIR) ++ ++dnl build doc files ++if test "$enable_doc" != no; then ++ AC_CONFIG_SUBDIRS(docs) ++ DOCSUBDIR=docs ++else ++ DOCSUBDIR= ++fi ++AC_SUBST(DOCSUBDIR) ++ + dnl Substitute variables + AC_SUBST(PACKAGE) + AC_SUBST(VERSION_MAJOR) +Index: gnuplot-4.6.0/Makefile.am +=================================================================== +--- gnuplot-4.6.0.orig/Makefile.am 2013-01-04 14:07:02.239120935 +0100 ++++ gnuplot-4.6.0/Makefile.am 2013-01-07 11:51:12.034846363 +0100 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ diff --git a/package/gnuplot/0002-use-gdlib-config-properly.patch b/package/gnuplot/0002-use-gdlib-config-properly.patch new file mode 100644 index 000000000..690a82652 --- /dev/null +++ b/package/gnuplot/0002-use-gdlib-config-properly.patch @@ -0,0 +1,27 @@ +Fix usage of gdlib-config + +gnuplot configure.in script properly takes care of finding +gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config +instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG +has defined. Which means that whenever a gdlib-config binary not in +the PATH is being used, it does not use it. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -537,9 +537,9 @@ + 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` ++ 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" diff --git a/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch deleted file mode 100644 index ccca4e3aa..000000000 --- a/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch +++ /dev/null @@ -1,66 +0,0 @@ -Add options to enable/disable docs and demos - -Originally written by Anthony Viallard -. - -Signed-off-by: Thomas Petazzoni - -Index: gnuplot-4.6.0/configure.in -=================================================================== ---- gnuplot-4.6.0.orig/configure.in 2012-03-08 05:34:42.000000000 +0100 -+++ gnuplot-4.6.0/configure.in 2013-01-07 11:50:03.003804463 +0100 -@@ -748,6 +748,16 @@ - AC_ARG_WITH(lisp-files,dnl - [ --without-lisp-files do not build emacs lisp files]) - -+dnl Whether we want to build the demo files -+dnl Does nothing here, is passed on to the demo subdir -+AC_ARG_ENABLE(demo,dnl -+[ --disable-demo do not build demo files]) -+ -+dnl Whether we want to build the doc files -+dnl Does nothing here, is passed on to the doc subdir -+AC_ARG_ENABLE(doc,dnl -+[ --disable-doc do not build doc files]) -+ - dnl Sort help/subtopic tables by row or column - AC_ARG_WITH(row-help,dnl - [ --with-row-help format help and subtopic tables by row (default) -@@ -1200,6 +1210,24 @@ - fi - AC_SUBST(LISPDIR) - -+dnl build demo files -+if test "$enable_demo" != no; then -+ AC_CONFIG_SUBDIRS(demo) -+ DEMOSUBDIR=demo -+else -+ DEMOSUBDIR= -+fi -+AC_SUBST(DEMOSUBDIR) -+ -+dnl build doc files -+if test "$enable_doc" != no; then -+ AC_CONFIG_SUBDIRS(docs) -+ DOCSUBDIR=docs -+else -+ DOCSUBDIR= -+fi -+AC_SUBST(DOCSUBDIR) -+ - dnl Substitute variables - AC_SUBST(PACKAGE) - AC_SUBST(VERSION_MAJOR) -Index: gnuplot-4.6.0/Makefile.am -=================================================================== ---- gnuplot-4.6.0.orig/Makefile.am 2013-01-04 14:07:02.239120935 +0100 -+++ gnuplot-4.6.0/Makefile.am 2013-01-07 11:51:12.034846363 +0100 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ diff --git a/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch b/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch deleted file mode 100644 index 690a82652..000000000 --- a/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix usage of gdlib-config - -gnuplot configure.in script properly takes care of finding -gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config -instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG -has defined. Which means that whenever a gdlib-config binary not in -the PATH is being used, it does not use it. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -537,9 +537,9 @@ - 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` -+ 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" -- cgit v1.2.3