Attachment 243033 Details for Bug 272210 – patch3

[patch] patch3

gettext.patch (text/plain), 14.76 KB, created by Tijl Coosemans on 2023-06-27 08:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2023-06-27 08:20:09 UTC

Size: 14.76 KB

patch

obsolete

>diff --git a/devel/gettext-runtime/files/patch-configure b/devel/gettext-runtime/files/patch-configure
>index fab412b86976..e70ae06e4969 100644
>--- a/devel/gettext-runtime/files/patch-configure
>+++ b/devel/gettext-runtime/files/patch-configure
>@@ -1,11 +1,11 @@
>---- configure.orig	2022-10-09 21:31:34 UTC
>+--- configure.orig	2023-06-17 11:53:59 UTC
> +++ configure
>-@@ -22002,7 +22002,7 @@ then :
>+@@ -27079,7 +27079,7 @@ then :
>               # On Solaris 10 or newer, this test is no longer needed, because
>               # libc contains the fully functional pthread functions.
>               case "$host_os" in
>--               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
>-+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
>+-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
>++               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
>  
>  printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
>  
>diff --git a/devel/gettext-runtime/files/patch-intl_Makefile.in b/devel/gettext-runtime/files/patch-intl_Makefile.in
>new file mode 100644
>index 000000000000..40647158d4fb
>--- /dev/null
>+++ b/devel/gettext-runtime/files/patch-intl_Makefile.in
>@@ -0,0 +1,11 @@
>+--- intl/Makefile.in.orig	2023-06-17 11:53:53 UTC
>++++ intl/Makefile.in
>+@@ -1692,7 +1692,7 @@ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
>+ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
>+ 	-DLOCALEDIR=$(localedir_c_make) \
>+ 	-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \
>+-	-DBUILDING_LIBINTL $(am__append_1)
>++	-DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1)
>+ 
>+ # Enable more warning options in this directory.
>+ 
>diff --git a/devel/gettext-runtime/files/patch-intl-threadlib.c b/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c
>similarity index 76%
>rename from devel/gettext-runtime/files/patch-intl-threadlib.c
>rename to devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c
>index 8de65d9244f0..45b8beaf8f98 100644
>--- a/devel/gettext-runtime/files/patch-intl-threadlib.c
>+++ b/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c
>@@ -1,8 +1,8 @@
>---- intl/threadlib.c.orig	2013-03-07 08:44:37 UTC
>-+++ intl/threadlib.c
>-@@ -29,11 +29,10 @@
>+--- intl/gnulib-lib/glthread/threadlib.c.orig	2023-02-03 13:19:38 UTC
>++++ intl/gnulib-lib/glthread/threadlib.c
>+@@ -62,11 +62,10 @@ glthread_in_use (void)
>  
>- # if PTHREAD_IN_USE_DETECTION_HARD
>+ /* Test using pthread_create.  */
>  
> -/* The function to be executed by a dummy thread.  */
> -static void *
>@@ -15,7 +15,7 @@
>  }
>  
>  int
>-@@ -44,19 +43,10 @@ glthread_in_use (void)
>+@@ -77,19 +76,10 @@ glthread_in_use (void)
>  
>    if (!tested)
>      {
>diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist
>index 18baf1d96239..454c0413eaf8 100644
>--- a/devel/gettext-runtime/pkg-plist
>+++ b/devel/gettext-runtime/pkg-plist
>@@ -76,6 +76,7 @@ share/locale/hu/LC_MESSAGES/gettext-runtime.mo
> share/locale/id/LC_MESSAGES/gettext-runtime.mo
> share/locale/it/LC_MESSAGES/gettext-runtime.mo
> share/locale/ja/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ka/LC_MESSAGES/gettext-runtime.mo
> share/locale/ko/LC_MESSAGES/gettext-runtime.mo
> share/locale/locale.alias
> share/locale/nb/LC_MESSAGES/gettext-runtime.mo
>diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
>index 4cb854f6ba66..45be53664d64 100644
>--- a/devel/gettext-tools/Makefile
>+++ b/devel/gettext-tools/Makefile
>@@ -25,7 +25,8 @@ CPE_VENDOR=	gnu
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-glib \
> 		--with-included-libcroco --with-included-libunistring \
>-		--with-included-libxml --with-xz --without-emacs \
>+		--with-included-libxml --with-installed-libtextstyle \
>+		--with-xz --without-emacs \
> 		ac_cv_lib_rt_sched_yield=no
> INSTALL_TARGET=	install-strip
> TEST_TARGET=	check
>@@ -43,20 +44,4 @@ OPTIONS_EXCLUDE_DragonFly=	THREADS
> 
> THREADS_CONFIGURE_ENABLE=	threads
> 
>-post-patch:
>-# Do not patch system float.h.
>-	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
>-		${WRKSRC}/configure
>-# Use libintl installed by gettext-runtime.
>-	@${REINPLACE_CMD} '/^LDADD_no =/s,\.\./intl/libgnuintl.la,,' \
>-		${WRKSRC}/tests/Makefile.in
>-# Use libasprintf installed by gettext-runtime.
>-	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
>-		${WRKSRC}/tests/lang-c++
>-# Use system libtextstyle.
>-	@${REINPLACE_CMD} \
>-		-e '/:/!s,[[:<:]]textstyle[^[:space:]]*\.h,,g' \
>-		-e 's,\.\./\.\./libtextstyle/lib/libtextstyle\.la,-ltextstyle,' \
>-		${WRKSRC}/src/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure
>index b519ba5fea97..aa7ea1955a41 100644
>--- a/devel/gettext-tools/files/patch-configure
>+++ b/devel/gettext-tools/files/patch-configure
>@@ -1,20 +1,19 @@
>---- configure.orig	2022-10-09 21:32:05 UTC
>+--- configure.orig	2023-06-17 11:54:38 UTC
> +++ configure
>-@@ -24756,7 +24756,7 @@ then :
>+@@ -26130,7 +26130,6 @@ printf "%s\n" "$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 \
>+                 && test "$PACKAGE" != libintl; }; then
>+           gt_use_preinstalled_gnugettext=yes
>+         else
>+@@ -35320,7 +35319,7 @@ then :
>               # On Solaris 10 or newer, this test is no longer needed, because
>               # libc contains the fully functional pthread functions.
>               case "$host_os" in
>--               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
>-+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
>+-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
>++               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
>  
>  printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
>  
>-@@ -29661,7 +29661,7 @@ printf "%s\n" "$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/devel/gettext-tools/files/patch-src_Makefile.in b/devel/gettext-tools/files/patch-src_Makefile.in
>new file mode 100644
>index 000000000000..6ac2f71193b4
>--- /dev/null
>+++ b/devel/gettext-tools/files/patch-src_Makefile.in
>@@ -0,0 +1,11 @@
>+--- src/Makefile.in.orig	2023-06-17 11:54:44 UTC
>++++ src/Makefile.in
>+@@ -696,7 +696,7 @@ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
>+ msggrep_OBJECTS = $(am_msggrep_OBJECTS)
>+ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
>+ 	msginit-lang-table.$(OBJEXT) msginit-plural-count.$(OBJEXT) \
>+-	../../gettext-runtime/intl/msginit-localealias.$(OBJEXT)
>++
>+ msginit_OBJECTS = $(am_msginit_OBJECTS)
>+ msginit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
>+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
>diff --git a/devel/gettext-tools/files/patch-tests_Makefile.in b/devel/gettext-tools/files/patch-tests_Makefile.in
>new file mode 100644
>index 000000000000..11bd831120cf
>--- /dev/null
>+++ b/devel/gettext-tools/files/patch-tests_Makefile.in
>@@ -0,0 +1,11 @@
>+--- tests/Makefile.in.orig	2023-06-25 16:45:40 UTC
>++++ tests/Makefile.in
>+@@ -3788,7 +3788,7 @@ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTL
>+ # but libtool doesn't put -Wl,-framework options into .la files.
>+ LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
>+ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
>+-LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
>++LDADD_no = @LTLIBTHREAD@ @LTLIBINTL@
>+ tstgettext_SOURCES = \
>+   tstgettext.c ../../gettext-runtime/src/escapes.h \
>+   setlocale.c
>diff --git a/devel/gettext-tools/files/patch-tests_lang-c++ b/devel/gettext-tools/files/patch-tests_lang-c++
>new file mode 100644
>index 000000000000..887a24e088f8
>--- /dev/null
>+++ b/devel/gettext-tools/files/patch-tests_lang-c++
>@@ -0,0 +1,11 @@
>+--- tests/lang-c++.orig	2023-06-08 12:56:56 UTC
>++++ tests/lang-c++
>+@@ -72,7 +72,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=
>+ : ${CONFIG_SHELL=${SHELL-/bin/sh}}
>+ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
>+   ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
>+-         ../../../gettext-runtime/libasprintf/libasprintf.la \
>++         -lasprintf \
>+          ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
>+   || Exit 1
>+ 
>diff --git a/devel/gettext-tools/pkg-plist b/devel/gettext-tools/pkg-plist
>index c269acaa82ec..c0dd1f341684 100644
>--- a/devel/gettext-tools/pkg-plist
>+++ b/devel/gettext-tools/pkg-plist
>@@ -27,7 +27,7 @@ lib/libgettextlib.so
> lib/libgettextpo.a
> lib/libgettextpo.so
> lib/libgettextpo.so.0
>-lib/libgettextpo.so.0.5.8
>+lib/libgettextpo.so.0.5.9
> lib/libgettextsrc-%%PORTVERSION%%.so
> lib/libgettextsrc.so
> man/man1/autopoint.1.gz
>@@ -48,6 +48,7 @@ man/man1/msgunfmt.1.gz
> man/man1/msguniq.1.gz
> man/man1/recode-sr-latin.1.gz
> man/man1/xgettext.1.gz
>+share/aclocal/build-to-host.m4
> share/aclocal/gettext.m4
> share/aclocal/host-cpu-c-abi.m4
> share/aclocal/iconv.m4
>@@ -373,6 +374,60 @@ share/aclocal/progtest.m4
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_CN.po
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_HK.po
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++/po/zh_TW.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/INSTALL
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/Makefile.am
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autoclean.sh
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/autogen.sh
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/configure.ac
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/hello.cc
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/m4/Makefile.am
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/LINGUAS
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/Makevars
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/POTFILES.in
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/af.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ast.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/bg.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ca.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/cs.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/da.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/de.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/el.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/eo.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/es.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fi.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/fr.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ga.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/gl.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hr.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/hu.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/id.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/it.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ja.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ka.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ky.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/lv.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ms.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/mt.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nb.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nl.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/nn.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pl.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/pt_BR.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ro.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ru.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sk.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sl.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sq.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sr.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/sv.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/ta.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/tr.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/uk.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/vi.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_CN.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_HK.po
>+%%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c++20/po/zh_TW.po
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/INSTALL
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/Makefile.am
> %%PORTEXAMPLES%%%%DOCSDIR%%/examples/hello-c-gnome/autoclean.sh
>@@ -1837,6 +1892,7 @@ share/locale/eu/LC_MESSAGES/gettext-tools.mo
> share/locale/fi/LC_MESSAGES/gettext-tools.mo
> share/locale/fr/LC_MESSAGES/gettext-tools.mo
> share/locale/gl/LC_MESSAGES/gettext-tools.mo
>+share/locale/hr/LC_MESSAGES/gettext-tools.mo
> share/locale/id/LC_MESSAGES/gettext-tools.mo
> share/locale/it/LC_MESSAGES/gettext-tools.mo
> share/locale/ja/LC_MESSAGES/gettext-tools.mo
>diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
>index 7e3156c3f060..08cfb9debd9e 100644
>--- a/devel/gettext/Makefile.common
>+++ b/devel/gettext/Makefile.common
>@@ -2,7 +2,7 @@
> # experimental ports run.  Untested commits may be backed out at portmgr's
> # discretion.
> 
>-PORTVERSION=	0.21.1
>+DISTVERSION=	0.22
> PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
> CATEGORIES=	devel
> MASTER_SITES=	GNU/gettext
>diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
>index 6b3256f053d2..0f8a14092eeb 100644
>--- a/devel/gettext/distinfo
>+++ b/devel/gettext/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1669052475
>-SHA256 (gettext-0.21.1.tar.xz) = 50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6
>-SIZE (gettext-0.21.1.tar.xz) = 10054564
>+TIMESTAMP = 1687532203
>+SHA256 (gettext-0.22.tar.xz) = 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93
>+SIZE (gettext-0.22.tar.xz) = 10008808
>diff --git a/devel/libtextstyle/pkg-plist b/devel/libtextstyle/pkg-plist
>index 287652c8823e..1a64a38215c6 100644
>--- a/devel/libtextstyle/pkg-plist
>+++ b/devel/libtextstyle/pkg-plist
>@@ -5,7 +5,7 @@ include/textstyle/woe32dll.h
> lib/libtextstyle.a
> lib/libtextstyle.so
> lib/libtextstyle.so.0
>-lib/libtextstyle.so.0.1.2
>+lib/libtextstyle.so.0.2.0
> %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html
> %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html
> %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html

Actions: View | Diff

Attachments on bug 272210: 242993 | 243020 | 243033 | 243264