[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:25:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3c577f0dae0792fca10e861305db4cbd3f8f779d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 19 03:02:32 2003 +0000
WebCore:
Reviewed by Chris.
Merged changes from Safari-58-1-branch.
2003-02-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
* WebCore.pbproj/project.pbxproj: Include /System/Library/PrivateFrameworks.
WebKit:
Reviewed by Chris.
Merged changes from Safari-58-1-branch.
2003-02-11 Richard Williamson <rjw at apple.com>
Add import of CGFontCache.h, which is no longer
included by CoreGraphicsPrivate.h.
Reviewed by Vicki.
* WebCoreSupport.subproj/WebTextRendererFactory.m:
2003-02-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
* WebCoreSupport.subproj/WebTextRenderer.m: Change (void **) cast
to (void *) for compatibility with the latest Panther.
2003-02-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Trey.
* WebKit.pbproj/project.pbxproj: Add /System/Library/PrivateFrameworks
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3671 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9faaae9..e22f105 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-02-18 Maciej Stachowiak <mjs at apple.com
+
+ Reviewed by Chris.
+
+ Merged changes from Safari-58-1-branch.
+
+ 2003-02-11 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ * WebCore.pbproj/project.pbxproj: Include /System/Library/PrivateFrameworks.
+
2003-02-18 Trey Matteson <trey at apple.com>
3171982 - REGRESSION: onClick handlers run twice when button pressed (DSLReports.com forums)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9faaae9..e22f105 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-02-18 Maciej Stachowiak <mjs at apple.com
+
+ Reviewed by Chris.
+
+ Merged changes from Safari-58-1-branch.
+
+ 2003-02-11 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ * WebCore.pbproj/project.pbxproj: Include /System/Library/PrivateFrameworks.
+
2003-02-18 Trey Matteson <trey at apple.com>
3171982 - REGRESSION: onClick handlers run twice when button pressed (DSLReports.com forums)
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 19f2999..2fda5b3 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -125,7 +125,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebCore.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\" \"${DSTROOT}/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = ForwardingHeaders;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 774d7a4..2d7ba41 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,31 @@
+2003-02-18 Maciej Stachowiak <mjs at ap0101m-dhcp138.apple.com>
+
+ Reviewed by Chris.
+
+ Merged changes from Safari-58-1-branch.
+
+ 2003-02-11 Richard Williamson <rjw at apple.com>
+
+ Add import of CGFontCache.h, which is no longer
+ included by CoreGraphicsPrivate.h.
+
+ Reviewed by Vicki.
+
+ * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
+ 2003-02-11 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * WebCoreSupport.subproj/WebTextRenderer.m: Change (void **) cast
+ to (void *) for compatibility with the latest Panther.
+
+ 2003-02-11 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ * WebKit.pbproj/project.pbxproj: Add /System/Library/PrivateFrameworks
+
=== Safari-62 ===
2003-02-17 Ken Kocienda <kocienda at apple.com>
diff --git a/WebKit/English.lproj/InfoPlist.strings b/WebKit/English.lproj/InfoPlist.strings
index 7799708..fa485db 100644
Binary files a/WebKit/English.lproj/InfoPlist.strings and b/WebKit/English.lproj/InfoPlist.strings differ
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index cb78095..687a7bb 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -258,7 +258,7 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
ATSUFontID *valueArray[1] = {&fontId};
if (fontId) {
- if (ATSUSetAttributes(style, 1, &tag, &size, (void **)valueArray) != noErr)
+ if (ATSUSetAttributes(style, 1, &tag, &size, (void *)valueArray) != noErr)
[NSException raise:NSInternalInconsistencyException format:@"Failed to set font (%@) ATSUStyle 0x%X", theFont, style];
}
}
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 83e8ce9..793e474 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -12,6 +12,7 @@
#import <CoreGraphics/CoreGraphicsPrivate.h>
#import <CoreGraphics/CGFontLCDSupport.h>
+#import <CoreGraphics/CGFontCache.h>
#import <mach-o/dyld.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index a41c61f..3c81eb1 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -133,7 +133,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebKit.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\" \"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\" \"$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\" \"${DSTROOT}/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\" \"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list