[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:55:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d39f93526bb8f36fca3b09f9e3aa9052f01edff0
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 19 00:26:09 2002 +0000
2002-02-18 Kenneth Kocienda <kocienda at apple.com>
Changes to support building standalone Alexander with Frameworks
and libraries contained inside the app package.
* Makefile.am:
* Tests/Makefile.am:
* build-style.txt:
* configure.in:
* WebBrowser/Makefile.am:
* WebBrowser.pbproj/project.pbxproj:
* WebFoundation/Makefile.am:
* WebFoundation.pbproj/project.pbxproj:
* WebKit/Makefile.am:
* WebKit.pbproj/kocienda.pbxuser:
* WebKit.pbproj/project.pbxproj:
* WebCore/src/Makefile.am:
* WebCore/src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseMoveEvent):
* WebCore/src/kwq/KWQView.mm: (-[KWQHTMLView mouseUp:]), (-[KWQHTMLView mouseDown:]):
* WebCore/src/kwq/kde/_kurl.cpp: (KURL::htmlRef):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@638 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2ce6e9f..3dfb7da 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-02-18 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseMoveEvent):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView mouseUp:]), (-[KWQHTMLView mouseDown:]):
+ * src/kwq/kde/_kurl.cpp: (KURL::htmlRef):
+
2002-02-18 Richard Williamson <rjw at apple.com>
Fixed the prefences won't stay in front problem after John found
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2ce6e9f..3dfb7da 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-02-18 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseMoveEvent):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView mouseUp:]), (-[KWQHTMLView mouseDown:]):
+ * src/kwq/kde/_kurl.cpp: (KURL::htmlRef):
+
2002-02-18 Richard Williamson <rjw at apple.com>
Fixed the prefences won't stay in front problem after John found
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2ce6e9f..3dfb7da 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-02-18 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseMoveEvent):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView mouseUp:]), (-[KWQHTMLView mouseDown:]):
+ * src/kwq/kde/_kurl.cpp: (KURL::htmlRef):
+
2002-02-18 Richard Williamson <rjw at apple.com>
Fixed the prefences won't stay in front problem after John found
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index c5432b9..c6a5359 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1123,6 +1123,8 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
{
+// FIXME: need working implementation of this event
+#if 0
QMouseEvent *_mouse = event->qmouseEvent();
DOM::DOMString url = event->url();
DOM::Node innerNode = event->innerNode();
@@ -1185,6 +1187,8 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
if(r)
{
int absx, absy, vx, vy;
+ // FIXME: when compiling with -02, compilation breaks with a
+ // complaint that vx and vy might be uninitialized before use
r->absolutePosition(absx, absy);
//view()->contentsToViewport( absx, absy, vx, vy );
@@ -1290,6 +1294,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
}
#endif
}
+#endif
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index c5432b9..c6a5359 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -1123,6 +1123,8 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
{
+// FIXME: need working implementation of this event
+#if 0
QMouseEvent *_mouse = event->qmouseEvent();
DOM::DOMString url = event->url();
DOM::Node innerNode = event->innerNode();
@@ -1185,6 +1187,8 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
if(r)
{
int absx, absy, vx, vy;
+ // FIXME: when compiling with -02, compilation breaks with a
+ // complaint that vx and vy might be uninitialized before use
r->absolutePosition(absx, absy);
//view()->contentsToViewport( absx, absy, vx, vy );
@@ -1290,6 +1294,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
}
#endif
}
+#endif
}
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 317d9ba..e6759f5 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -253,6 +253,8 @@
- (void)mouseUp: (NSEvent *)event
{
int button, state;
+
+ button = state = 0;
if ([event type] == NSLeftMouseDown){
button = Qt::LeftButton;
@@ -276,6 +278,8 @@
{
int button, state;
+ button = state = 0;
+
if ([event type] == NSLeftMouseDown){
button = Qt::LeftButton;
state = Qt::LeftButton;
diff --git a/WebCore/kwq/kde/_kurl.cpp b/WebCore/kwq/kde/_kurl.cpp
index 10c728d..6a99d32 100644
--- a/WebCore/kwq/kde/_kurl.cpp
+++ b/WebCore/kwq/kde/_kurl.cpp
@@ -1390,7 +1390,12 @@ QString KURL::htmlRef() const
}
List lst = split( *this );
- return decode( (*lst.begin()).ref() );
+#ifdef _KWQ_
+ QString s((*lst.begin()).ref());
+ return decode(s);
+#else
+ return decode( (*lst.begin()).ref() );
+#endif
}
QString KURL::encodedHtmlRef() const
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index 5423ff7..da1c4d0 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -21,12 +21,18 @@ libwebcore_dylib_LIBADD = \
-ljpeg \
$(NULL)
+
+if AlexanderTest
+LIBWEBCORE_INSTALL_PATH=@executable_path/../Frameworks
+else
+LIBWEBCORE_INSTALL_PATH=$(symrootsdir)
+endif
+
LDFLAGS = \
-dynamiclib \
-flat_namespace -undefined suppress \
-all_load \
- -install_name $(symrootsdir)/libwebcore.dylib
- -version-info $(WEBCORE_VERSION_INFO) \
+ -install_name $(LIBWEBCORE_INSTALL_PATH)/libwebcore.dylib \
$(NULL)
libwebcore_dylib_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index c5432b9..c6a5359 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -1123,6 +1123,8 @@ static QString splitUrlTarget(const QString &url, QString *target=0)
void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
{
+// FIXME: need working implementation of this event
+#if 0
QMouseEvent *_mouse = event->qmouseEvent();
DOM::DOMString url = event->url();
DOM::Node innerNode = event->innerNode();
@@ -1185,6 +1187,8 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
if(r)
{
int absx, absy, vx, vy;
+ // FIXME: when compiling with -02, compilation breaks with a
+ // complaint that vx and vy might be uninitialized before use
r->absolutePosition(absx, absy);
//view()->contentsToViewport( absx, absy, vx, vy );
@@ -1290,6 +1294,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
}
#endif
}
+#endif
}
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index 317d9ba..e6759f5 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -253,6 +253,8 @@
- (void)mouseUp: (NSEvent *)event
{
int button, state;
+
+ button = state = 0;
if ([event type] == NSLeftMouseDown){
button = Qt::LeftButton;
@@ -276,6 +278,8 @@
{
int button, state;
+ button = state = 0;
+
if ([event type] == NSLeftMouseDown){
button = Qt::LeftButton;
state = Qt::LeftButton;
diff --git a/WebCore/src/kwq/kde/_kurl.cpp b/WebCore/src/kwq/kde/_kurl.cpp
index 10c728d..6a99d32 100644
--- a/WebCore/src/kwq/kde/_kurl.cpp
+++ b/WebCore/src/kwq/kde/_kurl.cpp
@@ -1390,7 +1390,12 @@ QString KURL::htmlRef() const
}
List lst = split( *this );
- return decode( (*lst.begin()).ref() );
+#ifdef _KWQ_
+ QString s((*lst.begin()).ref());
+ return decode(s);
+#else
+ return decode( (*lst.begin()).ref() );
+#endif
}
QString KURL::encodedHtmlRef() const
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d64713f..e1801ad 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Changes to support building standalone Alexander with Frameworks
+ and libraries contained inside the app package.
+
+ * Makefile.am:
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-18 Richard Williamson <rjw at apple.com>
Performance measurement.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d64713f..e1801ad 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-02-18 Kenneth Kocienda <kocienda at apple.com>
+
+ Changes to support building standalone Alexander with Frameworks
+ and libraries contained inside the app package.
+
+ * Makefile.am:
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-18 Richard Williamson <rjw at apple.com>
Performance measurement.
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index e31d0f0..9727c05 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -1,6 +1,6 @@
all:
- pbxbuild
+ pbxbuild -buildstyle $(BUILDSTYLE)
clean:
pbxbuild clean
diff --git a/WebKit/WebKit.pbproj/kocienda.pbxuser b/WebKit/WebKit.pbproj/kocienda.pbxuser
index 253bcbc..a0c1461 100644
--- a/WebKit/WebKit.pbproj/kocienda.pbxuser
+++ b/WebKit/WebKit.pbproj/kocienda.pbxuser
@@ -1,7 +1,7 @@
// !$*UTF8*$!
{
0867D690FE84028FC02AAC07 = {
- activeBuildStyle = 014CEA440018CDF011CA2923;
+ activeBuildStyle = 257486E20221853F0ECA149E;
activeTarget = 0867D69CFE84028FC02AAC07;
addToTargets = (
0867D69CFE84028FC02AAC07,
@@ -108,21 +108,6 @@
sepNavWindowFrame = "{{38, 650}, {750, 502}}";
};
};
- 25A8176D01B5B9180ECA149E = {
- uiCtxt = {
- sepNavWindowFrame = "{{15, 267}, {853, 906}}";
- };
- };
- 25A8176E01B5B9180ECA149E = {
- uiCtxt = {
- sepNavWindowFrame = "{{672, 74}, {790, 1081}}";
- };
- };
- 25BECC94017E0A0D0ECA149E = {
- uiCtxt = {
- sepNavWindowFrame = "{{84, 608}, {750, 502}}";
- };
- };
25C29825016E29620ECA149E = {
uiCtxt = {
sepNavWindowFrame = "{{38, 650}, {750, 502}}";
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 4d17a9a..0add410 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 34;
+ objectVersion = 35;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
@@ -60,6 +60,7 @@
buildStyles = (
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
+ 257486E20221853F0ECA149E,
);
isa = PBXProject;
knownRegions = (
@@ -193,7 +194,6 @@
9CF0E24B021361B10ECA16EA,
);
isa = PBXHeadersBuildPhase;
- name = Headers;
};
0867D69EFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -203,7 +203,6 @@
35F357800198AAB80ACA1520,
);
isa = PBXResourcesBuildPhase;
- name = "Bundle Resources";
};
0867D69FFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -226,7 +225,6 @@
F584CFE70221BDB601A80181,
);
isa = PBXSourcesBuildPhase;
- name = Sources;
};
0867D6A0FE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -235,14 +233,12 @@
F5EBC45C02134C0C01CA1520,
);
isa = PBXFrameworksBuildPhase;
- name = "Frameworks & Libraries";
};
0867D6A2FE84028FC02AAC07 = {
buildActionMask = 2147483647;
files = (
);
isa = PBXRezBuildPhase;
- name = "ResourceManager Resources";
};
0867D6A5FE840307C02AAC07 = {
isa = PBXFrameworkReference;
@@ -365,6 +361,19 @@
);
};
};
+ 257486E20221853F0ECA149E = {
+ buildRules = (
+ );
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ OPTIMIZATION_CFLAGS = "-O2";
+ SKIP_INSTALL = YES;
+ };
+ isa = PBXBuildStyle;
+ name = AlexanderTest;
+ };
25A5593101A5996D0ECA149E = {
isa = PBXFileReference;
name = WebKitDebug.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list