From f83ac49d06f0078ca6a04a3bc35e1d2e4cacf5f2 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 2 Apr 2018 09:43:46 +0100 Subject: [PATCH] libidn: bump to v1.35 (2018-05-11) Bump to v1.35 Refresh patches. Update Makefile to use new '--disable-doc' configure flag. Signed-off-by: Kevin Darbyshire-Bryant --- libs/libidn/Makefile | 18 +++++---------- .../002-disable-po-docs-examples.patch | 22 ------------------- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 libs/libidn/patches/002-disable-po-docs-examples.patch diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 3b9b9a5cf..6425244f7 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -8,18 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn -PKG_VERSION:=1.33 -PKG_RELEASE:=2 - +PKG_VERSION:=1.35 +PKG_RELEASE:=1 +PKG_MAINTAINER:=Kevin Darbyshire-Bryant PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn -PKG_HASH:=44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 +PKG_HASH:=f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0 PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -28,7 +26,6 @@ define Package/idn/Default SECTION:=net CATEGORY:=Network URL:=http://www.gnu.org/software/libidn/ - MAINTAINER:=Kevin Darbyshire-Bryant endef define Package/idn/Default/description @@ -68,11 +65,8 @@ endef TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - -MAKE_FLAGS += \ - CC="$(TARGET_CC)" \ + --disable-rpath \ + --disable-doc define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/libs/libidn/patches/002-disable-po-docs-examples.patch b/libs/libidn/patches/002-disable-po-docs-examples.patch deleted file mode 100644 index dcac7c450..000000000 --- a/libs/libidn/patches/002-disable-po-docs-examples.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,7 +16,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - --SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples \ -+SUBDIRS = gl lib/gl lib src \ - java csharp - - EXTRA_DIST = cfg.mk maint.mk .clcopying ---- a/configure.ac -+++ b/configure.ac -@@ -47,8 +47,6 @@ LT_INIT([win32-dll]) - # Checks for programs. - AM_MISSING_PROG(PERL, perl, $missing_dir) - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) --AM_GNU_GETTEXT(external) --AM_GNU_GETTEXT_VERSION(0.19.3) - AM_ICONV - AM_PATH_LISPDIR -