[commits] (bear) [11131] Tweaked the patch to remove the fuzz and also

[commits]

Title: [commits] (bear) [11131] Tweaked the patch to remove the fuzz and also

Revision

11131

Author

bear

Date

2006-07-11 16:12:41 -0700 (Tue, 11 Jul 2006)

Log Message

Tweaked the patch to remove the fuzz and also
make the apply target not complain to make that
the patchc may already be present

Modified Paths

• trunk/external/PyICU/Makefile
• trunk/external/PyICU/patches-0.5-62

Diff

Modified: trunk/external/PyICU/Makefile (11130 => 11131)

--- trunk/external/PyICU/Makefile	2006-07-11 22:49:17 UTC (rev 11130)
+++ trunk/external/PyICU/Makefile	2006-07-11 23:12:41 UTC (rev 11131)
@@ -37,7 +37,7 @@
 MANIFEST=$(SNAP)/$(SITE)/PyICU.py $(SNAP)/$(SITE)/_PyICU.so
 
 apply: patches-$(VERSION)
-	patch -Nup0 < patches-$(VERSION)
+	patch -Nup0 < patches-$(VERSION); echo ok
 
 build: expand apply
 	MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) \

Modified: trunk/external/PyICU/patches-0.5-62 (11130 => 11131)

--- trunk/external/PyICU/patches-0.5-62	2006-07-11 22:49:17 UTC (rev 11130)
+++ trunk/external/PyICU/patches-0.5-62	2006-07-11 23:12:41 UTC (rev 11131)
@@ -1,9 +1,10 @@
 --- PyICU-0.5-62/_PyICU.cpp	2006-07-11 13:27:53.000000000 -0700
 +++ PyICU-0.5-62-patched/_PyICU.cpp	2006-07-11 13:27:06.000000000 -0700
-@@ -35,6 +35,16 @@
+@@ -35,8 +35,18 @@
  #include "calendar.h"
  #include "collator.h"
  
+ 
 +#ifdef EPRINTF
 +#include <assert.h>
 +void __eprintf(const char *format, const char *file, unsigned line,
@@ -17,6 +18,7 @@
  /* const variable descriptor */
  
  class t_descriptor {
+ public:
 --- PyICU-0.5-62/Makefile	2006-07-11 13:31:16.000000000 -0700
 +++ PyICU-0.5-62-patched/Makefile	2006-07-11 13:31:14.000000000 -0700
 @@ -87,7 +87,7 @@

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits