r12856 - in /desktop/unstable/epiphany-browser/debian: changelog patches/12_contentmanager_block_https.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Sep 26 22:40:16 2007
New Revision: 12856

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12856
Log:
* Remove MimeType entries from the additional .desktop files.
* 12_contentmanager_block_https.patch: use the same content policy for
  http and https, allowing adblock to work on https. Closes: #439772.

Added:
    desktop/unstable/epiphany-browser/debian/patches/12_contentmanager_block_https.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=12856&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Wed Sep 26 22:40:16 2007
@@ -2,11 +2,14 @@
 
   [ Josselin Mouette ]
   * Fix typo that lead NoDisplay to be ignored.
+  * Remove MimeType entries from the additional .desktop files.
+  * 12_contentmanager_block_https.patch: use the same content policy for
+    http and https, allowing adblock to work on https. Closes: #439772.
 
   [ Loic Minier ]
   * Cleanup whitespaces in control.
 
- -- Loic Minier <lool at dooz.org>  Tue, 25 Sep 2007 12:08:42 +0200
+ -- Josselin Mouette <joss at debian.org>  Thu, 27 Sep 2007 00:39:59 +0200
 
 epiphany-browser (2.20.0-1) unstable; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/12_contentmanager_block_https.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/12_contentmanager_block_https.patch?rev=12856&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/12_contentmanager_block_https.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/12_contentmanager_block_https.patch Wed Sep 26 22:40:16 2007
@@ -1,0 +1,26 @@
+Index: epiphany-2.20.0/embed/mozilla/EphyContentPolicy.cpp
+===================================================================
+--- epiphany-2.20.0.orig/embed/mozilla/EphyContentPolicy.cpp	2007-09-27 00:25:40.715550029 +0200
++++ epiphany-2.20.0/embed/mozilla/EphyContentPolicy.cpp	2007-09-27 00:26:06.365011709 +0200
+@@ -128,10 +128,6 @@
+ 	aContentLocation->SchemeIs ("resource", &isResource);
+ 	if (isChrome || isResource) return NS_OK;
+ 
+-	PRBool isHttps = PR_FALSE;
+-	aContentLocation->SchemeIs ("https", &isHttps);
+-	if (isHttps) return NS_OK;
+-
+ 	/* is this url allowed ? */
+ 	nsCString contentSpec;
+ 	aContentLocation->GetSpec (contentSpec);
+@@ -170,6 +166,10 @@
+ 		}
+ 	}
+ 
++	PRBool isHttps = PR_FALSE;
++	aContentLocation->SchemeIs ("https", &isHttps);
++	if (isHttps) return NS_OK;
++
+ 	PRBool isHttp = PR_FALSE;
+ 	aContentLocation->SchemeIs ("http", &isHttp);
+ 	if (isHttp) return NS_OK;

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=12856&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Wed Sep 26 22:40:16 2007
@@ -10,4 +10,5 @@
 09_download_dialog.patch -p0
 10_url_double-click.patch
 11_useragent-weasel.patch
+12_contentmanager_block_https.patch
 99_configure.patch

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=12856&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Wed Sep 26 22:40:16 2007
@@ -113,7 +113,7 @@
 		( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
 			debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \
 			| sed "s,epiphany-browser,epiphany-$$f," \
-			| grep -v ^TryExec ; \
+			| grep -v ^TryExec | grep -v ^MimeType ; \
 			echo NoDisplay=true ) \
 		> debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \
 		done