Issue 10701 - stlport/win32_sdk.sh uses wrong patchfile.
Summary: stlport/win32_sdk.sh uses wrong patchfile.
Status: CLOSED FIXED
Alias: None
Product: Build Tools
Classification: Code
Component: code (show other issues)
Version: 643C
Hardware: PC Windows 2000
: P3 Trivial (vote)
Target Milestone: OOo 1.0.2
Assignee: hjs
QA Contact: issues@tools
URL:
Keywords: merge_pending
Depends on:
Blocks:
 
Reported: 2003-01-16 08:10 UTC by quetschke
Modified: 2003-03-06 10:49 UTC (History)
1 user (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
patch for stlport/win32_sdk.sh (435 bytes, patch)
2003-01-16 08:13 UTC, quetschke 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description quetschke 2003-01-16 08:10:46 UTC 
The following patchfile is needed to fix a cut-n-paste error.

This only affects w32/tcsh builds.
Comment 1 quetschke 2003-01-16 08:13:31 UTC 
Created attachment 4316 [details]
patch for stlport/win32_sdk.sh
Comment 2 quetschke 2003-01-16 08:16:31 UTC 
Committed as obvious fix.
Comment 3 quetschke 2003-01-16 08:18:35 UTC 
Added merge_pending.
Comment 4 quetschke 2003-01-17 08:12:16 UTC 
Don't use --binary! The win32_sdk.diff file is (mostly) DOS style,
_threads.h is UNIX style.

Applied:

--- stlport/win32_sdk.sh	16 Jan 2003 08:15:34 -0000	1.1.2.1
+++ stlport/win32_sdk.sh	17 Jan 2003 08:07:02 -0000
@@ -5,5 +5,5 @@
 
 cd $1
 
-cat $2/STLport-4.0_SDK.patch | patch --binary -b -p2
+cat $2/STLport-4.0_SDK.patch | patch -b -p2
Comment 5 quetschke 2003-01-17 08:24:04 UTC 
Don't ask, this works.

-cat $2/STLport-4.0_SDK.patch | patch -b -p2
+patch -i $2/STLport-4.0_SDK.patch -b -p2

Now it uses the same syntax as win32_sdk.bat
Comment 6 foskey 2003-01-17 12:04:08 UTC 
Approval for OO643C.

Wait for tree to open for patches,  approved for OO_STABLE_1 as well.

I am curious why we really need another script for the cd and patch
however.
Comment 7 quetschke 2003-01-30 08:48:56 UTC 
stlport/win32_custom.sh needs the same syntax as win32_custom.bat

-cat $2/dos_lineends.patch | patch --binary -b -p2
+patch -i %2\dos_lineends.patch -b -p2

Approved and committed as w32/tcsh only patch.
Comment 8 hjs 2003-03-06 10:49:51 UTC 
closing as it seems to be fixed for a while now...