[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:52:44 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit a87edc788d0b070e7d7fc511989dd7e91a3c13e1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 6 17:52:32 2001 +0000

    This is my first attempt at getting the build server to work, and in
    removing our dependency and a hardcoded symroots directory.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/lib/Makefile.in b/WebCore/lib/Makefile.in
index fe1ed35..67a714d 100644
--- a/WebCore/lib/Makefile.in
+++ b/WebCore/lib/Makefile.in
@@ -47,13 +47,13 @@ all: $(LIBRARY)
 
 $(LIBRARY): $(OBJECTS)
 	rm -f $(LIBRARY_BASE_NAME).*.dylib; \
-	$(CC) -flat_namespace -undefined suppress -compatibility_version $(LIBRARY_COMPAT_VERSION) -current_version $(LIBRARY_VERSION) $(DYLIBFLAGS) -o $(LIBRARY) $(OBJECTS) -lstdc++ -ljpeg -install_name "`echo "@executable_path/../Frameworks/libwebcore.1.0.0.dylib" | /usr/bin/sed 's!//*!/!g'`"
+	$(CC) $(PROFILINGFLAGS) -flat_namespace -undefined suppress -compatibility_version $(LIBRARY_COMPAT_VERSION) -current_version $(LIBRARY_VERSION) $(DYLIBFLAGS) -o $(LIBRARY) $(OBJECTS) -lstdc++ -ljpeg -install_name "`echo "@executable_path/../Frameworks/libwebcore.1.0.0.dylib" | /usr/bin/sed 's!//*!/!g'`"
 	ln -fs $(LIBRARY) $(LIBRARY_DYNAMIC_LINK)
 	ln -fs $(LIBRARY) $(LIBRARY_STATIC_LINK)
-	if [ -d "/symroots" ]; then \
-		ln -fs `pwd`/$(LIBRARY) /symroots/$(LIBRARY); \
-		ln -fs `pwd`/$(LIBRARY) /symroots/$(LIBRARY_DYNAMIC_LINK); \
-		ln -fs `pwd`/$(LIBRARY) /symroots/$(LIBRARY_STATIC_LINK); \
+	if [ -d "$(SYMROOTS)" ]; then \
+		ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY); \
+		ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY_DYNAMIC_LINK); \
+		ln -fs `pwd`/$(LIBRARY) $(SYMROOTS)/$(LIBRARY_STATIC_LINK); \
 	fi
 
 #----------------------------------------------------------------------
diff --git a/WebKit/WebKit.pbproj/kocienda.pbxuser b/WebKit/WebKit.pbproj/kocienda.pbxuser
index 4b1a35b..92e1705 100644
--- a/WebKit/WebKit.pbproj/kocienda.pbxuser
+++ b/WebKit/WebKit.pbproj/kocienda.pbxuser
@@ -12,12 +12,13 @@
 			PBXWorkspaceConfiguration = {
 				ContentSize = "{1207, 1028}";
 				LeftSlideOut = {
-					ActiveTab = 3;
+					ActiveTab = 0;
 					Frame = "{{0, 23}, {1207, 1005}}";
 					Split0 = {
-						Frame = "{{224, 0}, {983, 1005}}";
+						ActiveTab = 2;
+						Frame = "{{312, 0}, {895, 1005}}";
 						Split0 = {
-							Frame = "{{0, 24}, {983, 981}}";
+							Frame = "{{0, 1004}, {895, 1}}";
 						};
 						SplitCount = 1;
 						Tab0 = {
@@ -53,9 +54,9 @@
 							};
 						};
 						Tab2 = {
-							BuildMessageFrame = "{{0, 0}, {985, 325}}";
-							BuildTranscriptFrame = "{{0, 334}, {985, 648}}";
-							Frame = "{{0, 0}, {983, 980}}";
+							BuildMessageFrame = "{{0, 0}, {897, 325}}";
+							BuildTranscriptFrame = "{{0, 334}, {897, 648}}";
+							Frame = "{{0, 0}, {895, 980}}";
 						};
 						Tab3 = {
 							Frame = "{{0, 0}, {983, 295}}";
@@ -121,7 +122,7 @@
 	};
 	25BECC94017E0A0D0ECA149E = {
 		uiCtxt = {
-			sepNavWindowFrame = "{{130, 100}, {1058, 968}}";
+			sepNavWindowFrame = "{{84, 608}, {750, 502}}";
 		};
 	};
 	25C29825016E29620ECA149E = {
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index fdeb761..a1a43ea 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -184,6 +184,7 @@
 				25A8176F01B5B9180ECA149E,
 				25A8177301B698760ECA149E,
 				25A8177701B6A5240ECA149E,
+				25D5032F01BD74D70ECA149E,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -212,6 +213,7 @@
 				25A8177001B5B9180ECA149E,
 				25A8177401B698760ECA149E,
 				25A8177801B6A5240ECA149E,
+				25D5033001BD74D70ECA149E,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -353,6 +355,8 @@
 				2568C72B017491070ECA149E,
 				25A5593101A5996D0ECA149E,
 				25A5593201A5996D0ECA149E,
+				25D5032D01BD74D70ECA149E,
+				25D5032E01BD74D70ECA149E,
 			);
 			isa = PBXGroup;
 			name = Misc;
@@ -625,6 +629,30 @@
 			settings = {
 			};
 		};
+		25D5032D01BD74D70ECA149E = {
+			isa = PBXFileReference;
+			name = InterThreadMessaging.h;
+			path = Misc.subproj/InterThreadMessaging.h;
+			refType = 4;
+		};
+		25D5032E01BD74D70ECA149E = {
+			isa = PBXFileReference;
+			name = InterThreadMessaging.m;
+			path = Misc.subproj/InterThreadMessaging.m;
+			refType = 4;
+		};
+		25D5032F01BD74D70ECA149E = {
+			fileRef = 25D5032D01BD74D70ECA149E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		25D5033001BD74D70ECA149E = {
+			fileRef = 25D5032E01BD74D70ECA149E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 //250
 //251
 //252

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list