From 084d0a37c8d0f1a991ce22ccc6d8c3dd8ca12a33 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2012 22:14:47 -0500 Subject: (scripted) fix file permission breakage introduced in commit d62bd1 I did this with this command: git diff d62bd1^..d62bd1 | egrep '^old mode ' -C1 \ | tr '\n' ' ' | sed 's/diff --git/\n&/g' \ | sed -r 's|^diff --git a/([^ ]*) b/([^ ]*) old mode 100([0-9]*) new mode 100([0-9]*)|chmod \3 ./\1|' \ | bash The first line finds all of the file-permission changes in the commit. The second line squashes some newlines to get one line per file. This line is in the format: diff --git a/FILE b/FILE old mode OLDMODE new mode NEWMODE The third line extracts the values from those lines and transforms the line into: chmod FILE ./OLDMODE The fourth line (obviously) just executes the output. --- libre/icecat/icecat.desktop | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libre/icecat/icecat.desktop (limited to 'libre/icecat/icecat.desktop') diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop old mode 100755 new mode 100644 -- cgit v1.2.3 From 7ffb3a2380d08711d92b9d1735117a07839b4844 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:04:47 -0500 Subject: libre/icecat: sync files with versions from firefox and upstream * firefox-install-dir.patch: use version from firefox package * icecat.desktop: merge with version from firefox package * mozconfig: merge with versions from icecat upstream and firefox package --- libre/icecat/PKGBUILD | 6 ++-- libre/icecat/firefox-install-dir.patch | 12 +++---- libre/icecat/icecat.desktop | 58 ++++++++++++++++++++++++++++------ libre/icecat/mozconfig | 21 ++++-------- 4 files changed, 64 insertions(+), 33 deletions(-) (limited to 'libre/icecat/icecat.desktop') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e82263c30..eccf8b89b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -92,9 +92,9 @@ md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e' '3009b176cc5f9b1e416b1bf7c45b064b' 'f4cffe48e84283026da634424f4bbee6' 'e4cd438a0b2a42dfb14bc7716e901e5f' - 'd35394f58d9893609a352cd4c82731dc' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - '64826fcf48816b13090042eefddbaa58' + 'd71509923cfede3e634756fee899e492' + 'daa249d183fcf09942ff30db1b279f1e' + '150ac0fb3ac7b2114c8e8851a9e0516c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93') diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch index 7a72b9c9d..9c115f0eb 100644 --- a/libre/icecat/firefox-install-dir.patch +++ b/libre/icecat/firefox-install-dir.patch @@ -1,6 +1,6 @@ -diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk ---- a/config/baseconfig.mk -+++ b/config/baseconfig.mk +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 @@ -15,9 +15,9 @@ diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk ---- a/js/src/config/baseconfig.mk -+++ b/js/src/config/baseconfig.mk +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop index 8a7cad93d..668d5104f 100644 --- a/libre/icecat/icecat.desktop +++ b/libre/icecat/icecat.desktop @@ -1,11 +1,5 @@ [Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/icecat %u -Icon=icecat -Type=Application -Terminal=false -MultipleArgs=false -Name=GNU IceCat +Name=IceCat GenericName=Web Browser GenericName[af]=Web Blaaier GenericName[ar]=متصفح ويب @@ -73,6 +67,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web GenericName[zh_CN]=网页浏览器 GenericName[zh_TW]=網頁瀏覽器 GenericName[zu]=Umcingi we-Web -MimeType=text/html -StartupNotify=false -Categories=Application;Network; +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=/usr/lib/icecat/icecat %u +Icon=icecat +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 934ea9f0d..c5cea7185 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -20,35 +20,28 @@ ac_add_options --with-system-zlib ac_add_options --disable-crashreporter ac_add_options --disable-gnomevfs ac_add_options --disable-installer -ac_add_options --disable-mochitest ac_add_options --disable-safe-browsing ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-gio +#ac_add_options --enable-gstreamer ac_add_options --enable-startup-notification # Vendor settings -# Optimization -ac_add_options --enable-optimize +ac_add_options --enable-optimize="-pipe -O3" ac_add_options --libdir=/usr/lib ac_add_options --prefix=/usr -export BUILD_OFFICIAL=1 +# Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - -# Platform settings -#ac_add_options --build=i586-pc-linux-gnu -#ac_add_options --host=i586-pc-linux-gnu -#export USE_SHORT_LIBNAME=1 -#mk_add_options USE_SHORT_LIBNAME=1 # Application settings ac_add_options --disable-official-branding +# since with-user-appdir with .gnuzilla doesn't do the trick, +# use app-basename instead +ac_add_options --with-app-basename=icecat ac_add_options --with-branding=browser/branding/unofficial ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla -# Icecat +ac_add_options --with-user-appdir=.mozilla export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 -- cgit v1.2.3 From f4444da8f7943507e90c4b169205809221f2744e Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sun, 13 Jan 2013 21:51:57 -0200 Subject: ice{cat,weasel}: revert to back pkg stables and mv lukeshu pkgs to libre-testing --- libre-testing/icecat/PKGBUILD | 180 ++++++ libre-testing/icecat/bug-xulrunner-copy-stub.patch | 11 + libre-testing/icecat/firefox-install-dir.patch | 30 + libre-testing/icecat/firefox.install | 13 + libre-testing/icecat/icecat.desktop | 116 ++++ libre-testing/icecat/libre.patch | 108 ++++ libre-testing/icecat/mozconfig | 51 ++ libre-testing/icecat/mozconfig.pgo | 2 + libre-testing/icecat/shared-libs.patch | 12 + libre-testing/icecat/vendor.js | 21 + libre-testing/iceweasel-libre/PKGBUILD | 410 ++++++++++++++ libre-testing/iceweasel-libre/bug677092.patch | 330 +++++++++++ libre-testing/iceweasel-libre/firefox.install | 13 + .../iceweasel-libre/iceweasel-install-dir.patch | 31 ++ libre-testing/iceweasel-libre/iceweasel.desktop | 116 ++++ libre-testing/iceweasel-libre/libre.patch | 257 +++++++++ libre-testing/iceweasel-libre/mozconfig | 39 ++ libre-testing/iceweasel-libre/mozconfig.pgo | 2 + libre-testing/iceweasel-libre/replace-urls.txt | 25 + libre-testing/iceweasel-libre/shared-libs.patch | 12 + libre-testing/iceweasel-libre/vendor.js | 26 + libre/icecat-i18n/.gitignore | 3 + libre/icecat-i18n/Makefile | 38 ++ libre/icecat-i18n/PKGBUILD | 240 ++++++++ libre/icecat-i18n/PKGBUILD.in | 46 ++ libre/icecat/PKGBUILD | 229 ++++---- libre/icecat/bug-xulrunner-copy-stub.patch | 11 - libre/icecat/cairo.patch | 33 ++ libre/icecat/firefox-install-dir.patch | 30 - libre/icecat/firefox.install | 13 - libre/icecat/gcc47.patch | 75 +++ libre/icecat/icecat-install-dir.patch | 30 + libre/icecat/icecat-safe.desktop | 78 +++ libre/icecat/icecat.desktop | 58 +- libre/icecat/icecat.install | 13 + libre/icecat/libre.patch | 576 +++++++++++++++++-- libre/icecat/mozconfig | 73 +-- libre/icecat/mozconfig.pgo | 4 +- libre/icecat/shared-libs.patch | 12 - libre/icecat/vendor.js | 12 - libre/icecat/xulrunner-copy-stub.patch | 11 + libre/iceweasel-i18n/.gitignore | 3 + libre/iceweasel-i18n/Makefile | 59 ++ libre/iceweasel-i18n/PKGBUILD | 146 +++++ libre/iceweasel-i18n/PKGBUILD.in | 63 +++ ...Make-the-Reset-Firefox-feature-more-gener.patch | 281 ++++++++++ libre/iceweasel-libre/PKGBUILD | 481 ++++------------ libre/iceweasel-libre/bug677092.patch | 330 ----------- libre/iceweasel-libre/firefox.install | 13 - libre/iceweasel-libre/iceweasel-install-dir.patch | 12 +- libre/iceweasel-libre/iceweasel.desktop | 175 +++--- libre/iceweasel-libre/iceweasel.install | 13 + libre/iceweasel-libre/libre.patch | 617 +++++++++++++++++---- libre/iceweasel-libre/mozconfig | 54 +- libre/iceweasel-libre/mozconfig.pgo | 4 +- libre/iceweasel-libre/replace-urls.txt | 25 - libre/iceweasel-libre/vendor.js | 17 - 57 files changed, 4379 insertions(+), 1304 deletions(-) create mode 100644 libre-testing/icecat/PKGBUILD create mode 100644 libre-testing/icecat/bug-xulrunner-copy-stub.patch create mode 100644 libre-testing/icecat/firefox-install-dir.patch create mode 100644 libre-testing/icecat/firefox.install create mode 100644 libre-testing/icecat/icecat.desktop create mode 100644 libre-testing/icecat/libre.patch create mode 100644 libre-testing/icecat/mozconfig create mode 100644 libre-testing/icecat/mozconfig.pgo create mode 100644 libre-testing/icecat/shared-libs.patch create mode 100644 libre-testing/icecat/vendor.js create mode 100644 libre-testing/iceweasel-libre/PKGBUILD create mode 100644 libre-testing/iceweasel-libre/bug677092.patch create mode 100644 libre-testing/iceweasel-libre/firefox.install create mode 100644 libre-testing/iceweasel-libre/iceweasel-install-dir.patch create mode 100644 libre-testing/iceweasel-libre/iceweasel.desktop create mode 100644 libre-testing/iceweasel-libre/libre.patch create mode 100644 libre-testing/iceweasel-libre/mozconfig create mode 100644 libre-testing/iceweasel-libre/mozconfig.pgo create mode 100644 libre-testing/iceweasel-libre/replace-urls.txt create mode 100644 libre-testing/iceweasel-libre/shared-libs.patch create mode 100644 libre-testing/iceweasel-libre/vendor.js create mode 100644 libre/icecat-i18n/.gitignore create mode 100644 libre/icecat-i18n/Makefile create mode 100644 libre/icecat-i18n/PKGBUILD create mode 100644 libre/icecat-i18n/PKGBUILD.in delete mode 100644 libre/icecat/bug-xulrunner-copy-stub.patch create mode 100644 libre/icecat/cairo.patch delete mode 100644 libre/icecat/firefox-install-dir.patch delete mode 100644 libre/icecat/firefox.install create mode 100644 libre/icecat/gcc47.patch create mode 100644 libre/icecat/icecat-install-dir.patch create mode 100644 libre/icecat/icecat-safe.desktop create mode 100644 libre/icecat/icecat.install delete mode 100644 libre/icecat/shared-libs.patch create mode 100644 libre/icecat/xulrunner-copy-stub.patch create mode 100644 libre/iceweasel-i18n/.gitignore create mode 100644 libre/iceweasel-i18n/Makefile create mode 100644 libre/iceweasel-i18n/PKGBUILD create mode 100644 libre/iceweasel-i18n/PKGBUILD.in create mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch delete mode 100644 libre/iceweasel-libre/bug677092.patch delete mode 100644 libre/iceweasel-libre/firefox.install create mode 100644 libre/iceweasel-libre/iceweasel.install delete mode 100644 libre/iceweasel-libre/replace-urls.txt (limited to 'libre/icecat/icecat.desktop') diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD new file mode 100644 index 000000000..d60144bde --- /dev/null +++ b/libre-testing/icecat/PKGBUILD @@ -0,0 +1,180 @@ +# Maintainer: Márcio Silva +# Contributor (Parabola): Luke Shumaker +# Contributor (Parabola): fauno +# Contributor (Parabola): vando +# Contributor (Parabola): André Silva + +# Maintainer (ConnochaetOS): Henry Jensen + +# Maintainer (Arch) : Ionut Biru +# Contributor (Arch): Jakub Schmidtke + +# Contributor: Figue +# Thank you very much to the older contributors: +# Contributor: evr +# Contributor: Muhammad 'MJ' Jassim + +# Version Configuration ############################################## + +_pgo=false + +pkgname=icecat +pkgver=17.0.1 +pkgrel=2 + +###################################################################### + +if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox." +arch=( + 'i686' + 'mips64el' + 'x86_64' +) +license=( + 'GPL2' + 'LGPL' + 'MPL' +) +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss>=3.13.3' + 'sqlite' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'imagemagick' + 'imake' + 'libidl2' + 'librsvg' + 'libxslt' + 'mesa' + 'python2' + 'unzip' + 'wireless_tools' + 'zip' +) +[[ $CARCH != mips64el ]] && makedepends+=('yasm') +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options+=(!ccache) +fi +optdepends=('wireless_tools: Location detection via available WiFi networks') +url=http://www.gnu.org/software/gnuzilla/ +install=firefox.install +options=(!emptydirs) +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706 + bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo + mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch) +md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e' + '78bbfc17be8ef2104699875300a22316' + '3009b176cc5f9b1e416b1bf7c45b064b' + '6e9f9c6e8c63333e708d7d9e4f4ca161' + 'e4cd438a0b2a42dfb14bc7716e901e5f' + 'd71509923cfede3e634756fee899e492' + 'daa249d183fcf09942ff30db1b279f1e' + '150ac0fb3ac7b2114c8e8851a9e0516c' + '09428128596f92b46caaba5852738f8e' + '52e52f840a49eb1d14be1c0065b03a93') + +build() { + mv $pkgname-$pkgver mozilla-release + cd mozilla-release + + cp ../mozconfig .mozconfig + if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi + patch -Np1 -i ../firefox-install-dir.patch + patch -Np1 -i ../shared-libs.patch + patch -Np1 -i ../libre.patch + patch -Np1 -i ../bug-xulrunner-copy-stub.patch + patch -Np1 -i ../mozilla-bug-756390.patch + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + # This is a bug, we should fix it. + if [[ $CARCH == mips64el ]]; then + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + js/src/assembler/wtf/Platform.h + # Disable JIT. + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in + echo 'ac_add_options --disable-methodjit' >> .mozconfig + echo 'ac_add_options --disable-tracejit' >> .mozconfig + echo 'ac_add_options --disable-jemalloc' >> .mozconfig + fi + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + if $_pgo; then + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + fi + + _fail=0 + make -f client.mk build || _fail=1 + + if $_pgo; then + kill $! || true + fi + return $_fail +} + +package() { + cd mozilla-release + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" + + brandingdir=browser/branding/unofficial + for i in 16 32 48; do + install -Dm644 $brandingdir/default$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png" + done + + install -Dm644 ../$pkgbase.desktop \ + "$pkgdir/usr/share/applications/$pkgbase.desktop" + + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins + ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl} + + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" +} diff --git a/libre-testing/icecat/bug-xulrunner-copy-stub.patch b/libre-testing/icecat/bug-xulrunner-copy-stub.patch new file mode 100644 index 000000000..8ccf127df --- /dev/null +++ b/libre-testing/icecat/bug-xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -233,7 +233,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/libre-testing/icecat/firefox-install-dir.patch b/libre-testing/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..9c115f0eb --- /dev/null +++ b/libre-testing/icecat/firefox-install-dir.patch @@ -0,0 +1,30 @@ +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/libre-testing/icecat/firefox.install b/libre-testing/icecat/firefox.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/libre-testing/icecat/firefox.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/libre-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop new file mode 100644 index 000000000..668d5104f --- /dev/null +++ b/libre-testing/icecat/icecat.desktop @@ -0,0 +1,116 @@ +[Desktop Entry] +Name=IceCat +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=/usr/lib/icecat/icecat %u +Icon=icecat +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch new file mode 100644 index 000000000..497b8cd10 --- /dev/null +++ b/libre-testing/icecat/libre.patch @@ -0,0 +1,108 @@ +diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1150,11 +1150,9 @@ + // (This is intentionally on the high side; see bug 746055.) + pref("image.mem.max_decoded_image_kb", 256000); + +-// Example social provider +-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); + // Comma-separated list of nsIURI::prePaths that are allowed to activate + // built-in social functionality. +-pref("social.activation.whitelist", "https://www.facebook.com"); ++pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); + pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.active", false); +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 + +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Bloglines +-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s +-browser.contentHandlers.types.1.title=My Yahoo +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.2.title=Google +-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s +- +-# Keyword URL (for location bar searches) +-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= +- + # 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 + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +@@ -34,3 +22,11 @@ + # means that it's not possible to update the name of existing handler, so + # don't make any spelling errors here. + gecko.handlerService.defaultHandlersVersion=3 ++ ++# The default set of protocol handlers for irc: ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++ ++# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul +@@ -294,6 +294,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +