From patchwork Fri Mar 13 21:33:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 450104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id E1F631400EA for ; Sat, 14 Mar 2015 08:33:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=KVbILwY5; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1CCBB95A32; Fri, 13 Mar 2015 21:33:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TtL05-fArjCI; Fri, 13 Mar 2015 21:33:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 33C739587A; Fri, 13 Mar 2015 21:33:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C85F81C24B7 for ; Fri, 13 Mar 2015 21:33:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C29F18FC06 for ; Fri, 13 Mar 2015 21:33:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6HEQ1NwfpLlL for ; Fri, 13 Mar 2015 21:33:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1560D8F74D for ; Fri, 13 Mar 2015 21:33:42 +0000 (UTC) Received: from asgard (cpe-181-46-99-160.telecentro-reversos.com.ar [181.46.99.160] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id t2DLXYo5016263 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 13 Mar 2015 21:33:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1426282419; bh=BjOARRkryZyMasSk91RtBFSORxva+Lb/bhz5GJ+CZoo=; h=From:To:Cc:Subject:Date; b=KVbILwY544SZxEySyjGAmEuL9FrCoDDbgyTzGwx5zs7PgdTDe7vcGPleLvap04tVc 3gYBoPTjp1HiglEUG/g32AY43zBvIYDAxs8/uLsfa7eZofSyeXyjbDI2MKo24wFROH LCcQCKghS6UnGePBLKfz8kxZk1V7XVzctdnmu8DM= Received: by asgard (sSMTP sendmail emulation); Fri, 13 Mar 2015 18:33:04 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 13 Mar 2015 18:33:04 -0300 Message-Id: <1426282384-16194-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.5 X-Virus-Scanned: clamav-milter 0.98.6 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] gptfdisk: bump to version 0.8.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop the ICU patch and ICU support since it's no longer necessary. Use original hashes from sourceforge. Signed-off-by: Gustavo Zacarias --- .../gptfdisk/0001-configurable-utf16-support.patch | 50 ---------------------- package/gptfdisk/Config.in | 1 + package/gptfdisk/gptfdisk.hash | 5 ++- package/gptfdisk/gptfdisk.mk | 7 +-- 4 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 package/gptfdisk/0001-configurable-utf16-support.patch diff --git a/package/gptfdisk/0001-configurable-utf16-support.patch b/package/gptfdisk/0001-configurable-utf16-support.patch deleted file mode 100644 index 6d54cea..0000000 --- a/package/gptfdisk/0001-configurable-utf16-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -[PATCH] Make the UTF16 support configurable - -libicu is quite large, and unicode partition names are uncommon, so we -may not necessarily want to have UTF16 support unconditionnally. This -patch adds a USE_UTF16 environment variable to tell whether we want -the UTF16 support or not. - -Signed-off-by: Justin Maggard -Signed-off-by: Thomas Petazzoni -[baruch: add $(LDLIBS)] -Signed-off-by: Baruch Siach ---- -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,11 @@ - CC=gcc - CXX=g++ - CFLAGS+=-D_FILE_OFFSET_BITS=64 --CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 --#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -+ifeq ($(USE_UTF16),y) -+CXXFLAGS+=-D USE_UTF16 -+UTF16_LIBS=-licuio -licuuc -+endif - LDFLAGS+= - LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix - MBR_LIBS=support diskio diskio-unix basicmbr mbrpart -@@ -14,16 +17,13 @@ - all: cgdisk gdisk sgdisk fixparts - - gdisk: $(LIB_OBJS) gdisk.o gpttext.o --# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk -- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk -+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(UTF16_LIBS) -luuid $(LDLIBS) -o gdisk - - cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o --# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk -- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk -+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lncurses $(LDLIBS) -o cgdisk - - sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o --# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk -- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk -+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lpopt $(LDLIBS) -o sgdisk - - fixparts: $(MBR_LIB_OBJS) fixparts.o - $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in index 264b4d7..61692f6 100644 --- a/package/gptfdisk/Config.in +++ b/package/gptfdisk/Config.in @@ -37,6 +37,7 @@ config BR2_PACKAGE_GPTFDISK_SGDISK config BR2_PACKAGE_GPTFDISK_CGDISK bool "ncurses cgdisk" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16 help Install the ncurses-based GUID partition table (GPT) manipulator /usr/sbin/cgdisk. diff --git a/package/gptfdisk/gptfdisk.hash b/package/gptfdisk/gptfdisk.hash index d254263..93f7b36 100644 --- a/package/gptfdisk/gptfdisk.hash +++ b/package/gptfdisk/gptfdisk.hash @@ -1,2 +1,3 @@ -# Locally computed: -sha256 4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2 gptfdisk-0.8.6.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/0.8.10/ +md5 9cf4246c181c324bdbd553fe9b348373 gptfdisk-0.8.10.tar.gz +sha1 1708e232220236b6bdf299b315e9bc2205c01ba5 gptfdisk-0.8.10.tar.gz diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 075af57..c11b1d9 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 0.8.6 +GPTFDISK_VERSION = 0.8.10 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPLv2+ GPTFDISK_LICENSE_FILES = COPYING @@ -21,11 +21,6 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses endif -ifeq ($(BR2_PACKAGE_ICU),y) -GPTFDISK_DEPENDENCIES += icu -GPTFDISK_MAKE_OPTS += USE_UTF16=y -endif - ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy) GPTFDISK_MAKE_OPTS += LDLIBS=-lintl endif