Attachment 205147 Details for Bug 238629 – Remove the dependency on devel/patch

[patch] Remove the dependency on devel/patch

libreoffice-gpatch.diff (text/plain), 1.44 KB, created by Mikhail Teterin on 2019-06-16 20:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2019-06-16 20:26:00 UTC

Size: 1.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 504360)
>+++ Makefile	(working copy)
>@@ -20,7 +20,6 @@
> 		dmake:devel/dmake \
> 		${LOCALBASE}/bin/gperf:devel/gperf \
> 		mdds>=1.4:devel/mdds \
>-		gpatch:devel/patch \
> 		ucpp:devel/ucpp \
> 		${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \
> 		vigra-config:graphics/vigra \
>@@ -253,7 +252,6 @@
> 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
> 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
> 		--with-external-thes-dir=${LOCALBASE}/share/mythes \
>-		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
> 		--with-os-version=${OSVERSION} \
> 		--with-parallelism=${MAKE_JOBS_NUMBER} \
> 		--with-system-cppunit \
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 504360)
>+++ files/patch-configure	(working copy)
>@@ -1,4 +1,4 @@
>---- configure.orig	2018-08-03 03:58:40.000000000 +0800
>+--- configure	2018-08-03 03:58:40.000000000 +0800
> +++ configure	2018-08-10 05:28:52.021925000 +0800
> @@ -31735,7 +31735,7 @@
>  
>@@ -9,3 +9,10 @@
>              && test "$with_system_openssl" != "no"; then
>          with_system_openssl=yes
>          SYSTEM_OPENSSL=TRUE
>+@@ -34402,5 +34412,5 @@
>+ fi
>+ 
>+-if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
>++if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
>+     if test -z "$with_gnu_patch"; then
>+         GNUPATCH=$PATCH

Actions: View | Diff

Attachments on bug 238629: 205147