incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1230424 - in /incubator/ooo/trunk/main: expat/expat-2.0.1.patch libtextcat/libtextcat-2.2.patch mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
Date Thu, 12 Jan 2012 07:31:03 GMT
Author: arielch
Date: Thu Jan 12 07:31:02 2012
New Revision: 1230424

URL: http://svn.apache.org/viewvc?rev=1230424&view=rev
Log:
Fix malformed patches (build breakers)

Modified:
    incubator/ooo/trunk/main/expat/expat-2.0.1.patch
    incubator/ooo/trunk/main/libtextcat/libtextcat-2.2.patch
    incubator/ooo/trunk/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch

Modified: incubator/ooo/trunk/main/expat/expat-2.0.1.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/expat/expat-2.0.1.patch?rev=1230424&r1=1230423&r2=1230424&view=diff
==============================================================================
--- incubator/ooo/trunk/main/expat/expat-2.0.1.patch (original)
+++ incubator/ooo/trunk/main/expat/expat-2.0.1.patch Thu Jan 12 07:31:02 2012
@@ -1,6 +1,6 @@
 --- misc/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
 +++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
-@@ -1 +1,89 @@
+@@ -1 +1,83 @@
 -dummy
 +#**************************************************************
 +#  

Modified: incubator/ooo/trunk/main/libtextcat/libtextcat-2.2.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/libtextcat/libtextcat-2.2.patch?rev=1230424&r1=1230423&r2=1230424&view=diff
==============================================================================
--- incubator/ooo/trunk/main/libtextcat/libtextcat-2.2.patch (original)
+++ incubator/ooo/trunk/main/libtextcat/libtextcat-2.2.patch Thu Jan 12 07:31:02 2012
@@ -950,7 +950,7 @@
 +}
 --- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
 +++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,87 @@
+@@ -1 +1,81 @@
 -dummy
 +#**************************************************************
 +#  

Modified: incubator/ooo/trunk/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch?rev=1230424&r1=1230423&r2=1230424&view=diff
==============================================================================
--- incubator/ooo/trunk/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch (original)
+++ incubator/ooo/trunk/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch Thu Jan 12 07:31:02
2012
@@ -1,6 +1,6 @@
---- misc/mythes-1.2.0.orig/th_gen_idx.pl
-+++ misc/build/mythes-1.2.0/th_gen_idx.pl
-@@ -1,11 +1,32 @@
+--- misc/mythes-1.2.0.orig/th_gen_idx.pl	2010-02-27 12:52:58.000000000 -0300
++++ misc/build/mythes-1.2.0/th_gen_idx.pl	2012-01-12 04:13:15.149371123 -0300
+@@ -1,11 +1,26 @@
 -#!/usr/bin/perl
 -
 -# perl program to take a thesaurus structured text data file 
@@ -9,7 +9,7 @@
 +eval 'exec perl -wS $0 ${1+"$@"}'
 +    if 0;
 +#**************************************************************
-+#  
++#
 +#  Licensed to the Apache Software Foundation (ASF) under one
 +#  or more contributor license agreements.  See the NOTICE file
 +#  distributed with this work for additional information
@@ -17,21 +17,23 @@
 +#  to you under the Apache License, Version 2.0 (the
 +#  "License"); you may not use this file except in compliance
 +#  with the License.  You may obtain a copy of the License at
-+#  
++#
 +#    http://www.apache.org/licenses/LICENSE-2.0
-+#  
+ #
+-# typcially invoked as follows:
+-# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx
 +#  Unless required by applicable law or agreed to in writing,
 +#  software distributed under the License is distributed on an
 +#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +#  KIND, either express or implied.  See the License for the
 +#  specific language governing permissions and limitations
 +#  under the License.
-+#  
+ #
 +#**************************************************************
  
  sub by_entry {
      my ($aent, $aoff) = split('\|',$a);
-@@ -13,6 +34,27 @@ sub by_entry {
+@@ -13,6 +28,27 @@ sub by_entry {
      $aent cmp $bent;
  }
  
@@ -59,7 +61,7 @@
  # main routine
  my $ne = 0;       # number of entries in index
  my @tindex=();    # the index itself
-@@ -24,6 +66,10 @@ my $nm=0;         # number of meaning fo
+@@ -24,6 +60,10 @@ my $nm=0;         # number of meaning fo
  my $meaning="";   # current meaning and synonyms
  my $p;            # misc uses
  my $encoding;     # encoding used by text file
@@ -70,7 +72,7 @@
  
  # top line of thesaurus provides encoding
  $encoding=<STDIN>;
-@@ -51,9 +97,13 @@ while ($rec=<STDIN>){
+@@ -51,9 +91,13 @@ while ($rec=<STDIN>){
  # now we have all of the information
  # so sort it and then output the encoding, count and index data
  @tindex = sort by_entry @tindex;



Mime
View raw message