[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:27:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7a8962282c7da155e52943da599dbfc886063843
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 26 00:04:42 2002 +0000
top level:
* configure.in: Add DeploymentFat build style.
JavaScriptCore:
* JavaScriptCore.pbproj/project.pbxproj: Add DeploymentFat build style.
WebFoundation:
* WebFoundation.pbproj/project.pbxproj: Add DeploymentFat build style.
WebCore:
* WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
- fixed 3007532 -- Main documentation frame doesn't load on Apple docs page
This was caused by my recent fix for the "checkboxes in wrong place" bug.
While discussing that bug fix with Richard, I realized that I needed to do the
work at layout time, not print time. Luckily, this code ends up being simpler
than the original solution.
* khtml/rendering/render_replaced.cpp:
(RenderWidget::resizeWidget): Take out size limits based on X limits.
(RenderWidget::layout): Move widgets off into far away coordinate space when
layout happens. They get moved back on to the right position during the print process.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm: Removed paint, buildViewsNotYetAddedSet, viewsNotYetAdded,
and addedWidget.
* kwq/KWQScrollView.mm: (QScrollView::addChild): Removed call to addedWidget.
* kwq/WebCoreBridge.mm: (-[WebCoreBridge drawRect:withPainter:]): Put the call to the
renderer to print back in here, since it's simple again.
* kwq/KWQWidget.mm: (QWidget::internalSetGeometry): Left in a couple of asserts that
were useful in narrowing this one down.
WebKit:
* WebKit.pbproj/project.pbxproj: Add DeploymentFat build style.
WebBrowser:
* WebBrowser.pbproj/project.pbxproj: Add DeploymentFat build style.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1674 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c1e0546..68630a0 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
=== Alexander-14 ===
2002-07-21 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index c1e0546..68630a0 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
=== Alexander-14 ===
2002-07-21 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index c1e0546..68630a0 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,7 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
=== Alexander-14 ===
2002-07-21 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index b8e7d1d..261ca4c 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -67,6 +67,7 @@
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
F58C8A1D025BD408018635CA,
+ F531DDEB02F0C2DD018635CA,
);
isa = PBXProject;
mainGroup = 0867D691FE84028FC02AAC07;
@@ -421,6 +422,17 @@
//F52
//F53
//F54
+ F531DDEB02F0C2DD018635CA = {
+ buildRules = (
+ );
+ buildSettings = {
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+ SKIP_INSTALL = YES;
+ };
+ isa = PBXBuildStyle;
+ name = DeploymentFat;
+ };
F58C8A1D025BD408018635CA = {
buildRules = (
);
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3d4cbe6..049b1c1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,44 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
+ - fixed 3007532 -- Main documentation frame doesn't load on Apple docs page
+
+ This was caused by my recent fix for the "checkboxes in wrong place" bug.
+ While discussing that bug fix with Richard, I realized that I needed to do the
+ work at layout time, not print time. Luckily, this code ends up being simpler
+ than the original solution.
+
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::resizeWidget): Take out size limits based on X limits.
+ (RenderWidget::layout): Move widgets off into far away coordinate space when
+ layout happens. They get moved back on to the right position during the print process.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed paint, buildViewsNotYetAddedSet, viewsNotYetAdded,
+ and addedWidget.
+ * kwq/KWQScrollView.mm: (QScrollView::addChild): Removed call to addedWidget.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge drawRect:withPainter:]): Put the call to the
+ renderer to print back in here, since it's simple again.
+
+ * kwq/KWQWidget.mm: (QWidget::internalSetGeometry): Left in a couple of asserts that
+ were useful in narrowing this one down.
+
+2002-07-25 Darin Adler <darin at apple.com>
+
+ Once I realized that, Richard and I talked it over and found an even better fix
+ that sidesteps the problem. Removing the widgets from the superview was not necessary.
+
+ * kwq/KWQKHTMLPartImpl.h: Removed buildViewsNotYetAddedSet, viewsNotYetAdded, and
+ addedWidget. Added moveWidgetsAside.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::paint):
+ (KWQKHTMLPartImpl::moveWidgetsAside):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::addChild):
+ * kwq/KWQWidget.mm:
+ (QWidget::internalSetGeometry):
+
2002-07-25 David Hyatt <hyatt at apple.com>
Floated images using "align" should have margins to prevent the text from running right
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3d4cbe6..049b1c1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,44 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
+ - fixed 3007532 -- Main documentation frame doesn't load on Apple docs page
+
+ This was caused by my recent fix for the "checkboxes in wrong place" bug.
+ While discussing that bug fix with Richard, I realized that I needed to do the
+ work at layout time, not print time. Luckily, this code ends up being simpler
+ than the original solution.
+
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::resizeWidget): Take out size limits based on X limits.
+ (RenderWidget::layout): Move widgets off into far away coordinate space when
+ layout happens. They get moved back on to the right position during the print process.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed paint, buildViewsNotYetAddedSet, viewsNotYetAdded,
+ and addedWidget.
+ * kwq/KWQScrollView.mm: (QScrollView::addChild): Removed call to addedWidget.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge drawRect:withPainter:]): Put the call to the
+ renderer to print back in here, since it's simple again.
+
+ * kwq/KWQWidget.mm: (QWidget::internalSetGeometry): Left in a couple of asserts that
+ were useful in narrowing this one down.
+
+2002-07-25 Darin Adler <darin at apple.com>
+
+ Once I realized that, Richard and I talked it over and found an even better fix
+ that sidesteps the problem. Removing the widgets from the superview was not necessary.
+
+ * kwq/KWQKHTMLPartImpl.h: Removed buildViewsNotYetAddedSet, viewsNotYetAdded, and
+ addedWidget. Added moveWidgetsAside.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::paint):
+ (KWQKHTMLPartImpl::moveWidgetsAside):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::addChild):
+ * kwq/KWQWidget.mm:
+ (QWidget::internalSetGeometry):
+
2002-07-25 David Hyatt <hyatt at apple.com>
Floated images using "align" should have margins to prevent the text from running right
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3d4cbe6..049b1c1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,44 @@
+2002-07-25 Darin Adler <darin at apple.com>
+
+ * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
+
+ - fixed 3007532 -- Main documentation frame doesn't load on Apple docs page
+
+ This was caused by my recent fix for the "checkboxes in wrong place" bug.
+ While discussing that bug fix with Richard, I realized that I needed to do the
+ work at layout time, not print time. Luckily, this code ends up being simpler
+ than the original solution.
+
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::resizeWidget): Take out size limits based on X limits.
+ (RenderWidget::layout): Move widgets off into far away coordinate space when
+ layout happens. They get moved back on to the right position during the print process.
+
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm: Removed paint, buildViewsNotYetAddedSet, viewsNotYetAdded,
+ and addedWidget.
+ * kwq/KWQScrollView.mm: (QScrollView::addChild): Removed call to addedWidget.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge drawRect:withPainter:]): Put the call to the
+ renderer to print back in here, since it's simple again.
+
+ * kwq/KWQWidget.mm: (QWidget::internalSetGeometry): Left in a couple of asserts that
+ were useful in narrowing this one down.
+
+2002-07-25 Darin Adler <darin at apple.com>
+
+ Once I realized that, Richard and I talked it over and found an even better fix
+ that sidesteps the problem. Removing the widgets from the superview was not necessary.
+
+ * kwq/KWQKHTMLPartImpl.h: Removed buildViewsNotYetAddedSet, viewsNotYetAdded, and
+ addedWidget. Added moveWidgetsAside.
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::paint):
+ (KWQKHTMLPartImpl::moveWidgetsAside):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::addChild):
+ * kwq/KWQWidget.mm:
+ (QWidget::internalSetGeometry):
+
2002-07-25 David Hyatt <hyatt at apple.com>
Floated images using "align" should have margins to prevent the text from running right
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index f71d25f..096fd67 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -70,6 +70,7 @@
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
F58C8A07025BD3BC018635CA,
+ F531DDEC02F0C34D018635CA,
);
isa = PBXProject;
knownRegions = (
@@ -3580,6 +3581,18 @@
path = xml;
refType = 4;
};
+ F531DDEC02F0C34D018635CA = {
+ buildRules = (
+ );
+ buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+ SKIP_INSTALL = YES;
+ };
+ isa = PBXBuildStyle;
+ name = DeploymentFat;
+ };
F54A61D302E3523B01A80180 = {
isa = PBXFileReference;
path = KWQKHTMLPartImpl.cpp;
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index b61df22..65e646e 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -155,9 +155,11 @@ RenderWidget::~RenderWidget()
void RenderWidget::resizeWidget( QWidget *widget, int w, int h )
{
+#ifndef APPLE_CHANGES
// ugly hack to limit the maximum size of the widget (as X11 has problems i
h = QMIN( h, 3072 );
w = QMIN( w, 2000 );
+#endif
if (widget->width() != w || widget->height() != h) {
ref();
@@ -202,6 +204,11 @@ void RenderWidget::layout( )
KHTMLAssert( !layouted() );
KHTMLAssert( minMaxKnown() );
if ( m_widget ) {
+#ifdef APPLE_CHANGES
+ // Since not all widgets will get a print call, it's important to move them away
+ // so that they won't linger in an old position left over from a previous print.
+ m_widget->move(999999, 0);
+#endif
resizeWidget( m_widget,
m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(),
m_height-borderLeft()-borderRight()-paddingLeft()-paddingRight() );
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index ed2c8ea..de80a74 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -109,12 +109,6 @@ public:
void overURL(const QString &url, const QString &target, int modifierState);
- // Draw the contents of the view, with the side effect of putting all the widgets into place.
- void paint(QPainter &, int x, int y, int width, int height);
-
- // Used by KWQWidget to tell the paint call that this widget should stay.
- static void addedWidget(QWidget *);
-
private:
KHTMLPart *part;
KHTMLPartPrivate *d;
@@ -127,9 +121,6 @@ private:
QString m_documentSource;
bool m_decodingStarted;
- static void buildViewsNotYetAddedSet(khtml::RenderObject *);
- static NSMutableSet *viewsNotYetAdded;
-
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 28632ca..560d800 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -44,8 +44,6 @@ using khtml::RenderObject;
using khtml::RenderPart;
using khtml::RenderWidget;
-NSMutableSet *KWQKHTMLPartImpl::viewsNotYetAdded = nil;
-
void KHTMLPart::onURL(const QString &)
{
}
@@ -723,55 +721,3 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
setStatusBarText(QString::fromNSString([NSString stringWithFormat:format, url.getNSString()]));
}
-
-void KWQKHTMLPartImpl::paint(QPainter &p, int x, int y, int width, int height)
-{
- DOM::DocumentImpl *doc = part->xmlDocImpl();
- if (!doc) {
- return;
- }
- RenderObject *renderer = doc->renderer();
- if (!renderer) {
- return;
- }
-
- // Walk the render tree, putting all the views into a set.
- KWQ_ASSERT(viewsNotYetAdded == nil);
- viewsNotYetAdded = [[NSMutableSet alloc] init];
- buildViewsNotYetAddedSet(renderer);
-
- // We will remove views from the set when the corresponding widget gets an addChild call.
-
- renderer->print(&p, x, y, width, height, 0, 0);
-
- // Call removeFromSuperview on any that are still in the set at the end.
- [viewsNotYetAdded makeObjectsPerformSelector:@selector(removeFromSuperview)];
- [viewsNotYetAdded release];
- viewsNotYetAdded = nil;
-}
-
-void KWQKHTMLPartImpl::addedWidget(QWidget *widget)
-{
- NSView *view = widget->getView();
- if (view) {
- [viewsNotYetAdded removeObject:view];
- }
-}
-
-void KWQKHTMLPartImpl::buildViewsNotYetAddedSet(RenderObject *renderObject)
-{
- RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(renderObject);
- if (renderWidget) {
- QWidget *widget = renderWidget->widget();
- if (widget) {
- NSView *view = widget->getView();
- if (view) {
- [viewsNotYetAdded addObject:view];
- }
- }
- }
-
- for (RenderObject *child = renderObject->firstChild(); child; child = child->nextSibling()) {
- buildViewsNotYetAddedSet(child);
- }
-}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index ed2c8ea..de80a74 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -109,12 +109,6 @@ public:
void overURL(const QString &url, const QString &target, int modifierState);
- // Draw the contents of the view, with the side effect of putting all the widgets into place.
- void paint(QPainter &, int x, int y, int width, int height);
-
- // Used by KWQWidget to tell the paint call that this widget should stay.
- static void addedWidget(QWidget *);
-
private:
KHTMLPart *part;
KHTMLPartPrivate *d;
@@ -127,9 +121,6 @@ private:
QString m_documentSource;
bool m_decodingStarted;
- static void buildViewsNotYetAddedSet(khtml::RenderObject *);
- static NSMutableSet *viewsNotYetAdded;
-
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 28632ca..560d800 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -44,8 +44,6 @@ using khtml::RenderObject;
using khtml::RenderPart;
using khtml::RenderWidget;
-NSMutableSet *KWQKHTMLPartImpl::viewsNotYetAdded = nil;
-
void KHTMLPart::onURL(const QString &)
{
}
@@ -723,55 +721,3 @@ void KWQKHTMLPartImpl::overURL( const QString &url, const QString &target, int m
setStatusBarText(QString::fromNSString([NSString stringWithFormat:format, url.getNSString()]));
}
-
-void KWQKHTMLPartImpl::paint(QPainter &p, int x, int y, int width, int height)
-{
- DOM::DocumentImpl *doc = part->xmlDocImpl();
- if (!doc) {
- return;
- }
- RenderObject *renderer = doc->renderer();
- if (!renderer) {
- return;
- }
-
- // Walk the render tree, putting all the views into a set.
- KWQ_ASSERT(viewsNotYetAdded == nil);
- viewsNotYetAdded = [[NSMutableSet alloc] init];
- buildViewsNotYetAddedSet(renderer);
-
- // We will remove views from the set when the corresponding widget gets an addChild call.
-
- renderer->print(&p, x, y, width, height, 0, 0);
-
- // Call removeFromSuperview on any that are still in the set at the end.
- [viewsNotYetAdded makeObjectsPerformSelector:@selector(removeFromSuperview)];
- [viewsNotYetAdded release];
- viewsNotYetAdded = nil;
-}
-
-void KWQKHTMLPartImpl::addedWidget(QWidget *widget)
-{
- NSView *view = widget->getView();
- if (view) {
- [viewsNotYetAdded removeObject:view];
- }
-}
-
-void KWQKHTMLPartImpl::buildViewsNotYetAddedSet(RenderObject *renderObject)
-{
- RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(renderObject);
- if (renderWidget) {
- QWidget *widget = renderWidget->widget();
- if (widget) {
- NSView *view = widget->getView();
- if (view) {
- [viewsNotYetAdded addObject:view];
- }
- }
- }
-
- for (RenderObject *child = renderObject->firstChild(); child; child = child->nextSibling()) {
- buildViewsNotYetAddedSet(child);
- }
-}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index a42153a..cbcfb25 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -29,8 +29,6 @@
#import <kwqdebug.h>
-#import <KWQKHTMLPartImpl.h>
-
/*
This class implementation does NOT actually emulate the Qt QScrollView.
It does provide an implementation that khtml will use to interact with
@@ -195,8 +193,6 @@ void QScrollView::addChild(QWidget* child, int x, int y)
KWQ_ASSERT(child != this);
- KWQKHTMLPartImpl::addedWidget(child);
-
child->move(x, y);
thisView = getView();
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 562e88c..b92ac35 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -293,12 +293,15 @@ void QWidget::internalSetGeometry(int x, int y, int w, int h)
{
NSView *view = getView();
+ KWQ_ASSERT(view);
+
// A QScrollView is a widget only used to represent a frame. If
// this widget's view is a WebCoreFrameView the we resize it's containing
// view, an WebView. The scrollview contained by the WebView
// will be autosized.
if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
view = [view superview];
+ KWQ_ASSERT(view);
}
[view setFrame:NSMakeRect(x, y, w, h)];
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 7d746e8..02f775e 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -190,7 +190,13 @@ using namespace khtml;
- (void)drawRect:(NSRect)rect withPainter:(QPainter *)p
{
- part->impl->paint(*p, (int)rect.origin.x, (int)rect.origin.y, (int)rect.size.width, (int)rect.size.height);
+ DOM::DocumentImpl *doc = part->xmlDocImpl();
+ if (doc) {
+ RenderObject *renderer = doc->renderer();
+ if (renderer) {
+ renderer->print(p, (int)rect.origin.x, (int)rect.origin.y, (int)rect.size.width, (int)rect.size.height, 0, 0);
+ }
+ }
}
- (void)drawRect:(NSRect)rect
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2bfa2ba..d58d792 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,9 @@
2002-07-25 Darin Adler <darin at apple.com>
+ * WebKit.pbproj/project.pbxproj: Add DeploymentFat build style.
+
+2002-07-25 Darin Adler <darin at apple.com>
+
WebKit part of fix for 3006054 -- assert error failingURL != nil
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2bfa2ba..d58d792 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
2002-07-25 Darin Adler <darin at apple.com>
+ * WebKit.pbproj/project.pbxproj: Add DeploymentFat build style.
+
+2002-07-25 Darin Adler <darin at apple.com>
+
WebKit part of fix for 3006054 -- assert error failingURL != nil
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0dcfc07..514d23f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -69,6 +69,7 @@
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
F58C8A07025BD3BC018635CA,
+ F531DDFF02F0C36F018635CA,
);
isa = PBXProject;
knownRegions = (
@@ -1463,6 +1464,18 @@
path = "";
refType = 4;
};
+ F531DDFF02F0C36F018635CA = {
+ buildRules = (
+ );
+ buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+ SKIP_INSTALL = YES;
+ };
+ isa = PBXBuildStyle;
+ name = DeploymentFat;
+ };
F53444CE02E87CBA018635CA = {
isa = PBXFileReference;
name = WebKitStatistics.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list