From 820f075a89a44c4ade3eb4049071d4c28664d52e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 11:57:41 -0500 Subject: update [android-udev] in [~lukeshu] from AUR --- ~lukeshu/android-udev/.gitignore | 1 + ~lukeshu/android-udev/51-android.rules | 100 ++++++++++++++++++++------------- ~lukeshu/android-udev/Makefile | 33 +++++++++++ ~lukeshu/android-udev/PKGBUILD | 10 ++-- 4 files changed, 101 insertions(+), 43 deletions(-) create mode 100644 ~lukeshu/android-udev/.gitignore create mode 100644 ~lukeshu/android-udev/Makefile (limited to '~lukeshu') diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore new file mode 100644 index 000000000..290a3baa3 --- /dev/null +++ b/~lukeshu/android-udev/.gitignore @@ -0,0 +1 @@ +aur \ No newline at end of file diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules index c52379309..51f80cf54 100644 --- a/~lukeshu/android-udev/51-android.rules +++ b/~lukeshu/android-udev/51-android.rules @@ -1,24 +1,23 @@ # Acer SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers" -# ICONIA TAB A500 +# Iconia Tab A500 SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" +# Liquid +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202" +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb" # Archos SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers" # 43 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" # 101 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" # Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" - -# Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" # Dell SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers" @@ -32,13 +31,15 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers" # Google SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers" # NEXUS S -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" # Nexus One -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +# Generic and unspecified debug interface +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" # HTC SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers" @@ -46,14 +47,17 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot" # Desire (Bravo) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +# Desire HD +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Desire Z SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot" # Evo Shift -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # HD2 @@ -61,36 +65,37 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="and SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" # Hero H2000 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" -# Hero (GSM) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" +# Hero (GSM), Desire +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Hero (CDMA) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Incredible -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Incredible rev 0002 -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +# Evo 4G, Incredible rev 0002 +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # MyTouch 4G -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Slide -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Tatoo +# Tatoo, Dream, ADP1 , G1, Magic +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" # Vision -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Wildfire @@ -122,8 +127,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers" # LG SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers" -# LG (Swift) GT540 -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" +# Ally, Vortex, P500 +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f" +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb" +# Optimus One +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb" +# Swift GT540 +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb" + # Motorola SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers" @@ -131,14 +142,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers" SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66" # Defy/MB525 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c" -# Droid +# Droid SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db" # -- Xoom ID 1 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot" # -- Xoom ID 2 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot" # NEC SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers" @@ -178,15 +189,16 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="and SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" # Galaxy i7500 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" # Galaxy S SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666" # Galaxy Tab SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" -# Galaxy Tab 10.1 +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" +# Galaxy Tab 10.1, i9100 S2 +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" @@ -196,6 +208,18 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers" # Sony Ericsson SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers" +# Xperia X10 mini +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb" +# Xperia X10 mini pro +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb" +# Xperia X8 +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb" +# Xperia X12 +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb" # Toshiba SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers" @@ -203,6 +227,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers" # ZTE SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers" # Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_fastboot" + diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile new file mode 100644 index 000000000..238877f5a --- /dev/null +++ b/~lukeshu/android-udev/Makefile @@ -0,0 +1,33 @@ +# Use this to update the package from AUR. + +default: PHONY all +all: PHONY 51-android.rules PKGBUILD + +name=android-udev + +aur: + mkdir $@ +aur/%.tar.gz: | aur + cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz +aur/%: aur/%.tar.gz + cd aur && tar xzf $(notdir $<) +aur/$(name)/%: aur/$(name).tar.gz | aur/$(name) + test -f $@ && touch $@ + +51-android.rules: aur/$(name)/51-android.rules + sed -r 's/\s+$$//' < $< > $@ + +PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules + # Update pkg{ver,rel} + ver=`grep -m1 pkgver= $<` ; sed -i "s/pkgver=.*/$$ver/" $@ + rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@ + # Update md5sums + sed -i '/md5sums/,$$d' $@ + makepkg -g >> $@ + +clean: PHONY + rm -rf aur +maintainerclean: PHONY clean + rm -f 51-android.rules + +.PHONY: PHONY FORCE diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD index dabb611c9..6900b46da 100644 --- a/~lukeshu/android-udev/PKGBUILD +++ b/~lukeshu/android-udev/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: marlock pkgname=android-udev -pkgver=0.7 -pkgrel=3.1 +pkgver=0.8 +pkgrel=1.1 pkgdesc='Udev rules to for Android devices.' arch=('any') url="http://developer.android.com/guide/developing/device.html" @@ -15,8 +15,8 @@ conflicts=('udev-android-rules') install='android-udev.install' package() { - install -d $pkgdir/etc/udev/rules.d - install -m644 $srcdir/51-android.rules $pkgdir/etc/udev/rules.d/51-android.rules + install -d "$pkgdir/etc/udev/rules.d" + install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules" } -md5sums=('bfcd8d0e4c5bdeed0973e102a656e1eb') +md5sums=('909eb7629683efae838c6e9d65966b3b') -- cgit v1.2.3 From 0b84bcb1f125563d632c224ffc8212f19bbe32b8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 12:00:10 -0500 Subject: add emacs24 beta to [~lukeshu] --- ~lukeshu/emacs24/PKGBUILD | 82 ++++++++++++++++++++++++++++++++++++++++++ ~lukeshu/emacs24/emacs.install | 32 +++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 ~lukeshu/emacs24/PKGBUILD create mode 100644 ~lukeshu/emacs24/emacs.install (limited to '~lukeshu') diff --git a/~lukeshu/emacs24/PKGBUILD b/~lukeshu/emacs24/PKGBUILD new file mode 100644 index 000000000..00f90b16a --- /dev/null +++ b/~lukeshu/emacs24/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $ +# Maintainer: Juergen Hoetzel +# Contributor: Renchi Raju +pkgname=emacs24-bzr +_majorver=24.0.92 +pkgver=106675 +pkgrel=4 +pkgdesc="The extensible, customizable, self-documenting real-time display editor" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/emacs/emacs.html" +license=('GPL3') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') +install=emacs.install +source=(emacs.desktop) +md5sums=() + +_bzrtrunk=bzr://bzr.savannah.gnu.org/emacs/trunk +_bzrmod=$pkgname + +build() { + cd "$srcdir" + msg "Connecting to Bazaar server...." + + if [[ -d "$_bzrmod" ]]; then + cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" + msg "The local files are updated." + else + bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" + fi + + msg "Bazaar checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_bzrmod-$_majorver" + cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-$_majorver" + + cd "$srcdir"/$pkgname-$_majorver + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var --with-x-toolkit=gtk --with-xft + make +} + +package() { + provides=("emacs=${_majorver}a") + + cd "$srcdir"/$pkgname-$_majorver + make DESTDIR="$pkgdir" install + + # remove conflict with ctags package + mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} + mv "$pkgdir"/usr/share/man/man1/{ctags,ctags.emacs}.1.gz + # fix all the 777 perms on directories + find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; + # fix user/root permissions on usr/share files + find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \; + # fix perms on /var/games + chmod 775 "$pkgdir"/var/games + chmod 775 "$pkgdir"/var/games/emacs + chmod 664 "$pkgdir"/var/games/emacs/* + chown -R root:games "$pkgdir"/var/games + + # fix FS#9253 + mkdir -p "$pkgdir"/usr/share/pixmaps + ln -s $pkgdir../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png + + # This is done down here to help future-proof the above + rm "$pkgdir"/usr/bin/emacs + mv "$pkgdir"/usr/share/man/man1/emacs{,-$_majorver}.1.gz + for prog in ctags.emacs ebrowse emacsclient etags grep-changelog rcs-checkin; do + mv "$pkgdir"/usr/bin/$prog{,-$_majorver} + mv "$pkgdir"/usr/share/man/man1/$prog{,-24}.1.gz + done + mv "$pkgdir"/usr/share/applications/emacs{,24}.desktop + mv "$pkgdir"/usr/share/emacs/site-lisp/subdirs{,.emacs24}.el + rm "$pkgdir"/usr/share/info/dir + for file in "$pkgdir"/usr/share/pixmaps/emacs-icon.png `find "$pkgdir"/usr/share/{icons,info} -type f`; do + mv "$file" "`echo "$file"|sed 's/\..*/-24&/'`" + done + ln -s "$_majorver" "$pkgdir"/usr/share/emacs/24 + rm "$pkgdir"/var/games/emacs/* +} diff --git a/~lukeshu/emacs24/emacs.install b/~lukeshu/emacs24/emacs.install new file mode 100644 index 000000000..d84f1de14 --- /dev/null +++ b/~lukeshu/emacs24/emacs.install @@ -0,0 +1,32 @@ +ICON_PATH=usr/share/icons/hicolor +INFO_DIR=usr/share/info + +INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse +ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake +forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode +org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail +speedbar tramp url vip viper widget woman) + +post_install() { + gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + + [[ -x usr/bin/install-info ]] || return 0 + for f in ${INFO_FILES[@]}; do + install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + + [[ -x usr/bin/install-info ]] || return 0 + for f in ${INFO_FILES[@]}; do + install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + done +} -- cgit v1.2.3 From b387eed298e43c21d6809b56d23c8059e564a876 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 13:45:36 -0500 Subject: update openn-unstable in [~lukeshu] to 1.4.0.2 --- ~lukeshu/openni-unstable/PKGBUILD | 55 ++++++++++++++++------------ ~lukeshu/openni-unstable/openni-core.install | 11 ++++++ ~lukeshu/openni-unstable/openni-mono.install | 7 ++++ ~lukeshu/openni-unstable/openni.install | 11 ------ 4 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 ~lukeshu/openni-unstable/openni-core.install create mode 100644 ~lukeshu/openni-unstable/openni-mono.install delete mode 100644 ~lukeshu/openni-unstable/openni.install (limited to '~lukeshu') diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD index 32020d726..19d1575a1 100644 --- a/~lukeshu/openni-unstable/PKGBUILD +++ b/~lukeshu/openni-unstable/PKGBUILD @@ -21,24 +21,23 @@ pkgname=( openni$_suf-java-samples openni$_suf-java-samples-source ) -pkgver=1.3.4.6 -pkgrel=4 +pkgver=1.4.0.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.openni.org/" license=('GPL') makedepends=('git' 'doxygen' 'graphviz') +options+=('!strip') source=() md5sums=() __gitroot="git://github.com/OpenNI/OpenNI.git" _gitname="openni" -#_gitbranch="unstable" -#_gitbranch="master" _gitbranch="Unstable-$pkgver" _os='Linux' case "${CARCH}" in -'x86_64') _arch=x86;; +'x86_64') _arch=x64;; 'i686') _arch=x86;; 'arm') _arch=Arm;; # untested *) _arch=UNSUPPORTED_ARCH;; @@ -51,27 +50,32 @@ build() { cd "${srcdir}" msg "Connecting to GIT server...." - if [ -d ${_gitname} ] ; then + #if [ -d ${_gitname} ] ; then cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${__gitroot} ${_gitname} - cd ${_gitname} - fi + # git checkout master + # git pull origin + # msg "The local files are updated." + #else + # git clone ${__gitroot} ${_gitname} + # cd ${_gitname} + #fi git checkout ${_gitbranch} cd .. msg "GIT checkout done or server timeout" - msg "Starting make..." + msg "Starting build..." - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" + #rm -rf "${srcdir}/${_gitname}-build" + #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" cd "${srcdir}/${_gitname}-build" # PATCH sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" + + for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do + echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile" + done + echo ' abs_core: $(ALL_MODULES) $(ALL_UTILS) abs_core_samples: $(CORE_SAMPLES) @@ -87,7 +91,9 @@ abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) make -j1 \ abs_core abs_core_samples \ abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 + abs_mono abs_mono_samples + cd "../Bin/${_arch}-Release" + ln NiViewer Sample-NiViewer cd '../../../Source/DoxyGen' mkdir html @@ -117,7 +123,7 @@ package_openni-unstable-docs() { package_openni-unstable-core() { pkgdesc="OpenNI core libraries" depends=('libusb' 'freeglut') - install="openni.install" + install="openni-core.install" provides=('openni-core') conflicts=('openni-core') @@ -144,6 +150,8 @@ package_openni-unstable-core() { cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" install -d "${pkgdir}/usr/share" cp -r Common "${pkgdir}/usr/share/common" + + install -d "${pkgdir}/var/lib/ni" } package_openni-unstable-java() { @@ -164,6 +172,7 @@ package_openni-unstable-java() { package_openni-unstable-mono() { pkgdesc="OpenNI mono wrapper" depends=("openni$_suf" 'mono') + install="openni-mono.install" provides=('openni-mono') conflicts=('openni-mono') @@ -183,14 +192,16 @@ _install_sample_source() { install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" } -# Leave out NiViewer, it's set up wrong CORE_SAMPLES=' AudioSample BackRecorder CRead ConvertXToONI + HandTracker RecordSynthetic SimpleCreate + UserSelection + Viewer SimpleRead SimpleViewer UserTracker' MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' @@ -204,9 +215,8 @@ package_openni-unstable-core-samples() { cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" + install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" done } package_openni-unstable-core-samples-source() { @@ -214,7 +224,6 @@ package_openni-unstable-core-samples-source() { depends=("openni$_suf-core") provides=('openni-core-samples-source') conflicts=('openni-core-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in Viewer $CORE_SAMPLES; do @@ -246,7 +255,6 @@ package_openni-unstable-java-samples-source() { depends=("openni$_suf-java") provides=('openni-java-samples-source') conflicts=('openni-java-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in $JAVA_SAMPLES; do @@ -278,7 +286,6 @@ package_openni-unstable-mono-samples-source() { depends=("openni$_suf-mono") provides=('openni-mono-samples-source') conflicts=('openni-mono-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in $MONO_SAMPLES; do diff --git a/~lukeshu/openni-unstable/openni-core.install b/~lukeshu/openni-unstable/openni-core.install new file mode 100644 index 000000000..8470f4512 --- /dev/null +++ b/~lukeshu/openni-unstable/openni-core.install @@ -0,0 +1,11 @@ +post_install() { + MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" + for module in $MODULES + do + /usr/bin/niReg /usr/lib/$module + done +} + +pre_remove() { + rm /var/lib/ni/modules.xml +} diff --git a/~lukeshu/openni-unstable/openni-mono.install b/~lukeshu/openni-unstable/openni-mono.install new file mode 100644 index 000000000..72a6fb23d --- /dev/null +++ b/~lukeshu/openni-unstable/openni-mono.install @@ -0,0 +1,7 @@ +post_install() { + gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr +} + +post_remove() { + gacutil -u OpenNI.net -gacdir /usr +} diff --git a/~lukeshu/openni-unstable/openni.install b/~lukeshu/openni-unstable/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-unstable/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} -- cgit v1.2.3 From 8b024219267fe0dfe3a251ff966af66a1fd23d7b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 13:51:11 -0500 Subject: add svn-graph-branches to [~lukeshu] --- ~lukeshu/svn-graph-branches/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ~lukeshu/svn-graph-branches/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/svn-graph-branches/PKGBUILD b/~lukeshu/svn-graph-branches/PKGBUILD new file mode 100644 index 000000000..63568e50c --- /dev/null +++ b/~lukeshu/svn-graph-branches/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Luke Shumaker + +pkgname=svn-graph-branches +pkgver=0.10 +pkgrel=1 +pkgdesc="Parses the Subversion log of a repository to generate a graph of the important events of the project." +arch=('any') +url="https://code.google.com/p/svn-graph-branches/" +license=('GPL') +depends=('subversion' 'graphviz' 'java-environment') +makedepends=('sharutils') +source=(https://svn-graph-branches.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha1sums=('c8b85b57b7725bc869f792334505d36d527e1dea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + export CLASSPATH=`pwd` + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} -- cgit v1.2.3 From 9f78c0ab6f3d3f7de6b254848a8016a2c9d80043 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 18:58:41 -0500 Subject: add ~lukeshu/terminal-colors 1.3 --- ~lukeshu/terminal-colors/PKGBUILD | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ~lukeshu/terminal-colors/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/terminal-colors/PKGBUILD b/~lukeshu/terminal-colors/PKGBUILD new file mode 100644 index 000000000..662e5b5ef --- /dev/null +++ b/~lukeshu/terminal-colors/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Luke Shumaker + +pkgname=terminal-colors +pkgver=1.3 +pkgrel=1 +pkgdesc="Displays charts for 256/88/16 terminal color modes. Also supports converting between 256/88 color values." +arch=('any') +url="http://zhar.net/projects/shell/" +license=('GPL3') +depends=('python2') +source=("terminal-colors.py::http://zhar.net/projects/shell/terminal-colors") + +build() { + cd "$srcdir" + sed 's@/usr/bin/env python$@/usr/bin/env python2@' < terminal-colors.py > terminal-colors +} + +package() { + cd "$srcdir" + install -D -m755 terminal-colors "$pkgdir/usr/bin/terminal-colors" +} + +md5sums=('30e3ab6cde416df110110244ce40eb94') -- cgit v1.2.3 From 3e0b65526ad875e77b7925091e384065218a63e0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 19:01:11 -0500 Subject: add ~lukeshu/make-graph 3.82 (GNU Make with graphviz patch) --- ~lukeshu/make-graph/PKGBUILD | 64 ++++++ ~lukeshu/make-graph/bug30612.patch | 66 ++++++ ~lukeshu/make-graph/bug30723.patch | 12 ++ ~lukeshu/make-graph/make-3.82-makeflags.patch | 36 ++++ ~lukeshu/make-graph/make-3.82-sort-blank.patch | 17 ++ ~lukeshu/make-graph/make-graph.patch | 273 +++++++++++++++++++++++++ ~lukeshu/make-graph/make.install | 20 ++ 7 files changed, 488 insertions(+) create mode 100644 ~lukeshu/make-graph/PKGBUILD create mode 100644 ~lukeshu/make-graph/bug30612.patch create mode 100644 ~lukeshu/make-graph/bug30723.patch create mode 100644 ~lukeshu/make-graph/make-3.82-makeflags.patch create mode 100644 ~lukeshu/make-graph/make-3.82-sort-blank.patch create mode 100644 ~lukeshu/make-graph/make-graph.patch create mode 100644 ~lukeshu/make-graph/make.install (limited to '~lukeshu') diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD new file mode 100644 index 000000000..f7f7cd0b1 --- /dev/null +++ b/~lukeshu/make-graph/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ +# Maintainer: Allan McRae +# Contributor: judd + +_pkgname=make +pkgname=$_pkgname-graph +pkgver=3.82 +pkgrel=4.1 +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$_pkgname.install +source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + +source+=('make-graph.patch') +md5sums+=('c1f1d652004a36c69b1f7f42a6849356') +depends+=('graphviz') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + # https://savannah.gnu.org/patch/?7447 + patch -Np1 -i $srcdir/make-graph.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${_pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/~lukeshu/make-graph/bug30612.patch b/~lukeshu/make-graph/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/~lukeshu/make-graph/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/~lukeshu/make-graph/bug30723.patch b/~lukeshu/make-graph/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/~lukeshu/make-graph/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/~lukeshu/make-graph/make-3.82-sort-blank.patch b/~lukeshu/make-graph/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/~lukeshu/make-graph/make-graph.patch b/~lukeshu/make-graph/make-graph.patch new file mode 100644 index 000000000..083db55e4 --- /dev/null +++ b/~lukeshu/make-graph/make-graph.patch @@ -0,0 +1,273 @@ +diff -ur make-3.82/file.c make-wch/file.c +--- make-3.82/file.c 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/file.c 2010-08-19 23:28:20.162660391 -0400 +@@ -1021,6 +1021,129 @@ + hash_print_stats (&files, stdout); + } + ++/* Dump the dependency graph to a Graphviz file (on stdout) */ ++ ++void ++print_graph_prereqs (const char *filename, const struct dep *deps) ++{ ++ const struct dep *ood = 0; ++ ++ /* Print all normal dependencies; note any order-only deps. */ ++ for (; deps != 0; deps = deps->next) ++ if (! deps->ignore_mtime) ++ printf (" \"%s\" -> \"%s\";\n", filename, dep_name (deps)); ++ ++ /* Print order-only deps, if we have any. */ ++ if (ood) ++ { ++ for (ood = ood->next; ood != 0; ood = ood->next) ++ if (ood->ignore_mtime) ++ printf (" %s -> %s [style=dotted];\n", filename, dep_name (ood)); ++ /* XXX: we need to distinguish these some how. ++ * Is dotting them the right way? */ ++ } ++} ++ ++static void ++print_graph_file (const void *item) ++{ ++ const struct file *f = item; ++ ++ int built_in_special_target=( ++ (0==strcmp(f->name,".PHONY")) ++ || (0==strcmp(f->name,".SUFFIXES")) ++ || (0==strcmp(f->name,".DEFAULT")) ++ || (0==strcmp(f->name,".PRECIOUS")) ++ || (0==strcmp(f->name,".INTERMEDIATE")) ++ || (0==strcmp(f->name,".SECONDARY")) ++ || (0==strcmp(f->name,".SECONDEXPANSION")) ++ || (0==strcmp(f->name,".DELETE_ON_ERROR")) ++ || (0==strcmp(f->name,".IGNORE")) ++ || (0==strcmp(f->name,".LOW_RESOLUTION_TIME")) ++ || (0==strcmp(f->name,".SILENT")) ++ || (0==strcmp(f->name,".EXPORT_ALL_VARIABLES")) ++ || (0==strcmp(f->name,".NOTPARALLEL")) ++ || (0==strcmp(f->name,".ONESHELL")) ++ || (0==strcmp(f->name,".POSIX")) ++ ); ++ if ((f->is_target) && (!built_in_special_target)) ++ { ++ printf (" \"%s\" [", f->name); ++ /* XXX some of these should be attached to the nodes in some way; ++ * though I'm not sure what style changes should be made for which ones. ++ * ~ LukeShu ++ if (f->double_colon) puts (_("// Double-colon rule.")); ++ if (f->precious) puts (_("// Precious file (prerequisite of .PRECIOUS).")); ++ */if (f->phony) puts (_(" color=blue "));/* ++ if (f->cmd_target) puts (_("// Command line target.")); ++ if (f->dontcare) puts (_("// A default, MAKEFILES, or -include/sinclude makefile.")); ++ if (f->tried_implicit) puts (_("// Implicit rule search has been done.")); ++ else puts (_("// Implicit rule search has not been done.")); ++ if (f->stem != 0) printf (_("// Implicit/static pattern stem: `%s'\n"), f->stem); ++ if (f->intermediate) puts (_("// File is an intermediate prerequisite.")); ++ if (f->also_make != 0) ++ { ++ const struct dep *d; ++ fputs (_("# Also makes:"), stdout); ++ for (d = f->also_make; d != 0; d = d->next) ++ printf (" %s\n", dep_name (d)); ++ } ++ if (f->last_mtime == UNKNOWN_MTIME) puts (_("// Modification time never checked.")); ++ else if (f->last_mtime == NONEXISTENT_MTIME) puts (_("// File does not exist.")); ++ else if (f->last_mtime == OLD_MTIME) puts (_("// File is very old.")); ++ else ++ { ++ char buf[FILE_TIMESTAMP_PRINT_LEN_BOUND + 1]; ++ file_timestamp_sprintf (buf, f->last_mtime); ++ printf (_("// Last modified %s\n"), buf); ++ } ++ if (f->updated) puts (_("// File has been updated.")); ++ else puts (_("// File has not been updated.")); ++ switch (f->command_state) ++ { ++ case cs_running: puts (_("// Update: Running (THIS IS A BUG).")); break; ++ case cs_deps_running: puts (_("// Update: Dependencies running (THIS IS A BUG).")); break; ++ case cs_not_started: ++ case cs_finished: ++ switch (f->update_status) ++ { ++ case -1: break; ++ case 0: puts (_("// Update: Successfully")); break; ++ case 1: assert (question_flag); ++ puts (_("// Update: Needs to be (-q is set)")); break; ++ case 2: puts (_("// Update: Failed")); break; ++ default: puts (_("// Update: Invalid `update_status' value)); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ break; ++ default: puts (_("// Update: Invalid `command_state' value")); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ if (f->variables != 0) print_file_variables (f); ++ if (f->cmds != 0) print_commands (f->cmds); ++ */ ++ puts("];"); ++ print_graph_prereqs (f->name, f->deps); ++ } ++ ++ if (f->prev) ++ print_graph_file ((const void *) f->prev); ++} ++ ++void ++print_graph (void) ++{ ++ printf ("%sgraph make%i {\n", ++ (makelevel==0)?"di":"sub", ++ getpid()); ++ hash_map (&files, print_graph_file); ++ puts ("}"); ++} ++ + /* Verify the integrity of the data base of files. */ + + #define VERIFY_CACHED(_p,_n) \ +diff -ur make-3.82/filedef.h make-wch/filedef.h +--- make-3.82/filedef.h 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/filedef.h 2010-08-19 21:09:34.314660209 -0400 +@@ -116,6 +116,7 @@ + char *build_target_list (char *old_list); + void print_prereqs (const struct dep *deps); + void print_file_data_base (void); ++void print_graph (void); + + #if FILE_TIMESTAMP_HI_RES + # define FILE_TIMESTAMP_STAT_MODTIME(fname, st) \ +diff -ur make-3.82/main.c make-wch/main.c +--- make-3.82/main.c 2010-07-19 03:10:53.000000000 -0400 ++++ make-wch/main.c 2010-08-21 22:32:56.818417305 -0400 +@@ -175,6 +175,11 @@ + + int print_data_base_flag = 0; + ++/* Nonzero means don't remake anything, just print the dependency graph ++ that results from reading the makefile (-g). */ ++ ++int print_graph_flag = 0; ++ + /* Nonzero means don't remake anything; just return a nonzero status + if the specified targets are not up to date (-q). */ + +@@ -321,6 +326,9 @@ + -f FILE, --file=FILE, --makefile=FILE\n\ + Read FILE as a makefile.\n"), + N_("\ ++ -g, --graph Print make's internal dependency graph\n\ ++ in Graphviz format, without remaking makefiles.\n"), ++ N_("\ + -h, --help Print this message and exit.\n"), + N_("\ + -i, --ignore-errors Ignore errors from recipes.\n"), +@@ -385,6 +393,7 @@ + #endif + { 'e', flag, &env_overrides, 1, 1, 0, 0, 0, "environment-overrides", }, + { 'f', filename, &makefiles, 0, 0, 0, 0, 0, "file" }, ++ { 'g', flag, &print_graph_flag, 1, 1, 0, 0, 0, "graph" }, + { 'h', flag, &print_usage_flag, 0, 0, 0, 0, 0, "help" }, + { 'i', flag, &ignore_errors_flag, 1, 1, 0, 0, 0, "ignore-errors" }, + { 'I', filename, &include_directories, 1, 1, 0, 0, 0, +@@ -1946,7 +1955,10 @@ + define_makeflags (1, 1); + + rebuilding_makefiles = 1; +- status = update_goal_chain (read_makefiles); ++ if (print_graph_flag) ++ status = -1; ++ else ++ status = update_goal_chain (read_makefiles); + rebuilding_makefiles = 0; + + switch (status) +@@ -2278,33 +2290,37 @@ + + { + int status; ++ if (print_graph_flag) ++ status=0; ++ else ++ { ++ switch (update_goal_chain (goals)) ++ { ++ case -1: ++ /* Nothing happened. */ ++ case 0: ++ /* Updated successfully. */ ++ status = makefile_status; ++ break; ++ case 1: ++ /* We are under -q and would run some commands. */ ++ status = MAKE_TROUBLE; ++ break; ++ case 2: ++ /* Updating failed. POSIX.2 specifies exit status >1 for this; ++ but in VMS, there is only success and failure. */ ++ status = MAKE_FAILURE; ++ break; ++ default: ++ abort (); ++ } + +- switch (update_goal_chain (goals)) +- { +- case -1: +- /* Nothing happened. */ +- case 0: +- /* Updated successfully. */ +- status = makefile_status; +- break; +- case 1: +- /* We are under -q and would run some commands. */ +- status = MAKE_TROUBLE; +- break; +- case 2: +- /* Updating failed. POSIX.2 specifies exit status >1 for this; +- but in VMS, there is only success and failure. */ +- status = MAKE_FAILURE; +- break; +- default: +- abort (); +- } +- +- /* If we detected some clock skew, generate one last warning */ +- if (clock_skew_detected) +- error (NILF, +- _("warning: Clock skew detected. Your build may be incomplete.")); +- ++ /* If we detected some clock skew, generate one last warning */ ++ if (clock_skew_detected) ++ error (NILF, ++ _("warning: Clock skew detected. Your build may be incomplete.")); ++ } ++ + /* Exit. */ + die (status); + } +@@ -3042,7 +3058,7 @@ + { + static int printed_version = 0; + +- char *precede = print_data_base_flag ? "# " : ""; ++ char *precede = (print_data_base_flag||print_graph_flag) ? "# " : ""; + + if (printed_version) + /* Do it only once. */ +@@ -3188,6 +3204,10 @@ + if (print_data_base_flag) + print_data_base (); + ++ ++ if (print_graph_flag) ++ print_graph (); ++ + verify_file_data_base (); + + clean_jobserver (status); diff --git a/~lukeshu/make-graph/make.install b/~lukeshu/make-graph/make.install new file mode 100644 index 000000000..6cf8b0dc4 --- /dev/null +++ b/~lukeshu/make-graph/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} -- cgit v1.2.3 From 2ade85f60e889eac62480ca6d0ec8dfdac3854c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 19:05:00 -0500 Subject: add ~lukeshu/redo 0.06-1 --- ~lukeshu/redo/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 ~lukeshu/redo/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD new file mode 100644 index 000000000..95e75dd0e --- /dev/null +++ b/~lukeshu/redo/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Luke Shumaker + +pkgname=redo +pkgver=0.06 +pkgrel=1 +pkgdesc="A competitor to make based on essays by DJB.") +arch=('any') +url="https://github.com/apenwarr/$pkgname" +license=('GPL2') +depends=('python2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/apenwarr/$pkgname/tarball/$pkgname-$pkgver") + +build() { + cd "$srcdir/apenwarr-$pkgname-"* + + # Make everything use python2 + sed -i 's@^#!/usr/bin/python$@#!/usr/bin/python2@' *.py + sed -i 's@/usr/bin/env python@/usr/bin/env python2@' Documentation/md2man.py + sed -i -e 's@^python @python2 @' \ + -e 's@/usr/bin/python$@/usr/bin/python2@' \ + install.do + + make +} + +check() { + cd "$srcdir/apenwarr-$pkgname-"* + make test +} + +package() { + cd "$srcdir/apenwarr-$pkgname-"* + make install DESTDIR="$pkgdir" +} + +md5sums=('0faa0e98f3d60fdcdea826dad59923c8') -- cgit v1.2.3 From 2751b31a75cd64a3ef557f3c7e21674a37c87f8a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 19:05:58 -0500 Subject: add ~lukeshu/stow 2.1.2-1 (GNU Stow) --- ~lukeshu/stow/PKGBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 ~lukeshu/stow/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD new file mode 100644 index 000000000..aa0d62ac3 --- /dev/null +++ b/~lukeshu/stow/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke Shumaker + +pkgname=stow +pkgver=2.1.2 +pkgrel=1 +pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place." +arch=(any) +url="https://www.gnu.org/software/stow/" +license=('GPL2') +depends=('perl>=5.6.1') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('82857e43531cf6936aed99ef3b86b446') -- cgit v1.2.3 From aa3c52ef01f1c52359164f26c1425d5b57d9ec31 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 23 Dec 2011 19:29:12 -0500 Subject: give ~lukeshu a .gitignore that suits me more --- ~lukeshu/.gitignore | 6 ++++++ ~lukeshu/terminal-colors/.gitignore | 1 + 2 files changed, 7 insertions(+) create mode 100644 ~lukeshu/.gitignore create mode 100644 ~lukeshu/terminal-colors/.gitignore (limited to '~lukeshu') diff --git a/~lukeshu/.gitignore b/~lukeshu/.gitignore new file mode 100644 index 000000000..db32297d9 --- /dev/null +++ b/~lukeshu/.gitignore @@ -0,0 +1,6 @@ +# probably source downloads +*.tar.gz +*.tar.xz +*.tar.bz2 +*.tgz +*.zip diff --git a/~lukeshu/terminal-colors/.gitignore b/~lukeshu/terminal-colors/.gitignore new file mode 100644 index 000000000..8ba0d861a --- /dev/null +++ b/~lukeshu/terminal-colors/.gitignore @@ -0,0 +1 @@ +terminal-colors.py -- cgit v1.2.3 From 976b093b36a5c78ec0de8e194c1066f93965e7d3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 24 Dec 2011 15:43:26 -0500 Subject: add ~lukeshu/git-svn-abandon-git (git-svn-abandon, from github) --- ~lukeshu/git-svn-abandon-git/PKGBUILD | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 ~lukeshu/git-svn-abandon-git/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD new file mode 100644 index 000000000..51cd83817 --- /dev/null +++ b/~lukeshu/git-svn-abandon-git/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Luke Shumaker + +_pkgname=git-svn-abandon +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="http://blog.woobling.org/2009/06/git-svn-abandon.html" +license=('MIT') +depends=('git') +makedepends=('git' 'python-markdown') + +_gitroot=https://github.com/nothingmuch/git-svn-abandon.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + markdown README.mkdn > README.html +} + +package() { + cd "$srcdir/$_gitname-build" + install -d "$pkgdir/usr/lib/git-core" + install -m755 git-* "$pkgdir/usr/lib/git-core" + + install -D -m644 README.mkdn "$pkgdir/usr/doc/git-svn-abandon/README.md" + install -D -m644 README.html "$pkgdir/usr/doc/git-svn-abandon/README.html" + install -D -m644 LICENSE "$pkgdir/usr/licenses/git-svn-abandon/LICENSE" +} -- cgit v1.2.3 From 21d21856b9ef35f98c4e714ce526febc50fedb2b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 24 Dec 2011 16:09:02 -0500 Subject: add ~lukeshu/wdiff 1.1.0 (GNU Wdiff) --- ~lukeshu/stow/PKGBUILD | 2 +- ~lukeshu/wdiff/PKGBUILD | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ~lukeshu/wdiff/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD index aa0d62ac3..24a2dcb1c 100644 --- a/~lukeshu/stow/PKGBUILD +++ b/~lukeshu/stow/PKGBUILD @@ -5,7 +5,7 @@ pkgver=2.1.2 pkgrel=1 pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place." arch=(any) -url="https://www.gnu.org/software/stow/" +url="https://www.gnu.org/software/$pkgname/" license=('GPL2') depends=('perl>=5.6.1') source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD new file mode 100644 index 000000000..6092b3d76 --- /dev/null +++ b/~lukeshu/wdiff/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke Shumaker + +pkgname=wdiff +pkgver=1.1.0 +pkgrel=1 +pkgdesc="A front end to diff for comparing files on a word per word basis." +arch=('i686' 'x86_64') +url="https://www.gnu.org/software/$pkgname/" +license=('GPL3') +depends=('diffutils') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('aa4dd87a9140a96ee85d2502673d19f3') -- cgit v1.2.3 From c1a8a48c19af10651f6253b476ff3c72d50ce895 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 24 Dec 2011 16:14:57 -0500 Subject: add ~lukeshu/thingutils-git (LukeShu's thingutils) --- ~lukeshu/thingutils-git/PKGBUILD | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 ~lukeshu/thingutils-git/PKGBUILD (limited to '~lukeshu') diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD new file mode 100644 index 000000000..5ef2c1c56 --- /dev/null +++ b/~lukeshu/thingutils-git/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Luke Shumaker + +_pkgname=thingutils +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="https://gitorious.org/thingutils" +license=('MIT') +depends=( + 'php' # roll, urldecode + 'bash' # daemon, newegg, sysfiles + 'emacs' # emacsmail, emacsterm, e + 'wget' # whatismyip + 'findutils' # maildups, whatismyip + 'sysstat' # sysfiles + 'offlineimap' # offlineimap-runner + 'wdiff' # chardiff +) +makedepends=('git') + +_gitroot=https://git.gitorious.org/thingutils/thingutils.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + make prefix=/usr +} + +package() { + cd "$srcdir/$_gitname-build" + make install prefix=/usr DESTDIR="$pkgdir" +} -- cgit v1.2.3 From 9016fc139f2f81420ca15e20332e9b6e5e5e6a80 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 25 Dec 2011 15:31:54 -0500 Subject: import ~iceweasel-libre-current (from ConnochaetOS) --- ~lukeshu/iceweasel-libre-current/PKGBUILD | 105 ++ .../iceweasel-libre-current/arch-linux-wiki.xml | 12 + .../iceweasel-libre-current/duck-duck-go-lite.xml | 8 + .../iceweasel-libre-current/duck-duck-go-ssl.xml | 8 + ~lukeshu/iceweasel-libre-current/firefox.js | 1072 ++++++++++++++++++++ ~lukeshu/iceweasel-libre-current/iceweasel.install | 21 + .../iceweasel-libre-current/internet-archive.xml | 12 + ~lukeshu/iceweasel-libre-current/jamendo-en.xml | 12 + ~lukeshu/iceweasel-libre-current/libre.patch | 391 +++++++ .../iceweasel-libre-current/logless-search.xml | 8 + ~lukeshu/iceweasel-libre-current/mozconfig | 39 + .../mozilla-firefox-1.0-lang.patch | 12 + ~lukeshu/iceweasel-libre-current/region.properties | 23 + .../scroogle-ssl-english.xml | 14 + .../xulrunner-copy-stub.patch | 11 + ~lukeshu/iceweasel-libre-current/yacy.xml | 9 + 16 files changed, 1757 insertions(+) create mode 100644 ~lukeshu/iceweasel-libre-current/PKGBUILD create mode 100644 ~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml create mode 100644 ~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml create mode 100644 ~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml create mode 100644 ~lukeshu/iceweasel-libre-current/firefox.js create mode 100644 ~lukeshu/iceweasel-libre-current/iceweasel.install create mode 100644 ~lukeshu/iceweasel-libre-current/internet-archive.xml create mode 100644 ~lukeshu/iceweasel-libre-current/jamendo-en.xml create mode 100644 ~lukeshu/iceweasel-libre-current/libre.patch create mode 100644 ~lukeshu/iceweasel-libre-current/logless-search.xml create mode 100644 ~lukeshu/iceweasel-libre-current/mozconfig create mode 100644 ~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch create mode 100644 ~lukeshu/iceweasel-libre-current/region.properties create mode 100644 ~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml create mode 100644 ~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch create mode 100644 ~lukeshu/iceweasel-libre-current/yacy.xml (limited to '~lukeshu') diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/~lukeshu/iceweasel-libre-current/PKGBUILD new file mode 100644 index 000000000..bf5fe5fb0 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Henry Jensen + + +pkgname=iceweasel-libre-current +_pkgname=iceweasel +pkgver=9.0.1 +_pkgver=9.0 + +pkgrel=1 +pkgdesc="Libre version of Iceweasel, based on the Firefox browser." +arch=('i586' 'x86_64') +url="http://www.connochaetos.org" +license=('GPL2' 'MPL' 'LGPL') +depends=('desktop-file-utils') +makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa') +provides=('firefox' 'icecat' 'iceweasel') +conflicts=('firefox' 'icecat6' 'icecat' 'iceweasel-libre-lts') +replaces=("firefox=${pkgver}" 'icecat6' 'icecat') +install=iceweasel.install +source=(iceweasel-${pkgver}.tar.gz::https://repo.parabolagnulinux.org/other/iceweasel-${pkgver}-connos.tar.gz + mozconfig + mozilla-firefox-1.0-lang.patch + xulrunner-copy-stub.patch + libre.patch +# Search engines + arch-linux-wiki.xml + internet-archive.xml + jamendo-en.xml + logless-search.xml + scroogle-ssl-english.xml + yacy.xml + duck-duck-go-ssl.xml + duck-duck-go-lite.xml +# Default options + firefox.js + region.properties) + +build() { + + msg2 "Patching some files..." + cd "${srcdir}/${_pkgname}-${pkgver}/" + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -p1 < ../libre.patch +# patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch" + + cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + msg2 "Starting build..." + cp "${srcdir}/mozconfig" .mozconfig + + #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + ./configure + +# touch config* + + make MOZ_MAKE_FLAGS="${MAKEFLAGS}" + msg2 "Build complete" +} + +package() { + + cd "${srcdir}/${_pkgname}-${pkgver}/" + #make -j1 -f client.mk DESTDIR="${pkgdir}" install + make install DESTDIR="${pkgdir}" + + msg2 "Finishing..." + + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/pixmaps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1 + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg + + + msg2 "Removing proprietary and anti-privacy search engines" + rm -f ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml + msg2 "And provide better ones..." + install -m755 -d ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + install -m644 ${srcdir}/*.xml ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver} + rm -rvf ${pkgdir}/usr/include + +} +md5sums=('a1e4a5d09f3dc24b936eadc8c5bae7a8' + '5e2574eef71ee1437e2f8e7481c67893' + 'bd5db57c23c72a02a489592644f18995' + '5a1938673a367b20ecfa009a5eb767aa' + '9609e77182cc300e3fe9d4b0c7e7efb4' + '3403175087e584a8c5e840cc62310cd9' + '462c68585461f8cdc23c93c46f6ee4cf' + '2d492295c4308f9bba9ece28d8b3af2d' + '937ac0e5392b060d93bd33e761fbfa51' + 'cf97082e77e3ef5f1bd74b1db9329965' + '24528ca3f7f1e1a0ba735231aa3ac1de' + 'c5f00b6b24222aacd5a749d1f59c4d24' + 'e1bda0854de7d764f7401c81bb82b5ef' + '9952048383966926eea6d67384102425' + 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml new file mode 100644 index 000000000..9e21b92e2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml @@ -0,0 +1,12 @@ + +Arch Linux Wiki +searches on the arch linux wiki +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII= +7 +http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml +http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png +http://wiki.archlinux.org/index.php/Main_Page + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml new file mode 100644 index 000000000..3142d3410 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (Lite) +Search Duck Duck Go (Lite) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml new file mode 100644 index 000000000..4fb1391ab --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (SSL) +Search Duck Duck Go (SSL) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/firefox.js b/~lukeshu/iceweasel-libre-current/firefox.js new file mode 100644 index 000000000..2300e65ce --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/firefox.js @@ -0,0 +1,1072 @@ +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1998 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +// XXX Toolkit-specific preferences should be moved into toolkit.js + +#filter substitution + +# SYNTAX HINTS: dashes are delimiters. Use underscores instead. +# The first character after a period must be alphabetic. + +#ifdef XP_UNIX +#ifndef XP_MACOSX +#define UNIX_BUT_NOT_MAC +#endif +#endif + +pref("general.startup.browser", true); + +pref("browser.chromeURL","chrome://browser/content/"); +pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); + +// Enables some extra Extension System Logging (can reduce performance) +pref("extensions.logging.enabled", false); + +// Preferences for AMO integration +pref("extensions.getAddons.cache.enabled", true); +pref("extensions.getAddons.maxResults", 15); +pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + +// Blocklist preferences +pref("extensions.blocklist.enabled", true); +pref("extensions.blocklist.interval", 86400); +// Controls what level the blocklist switches from warning about items to forcibly +// blocking them. +pref("extensions.blocklist.level", 2); +pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); +pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); + +pref("extensions.update.autoUpdateDefault", true); + +// Dictionary download preference +pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org"); + +// Update Timer Manager preferences +// Interval: When all registered timers should be checked (in milliseconds) +// default=10 minutes +pref("app.update.timer", 600000); + +// App-specific update preferences + +// The interval to check for updates (app.update.interval) is defined in +// firefox-branding.js + +// Alternative windowtype for an application update user interface window. When +// a window with this windowtype is open the application update service won't +// open the normal application update user interface window. +pref("app.update.altwindowtype", "Browser:About"); + +// Enables some extra Application Update Logging (can reduce performance) +pref("app.update.log", false); + +// The number of general background check failures to allow before notifying the +// user of the failure. User initiated update checks always notify the user of +// the failure. +pref("app.update.backgroundMaxErrors", 10); + +// When |app.update.cert.requireBuiltIn| is true or not specified the +// final certificate and all certificates the connection is redirected to before +// the final certificate for the url specified in the |app.update.url| +// preference must be built-in. +pref("app.update.cert.requireBuiltIn", true); + +// When |app.update.cert.checkAttributes| is true or not specified the +// certificate attributes specified in the |app.update.certs.| preference branch +// are checked against the certificate for the url specified by the +// |app.update.url| preference. +pref("app.update.cert.checkAttributes", true); + +// The number of certificate attribute check failures to allow for background +// update checks before notifying the user of the failure. User initiated update +// checks always notify the user of the certificate attribute check failure. +pref("app.update.cert.maxErrors", 5); + +// The |app.update.certs.| preference branch contains branches that are +// sequentially numbered starting at 1 that contain attribute name / value +// pairs for the certificate used by the server that hosts the update xml file +// as specified in the |app.update.url| preference. When these preferences are +// present the following conditions apply for a successful update check: +// 1. the uri scheme must be https +// 2. the preference name must exist as an attribute name on the certificate and +// the value for the name must be the same as the value for the attribute name +// on the certificate. +// If these conditions aren't met it will be treated the same as when there is +// no update available. This validation will not be performed when using the +// |app.update.url.override| preference for update checking. +pref("app.update.certs.1.issuerName", "OU=Equifax Secure Certificate Authority,O=Equifax,C=US"); +pref("app.update.certs.1.commonName", "aus3.mozilla.org"); + +pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); +pref("app.update.certs.2.commonName", "aus3.mozilla.org"); + +// Whether or not app updates are enabled +pref("app.update.enabled", false); + +// This preference turns on app.update.mode and allows automatic download and +// install to take place. We use a separate boolean toggle for this to make +// the UI easier to construct. +pref("app.update.auto", false); + +// Defines how the Application Update Service notifies the user about updates: +// +// AUM Set to: Minor Releases: Major Releases: +// 0 download no prompt download no prompt +// 1 download no prompt download no prompt if no incompatibilities +// 2 download no prompt prompt +// +// See chart in nsUpdateService.js source for more details +// +pref("app.update.mode", 1); + +// If set to true, the Update Service will present no UI for any event. +pref("app.update.silent", false); + +// Update service URL: +pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +// app.update.url.manual is in branding section +// app.update.url.details is in branding section + +// User-settable override to app.update.url for testing purposes. +//pref("app.update.url.override", ""); + +// app.update.interval is in branding section + +// Interval: Time before prompting the user again to restart to install the +// latest download (in seconds) default=1 day +pref("app.update.nagTimer.restart", 86400); + +// Give the user x seconds to react before showing the big UI. default=12 hours +pref("app.update.promptWaitTime", 43200); +// Show the Update Checking/Ready UI when the user was idle for x seconds +pref("app.update.idletime", 60); + +// Whether or not we show a dialog box informing the user that the update was +// successfully applied. This is off in Firefox by default since we show a +// upgrade start page instead! Other apps may wish to show this UI, and supply +// a whatsNewURL field in their brand.properties that contains a link to a page +// which tells users what's new in this new update. +pref("app.update.showInstalledUI", false); + +// 0 = suppress prompting for incompatibilities if there are updates available +// to newer versions of installed addons that resolve them. +// 1 = suppress prompting for incompatibilities only if there are VersionInfo +// updates available to installed addons that resolve them, not newer +// versions. +pref("app.update.incompatible.mode", 0); + +// Symmetric (can be overridden by individual extensions) update preferences. +// e.g. +// extensions.{GUID}.update.enabled +// extensions.{GUID}.update.url +// .. etc .. +// +pref("extensions.update.enabled", true); +pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%"); +pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day +// Non-symmetric (not shared by extensions) extension-specific [update] preferences +pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons"); +pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); +pref("extensions.dss.enabled", false); // Dynamic Skin Switching +pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. + +pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties"); +pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties"); + +pref("xpinstall.whitelist.add", "addons.mozilla.org"); +pref("xpinstall.whitelist.add.36", "getpersonas.com"); + +pref("lightweightThemes.update.enabled", true); + +pref("keyword.enabled", true); +// Override the default keyword.URL. Empty value means +// "use the search service's default engine" +pref("keyword.URL", ""); + +pref("general.useragent.locale", "@AB_CD@"); +pref("general.skins.selectedSkin", "classic/1.0"); +pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@ (like Firefox/@APP_VERSION@)"); +pref("general.smoothScroll", false); +#ifdef UNIX_BUT_NOT_MAC +pref("general.autoScroll", false); +#else +pref("general.autoScroll", true); +#endif + +// Whether or not the application should check at startup each time if it +// is the default browser. +pref("browser.shell.checkDefaultBrowser", true); + +// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session +// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore +pref("browser.startup.page", 1); +pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); + +// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into +// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +// repackager of this code using an alternate snippet url, please keep your users safe +pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); + +pref("browser.enable_automatic_image_resizing", true); +pref("browser.chrome.site_icons", true); +pref("browser.chrome.favicons", true); +// browser.warnOnQuit == false will override all other possible prompts when quitting or restarting +pref("browser.warnOnQuit", true); +pref("browser.warnOnRestart", false); +// browser.showQuitWarning specifically controls the quit warning dialog. We +// might still show the window closing dialog with showQuitWarning == false. +pref("browser.showQuitWarning", false); +pref("browser.fullscreen.autohide", true); +pref("browser.fullscreen.animateUp", 1); +pref("browser.overlink-delay", 70); + +#ifdef UNIX_BUT_NOT_MAC +pref("browser.urlbar.clickSelectsAll", false); +#else +pref("browser.urlbar.clickSelectsAll", true); +#endif +#ifdef UNIX_BUT_NOT_MAC +pref("browser.urlbar.doubleClickSelectsAll", true); +#else +pref("browser.urlbar.doubleClickSelectsAll", false); +#endif +pref("browser.urlbar.autoFill", false); +// 0: Match anywhere (e.g., middle of words) +// 1: Match on word boundaries and then try matching anywhere +// 2: Match only on word boundaries (e.g., after / or .) +// 3: Match at the beginning of the url or title +pref("browser.urlbar.matchBehavior", 1); +pref("browser.urlbar.filter.javascript", true); + +// the maximum number of results to show in autocomplete when doing richResults +pref("browser.urlbar.maxRichResults", 12); +// The amount of time (ms) to wait after the user has stopped typing +// before starting to perform autocomplete. 50 is the default set in +// autocomplete.xml. +pref("browser.urlbar.delay", 50); + +// The special characters below can be typed into the urlbar to either restrict +// the search to visited history, bookmarked, tagged pages; or force a match on +// just the title text or url. +pref("browser.urlbar.restrict.history", "^"); +pref("browser.urlbar.restrict.bookmark", "*"); +pref("browser.urlbar.restrict.tag", "+"); +pref("browser.urlbar.restrict.openpage", "%"); +pref("browser.urlbar.restrict.typed", "~"); +pref("browser.urlbar.match.title", "#"); +pref("browser.urlbar.match.url", "@"); + +// The default behavior for the urlbar can be configured to use any combination +// of the restrict or match filters with each additional filter restricting +// more (intersection). Add the following values to set the behavior as the +// default: 1: history, 2: bookmark, 4: tag, 8: title, 16: url, 32: typed, +// 64: javascript, 128: tabs +// E.g., 0 = show all results (no filtering), 1 = only visited pages in history, +// 2 = only bookmarks, 3 = visited bookmarks, 1+16 = history matching in the url +pref("browser.urlbar.default.behavior", 0); + +// Number of milliseconds to wait for the http headers (and thus +// the Content-Disposition filename) before giving up and falling back to +// picking a filename without that info in hand so that the user sees some +// feedback from their action. +pref("browser.download.saveLinkAsFilenameTimeout", 1000); + +pref("browser.download.useDownloadDir", true); + +#ifdef WINCE +pref("browser.download.folderList", 2); +pref("browser.download.dir", "\\Storage Card"); +#else +pref("browser.download.folderList", 1); +#endif +pref("browser.download.manager.showAlertOnComplete", true); +pref("browser.download.manager.showAlertInterval", 2000); +pref("browser.download.manager.retention", 2); +pref("browser.download.manager.showWhenStarting", true); +pref("browser.download.manager.closeWhenDone", false); +pref("browser.download.manager.focusWhenStarting", false); +pref("browser.download.manager.flashCount", 2); +pref("browser.download.manager.addToRecentDocs", true); +pref("browser.download.manager.quitBehavior", 0); +pref("browser.download.manager.scanWhenDone", true); +pref("browser.download.manager.resumeOnWakeDelay", 10000); + +// search engines URL +pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines"); + +// pointer to the default engine name +pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); + +// disable logging for the search service by default +pref("browser.search.log", false); + +// Ordering of Search Engines in the Engine list. +pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); +pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); +pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); + +// search bar results always open in a new tab +pref("browser.search.openintab", false); + +// send ping to the server to update +pref("browser.search.update", true); + +// disable logging for the search service update system by default +pref("browser.search.update.log", false); + +// Check whether we need to perform engine updates every 6 hours +pref("browser.search.update.interval", 21600); + +// Whether or not microsummary and generator updates are enabled +pref("browser.microsummary.enabled", true); +pref("browser.microsummary.updateGenerators", true); + +// enable search suggestions by default +pref("browser.search.suggest.enabled", true); + +pref("browser.sessionhistory.max_entries", 50); + +// handle links targeting new windows +// 0=default window, 1=current window/tab, 2=new window, 3=new tab in most recent window +pref("browser.link.open_newwindow", 3); + +// 0: no restrictions - divert everything +// 1: don't divert window.open at all +// 2: don't divert window.open with features +pref("browser.link.open_newwindow.restriction", 2); + +// Tabbed browser +#ifndef WINCE +pref("browser.tabs.autoHide", false); +#else +pref("browser.tabs.autoHide", true); +#endif +pref("browser.tabs.closeWindowWithLastTab", true); +pref("browser.tabs.insertRelatedAfterCurrent", true); +pref("browser.tabs.warnOnClose", true); +pref("browser.tabs.warnOnOpen", true); +pref("browser.tabs.maxOpenBeforeWarn", 15); +pref("browser.tabs.loadInBackground", true); +pref("browser.tabs.opentabfor.middleclick", true); +pref("browser.tabs.loadDivertedInBackground", false); +pref("browser.tabs.loadBookmarksInBackground", false); +pref("browser.tabs.tabClipWidth", 140); +pref("browser.tabs.animate", true); +pref("browser.tabs.drawInTitlebar", true); + +// Where to show tab close buttons: +// 0 on active tab only +// 1 on all tabs until tabClipWidth is reached, then active tab only +// 2 no close buttons at all +// 3 at the end of the tabstrip +pref("browser.tabs.closeButtons", 1); + +// When tabs opened by links in other tabs via a combination of +// browser.link.open_newwindow being set to 3 and target="_blank" etc are +// closed: +// true return to the tab that opened this tab (its owner) +// false return to the adjacent tab (old default) +pref("browser.tabs.selectOwnerOnClose", true); + +pref("browser.allTabs.previews", false); +pref("browser.ctrlTab.previews", false); +pref("browser.ctrlTab.recentlyUsedLimit", 7); + +// By default, do not export HTML at shutdown. +// If true, at shutdown the bookmarks in your menu and toolbar will +// be exported as HTML to the bookmarks.html file. +pref("browser.bookmarks.autoExportHTML", false); + +// The maximum number of daily bookmark backups to +// keep in {PROFILEDIR}/bookmarkbackups. Special values: +// -1: unlimited +// 0: no backups created (and deletes all existing backups) +pref("browser.bookmarks.max_backups", 10); + +// Scripts & Windows prefs +pref("dom.disable_open_during_load", true); +pref("javascript.options.showInConsole", true); +#ifdef DEBUG +pref("general.warnOnAboutConfig", false); +#endif + +#ifdef WINCE +// Set the threshold higher to avoid some slow script warnings +pref("dom.max_script_run_time", 20); +#endif + +// This is the pref to control the location bar, change this to true to +// force this - this makes the origin of popup windows more obvious to avoid +// spoofing. We would rather not do it by default because it affects UE for web +// applications, but without it there isn't a really good way to prevent chrome +// spoofing, see bug 337344 +pref("dom.disable_window_open_feature.location", true); +// prevent JS from setting status messages +pref("dom.disable_window_status_change", true); +// allow JS to move and resize existing windows +pref("dom.disable_window_move_resize", false); +// prevent JS from monkeying with window focus, etc +pref("dom.disable_window_flip", true); + +// popups.policy 1=allow,2=reject +pref("privacy.popups.policy", 1); +pref("privacy.popups.usecustom", true); +pref("privacy.popups.showBrowserMessage", true); + +pref("privacy.item.cookies", false); + +pref("privacy.clearOnShutdown.history", true); +pref("privacy.clearOnShutdown.formdata", true); +pref("privacy.clearOnShutdown.passwords", false); +pref("privacy.clearOnShutdown.downloads", true); +pref("privacy.clearOnShutdown.cookies", true); +pref("privacy.clearOnShutdown.cache", true); +pref("privacy.clearOnShutdown.sessions", true); +pref("privacy.clearOnShutdown.offlineApps", false); +pref("privacy.clearOnShutdown.siteSettings", false); + +pref("privacy.cpd.history", true); +pref("privacy.cpd.formdata", true); +pref("privacy.cpd.passwords", false); +pref("privacy.cpd.downloads", true); +pref("privacy.cpd.cookies", true); +pref("privacy.cpd.cache", true); +pref("privacy.cpd.sessions", true); +pref("privacy.cpd.offlineApps", false); +pref("privacy.cpd.siteSettings", false); + +// What default should we use for the time span in the sanitizer: +// 0 - Clear everything +// 1 - Last Hour +// 2 - Last 2 Hours +// 3 - Last 4 Hours +// 4 - Today +pref("privacy.sanitize.timeSpan", 1); +pref("privacy.sanitize.sanitizeOnShutdown", false); + +pref("privacy.sanitize.migrateFx3Prefs", false); + +pref("network.proxy.share_proxy_settings", false); // use the same proxy settings for all protocols + +// simple gestures support +pref("browser.gesture.swipe.left", "Browser:BackOrBackDuplicate"); +pref("browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate"); +pref("browser.gesture.swipe.up", "cmd_scrollTop"); +pref("browser.gesture.swipe.down", "cmd_scrollBottom"); +#ifdef XP_MACOSX +pref("browser.gesture.pinch.latched", true); +pref("browser.gesture.pinch.threshold", 150); +#else +pref("browser.gesture.pinch.latched", false); +pref("browser.gesture.pinch.threshold", 25); +#endif +pref("browser.gesture.pinch.out", ""); +pref("browser.gesture.pinch.in", ""); +pref("browser.gesture.pinch.out.shift", ""); +pref("browser.gesture.pinch.in.shift", ""); +pref("browser.gesture.twist.latched", false); +pref("browser.gesture.twist.threshold", 25); +pref("browser.gesture.twist.right", ""); +pref("browser.gesture.twist.left", ""); +pref("browser.gesture.tap", "cmd_fullZoomReset"); + +// 0=lines, 1=pages, 2=history , 3=text size +#ifdef XP_MACOSX +// On OS X, if the wheel has one axis only, shift+wheel comes through as a +// horizontal scroll event. Thus, we can't assign anything other than normal +// scrolling to shift+wheel. +pref("mousewheel.withshiftkey.action",0); +pref("mousewheel.withshiftkey.sysnumlines",true); +pref("mousewheel.withshiftkey.numlines",1); +pref("mousewheel.withaltkey.action",2); +pref("mousewheel.withaltkey.sysnumlines",false); +pref("mousewheel.withaltkey.numlines",1); +pref("mousewheel.withmetakey.action",0); +pref("mousewheel.withmetakey.sysnumlines",false); +pref("mousewheel.withmetakey.numlines",1); +#else +pref("mousewheel.withshiftkey.action",2); +pref("mousewheel.withshiftkey.sysnumlines",false); +pref("mousewheel.withshiftkey.numlines",1); +pref("mousewheel.withaltkey.action",0); +pref("mousewheel.withaltkey.sysnumlines",false); +pref("mousewheel.withaltkey.numlines",1); +pref("mousewheel.withmetakey.action",0); +pref("mousewheel.withmetakey.sysnumlines",true); +pref("mousewheel.withmetakey.numlines",1); +#endif +pref("mousewheel.withcontrolkey.action",3); +pref("mousewheel.withcontrolkey.sysnumlines",false); +pref("mousewheel.withcontrolkey.numlines",1); + +pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code + +// Customizable toolbar stuff +pref("custtoolbar.personal_toolbar_folder", ""); + +// pref to control the alert notification +pref("alerts.slideIncrement", 1); +pref("alerts.slideIncrementTime", 10); +pref("alerts.totalOpenTime", 4000); + +pref("browser.xul.error_pages.enabled", true); +pref("browser.xul.error_pages.expert_bad_cert", false); + +// Work Offline is best manually managed by the user. +pref("network.manage-offline-status", false); + +// We want to make sure mail URLs are handled externally... +pref("network.protocol-handler.external.mailto", true); // for mail +pref("network.protocol-handler.external.news", true); // for news +pref("network.protocol-handler.external.snews", true); // for secure news +pref("network.protocol-handler.external.nntp", true); // also news +// ...without warning dialogs +pref("network.protocol-handler.warn-external.mailto", false); +pref("network.protocol-handler.warn-external.news", false); +pref("network.protocol-handler.warn-external.snews", false); +pref("network.protocol-handler.warn-external.nntp", false); + +// By default, all protocol handlers are exposed. This means that +// the browser will respond to openURL commands for all URL types. +// It will also try to open link clicks inside the browser before +// failing over to the system handlers. +pref("network.protocol-handler.expose-all", true); +pref("network.protocol-handler.expose.mailto", false); +pref("network.protocol-handler.expose.news", false); +pref("network.protocol-handler.expose.snews", false); +pref("network.protocol-handler.expose.nntp", false); + +// Default security warning dialogs to show once. +pref("security.warn_entering_secure.show_once", false); +pref("security.warn_entering_weak.show_once", true); +pref("security.warn_leaving_secure.show_once", false); +pref("security.warn_viewing_mixed.show_once", true); +pref("security.warn_submit_insecure.show_once", false); + +pref("accessibility.typeaheadfind", false); +pref("accessibility.typeaheadfind.timeout", 5000); +pref("accessibility.typeaheadfind.linksonly", false); +pref("accessibility.typeaheadfind.flashBar", 1); + +// plugin finder service url +pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + +// by default we show an infobar message when pages require plugins the user has not installed, or are outdated +pref("plugins.hide_infobar_for_missing_plugin", false); +pref("plugins.hide_infobar_for_outdated_plugin", false); + +#ifdef XP_MACOSX +pref("plugins.hide_infobar_for_carbon_failure_plugin", false); +#endif + +pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/"); +pref("plugins.update.notifyUser", false); + +#ifdef XP_WIN +pref("browser.preferences.instantApply", false); +#else +pref("browser.preferences.instantApply", true); +#endif +#ifdef XP_MACOSX +pref("browser.preferences.animateFadeIn", true); +#else +pref("browser.preferences.animateFadeIn", false); +#endif + +pref("browser.download.show_plugins_in_list", true); +pref("browser.download.hide_plugins_without_extensions", true); + +// Backspace and Shift+Backspace behavior +// 0 goes Back/Forward +// 1 act like PgUp/PgDown +// 2 and other values, nothing +#ifdef UNIX_BUT_NOT_MAC +pref("browser.backspace_action", 2); +#else +pref("browser.backspace_action", 0); +#endif + +// this will automatically enable inline spellchecking (if it is available) for +// editable elements in HTML +// 0 = spellcheck nothing +// 1 = check multi-line controls [default] +// 2 = check multi/single line controls +pref("layout.spellcheckDefault", 1); + +pref("browser.send_pings", false); + +/* initial web feed readers list */ +pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); +pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); +pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); +pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); +pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); +pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); +pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); + +pref("browser.feeds.handler", "ask"); +pref("browser.videoFeeds.handler", "ask"); +pref("browser.audioFeeds.handler", "ask"); + +// At startup, if the handler service notices that the version number in the +// region.properties file is newer than the version number in the handler +// service datastore, it will add any new handlers it finds in the prefs (as +// seeded by this file) to its datastore. +pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); + +// The default set of web-based protocol handlers shown in the application +// selection dialog for webcal: ; I've arbitrarily picked 4 default handlers +// per protocol, but if some locale wants more than that (or defaults for some +// protocol not currently listed here), we should go ahead and add those. + +// webcal +pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); + +// mailto +pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); + +// irc +pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); + +// ircs +pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); +pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); + +// By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 +pref("gecko.handlerService.allowRegisterFromDifferentHost", false); + +#ifdef MOZ_SAFE_BROWSING +// Safe browsing does nothing unless this pref is set +pref("browser.safebrowsing.enabled", true); + +// Prevent loading of pages identified as malware +pref("browser.safebrowsing.malware.enabled", true); + +// Non-enhanced mode (local url lists) URL list to check for updates +pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2"); + +pref("browser.safebrowsing.dataProvider", 0); + +// Does the provider name need to be localizable? +pref("browser.safebrowsing.provider.0.name", "Google"); +pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2"); +pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); +pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2"); + +// HTML report pages +pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}"); +pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}"); +pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}"); +pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}"); +pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}"); + +// FAQ URLs +pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/"); +pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/"); + +// Name of the about: page contributed by safebrowsing to handle display of error +// pages on phishing/malware hits. (bug 399233) +pref("urlclassifier.alternate_error_page", "blocked"); + +// The number of random entries to send with a gethash request. +pref("urlclassifier.gethashnoise", 4); + +// The list of tables that use the gethash request to confirm partial results. +pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); + +// If an urlclassifier table has not been updated in this number of seconds, +// a gethash request will be forced to check that the result is still in +// the database. +pref("urlclassifier.confirm-age", 2700); + +#ifdef MOZ_WIDGET_GTK2 +#define RESTRICT_CACHEMAX +#endif +#ifdef XP_OS2 +#define RESTRICT_CACHEMAX +#endif + +// Maximum size of the sqlite3 cache during an update, in bytes +#ifdef RESTRICT_CACHEMAX +pref("urlclassifier.updatecachemax", 104857600); +#else +pref("urlclassifier.updatecachemax", -1); +#endif + +// URL for checking the reason for a malware warning. +pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); + +#endif + +pref("browser.EULA.version", 3); +pref("browser.rights.version", 3); +pref("browser.rights.3.shown", false); + +#ifdef DEBUG +// Don't show the about:rights notification in debug builds. +pref("browser.rights.override", true); +#endif + +#ifdef WINCE +pref("browser.sessionstore.resume_from_crash", false); +#else +pref("browser.sessionstore.resume_from_crash", true); +#endif +pref("browser.sessionstore.resume_session_once", false); + +// minimal interval between two save operations in milliseconds +pref("browser.sessionstore.interval", 15000); +// maximum amount of POSTDATA to be saved in bytes per history entry (-1 = all of it) +// (NB: POSTDATA will be saved either entirely or not at all) +pref("browser.sessionstore.postdata", 0); +// on which sites to save text data, POSTDATA and cookies +// 0 = everywhere, 1 = unencrypted sites, 2 = nowhere +pref("browser.sessionstore.privacy_level", 0); +// the same as browser.sessionstore.privacy_level, but for saving deferred session data +pref("browser.sessionstore.privacy_level_deferred", 1); +// how many tabs can be reopened (per window) +pref("browser.sessionstore.max_tabs_undo", 10); +// how many windows can be reopened (per session) - on non-OS X platforms this +// pref may be ignored when dealing with pop-up windows to ensure proper startup +pref("browser.sessionstore.max_windows_undo", 3); +// number of crashes that can occur before the about:sessionrestore page is displayed +// (this pref has no effect if more than 6 hours have passed since the last crash) +pref("browser.sessionstore.max_resumed_crashes", 1); +// The number of tabs that can restore concurrently: +// < 0 = All tabs can restore at the same time +// 0 = Only the selected tab in each window will be restored +// Other tabs won't be restored until they are selected +// N = The number of tabs to restore at the same time +pref("browser.sessionstore.max_concurrent_tabs", 3); + +// allow META refresh by default +pref("accessibility.blockautorefresh", false); + +// Whether history is enabled or not. +pref("places.history.enabled", true); + +// The percentage of system memory that the Places database can use. Out of the +// allowed cache size it will at most use the size of the database file. +// Changes to this value are effective after an application restart. +// Acceptable values are between 0 and 50. +pref("places.database.cache_to_memory_percentage", 6); + +// the (maximum) number of the recent visits to sample +// when calculating frecency +pref("places.frecency.numVisits", 10); + +// buckets (in days) for frecency calculation +pref("places.frecency.firstBucketCutoff", 4); +pref("places.frecency.secondBucketCutoff", 14); +pref("places.frecency.thirdBucketCutoff", 31); +pref("places.frecency.fourthBucketCutoff", 90); + +// weights for buckets for frecency calculations +pref("places.frecency.firstBucketWeight", 100); +pref("places.frecency.secondBucketWeight", 70); +pref("places.frecency.thirdBucketWeight", 50); +pref("places.frecency.fourthBucketWeight", 30); +pref("places.frecency.defaultBucketWeight", 10); + +// bonus (in percent) for visit transition types for frecency calculations +pref("places.frecency.embedVisitBonus", 0); +pref("places.frecency.framedLinkVisitBonus", 0); +pref("places.frecency.linkVisitBonus", 100); +pref("places.frecency.typedVisitBonus", 2000); +pref("places.frecency.bookmarkVisitBonus", 75); +pref("places.frecency.downloadVisitBonus", 0); +pref("places.frecency.permRedirectVisitBonus", 0); +pref("places.frecency.tempRedirectVisitBonus", 0); +pref("places.frecency.defaultVisitBonus", 0); + +// bonus (in percent) for place types for frecency calculations +pref("places.frecency.unvisitedBookmarkBonus", 140); +pref("places.frecency.unvisitedTypedBonus", 200); + +// Controls behavior of the "Add Exception" dialog launched from SSL error pages +// 0 - don't pre-populate anything +// 1 - pre-populate site URL, but don't fetch certificate +// 2 - pre-populate site URL and pre-fetch certificate +pref("browser.ssl_override_behavior", 2); + +// Controls the display of domain in the identity box for SSL connections. +// 0 - do not show domain +// 1 - show effectiveTLD + 1 (e.g. mozilla.org) +// 2 - show full domain (e.g. bugzilla.mozilla.org) +pref("browser.identity.ssl_domain_display", 1); + +// True if the user should be prompted when a web application supports +// offline apps. +pref("browser.offline-apps.notify", true); + +// if true, use full page zoom instead of text zoom +pref("browser.zoom.full", true); + +// Whether or not to save and restore zoom levels on a per-site basis. +pref("browser.zoom.siteSpecific", true); + +// Whether or not to update background tabs to the current zoom level. +pref("browser.zoom.updateBackgroundTabs", true); + +// The breakpad report server to link to in about:crashes +pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/"); + +// base URL for web-based support pages +pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/"); + +// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror) +pref("security.alternate_certificate_error_page", "certerror"); + +// Whether to start the private browsing mode at application startup +pref("browser.privatebrowsing.autostart", false); + +// Whether we should skip prompting before starting the private browsing mode +pref("browser.privatebrowsing.dont_prompt_on_enter", false); + +// Don't try to alter this pref, it'll be reset the next time you use the +// bookmarking dialog +pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); + +// base url for the wifi geolocation network provider +pref("geo.wifi.uri", "http://geomena.org"); +pref("geo.wifi.protocol", 0); + +#ifdef WINCE + +// tweak awesomebar -- increase the delay until a search happens. +pref("browser.urlbar.delay", 250); + +// disable safe browsing, due to perf hit +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); + +// don't check for default browser +pref("browser.shell.checkDefaultBrowser", false); + +// disable bfcache for memory +pref("browser.sessionhistory.max_total_viewers", 0); + +pref("browser.sessionhistory.optimize_eviction", false); + +// tweak default content sink prefs +pref("content.sink.interactive_deflect_count", 10); /* default 0 */ +pref("content.sink.perf_deflect_count", 50); /* default 200 */ +pref("content.sink.interactive_parse_time", 5000); /* default 3000 */ +pref("content.sink.perf_parse_time", 150000); /* default 360000 */ +pref("content.sink.pending_event_mode", 0); /* default 1 */ +pref("content.sink.event_probe_rate", 1); /* default 1 */ +pref("content.sink.interactive_time", 750000); /* default 750000 */ +pref("content.sink.initial_perf_time", 500000); /* default 2000000 */ +pref("content.sink.enable_perf_mode", 0); /* default 0; 0 == switch, 1 == stay interactive, 2 == stay perf */ + +// Write sessionstore.js less often +pref("browser.sessionstore.interval", 60000); + +#endif /* WINCE */ + +// Whether to use a panel that looks like an OS X sheet for customization +#ifdef XP_MACOSX +pref("toolbar.customization.usesheet", true); +#else +pref("toolbar.customization.usesheet", false); +#endif + +// The default for this pref reflects whether the build is capable of IPC. +// (Turning it on in a no-IPC build will have no effect.) +#ifdef XP_MACOSX +// i386 ipc preferences +pref("dom.ipc.plugins.enabled.i386", false); +pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true); +pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true); +// x86_64 ipc preferences +pref("dom.ipc.plugins.enabled.x86_64", true); +#elifdef MOZ_IPC +pref("dom.ipc.plugins.enabled", true); +#else +pref("dom.ipc.plugins.enabled", false); +#endif + +#ifdef XP_WIN +#ifndef WINCE +pref("browser.taskbar.previews.enable", false); +pref("browser.taskbar.previews.max", 20); +pref("browser.taskbar.previews.cachetime", 5); +pref("browser.taskbar.lists.enabled", true); +pref("browser.taskbar.lists.frequent.enabled", true); +pref("browser.taskbar.lists.recent.enabled", false); +pref("browser.taskbar.lists.maxListItemCount", 7); +pref("browser.taskbar.lists.tasks.enabled", true); +pref("browser.taskbar.lists.refreshInSeconds", 120); +#endif +#endif + +#ifdef MOZ_SERVICES_SYNC +// The sync engines to use. +pref("services.sync.registerEngines", "Bookmarks,Form,History,Password,Prefs,Tab"); +// Preferences to be synced by default +pref("services.sync.prefs.sync.accessibility.blockautorefresh", true); +pref("services.sync.prefs.sync.accessibility.browsewithcaret", true); +pref("services.sync.prefs.sync.accessibility.typeaheadfind", true); +pref("services.sync.prefs.sync.accessibility.typeaheadfind.linksonly", true); +pref("services.sync.prefs.sync.app.update.mode", true); +pref("services.sync.prefs.sync.browser.download.manager.closeWhenDone", true); +pref("services.sync.prefs.sync.browser.download.manager.retention", true); +pref("services.sync.prefs.sync.browser.download.manager.scanWhenDone", true); +pref("services.sync.prefs.sync.browser.download.manager.showWhenStarting", true); +pref("services.sync.prefs.sync.browser.formfill.enable", true); +pref("services.sync.prefs.sync.browser.link.open_newwindow", true); +pref("services.sync.prefs.sync.browser.offline-apps.notify", true); +pref("services.sync.prefs.sync.browser.safebrowsing.enabled", true); +pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true); +pref("services.sync.prefs.sync.browser.search.selectedEngine", true); +pref("services.sync.prefs.sync.browser.search.update", true); +pref("services.sync.prefs.sync.browser.startup.homepage", true); +pref("services.sync.prefs.sync.browser.startup.page", true); +pref("services.sync.prefs.sync.browser.tabs.autoHide", true); +pref("services.sync.prefs.sync.browser.tabs.closeButtons", true); +pref("services.sync.prefs.sync.browser.tabs.loadInBackground", true); +pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true); +pref("services.sync.prefs.sync.browser.tabs.warnOnOpen", true); +pref("services.sync.prefs.sync.browser.urlbar.autocomplete.enabled", true); +pref("services.sync.prefs.sync.browser.urlbar.autoFill", true); +pref("services.sync.prefs.sync.browser.urlbar.default.behavior", true); +pref("services.sync.prefs.sync.browser.urlbar.maxRichResults", true); +pref("services.sync.prefs.sync.dom.disable_open_during_load", true); +pref("services.sync.prefs.sync.dom.disable_window_flip", true); +pref("services.sync.prefs.sync.dom.disable_window_move_resize", true); +pref("services.sync.prefs.sync.dom.event.contextmenu.enabled", true); +pref("services.sync.prefs.sync.extensions.personas.current", true); +pref("services.sync.prefs.sync.extensions.update.enabled", true); +pref("services.sync.prefs.sync.general.smoothScroll", true); +pref("services.sync.prefs.sync.intl.accept_languages", true); +pref("services.sync.prefs.sync.javascript.enabled", true); +pref("services.sync.prefs.sync.layout.spellcheckDefault", true); +pref("services.sync.prefs.sync.lightweightThemes.isThemeSelected", true); +pref("services.sync.prefs.sync.lightweightThemes.usedThemes", true); +pref("services.sync.prefs.sync.network.cookie.cookieBehavior", true); +pref("services.sync.prefs.sync.network.cookie.lifetimePolicy", true); +pref("services.sync.prefs.sync.permissions.default.image", true); +pref("services.sync.prefs.sync.pref.advanced.images.disable_button.view_image", true); +pref("services.sync.prefs.sync.pref.advanced.javascript.disable_button.advanced", true); +pref("services.sync.prefs.sync.pref.downloads.disable_button.edit_actions", true); +pref("services.sync.prefs.sync.pref.privacy.disable_button.cookie_exceptions", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.cache", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.cookies", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.downloads", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.formdata", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.history", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.offlineApps", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.passwords", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true); +pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true); +pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true); +pref("services.sync.prefs.sync.security.OCSP.disable_button.managecrl", true); +pref("services.sync.prefs.sync.security.OCSP.enabled", true); +pref("services.sync.prefs.sync.security.OCSP.require", true); +pref("services.sync.prefs.sync.security.default_personal_cert", true); +pref("services.sync.prefs.sync.security.enable_ssl3", true); +pref("services.sync.prefs.sync.security.enable_tls", true); +pref("services.sync.prefs.sync.security.warn_entering_secure", true); +pref("services.sync.prefs.sync.security.warn_entering_weak", true); +pref("services.sync.prefs.sync.security.warn_leaving_secure", true); +pref("services.sync.prefs.sync.security.warn_submit_insecure", true); +pref("services.sync.prefs.sync.security.warn_viewing_mixed", true); +pref("services.sync.prefs.sync.signon.rememberSignons", true); +pref("services.sync.prefs.sync.spellchecker.dictionary", true); +pref("services.sync.prefs.sync.xpinstall.whitelist.required", true); +#endif + +// Disable the error console and inspector +pref("devtools.errorconsole.enabled", false); +pref("devtools.inspector.enabled", false); + +// The last Web Console height. This is initially 0 which means that the Web +// Console will use the default height next time it shows. +// Change to -1 if you do not want the Web Console to remember its last height. +pref("devtools.hud.height", 0); + +// Whether the character encoding menu is under the main Firefox button. This +// preference is a string so that localizers can alter it. +pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties"); + +// Allow using tab-modal prompts when possible. +pref("prompts.tab_modal.enabled", true); +// Whether the Panorama should animate going in/out of tabs +pref("browser.panorama.animate_zoom", true); diff --git a/~lukeshu/iceweasel-libre-current/iceweasel.install b/~lukeshu/iceweasel-libre-current/iceweasel.install new file mode 100644 index 000000000..376600ec2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/iceweasel.install @@ -0,0 +1,21 @@ +#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat" +post_install () { + echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session" + echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories" + update-desktop-database -q +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + +#op=$1 +#shift + +#$op $* diff --git a/~lukeshu/iceweasel-libre-current/internet-archive.xml b/~lukeshu/iceweasel-libre-current/internet-archive.xml new file mode 100644 index 000000000..1556a2d8c --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/internet-archive.xml @@ -0,0 +1,12 @@ + +Internet Archive +Search www.archive.org +ISO-8859-1 +data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7 +7 +http://mycroft.mozdev.org/update.php/id0/archive.src +http://mycroft.mozdev.org/update.php/id0/archive.gif +http://www.archive.org/ + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/jamendo-en.xml b/~lukeshu/iceweasel-libre-current/jamendo-en.xml new file mode 100644 index 000000000..91d6df6e4 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/jamendo-en.xml @@ -0,0 +1,12 @@ + +Jamendo (en) +Search Jamendo.com English site for downloadable Creative Commons music +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg== +7 +http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml +http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico +http://www.jamendo.com/en + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/libre.patch b/~lukeshu/iceweasel-libre-current/libre.patch new file mode 100644 index 000000000..e29e22a67 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/libre.patch @@ -0,0 +1,391 @@ +diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + +-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + pref("keyword.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + +-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + pref("keyword.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js +--- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + browser.search.order.2=Yahoo + browser.search.order.3=Bing + +@@ -17,7 +17,7 @@ + # 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=http://duckduck.go.com/?q={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 +diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in +--- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 +@@ -11,14 +11,12 @@ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ +-
@latest_headlines@ ++
ConnochaetOS +

+

@firefox_heading@

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Free Software Foundation ++
LibrePlanet ++
Free addons +

+

+diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html +--- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ +

+

+ <a> anchor
+- <a> a + href ++ <a> a + href +

+

+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul +--- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ +-
@latest_headlines@ ++
ConnochaetOS +

+

@firefox_heading@

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Free Software Foundation ++
LibrePlanet ++
Free addons +

+

+diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html +--- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ +

+

+ <a> anchor
+- <a> a + href ++ <a> a + href +

+

+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul +--- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +

@bookmarks_toolbarfolder@

-
@bookmarks_toolbarfolder_description@ -

--

@getting_started@ --
@latest_headlines@ -+
ConnochaetOS -

-

@firefox_heading@

-

--

@firefox_help@ --
@firefox_customize@ --
@firefox_community@ --
@firefox_about@ -+
Free Software Foundation -+
LibrePlanet -+
Free addons -

-

-diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html ---- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 -+++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 -@@ -143,7 +143,7 @@ -

-

- <a> anchor
-- <a> a + href -+ <a> a + href -

-

- <abbr> abbr - extended text when mouseover.
-diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul ---- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 -+++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 -@@ -301,6 +301,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - - -- -+ -