[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:18 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b40f7464b65d9c892aabcbfeaf2b7a65d8642b97
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 7 04:39:05 2002 +0000

    	* Makefile.am: Update warning flags for compatibility with new C++.
    	* configure.in: Update warning flags for compatibility with new C++.
    
    	* Tools/DiskCachePeek/DiskCachePeek.pbproj/project.pbxproj:
    	Project Builder wants what it wants.
    
    JavaScriptCore:
    
    	* JavaScriptCore.pbproj/project.pbxproj: Update warning flags for compatibility
    	with new C++.
    
    WebFoundation:
    
    	* WebFoundation.pbproj/project.pbxproj: Update warning flags for compatibility
    	with new C++.
    
    WebKit:
    
    	* WebKit.pbproj/project.pbxproj: Update warning flags for compatibility
    	with new C++.
    
    	* WebCoreSupport.subproj/IFTextRenderer.m: (FillStyleWithAttributes):
    	Remove workaround we copied from AppKit, because it's a workaround for
    	a bug that was fixed in Puma.
    
    WebBrowser:
    
    	* WebBrowser.pbproj/project.pbxproj: Update warning flags for compatibility
    	with new C++.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2f7ffa4..26fe792 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-06  Darin Adler  <darin at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Update warning flags for compatibility
+	with new C++.
+
 2002-06-05  Darin Adler  <darin at apple.com>
 
 	Fix problem seen as build failure on Jersey.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 2f7ffa4..26fe792 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-06-06  Darin Adler  <darin at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Update warning flags for compatibility
+	with new C++.
+
 2002-06-05  Darin Adler  <darin at apple.com>
 
 	Fix problem seen as build failure on Jersey.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 2f7ffa4..26fe792 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-06-06  Darin Adler  <darin at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Update warning flags for compatibility
+	with new C++.
+
 2002-06-05  Darin Adler  <darin at apple.com>
 
 	Fix problem seen as build failure on Jersey.
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 8cb45b4..7a460eb 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -132,7 +132,9 @@
 				SECTORDER_FLAGS = "";
 				USE_GCC3 = YES;
 				USE_GCC3_PFE_SUPPORT = YES;
-				WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+				WARNING_CFLAGS = "$(WARNING_COMMONFLAGS) -Wbad-function-cast -Wmissing-declarations -Wnested-externs";
+				WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+				WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
 				WRAPPER_EXTENSION = framework;
 			};
 			dependencies = (
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6da5d13..2508d64 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-06  Darin Adler  <darin at apple.com>
+
+	* WebKit.pbproj/project.pbxproj: Update warning flags for compatibility
+	with new C++.
+
+	* WebCoreSupport.subproj/IFTextRenderer.m: (FillStyleWithAttributes):
+	Remove workaround we copied from AppKit, because it's a workaround for
+	a bug that was fixed in Puma.
+
 2002-06-06  Chris Blumenberg  <cblu at apple.com>
 
 	Added support for key codes and other encodings.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6da5d13..2508d64 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-06  Darin Adler  <darin at apple.com>
+
+	* WebKit.pbproj/project.pbxproj: Update warning flags for compatibility
+	with new C++.
+
+	* WebCoreSupport.subproj/IFTextRenderer.m: (FillStyleWithAttributes):
+	Remove workaround we copied from AppKit, because it's a workaround for
+	a bug that was fixed in Puma.
+
 2002-06-06  Chris Blumenberg  <cblu at apple.com>
 
 	Added support for key codes and other encodings.
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index b253b77..0a55217 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -182,15 +182,6 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
         if (fontId) {
             if (ATSUSetAttributes(style, 1, &tag, &size, (void **)valueArray) != noErr)
                 [NSException raise:NSInternalInconsistencyException format:@"Failed to set font (%@) ATSUStyle 0x%X", theFont, style];
-
-#if 1
-//#warning Aki 7/20/2000 This code should be disabled once the brain dead bug 2499383 is fixed
-            {
-                ATSUFontFeatureType types[8] = {kDiacriticsType, kTypographicExtrasType, kFractionsType, kSmartSwashType, kSmartSwashType, kSmartSwashType, kSmartSwashType, kSmartSwashType};
-                ATSUFontFeatureSelector selectors[8] = {kDecomposeDiacriticsSelector, kSmartQuotesOffSelector, kNoFractionsSelector, kWordInitialSwashesOffSelector, kWordFinalSwashesOffSelector, kLineInitialSwashesOffSelector, kLineFinalSwashesOffSelector, kNonFinalSwashesOffSelector};
-                ATSUSetFontFeatures(style, 8, types, selectors);
-            }
-#endif
         }
     }
 }
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index b253b77..0a55217 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -182,15 +182,6 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
         if (fontId) {
             if (ATSUSetAttributes(style, 1, &tag, &size, (void **)valueArray) != noErr)
                 [NSException raise:NSInternalInconsistencyException format:@"Failed to set font (%@) ATSUStyle 0x%X", theFont, style];
-
-#if 1
-//#warning Aki 7/20/2000 This code should be disabled once the brain dead bug 2499383 is fixed
-            {
-                ATSUFontFeatureType types[8] = {kDiacriticsType, kTypographicExtrasType, kFractionsType, kSmartSwashType, kSmartSwashType, kSmartSwashType, kSmartSwashType, kSmartSwashType};
-                ATSUFontFeatureSelector selectors[8] = {kDecomposeDiacriticsSelector, kSmartQuotesOffSelector, kNoFractionsSelector, kWordInitialSwashesOffSelector, kWordFinalSwashesOffSelector, kLineInitialSwashesOffSelector, kLineFinalSwashesOffSelector, kNonFinalSwashesOffSelector};
-                ATSUSetFontFeatures(style, 8, types, selectors);
-            }
-#endif
         }
     }
 }
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 3f8af0e..d2e523a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -146,9 +146,10 @@
 				PREFIX_HEADER = WebKitPrefix.h;
 				PRODUCT_NAME = WebKit;
 				SECTORDER_FLAGS = "";
-				USE_GCC3 = YES;
 				USE_GCC3_PFE_SUPPORT = YES;
-				WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+				WARNING_CFLAGS = "$(WARNING_COMMONFLAGS) -Wbad-function-cast -Wmissing-declarations -Wnested-externs";
+				WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+				WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
 				WRAPPER_EXTENSION = framework;
 			};
 			dependencies = (

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list