From 51867161079ab52d5152105142a3bc965c63ca03 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Nov 2012 02:31:56 -0800 Subject: Fri Nov 30 02:29:05 PST 2012 --- community/nestopia/PKGBUILD | 9 +- community/parrot/PKGBUILD | 10 +- community/supercollider/PKGBUILD | 14 +-- community/supercollider/supercollider.install | 1 + core/iputils/PKGBUILD | 14 +-- core/libevent/PKGBUILD | 8 +- extra/avahi/PKGBUILD | 13 +- extra/dovecot/PKGBUILD | 11 +- extra/gdb/PKGBUILD | 8 +- extra/live-media/PKGBUILD | 6 +- extra/nmap/PKGBUILD | 19 +-- extra/pigeonhole/PKGBUILD | 43 +++++++ extra/pigeonhole/dovecot.conf | 1 + libre/clementine-libre/PKGBUILD | 8 +- .../remove-and-disable-spotify.patch | 8 -- libre/iceape-libre/PKGBUILD | 2 +- libre/iceape-libre/libre.patch | 67 +++++------ libre/icecat/PKGBUILD | 4 +- libre/icecat/libre.patch | 133 +++++++-------------- libre/kdebase-runtime-libre/PKGBUILD | 2 +- 20 files changed, 177 insertions(+), 204 deletions(-) create mode 100644 extra/pigeonhole/PKGBUILD create mode 100644 extra/pigeonhole/dovecot.conf diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index d03528a26..b0fee1ae2 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77858 2012-10-15 10:08:57Z spupykin $ +# $Id: PKGBUILD 80697 2012-11-29 16:17:59Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tiago Pierezan Camargo # Contributor: robb_force pkgname=nestopia -pkgver=1.42 -pkgrel=4 +pkgver=1.43 +pkgrel=1 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://0ldsk00l.ca/nestopia.html' license=('GPL') @@ -14,12 +14,13 @@ depends=('sdl' 'alsa-lib' 'gtk3' 'glu') makedepends=('unzip' 'mesa') source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" "build-fix.patch") -md5sums=('ce7ffba59f19c764f08546e015777172' +md5sums=('c73d45015eb16b9870a620a188a23275' '49dc5a51243a023b47f25ff3d6aabd89') build() { cd ${srcdir}/rdanbrook-nestopia-* patch -p1 <$srcdir/build-fix.patch + export LDFLAGS=-lX11 make PREFIX=/usr -j1 } diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 341337458..50c62f78e 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80286 2012-11-19 12:16:58Z spupykin $ +# $Id: PKGBUILD 80699 2012-11-29 16:18:21Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: mpie pkgname=parrot -pkgver=4.9.0 -_rel=stable -#_rel=devel +pkgver=4.10.0 +#_rel=stable +_rel=devel pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('ca42f4fbcc734e4cf354117cd7c073b0') +md5sums=('aab3d07aecfe821a792421fb4fb88a4f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 4b72c2f07..64062b8a4 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,32 +1,28 @@ -# $Id: PKGBUILD 79411 2012-11-04 16:42:49Z speps $ +# $Id: PKGBUILD 80709 2012-11-30 03:35:13Z speps $ # Maintainer : speps # Contributor: _name=SuperCollider pkgname=supercollider -pkgver=3.5.6 +pkgver=3.6.1 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') url="http://supercollider.sourceforge.net/" license=('GPL3') -depends=('jack' 'fftw' 'icu' 'cwiid' 'curl' 'qtwebkit') +depends=('jack' 'fftw' 'cwiid' 'qtwebkit') makedepends=('cmake' 'ruby' 'vim' 'emacs') optdepends=('emacs: emacs interface' 'gedit: gedit interface' 'vim: vim interface' 'ruby: vim support') install="$pkgname.install" -source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('d76b61fad8d0a1242905c5efb46e23b6') +source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") +md5sums=('9ac8f563d885cef66b2365949eb666d1') build() { cd "$srcdir/$_name-Source" - ## glibc 2.16 + boost 1.49 fix - # https://svn.boost.org/trac/boost/ticket/6940 - sed -i "s/TIME_UTC/&_/" `grep -rl TIME_UTC .` - [ -d bld ] || mkdir bld && cd bld cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release diff --git a/community/supercollider/supercollider.install b/community/supercollider/supercollider.install index 78ec45794..32bd4537c 100644 --- a/community/supercollider/supercollider.install +++ b/community/supercollider/supercollider.install @@ -1,4 +1,5 @@ post_install() { + update-desktop-database -q update-mime-database usr/share/mime } diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 154d4ae0a..7ad2b8048 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171270 2012-11-16 23:40:29Z stephane $ +# $Id: PKGBUILD 172113 2012-11-29 11:07:07Z stephane $ # Maintainer: Stéphane Gaudreault # Maintainer: Tobias Powalowski # Contributor: Aaron Griffin pkgname=iputils -pkgver=20121114 +pkgver=20121126 pkgrel=1 pkgdesc="Network monitoring tools, including ping" arch=('i686' 'x86_64') @@ -19,17 +19,13 @@ replaces=('netkit-base') backup=(etc/xinetd.d/tftp) install=${pkgname}.install source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 - tftp.xinetd - iputils-20121114-free-unintialized.patch) -sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d' - 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' - '7f1262f4bed7fa122ea86f09cb81d817adbd8164') + tftp.xinetd) +sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2' + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') build() { cd "${srcdir}/${pkgname}-s${pkgver}" - patch -Np1 -i ../iputils-20121114-free-unintialized.patch - # Use our CFLAGS sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD index ae314ac2e..4c5214d07 100644 --- a/core/libevent/PKGBUILD +++ b/core/libevent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165854 2012-09-01 15:27:36Z tomegun $ +# $Id: PKGBUILD 172139 2012-11-30 00:38:49Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Judd pkgname=libevent -pkgver=2.0.20 +pkgver=2.0.21 pkgrel=1 pkgdesc="An event notification library" arch=('i686' 'x86_64') @@ -30,5 +30,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" make DESTDIR="${pkgdir}" install } -md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e' - '5310233871ef2f2b3536114bf0377a42') +md5sums=('b2405cc9ebf264aa47ff615d9de527a2' + '31ffa4efc611c452697bd120a3bf8f9e') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 4b20f73a1..4e500bf48 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 166539 2012-09-10 04:37:24Z bisson $ +# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $ # Contributor: Douglas Soares de Andrade # Maintainer: Gaetan Bisson pkgname=avahi pkgver=0.6.31 -pkgrel=4 +pkgrel=5 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64') options=('!libtool' '!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') -optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' +depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') +optdepends=('dbus: communicating with client applications' + 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' 'qt: qt bindings' 'pygtk: avahi-bookmarks, avahi-discover' 'twisted: avahi-bookmarks' 'mono: mono bindings' - 'dbus-python: avahi-discover' + 'python2-dbus: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus' 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman') backup=('etc/avahi/hosts' 'etc/avahi/avahi-daemon.conf' diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 96f7ac061..2628e71a0 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170236 2012-11-05 18:50:40Z andyrtr $ +# $Id: PKGBUILD 172133 2012-11-29 19:39:59Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) # Contributor: GARETTE Emmanuel pkgname=dovecot -pkgver=2.1.10 +pkgver=2.1.11 pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -22,8 +22,8 @@ install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh dovecot.tmpfilesd) -md5sums=('a5a4b3c444cf37e2c6bb6df3af87e18e' - '9327f77a0090e7d389cf9f3b35ae7c04' +md5sums=('28443208243171423437daaf89db7e18' + 'b3dd87d3dac492c172c0f399a82e88df' '587159e84e2da6f83d70b3c706ba87cc' '342a28251d40f983c98c0d1f1bf3d07d') @@ -79,4 +79,7 @@ package() { # systemd tmpfile install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf + + # fix some missing quotes that make pigeonhole fail to build + sed -i "s:LIBDOVECOT_LOGIN=-ldovecot-login -lssl -lcrypto:LIBDOVECOT_LOGIN=\'-ldovecot-login -lssl -lcrypto \':" ${pkgdir}/usr/lib/dovecot/dovecot-config } diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 034a01a0e..6e0648ba4 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165406 2012-08-18 05:25:03Z allan $ +# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $ # Maintainer: Allan McRae # Contributor: Jan de Groot pkgname=gdb -pkgver=7.5 +pkgver=7.5.1 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('24a6779a9fe0260667710de1b082ef61' - 'c1d42158075135b539ecba166987bc15') +md5sums=('3f48f468b24447cf24820054ff6e85b1' + '31ab569c78a01d3f946c6fe0336175fe') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index c8214de25..5dbbb01c4 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171909 2012-11-23 09:55:00Z giovanni $ +# $Id: PKGBUILD 172118 2012-11-29 17:09:42Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.11.22 +pkgver=2012.11.29 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('ab793b94629c3d52193fa7b9c09902b3') +md5sums=('42000c39b2a9beadef1f1a641897f61f') build() { cd ${srcdir}/live diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index 1609326b3..e8a07b55a 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $ +# $Id: PKGBUILD 172141 2012-11-30 02:54:16Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Hugo Doria pkgname=nmap -pkgver=6.01 -pkgrel=2 +pkgver=6.25 +pkgrel=1 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64') @@ -13,20 +13,12 @@ license=('GPL') makedepends=('pygtk') optdepends=('pygtk: zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') -source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'kdesu.patch') -sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a' - '159bc1243564d3a9dee820291bf07168870cbaf6') +source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Show icon only if runnable; see FS#12045 - echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop - echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop - - patch -p1 -i ../kdesu.patch # FS#31158 - ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -37,6 +29,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install rm "${pkgdir}"/usr/bin/uninstall_zenmap diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD new file mode 100644 index 000000000..45de7f3cc --- /dev/null +++ b/extra/pigeonhole/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 172134 2012-11-29 19:40:00Z andyrtr $ +# Maintainer: Andreas Radke + +# Contributorr: Peter Lewis +# Contributor: Sebastian Köhler + +# This must be built against the version of dovecot being used, +# else mail delivery will fail. +# Specify the version of dovecot to be used here: +_dcpkgver=2.1.11 +# Make sure to bump pkgrel if changing this. + +pkgname=pigeonhole +pkgver=0.3.3 +pkgrel=2 +pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" +arch=('i686' 'x86_64') +url="http://pigeonhole.dovecot.org/" +license=('LGPL') +depends=('dovecot='$_dcpkgver) +conflicts=('dovecot-sieve' 'pigeonhole-hg') +source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} + "dovecot.conf") +options=('!libtool') +sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e' + '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec' + 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') + +build() { + cd "$srcdir/dovecot-2.1-$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-dovecot=/usr/lib/dovecot \ + --disable-static + make +} + +package() { + cd "$srcdir/dovecot-2.1-$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf" +} diff --git a/extra/pigeonhole/dovecot.conf b/extra/pigeonhole/dovecot.conf new file mode 100644 index 000000000..061a50c90 --- /dev/null +++ b/extra/pigeonhole/dovecot.conf @@ -0,0 +1 @@ +/usr/lib/dovecot diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 7c231fe27..053a38d1e 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -27,7 +27,7 @@ provides=("clementine=$pkgver") source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz remove-and-disable-spotify.patch) sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e' - '3980a00c02e406226f0d08ae9b7e581702c89838') + '4d336b6a42100a268e4d905b9596453f396fb649') install=clementine.install build() { @@ -44,7 +44,9 @@ build() { rm -v data/icons/svg/spotify.svg rm -v data/schema/schema-30.sql rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - + + # Create a blank file due that is a dependency for clementine + touch data/schema/schema-30.sql cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch index e006e14c5..a9352b275 100644 --- a/libre/clementine-libre/remove-and-disable-spotify.patch +++ b/libre/clementine-libre/remove-and-disable-spotify.patch @@ -121,14 +121,6 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc icons/48x48/view-choose.png icons/48x48/view-fullscreen.png icons/48x48/view-media-equalizer.png -@@ -318,7 +314,6 @@ - schema/schema-28.sql - schema/schema-29.sql - schema/schema-2.sql -- schema/schema-30.sql - schema/schema-31.sql - schema/schema-32.sql - schema/schema-33.sql @@ -339,7 +334,6 @@ smartplaylistsearchterm.css songinfo.css diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 2325b8cd7..2595a36f9 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - 'ed7a06c9e73a9f3e023d7bff9878504b') + 'ebe66195898c89644138ffc88ba26a24') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 9947b1bbe..6273a05a9 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -1,28 +1,24 @@ --- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200 -+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 23:23:02.484406177 -0300 -@@ -1,23 +1,23 @@ ++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-29 22:19:37.998383034 -0200 +@@ -1,23 +1,16 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -+browser.search.order.1=Duck Duck Go (HTML) -+browser.search.order.2=Seeks Search -+browser.search.order.3=YaCy - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -33,25 +29,20 @@ # 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 -@@ -27,19 +27,19 @@ +@@ -26,20 +19,10 @@ + # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 - # The default set of protocol handlers for webcal: +-# The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank - - # The default set of protocol handlers for mailto: +- +-# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank - +- # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s @@ -118,9 +109,9 @@ ---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:28:27.000000000 -0300 -+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:52:31.135268099 -0300 -@@ -4,10 +4,10 @@ +--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 21:25:41.879931999 -0200 ++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 22:25:15.125790092 -0200 +@@ -4,18 +4,11 @@ # browser.startup.homepage=about: browser.throbber.url=about: @@ -129,35 +120,31 @@ -browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= -browser.translation.serviceDomain=translate.google.com -+browser.translation.service=about:blank ++browser.translation.service=about: +browser.translation.serviceDomain= #config.js # -@@ -15,7 +15,7 @@ - - # This is the default set of web based feed handlers shown in the reader - # selection UI + startup.homepage_override_url=about: +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank --- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-06-15 23:46:27.744272972 -0300 ++++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-11-29 22:26:25.271781371 -0200 @@ -1,10 +1,10 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Google -browser.search.order.2=Yahoo -+browser.search.order.1=Duck Duck Go (HTML) -+browser.search.order.2=Seeks Search ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite # More information about this update link available in the update wizard. # Only change this if you are providing localized release notes. diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cb4ef9688..822f800f2 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,7 +16,7 @@ _pgo=false pkgname=icecat pkgver=14.0 -pkgrel=3 +pkgrel=4 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' arch=(i686 x86_64 mips64el) license=(GPL2 MPL LGPL) @@ -79,7 +79,7 @@ md5sums=( 3117865902d1a20ab61d75707be9888e ac29b01c189f20abae2f3eef1618ffc0 3009b176cc5f9b1e416b1bf7c45b064b - 0fe48b455f9b0ad7993071cd766b3bbf + 0119cc83435b192e78160f97ad2da9ea e81ad01dbc16ba28bf92ba4b7c309ca7 d93fe402b87cd000a869e1fd6badc6c9 b320085e7effa2890a79f4f45760614b diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index b5a9acc0b..1f0d4306e 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,3 +1,10 @@ +diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties +--- a/browser/branding/unofficial/locales/browserconfig.properties ++++ b/browser/branding/unofficial/locales/browserconfig.properties +@@ -1,2 +1,2 @@ + # Do NOT localize or otherwise change these values +-browser.startup.homepage=http://gnuzilla.gnu.org ++browser.startup.homepage=about:home diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -9,15 +16,6 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js 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"); -@@ -87,7 +88,7 @@ - pref("extensions.update.autoUpdateDefault", true); - - // 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 diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js --- a/browser/base/content/abouthome/aboutHome.js +++ b/browser/base/content/abouthome/aboutHome.js @@ -129,47 +127,39 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a @@ -143,7 +45,7 @@ // The part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ -- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" + "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" -, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" -+ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1" +, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2" ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -1,28 +1,28 @@ +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2012-08-21 21:53:59.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-30 01:17:50.561255302 -0200 +@@ -1,28 +1,16 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Duck Duck Go -browser.search.order.2=Google -browser.search.order.3=Yahoo -+browser.search.order.1=Duck Duck Go (HTML) -+browser.search.order.2=Seeks Search -+browser.search.order.3=YaCy - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Bloglines -browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s -browser.contentHandlers.types.1.title=My Yahoo -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.2.title=Google -browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank -+browser.contentHandlers.types.2.title= -+browser.contentHandlers.types.2.uri=about:blank - - # Keyword URL (for location bar searches) +- +-# Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/html/?q= ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -180,21 +170,11 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow # 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 -@@ -30,3 +30,21 @@ +@@ -30,3 +18,11 @@ # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 + -+# The default set of protocol handlers for webcal: -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank -+ -+# The default set of protocol handlers for mailto: -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank -+ +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ @@ -291,52 +271,49 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties ---- a/mobile/locales/en-US/chrome/region.properties -+++ b/mobile/locales/en-US/chrome/region.properties -@@ -1,18 +1,18 @@ +--- a/mobile/locales/en-US/chrome/region.properties 2012-08-21 21:53:59.000000000 -0300 ++++ b/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:12:12.823875656 -0200 +@@ -1,18 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=Duck Duck Go (HTML) - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=My Yahoo -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.1.title=Google -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank - - # Keyword URL (for location bar searches) +- +-# Keyword URL (for location bar searches) -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/html/?q= ++browser.search.order.1=DuckDuckGo HTML # 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 -@@ -22,11 +20,11 @@ +@@ -21,12 +11,10 @@ + # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=2 - # The default set of protocol handlers for webcal: +-# The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank - - # The default set of protocol handlers for mailto: +- +-# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank ++# The default set of protocol handlers for irc: ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ ++ ++# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js --- a/mobile/xul/app/mobile.js +++ b/mobile/xul/app/mobile.js @@ -366,7 +343,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js pref("keyword.enabled", true); -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL","https://duckduckgo.com/html/?q="); ++pref("keyword.URL",""); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); @@ -378,27 +355,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js */ -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL","https://duckduckgo.com/html/?q="); ++pref("keyword.URL",""); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); -diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties ---- a/toolkit/locales/en-US/chrome/global-region/region.properties -+++ b/toolkit/locales/en-US/chrome/global-region/region.properties -@@ -4,10 +4,10 @@ - pluginStartupMessage=Starting Plugin for type - - # plug-ins URLs --more_plugins_label=mozilla.org --more_plugins_url=https://pfs.mozilla.org/plugins/ --pluginupdates_label=mozilla.com/plugincheck --pluginupdates_url=http://www.mozilla.com/plugincheck/ --plugindoc_label=plugindoc.mozdev.org --plugindoc_url=http://plugindoc.mozdev.org/ -+more_plugins_label= -+more_plugins_url=about:blank -+pluginupdates_label= -+pluginupdates_url=about:blank -+plugindoc_label= -+plugindoc_url=about:blank - diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 164cd19e9..3d30a19b2 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -28,7 +28,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar. 'duckduckgo_lite.desktop') sha1sums=('5245c1152680ad22dff21c44dad531eda736e769' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' - '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') + 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') build() { cd "${srcdir}" -- cgit v1.2.3-54-g00ecf