aboutsummaryrefslogtreecommitdiff
path: root/lib/addons
diff options
context:
space:
mode:
Diffstat (limited to 'lib/addons')
-rw-r--r--lib/addons/script.module.pil/Imaging-1.1.7-access.patch13
-rw-r--r--lib/addons/script.module.pil/Makefile.in1
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch
new file mode 100644
index 0000000000..dd51f4ac8e
--- /dev/null
+++ b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch
@@ -0,0 +1,13 @@
+diff -rupN Imaging-1.1.7/libImaging/Access.c Imaging-1.1.7-mod/libImaging/Access.c
+--- Imaging-1.1.7/libImaging/Access.c 2009-10-31 20:44:12.000000000 -0400
++++ Imaging-1.1.7-mod/libImaging/Access.c 2011-10-10 19:40:22.000000000 -0400
+@@ -32,7 +32,7 @@ add_item(const char* mode)
+ {
+ UINT32 i = hash(mode);
+ /* printf("hash %s => %d\n", mode, i); */
+- if (access_table[i].mode) {
++ if (access_table[i].mode && (strcmp(mode, access_table[i].mode) != 0)) {
+ fprintf(stderr, "AccessInit: hash collision: %d for both %s and %s\n",
+ i, mode, access_table[i].mode);
+ exit(1);
+
diff --git a/lib/addons/script.module.pil/Makefile.in b/lib/addons/script.module.pil/Makefile.in
index 4fb5db97c3..a1f4d00e2e 100644
--- a/lib/addons/script.module.pil/Makefile.in
+++ b/lib/addons/script.module.pil/Makefile.in
@@ -41,6 +41,7 @@ $(SOURCE): $(ARCHIVE)
cd $(SOURCE); \
patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch; \
patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \
+ patch -p1 < ../Imaging-1.1.7-access.patch; \
sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \
fi