SF.net SVN: gar:[26714] csw/mgar/pkg/gettext/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Nov 17 19:23:44 CET 2020
Revision: 26714
http://sourceforge.net/p/gar/code/26714
Author: dmichelsen
Date: 2020-11-17 18:23:43 +0000 (Tue, 17 Nov 2020)
Log Message:
-----------
gettext/trunk: Update to 0.20.1
Modified Paths:
--------------
csw/mgar/pkg/gettext/trunk/Makefile
csw/mgar/pkg/gettext/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gettext/trunk/files/0001-Move-undef-_FILE_OFFSET_BITS-or-the-Cannot-use-procf.patch
Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile 2020-11-14 23:03:59 UTC (rev 26713)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2020-11-17 18:23:43 UTC (rev 26714)
@@ -1,5 +1,7 @@
NAME = gettext
-VERSION = 0.19.8
+#VERSION = 0.21
+VERSION = 0.20.1
+#VERSION = 2020-11-16
GARTYPE = v2
PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
@@ -10,8 +12,11 @@
endef
MASTER_SITES += $(GNU_MIRROR)
-DISTFILES += $(DISTNAME).tar.lz
+DISTFILES += $(DISTNAME).tar.xz
+#DISTFILES += $(DISTNAME).tar.gz
+# PATCHFILES += 0001-Move-undef-_FILE_OFFSET_BITS-or-the-Cannot-use-procf.patch
+
# A few legacy packages that we still need to depend on for dependency reasons
# that we no longer want to rebuild and carry.
FOREIGN_PACKAGES += CSWlibgettextlib0-14-1
@@ -32,12 +37,11 @@
SPKG_DESC_CSWggettext = GNU locale utilities
# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-19-8
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-19-8
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-20-1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-20-1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8
RUNTIME_DEP_PKGS_CSWggettext += CSWlibgomp1
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibtextstyle0
RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring2
RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data
@@ -65,74 +69,80 @@
CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data
OBSOLETED_BY_CSWlibasprintf0 += CSWggettextrt
-PACKAGES += CSWlibgettextlib0-19-8
-SPKG_DESC_CSWlibgettextlib0-19-8 += GNU locale utilities, libgettextlib-0.19.8.so
-PKGFILES_CSWlibgettextlib0-19-8 += $(call pkgfiles_lib,libgettextlib-0.19.8.so)
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibncurses6
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibunistring2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += soname-equals-filename
+PACKAGES += CSWlibgettextlib0-20-1
+SPKG_DESC_CSWlibgettextlib0-20-1 += GNU locale utilities, libgettextlib-0.20.1.so
+PKGFILES_CSWlibgettextlib0-20-1 += $(call pkgfiles_lib,libgettextlib-0.20.1.so)
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-20-1 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-20-1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-20-1 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-20-1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-20-1 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-20-1 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-20-1 += soname-equals-filename
-PACKAGES += CSWlibgettextpo1
-SPKG_DESC_CSWlibgettextpo1 += GNU locale utilities, libgettextpo.so.1
-PKGFILES_CSWlibgettextpo1 += $(call pkgfiles_lib,libgettextpo.so.1)
-RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibunistring2
-RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextpo1 += surplus-dependency|CSWggettext-data
-OBSOLETED_BY_CSWlibgettextpo1 += CSWggettextrt
+PACKAGES += CSWlibgettextpo0
+SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
+PKGFILES_CSWlibgettextpo0 += $(call pkgfiles_lib,libgettextpo.so.0)
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
-PACKAGES += CSWlibgettextsrc0-19-8
-SPKG_DESC_CSWlibgettextsrc0-19-8 += GNU locale utilities, libgettextsrc-0.19.8.so
-PKGFILES_CSWlibgettextsrc0-19-8 += $(call pkgfiles_lib,libgettextsrc-0.19.8.so)
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgettextlib0-19-8
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibncurses6
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibunistring2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += soname-equals-filename
+PACKAGES += CSWlibgettextsrc0-20-1
+SPKG_DESC_CSWlibgettextsrc0-20-1 += GNU locale utilities, libgettextsrc-0.20.1.so
+PKGFILES_CSWlibgettextsrc0-20-1 += $(call pkgfiles_lib,libgettextsrc-0.20.1.so)
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibgettextlib0-20-1
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibtextstyle0
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibncurses6
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-20-1 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-20-1 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-20-1 += soname-equals-filename
# On i386 only
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibncurses6
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-20-1 += surplus-dependency|CSWlibxml2-2
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-20-1 += surplus-dependency|CSWlibncurses6
-PACKAGES += CSWlibintl9
-SPKG_DESC_CSWlibintl9 += GNU locale utilities, libintl.so.9
-PKGFILES_CSWlibintl9 += $(call pkgfiles_lib,libintl.so.9)
-RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibintl9 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibintl9 += surplus-dependency|CSWggettext-data
+PACKAGES += CSWlibintl8
+SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8
+PKGFILES_CSWlibintl8 += $(call pkgfiles_lib,libintl.so.8)
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data
+PACKAGES += CSWlibtextstyle0
+SPKG_DESC_CSWlibtextstyle0 = GNU locale utilities, libtextstyle.so.0
+PKGFILES_CSWlibtextstyle0 += $(call pkgfiles_lib,libtextstyle.so.0)
+RUNTIME_DEP_PKGS_CSWlibtextstyle0 += CSWlibncurses6
+RUNTIME_DEP_PKGS_CSWlibtextstyle0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtextstyle0 += CSWlibiconv2
+
PACKAGES += CSWggettext-dev
SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
# This is needed because these libs are the ones linked against, not symlinks as usual:
-# libgettextlib-0.19.8.so
-# libgettextsrc-0.19.8.so
+# libgettextlib-0.20.so
+# libgettextsrc-0.20.so
PKGFILES_DEVEL_SHAREDLIBLINK =
PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWggettext-dev += $(PKGFILES_DOC)
PKGFILES_CSWggettext-dev += $(sharedstatedir)/gettext/.*
-PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextlib.so)
-PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextpo.so)
-PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextsrc.so)
-PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libintl.so)
+PKGFILES_CSWggettext-dev += $(call baseisadirs,$(libdir),libasprintf.so)
+PKGFILES_CSWggettext-dev += $(call baseisadirs,$(libdir),libgettextlib.so)
+PKGFILES_CSWggettext-dev += $(call baseisadirs,$(libdir),libgettextpo.so)
+PKGFILES_CSWggettext-dev += $(call baseisadirs,$(libdir),libgettextsrc.so)
+PKGFILES_CSWggettext-dev += $(call baseisadirs,$(libdir),libintl.so)
PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*\.mo
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-19-8
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-20-1
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-19-8
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-20-1
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
OBSOLETED_BY_CSWggettext-dev += CSWggettextdoc
CHECKPKG_OVERRIDES_CSWggettext-dev += missing-dependency|CSWperl
Modified: csw/mgar/pkg/gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/gettext/trunk/checksums 2020-11-14 23:03:59 UTC (rev 26713)
+++ csw/mgar/pkg/gettext/trunk/checksums 2020-11-17 18:23:43 UTC (rev 26714)
@@ -1 +1 @@
-e83becf5dc4c29519a5ec5335d769764 gettext-0.19.8.tar.lz
+9ed9e26ab613b668e0026222a9c23639 gettext-0.20.1.tar.xz
Added: csw/mgar/pkg/gettext/trunk/files/0001-Move-undef-_FILE_OFFSET_BITS-or-the-Cannot-use-procf.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0001-Move-undef-_FILE_OFFSET_BITS-or-the-Cannot-use-procf.patch (rev 0)
+++ csw/mgar/pkg/gettext/trunk/files/0001-Move-undef-_FILE_OFFSET_BITS-or-the-Cannot-use-procf.patch 2020-11-17 18:23:43 UTC (rev 26714)
@@ -0,0 +1,47 @@
+From 1548cc8110bf4c71169d5b0be256b9103bd89b81 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 16 Nov 2020 13:47:50 +0100
+Subject: [PATCH] Move undef _FILE_OFFSET_BITS or the 'Cannot use procfs' error
+ will appear
+
+---
+ gettext-tools/gnulib-tests/vma-iter.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/gettext-tools/gnulib-tests/vma-iter.c b/gettext-tools/gnulib-tests/vma-iter.c
+index 10ccda4..9122892 100644
+--- a/gettext-tools/gnulib-tests/vma-iter.c
++++ b/gettext-tools/gnulib-tests/vma-iter.c
+@@ -17,6 +17,14 @@
+
+ #include <config.h>
+
++/* Specification. */
++#include "vma-iter.h"
++
++#include <errno.h> /* errno */
++#include <stdlib.h> /* size_t */
++#include <fcntl.h> /* open, O_RDONLY */
++#include <unistd.h> /* getpagesize, lseek, read, close, getpid */
++
+ /* On Solaris in 32-bit mode, when gnulib module 'largefile' is in use,
+ prevent a compilation error
+ "Cannot use procfs in the large file compilation environment"
+@@ -32,14 +40,6 @@
+ # undef _FILE_OFFSET_BITS
+ #endif
+
+-/* Specification. */
+-#include "vma-iter.h"
+-
+-#include <errno.h> /* errno */
+-#include <stdlib.h> /* size_t */
+-#include <fcntl.h> /* open, O_RDONLY */
+-#include <unistd.h> /* getpagesize, lseek, read, close, getpid */
+-
+ #if defined __linux__ || defined __ANDROID__
+ # include <limits.h> /* PATH_MAX */
+ #endif
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list