diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-05-16 21:56:04 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-03 11:41:36 +0100 |
commit | 1e4422a4b4c443c286c90853f50b739a67ce5d1f (patch) | |
tree | d09d18435b1c7f579fed91e48927c29af4239d19 /mythes | |
parent | remove ShapeList::getNextShape(SdrObject* pObj) (diff) | |
download | core-1e4422a4b4c443c286c90853f50b739a67ce5d1f.tar.gz core-1e4422a4b4c443c286c90853f50b739a67ce5d1f.zip |
re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1397337
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
Patches contributed by Andre Fischer
Fixed getcsym.awk to handle #-comments that contain special regexp chars.
http://svn.apache.org/viewvc?view=revision&revision=1230971
118778: Added ADDITIONAL_REPOSITORIES environment variable and its
automatic setup in configure.
http://svn.apache.org/viewvc?view=revision&revision=1232004
118160: Added external CoinMP library.
http://svn.apache.org/viewvc?view=revision&revision=1233909
Patches contributed by Herbert Duerr
#i119168# use generic LICENSE file for langpacks and sdks
http://svn.apache.org/viewvc?view=revision&revision=1310178
macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
http://svn.apache.org/viewvc?view=revision&revision=1183367
allow gbuild with empty sysroot on linux
http://svn.apache.org/viewvc?view=revision&revision=1179186
Patches contributed by Ingo Schmidt
native373: #164472# improvements for msi database
http://svn.apache.org/viewvc?view=revision&revision=1167540
http://svn.apache.org/viewvc?view=revision&revision=1167539
Patches contributed by Jurgen Schmidt
adapt setup package scripts to handle special DS_Store file for
developer snapshot builds
http://svn.apache.org/viewvc?view=revision&revision=1232430
imported patch extensions_i117681.patch
http://svn.apache.org/viewvc?view=revision&revision=1172102
Patches contributed by Michael Stahl
gbuild: RepositoryFixes.mk should be optional
http://svn.apache.org/viewvc?view=revision&revision=1166123
xslt filter: remove the FLA horror
wordml import filter: replace FLA usage with plain XSLT
http://svn.apache.org/viewvc?view=revision&revision=1363727
Patch contributed by Oliver-Rainer Wittmann
i#88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
cppunit pieces, cleanup Mac image bits, remove coin-mp and
re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
MPLv2 subset checking.
Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
Diffstat (limited to 'mythes')
-rw-r--r-- | mythes/mythes-1.2.0-vanilla-th-gen-idx.patch | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch index 5012f5a17cf7..3752e291200e 100644 --- a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch +++ b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch @@ -1,6 +1,6 @@ --- misc/mythes-1.2.3.orig/th_gen_idx.pl +++ misc/build/mythes-1.2.3/th_gen_idx.pl -@@ -1,11 +1,32 @@ +@@ -1,11 +1,25 @@ -#!/usr/bin/perl - -# perl program to take a thesaurus structured text data file @@ -8,34 +8,27 @@ +: +eval 'exec perl -wS $0 ${1+"$@"}' + if 0; -+#************************************************************************* +# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# This file is part of the LibreOffice project. +# -+# Copyright 2000, 2010 Oracle and/or its affiliates. ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# -+# OpenOffice.org - a multi-platform office productivity suite ++# This file incorporates work covered by the following license notice: +# -+# This file is part of OpenOffice.org. ++# 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 regarding copyright ++# ownership. The ASF licenses this file 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 . +# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). # -# typically invoked as follows: -# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. # -+#************************************************************************* sub by_entry { my ($aent, $aoff) = split('\|',$a); |