[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
vicki
vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:39:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0fb1e7d12c7d71d8829c3c9cc72f0c10b4adf2c2
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 18 18:39:42 2002 +0000
Matt Watson's approved changes to fix the fat build on gcc-1203
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index e14f3e2..07f9ade 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -460,6 +460,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
SKIP_INSTALL = YES;
i386 = YES;
+ ppc = YES;
};
isa = PBXBuildStyle;
name = DeploymentFat;
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index c9d54a4..68e7d61 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -144,7 +144,7 @@
SECTORDER_FLAGS = "";
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
- WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+ WARNING_COMMONFLAGS = "-Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
WRAPPER_EXTENSION = framework;
};
@@ -3943,6 +3943,7 @@
FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
SKIP_INSTALL = YES;
+ ppc = YES;
i386 = YES;
};
isa = PBXBuildStyle;
diff --git a/WebCore/kwq/KWQCharsets.h b/WebCore/kwq/KWQCharsets.h
index f4b8842..be1da5d 100644
--- a/WebCore/kwq/KWQCharsets.h
+++ b/WebCore/kwq/KWQCharsets.h
@@ -34,5 +34,5 @@ CFStringEncoding KWQCFStringEncodingFromMIB(int mib);
CFStringRef KWQCFStringEncodingToIANACharsetName(CFStringEncoding encoding);
int KWQCFStringEncodingToMIB(CFStringEncoding encoding);
-#endif KWQCHARSETS_H_
+#endif /* KWQCHARSETS_H_ */
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index f33306e..5ef3fae 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1004,7 +1004,7 @@ QString &QString::operator=(char ch)
return *this = QString(QChar(ch));
}
-inline QChar QString::at(uint i) const
+QChar QString::at(uint i) const
{
QStringData *thisData = *dataHandle;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 06cd0fa..f916ac7 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1695,6 +1695,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
SKIP_INSTALL = YES;
i386 = YES;
+ ppc = YES;
};
isa = PBXBuildStyle;
name = DeploymentFat;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list