summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmando Di Cianno <fafhrd@gentoo.org>2005-01-18 21:59:15 +0000
committerArmando Di Cianno <fafhrd@gentoo.org>2005-01-18 21:59:15 +0000
commitb7d80db4bbd3c26c5507ca950d1804e8b1fcd0fa (patch)
tree0194f9abb65b2c20fdfe6e94e5f93a9507f7e78b /gnustep-apps/gnumail/files
parentStable on ppc. (diff)
downloadgentoo-2-b7d80db4bbd3c26c5507ca950d1804e8b1fcd0fa.tar.gz
gentoo-2-b7d80db4bbd3c26c5507ca950d1804e8b1fcd0fa.tar.bz2
gentoo-2-b7d80db4bbd3c26c5507ca950d1804e8b1fcd0fa.zip
Fixed emoticon bundle that would mangle some embedded C/C++/ObjC code
Diffstat (limited to 'gnustep-apps/gnumail/files')
-rw-r--r--gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch22
-rw-r--r--gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r10
2 files changed, 22 insertions, 0 deletions
diff --git a/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch b/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch
new file mode 100644
index 000000000000..6277aa1a8996
--- /dev/null
+++ b/gnustep-apps/gnumail/files/Emoticon-dont-break-C.patch
@@ -0,0 +1,22 @@
+--- Bundles/Emoticon/EmoticonController.m.orig 2005-01-18 15:55:51.537699400 -0500
++++ Bundles/Emoticon/EmoticonController.m 2005-01-18 16:11:10.642974160 -0500
+@@ -35,8 +35,7 @@
+ {@":)", @"emoticon-face1.tiff"},
+ {@":-)", @"emoticon-face1.tiff"},
+ {@":o)", @"emoticon-face1.tiff"},
+- {@"8)", @"emoticon-face2.tiff"},
+- {@"8-)", @"emoticon-face2.tiff"},
++ {@"8-)", @"emoticon-face2.tiff"}, // 8) conflicts with C/ObjC code! like: if (n == 8)
+ {@";)", @"emoticon-face3.tiff"},
+ {@";o)", @"emoticon-face3.tiff"},
+ {@";-)", @"emoticon-face3.tiff"},
+@@ -57,8 +56,7 @@
+ {@";o(", @"emoticon-face11.tiff"},
+ {@":-*", @"emoticon-face13.tiff"},
+ {@":-x", @"emoticon-face14.tiff"},
+- {@"B)", @"emoticon-face15.tiff"},
+- {@"B-)", @"emoticon-face15.tiff"},
++ {@"B-)", @"emoticon-face15.tiff"}, // B) conflicts with valid C code! like if (FlagB)
+ {@":-.", @"emoticon-face19.tiff"},
+ {@":o", @"emoticon-face5.tiff"}
+ };
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20050106-r1