From c32be18efff716754baf96ba44ad28531fa5fcff Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 24 Oct 2012 15:12:58 +0200
Subject: ct2n: fix build on Windows (DOS line ends in patches)

Change-Id: I48c90f7abcc9609d5b2c041597fdeff37db836c8
---
 ct2n/ConvertTextToNumber-1.3.2-no-license.patch    |  24 ++--
 ...tTextToNumber-1.3.2-no-visible-by-default.patch | 144 ++++++++++-----------
 ct2n/UnpackedTarball_ct2n.mk                       |  12 ++
 3 files changed, 96 insertions(+), 84 deletions(-)

(limited to 'ct2n')

diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
index 1d8b805ceaa8..cd17fc00da70 100644
--- a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
@@ -2,15 +2,15 @@ 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>
+  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 --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
index e764b55e3b8b..50dd4b5f4775 100644
--- a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
@@ -2,103 +2,103 @@ diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowSta
 --- 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>
+ 				<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>
+ 				<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>
+ 				<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>
+ 				<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>
+ 				<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>
+ 				<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>
+ 				<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>
+ 				<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 --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk
index f30704668a24..bf96226f3ecb 100644
--- a/ct2n/UnpackedTarball_ct2n.mk
+++ b/ct2n/UnpackedTarball_ct2n.mk
@@ -16,6 +16,18 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
 	ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
 ))
 
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,ConvertTextToNumber,\
+	description.xml \
+	Office/UI/BaseWindowState.xcu \
+	Office/UI/BasicIDEWindowState.xcu \
+	Office/UI/CalcWindowState.xcu \
+	Office/UI/DrawWindowState.xcu \
+	Office/UI/ImpressWindowState.xcu \
+	Office/UI/MathWindowState.xcu \
+	Office/UI/StartModuleWindowState.xcu \
+	Office/UI/WriterWindowState.xcu \
+))
+
 $(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit