summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-03 16:27:22 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-03 16:27:22 -0300
commit1c222df4c718aa049f55cc10a6bdf3357ac3a919 (patch)
treed063480e99f467937ae3fa1f82839c1d235b8084
parent2945507149df876505c048936cc487d76b1cfcdd (diff)
downloadabslibre-1c222df4c718aa049f55cc10a6bdf3357ac3a919.tar.gz
abslibre-1c222df4c718aa049f55cc10a6bdf3357ac3a919.tar.bz2
abslibre-1c222df4c718aa049f55cc10a6bdf3357ac3a919.zip
iceweasel: remove libre suffix and Social API support -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002291.html
-rw-r--r--libre/iceweasel/PKGBUILD (renamed from libre/iceweasel-libre/PKGBUILD)37
-rw-r--r--libre/iceweasel/gnu_headshadow.png (renamed from libre/iceweasel-libre/gnu_headshadow.png)bin6785 -> 6785 bytes
-rw-r--r--libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png (renamed from libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png)bin12184 -> 12184 bytes
-rw-r--r--libre/iceweasel/iceweasel-install-dir.patch (renamed from libre/iceweasel-libre/iceweasel-install-dir.patch)0
-rw-r--r--libre/iceweasel/iceweasel.desktop (renamed from libre/iceweasel-libre/iceweasel.desktop)0
-rw-r--r--libre/iceweasel/iceweasel.install (renamed from libre/iceweasel-libre/iceweasel.install)0
-rw-r--r--libre/iceweasel/libre.patch (renamed from libre/iceweasel-libre/libre.patch)23
-rw-r--r--libre/iceweasel/mozconfig (renamed from libre/iceweasel-libre/mozconfig)0
-rw-r--r--libre/iceweasel/mozconfig.pgo (renamed from libre/iceweasel-libre/mozconfig.pgo)0
-rw-r--r--libre/iceweasel/vendor.js (renamed from libre/iceweasel-libre/vendor.js)3
10 files changed, 41 insertions, 22 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel/PKGBUILD
index e8024f700..122e6138e 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -19,8 +19,7 @@ _debrel=deb3
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_pkgname=iceweasel
-pkgname=iceweasel-libre
+pkgname=iceweasel
epoch=1
pkgver=$_debver.$_debrel
pkgrel=1
@@ -39,10 +38,10 @@ fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gst-plugins-good: h.264 video'
'gst-libav: h.264 video')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/sid/${pkgname}"
install=iceweasel.install
-replaces=('firefox')
-conflicts=('firefox')
+replaces=('firefox' "${pkgname}-libre")
+conflicts=('firefox' "${pkgname}-libre")
provides=('firefox')
source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
"$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
@@ -58,11 +57,11 @@ md5sums=('52fc839ddc92223023d98c600075cd9e'
'11f646159f802ac0bdb4900d9953e9f6'
'2f5cb3df42b09fbfeaee5e72e5433ab9'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '96aec3a725ad9f438ae9d54c0f8b37d0'
+ '038ce8cedafb790041fb9842ad0f21f4'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'1c42509891cf6843660a5f3c69896e80'
- '783a5927246f014855b96a3abb92566b'
+ 'd6d1d8fa09082766ba8df2ca4b898cba'
'6e335a517c68488941340ee1c23f97b0')
prepare() {
@@ -175,7 +174,7 @@ build() {
cd "$srcdir/$DEBIAN_BUILD"
export PATH="$srcdir/path:$PATH"
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
export PYTHON="/usr/bin/python2"
if $_pgo; then
@@ -193,34 +192,34 @@ package() {
cd "$srcdir/$DEBIAN_BUILD"
make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
- install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
+ install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
# I don't even know why we're hitting the objdir, and ConnOS didn't
_brandingdir=debian/branding
brandingdir=moz-objdir/$_brandingdir
icondir="$pkgdir/usr/share/icons/hicolor"
for i in 16x16 32x32 48x48 64x64; do
- install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+ install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png"
done
install -Dm644 "$brandingdir/mozicon128.png" \
- "$icondir/128x128/apps/$_pkgname.png"
+ "$icondir/128x128/apps/$pkgname.png"
install -Dm644 "$_brandingdir/iceweasel_icon.svg" \
- "$icondir/scalable/apps/$_pkgname.svg"
+ "$icondir/scalable/apps/$pkgname.svg"
install -d "$pkgdir/usr/share/applications"
install -m644 "$srcdir/iceweasel.desktop" \
"$pkgdir/usr/share/applications"
# Use system-provided dictionaries
- rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
- ln -s /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
- ln -s /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+ rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
+ ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+ ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
- rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
- ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/browser/plugins"
- ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
+ rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins}
+ ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/browser/plugins"
+ ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/browser/searchplugins"
# Workaround for now:
#https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+ ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
}
diff --git a/libre/iceweasel-libre/gnu_headshadow.png b/libre/iceweasel/gnu_headshadow.png
index e0f73a3bf..e0f73a3bf 100644
--- a/libre/iceweasel-libre/gnu_headshadow.png
+++ b/libre/iceweasel/gnu_headshadow.png
Binary files differ
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
index 55f25e591..55f25e591 100644
--- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
+++ b/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
Binary files differ
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel/iceweasel-install-dir.patch
index af113fa85..af113fa85 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel/iceweasel-install-dir.patch
diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index c4a338cc6..c4a338cc6 100644
--- a/libre/iceweasel-libre/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel/iceweasel.install
index 1a1f4b16b..1a1f4b16b 100644
--- a/libre/iceweasel-libre/iceweasel.install
+++ b/libre/iceweasel/iceweasel.install
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel/libre.patch
index 608dc5819..08704affd 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -884,3 +884,26 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
if (target) {
target.messageManager.sendAsyncMessage("AboutHome:Update", data);
} else {
+diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
+--- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-03 04:25:46.017695291 -0300
++++ mozilla-release/modules/libpref/src/init/all.js 2014-09-03 04:44:10.801521540 -0300
+@@ -4268,19 +4268,6 @@
+ // Number of stack frames to capture in createObjectURL for about:memory.
+ pref("memory.blob_report.stack_frames", 0);
+
+-// comma separated list of domain origins (e.g. https://domain.com) for
+-// providers that can install from their own website without user warnings.
+-// entries are
+-pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp");
+-// comma separated list of domain origins (e.g. https://domain.com) for
+-// directory websites (e.g. AMO) that can install providers for other sites
+-pref("social.directories", "https://activations.cdn.mozilla.net");
+-// remote-install allows any website to activate a provider, with extended UI
+-// notifying user of installation. we can later pref off remote install if
+-// necessary. This does not affect whitelisted and directory installs.
+-pref("social.remote-install.enabled", true);
+-pref("social.toast-notifications.enabled", true);
+-
+ // Disable idle observer fuzz, because only privileged content can access idle
+ // observers (bug 780507).
+ pref("dom.idle-observers-api.fuzz_time.disabled", true);
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel/mozconfig
index 37ad56fda..37ad56fda 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel/mozconfig
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel/mozconfig.pgo
index 71ba205a4..71ba205a4 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel/mozconfig.pgo
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel/vendor.js
index da8118138..78b5eeb45 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -8,9 +8,6 @@ pref("browser.shell.checkDefaultBrowser", false);
pref("extensions.autoDisableScopes", 11);
pref("extensions.shownSelectionUI", true);
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
// Make sure that safebrowsing is disabled
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);