[vlc-commits] contrib: sparkle: drop obsolete patch

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Aug  6 14:50:56 2014 +0200| [162e7f9086698aff6a4a851baefd9d037e9df2c0] | committer: Felix Paul Kühne

contrib: sparkle: drop obsolete patch

(cherry picked from commit b073cda5f02aa512936ced2c45c9bfa54b83b429)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=162e7f9086698aff6a4a851baefd9d037e9df2c0
---

 contrib/src/sparkle/rules.mak                      |    1 -
 ...le-fix-xcode-project-for-current-releases.patch |  189 --------------------
 2 files changed, 190 deletions(-)

diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak
index e91d2da..56efd1d 100644
--- a/contrib/src/sparkle/rules.mak
+++ b/contrib/src/sparkle/rules.mak
@@ -17,7 +17,6 @@ $(TARBALLS)/sparkle-git.tar.xz:
 
 sparkle: sparkle-git.tar.xz .sum-sparkle
 	$(UNPACK)
-	$(APPLY) $(SRC)/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
 	$(APPLY) $(SRC)/sparkle/sparkle-fix-compilation-on-snowleopard.patch
 	$(MOVE)
 
diff --git a/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch b/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
deleted file mode 100644
index 9f38e44..0000000
--- a/contrib/src/sparkle/sparkle-fix-xcode-project-for-current-releases.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -ru sparkle/Sparkle.xcodeproj/project.pbxproj sparkle-fixed/Sparkle.xcodeproj/project.pbxproj
---- sparkle/Sparkle.xcodeproj/project.pbxproj	2014-01-11 18:03:33.000000000 +0100
-+++ sparkle-fixed/Sparkle.xcodeproj/project.pbxproj	2014-01-11 18:10:24.000000000 +0100
-@@ -1368,6 +1368,22 @@
- 			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = Debug;
- 		};
-@@ -1376,18 +1392,36 @@
- 			baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = Release;
- 		};
- 		1DEB91B208733DA50010E9CD /* Debug */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
- 		1DEB91B308733DA50010E9CD /* Release */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1412,6 +1446,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1435,6 +1470,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 				ZERO_LINK = NO;
- 			};
- 			name = Release;
-@@ -1457,6 +1493,7 @@
- 					AppKit,
- 				);
- 				PRODUCT_NAME = finish_installation;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1464,6 +1501,7 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1471,6 +1509,7 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1478,12 +1517,14 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
- 		61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1492,6 +1533,22 @@
- 			baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
-+				WARNING_CFLAGS = (
-+					"-Wall",
-+					"-Wno-unused-parameter",
-+					"-Wundef",
-+					"-Wendif-labels",
-+					"-Wpointer-arith",
-+					"-Wcast-align",
-+					"-Wwrite-strings",
-+					"-Wmissing-format-attribute",
-+					"-Wpacked",
-+					"-Wredundant-decls",
-+					"-Winline",
-+					"-Wdisabled-optimization",
-+					"-Winvalid-pch",
-+				);
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1500,6 +1557,7 @@
- 			baseConfigurationReference = 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1508,6 +1566,7 @@
- 			baseConfigurationReference = FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = "Release (GC dual-mode; 10.5+)";
- 		};
-@@ -1516,6 +1575,7 @@
- 			baseConfigurationReference = FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1524,6 +1584,7 @@
- 			baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -1532,6 +1593,7 @@
- 			baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -1540,6 +1602,7 @@
- 			baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
- 			buildSettings = {
- 				COMBINE_HIDPI_IMAGES = YES;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};