summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/gettext/files')
-rw-r--r--sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch30
-rw-r--r--sys-devel/gettext/files/gettext-0.20-parallel_install.patch37
-rw-r--r--sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch100
-rw-r--r--sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch22
4 files changed, 0 insertions, 189 deletions
diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
deleted file mode 100644
index f51de3484331..000000000000
--- a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/564168
-Never build libintl since it's in dev-libs/libintl now.
-
-We can drop this if/when upstream fixes the configure flag handling:
-https://savannah.gnu.org/bugs/?48233
-
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-- && test "$PACKAGE" != gettext-runtime \
-- && test "$PACKAGE" != gettext-tools; }; then
-+ }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
diff --git a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch b/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
deleted file mode 100644
index e47beaf94433..000000000000
--- a/sys-devel/gettext/files/gettext-0.20-parallel_install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 829660df1583c6c3ee1d90291dd910f08e3b777e Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Fri, 10 May 2019 20:08:25 +0200
-Subject: [PATCH] Fix parallel install issue
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- gettext-tools/src/Makefile.am | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
-index 09a3c153d..1ee49cdca 100644
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -252,9 +252,16 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-
- # How to get the include files of libtextstyle.
- textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+ else \
-+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+ fi; \
-+ target_dir="$(abs_builddir)/$@"; \
-+ target_dir="$${target_dir%/*}"; \
-+ $(MKDIR_P) "$${target_dir}"; \
-+ $(INSTALL_HEADER) "$$file" $@
- BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
- MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
-
---
-2.21.0
-
diff --git a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
deleted file mode 100644
index a7471ac724c9..000000000000
--- a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Tue, 11 Oct 2022 01:54:44 +0200
-Subject: [PATCH] Avoid warnings during configure execution with
- --disable-java.
-
-Reported by Sam James <sam@cmpct.info>
-in <https://savannah.gnu.org/bugs/?63193>.
-
-* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline.
-* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and
-gt_JAVACOMP_DISABLED inline.
---- a/gettext-runtime/configure.ac
-+++ b/gettext-runtime/configure.ac
-@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [
- BUILDJAVA=no
- fi
- ], [
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
-+ AC_SUBST([CONF_JAVAC])
-+ AC_SUBST([HAVE_JAVAC_ENVVAR])
-+ AC_SUBST([HAVE_GCJ_C])
-+ AC_SUBST([HAVE_JAVAC])
-+ AC_SUBST([HAVE_JIKES])
- JAR=
- BUILDJAVA=no
- ])
---- a/gettext-tools/configure.ac
-+++ b/gettext-tools/configure.ac
-@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [
- BUILDJAVA=no
- fi
- ], [
-- gt_JAVAEXEC_DISABLED
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVA=
-+ HAVE_JAVA_ENVVAR=
-+ HAVE_GIJ=
-+ HAVE_JAVA=
-+ HAVE_JRE=
-+ HAVE_JVIEW=
-+ AC_SUBST([CONF_JAVA])
-+ AC_SUBST([HAVE_JAVA_ENVVAR])
-+ AC_SUBST([HAVE_GIJ])
-+ AC_SUBST([HAVE_JAVA])
-+ AC_SUBST([HAVE_JRE])
-+ AC_SUBST([HAVE_JVIEW])
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
-+ AC_SUBST([CONF_JAVAC])
-+ AC_SUBST([HAVE_JAVAC_ENVVAR])
-+ AC_SUBST([HAVE_GCJ_C])
-+ AC_SUBST([HAVE_JAVAC])
-+ AC_SUBST([HAVE_JIKES])
- JAR=
- BUILDJAVA=no
- ])
-diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index 5e2d593..cf579ff 100755
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -7070,7 +7070,11 @@ fi
-
- else $as_nop
-
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
- JAR=
- BUILDJAVA=no
-
-diff --git a/gettext-tools/configure b/gettext-tools/configure
-index f897bc3..3af54cd 100755
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -8718,8 +8718,11 @@ fi
-
- else $as_nop
-
-- gt_JAVAEXEC_DISABLED
-- gt_JAVACOMP_DISABLED
-+ CONF_JAVAC=
-+ HAVE_JAVAC_ENVVAR=
-+ HAVE_GCJ_C=
-+ HAVE_JAVAC=
-+ HAVE_JIKES=
- JAR=
- BUILDJAVA=no
-
diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
deleted file mode 100644
index 8adae5d5484a..000000000000
--- a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gettext-0.21-rc1/gettext-tools/src/Makefile.in
-+++ gettext-0.21-rc1/gettext-tools/src/Makefile.in
-@@ -4106,9 +4106,16 @@
-
- # How to get the include files of libtextstyle.
- @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \
--@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \
-+@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@
-
- # No need to install libgettextsrc.a, except on AIX.
- install-exec-hook: install-exec-clean