Fri Jan 18 00:06:07 PST 2013

4 files changed, 23 insertions, 12 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 5010b4298..c26b3c1b7 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
 _pgo=false
 pkgname=icecat
 pkgver=17.0.1
-pkgrel=2
+pkgrel=4
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
 arch=(i686 x86_64 mips64el)
 license=(GPL2 MPL LGPL)
@@ -79,11 +79,11 @@ md5sums=(
   a22327391a1995703436ed42fe703d3f
   ac29b01c189f20abae2f3eef1618ffc0
   3009b176cc5f9b1e416b1bf7c45b064b
-  f4cffe48e84283026da634424f4bbee6
-  e81ad01dbc16ba28bf92ba4b7c309ca7
-  d93fe402b87cd000a869e1fd6badc6c9
+  fcd2d895a0335c1b5fb652401e9da0d5
+  b41f82994fa056ffa5f8e6d99570e27a
+  b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
-  0d053487907de4376d67d8f499c5502b
+  e7b54d4bd68b2af4cfdef074e3ed08a2
   #c8552d030494443218d88792f4dbbd0f
 )
 
@@ -139,7 +139,7 @@ package() {
   cd $srcdir/gnuzilla-build
   make -j1 -f client.mk DESTDIR=$pkgdir install
 
-  install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
   icondir=$pkgdir/usr/share/icons/hicolor
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
index 87acc970c..e33d75469 100644
--- a/libre/icecat/icecat-safe.desktop
+++ b/libre/icecat/icecat-safe.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/icecat -safe-mode %u
+Exec=/usr/lib/icecat/icecat -safe-mode %u
 Icon=icecat
 Type=Application
 Terminal=false
diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop
index 8a7cad93d..72666a5b8 100644
--- a/libre/icecat/icecat.desktop
+++ b/libre/icecat/icecat.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/icecat %u
+Exec=/usr/lib/icecat/icecat %u
 Icon=icecat
 Type=Application
 Terminal=false
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 497b8cd10..496c6b983 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -17,10 +17,18 @@ diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -10,23 +10,11 @@
- browser.search.order.2=Google
- browser.search.order.3=Yahoo
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+ # Default search engine
+-browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=DuckDuckGo HTML
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=DuckDuckGo
+-browser.search.order.2=Google
+-browser.search.order.3=Yahoo
+-
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
 -browser.contentHandlers.types.0.title=Bloglines
@@ -32,7 +40,10 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -
 -# Keyword URL (for location bar searches)
 -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
+ 
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location