[1/1] rrdtool: bump version to 1.6.0

As the second version of this patch with deleted function
RRDTOOL_AUTORECONF = YES
RRDTOOL_GETTEXTIZE = YES

will not work in all situations, my question is if this first version
can be used for the update of RRDTool to version 1.6.0

Best regards,
Roland

-----Ursprüngliche Nachricht----- 
From: Roland Franke
Sent: Monday, May 9, 2016 10:10 PM
To: buildroot@buildroot.org
Cc: Roland Franke
Subject: [PATCH 1/1] rrdtool: bump version to 1.6.0

delete patch 0001-Add-configure-option-to-disable-documentation.patch
as this is now include in the new version.

Signed-off-by: Roland Franke <fli4l@franke-prem.de>
---
...configure-option-to-disable-documentation.patch | 
71 ----------------------
package/rrdtool/rrdtool.hash                       |  2 +-
package/rrdtool/rrdtool.mk                         |  3 +-
3 files changed, 2 insertions(+), 74 deletions(-)
delete mode 100644 
package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch

diff --git 
a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch 
b/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch
deleted file mode 100644
index afb6292..0000000
---  
a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From deaef0790f3cbbce826275d3564551fc9568b628 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 2 Dec 2015 14:31:52 -0300
-Subject: [PATCH] Add configure option to disable documentation
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- Makefile.am  | 6 +++++-
- configure.ac | 8 ++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f45975c..1f46a9b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,11 @@ RSYNC = rsync --rsh=ssh
-
- # build the following subdirectories
-
--SUBDIRS = po src doc bindings tests
-+SUBDIRS = po src bindings tests
-+
-+if BUILD_DOCS
-+SUBDIRS += doc
-+endif
-
- if BUILD_EXAMPLES
- SUBDIRS += examples
-diff --git a/configure.ac b/configure.ac
-index dc70e7d..7460c67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,6 +100,9 @@ AC_ARG_VAR(RRDGRAPH_YLEGEND_ANGLE,
- AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0},
-  [Vertical label angle: -90.0 (default) or 90.0])
-
-+AC_ARG_ENABLE(docs,AS_HELP_STRING([--disable-docs],[disable building 
documentation]),
-+[],[enable_docs=yes])
-+
- AC_ARG_ENABLE(examples,AS_HELP_STRING([--disable-examples],[disable 
building of examples]),
- [],[enable_examples=yes])
-
-@@ -115,6 +118,7 @@ 
AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all 
rrd_gr
- AC_ARG_ENABLE(rrd_restore,AS_HELP_STRING([--disable-rrd_restore],[disable 
rrd_restore XML import functions]),
- [],[enable_rrd_restore=yes])
-
-+AM_CONDITIONAL(BUILD_DOCS,[test $enable_docs != no])
- AM_CONDITIONAL(BUILD_EXAMPLES,[test $enable_examples != no])
- AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
- AM_CONDITIONAL(BUILD_RRDCACHED,[test $enable_rrdcached != no])
-@@ -945,6 +949,8 @@ fi
-
- AC_SUBST(COMP_PYTHON)
-
-+if test $enable_docs != no; then
-+
- dnl Check for nroff
- AC_ARG_VAR(NROFF, [path to the local nroff version])
- AC_PATH_PROGS(NROFF, [gnroff nroff])
-@@ -961,6 +967,8 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] 
Documentation directory])
- if test -z "$RRDDOCDIR"; then
-    RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
-
-+fi
-+
- # systemd check
- PKG_PROG_PKG_CONFIG
- AC_ARG_WITH([systemdsystemunitdir],
--- 
-2.4.10
-
RRDTOOL_INSTALL_STAGING = YES

Hello,

On Mon, 18 Jul 2016 14:12:22 +0200, Roland Franke wrote:
> As the second version of this patch with deleted function
> RRDTOOL_AUTORECONF = YES
> RRDTOOL_GETTEXTIZE = YES
> 
> will not work in all situations, my question is if this first version
> can be used for the update of RRDTool to version 1.6.0
> 
> Best regards,
> Roland

I've applied your patch, after doing some fixes:

    [Thomas:
     - add dependency on gettext when needed
     - add comment about why autoreconf/gettextize are kept
     - cleanup commit log.]

Thanks!

Thomas

Hello,

> On Mon, 18 Jul 2016 14:12:22 +0200, Roland Franke wrote:
>> As the second version of this patch with deleted function
>> RRDTOOL_AUTORECONF = YES
>> RRDTOOL_GETTEXTIZE = YES
>> 
>> will not work in all situations, my question is if this first version
>> can be used for the update of RRDTool to version 1.6.0

> I've applied your patch, after doing some fixes:

>     [Thomas:
>      - add dependency on gettext when needed
>      - add comment about why autoreconf/gettextize are kept
>      - cleanup commit log.]

As i have made an mistake by me local, my checkout is complete
down and i will not be able to come back to an point for bring 
up an clean patch in the system (Sorry).
So anyone feel free to do that instead of me.

Best regards,
Roland

Hello,

On Tue, 19 Jul 2016 10:06:06 +0200, Roland Franke wrote:

> As i have made an mistake by me local, my checkout is complete
> down and i will not be able to come back to an point for bring 
> up an clean patch in the system (Sorry).
> So anyone feel free to do that instead of me.

I already cleaned up your patch, and applied it, see:

	https://git.buildroot.org/buildroot/commit/?id=856c407976d5095c13b243b9ab2be6a4dcf8deb5

Thanks,

Thomas