[Buildroot] [PATCH 1/2] package/znc: bump version to 1.7.5

[Buildroot] [PATCH 1/2] package/znc: bump version to 1.7.5

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/znc/znc.hash | 2 +-
 package/znc/znc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/znc/znc.hash b/package/znc/znc.hash
index 216d105f23..f704e388cb 100644
--- a/package/znc/znc.hash
+++ b/package/znc/znc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 b1a32921a8e6d79ee6c5900c8d07293026966db7c05aaac48984231befc49b71  znc-1.7.4.tar.gz
+sha256 a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721  znc-1.7.5.tar.gz
 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/znc/znc.mk b/package/znc/znc.mk
index 24795886ae..9556b60fdf 100644
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZNC_VERSION = 1.7.4
+ZNC_VERSION = 1.7.5
 ZNC_SITE = http://znc.in/releases/archive
 ZNC_LICENSE = Apache-2.0
 ZNC_LICENSE_FILES = LICENSE
-- 
2.20.1

[Buildroot] [PATCH 2/2] package/znc: switch to cmake

[Bernd Kuhls]

Upstream deprecated autoconf and asks to use cmake:
https://github.com/znc/znc/commit/71f35b003dda65f3867ff84deaf8aa15bcd0b958

Add options to explicitly disable cyrus and i18n support.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/znc/znc.mk | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/package/znc/znc.mk b/package/znc/znc.mk
index 9556b60fdf..78e1410b68 100644
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -9,35 +9,37 @@ ZNC_SITE = http://znc.in/releases/archive
 ZNC_LICENSE = Apache-2.0
 ZNC_LICENSE_FILES = LICENSE
 ZNC_DEPENDENCIES = host-pkgconf
-ZNC_CONF_OPTS = --disable-perl
+ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF
 
 ifeq ($(BR2_PACKAGE_ICU),y)
 ZNC_DEPENDENCIES += icu
-ZNC_CONF_OPTS += --enable-charset
+ZNC_CONF_OPTS += -DWANT_ICU=ON
 else
-ZNC_CONF_OPTS += --disable-charset
+ZNC_CONF_OPTS += -DWANT_ICU=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ZNC_DEPENDENCIES += openssl
-ZNC_CONF_OPTS += --enable-openssl
+ZNC_CONF_OPTS += -DWANT_OPENSSL=ON
 else
-ZNC_CONF_OPTS += --disable-openssl
+ZNC_CONF_OPTS += -DWANT_OPENSSL=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 ZNC_DEPENDENCIES += zlib
-ZNC_CONF_OPTS += --enable-zlib
+ZNC_CONF_OPTS += -DWANT_ZLIB=ON
 else
-ZNC_CONF_OPTS += --disable-zlib
+ZNC_CONF_OPTS += -DWANT_ZLIB=OFF
 endif
 
 # python support depends on icu
 ifeq ($(BR2_PACKAGE_ICU)$(BR2_PACKAGE_PYTHON3),yy)
 ZNC_DEPENDENCIES += python3 host-swig
-ZNC_CONF_OPTS += --enable-python=python3
+ZNC_CONF_OPTS += \
+	-DWANT_PYTHON=ON \
+	-DWANT_PYTHON_VERSION=python3
 else
-ZNC_CONF_OPTS += --disable-python
+ZNC_CONF_OPTS += -DWANT_PYTHON=OFF
 endif
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))
-- 
2.20.1

[Buildroot] [PATCH 1/2] package/znc: bump version to 1.7.5

[Thomas Petazzoni]

On Sat, 28 Sep 2019 12:41:05 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/znc/znc.hash | 2 +-
>  package/znc/znc.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/znc: switch to cmake

[Thomas Petazzoni]

On Sat, 28 Sep 2019 12:41:06 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Upstream deprecated autoconf and asks to use cmake:
> https://github.com/znc/znc/commit/71f35b003dda65f3867ff84deaf8aa15bcd0b958
> 
> Add options to explicitly disable cyrus and i18n support.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/znc/znc.mk | 22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)

Applied to master, thanks. Regarding the WANT_I18N option, what does it
do exactly ? Indeed, the autotools package infrastructure was
automatically passing --enable-nls or --disable-nls depending on the
value of BR2_SYSTEM_ENABLE_NLS. So with your unconditional addition of
WANT_I18N=OFF, I'm wondering if we have lost NLS support in znc when
BR2_SYSTEM_ENABLE_NLS=y. Could you check this ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/znc: switch to cmake

[Bernd Kuhls]

Am Sat, 28 Sep 2019 21:50:35 +0200 schrieb Thomas Petazzoni:

> Applied to master, thanks. Regarding the WANT_I18N option, what does it
> do exactly ? Indeed, the autotools package infrastructure was
> automatically passing --enable-nls or --disable-nls depending on the
> value of BR2_SYSTEM_ENABLE_NLS. So with your unconditional addition of
> WANT_I18N=OFF, I'm wondering if we have lost NLS support in znc when
> BR2_SYSTEM_ENABLE_NLS=y. Could you check this ?

Hi Thomas,

WANT_I18N enables the C/C++ define HAVE_I18N, but only if Boost.Locale 
and gettext were found:
https://github.com/znc/znc/blob/master/CMakeLists.txt#L222

HAVE_I18N was not used by autoconf so we did not lose any features when 
switching to cmake.

Regards, Bernd

[Buildroot] [PATCH 2/2] package/znc: switch to cmake

[Thomas Petazzoni]

On Sat, 28 Sep 2019 22:00:43 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> WANT_I18N enables the C/C++ define HAVE_I18N, but only if Boost.Locale
> and gettext were found:
> https://github.com/znc/znc/blob/master/CMakeLists.txt#L222
> 
> HAVE_I18N was not used by autoconf so we did not lose any features when
> switching to cmake.

OK, thanks for the confirmation!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com