From 8e372cc6207b56516c1facdaeb92d15c4716d8a2 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 9 Oct 2011 23:14:34 +0000 Subject: Sun Oct 9 23:14:34 UTC 2011 --- community/gogglesmm/PKGBUILD | 8 ++-- community/hwinfo/PKGBUILD | 10 ++-- community/mc/PKGBUILD | 8 ++-- community/radvd/PKGBUILD | 20 +++++--- community/rexima/PKGBUILD | 24 ++++++---- community/v8/PKGBUILD | 4 +- extra/amule/PKGBUILD | 6 +-- extra/epiphany-extensions/PKGBUILD | 8 ++-- .../epiphany-extensions.install | 1 + extra/evolution-groupwise/PKGBUILD | 32 +++++++++++++ extra/gparted/PKGBUILD | 28 +++++++++--- extra/gparted/org.archlinux.pkexec.gparted.policy | 20 ++++++++ extra/mtr/PKGBUILD | 14 +++--- extra/telepathy-mission-control/PKGBUILD | 6 +-- extra/telepathy-qt4/PKGBUILD | 6 +-- extra/telepathy-salut/PKGBUILD | 7 +-- extra/usermin/PKGBUILD | 6 +-- extra/webmin/PKGBUILD | 6 +-- libre/icecat/PKGBUILD | 53 ++++++++++------------ libre/icecat/firefox-version.patch | 6 +-- libre/icecat/mozconfig | 2 - 21 files changed, 175 insertions(+), 100 deletions(-) create mode 100644 extra/evolution-groupwise/PKGBUILD create mode 100644 extra/gparted/org.archlinux.pkexec.gparted.policy diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index 333bd4455..f38a3f005 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54297 2011-08-16 14:25:26Z spupykin $ +# $Id: PKGBUILD 56576 2011-10-08 22:42:27Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sander Jansen pkgname=gogglesmm -pkgver=0.12.3 -pkgrel=1 +pkgver=0.12.4 +pkgrel=2 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64') url="http://code.google.com/p/gogglesmm/" @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'glproto' 'dri2proto') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('77cfc3cb158673193251c85713ac7a4d') +md5sums=('ddbc41ecc6cfcf8958dbe2bca47e79e6') build() { cd $srcdir/gogglesmm-$pkgver diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 7b081488f..1a3cbedb3 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 36515 2011-01-03 19:26:37Z kchen $ +# $Id: PKGBUILD 56582 2011-10-09 02:28:04Z tdziedzic $ # Maintainer: Kaiting Chen # Contributor: Gergely Imreh # Originally contributed by champus, madeye, Ranguvar and ninja_pt pkgname=hwinfo -pkgver=18.1 -_pkgver=$pkgver-3.5 -pkgrel=9 +pkgver=18.5 +_pkgver=$pkgver-2.7 +pkgrel=1 pkgdesc='The hardware detection tool from openSUSE' arch=('i686' 'x86_64') url='http://www.opensuse.org/' @@ -30,3 +30,5 @@ build() { make -j1 LIBDIR=/usr/lib make LIBDIR=/usr/lib DESTDIR=$pkgdir install } +md5sums=('7d862ddd407200e40d1e0954e09cd566' + '1500ecfa26f6aaf4d7967eea74e86e5d') diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 379436ce2..81862a079 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55445 2011-09-12 20:10:14Z schuay $ +# $Id: PKGBUILD 56569 2011-10-08 17:55:12Z schuay $ # Contributor: Daniel J Griffiths # Maintainer: schuay pkgname=mc -pkgver=4.7.5.4 +pkgver=4.7.5.5 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('1e53e27fb3bed21c9042689d5777b5aa') -sha1sums=('5deefd15a13782605fa92c0beb635c0664b913cf') +md5sums=('ef1582651115ca8aa52f8d11e99f7da3') +sha1sums=('be428f4c5f0cb180277eed7387e29e69c042aadc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 32a668db6..d42e9b931 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 38596 2011-01-28 17:42:11Z kchen $ +# $Id: PKGBUILD 56578 2011-10-09 01:59:34Z tdziedzic $ # Maintainer: Kaiting Chen # Contributor: Mark Smith pkgname=radvd -pkgver=1.7 +pkgver=1.8.2 pkgrel=1 pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon' url='http://www.litech.org/radvd/' @@ -11,16 +11,24 @@ license=('custom') depends=('glibc') arch=('i686' 'x86_64') install=radvd.install -source=("${url}dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') -md5sums=('5ec417bde33964a07231ddf6353177c8' +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') +md5sums=('ac8a862d2b232d25ea2622274a2da8a4' '65a585f5850a1ac2a0c2c2a7096ec92a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man - make; make DESTDIR=$pkgdir install + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=$pkgdir install install -Dm644 radvd.conf.example \ $pkgdir/usr/share/doc/radvd/radvd.conf.example diff --git a/community/rexima/PKGBUILD b/community/rexima/PKGBUILD index aa73c8752..8342183de 100644 --- a/community/rexima/PKGBUILD +++ b/community/rexima/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 7502 2010-01-07 03:33:19Z dgriffiths $ -# Maintainer: Jeff Mickey +# $Id: PKGBUILD 56548 2011-10-08 11:58:00Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Jeff Mickey +# Maintainer: Daniel J Griffiths pkgname=rexima pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A curses-based interactive mixer." arch=('i686' 'x86_64') -url="http://rus.members.beeb.net/rexima.html" +url="http://www.svgalib.org/rus/rexima.html" license=('GPL') depends=('ncurses') -source=(ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/$pkgname-$pkgver.tar.gz) +source=(http://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${pkgname}-${pkgver}.tar.gz) md5sums=('333a4db26409b9cca9b9e96ddf42f44c') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install - mv $pkgdir/usr/man $pkgdir/usr/share/ + cd ${srcdir}/${pkgname}-${pkgver} + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install } diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index d5dac302f..b89b9c469 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45132 2011-04-17 01:54:09Z kchen $ +# $Id: PKGBUILD 56586 2011-10-09 03:29:08Z tdziedzic $ # Maintainer: Kaiting Chen # Contributor: tocer pkgname=v8 -pkgver=3.2.10.2 +pkgver=3.6.5.1 pkgrel=1 pkgdesc='A fast and modern javascript engine' arch=('i686' 'x86_64') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 53e7d5b62..aeaaa521d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138463 2011-09-24 09:30:24Z giovanni $ +# $Id: PKGBUILD 140160 2011-10-08 05:52:53Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10616 +pkgver=10624 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('b94fa71f713e1bd3c39ad12b08ca8a2f') +md5sums=('9b66eb490210a0c89d6e70c131565db0') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD index 72532a2e3..c168579d3 100644 --- a/extra/epiphany-extensions/PKGBUILD +++ b/extra/epiphany-extensions/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119191 2011-04-11 08:30:21Z ibiru $ +# $Id: PKGBUILD 140164 2011-10-08 07:58:37Z ibiru $ # Maintainer: Jan de Groot pkgname=epiphany-extensions -pkgver=3.0.0 +pkgver=3.2.0 pkgrel=1 url="http://www.gnome.org/projects/epiphany/" pkgdesc="Various extentions for the Epiphany web browser" @@ -12,8 +12,8 @@ depends=('epiphany' 'opensp' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') options=('!libtool' '!emptydirs') install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c9984de0912b307fecd0232135c0e3d8c7f0859867b9693221ff12d1c483b724') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/epiphany-extensions/epiphany-extensions.install b/extra/epiphany-extensions/epiphany-extensions.install index 1a05f573e..c0ed9a0d7 100644 --- a/extra/epiphany-extensions/epiphany-extensions.install +++ b/extra/epiphany-extensions/epiphany-extensions.install @@ -1,4 +1,5 @@ post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD new file mode 100644 index 000000000..5a79f4628 --- /dev/null +++ b/extra/evolution-groupwise/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $ +# Maintainer : Ionut Biru +# Contributor: György Balló + +pkgname=evolution-groupwise +pkgver=3.2.0 +pkgrel=1 +pkgdesc="GroupWise connector for evolution" +arch=(i686 x86_64) +url="http://projects.gnome.org/evolution/" +license=(LGPL) +depends=('evolution-data-server' 'gtkhtml4') +makedepends=(intltool evolution) +optdepends=('evolution: evolution plugin') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index dca866a42..41b848763 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 139177 2011-10-01 06:10:22Z giovanni $ +# $Id: PKGBUILD 140162 2011-10-08 07:31:59Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons +# Contributor: György Balló pkgname=gparted pkgver=0.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" license=('GPL') depends=('parted' 'gtkmm' 'libsigc++') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' 'ntfsprogs: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' - 'gksu: to run gparted directly from menu' + 'polkit: to run gparted directly from menu' 'gpart: for recovering corrupt partition tables' 'mtools') install=gparted.install -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f35785099994c7c9b7b2e842840f8b72') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'org.archlinux.pkexec.gparted.policy') +md5sums=('f35785099994c7c9b7b2e842840f8b72' + '27c264cfad8fa413d75954dda7a2dd50') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,5 +37,16 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop + + # Install policy file + install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" + + # Install launcher script + mkdir -p ${pkgdir}/usr/bin + echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted-pkexec + echo 'pkexec "/usr/sbin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted-pkexec + chmod 755 ${pkgdir}/usr/bin/gparted-pkexec + + # Modify desktop file + sed -i -e "s/Exec=.*/Exec=gparted-pkexec/" ${pkgdir}/usr/share/applications/gparted.desktop } diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy new file mode 100644 index 000000000..561cd7d1e --- /dev/null +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -0,0 +1,20 @@ + + + + + + Authentication is required to run the GParted Partition Editor + gparted + + auth_admin + auth_admin + auth_admin + + /usr/sbin/gparted + true + + + + diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index 47c86db91..8383b1efb 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 106670 2011-01-17 20:34:58Z ibiru $ +# $Id: PKGBUILD 140175 2011-10-08 12:02:46Z ibiru $ # Maintainer : Ionut Biru # Contributor: Douglas Soares de Andrade pkgbase=mtr pkgname=(mtr mtr-gtk) -pkgver=0.80 -pkgrel=2 +pkgver=0.81 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') makedepends=('ncurses' 'gtk2') source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz) url="http://www.bitwizard.nl/mtr/" -md5sums=('fa68528eaec1757f52bacf9fea8c68a9') +md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1') build() { install -d "${srcdir}/"{mtr-cli,mtr-gtk} @@ -20,20 +20,20 @@ build() { make cd "${srcdir}/mtr-gtk" - ../${pkgbase}-${pkgver}/configure --prefix=/usr --enable-gtk2 + ../${pkgbase}-${pkgver}/configure --prefix=/usr make } package_mtr() { pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)" - depends=('ncurses>=5.7') + depends=('ncurses') cd "${srcdir}/mtr-cli" make DESTDIR="${pkgdir}" install } package_mtr-gtk() { pkgdesc="Combines the functionality of traceroute and ping into one tool (GTK version)" - depends=('ncurses>=5.7' "gtk2>=2.22.0") + depends=('ncurses' "gtk2") conflicts=("mtr") provides=("mtr=${pkgver}") diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 47c2acdee..54c820291 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139437 2011-10-01 19:01:29Z ibiru $ +# $Id: PKGBUILD 140177 2011-10-08 12:03:11Z ibiru $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.9.2 +pkgver=5.9.3 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('312fb289f644a90d4514064586445d58') +md5sums=('15fc8e560bc67a86393a3138d7ac38e3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 6709092ea..64e704ca2 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132835 2011-07-26 13:03:28Z andrea $ +# $Id: PKGBUILD 140179 2011-10-08 12:12:17Z ibiru $ # Maintainer: Ionut Biru # Contributor: Andrea Scarpino pkgname=telepathy-qt4 -pkgver=0.7.1 +pkgver=0.7.3 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('a609c6e9638e8cf24134b2165fec1c8a') +md5sums=('a8e4f9f996b074a4e9a8950ddb5240d7') build() { cd "${srcdir}" diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index dc8e1d869..5fce245ed 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 130825 2011-07-08 08:13:11Z ibiru $ +# $Id: PKGBUILD 140181 2011-10-08 12:18:04Z ibiru $ # Maintainer: Ionut Biru # Contributor: Daniel Balieiro + pkgname=telepathy-salut -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ depends=('telepathy-glib' 'avahi' 'libsoup') makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8c9a0588d9b74c467a8b2dcb442efae1') +md5sums=('b7bbea8fde1168f4ebd73460491e7dbc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index 712901cf1..88575e8c4 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 134661 2011-08-07 10:26:07Z tpowa $ +# $Id: PKGBUILD 140170 2011-10-08 10:02:07Z tpowa $ # Maintainer: Tobias Powalowski pkgname=usermin -pkgver=1.480 +pkgver=1.490 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" arch=(i686 x86_64) @@ -124,6 +124,6 @@ build() { #install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE } -md5sums=('b5fa9938a29b7e83c36249f0b01119a3' +md5sums=('a6d87aad595ea8abbe6639ce2c08efc1' 'cfef4490cd1ef9517c0b39a7bd75c968' 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 51fd18d68..f1112e39d 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 134656 2011-08-07 10:21:55Z tpowa $ +# $Id: PKGBUILD 140171 2011-10-08 10:04:27Z tpowa $ # Maintainer: Tobias Powalowski pkgname=webmin -pkgver=1.560 +pkgver=1.570 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -210,7 +210,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('6a3eb723f991fd8c3004655472352cd7' +md5sums=('20b4f488637366c39458b9b93162eff3' 'da6bea412a5be8cf82a813078fec5847' 'bfebb75bb94029b48c46b7f1ba1aa811' '0673e51af0e81418b4a6c1e205f7e5cd') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 47cc99f42..9ab8d6c71 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -21,17 +21,13 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=7.0 +pkgver=7.0.1 pkgrel=1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender' - 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' - 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils' 'libvpx' - 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo') -makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' - 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme') +makedepends=('p7zip-libre' 'zip' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') options=(!buildflags !distcc) url="http://www.gnu.org/software/gnuzilla/" install=icecat.install @@ -40,6 +36,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz icecat.desktop icecat-safe.desktop mozilla-firefox-1.0-lang.patch + firefox-version.patch # Search engines internet-archive.xml jamendo-en.xml @@ -52,11 +49,12 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz # Default options firefox.js region.properties) -md5sums=('f486a11f638e208b45b04c29d41de19b' - 'e7fe1de533599f4ae645ea1661e4006a' +md5sums=('eb20dad67baeb5e71c5cfe469dbba378' + '927c3ac9ad0ba682e0ec9b66ed8cc4d3' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' + 'ff4654144499faf630271cddc2261b7c' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' @@ -72,31 +70,26 @@ build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + #patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" # Solve missing reporter locales and preprocessor.pl - cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ +# cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ # Default prefs, remove Google stuff cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ - cp "${srcdir}/mozconfig" .mozconfig + cp "$srcdir/mozconfig" .mozconfig + #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" + #patch -Np1 -i "$srcdir/firefox-version.patch" - # Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it - # gets set to \177 for an unknown reason - sed -i 's/@PRE_RELEASE_SUFFIX@//g' \ - browser/base/content/browser.xul + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0" export PYTHON="/usr/bin/python2" - # PGO - sed -i '/^NO_PROFILE_GUIDED_OPTIMIZE = 1$/d' \ - memory/jemalloc/Makefile.in - echo 'LDFLAGS += -lX11 -lXrender' \ - >> layout/build/Makefile.in - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" kill $! || true @@ -106,7 +99,7 @@ package() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - make -j1 -f client.mk install DESTDIR="${pkgdir}" + make -j1 -f client.mk DESTDIR="$pkgdir" install msg2 "Finishing..." install -m755 -d ${pkgdir}/usr/share/applications @@ -118,15 +111,17 @@ package() { cd ${pkgdir}/usr/lib ln -s ${ICECATDIR} icecat - # Remove included dictionaries, add symlink to system myspell path - # Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "$pkgdir/usr/lib/icecat-$pkgver/dictionaries" - ln -sf /usr/share/myspell/dicts \ - "$pkgdir/usr/lib/icecat-$pkgver/dictionaries" + rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation" # We don't want the development stuff rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl} + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat" + msg2 "Removing proprietary and anti-privacy search engines" rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml msg2 "And provide better ones..." diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch index a72eab698..ab5dda540 100644 --- a/libre/icecat/firefox-version.patch +++ b/libre/icecat/firefox-version.patch @@ -1,6 +1,6 @@ -diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/installer/Makefile.in ---- mozilla-2.0.orig//browser/installer/Makefile.in 2011-03-03 14:11:20.000000000 -0800 -+++ mozilla-2.0/browser/installer/Makefile.in 2011-03-13 10:08:45.896702838 -0700 +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2011-09-30 08:45:28.858668017 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2011-09-30 08:51:01.548314685 +0000 @@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 9ece9301f..a5810e33a 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -14,7 +14,6 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo -ac_add_options --enable-system-lcms ac_add_options --with-pthreads ac_add_options --enable-default-toolkit=cairo-gtk2 @@ -52,7 +51,6 @@ ac_add_options --disable-static ac_add_options --enable-gio ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf ac_add_options --enable-libnotify export BUILD_OFFICIAL=1 -- cgit v1.2.3-54-g00ecf