[SVN-Commit] r821 - in branches/experimental/www: firefox firefox-esr firefox-esr/files firefox-nightly firefox-nightly/files firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Jun 30 22:55:23 2012
New Revision: 821

Log:
remove obsolete patch for system plugins

Deleted:
   branches/experimental/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
   branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
   branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
Modified:
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Sat Jun 30 22:55:12 2012	(r820)
+++ branches/experimental/www/firefox-esr/Makefile	Sat Jun 30 22:55:23 2012	(r821)
@@ -123,8 +123,7 @@
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/browser/app/nsBrowserApp.cpp \
-		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
+		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Deleted: branches/experimental/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Sat Jun 30 22:55:23 2012	(r820)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
-+++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
-@@ -238,7 +238,7 @@
- #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
-           "/usr/lib64/mozilla/plugins";
- #else
--          "/usr/lib/mozilla/plugins";
-+          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
- #endif
-         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
-                                    PR_FALSE, getter_AddRefs(localFile));

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Sat Jun 30 22:55:12 2012	(r820)
+++ branches/experimental/www/firefox-nightly/Makefile	Sat Jun 30 22:55:23 2012	(r821)
@@ -142,8 +142,7 @@
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/browser/app/nsBrowserApp.cpp \
-		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
+		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Sat Jun 30 22:55:23 2012	(r820)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
-+++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
-@@ -238,7 +238,7 @@
- #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
-           "/usr/lib64/mozilla/plugins";
- #else
--          "/usr/lib/mozilla/plugins";
-+          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
- #endif
-         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
-                                    PR_FALSE, getter_AddRefs(localFile));

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Sat Jun 30 22:55:12 2012	(r820)
+++ branches/experimental/www/firefox/Makefile	Sat Jun 30 22:55:23 2012	(r821)
@@ -119,8 +119,7 @@
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/browser/app/nsBrowserApp.cpp \
-		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
+		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Deleted: branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Sat Jun 30 22:55:23 2012	(r820)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
-+++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
-@@ -238,7 +238,7 @@
- #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
-           "/usr/lib64/mozilla/plugins";
- #else
--          "/usr/lib/mozilla/plugins";
-+          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
- #endif
-         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
-                                    PR_FALSE, getter_AddRefs(localFile));