mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
sys-apps/texinfo: Sync with Gentoo
It's from Gentoo commit 483cf327249165855b9a8f5ed5ca6d8520906bff.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
2dcdd85195
commit
87e0ef0128
@ -1,2 +1 @@
|
||||
DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
|
||||
DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
|
||||
|
||||
@ -1,186 +0,0 @@
|
||||
|
||||
Patch by Vitezslav Crhonek <vcrhonek@redhat.com>
|
||||
Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
|
||||
|
||||
diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
|
||||
--- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100
|
||||
+++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200
|
||||
@@ -321,15 +321,15 @@
|
||||
|
||||
/* The nonnull function attribute marks pointer parameters that
|
||||
must not be NULL. */
|
||||
-#ifndef __attribute_nonnull__
|
||||
+#ifndef __nonnull
|
||||
# if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
|
||||
-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
|
||||
+# define __nonnull(params) __attribute__ ((__nonnull__ params))
|
||||
# else
|
||||
-# define __attribute_nonnull__(params)
|
||||
+# define __nonnull(params)
|
||||
# endif
|
||||
-#endif
|
||||
-#ifndef __nonnull
|
||||
-# define __nonnull(params) __attribute_nonnull__ (params)
|
||||
+#elif !defined __GLIBC__
|
||||
+# undef __nonnull
|
||||
+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
|
||||
#endif
|
||||
|
||||
/* If fortification mode, we warn about unused results of certain
|
||||
diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
|
||||
--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100
|
||||
+++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200
|
||||
@@ -33,9 +33,9 @@
|
||||
#include <config.h>
|
||||
|
||||
/* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
|
||||
- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and
|
||||
- DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
|
||||
- Elsewhere it is harmless. */
|
||||
+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it
|
||||
+ includes <sys/cdefs.h> which defines __nonnull. Elsewhere it
|
||||
+ is harmless. */
|
||||
#include <errno.h>
|
||||
|
||||
/* From glibc <errno.h>. */
|
||||
diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
|
||||
--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100
|
||||
+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200
|
||||
@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
|
||||
|
||||
/* Initialize a dynamic array object. This must be called before any
|
||||
use of the object. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static void
|
||||
DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
|
||||
}
|
||||
|
||||
/* Deallocate the dynamic array and its elements. */
|
||||
-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __nonnull ((1))
|
||||
static void
|
||||
DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
|
||||
}
|
||||
|
||||
/* Return true if the dynamic array is in an error state. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline bool
|
||||
DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
|
||||
|
||||
/* Mark the dynamic array as failed. All elements are deallocated as
|
||||
a side effect. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static void
|
||||
DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
|
||||
|
||||
/* Return the number of elements which have been added to the dynamic
|
||||
array. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline size_t
|
||||
DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
|
||||
|
||||
/* Return a pointer to the array element at INDEX. Terminate the
|
||||
process if INDEX is out of bounds. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline DYNARRAY_ELEMENT *
|
||||
DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
|
||||
{
|
||||
@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
|
||||
/* Return a pointer to the first array element, if any. For a
|
||||
zero-length array, the pointer can be NULL even though the dynamic
|
||||
array has not entered the failure state. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline DYNARRAY_ELEMENT *
|
||||
DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
|
||||
/* Return a pointer one element past the last array element. For a
|
||||
zero-length array, the pointer can be NULL even though the dynamic
|
||||
array has not entered the failure state. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline DYNARRAY_ELEMENT *
|
||||
DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
|
||||
/* Add ITEM at the end of the array, enlarging it by one element.
|
||||
Mark *LIST as failed if the dynamic array allocation size cannot be
|
||||
increased. */
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__nonnull ((1))
|
||||
static inline void
|
||||
DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
|
||||
{
|
||||
@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
|
||||
/* Allocate a place for a new element in *LIST and return a pointer to
|
||||
it. The pointer can be NULL if the dynamic array cannot be
|
||||
enlarged due to a memory allocation failure. */
|
||||
-__attribute_maybe_unused__ __attribute_warn_unused_result__
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
|
||||
static
|
||||
/* Avoid inlining with the larger initialization code. */
|
||||
#if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
|
||||
@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
|
||||
existing size, new elements are added (which can be initialized).
|
||||
Otherwise, the list is truncated, and elements are freed. Return
|
||||
false on memory allocation failure (and mark *LIST as failed). */
|
||||
-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __nonnull ((1))
|
||||
static bool
|
||||
DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
|
||||
{
|
||||
@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
|
||||
}
|
||||
|
||||
/* Remove the last element of LIST if it is present. */
|
||||
-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __nonnull ((1))
|
||||
static void
|
||||
DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
|
||||
|
||||
/* Remove all elements from the list. The elements are freed, but the
|
||||
list itself is not. */
|
||||
-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __nonnull ((1))
|
||||
static void
|
||||
DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
|
||||
{
|
||||
@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
|
||||
stored in *RESULT if LIST refers to an empty list. On success, the
|
||||
pointer in *RESULT is heap-allocated and must be deallocated using
|
||||
free. */
|
||||
-__attribute_maybe_unused__ __attribute_warn_unused_result__
|
||||
-__attribute_nonnull__ ((1, 2))
|
||||
+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
|
||||
static bool
|
||||
DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
|
||||
DYNARRAY_FINAL_TYPE *result)
|
||||
@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
|
||||
have a sentinel at the end). If LENGTHP is not NULL, the array
|
||||
length is written to *LENGTHP. *LIST is re-initialized and can be
|
||||
reused. */
|
||||
-__attribute_maybe_unused__ __attribute_warn_unused_result__
|
||||
-__attribute_nonnull__ ((1))
|
||||
+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
|
||||
static DYNARRAY_ELEMENT *
|
||||
DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
|
||||
{
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# Note: if your package uses the texi2dvi utility, it must depend on the
|
||||
# virtual/texi2dvi package to pull in all the right deps. The tool is not
|
||||
# usable out-of-the-box because it requires the large tex packages.
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="The GNU info program and utilities"
|
||||
HOMEPAGE="https://www.gnu.org/software/texinfo/"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="nls +standalone static"
|
||||
|
||||
RDEPEND="
|
||||
!=app-text/tetex-2*
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
standalone? ( dev-lang/perl )
|
||||
!standalone? ( dev-lang/perl:= )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-undo-gnulib-nonnul.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
|
||||
touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
|
||||
local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
|
||||
|
||||
use static && append-ldflags -static
|
||||
local myeconfargs=(
|
||||
--cache-file="${S}"/config.cache
|
||||
$(use_enable nls)
|
||||
)
|
||||
|
||||
if use standalone ; then
|
||||
myeconfargs+=(
|
||||
--disable-perl-xs
|
||||
)
|
||||
else
|
||||
myeconfargs+=(
|
||||
--enable-perl-xs
|
||||
)
|
||||
fi
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user