[packages/hiphop-php] fix gd symbols overlap with real gd lib
glen
glen at pld-linux.org
Sun Oct 6 16:13:39 CEST 2013
commit 456ede1d0dce4b52754924e87bdaf64cae5a3670
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Oct 6 17:12:39 2013 +0300
fix gd symbols overlap with real gd lib
gd-syms.patch | 29 +++++++++++++++++++++++++++++
hiphop-php.spec | 2 ++
2 files changed, 31 insertions(+)
---
diff --git a/hiphop-php.spec b/hiphop-php.spec
index c512faf..c0f713a 100644
--- a/hiphop-php.spec
+++ b/hiphop-php.spec
@@ -29,6 +29,7 @@ Patch4: system-libafdt.patch
Patch5: system-folly.patch
Patch6: boost-system-category.patch
Patch7: gcc4.8.patch
+Patch8: gd-syms.patch
URL: http://wiki.github.com/facebook/hiphop-php/
BuildRequires: binutils-devel
BuildRequires: bison >= 2.3
@@ -82,6 +83,7 @@ Apache and mod_php.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
ln -s libevent-1.4.*-stable libevent
%{__patch} -d libevent -p1 < hphp/third_party/libevent-1.4.14.fb-changes.diff
diff --git a/gd-syms.patch b/gd-syms.patch
new file mode 100644
index 0000000..1c4c885
--- /dev/null
+++ b/gd-syms.patch
@@ -0,0 +1,29 @@
+--- hiphop-php-HPHP-2.1.0/hphp/runtime/ext/ext_image.cpp~ 2013-07-12 18:00:55.000000000 +0000
++++ hiphop-php-HPHP-2.1.0/hphp/runtime/ext/ext_image.cpp 2013-10-06 12:44:00.105141356 +0000
+@@ -4188,7 +4188,7 @@
+ return false;
+ }
+
+-// gdImageConvolution does not exist in our libgd.a, copied from
++// hphp_gdImageConvolution does not exist in our libgd.a, copied from
+ // php's libgd/gd.c
+
+ /* Filters function added on 2003/12
+@@ -4200,7 +4200,7 @@
+ (src->trueColor?gdImageGetTrueColorPixel:gdImageGetPixel)
+ #endif
+
+-static int gdImageConvolution(gdImagePtr src, float filter[3][3],
++static int hphp_gdImageConvolution(gdImagePtr src, float filter[3][3],
+ float filter_div, float offset) {
+ int x, y, i, j, new_a;
+ float new_r, new_g, new_b;
+@@ -4290,7 +4290,7 @@
+ }
+ }
+ }
+- if (gdImageConvolution(im_src, mtx, div, offset)) {
++ if (hphp_gdImageConvolution(im_src, mtx, div, offset)) {
+ return true;
+ } else {
+ return false;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hiphop-php.git/commitdiff/456ede1d0dce4b52754924e87bdaf64cae5a3670
More information about the pld-cvs-commit
mailing list