You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/07 00:39:35 UTC
svn commit: r1826059 - /openoffice/trunk/main/solenv/win64/win64.patch
Author: damjan
Date: Wed Mar 7 00:39:35 2018
New Revision: 1826059
URL: http://svn.apache.org/viewvc?rev=1826059&view=rev
Log:
Add a missing .ENDIF
Patch by: me
Modified:
openoffice/trunk/main/solenv/win64/win64.patch
Modified: openoffice/trunk/main/solenv/win64/win64.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/win64/win64.patch?rev=1826059&r1=1826058&r2=1826059&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/win64/win64.patch (original)
+++ openoffice/trunk/main/solenv/win64/win64.patch Wed Mar 7 00:39:35 2018
@@ -261,7 +261,7 @@ Index: solenv/inc/tg_compv.mk
===================================================================
--- solenv/inc/tg_compv.mk (revision 1826001)
+++ solenv/inc/tg_compv.mk (working copy)
-@@ -72,7 +72,10 @@
+@@ -72,9 +72,13 @@
.IF "$(COM)"=="MSC"
.IF "$(CCNUMVER)">="001200000000"
COMID=MSC
@@ -271,6 +271,9 @@ Index: solenv/inc/tg_compv.mk
+COMNAME=mscx
.ENDIF
.ENDIF
++.ENDIF
+
+ .IF "$(COM)"=="GCC"
Index: odk/settings/settings.mk
===================================================================
Re: svn commit: r1826059 - /openoffice/trunk/main/solenv/win64/win64.patch
Posted by Damjan Jovanovic <da...@apache.org>.
Why is it in Bugzilla? Merge it! :)
Mac users can either test regularly, or deal with the consequences later.
On Wed, Mar 7, 2018 at 2:55 AM, Don Lewis <tr...@apache.org> wrote:
> On 7 Mar, damjan@apache.org wrote:
> > Author: damjan
> > Date: Wed Mar 7 00:39:35 2018
> > New Revision: 1826059
> >
> > URL: http://svn.apache.org/viewvc?rev=1826059&view=rev
> > Log:
> > Add a missing .ENDIF
> >
> > Patch by: me
> >
> >
> > Modified:
> > openoffice/trunk/main/solenv/win64/win64.patch
> >
> > Modified: openoffice/trunk/main/solenv/win64/win64.patch
> > URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/
> win64/win64.patch?rev=1826059&r1=1826058&r2=1826059&view=diff
> > ============================================================
> ==================
> > --- openoffice/trunk/main/solenv/win64/win64.patch (original)
> > +++ openoffice/trunk/main/solenv/win64/win64.patch Wed Mar 7 00:39:35
> 2018
> > @@ -261,7 +261,7 @@ Index: solenv/inc/tg_compv.mk
> > ===================================================================
> > --- solenv/inc/tg_compv.mk (revision 1826001)
> > +++ solenv/inc/tg_compv.mk (working copy)
> > -@@ -72,7 +72,10 @@
> > +@@ -72,9 +72,13 @@
> > .IF "$(COM)"=="MSC"
> > .IF "$(CCNUMVER)">="001200000000"
> > COMID=MSC
> > @@ -271,6 +271,9 @@ Index: solenv/inc/tg_compv.mk
> > +COMNAME=mscx
> > .ENDIF
> > .ENDIF
> > ++.ENDIF
> > +
> > + .IF "$(COM)"=="GCC"
> >
> > Index: odk/settings/settings.mk
> > ===================================================================
>
> I wish my patch in https://bz.apache.org/ooo/show_bug.cgi?id=127664
> since it is now bit-rotting. It's been waiting for testing on Mac for
> the last six weeks ...
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
> For additional commands, e-mail: dev-help@openoffice.apache.org
>
>
Re: svn commit: r1826059 -
/openoffice/trunk/main/solenv/win64/win64.patch
Posted by Don Lewis <tr...@apache.org>.
On 7 Mar, damjan@apache.org wrote:
> Author: damjan
> Date: Wed Mar 7 00:39:35 2018
> New Revision: 1826059
>
> URL: http://svn.apache.org/viewvc?rev=1826059&view=rev
> Log:
> Add a missing .ENDIF
>
> Patch by: me
>
>
> Modified:
> openoffice/trunk/main/solenv/win64/win64.patch
>
> Modified: openoffice/trunk/main/solenv/win64/win64.patch
> URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/win64/win64.patch?rev=1826059&r1=1826058&r2=1826059&view=diff
> ==============================================================================
> --- openoffice/trunk/main/solenv/win64/win64.patch (original)
> +++ openoffice/trunk/main/solenv/win64/win64.patch Wed Mar 7 00:39:35 2018
> @@ -261,7 +261,7 @@ Index: solenv/inc/tg_compv.mk
> ===================================================================
> --- solenv/inc/tg_compv.mk (revision 1826001)
> +++ solenv/inc/tg_compv.mk (working copy)
> -@@ -72,7 +72,10 @@
> +@@ -72,9 +72,13 @@
> .IF "$(COM)"=="MSC"
> .IF "$(CCNUMVER)">="001200000000"
> COMID=MSC
> @@ -271,6 +271,9 @@ Index: solenv/inc/tg_compv.mk
> +COMNAME=mscx
> .ENDIF
> .ENDIF
> ++.ENDIF
> +
> + .IF "$(COM)"=="GCC"
>
> Index: odk/settings/settings.mk
> ===================================================================
I wish my patch in https://bz.apache.org/ooo/show_bug.cgi?id=127664
since it is now bit-rotting. It's been waiting for testing on Mac for
the last six weeks ...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org