summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2013-11-24 13:48:34 -0200
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2013-11-24 13:48:34 -0200
commitb5fab32f34d03556e21b6af1024f44240be130eb (patch)
treea6d89df9a9dbc91e275505a36ef45749a6e875ce
parent9686c054c90ed47037235d0f7c2fd133f3fce73e (diff)
parent69eb369a0639708d250ab0fa4a40e5606a3ae094 (diff)
downloadabslibre-b5fab32f34d03556e21b6af1024f44240be130eb.tar.gz
abslibre-b5fab32f34d03556e21b6af1024f44240be130eb.tar.bz2
abslibre-b5fab32f34d03556e21b6af1024f44240be130eb.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/icecat/PKGBUILD5
-rw-r--r--libre/iceweasel-libre/PKGBUILD5
-rw-r--r--libre/syslinux/PKGBUILD2
3 files changed, 7 insertions, 5 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 9c1f30c1c..0d26fd734 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -73,8 +73,9 @@ prepare() {
patch -Np1 -i $srcdir/libre.patch
sed -i 's|Adobe Flash|SWF Player|g;
' browser/base/content/pageinfo/permissions.js \
- browser/base/content/browser-plugins.js
- sed -i '\|geo.wifi.uri| s|https://www[.]googleapis[.]com/geolocation/v1/geolocate[?]key=[%]GOOGLE_API_KEY[%]||g;
+ browser/base/content/browser-plugins.js
+ sed -i '\|URL of the GeoLocation backend|d;
+ \|geo[.]wifi[.]uri|d;
' browser/app/profile/firefox.js
# Fix for use nspr, sqlite and nss external
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 182f49a65..9f3ee6be8 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -93,8 +93,9 @@ prepare() {
patch -Np1 -i "$srcdir/libre.patch"
sed -i 's|Adobe Flash|SWF Player|g;
' browser/base/content/pageinfo/permissions.js \
- browser/base/content/browser-plugins.js
- sed -i '\|geo.wifi.uri| s|https://www[.]googleapis[.]com/geolocation/v1/geolocate[?]key=[%]GOOGLE_API_KEY[%]||g;
+ browser/base/content/browser-plugins.js
+ sed -i '\|URL of the GeoLocation backend|d;
+ \|geo[.]wifi[.]uri|d;
' browser/app/profile/firefox.js \
browser/metro/profile/metro.js
rm -v browser/base/content/abouthome/snippet*.png || true
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 345523b0f..fe0fedf73 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -31,7 +31,7 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve
md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
'f048880b57e2c5a7017ff8804bfda327'
'9376f18fa3e42fc36cffa4cff0a84c09'
- '9dbede6b71a4de9e46aac4aad65334d7
+ '9dbede6b71a4de9e46aac4aad65334d7'
'cb46ca47c6b6323127d908440057d98f')
prepare() {