[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:50:36 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f7e14dd4daf9b107256d2b75b81716d04b20611f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 17 18:55:06 2001 +0000

    Updated project so that its include paths are less screwed up than before
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index 8f7f88a..eab7f44 100644
--- a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -65,7 +65,6 @@
 		};
 		1058C7A2FEA54F0111CA2CBB = {
 			children = (
-				2587FFAC017B21AB0ECA149E,
 				29B97325FDCFA39411CA2CEA,
 				29B97324FDCFA39411CA2CEA,
 			);
@@ -122,18 +121,6 @@
 //252
 //253
 //254
-		2587FFAC017B21AB0ECA149E = {
-			isa = PBXFrameworkReference;
-			name = WebKit.framework;
-			path = ../../../../../../../../../../../Network/Servers/noether/homes/gandalf/kocienda/symroots/WebKit.framework;
-			refType = 2;
-		};
-		2587FFAD017B21AB0ECA149E = {
-			fileRef = 2587FFAC017B21AB0ECA149E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		25FB9CE1017B6FDB0ECA149E = {
 			isa = PBXFileReference;
 			name = draw.mm;
@@ -245,12 +232,12 @@
 				29B9732DFDCFA39411CA2CEA,
 			);
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Network/Servers/noether/homes/gandalf/kocienda/symroots;
+				FRAMEWORK_SEARCH_PATHS = /symroots;
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = ../../../../../lib;
 				OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
-				OTHER_LDFLAGS = "-lwebcore";
+				OTHER_LDFLAGS = "-lwebcore -framework WebKit";
 				PRODUCT_NAME = WebViewTest;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -318,7 +305,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				1058C7A3FEA54F0111CA2CBB,
-				2587FFAD017B21AB0ECA149E,
 			);
 			isa = PBXFrameworksBuildPhase;
 			name = "Frameworks & Libraries";
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index 8f7f88a..eab7f44 100644
--- a/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -65,7 +65,6 @@
 		};
 		1058C7A2FEA54F0111CA2CBB = {
 			children = (
-				2587FFAC017B21AB0ECA149E,
 				29B97325FDCFA39411CA2CEA,
 				29B97324FDCFA39411CA2CEA,
 			);
@@ -122,18 +121,6 @@
 //252
 //253
 //254
-		2587FFAC017B21AB0ECA149E = {
-			isa = PBXFrameworkReference;
-			name = WebKit.framework;
-			path = ../../../../../../../../../../../Network/Servers/noether/homes/gandalf/kocienda/symroots/WebKit.framework;
-			refType = 2;
-		};
-		2587FFAD017B21AB0ECA149E = {
-			fileRef = 2587FFAC017B21AB0ECA149E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		25FB9CE1017B6FDB0ECA149E = {
 			isa = PBXFileReference;
 			name = draw.mm;
@@ -245,12 +232,12 @@
 				29B9732DFDCFA39411CA2CEA,
 			);
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Network/Servers/noether/homes/gandalf/kocienda/symroots;
+				FRAMEWORK_SEARCH_PATHS = /symroots;
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = ../../../../../lib;
 				OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
-				OTHER_LDFLAGS = "-lwebcore";
+				OTHER_LDFLAGS = "-lwebcore -framework WebKit";
 				PRODUCT_NAME = WebViewTest;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -318,7 +305,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				1058C7A3FEA54F0111CA2CBB,
-				2587FFAD017B21AB0ECA149E,
 			);
 			isa = PBXFrameworksBuildPhase;
 			name = "Frameworks & Libraries";

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list