diff options
34 files changed, 640 insertions, 318 deletions
diff --git a/community/afpfs-ng/PKGBUILD b/community/afpfs-ng/PKGBUILD index f8dc2d6fc..fca6ea89e 100644 --- a/community/afpfs-ng/PKGBUILD +++ b/community/afpfs-ng/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 68567 2012-03-28 10:22:57Z idevolder $ +# $Id: PKGBUILD 99034 2013-10-22 19:25:28Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: slubman <slubman.dndd@laposte.net> pkgname=afpfs-ng pkgver=0.8.1 -pkgrel=5 +pkgrel=7 pkgdesc="A client for the Apple Filing Protocol (AFP)" url="http://alexthepuffin.googlepages.com/" license=('GPL') depends=('gmp' 'fuse' 'libgcrypt') arch=('i686' 'x86_64') -options=(!libtool) source=( "http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" 'fix_afpfs-ng_includes.patch' diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 18bccd8f3..bad27de08 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ft=sh: -# $Id: PKGBUILD 97499 2013-09-22 18:09:18Z idevolder $ +# $Id: PKGBUILD 99033 2013-10-22 19:21:49Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) @@ -7,7 +7,7 @@ pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') pkgver=0.5.7 _helpver=0.5.5 -pkgrel=1 +pkgrel=2 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -49,6 +49,7 @@ build() { package_doublecmd-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK)" depends=('gtk2') + conflicts=('doublecmd-qt') cd "$srcdir/$pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" @@ -61,6 +62,7 @@ package_doublecmd-gtk2() { package_doublecmd-qt() { pkgdesc="twin-panel (commander-style) file manager (QT)" depends=('qt4pas') + conflicts=('doublecmd-gtk2') cd "$srcdir/$pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index 1cdca27a1..d5cbc70e1 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 92707 2013-06-13 08:34:56Z mtorromeo $ +# $Id: PKGBUILD 98987 2013-10-22 07:30:18Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') license=('BSD') url="http://www.canonware.com/jemalloc/" depends=('glibc') -makedepends=('autoconf' 'make') +makedepends=('autoconf' 'make' 'bash') +optdepends=( + 'perl: memory profiler' +) source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) build() { @@ -27,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('f60802c4c2c60bc24598fd052494aea96f4426f3d4decd832eadeed520ff81c0') +sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb') diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index bd2904d90..4593354f1 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93498 2013-07-04 12:44:24Z idevolder $ +# $Id: PKGBUILD 99035 2013-10-22 19:26:05Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> # vim: ft=sh: pkgname=libcec pkgver=2.1.3 -pkgrel=1 +pkgrel=3 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="https://github.com/Pulse-Eight/libcec" @@ -13,7 +13,6 @@ license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") _srcfolder=Pulse-Eight-libcec-54be21e -options=(!libtool) sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1') build() { diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index c1572628f..c18fec262 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 92631 2013-06-10 08:52:37Z idevolder $ +# $Id: PKGBUILD 99036 2013-10-22 19:26:33Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs -pkgver=1.6.0 -pkgrel=1 +pkgver=1.7.0 +pkgrel=2 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64') url="https://github.com/sahlberg/libnfs" license=('GPL') depends=('glibc') source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz") -sha256sums=('19a497044f086d2bed973d0e89392bd41d1a8e9f524d5787f3090f966e20ccc3') -options=(!libtool) +sha256sums=('724e0b15cb2099ab3bbdb8456eaab54bc6d1de76da4b4f3251323471523e2114') build() { cd "$pkgname-$pkgname-$pkgver" diff --git a/community/libshairport/PKGBUILD b/community/libshairport/PKGBUILD index 7e69f1b6e..ec3a9d498 100644 --- a/community/libshairport/PKGBUILD +++ b/community/libshairport/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87587 2013-04-03 13:29:16Z idevolder $ +# $Id: PKGBUILD 99037 2013-10-22 19:26:56Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libshairport @@ -6,7 +6,7 @@ _developer='amejia1' _version=1.2.1.20121215 _commithash='16395d8' pkgver=${_version} -pkgrel=1 +pkgrel=3 pkgdesc="emulates an AirPort Express" arch=('i686' 'x86_64') url='https://github.com/amejia1/libshairport' @@ -14,7 +14,6 @@ license=('GPL') depends=('openssl' 'libao') source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash") sha256sums=('98b73313d0a8f2abcb32e11f4fd4b422777a495cd62dbe881d5061b91959d1d5') -options=(!libtool) _srcfolder=$_developer-$pkgname-$_commithash diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD new file mode 100644 index 000000000..d1c7bd977 --- /dev/null +++ b/community/miniupnpd/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 99009 2013-10-22 08:59:17Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: fauno <fauno@parabola.nu> +pkgname=miniupnpd +pkgver=1.8.20130730 +pkgrel=1 +pkgdesc="Lightweight UPnP IGD daemon" +arch=('i686' 'x86_64') +url="http://miniupnp.free.fr" +license=('BSD') +backup=(etc/miniupnpd/miniupnpd.conf) +depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux') +makedepends=('lsb-release') +source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" + miniupnpd.systemd) +sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43' + '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c') + +build() { + cd "$pkgname-$pkgver" + + CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h + make -f Makefile.linux +} + +package() { + cd "$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" + + make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install + + rm -r "${pkgdir}/etc/init.d" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" + + sed -i 's:/s\?bin/iptables:/usr/bin/iptables: + s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh + sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ + s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" +} diff --git a/community/miniupnpd/miniupnpd.systemd b/community/miniupnpd/miniupnpd.systemd new file mode 100644 index 000000000..88973535c --- /dev/null +++ b/community/miniupnpd/miniupnpd.systemd @@ -0,0 +1,12 @@ +[Unit] +Description=Lightweight UPnP IGD daemon + +[Service] +ExecStartPre=/etc/miniupnpd/iptables_init.sh +ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStopPost=/etc/miniupnpd/iptables_removeall.sh +PIDFile=/run/miniupnpd.pid +StandardOutput=null + +[Install] +WantedBy=network.target diff --git a/community/paps/PKGBUILD b/community/paps/PKGBUILD index e5d0721de..73a14bb19 100644 --- a/community/paps/PKGBUILD +++ b/community/paps/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93533 2013-07-05 01:34:25Z bisson $ +# $Id: PKGBUILD 98977 2013-10-22 05:29:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Artyom 'logus' Pervukhin <logus9@gmail.com> # Contributor: Tim Yang <tdy@gmx.com> pkgname=paps pkgver=0.6.8 -pkgrel=5 +pkgrel=6 pkgdesc='UTF-8 to PostScript converter via Pango' url='http://paps.sourceforge.net/' license=('LGPL') @@ -17,7 +17,7 @@ sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928') build() { cd "${srcdir}/${pkgname}-${pkgver}" export LDFLAGS=${LDFLAGS/,--as-needed/} - ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD index 02be15ca0..4468e1bd0 100644 --- a/community/pion/PKGBUILD +++ b/community/pion/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 94042 2013-07-13 12:35:54Z svenstaro $ +# $Id: PKGBUILD 99025 2013-10-22 18:18:59Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=pion -pkgver=5.0.2 +pkgver=5.0.4 pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="https://github.com/cloudmeter/pion" @@ -13,7 +13,7 @@ provides=('pion-net') conflicts=('pion-net') replaces=('pion-net') source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip) -md5sums=('1f6a9f69114235ca98756cbcab16d162') +md5sums=('5807d39beb0c80fdef5b8ad5cee71c1c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,7 +25,7 @@ build() { # override Makefile bug sed -i "/docs:/ s/doxygen-doc//" Makefile.in - ./configure --prefix=/usr --disable-doxygen-doc + ./configure --prefix=/usr --with-plugins=/usr/lib/pion/plugins --disable-doxygen-doc make } diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index 50a3db338..c0b4f49b5 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86533 2013-03-18 17:58:18Z bpiotrowski $ +# $Id: PKGBUILD 99024 2013-10-22 17:56:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.8.7 +pkgver=0.9.0 pkgrel=1 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ optdepends=('lsof: device processes' 'udevil: mount as non-root user and mount networks' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') -source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('3e48f276df4505b69d24fbeb4b5a869cf316503e2395bef467a29a5207b23947') +source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz) +sha256sums=('cca3fcfecd148dca165a71bb14c66c8b29ae7a488a98b9e9662ae4b686b2c01b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/spacefm/spacefm.install b/community/spacefm/spacefm.install index f2954aa73..76a5d56b9 100644 --- a/community/spacefm/spacefm.install +++ b/community/spacefm/spacefm.install @@ -1,8 +1,8 @@ post_install() { - update-mime-database usr/share/mime > /dev/null + update-mime-database /usr/share/mime > /dev/null update-desktop-database -q gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - [ -d /usr/share/icons/Faenza ] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza + [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza } post_upgrade() { diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index b12aaaa85..ce0e94829 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96041 2013-08-19 11:44:18Z tredaelli $ +# $Id: PKGBUILD 99008 2013-10-22 08:58:32Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: helios # Contributor: Lothar Gesslein # Contributor: Dominik George <nik@naturalnet.de> pkgname=tinc -pkgver=1.0.22 +pkgver=1.0.23 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lzo2' 'openssl') install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd@.service) -md5sums=('cc1346150715bd56070695af85ab39f4' +md5sums=('762c0d47bdf1b33a40b19165d9c2761f' 'SKIP' '112327da32fdb56ab779fe004712235f') diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD new file mode 100644 index 000000000..c49b9a5c0 --- /dev/null +++ b/community/xmind/PKGBUILD @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Christoph Drexler <chrdr at gmx dot at> +# Contributor: Jelle van der Waa <jellevdwaa@gmail.com> + +pkgname=xmind +pkgver=3.3.1 +_pkgdate=201212250029 +pkgrel=2 +pkgdesc="Brainstorming and Mind Mapping Software" +arch=('i686' 'x86_64') +[ "${CARCH}" = "i686" ] && _arch="i386" +[ "${CARCH}" = "x86_64" ] && _arch="amd64" +url="http://www.xmind.net" +license=('EPL' 'LGPL') +depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-mime-info') +optdepends=('lame: needed for the feature audio notes') +install=xmind.install +source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb) +[ "${CARCH}" = "i686" ] && md5sums=('53d55f189879b4d2f27eb214456c754b') +[ "${CARCH}" = "x86_64" ] && md5sums=('a31c55dab417a8281ec4211f4ac111d7') + +build() { + cd "${srcdir}" + ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb" + bsdtar -xf data.tar.gz +} + +package() { + install -d "${pkgdir}"/usr/share/xmind/ + cp -a "${srcdir}"/usr/local/xmind/* "${pkgdir}"/usr/share/xmind/ + cp -a "${srcdir}"/usr/share/* "${pkgdir}"/usr/share/ + install -d "${pkgdir}"/usr/bin/ + cd "${pkgdir}"/usr/bin/ + ln -s ../../usr/share/xmind/XMind . + + # getting the config files to the right place... + install -d "${pkgdir}"/etc/xmind/ + mv "${pkgdir}"/usr/share/xmind/configuration/* \ + "${pkgdir}"/etc/xmind/ + cd "${pkgdir}"/usr/share/xmind/configuration/ + ln -s ../../../../etc/xmind/* . + mv "${pkgdir}"/usr/share/xmind/XMind.ini \ + "${pkgdir}"/etc/xmind/ + cd ../ + ln -s ../../../etc/xmind/XMind.ini . + + # putting the png file where it belongs to + install -d "${pkgdir}"/usr/share/pixmaps/ + mv "${pkgdir}"/usr/share/xmind/xmind-logo-36.png \ + "${pkgdir}"/usr/share/pixmaps/xmind.png + sed -i s!Exec=.*!Exec=/usr/share/xmind/XMind! \ + "${pkgdir}"/usr/share/applications/xmind.desktop + sed -i s!/usr/local/xmind/xmind-logo-36.png!xmind.png! \ + "${pkgdir}"/usr/share/applications/xmind.desktop +} diff --git a/community/xmind/xmind.install b/community/xmind/xmind.install new file mode 100644 index 000000000..7be8023f9 --- /dev/null +++ b/community/xmind/xmind.install @@ -0,0 +1,16 @@ +post_install() { + echo "Updating MIME database" + update-mime-database /usr/share/mime + update-desktop-database +} + +post_remove() { + echo "Updating MIME database" + update-mime-database /usr/share/mime + update-desktop-database +} + +op=$1 +shift + +$op $* diff --git a/extra/gtkspell/PKGBUILD b/extra/gtkspell/PKGBUILD index 5dc2fef2d..9346533ae 100644 --- a/extra/gtkspell/PKGBUILD +++ b/extra/gtkspell/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 150411 2012-02-17 12:37:06Z allan $ +# $Id: PKGBUILD 197111 2013-10-22 07:52:45Z jgc $ # Maintainer: Roman Kyrylych <roman@archlinux.org> # Contributer: Ben <ben@benmazer.net> pkgname=gtkspell pkgver=2.0.16 -pkgrel=2 +pkgrel=3 url="http://gtkspell.sourceforge.net/" -pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" +pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" arch=('i686' 'x86_64') license=('GPL') depends=('gtk2' 'enchant') @@ -17,7 +17,7 @@ md5sums=('f75dcc9338f182c571b321d37c606a94') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD deleted file mode 100644 index 14a367a94..000000000 --- a/extra/lablgtk/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $ -#Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=lablgtk -pkgver=1.2.7 -pkgrel=9 -pkgdesc=" An Objective Caml interface to gtk+" -arch=(i686 x86_64) -url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html" -license=('LGPL') -depends=('gtk') -makedepends=('ocaml') -options=('!makeflags') -source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar.gz) -md5sums=('73a797e3a459190fdcaa8288935f6fb9') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make configure - make - make opt -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \ - INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install - rm -r "$pkgdir"/usr/bin -} diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD index de97c2ba4..bb3146ee4 100644 --- a/extra/libart-lgpl/PKGBUILD +++ b/extra/libart-lgpl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150419 2012-02-17 12:52:28Z allan $ +# $Id: PKGBUILD 197113 2013-10-22 07:55:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libart-lgpl pkgver=2.3.21 -pkgrel=2 +pkgrel=3 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { cd "${srcdir}/libart_lgpl-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD index 98a6836f5..d562768e0 100644 --- a/extra/libavc1394/PKGBUILD +++ b/extra/libavc1394/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $ +# $Id: PKGBUILD 197115 2013-10-22 07:58:26Z jgc $ # Maintainer: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=libavc1394 pkgver=0.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands." arch=("i686" "x86_64") url="http://sourceforge.net/projects/libavc1394/" @@ -16,7 +16,7 @@ md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static make } diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD index c44ac22e9..1878f8cb1 100644 --- a/extra/libcaca/PKGBUILD +++ b/extra/libcaca/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 158970 2012-05-13 20:58:29Z jgc $ +# $Id: PKGBUILD 197118 2013-10-22 08:29:56Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcaca pkgver=0.99.beta18 -pkgrel=1 +pkgrel=2 pkgdesc="Color AsCii Art library" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom:WTFPL') url="http://caca.zoy.org/wiki/libcaca" depends=('imlib2' 'ncurses') options=(!libtool !emptydirs) @@ -14,14 +14,15 @@ source=(http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz) md5sums=('93d35dbdb0527d4c94df3e9a02e865cc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man \ --enable-shared --disable-doc \ - --disable-cxx --disable-gl --disable-csharp + --disable-cxx --disable-gl --disable-csharp --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libcaca/COPYING" } diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD index e750c3440..8e08525b4 100644 --- a/extra/libdc1394/PKGBUILD +++ b/extra/libdc1394/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 180144 2013-03-18 09:10:25Z jgc $ +# $Id: PKGBUILD 197120 2013-10-22 08:46:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdc1394 pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="High level programming interface to control IEEE 1394 based cameras" arch=('i686' 'x86_64') license=('LGPL') url="http://sourceforge.net/projects/libdc1394/" -depends=('libraw1394' 'libusb') +depends=('libraw1394' 'libusbx') options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('5c4b78bb8265d6dc971433ec1da381ab') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libdc1394/rename-usb_init.patch b/extra/libdc1394/rename-usb_init.patch deleted file mode 100644 index 44e1a5de3..000000000 --- a/extra/libdc1394/rename-usb_init.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001 -From: Damien Douxchamps <ddsf@douxchamps.net> -Date: Sun, 21 Aug 2011 16:03:22 +0900 -Subject: [PATCH] fix usb_init function name conflict - ---- - libdc1394/dc1394/control.c | 2 +- - libdc1394/dc1394/internal.h | 2 +- - libdc1394/dc1394/usb/control.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c -index c62e0e2..f250f6a 100644 ---- a/libdc1394/dc1394/control.c -+++ b/libdc1394/dc1394/control.c -@@ -1955,7 +1955,7 @@ dc1394_new (void) - windows_init (d); - #endif - #ifdef HAVE_LIBUSB -- usb_init (d); -+ dc1394_usb_init (d); - #endif - - int i; -diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h -index b4d295a..c59e5d3 100644 ---- a/libdc1394/dc1394/internal.h -+++ b/libdc1394/dc1394/internal.h -@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d); - void linux_init(dc1394_t *d); - void macosx_init(dc1394_t *d); - void windows_init(dc1394_t *d); --void usb_init(dc1394_t *d); -+void dc1394_usb_init(dc1394_t *d); - - void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch, - const char * name); -diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c -index 6509452..19a21a6 100644 ---- a/libdc1394/dc1394/usb/control.c -+++ b/libdc1394/dc1394/usb/control.c -@@ -378,7 +378,7 @@ usb_dispatch = { - }; - - void --usb_init(dc1394_t * d) -+dc1394_usb_init(dc1394_t * d) - { - register_platform (d, &usb_dispatch, "usb"); - } --- -1.7.4.1 - diff --git a/extra/libdc1394/videodev-compile-fix.patch b/extra/libdc1394/videodev-compile-fix.patch deleted file mode 100644 index 8f234b152..000000000 --- a/extra/libdc1394/videodev-compile-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001 -From: David Moore <david.moore@gmail.com> -Date: Sun, 27 Mar 2011 22:48:15 -0700 -Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists - ---- - libdc1394/configure.in | 3 +++ - libdc1394/examples/Makefile.am | 2 ++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/libdc1394/configure.in b/libdc1394/configure.in -index 69babab..bdddc9b 100644 ---- a/libdc1394/configure.in -+++ b/libdc1394/configure.in -@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue) - AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue) - AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x") - -+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true]) -+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue) -+ - AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true]) - - AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue) -diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am -index fcebf18..035612e 100644 ---- a/libdc1394/examples/Makefile.am -+++ b/libdc1394/examples/Makefile.am -@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \ - B = dc1394_reset_bus - - if HAVE_LINUX -+if HAVE_VIDEODEV - B += dc1394_vloopback -+endif - if HAVE_XV - A += dc1394_multiview - endif --- -1.7.4.1 - diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD index bc42228f3..1ce53f975 100644 --- a/extra/libdca/PKGBUILD +++ b/extra/libdca/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137736 2011-09-10 14:39:31Z pierre $ +# $Id: PKGBUILD 197123 2013-10-22 09:00:16Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libdca pkgver=0.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="Free library for decoding DTS Coherent Acoustics streams" arch=('i686' 'x86_64') license=('GPL') @@ -16,18 +16,16 @@ source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgnam md5sums=('dab6b2795c66a82a6fcd4f8343343021') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man + cd $pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1 ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz" ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz" - # remove dangling symlink - rm "${pkgdir}/usr/lib/libdts.a" } diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 75121fc8f..8dd699e8b 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,45 +1,44 @@ -# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 197109 2013-10-22 05:48:33Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo pkgver=1.3.0 -pkgrel=2 -pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" -arch=('i686' 'x86_64') -url="http://libjpeg-turbo.virtualgl.org/" +pkgrel=3 +pkgdesc='JPEG image codec with accelerated baseline compression and decompression' +url='http://libjpeg-turbo.virtualgl.org/' license=('GPL' 'custom') -depends=('glibc') +arch=('i686' 'x86_64') makedepends=('nasm') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') + provides=('libjpeg=8.0.2' 'turbojpeg') conflicts=('libjpeg' 'turbojpeg') replaces=('libjpeg' 'turbojpeg') options=('!libtool') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man + make } check() { - cd "$srcdir/$pkgname-$pkgver" - make test + cd "${srcdir}/${pkgname}-${pkgver}" + make test } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ - exampledir=/usr/share/doc/libjpeg-turbo install - - # provide jpegint.h as it is required by various software - install -m644 jpegint.h "$pkgdir/usr/include/" - - install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" - ln -s ../../doc/libjpeg-turbo/README \ - "$pkgdir/usr/share/licenses/libjpeg-turbo/README" - ln -s ../../doc/libjpeg-turbo/README-turbo.txt \ - "$pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt" + cd "${srcdir}/${pkgname}-${pkgver}" + make \ + DESTDIR="${pkgdir}" \ + docdir="/usr/share/doc/${pkgname}" \ + exampledir="/usr/share/doc/${pkgname}" \ + install + + install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo" + ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt} + install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software } diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index abf407220..f46993815 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196771 2013-10-18 14:56:57Z andrea $ +# $Id: PKGBUILD 197140 2013-10-22 17:14:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -24,9 +24,9 @@ optdepends=('qtchooser: set the default Qt toolkit' 'libxfixes: Xfixes support' 'icu: Unicode support') install="${pkgname}.install" -options=('!libtool') replaces=('qt<=4.8.4') conflicts=('qt') +options=('staticlibs') # libQtUiTools builds as static only _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index f0571dd7e..86b1a20bd 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196795 2013-10-19 12:27:27Z andrea $ +# $Id: PKGBUILD 197132 2013-10-22 10:32:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -21,7 +21,7 @@ pkgname=('qt5-base' 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.1.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -32,7 +32,6 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'openal' 'gtk2' 'libxkbcommon') groups=('qt' 'qt5') -options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 22e7cd0bc..ae227ef59 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.27 +pkgver=1.1.29 pkgrel=1 pkgdesc='The Apache Tomcat Native Library' arch=('i686' 'x86_64') @@ -10,9 +10,9 @@ url='http://tomcat.apache.org/' license=('APACHE') depends=('apr' 'openssl') makedepends=('java-environment') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4') +sha256sums=('25fc6f3d65aeb3ac93142a4b536587b1231ac925eaf32a40f55c92a0991cf232') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD index 6d84309a9..5ac53741f 100644 --- a/extra/vc/PKGBUILD +++ b/extra/vc/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 197078 2013-10-21 16:10:43Z andrea $ +# $Id: PKGBUILD 197134 2013-10-22 12:37:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: PedsXing <pedsxing at gmx dot net> pkgname=vc pkgver=0.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library to ease explicit vectorization of C++ code" url='http://code.compeng.uni-frankfurt.de/projects/vc/' arch=('x86_64' 'i686') license=('LGPL3') makedepends=('cmake') +options=('staticlibs') source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz") md5sums=('a55e2871a33dbcbbe444c22ccef47dbd') prepare() { - mkdir build + mkdir build } build() { diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 23ee5f0b2..b098d36e5 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194330 2013-09-13 15:52:26Z andrea $ +# $Id: PKGBUILD 197128 2013-10-22 10:14:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> @@ -6,12 +6,11 @@ pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') epoch=1 pkgver=6.1.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") md5sums=('88885e84e8f7b61e59516f696b1d3be5') @@ -59,9 +58,8 @@ package_virtuoso() { # remove conflicts with virtuoso-base rm "${pkgdir}"/usr/bin/isql{,w-vt} rm "${pkgdir}"/usr/bin/virtuoso-t - rm "${pkgdir}"/usr/lib/libvirtuoso-t.a - rm "${pkgdir}"/usr/lib/virtodbc.{a,so} - rm "${pkgdir}"/usr/lib/virtodbc_r.{a,so} - rm "${pkgdir}"/usr/lib/virtodbcu.{a,so} - rm "${pkgdir}"/usr/lib/virtodbcu_r.{a,so} + rm "${pkgdir}"/usr/lib/virtodbc.so + rm "${pkgdir}"/usr/lib/virtodbc_r.so + rm "${pkgdir}"/usr/lib/virtodbcu.so + rm "${pkgdir}"/usr/lib/virtodbcu_r.so } diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD index 9d4c663f6..bb4acad26 100644 --- a/extra/wv/PKGBUILD +++ b/extra/wv/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 184449 2013-05-06 19:40:11Z foutrelis $ +# $Id: PKGBUILD 197126 2013-10-22 09:56:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=wv pkgver=1.2.9 -pkgrel=2 +pkgrel=3 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/wvware" license=('GPL') -depends=('libgsf' 'libpng' 'sh') -makedepends=('pkg-config') +depends=(libgsf libpng sh) options=('!libtool') -source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') +sha1sums=('db4717a151742dbdb492318f104504a92075543a') build() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man --disable-static make } package() { - cd ${pkgname}-${pkgver} - + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/wv/fix-soname.patch b/extra/wv/fix-soname.patch deleted file mode 100644 index 81dff86e6..000000000 --- a/extra/wv/fix-soname.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure ---- wv-1.2.7.orig//configure 2009-09-21 12:22:46.000000000 +0200 -+++ wv-1.2.7//configure 2010-06-08 12:00:27.948857203 +0200 -@@ -2082,8 +2082,8 @@ - WV_MAJOR_VERSION=1 - WV_MINOR_VERSION=2 - WV_MICRO_VERSION=7 --WV_INTERFACE_AGE=3 --WV_BINARY_AGE=3 -+WV_INTERFACE_AGE=4 -+WV_BINARY_AGE=4 - WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION - - diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 08efafb34..0ed8d24ee 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -62,7 +62,7 @@ md5sums=('8f24807d67599516850a4bdca2b2fbd6' '1f4f1347e05b15f5af137787d614ecdf' '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '5b32b39c033a33f45e2cfc6c3e80f20c' + '5e01a51ec4f3dd72ff2525edfe6cd371' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '121fefaa040936c3b96298da0c49f450' @@ -91,6 +91,11 @@ prepare() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname + # Patch and remove anything that's left + patch -Np1 -i "$srcdir/libre.patch" + rm -v browser/base/content/abouthome/snippet*.png || true + sed -i "\|abouthome/snippet|d" browser/base/jar.mn + # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do if [[ -n $moz_url ]]; then @@ -102,9 +107,6 @@ prepare() { fi done - # Patch anything that's left - patch -Np1 -i "$srcdir/libre.patch" - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch if $_pgo; then diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 504ebca91..c0e61d5b9 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,8 @@ -diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-08-07 10:36:49.891513965 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-08-12 22:34:34.309460804 -0300 -@@ -1206,14 +1206,6 @@ +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 2617a7f..a70434a 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1242,14 +1242,6 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -16,10 +17,107 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br // Turn on the CSP 1.0 parser for Content Security Policy headers pref("security.csp.speccompliant", true); -diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-08-07 11:44:11.230486326 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-08-08 08:27:08.189418422 -0300 -@@ -3,132 +3,41 @@ +diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css +index ce8db3c..27ff8b6 100644 +--- a/browser/base/content/abouthome/aboutHome.css ++++ b/browser/base/content/abouthome/aboutHome.css +@@ -51,11 +51,6 @@ a { + background-repeat: no-repeat; + } + +-#searchForm, +-#snippets { +- width: 470px; +-} +- + #searchForm { + display: -moz-box; + } +@@ -74,8 +69,7 @@ a { + #searchEngineLogo { + display: inline-block; + height: 28px; +- width: 70px; +- min-width: 70px; ++ width: 47px; + } + + #searchText { +@@ -147,48 +141,6 @@ a { + transition-duration: 0ms; + } + +-#defaultSnippet1, +-#defaultSnippet2, +-#rightsSnippet { +- display: block; +- min-height: 38px; +- background: 30px center no-repeat; +- padding: 6px 0; +- -moz-padding-start: 79px; +-} +- +-#rightsSnippet[hidden] { +- display: none; +-} +- +-#defaultSnippet1:-moz-dir(rtl), +-#defaultSnippet2:-moz-dir(rtl), +-#rightsSnippet:-moz-dir(rtl) { +- background-position: right 30px center; +-} +- +-#defaultSnippet1 { +- background-image: url("chrome://browser/content/abouthome/snippet1.png"); +-} +- +-#defaultSnippet2 { +- background-image: url("chrome://browser/content/abouthome/snippet2.png"); +-} +- +-#snippets { +- display: inline-block; +- text-align: start; +- margin: 12px 0; +- color: #3c3c3c; +- font-size: 75%; +- /* 12px is the computed font size, 15px the computed line height of the snippets +- with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately +- converts em from units of font-size to units of line-height. The goal is to +- preset the height of a three-line snippet to avoid visual moving/flickering as +- the snippets load. */ +- min-height: calc(15/12 * 3em); +-} +- + #launcher { + display: -moz-box; + -moz-box-align: center; +@@ -368,20 +320,6 @@ body[narrow] #restorePreviousSession::before { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } + +- #defaultSnippet1, +- #defaultSnippet2, +- #rightsSnippet { +- background-size: 40px; +- } +- +- #defaultSnippet1 { +- background-image: url("chrome://browser/content/abouthome/snippet1@2x.png"); +- } +- +- #defaultSnippet2 { +- background-image: url("chrome://browser/content/abouthome/snippet2@2x.png"); +- } +- + .launchButton::before, + #aboutMozilla::before { + transform: scale(.5); +diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +index dd050d3..7ae28d2 100644 +--- a/browser/base/content/abouthome/aboutHome.js ++++ b/browser/base/content/abouthome/aboutHome.js +@@ -3,147 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -186,31 +284,265 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil } }; -@@ -138,7 +47,7 @@ - // * add an entry here in the proper ordering (based on spans) - // The <a/> part of the snippet will be linked to the corresponding url. - const DEFAULT_SNIPPETS_URLS = [ +-// The process of adding a new default snippet involves: +-// * add a new entity to aboutHome.dtd +-// * add a <span/> for it in aboutHome.xhtml +-// * add an entry here in the proper ordering (based on spans) +-// The <a/> part of the snippet will be linked to the corresponding url. +-const DEFAULT_SNIPPETS_URLS = [ - "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet" -+ "http://packages.debian.org/experimental/iceweasel" - , "https://www.gnu.org/software/gnuzilla/addons.html" - ]; +-, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons" +-]; +- +-const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +- + // This global tracks if the page has been set up before, to prevent double inits + let gInitialized = false; + let gObserver = new MutationObserver(function (mutations) { +@@ -151,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { + if (mutation.attributeName == "searchEngineURL") { + setupSearchEngine(); + if (!gInitialized) { +- ensureSnippetsMapThen(loadSnippets); + gInitialized = true; + } + return; +@@ -172,70 +68,6 @@ window.addEventListener("pagehide", function() { + window.removeEventListener("resize", fitToWidth); + }); + +-// This object has the same interface as Map and is used to store and retrieve +-// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so +-// be sure its callback returned before trying to use it. +-let gSnippetsMap; +-let gSnippetsMapCallbacks = []; +- +-/** +- * Ensure the snippets map is properly initialized. +- * +- * @param aCallback +- * Invoked once the map has been initialized, gets the map as argument. +- * @note Snippets should never directly manage the underlying storage, since +- * it may change inadvertently. +- */ +-function ensureSnippetsMapThen(aCallback) +-{ +- if (gSnippetsMap) { +- aCallback(gSnippetsMap); +- return; +- } +- +- // Handle multiple requests during the async initialization. +- gSnippetsMapCallbacks.push(aCallback); +- if (gSnippetsMapCallbacks.length > 1) { +- // We are already updating, the callbacks will be invoked when done. +- return; +- } +- +- // TODO (bug 789348): use a real asynchronous storage here. This setTimeout +- // is done just to catch bugs with the asynchronous behavior. +- setTimeout(function() { +- // Populate the cache from the persistent storage. +- let cache = new Map(); +- for (let key of [ "snippets-last-update", +- "snippets-cached-version", +- "snippets" ]) { +- cache.set(key, localStorage[key]); +- } +- +- gSnippetsMap = Object.freeze({ +- get: function (aKey) cache.get(aKey), +- set: function (aKey, aValue) { +- localStorage[aKey] = aValue; +- return cache.set(aKey, aValue); +- }, +- has: function(aKey) cache.has(aKey), +- delete: function(aKey) { +- delete localStorage[aKey]; +- return cache.delete(aKey); +- }, +- clear: function() { +- localStorage.clear(); +- return cache.clear(); +- }, +- get size() cache.size +- }); +- +- for (let callback of gSnippetsMapCallbacks) { +- callback(gSnippetsMap); +- } +- gSnippetsMapCallbacks.length = 0; +- }, 0); +-} +- + function onSearchSubmit(aEvent) + { + let searchTerms = document.getElementById("searchText").value; +@@ -320,140 +152,6 @@ function setupSearchEngine() -diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 -@@ -66,8 +66,7 @@ - #searchEngineLogo { - display: inline-block; - height: 28px; -- width: 70px; -- min-width: 70px; -+ width: 47px; } - #searchText { -diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-10 20:14:52.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-18 17:24:08.209539436 -0300 +-/** +- * Update the local snippets from the remote storage, then show them through +- * showSnippets. +- */ +-function loadSnippets() +-{ +- if (!gSnippetsMap) +- throw new Error("Snippets map has not properly been initialized"); +- +- // Check cached snippets version. +- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; +- let currentVersion = document.documentElement.getAttribute("snippetsVersion"); +- if (cachedVersion < currentVersion) { +- // The cached snippets are old and unsupported, restart from scratch. +- gSnippetsMap.clear(); +- } +- +- // Check last snippets update. +- let lastUpdate = gSnippetsMap.get("snippets-last-update"); +- let updateURL = document.documentElement.getAttribute("snippetsURL"); +- let shouldUpdate = !lastUpdate || +- Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS; +- if (updateURL && shouldUpdate) { +- // Try to update from network. +- let xhr = new XMLHttpRequest(); +- try { +- xhr.open("GET", updateURL, true); +- } catch (ex) { +- showSnippets(); +- return; +- } +- // Even if fetching should fail we don't want to spam the server, thus +- // set the last update time regardless its results. Will retry tomorrow. +- gSnippetsMap.set("snippets-last-update", Date.now()); +- xhr.onerror = function (event) { +- showSnippets(); +- }; +- xhr.onload = function (event) +- { +- if (xhr.status == 200) { +- gSnippetsMap.set("snippets", xhr.responseText); +- gSnippetsMap.set("snippets-cached-version", currentVersion); +- } +- showSnippets(); +- }; +- xhr.send(null); +- } else { +- showSnippets(); +- } +-} +- +-/** +- * Shows locally cached remote snippets, or default ones when not available. +- * +- * @note: snippets should never invoke showSnippets(), or they may cause +- * a "too much recursion" exception. +- */ +-let _snippetsShown = false; +-function showSnippets() +-{ +- let snippetsElt = document.getElementById("snippets"); +- +- // Show about:rights notification, if needed. +- let showRights = document.documentElement.getAttribute("showKnowYourRights"); +- if (showRights) { +- let rightsElt = document.getElementById("rightsSnippet"); +- let anchor = rightsElt.getElementsByTagName("a")[0]; +- anchor.href = "about:rights"; +- snippetsElt.appendChild(rightsElt); +- rightsElt.removeAttribute("hidden"); +- return; +- } +- +- if (!gSnippetsMap) +- throw new Error("Snippets map has not properly been initialized"); +- if (_snippetsShown) { +- // There's something wrong with the remote snippets, just in case fall back +- // to the default snippets. +- showDefaultSnippets(); +- throw new Error("showSnippets should never be invoked multiple times"); +- } +- _snippetsShown = true; +- +- let snippets = gSnippetsMap.get("snippets"); +- // If there are remotely fetched snippets, try to to show them. +- if (snippets) { +- // Injecting snippets can throw if they're invalid XML. +- try { +- snippetsElt.innerHTML = snippets; +- // Scripts injected by innerHTML are inactive, so we have to relocate them +- // through DOM manipulation to activate their contents. +- Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) { +- let relocatedScript = document.createElement("script"); +- relocatedScript.type = "text/javascript;version=1.8"; +- relocatedScript.text = elt.text; +- elt.parentNode.replaceChild(relocatedScript, elt); +- }); +- return; +- } catch (ex) { +- // Bad content, continue to show default snippets. +- } +- } +- +- showDefaultSnippets(); +-} +- +-/** +- * Clear snippets element contents and show default snippets. +- */ +-function showDefaultSnippets() +-{ +- // Clear eventual contents... +- let snippetsElt = document.getElementById("snippets"); +- snippetsElt.innerHTML = ""; +- +- // ...then show default snippets. +- let defaultSnippetsElt = document.getElementById("defaultSnippets"); +- let entries = defaultSnippetsElt.querySelectorAll("span"); +- // Choose a random snippet. Assume there is always at least one. +- let randIndex = Math.floor(Math.random() * entries.length); +- let entry = entries[randIndex]; +- // Inject url in the eventual link. +- if (DEFAULT_SNIPPETS_URLS[randIndex]) { +- let links = entry.getElementsByTagName("a"); +- // Default snippets can have only one link, otherwise something is messed +- // up in the translation. +- if (links.length == 1) { +- links[0].href = DEFAULT_SNIPPETS_URLS[randIndex]; +- } +- } +- // Move the default snippet to the snippets element. +- snippetsElt.appendChild(entry); +-} +- + function fitToWidth() { + if (window.scrollMaxX) { + document.body.setAttribute("narrow", "true"); +diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml +index cd821c4..9816d54 100644 +--- a/browser/base/content/abouthome/aboutHome.xhtml ++++ b/browser/base/content/abouthome/aboutHome.xhtml +@@ -43,15 +43,6 @@ + <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> + </form> + </div> +- +- <div id="snippetContainer"> +- <div id="defaultSnippets" hidden="true"> +- <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span> +- <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span> +- </div> +- <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span> +- <div id="snippets"/> +- </div> + </div> + <div class="spacer"/> + +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index 23a30d0..fe7f265 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -233,7 +565,7 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # 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,20 +17,10 @@ +@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 @@ -258,31 +590,10 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul ---- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 -+++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 -@@ -299,6 +299,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul ---- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-01-04 18:44:37.000000000 -0500 -+++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-01-10 18:20:03.000000000 -0500 -@@ -73,6 +73,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-09-10 20:14:52.000000000 -0300 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-09-18 17:41:28.559462661 -0300 +diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +index e925c1e..5101035 100644 +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -310,10 +621,35 @@ diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff -ruN mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js ---- mozilla-release.orig/modules/libpref/src/init/all.js 2013-08-07 10:36:49.851516239 -0300 -+++ mozilla-release/modules/libpref/src/init/all.js 2013-08-12 22:35:19.870374357 -0300 -@@ -4127,20 +4127,6 @@ +diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul +index 25efdb6..8162c73 100644 +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul +@@ -299,6 +299,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul +index 237ba61..7603d7d 100644 +--- a/layout/ipc/test-ipcbrowser.xul ++++ b/layout/ipc/test-ipcbrowser.xul +@@ -73,6 +73,6 @@ + label="setViewportScale"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" + remote="true"/> + </window> +diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js +index 3b67260..29f7730 100644 +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -4190,20 +4190,6 @@ pref("memory.ghost_window_timeout_seconds", 60); // Disable freeing dirty pages when minimizing memory. pref("memory.free_dirty_pages", false); |