[Libreoffice-commits] .: bin/applyflags patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Mar 30 11:50:59 PDT 2011
bin/applyflags | 3
patches/dev300/apply | 6 -
patches/dev300/ct2n-build.diff | 220 -----------------------------------------
3 files changed, 229 deletions(-)
New commits:
commit 8d7eb7a786bd5d38d907fbc11d43b9e27ef8d569
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 30 20:50:16 2011 +0200
pushed ct2n-build.diff into git
removed the empty CT2N patch section
diff --git a/bin/applyflags b/bin/applyflags
index 58531e7..53aa0a1 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -22,9 +22,6 @@ test -n "$builddir" && OOBUILDDIR=$builddir
echo -n "--distro=$DISTRO"
-if test -d $OOBUILDDIR/ct2n ; then
- SECTIONS="$SECTIONS,CT2N"
-fi
if test -d $OOBUILDDIR/nlpsolver ; then
SECTIONS="$SECTIONS,NLPSolver"
fi
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8db5cba..7e6f81e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -36,8 +36,6 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
-# optional section for ConvertTextToNumber extension
-CT2N : CT2NBits
# optional section for NLPSolver extension
NLPSolver : NLPSolverBits
# special fragmented build patch distro
@@ -1371,10 +1369,6 @@ goodies-eps-filter-unix.diff, n#200053, rodo
# internationalized ordinal suffix autocorrection. Needs ICU 4.2
svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
-[ CT2NBits ]
-# ConvertTextToNumber extension build bits (fate#307906)
-ct2n-build.diff, pmladek
-
[ OxygenOfficeDefaultSettings ]
# Always enable extended tips
i27928-extended-tips-on.diff
diff --git a/patches/dev300/ct2n-build.diff b/patches/dev300/ct2n-build.diff
deleted file mode 100644
index 69c3cfe..0000000
--- a/patches/dev300/ct2n-build.diff
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -purN ct2n.old/ConvertTextToNumber-1.3.2-no-license.patch ct2n/ConvertTextToNumber-1.3.2-no-license.patch
---- ct2n.old/ConvertTextToNumber-1.3.2-no-license.patch 1970-01-01 01:00:00.000000000 +0100
-+++ ct2n/ConvertTextToNumber-1.3.2-no-license.patch 2010-03-08 19:40:15.000000000 +0100
-@@ -0,0 +1,16 @@
-+diff -purN misc/description.xml misc/build/description.xml
-+--- misc/description.xml 2009-02-03 00:07:30.000000000 +0100
-++++ misc/build/description.xml 2010-03-05 21:38:48.000000000 +0100
-+@@ -5,12 +5,4 @@
-+ xmlns:xlink="http://www.w3.org/1999/xlink">
-+ <identifier value="nl.nouenoff.ct2n"/>
-+ <version value="1.3.2"/>
-+- <!-- <dependencies>
-+-
-+- </dependencies> -->
-+- <registration>
-+- <simple-license accept-by="admin" default-license-id="ID0" suppress-on-update="true" >
-+- <license-text xlink:href="registration/COPYING" lang="en" license-id="ID0" />
-+- </simple-license>
-+- </registration>
-+ </description>
-diff -purN ct2n.old/ConvertTextToNumber-1.3.2-no-visible-by-default.patch ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
---- ct2n.old/ConvertTextToNumber-1.3.2-no-visible-by-default.patch 1970-01-01 01:00:00.000000000 +0100
-+++ ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch 2010-03-08 19:40:20.000000000 +0100
-@@ -0,0 +1,104 @@
-+diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowState.xcu
-+--- misc/Office/UI/BaseWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/BaseWindowState.xcu 2010-03-05 21:36:37.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/BasicIDEWindowState.xcu misc/build/Office/UI/BasicIDEWindowState.xcu
-+--- misc/Office/UI/BasicIDEWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/BasicIDEWindowState.xcu 2010-03-05 21:36:46.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/CalcWindowState.xcu misc/build/Office/UI/CalcWindowState.xcu
-+--- misc/Office/UI/CalcWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/CalcWindowState.xcu 2010-03-05 21:36:32.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/DrawWindowState.xcu misc/build/Office/UI/DrawWindowState.xcu
-+--- misc/Office/UI/DrawWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/DrawWindowState.xcu 2010-03-05 21:36:54.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/ImpressWindowState.xcu misc/build/Office/UI/ImpressWindowState.xcu
-+--- misc/Office/UI/ImpressWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/ImpressWindowState.xcu 2010-03-05 21:36:59.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/MathWindowState.xcu misc/build/Office/UI/MathWindowState.xcu
-+--- misc/Office/UI/MathWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/MathWindowState.xcu 2010-03-05 21:37:03.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/StartModuleWindowState.xcu misc/build/Office/UI/StartModuleWindowState.xcu
-+--- misc/Office/UI/StartModuleWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/StartModuleWindowState.xcu 2010-03-05 21:37:09.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-+diff -purN misc/Office/UI/WriterWindowState.xcu misc/build/Office/UI/WriterWindowState.xcu
-+--- misc/Office/UI/WriterWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
-++++ misc/build/Office/UI/WriterWindowState.xcu 2010-03-05 21:37:17.000000000 +0100
-+@@ -9,6 +9,9 @@
-+ <prop oor:name="UIName" oor:type="xs:string">
-+ <value>CT2N</value>
-+ </prop>
-++ <prop oor:name="Visible" oor:type="xs:boolean">
-++ <value>false</value>
-++ </prop>
-+ </node>
-+ </node>
-+ </node>
-diff -purN ct2n.old/makefile.mk ct2n/makefile.mk
---- ct2n.old/makefile.mk 2007-04-20 17:59:41.000000000 +0200
-+++ ct2n/makefile.mk 2010-04-15 14:43:02.000000000 +0200
-@@ -0,0 +1,70 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.10 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# 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).
-+#
-+# 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.
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=ct2n
-+TARGET=ct2n
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+TARFILE_MD5=451ccf439a36a568653b024534669971
-+TARFILE_NAME=ConvertTextToNumber-1.3.2
-+TARFILE_ROOTDIR=.
-+BUILD_DIR=.
-+
-+PATCH_FILES=\
-+ ConvertTextToNumber-1.3.2-no-license.patch \
-+ ConvertTextToNumber-1.3.2-no-visible-by-default.patch
-+
-+CONFIGURE_DIR=
-+CONFIGURE_ACTION=
-+CONFIGURE_FLAGS=
-+BUILD_ACTION=
-+
-+ZIP1TARGET=ConvertTextToNumber
-+ZIP1EXT=.oxt
-+ZIP1FLAGS=-u -r
-+ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR)
-+ZIP1LIST= * -x "*.orig" -x "so_*_ct2n"
-+ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : tg_ext.mk
-+.INCLUDE : target.mk
-+
-+ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-diff -purN ct2n.old/delzip ct2n/delzip
---- ct2n.old/delzip 2007-04-20 17:59:41.000000000 +0200
-+++ ct2n/delzip 2010-03-09 10:55:28.000000000 +0100
-@@ -0,0 +1,2 @@
-+*.orig
-+so_*_ct2n
-diff -purN ct2n.old/prj/build.lst ct2n/prj/build.lst
---- ct2n.old/prj/build.lst 1970-01-01 01:00:00.000000000 +0100
-+++ ct2n/prj/build.lst 2010-03-08 18:41:42.000000000 +0100
-@@ -0,0 +1,3 @@
-+ct2n ct2n : solenv NULL NULL
-+ct2n ct2n usr1 - all ct2n_mkout NULL
-+ct2n ct2n nmake - all ct2n_ct2n NULL
-diff -purN ct2n.old/prj/d.lst ct2n/prj/d.lst
---- ct2n.old/prj/d.lst 1970-01-01 01:00:00.000000000 +0100
-+++ ct2n/prj/d.lst 2010-03-08 19:42:13.000000000 +0100
-@@ -0,0 +1 @@
-+..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin%_EXT%\*
More information about the Libreoffice-commits
mailing list