From 218482d3e93f52f8daf3c027256ba50f457f0f39 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 May 2010 22:46:34 +0200 Subject: [PATCH] gettext: update to 0.18. --- srcpkgs/gettext/gettext-devel.template | 3 +-- srcpkgs/gettext/gettext-libs.template | 2 -- .../gettext/patches/disable_examples_install.diff | 13 ------------- srcpkgs/gettext/patches/fix_open_mode.diff | 11 ----------- srcpkgs/gettext/template | 7 +++---- xbps-src/common/mapping_shlib_binpkg.txt | 4 ++-- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/gettext/patches/disable_examples_install.diff delete mode 100644 srcpkgs/gettext/patches/fix_open_mode.diff diff --git a/srcpkgs/gettext/gettext-devel.template b/srcpkgs/gettext/gettext-devel.template index 03f5d6dafb3..99bd18bcc40 100644 --- a/srcpkgs/gettext/gettext-devel.template +++ b/srcpkgs/gettext/gettext-devel.template @@ -5,8 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - +Add_dependency run glibc-devel Add_dependency run gettext-libs do_install() diff --git a/srcpkgs/gettext/gettext-libs.template b/srcpkgs/gettext/gettext-libs.template index 726013edc52..3b9299b4b60 100644 --- a/srcpkgs/gettext/gettext-libs.template +++ b/srcpkgs/gettext/gettext-libs.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains the ${sourcepkg} shared libraries." -revision=2 - Add_dependency run glibc Add_dependency run ncurses-libs diff --git a/srcpkgs/gettext/patches/disable_examples_install.diff b/srcpkgs/gettext/patches/disable_examples_install.diff deleted file mode 100644 index 0097b3bed5f..00000000000 --- a/srcpkgs/gettext/patches/disable_examples_install.diff +++ /dev/null @@ -1,13 +0,0 @@ -Do not install the examples. - ---- gettext-tools/Makefile.in.orig 2009-02-19 02:26:59.754316493 +0100 -+++ gettext-tools/Makefile.in 2009-02-19 02:27:22.192981123 +0100 -@@ -724,7 +724,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests - - # Allow users to use "gnulib-tool --update". - diff --git a/srcpkgs/gettext/patches/fix_open_mode.diff b/srcpkgs/gettext/patches/fix_open_mode.diff deleted file mode 100644 index 38da508b914..00000000000 --- a/srcpkgs/gettext/patches/fix_open_mode.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- gettext-tools/src/write-catalog.c.orig 2009-04-29 15:59:51.212345437 +0200 -+++ gettext-tools/src/write-catalog.c 2009-04-29 16:00:26.023855357 +0200 -@@ -220,7 +220,7 @@ message catalog has plural form translat - /* Open the output file. */ - if (!to_stdout) - { -- fd = open (filename, O_WRONLY | O_CREAT); -+ fd = open (filename, O_WRONLY | O_CREAT, 0755); - if (fd < 0) - { - const char *errno_description = strerror (errno); diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index 0625925f1dd..a95cacdf5bd 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -1,14 +1,13 @@ # Template build file for 'gettext'. pkgname=gettext -version=0.17 -revision=1 +version=0.18 distfiles="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-java --disable-native-java --disable-csharp - --disable-libasprintf" +--disable-libasprintf" short_desc="Internationalized Message Handling Library and tools" maintainer="Juan RP " -checksum=209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba +checksum=02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5 long_desc=" GNU gettext provides the necessary tools and libraries for handling messages in different languages, as one of the steps to diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index a7cff56cfd8..d14b8ad3496 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -150,8 +150,8 @@ libdb-4.8.so db db-devel libdb_cxx-4.8.so db db-devel libperl.so perl libgdbm.so gdbm gdbm-devel -libgettextsrc-0.17.so gettext-libs gettext-devel -libgettextlib-0.17.so gettext-libs gettext-devel +libgettextsrc-0.18.so gettext-libs gettext-devel +libgettextlib-0.18.so gettext-libs gettext-devel libgettextpo.so gettext-libs gettext-devel libattr.so attr attr-devel libacl.so acl acl-devel