SOURCES: php4-gd.patch - drop gd.dsp

arekm arekm at pld-linux.org
Fri Aug 8 22:01:55 CEST 2008


Author: arekm                        Date: Fri Aug  8 20:01:55 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- drop gd.dsp

---- Files affected:
SOURCES:
   php4-gd.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/php4-gd.patch
diff -u SOURCES/php4-gd.patch:1.7 SOURCES/php4-gd.patch:1.8
--- SOURCES/php4-gd.patch:1.7	Fri Aug  8 21:42:41 2008
+++ SOURCES/php4-gd.patch	Fri Aug  8 22:01:49 2008
@@ -1516,278 +1516,6 @@
 + * vim600: sw=4 ts=4 fdm=marker
 + * vim<600: sw=4 ts=4
 + */
-diff -urN php-4.4.8.org/ext/gd/gd.dsp php-4.4.8/ext/gd/gd.dsp
---- php-4.4.8.org/ext/gd/gd.dsp	2007-05-03 04:55:11.000000000 +0200
-+++ php-4.4.8/ext/gd/gd.dsp	2008-01-22 22:38:05.887151436 +0100
-@@ -54,9 +54,9 @@
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
--# ADD BASE LINK32 php4ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-+# ADD BASE LINK32 php5ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
- # SUBTRACT BASE LINK32 /pdb:none
--# ADD LINK32 php4ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\zlib\Release"
-+# ADD LINK32 php5ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\zlib\Release"
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
-@@ -84,9 +84,9 @@
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
--# ADD BASE LINK32 php4ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"
-+# ADD BASE LINK32 php5ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"
- # SUBTRACT BASE LINK32 /pdb:none
--# ADD LINK32 php4ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\zlib\Debug"
-+# ADD LINK32 php5ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\zlib\Debug"
- # SUBTRACT LINK32 /pdb:none
- 
- !ENDIF 
-@@ -144,7 +144,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -160,7 +159,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -176,7 +174,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -192,7 +189,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -208,7 +204,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -216,18 +211,6 @@
- # Begin Source File
- 
- SOURCE=.\libgd\gd_gif_in.c
--
--!IF  "$(CFG)" == "gd - Win32 Release_TS GD2"
--
--# PROP Intermediate_Dir "Release_TS_bundled"
--
--!ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
--
--# PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
--
--!ENDIF 
--
- # End Source File
- # Begin Source File
- 
-@@ -244,7 +227,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -260,7 +242,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -276,7 +257,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -292,7 +272,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -308,7 +287,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -324,17 +302,12 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
- # End Source File
- # Begin Source File
- 
--SOURCE=.\libgd\gd_security.c
--# End Source File
--# Begin Source File
--
- SOURCE=.\libgd\gd_ss.c
- 
- !IF  "$(CFG)" == "gd - Win32 Release_TS GD2"
-@@ -344,7 +317,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -360,7 +332,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -376,7 +347,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -392,7 +362,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -408,7 +377,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -424,7 +392,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -440,7 +407,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -456,7 +422,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -472,7 +437,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -488,7 +452,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -504,7 +467,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -520,7 +482,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -536,7 +497,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -552,7 +512,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -568,7 +527,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
-@@ -584,7 +542,6 @@
- !ELSEIF  "$(CFG)" == "gd - Win32 Debug_TS GD2"
- 
- # PROP Intermediate_Dir "Debug_TS_bundled"
--# ADD CPP /FR
- 
- !ENDIF 
- 
 diff -urN php-4.4.8.org/ext/gd/gdttf.c php-4.4.8/ext/gd/gdttf.c
 --- php-4.4.8.org/ext/gd/gdttf.c	2005-01-09 22:05:31.000000000 +0100
 +++ php-4.4.8/ext/gd/gdttf.c	2008-01-22 22:38:05.887151436 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php4-gd.patch?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list