diff options
55 files changed, 1856 insertions, 321 deletions
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD new file mode 100644 index 000000000..fa2f7b8d0 --- /dev/null +++ b/community/blender/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $ +# Contributor: John Sowiak <john@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.61 +pkgrel=2 +epoch=3 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio') +makedepends=('cmake' 'boost' 'cuda-toolkit') +optdepends=('cuda-toolkit: cycles renderer cuda support') +options=(!strip) +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('11a4721ff92286f678bb2e05e5f29c97') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('7579d1139d0d6025df8afcfca64a65c4') +fi + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=38016 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=ON \ + -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DWITH_CYCLES:BOOL=ON \ + -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \ + -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \ + -DWITH_FFTW3:BOOL=ON \ + -DWITH_MOD_OCEANSIM:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/community/blender/blender.install b/community/blender/blender.install new file mode 100644 index 000000000..724bfce00 --- /dev/null +++ b/community/blender/blender.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a1d0f4102..211411c5d 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61189 2011-12-24 00:16:51Z giovanni $ +# $Id: PKGBUILD 61409 2011-12-30 12:30:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.32 +pkgver=0.8.33 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('ee973514615fc104be7cc41adf0862a6' +md5sums=('042c9f9f54ad02d08668e6a010682752' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index cfb7bf0cb..db7adca77 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 61276 2011-12-28 00:29:21Z stephane $ +# $Id: PKGBUILD 61430 2011-12-31 01:22:51Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle <ike.devolder@gmail.com> #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'qjson' 'libcdio' 'protobuf') + 'qjson' 'libcdio' 'protobuf' 'qca') makedepends=('cmake' 'boost') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' @@ -24,7 +24,7 @@ install=clementine.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON make } diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD new file mode 100644 index 000000000..e6e1c2aaf --- /dev/null +++ b/community/cuda-toolkit/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=cuda-toolkit +pkgver=4.0.17 +pkgrel=2 +_fedver=13 +pkgdesc="NVIDIA's GPU programming toolkit" +arch=('i686' 'x86_64') + +url="http://www.nvidia.com/object/cuda_home.html" +license=('custom') +depends=('gcc-libs') +if [ "$CARCH" = "i686" ]; then + _arch=32 + md5sums=('20d69b2d5bb7043ca7c2ad679c2825ed' + '21b65dc8f1be42f2b42217b5f62963f2' + 'c0781c63e726eaf03e10135b42b85729') +else + _arch=64 + md5sums=('152e1069f39fc8bbece875a1b9f576b6' + '21b65dc8f1be42f2b42217b5f62963f2' + 'c0781c63e726eaf03e10135b42b85729') +fi +install=cuda-toolkit.install +source=(http://developer.download.nvidia.com/compute/cuda/4_0/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run + cuda-toolkit.sh + cuda-toolkit.conf) + +build() { + cd "$srcdir" +} + +package() { + cd "$srcdir" + + mkdir -p $pkgdir/opt/cuda-toolkit + sh cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run --keep -- --prefix=$pkgdir/opt/cuda-toolkit + + sed -i "/unsupported GNU/d" $pkgdir/opt/cuda-toolkit/include/host_config.h + + install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh + install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf + install -Dm644 $pkgdir/opt/cuda-toolkit/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/cuda-toolkit/cuda-toolkit.conf b/community/cuda-toolkit/cuda-toolkit.conf new file mode 100644 index 000000000..0f55b39a7 --- /dev/null +++ b/community/cuda-toolkit/cuda-toolkit.conf @@ -0,0 +1,2 @@ +/opt/cuda-toolkit/lib64 +/opt/cuda-toolkit/lib diff --git a/community/cuda-toolkit/cuda-toolkit.install b/community/cuda-toolkit/cuda-toolkit.install new file mode 100644 index 000000000..4e1a1a6b7 --- /dev/null +++ b/community/cuda-toolkit/cuda-toolkit.install @@ -0,0 +1,8 @@ +post_install() { + echo "You need to relogin in order for the cuda-toolkit binaries to appear in your path." + post_upgrade +} + +post_upgrade() { + ldconfig -r . +} diff --git a/community/cuda-toolkit/cuda-toolkit.sh b/community/cuda-toolkit/cuda-toolkit.sh new file mode 100755 index 000000000..5609299b6 --- /dev/null +++ b/community/cuda-toolkit/cuda-toolkit.sh @@ -0,0 +1 @@ +PATH="/opt/cuda-toolkit/bin:$PATH" diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD index e07c5e235..5611a89e1 100644 --- a/community/espeak/PKGBUILD +++ b/community/espeak/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56889 2011-10-16 05:47:23Z bpiotrowski $ +# $Id: PKGBUILD 61395 2011-12-30 08:21:47Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: niQo # Contributor: Christoph Siegenthaler <csi@gmx.ch> pkgname=espeak -pkgver=1.45.05 +pkgver=1.46.01 pkgrel=1 pkgdesc="Text to Speech engine for good quality English, with support for other languages" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://espeak.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'portaudio') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip) -md5sums=('00692552d54f1849a1a0ad21ae3fc820') +md5sums=('a3e9de4b2a56ec19c059115dca587494') build() { cd $srcdir/$pkgname-$pkgver-source/src diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index 424fe129f..60b39ffdc 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59609 2007-01-01 00:07:53Z seblu $ +# $Id: PKGBUILD 61407 2011-12-30 10:27:27Z seblu $ # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> pkgname=ext4magic -pkgver=0.2.3 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('util-linux' 'e2fsprogs') source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b23ecf9dccc8b597fbbe2d149d0c08ac') +md5sums=('460b6642ee050d02b87395cc3ac6d4b6') build() { cd $pkgname-$pkgver diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD new file mode 100644 index 000000000..7a94ea7c1 --- /dev/null +++ b/community/opencollada/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Liganic <liganic-aur@gmx.net> +pkgname=opencollada +pkgver=864 +pkgrel=1 +pkgdesc="Stream based reader and writer library for COLLADA files" +arch=(i686 x86_64) +url="https://code.google.com/p/opencollada/" +license=('GPL') +depends=('libxml2') +makedepends=('subversion' 'ruby' 'cmake') +options=(!libtool !strip) + +_svntrunk=http://opencollada.googlecode.com/svn/trunk/ +_svnmod=opencollada + +build() { + cd "$srcdir" + msg "Connecting to SVN server...." + + if [[ -d "$_svnmod/.svn" ]]; then + (cd "$_svnmod" && svn up -r "$pkgver") + else + svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" + fi + + msg "SVN checkout done or server timeout" + msg "Starting build..." + + _builddir="$srcdir/$_svnmod-build" + + rm -rf $_builddir + cp -r "$srcdir/$_svnmod" $_builddir + cd $_builddir + + mkdir cmake + cd cmake + cmake ../ + cd $_builddir/cmake + make + +# cd scripts/ +# chmod +x unixbuild.sh +# ./unixbuild.sh $pkgdir/usr/ +} + +package() { + _builddir="$srcdir/$_svnmod-build" +# sed -i "s/libdir='.*'/libdir=\'\/usr\/lib\'/" $pkgdir/usr/lib/*.la* + +# Headers + rm -rf `find $_builddir -type d -name .svn` + mkdir -p $pkgdir/usr/include/opencollada/ + cd $_builddir + _include_dirs=$(find . -type d -name include -and -not -path '*Externals*' -print) + for dir in $_include_dirs;do + mkdir -p $pkgdir/usr/include/opencollada/${dir} + cp -r ${dir}/* $pkgdir/usr/include/opencollada/${dir}/.. + done + + rm -rf $pkgdir/usr/include/opencollada/generated* + + cp -r $_builddir/cmake/lib/ $pkgdir/usr/ + cp -r $_builddir/cmake/bin/ $pkgdir/usr/ +} + +# vim:set ts=2 sw=2 et: diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD new file mode 100644 index 000000000..63285dd4b --- /dev/null +++ b/community/openimageio/PKGBUILD @@ -0,0 +1,44 @@ +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +_pkg=OpenImageIO +pkgname=openimageio +pkgver=0.10.4 +pkgrel=1 +pkgdesc="A library for reading and writing images, including classes, utilities, and applications." +arch=(i686 x86_64) +url="http://www.openimageio.org/" +license=('custom') +depends=('openexr' 'boost-libs' 'jasper' 'glew') +makedepends=('cmake' 'qt' 'python2' 'boost') +optdepends=('qt: iv image viewer' 'python2: bindings support') +source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}") +md5sums=('08a1bc2b82862ad5547bba569f4f633f') + +build() { + cd "$srcdir"/$_pkg* + + # remove insecure rpath + sed -i "/RPATH/d" src/CMakeLists.txt + + make +} + +package() { + cd "$srcdir"/$_pkg*/dist/* + + # prepare dirs + install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages} + + # bin + cp -r bin include lib "$pkgdir/usr" + + # docs + cp -r doc/* "$pkgdir/usr/share/doc/$_pkg" + + # python module + cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 21db0e72b..650be0b03 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144653 2011-12-08 09:19:17Z andrea $ +# $Id: PKGBUILD 145767 2011-12-30 10:33:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,7 +8,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.7.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -68,7 +68,8 @@ package_kdeadmin-kuser() { package_kdeadmin-system-config-printer-kde() { pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' + 'cups' 'python2-gobject2') url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD index 7e9773a58..328e6d28e 100644 --- a/extra/qtscriptgenerator/PKGBUILD +++ b/extra/qtscriptgenerator/PKGBUILD @@ -1,38 +1,50 @@ -# $Id: PKGBUILD 75658 2010-04-02 04:17:23Z pierre $ +# $Id: PKGBUILD 145770 2011-12-30 11:51:06Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qtscriptgenerator pkgver=0.1.0 -pkgrel=4 -pkgdesc="Script generator for qt" +pkgrel=5 +pkgdesc="A tool that generates Qt bindings for Qt Script" arch=("i686" "x86_64") -url="http://code.google.com/p/qtscriptgenerator/" +url="https://code.google.com/p/qtscriptgenerator/" license=('GPL') -depends=('qt' 'phonon') +depends=('qt' 'phonon' 'qtwebkit') makedepends=('pkgconfig' 'mesa') -source=(http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz - phonon.patch - qtscriptgenerator-gcc44.patch) -md5sums=('ca4046ad4bda36cd4e21649d4b98886d' 'c0266892ecc645b3407f2203ee11a808'\ - 'a3d48d6a3cfdd9be397bef01d3e4f638') +source=("https://qtscriptgenerator.googlecode.com/files/${pkgname}-src-${pkgver}.tar.gz" + 'no-phonon.patch' + 'gcc44.patch' + 'qt48.patch' + 'phonon.patch') +sha1sums=('eeae733106369e289f257b754822bc372fd6ba75' + 'c50b26e6504f5c981a916860d9c3929e436e1067' + '87cd599403fa9bb441ddc27c77e0b6242e2cc150' + '5487e2ed1ce4d35b48b3433dc5cc2a1752a03ff1' + 'cca1cd546628a10a91475a82fe12ad2e4066a7d0') build() { - cd $srcdir/$pkgname-src-$pkgver/generator - patch -p1 -i $srcdir/qtscriptgenerator-gcc44.patch || return 1 + cd "${srcdir}"/$pkgname-src-$pkgver + + patch -p0 -i "${srcdir}"/gcc44.patch + patch -p1 -i "${srcdir}"/phonon.patch + patch -p1 -i "${srcdir}"/qt48.patch + patch -p1 -i "${srcdir}"/no-phonon.patch + # prepare plugins - patch -Np2 -i $srcdir/phonon.patch || return 1 - qmake || return 1 - make || return 1 - ./generator --include-paths=/usr/include || return 1 + cd generator + qmake + make + ./generator --include-paths=/usr/include + # build plugins - cd "$srcdir/$pkgname-src-$pkgver/qtbindings" - qmake || return 1 - make || return 1 + cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings + qmake + make } package() { - cd "$srcdir/$pkgname-src-$pkgver/qtbindings" + cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings # move plugins to correct directory - mkdir -p $pkgdir/usr/lib/qt/plugins/script - mv $srcdir/$pkgname-src-$pkgver/plugins/script/* $pkgdir/usr/lib/qt/plugins/script/ + install -d "${pkgdir}"/usr/lib/qt/plugins/script + mv "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \ + "${pkgdir}"/usr/lib/qt/plugins/script/ } diff --git a/extra/qtscriptgenerator/gcc44.patch b/extra/qtscriptgenerator/gcc44.patch new file mode 100644 index 000000000..dbb423e5d --- /dev/null +++ b/extra/qtscriptgenerator/gcc44.patch @@ -0,0 +1,15 @@ +# Patch from upstream bug tracker: +# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37 +# So far (2009-06-12) this has not been applied at upstream git repo + +diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h +--- generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100 ++++ generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100 +@@ -30,6 +30,7 @@ + #include <cctype> + + #include <fcntl.h> ++#include <cstdio> + + #ifdef HAVE_MMAP + # include <sys/mman.h> diff --git a/extra/qtscriptgenerator/no-phonon.patch b/extra/qtscriptgenerator/no-phonon.patch new file mode 100644 index 000000000..071b9aa69 --- /dev/null +++ b/extra/qtscriptgenerator/no-phonon.patch @@ -0,0 +1,34 @@ +diff -up qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon qtscriptgenerator-src-0.1.0/generator/build_all.txt +--- qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon 2010-10-26 02:53:53.000000000 -0500 ++++ qtscriptgenerator-src-0.1.0/generator/build_all.txt 2010-12-21 12:43:23.717989854 -0600 +@@ -6,7 +6,6 @@ + <load-typesystem name="typesystem_svg.xml" generate="yes" /> + <load-typesystem name="typesystem_network.xml" generate="yes" /> + <load-typesystem name="typesystem_xml.xml" generate="yes" /> +- <load-typesystem name="typesystem_phonon.xml" generate="yes" /> + <load-typesystem name="typesystem_webkit.xml" generate="yes" /> + <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" /> + <load-typesystem name="typesystem_uitools.xml" generate="yes" /> +diff -up qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon qtscriptgenerator-src-0.1.0/generator/generate.sh +--- qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon 2010-10-26 02:53:53.000000000 -0500 ++++ qtscriptgenerator-src-0.1.0/generator/generate.sh 2010-12-21 12:43:23.717989854 -0600 +@@ -12,8 +12,6 @@ xsltproc --stringparam source $PWD/types + + xsltproc --stringparam source $PWD/typesystem_sql-qtscript.xml merge.xsl typesystem_sql-common.xml > typesystem_sql.xml + +-xsltproc --stringparam source $PWD/typesystem_phonon-qtscript.xml merge.xsl typesystem_phonon-common.xml > typesystem_phonon.xml +- + xsltproc --stringparam source $PWD/typesystem_webkit-qtscript.xml merge.xsl typesystem_webkit-common.xml > typesystem_webkit.xml + + xsltproc --stringparam source $PWD/typesystem_xmlpatterns-qtscript.xml merge.xsl typesystem_xmlpatterns-common.xml > typesystem_xmlpatterns.xml +diff -up qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro +--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon 2010-10-26 02:53:53.000000000 -0500 ++++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro 2010-12-21 12:45:01.010979847 -0600 +@@ -6,7 +6,6 @@ SUBDIRS = qtscript_core \ + qtscript_sql \ + qtscript_svg \ + qtscript_xml \ +- qtscript_phonon \ + qtscript_webkit \ + qtscript_xmlpatterns \ + qtscript_uitools \ diff --git a/extra/qtscriptgenerator/phonon.patch b/extra/qtscriptgenerator/phonon.patch index cef0e1fa1..de22f4926 100644 --- a/extra/qtscriptgenerator/phonon.patch +++ b/extra/qtscriptgenerator/phonon.patch @@ -1,6 +1,7 @@ ---- b/generator/qtscript_masterinclude.h 2009-03-21 20:37:30.719523909 -0400 -+++ a/generator/qtscript_masterinclude.h 2009-03-21 21:00:25.108149339 -0400 -@@ -31,17 +31,41 @@ +diff -up qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h +--- qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon 2010-10-26 02:53:53.000000000 -0500 ++++ qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h 2010-12-11 17:00:08.456338081 -0600 +@@ -49,17 +49,46 @@ #include <QtUiTools/QtUiTools> @@ -18,19 +19,22 @@ +#include <QtXmlPatterns/QtXmlPatterns> + +#include <QtWebKit/QtWebKit> -+ -+#include "phonon/abstractaudiooutput.h" -+#include "phonon/abstractmediastream.h" -+#include "phonon/abstractvideooutput.h" -+#include "phonon/addoninterface.h" -+#include "phonon/audiooutput.h" -+#include "phonon/audiooutputinterface.h" -+#include "phonon/backendcapabilities.h" ++ ++#include "phonon/abstractaudiooutput.h" ++#include "phonon/abstractmediastream.h" ++#include "phonon/abstractvideooutput.h" ++#include "phonon/addoninterface.h" ++#include "phonon/audiodataoutput.h" ++#include "phonon/audiodataoutputinterface.h" ++#include "phonon/audiooutput.h" ++#include "phonon/audiooutputinterface.h" ++#include "phonon/backendcapabilities.h" +#include "phonon/backendinterface.h" +#include "phonon/effect.h" +#include "phonon/effectinterface.h" +#include "phonon/effectparameter.h" +#include "phonon/effectwidget.h" ++#include "phonon/globalconfig.h" +#include "phonon/mediacontroller.h" +#include "phonon/medianode.h" +#include "phonon/mediaobject.h" @@ -39,9 +43,11 @@ +#include "phonon/objectdescription.h" +#include "phonon/objectdescriptionmodel.h" +#include "phonon/path.h" ++#include "phonon/phonon_export.h" +#include "phonon/phonondefs.h" +#include "phonon/phononnamespace.h" +#include "phonon/platformplugin.h" ++#include "phonon/pulsesupport.h" +#include "phonon/seekslider.h" +#include "phonon/streaminterface.h" +#include "phonon/videoplayer.h" diff --git a/extra/qtscriptgenerator/qt48.patch b/extra/qtscriptgenerator/qt48.patch new file mode 100644 index 000000000..f397b5ab1 --- /dev/null +++ b/extra/qtscriptgenerator/qt48.patch @@ -0,0 +1,22 @@ +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 +@@ -2233,7 +2233,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 +@@ -2555,7 +2555,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD index 54aedf9a5..2b603ae36 100644 --- a/kde-unstable/kdeadmin/PKGBUILD +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145501 2011-12-22 22:47:38Z andrea $ +# $Id: PKGBUILD 145768 2011-12-30 10:34:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,7 +8,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.7.95 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -67,7 +67,8 @@ package_kdeadmin-kuser() { package_kdeadmin-system-config-printer-kde() { pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' + 'cups' 'python2-gobject2') url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 4eafae894..ecbba4e47 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -3,14 +3,14 @@ pkgbase=libretools pkgname=(libretools libretools-pr libretools-mips64el) -pkgver=$(date -u +%Y%m%d) -pkgrel=1 +pkgver=20111231 +pkgrel=2 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') url="http://parabolagnulinux.org" license=('GPL3+') depends=(openssh rsync git wget) -optdepends=(devtools) +optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)') makedepends=(git) backup=(etc/libretools.conf) install=libretools.install @@ -56,6 +56,7 @@ package_libretools() { install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop index 9d8e72920..62b8e8562 100644 --- a/libre/p7zip-libre/7zFM.desktop +++ b/libre/p7zip-libre/7zFM.desktop @@ -7,4 +7,3 @@ Categories=GTK;Utility;Archiving;Compression; Terminal=false Icon=p7zip Exec=7zFM - diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 61d0d5d71..2e6ab6e01 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,25 +8,24 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=4 +pkgrel=6 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar' url='http://p7zip.sourceforge.net/' license=('GPL') -arch=('i686' 'x86_64') -provides=("p7zip=$pkgver" 'unzip') -conflicts=('p7zip' 'unzip') -replaces=('p7zip' 'unzip') +arch=('i686' 'x86_64' 'mips64el') +provides=("p7zip=$pkgver") +conflicts=('p7zip') +replaces=('p7zip') +depends=('gcc-libs' 'bash') optdepends=('wxgtk: GUI' 'desktop-file-utils: desktop entries') makedepends=('yasm' 'nasm' 'wxgtk') source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2" 'p7zip-libre.patch' - 'unzip' # unzip replacement '7zFM.desktop') -md5sums=('c1eaf537e382b93adaa64713c96089fb' - '5b938c94cf80179137ea560dde510951' - '371af657bfb81a97bbeb5439896c814a' - '5b1c13139c42024d73abb67708ab6864') +sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9' + '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40') install=install mksource() { @@ -52,11 +51,12 @@ mksource() { build() { cd "${srcdir}/${_pkgname}_${pkgver}" - [[ $CARCH = x86_64 ]] \ - && cp makefile.linux_amd64_asm makefile.machine \ - || cp makefile.linux_x86_asm_gcc_4.X makefile.machine + case $CARCH in + x86_64) cp makefile.linux_amd64_asm makefile.machine ;; + i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;; + esac - make all4 OPTFLAGS="${CXXFLAGS}" + make all4 OPTFLAGS="${CXXFLAGS}" } package() { @@ -68,7 +68,6 @@ package() { DEST_MAN="/usr/share/man" # Integration with stuff... - install -D contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ @@ -79,8 +78,4 @@ package() { cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ chmod -R u+w "${pkgdir}/usr" - -# Install unzip replacement script - install -D -m755 "${srcdir}/unzip" "${pkgdir}/usr/bin/unzip" } - diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install index 2502df4a6..7f3cc4358 100644 --- a/libre/p7zip-libre/install +++ b/libre/p7zip-libre/install @@ -11,4 +11,3 @@ post_upgrade() { post_remove() { post_install } - diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index 9ac8350ce..6a517c112 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 145298 2011-12-21 14:25:49Z ibiru $ +# $Id: PKGBUILD 145619 2011-12-24 12:00:02Z ibiru $ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Anders Bostrom <anders.bostrom@home.se> pkgname=thunderbird-libre -pkgver=9.0 +pkgver=9.0.1 pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') license=('MPL' 'GPL') url="http://www.mozilla.org/thunderbird/" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -19,19 +19,18 @@ install=thunderbird.install source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 mozconfig thunderbird.desktop - thunderbird-3.0-lang.patch thunderbird-install-dir.patch - channel-prefs.js) -md5sums=('681bdf6362945b59b2bec23f8aecc7e7' + channel-prefs.js + vendor.js) +md5sums=('a5904751dbd33074682b438b732fdbab' 'ca98c2bf1017b33e19dae22fdcef2e73' 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '25b6fe16ac24cd5c852213e5c1adb272' 'aea906acf72c43dd82ead2fabcc1c6db' - '476ec205162340fb0679f522c9d31c3b') + '476ec205162340fb0679f522c9d31c3b' + '5a53179d14ae9631b7afe5e4d0fc0b25') build() { cd "$srcdir/comm-release" - patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch" patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" cp "$srcdir/mozconfig" .mozconfig @@ -46,6 +45,8 @@ package() { cd "$srcdir/comm-release" make -j1 -f client.mk DESTDIR="$pkgdir" install + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" diff --git a/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch index fc6e24c4c..74e692bf2 100644 --- a/libre/thunderbird-libre/thunderbird-install-dir.patch +++ b/libre/thunderbird-libre/thunderbird-install-dir.patch @@ -40,4 +40,3 @@ diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/ TOP_DIST = @TOP_DIST@ ifneq (,$(filter /%,$(TOP_DIST))) - diff --git a/libre/thunderbird-libre/vendor.js b/libre/thunderbird-libre/vendor.js new file mode 100644 index 000000000..170b505a8 --- /dev/null +++ b/libre/thunderbird-libre/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile index 5dd818e62..237edb616 100644 --- a/mozilla-testing/icecat-i18n/Makefile +++ b/mozilla-testing/icecat-i18n/Makefile @@ -7,25 +7,30 @@ # - sed # - wget +# Variables: +_pkgver=9.0 pkgver=9.0.1 +pkgrel=2 + +# Guts: ############################################################## default: PHONY all all: PHONY PKGBUILD -.PRECIOUS: PKGBUILD index.html: Makefile rm -f $@ wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ langpacks.txt: index.html Makefile egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ -PKGBUILD: langpacks.txt Makefile +PKGBUILD: PKGBUILD.in langpacks.txt Makefile sed \ - -e 's/^pkgver=.*/pkgver=$(pkgver)/' \ - -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e 's/@_PKGVER@/$(_pkgver)/' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ -e '/md5sums/,$$d' \ - $@ > $@.$$$$ && \ - makepkg -g >> $@.$$$$ && \ - mv $@.$$$$ $@ + PKGBUILD.in > $@ + makepkg -dg >> $@ clean: PHONY rm -f index.html langpacks.txt *.xpi diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD index 117d6a6bf..62f06df8e 100644 --- a/mozilla-testing/icecat-i18n/PKGBUILD +++ b/mozilla-testing/icecat-i18n/PKGBUILD @@ -3,7 +3,8 @@ # Based on firefox-i18n package # When updating to a newer upstream release: -# - Edit pkgver= in Makefile. +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in # - Run 'make'. It will take care of everything else for you. _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) @@ -14,7 +15,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) _pkgver=9.0 pkgver=9.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for GNUzilla IceCat." arch=('any') license=('MPL') diff --git a/mozilla-testing/icecat-i18n/PKGBUILD.in b/mozilla-testing/icecat-i18n/PKGBUILD.in new file mode 100644 index 000000000..90c901e31 --- /dev/null +++ b/mozilla-testing/icecat-i18n/PKGBUILD.in @@ -0,0 +1,46 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on firefox-i18n package + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_langpacks=@LANGPACKS@ + +pkgbase='icecat-i18n' +pkgname=($(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done)) +_pkgver=@_PKGVER@ +pkgver=@PKGVER@ +pkgrel=@PKGREL@ +pkgdesc="Language packs for GNUzilla IceCat." +arch=('any') +license=('MPL') +url="http://www.gnu.org/software/gnuzilla/" +depends=("icecat=${pkgver}") +source=($(for lang in ${_langpacks[@]} + do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + done)) +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" +} + +_path="/usr/lib/icecat-$_pkgver/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD index af040596a..b2b5eadef 100644 --- a/mozilla-testing/icecat/PKGBUILD +++ b/mozilla-testing/icecat/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Figue <ffigue at gmail> +# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> @@ -11,12 +11,10 @@ # the value for 'browser.dictionaries.download.url' in 'libre.patch' pkgname=icecat -_pkgver=9.0 pkgver=9.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/gnuzilla/" license=('MPL' 'GPL' 'LGPL') depends=( 'alsa-lib' @@ -32,7 +30,7 @@ depends=( 'mime-types' 'mozilla-common' 'mozilla-searchplugins' - 'nss' + 'nss>=3.13.1' 'sqlite3' 'startup-notification' ) @@ -49,29 +47,28 @@ makedepends=( 'yasm' 'zip' ) -options=(!buildflags !distcc) +url="http://www.gnu.org/software/gnuzilla/" install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig - mozconfig.old - mozconfig.default - libre.patch - parabola.patch icecat.desktop - icecat-safe.desktop) + icecat-safe.desktop + libre.patch + firefox-install-dir.patch + vendor.js) build() { - ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff - patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings # Fix PRE_RELEASE_SUFFIX - sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & @@ -80,43 +77,49 @@ build() { } package() { - ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR - cd "${srcdir}/${pkgname}-${pkgver}" - + cd "$srcdir/$pkgname-$pkgver" make -j1 -f client.mk DESTDIR="$pkgdir" install - msg2 "Finishing..." - install -m755 -d "${pkgdir}/usr/share/pixmaps" - install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref" - install -m755 -d "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/icecat.desktop" "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications" + brandingdir="browser/branding/unofficial" + for i in 16x16 32x32 48x48; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png" + done - ln -s "${pkgname}-${pkgver}" "${pkgdir}/usr/lib/${pkgname}-${_pkgver}" # WHY???!!! - ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" - rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell "${pkgdir}${ICECATDIR}/dictionaries" - ln -sf /usr/share/hyphen "${pkgdir}${ICECATDIR}/hyphenation" - ln -sf /usr/lib/mozilla/plugins "${pkgdir}${ICECATDIR}/plugins" - ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/searchplugins" + rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/searchplugins" # We don't want the development stuff - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}" - rm -rf "${pkgdir}/usr/share/idl" + rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl} - # Workaround for now: - # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname" + # Fix a bug with https-everywhere (duplicate rules) + rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" + + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" } md5sums=('a135581da2fd2845f268d7ca91054c06' '9c0cd5b45a3c4b04b872b6a900f62286' '0e5057d9427c6cd5e2f3b78fe34f50d9' '44959606e4a704e68a913e73fc941926' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9' '07e65752416e615fe04ce586bc58f86b' - '037b44b6e07d7115e0fb221d67b94272' + '1e4bcac59e93d21fffa6a1d1ad235247' + '0d053487907de4376d67d8f499c5502b') +md5sums=('a135581da2fd2845f268d7ca91054c06' + '9c0cd5b45a3c4b04b872b6a900f62286' 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9') + 'd93fe402b87cd000a869e1fd6badc6c9' + '07e65752416e615fe04ce586bc58f86b' + '1e4bcac59e93d21fffa6a1d1ad235247' + 'c382e35315047e4ca368d09383b39b8d') diff --git a/mozilla-testing/icecat/firefox-install-dir.patch b/mozilla-testing/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..b6f9700b3 --- /dev/null +++ b/mozilla-testing/icecat/firefox-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in +--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 ++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in +--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 ++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 +@@ -61,8 +61,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig index 5a04038be..c1305ac60 100644 --- a/mozilla-testing/icecat/mozconfig +++ b/mozilla-testing/icecat/mozconfig @@ -1,92 +1,57 @@ -# We are building the browser -ac_add_options --enable-application=browser -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 - -# Branding -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/unofficial - -# GNUzilla things -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla +. $topsrcdir/browser/config/mozconfig -# Operating system things ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -ac_add_options --with-pthreads - -ac_add_options --enable-toolkit-cairo-gtk2 -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-svg-renderer=cairo -ac_add_options --disable-toolkit-qt - -ac_add_options --enable-system-cairo -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --with-system-bz2 -ac_add_options --with-system-jpeg -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx +# System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --with-system-png +ac_add_options --with-system-jpeg ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads -ac_add_options --enable-freetype2 -ac_add_options --enable-pango +# Features ac_add_options --enable-startup-notification +ac_add_options --enable-gio - -# Enable/Disable web technologies -ac_add_options --enable-canvas -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-smil -ac_add_options --enable-svg - -# Enable/Disable "user-y" features -ac_add_options --enable-extensions="default spellcheck" - -ac_add_options --disable-safe-browsing -ac_add_options --enable-url-classifier -ac_add_options --disable-chatzilla -ac_add_options --disable-accessibility -ac_add_options --disable-calendar -ac_add_options --disable-composer - -# Enable/Disable "system-y" features +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter -ac_add_options --disable-debug -ac_add_options --disable-installer ac_add_options --disable-updater - -ac_add_options --disable-gnomevfs -ac_add_options --disable-javaxpcom -ac_add_options --enable-gio -ac_add_options --enable-libnotify -ac_add_options --enable-printing -ac_add_options --enable-xinerama -ac_add_options --enable-xterm-updates - -# Build settings -ac_add_options --disable-mochitest -ac_add_options --disable-pedantic -ac_add_options --disable-static ac_add_options --disable-tests -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-optimize -ac_add_options --enable-strip +ac_add_options --disable-mochitest +ac_add_options --disable-installer -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 +# Optimization +ac_add_options --enable-optimize # PGO ac_add_options --enable-profile-guided-optimization mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default index 21aaa0edd..01e047fc3 100644 --- a/mozilla-testing/icecat/mozconfig.default +++ b/mozilla-testing/icecat/mozconfig.default @@ -1,57 +1,35 @@ # This is a better commented version of the default .mozconfig from 9.0.1 - -# We are building the browser ac_add_options --enable-application=browser -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -# Branding -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/unofficial - -# GNUzilla things -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla - -# Operating system things ac_add_options --prefix=/usr/local #ac_add_options --with-default-mozilla-five-home=/usr/local/lib + +# System libraries +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +#ac_add_options --with-system-png +ac_add_options --disable-system-cairo #ac_add_options --with-pthreads +ac_add_options --disable-toolkit-qt ac_add_options --enable-toolkit-cairo-gtk2 ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-svg-renderer=cairo -ac_add_options --disable-toolkit-qt - -ac_add_options --disable-system-cairo -ac_add_options --with-system-jpeg -#ac_add_options --with-system-png -ac_add_options --with-system-zlib - +# Features +ac_add_options --enable-extensions="default spellcheck" ac_add_options --enable-freetype2 ac_add_options --enable-pango - -# Enable/Disable web technologies ac_add_options --enable-crypto #ac_add_options --enable-postscript ac_add_options --enable-svg ac_add_options --enable-xft -# Enable/Disable "user-y" features -ac_add_options --enable-extensions="default spellcheck" - ac_add_options --disable-chatzilla ac_add_options --disable-accessibility ac_add_options --disable-calendar ac_add_options --disable-composer -# Enable/Disable "system-y" features -ac_add_options --disable-crashreporter -ac_add_options --disable-debug -ac_add_options --disable-installer -ac_add_options --disable-updater - #ac_add_options --disable-jsd #ac_add_options --disable-libxul ac_add_options --disable-ipc @@ -62,9 +40,24 @@ ac_add_options --disable-profilesharing ac_add_options --disable-xinerama ac_add_options --disable-xprint -# Build settings -ac_add_options --disable-elf-dynstr-gc -ac_add_options --disable-mochitest +ac_add_options --disable-crashreporter +ac_add_options --disable-updater ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization +ac_add_options --disable-elf-dynstr-gc ac_add_options --enable-optimize="-pipe -O3" ac_add_options --enable-strip + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla diff --git a/mozilla-testing/icecat/mozconfig.firefox b/mozilla-testing/icecat/mozconfig.firefox new file mode 100644 index 000000000..428503642 --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.firefox @@ -0,0 +1,46 @@ +# This is the .mozconfig used by Arch for Firefox +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old index 3ae3e1c2e..a790aee48 100644 --- a/mozilla-testing/icecat/mozconfig.old +++ b/mozilla-testing/icecat/mozconfig.old @@ -1,85 +1,78 @@ # This is a better commented version of the .mozconfig used by the Parabola # package < v9 - -# We are building the browser . $topsrcdir/browser/config/mozconfig -# Branding -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/unofficial - -# GNUzilla things -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla - -# Operating system things ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -ac_add_options --with-pthreads - -ac_add_options --enable-default-toolkit=cairo-gtk2 - -ac_add_options --enable-system-cairo -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --with-system-bz2 -ac_add_options --with-system-jpeg -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx +# System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --with-system-png +ac_add_options --with-system-jpeg ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +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 --with-pthreads -ac_add_options --enable-pango -ac_add_options --enable-startup-notification +ac_add_options --enable-default-toolkit=cairo-gtk2 +# Features +ac_add_options --enable-extensions=default + +ac_add_options --enable-url-classifier +ac_add_options --enable-startup-notification +ac_add_options --enable-gio -# Enable/Disable web technologies ac_add_options --enable-canvas ac_add_options --enable-canvas3d ac_add_options --enable-places ac_add_options --enable-smil ac_add_options --enable-svg -# Enable/Disable "user-y" features -ac_add_options --enable-extensions=default - -ac_add_options --disable-safe-browsing -ac_add_options --enable-url-classifier - -# Enable/Disable "system-y" features -ac_add_options --disable-crashreporter -ac_add_options --disable-debug -ac_add_options --disable-installer -ac_add_options --disable-update - -ac_add_options --disable-gnomevfs ac_add_options --disable-javaxpcom -ac_add_options --enable-gio ac_add_options --enable-libnotify ac_add_options --enable-printing ac_add_options --enable-xinerama ac_add_options --enable-xterm-updates -# Build settings +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-update +ac_add_options --disable-tests ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization ac_add_options --disable-pedantic ac_add_options --disable-static -ac_add_options --disable-tests ac_add_options --enable-install-strip ac_add_options --enable-jemalloc ac_add_options --enable-optimize ac_add_options --enable-strip -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - # PGO ac_add_options --enable-profile-guided-optimization mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# IceCat +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 diff --git a/mozilla-testing/icecat/vendor.js b/mozilla-testing/icecat/vendor.js new file mode 100644 index 000000000..808d1b118 --- /dev/null +++ b/mozilla-testing/icecat/vendor.js @@ -0,0 +1,5 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile index a0a767c3d..64e140af6 100644 --- a/mozilla-testing/iceweasel-i18n/Makefile +++ b/mozilla-testing/iceweasel-i18n/Makefile @@ -5,32 +5,55 @@ # - pacman # - sed +# Variables: +# This is to get it from Debian Sid +debname=iceweasel-l10n +debver=9.0+debian +debrel=1 +debrepo=http://ftp.debian.org/debian/pool/main/ + +pkgver=9.0 +pkgrel=2 + +# Guts: ############################################################## + default: PHONY all all: PHONY $(MAKE) clean $(MAKE) PKGBUILD .PRECIOUS: PKGBUILD -PKGBUILD.g: Makefile +PKGBUILD.list: Makefile sed \ - -e '/This line is here/,$$d' \ - -e 's/^pkgname=/_pkgname=/' \ - PKGBUILD > $@ - echo 'pkgname=foo' >> $@ + -e 's/@DEBNAME@/$(debname)/' \ + -e 's/@DEBVER@/$(debver)/' \ + -e 's/@DEBREL@/$(debrel)/' \ + -e 's%@DEBREPO@%$(debrepo)%' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(phony)/" \ + -e '/CUT HERE/,$$d' \ + PKGBUILD.in > $@ echo 'package() { exit 0; }' >> $@ makepkg -gp $@ >> $@ -langpacks.txt: PKGBUILD.g Makefile +langpacks.txt: PKGBUILD.list Makefile makepkg -dp $< ls src/*/upstream | sed 's/\.xpi//' > $@ -PKGBUILD: langpacks.txt Makefile +PKGBUILD: PKGBUILD.in langpacks.txt Makefile sed \ - -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e 's/@DEBNAME@/$(debname)/' \ + -e 's/@DEBVER@/$(debver)/' \ + -e 's/@DEBREL@/$(debrel)/' \ + -e 's%@DEBREPO@%$(debrepo)%' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ + -e '/CUT HERE/d' \ -e '/md5sums/,$$d' \ - $@ > $@.$$$$ && \ - makepkg -g >> $@.$$$$ && \ - mv $@.$$$$ $@ + PKGBUILD.in > $@ + makepkg -dg >> $@ clean: PHONY - rm -f PKGBUILD.g langpacks.txt + rm -f PKGBUILD.list langpacks.txt .PHONY: PHONY FORCE diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD index 45555b019..8a744f7a5 100644 --- a/mozilla-testing/iceweasel-i18n/PKGBUILD +++ b/mozilla-testing/iceweasel-i18n/PKGBUILD @@ -1,10 +1,13 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on icecat-i18n package, which is in turn based on firefox-i18n # When updating to a newer upstream release: -# - Update pkgver= and _deb*= below. -# - Run "make". This will do everything else for you. +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. -# We're getting this from Debian Sid _debname=iceweasel-l10n _debver=9.0+debian _debrel=1 @@ -19,8 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) _pkgver=9.0 pkgver=${_debver}.${_debrel} -pkgrel=1 - +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -28,21 +30,26 @@ url="http://www.geticeweasel.org/" license=('MPL') depends=("iceweasel=${_pkgver}") source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz") + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc") noextract=($(for lang in ${_langpacks[@]} do echo $lang.xpi done)) -build() { - cd "${srcdir}" +dpkg-source() { # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc cd "${_debname}-${_debver}" patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" + cd .. +} + +build() { + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc } _path="/usr/lib/iceweasel-${_pkgver}/extensions" -# This line is here for auto-regeneration purposes. DO NOT EDIT! for lang in ${_langpacks[@]} do @@ -54,4 +61,5 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { done md5sums=('d0dc0653b9d7642e6d346b54fb1782ae' - '493920a716fa40daeb5bd8cdfdbfe6a6') + '493920a716fa40daeb5bd8cdfdbfe6a6' + 'd03f6db3a354e9208500898738506e50') diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD.in b/mozilla-testing/iceweasel-i18n/PKGBUILD.in new file mode 100644 index 000000000..691c80c0e --- /dev/null +++ b/mozilla-testing/iceweasel-i18n/PKGBUILD.in @@ -0,0 +1,63 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on icecat-i18n package, which is in turn based on firefox-i18n + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_debname=@DEBNAME@ +_debver=@DEBVER@ +_debrel=@DEBREL@ +_debrepo=@DEBREPO@ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=@LANGPACKS@ + +pkgbase=iceweasel-i18n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=@PKGVER@ +pkgver=${_debver}.${_debrel} +pkgrel=@PKGREL@ + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel=${_pkgver}") +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc") +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + cd "${_debname}-${_debver}" + patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" + cd .. +} + +build() { + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc +} + +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + +# CUT HERE <-- Separates package_*() functions from everything else. + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD new file mode 100644 index 000000000..c565313a8 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/PKGBUILD @@ -0,0 +1,148 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Henry Jensen <hjensen@connochaetos.org> + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=9.0.1 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=iceweasel +pkgname=iceweasel-libre +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64' 'mips64el') +license=('GPL2' 'MPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss>=3.13.1' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'librsvg' + 'mesa' + 'p7zip-libre' + 'pkg-config' + 'python2' + 'quilt' + 'wireless_tools' + 'yasm' + 'zip' +) +url="http://www.geticeweasel.org/" +install=iceweasel.install +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" + mozconfig + xulrunner-copy-stub.patch + libre.patch + iceweasel-install-dir.patch + region.properties + vendor.js) + +if [ "$_pkgname" != "$pkgname" ]; then + provides+=("$_pkgname") + conflicts+=("$_pkgname") +fi + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" + mv debian "${_debname}-${_debver}" + cd "${_debname}-${_debver}" + quilt push -a + find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? + cd .. +} + +build() { + msg2 "Applying Debian patches..." + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + + # This will make life more sane + cd "${srcdir}" + ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}" + + msg2 "Starting normal build..." + cd "$srcdir/$_pkgname-$pkgver" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix + patch -Np1 -i "$srcdir/libre.patch" + cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON="/usr/bin/python2" + + 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 +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref" + + brandingdir="debian/branding" + for i in 16x16 32x32 64x64; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png" + done + install -Dm644 "$brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg" + + install -d "$pkgdir/usr/share/applications" + install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" + #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + + rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/searchplugins" + + # We don't want the development stuff + rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl} + + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" +} + +md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' + '6cde9fe38df1434fdcc0f3a078b0238e' + 'd9b5f2a893ad80da492aec8c9a7cbb7c' + 'c401067e1ffcb8df5a53076845d28a88' + 'a485a2b5dc544a8a2bd40c985d2e5813' + '8942889dfa6936dc034e9c2f3503325a' + 'e529742c0a425648087bc3ce537fe4c5' + 'f1c76e7e244257856a386ca2de69bdf0' + '0d053487907de4376d67d8f499c5502b') diff --git a/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch new file mode 100644 index 000000000..f80a3eca9 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in +--- iceweasel-9.0.1.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 ++++ iceweasel-9.0.1/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in +--- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 ++++ iceweasel-9.0.1/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 +@@ -60,8 +60,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/mozilla-testing/iceweasel-libre/iceweasel.install b/mozilla-testing/iceweasel-libre/iceweasel.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/mozilla-testing/iceweasel-libre/iceweasel.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/mozilla-testing/iceweasel-libre/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch new file mode 100644 index 000000000..6f1fe82ff --- /dev/null +++ b/mozilla-testing/iceweasel-libre/libre.patch @@ -0,0 +1,242 @@ +diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js +--- iceweasel-9.0.1.orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0.1/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:home"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js +--- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0.1/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + browser.search.order.2=Yahoo + browser.search.order.3=Bing + +@@ -17,7 +17,7 @@ + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +diff -urN iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in +--- iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 +@@ -11,14 +11,12 @@ + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> + <DD>@bookmarks_toolbarfolder_description@ + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A> ++ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a> ++ <DT><A HREF="https://parabolagnulinux.org/">Parabola</a> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> ++ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A> ++ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A> ++ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a> + </DL><p> + </DL><p> +diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html +--- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ + </p> + <p> + <a><a> anchor</a><br> +- <a href="http://www.google.com"><a> a + href</a> ++ <a href="http://www.duckduckgo.com"><a> a + href</a> + </p> + <p> + <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> +diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul +--- iceweasel-9.0.1.orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0.1/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul +--- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000 ++++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000 +@@ -69,6 +69,6 @@ + label="setViewportScale"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="content" ++ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content" + remote="true"/> + </window> +diff -urN iceweasel-9.0.1.orig/mobile/app/mobile.js iceweasel-9.0.1/mobile/app/mobile.js +--- iceweasel-9.0.1.orig/mobile/app/mobile.js 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0.1/mobile/app/mobile.js 2011-12-21 10:04:04.976062646 +0000 +@@ -217,12 +217,13 @@ + /* preferences for the Get Add-ons pane */ + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++ ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); + + /* preference for the locale picker */ + pref("extensions.getLocales.get.url", ""); +@@ -239,7 +240,7 @@ + pref("privacy.popups.showBrowserMessage", true); + + pref("keyword.enabled", true); +-pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + + pref("accessibility.typeaheadfind", false); + pref("accessibility.typeaheadfind.timeout", 5000); +diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties +--- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000 ++++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + + # This is the default set of web based feed handlers shown in the reader + # selection UI +@@ -12,7 +12,7 @@ + browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s + + # Keyword URL (for location bar searches) +-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= ++keyword.URL=http://duckduckgo.com/?q= + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js +--- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0.1/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + +-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + pref("keyword.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties +--- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000 ++++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000 +@@ -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=gnuzilla.gnu.org ++more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html ++pluginupdates_label=gnuzilla.gnu.org ++pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html ++plugindoc_label=gnuzilla.gnu.org ++plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html + diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig new file mode 100644 index 000000000..88e5ec422 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/mozconfig @@ -0,0 +1,58 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# Iceweasel +ac_add_options --disable-official-branding +ac_add_options --with-branding=debian/branding + +# ConnochaetOS +#ac_add_options --build=i586-pc-linux-gnu +#ac_add_options --host=i586-pc-linux-gnu +#export USE_SHORT_LIBNAME=1 +#mk_add_options USE_SHORT_LIBNAME=1 + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 diff --git a/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch new file mode 100644 index 000000000..f0f7325a5 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch @@ -0,0 +1,12 @@ +--- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 ++++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 +@@ -253,6 +253,9 @@ + pref("font.language.group", "chrome://global/locale/intl.properties"); + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // 0=lines, 1=pages, 2=history , 3=text size + pref("mousewheel.withcontrolkey.action",3); + pref("mousewheel.withshiftkey.action",2); diff --git a/mozilla-testing/iceweasel-libre/region.properties b/mozilla-testing/iceweasel-libre/region.properties new file mode 100644 index 000000000..2e980987e --- /dev/null +++ b/mozilla-testing/iceweasel-libre/region.properties @@ -0,0 +1,23 @@ +# Default search engine +browser.search.defaultenginename=Duck Duck Go (SSL) + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=Duck Duck Go (SSL) +browser.search.order.2=Duck Duck Go (Lite) + + +# Keyword URL (for location bar searches) +keyword.URL=https://duckduckgo.com/?q= + +# URL for site-specific search engines +# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site +# to be searched and the user's search query. Place them in the appropriate location +# for your locale's URL but do not translate them. +browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} + +# increment this number when anything gets changed in the list below. This will +# cause Firefox to re-read these prefs and inject any new handlers into the +# profile database. Note that "new" is defined as "has a different URL"; this +# 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 diff --git a/mozilla-testing/iceweasel-libre/vendor.js b/mozilla-testing/iceweasel-libre/vendor.js new file mode 100644 index 000000000..d8d606bc1 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch new file mode 100644 index 000000000..e3b8e9376 --- /dev/null +++ b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 ++++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 +@@ -257,7 +257,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) + endif + endif + diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 63030deb9..2f6bd0943 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61356 2011-12-28 16:49:01Z heftig $ +# $Id: PKGBUILD 61422 2011-12-30 16:00:33Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=2 +pkgrel=3 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -29,6 +29,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.14-reinstall-nis-rpc-headers.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.15-math64crash.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -41,6 +42,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '55febbb72139ac7b65757df085024b83' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' + 'dc7550e659ddd685bd78a930d15a01f2' 'a8f4549c716cd37244fbf1ed059497f8') build() { @@ -85,6 +87,10 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + # revert optimized math routines that can cause crashes (FS#27736, FS#27743) + # obviously not a real fix... + patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch b/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch new file mode 100644 index 000000000..d315bf266 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch @@ -0,0 +1,184 @@ +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index be68903..a032da8 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -1,5 +1,5 @@ + ifeq ($(subdir),math) +-libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \ ++libm-sysdep_routines += s_floorf-c s_ceilf-c \ + s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c + + ifeq ($(have-mfma4),yes) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c +deleted file mode 100644 +index 6a5ea3f..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c ++++ /dev/null +@@ -1,2 +0,0 @@ +-#define __ceil __ceil_c +-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S +deleted file mode 100644 +index d0f8da3..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* Copyright (C) 2011 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ +- +-#include <machine/asm.h> +-#include <init-arch.h> +- +- +-ENTRY(__ceil) +- .type __ceil, @gnu_indirect_function +- call __get_cpu_features@plt +- movq %rax, %rdx +- leaq __ceil_sse41(%rip), %rax +- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx) +- jnz 2f +- leaq __ceil_c(%rip), %rax +-2: ret +-END(__ceil) +-weak_alias (__ceil, ceil) +- +- +-ENTRY(__ceil_sse41) +- roundsd $2, %xmm0, %xmm0 +- ret +-END(__ceil_sse41) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c +deleted file mode 100644 +index 68733b6..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c ++++ /dev/null +@@ -1,3 +0,0 @@ +-#undef __floor +-#define __floor __floor_c +-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S +deleted file mode 100644 +index 514ea95..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor.S ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* Copyright (C) 2011 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ +- +-#include <machine/asm.h> +-#include <init-arch.h> +- +- +-ENTRY(__floor) +- .type __floor, @gnu_indirect_function +- call __get_cpu_features@plt +- movq %rax, %rdx +- leaq __floor_sse41(%rip), %rax +- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx) +- jnz 2f +- leaq __floor_c(%rip), %rax +-2: ret +-END(__floor) +-weak_alias (__floor, floor) +- +- +-ENTRY(__floor_sse41) +- roundsd $1, %xmm0, %xmm0 +- ret +-END(__floor_sse41) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c +deleted file mode 100644 +index 1ba9dbc..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c ++++ /dev/null +@@ -1,31 +0,0 @@ +-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT +-# include <init-arch.h> +-# include <math.h> +-# undef NAN +- +-extern double __cos_sse2 (double); +-extern double __sin_sse2 (double); +-extern double __cos_avx (double); +-extern double __sin_avx (double); +-# ifdef HAVE_FMA4_SUPPORT +-extern double __cos_fma4 (double); +-extern double __sin_fma4 (double); +-# else +-# undef HAS_FMA4 +-# define HAS_FMA4 0 +-# define __cos_fma4 ((void *) 0) +-# define __sin_fma4 ((void *) 0) +-# endif +- +-libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2); +-weak_alias (__cos, cos) +- +-libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2); +-weak_alias (__sin, sin) +- +-# define __cos __cos_sse2 +-# define __sin __sin_sse2 +-#endif +- +- +-#include <sysdeps/ieee754/dbl-64/s_sin.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c +deleted file mode 100644 +index 8f6601e..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c ++++ /dev/null +@@ -1,21 +0,0 @@ +-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT +-# include <init-arch.h> +-# include <math.h> +- +-extern double __tan_sse2 (double); +-extern double __tan_avx (double); +-# ifdef HAVE_FMA4_SUPPORT +-extern double __tan_fma4 (double); +-# else +-# undef HAS_FMA4 +-# define HAS_FMA4 0 +-# define __tan_fma4 ((void *) 0) +-# endif +- +-libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2); +- +-# define tan __tan_sse2 +-#endif +- +- +-#include <sysdeps/ieee754/dbl-64/s_tan.c> diff --git a/multilib-testing/lib32-libpulse/PKGBUILD b/multilib-testing/lib32-libpulse/PKGBUILD new file mode 100644 index 000000000..dc5875fc0 --- /dev/null +++ b/multilib-testing/lib32-libpulse/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 61429 2011-12-31 00:45:02Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +_pkgbasename=libpulse +pkgname=lib32-$_pkgbasename +pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" +pkgver=1.1 +pkgrel=2 +arch=(x86_64) +url="http://pulseaudio.org/" +license=(GPL LGPL) +depends=(lib32-dbus-core lib32-json-c + lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile + $_pkgbasename) +makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex lib32-gtk2) +optdepends=('lib32-alsa-plugins: ALSA support') +provides=("lib32-pulseaudio=$pkgver") +conflicts=(lib32-pulseaudio) +replaces=(lib32-pulseaudio) +options=(!emptydirs !libtool) +source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz") +sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee') + +_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" + +build() { + cd "$srcdir/pulseaudio-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + --localstatedir=/var \ + --disable-hal \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make -C src $_libs +} + +package() { + cd "$srcdir/pulseaudio-$pkgver" + make -j1 -C src DESTDIR="$pkgdir" \ + lib_LTLIBRARIES="$_libs" install-libLTLIBRARIES + make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA +} diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index ed7a13eec..fe44bcacc 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61067 2011-12-21 20:49:25Z svenstaro $ +# $Id: PKGBUILD 61427 2011-12-30 20:43:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.35 -pkgrel=3 +pkgver=1.3.36 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('5833787fcd7fee5a2299fade10a2760d') +md5sums=('51e20231aa72a7b9db89aefdae8e92e3') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index 9bbd91765..58ba21ef3 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145698 2011-12-28 08:07:08Z allan $ +# $Id: PKGBUILD 145765 2011-12-30 08:17:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=2 +pkgrel=3 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -31,6 +31,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.14-reinstall-nis-rpc-headers.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.15-math64crash.patch nscd locale.gen.txt locale-gen) @@ -45,6 +46,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '55febbb72139ac7b65757df085024b83' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' + 'dc7550e659ddd685bd78a930d15a01f2' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -100,6 +102,10 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + # revert optimized math routines that can cause crashes (FS#27736, FS#27743) + # obviously not a real fix... + patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf diff --git a/testing/glibc/glibc-2.15-math64crash.patch b/testing/glibc/glibc-2.15-math64crash.patch new file mode 100644 index 000000000..d315bf266 --- /dev/null +++ b/testing/glibc/glibc-2.15-math64crash.patch @@ -0,0 +1,184 @@ +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index be68903..a032da8 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -1,5 +1,5 @@ + ifeq ($(subdir),math) +-libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \ ++libm-sysdep_routines += s_floorf-c s_ceilf-c \ + s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c + + ifeq ($(have-mfma4),yes) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c +deleted file mode 100644 +index 6a5ea3f..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c ++++ /dev/null +@@ -1,2 +0,0 @@ +-#define __ceil __ceil_c +-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S +deleted file mode 100644 +index d0f8da3..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* Copyright (C) 2011 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ +- +-#include <machine/asm.h> +-#include <init-arch.h> +- +- +-ENTRY(__ceil) +- .type __ceil, @gnu_indirect_function +- call __get_cpu_features@plt +- movq %rax, %rdx +- leaq __ceil_sse41(%rip), %rax +- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx) +- jnz 2f +- leaq __ceil_c(%rip), %rax +-2: ret +-END(__ceil) +-weak_alias (__ceil, ceil) +- +- +-ENTRY(__ceil_sse41) +- roundsd $2, %xmm0, %xmm0 +- ret +-END(__ceil_sse41) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c +deleted file mode 100644 +index 68733b6..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c ++++ /dev/null +@@ -1,3 +0,0 @@ +-#undef __floor +-#define __floor __floor_c +-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S +deleted file mode 100644 +index 514ea95..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor.S ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* Copyright (C) 2011 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ +- +-#include <machine/asm.h> +-#include <init-arch.h> +- +- +-ENTRY(__floor) +- .type __floor, @gnu_indirect_function +- call __get_cpu_features@plt +- movq %rax, %rdx +- leaq __floor_sse41(%rip), %rax +- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx) +- jnz 2f +- leaq __floor_c(%rip), %rax +-2: ret +-END(__floor) +-weak_alias (__floor, floor) +- +- +-ENTRY(__floor_sse41) +- roundsd $1, %xmm0, %xmm0 +- ret +-END(__floor_sse41) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c +deleted file mode 100644 +index 1ba9dbc..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c ++++ /dev/null +@@ -1,31 +0,0 @@ +-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT +-# include <init-arch.h> +-# include <math.h> +-# undef NAN +- +-extern double __cos_sse2 (double); +-extern double __sin_sse2 (double); +-extern double __cos_avx (double); +-extern double __sin_avx (double); +-# ifdef HAVE_FMA4_SUPPORT +-extern double __cos_fma4 (double); +-extern double __sin_fma4 (double); +-# else +-# undef HAS_FMA4 +-# define HAS_FMA4 0 +-# define __cos_fma4 ((void *) 0) +-# define __sin_fma4 ((void *) 0) +-# endif +- +-libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2); +-weak_alias (__cos, cos) +- +-libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2); +-weak_alias (__sin, sin) +- +-# define __cos __cos_sse2 +-# define __sin __sin_sse2 +-#endif +- +- +-#include <sysdeps/ieee754/dbl-64/s_sin.c> +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c +deleted file mode 100644 +index 8f6601e..0000000 +--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c ++++ /dev/null +@@ -1,21 +0,0 @@ +-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT +-# include <init-arch.h> +-# include <math.h> +- +-extern double __tan_sse2 (double); +-extern double __tan_avx (double); +-# ifdef HAVE_FMA4_SUPPORT +-extern double __tan_fma4 (double); +-# else +-# undef HAS_FMA4 +-# define HAS_FMA4 0 +-# define __tan_fma4 ((void *) 0) +-# endif +- +-libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2); +- +-# define tan __tan_sse2 +-#endif +- +- +-#include <sysdeps/ieee754/dbl-64/s_tan.c> diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD index 5ef2c1c56..32504560a 100644 --- a/~lukeshu/thingutils-git/PKGBUILD +++ b/~lukeshu/thingutils-git/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=thingutils pkgname=$_pkgname-git provides=($_pkgname) conflicts=($_pkgname) -pkgver=20111224 +pkgver=20111231 pkgrel=1 pkgdesc="" arch=('any') @@ -19,6 +19,7 @@ depends=( 'sysstat' # sysfiles 'offlineimap' # offlineimap-runner 'wdiff' # chardiff + 'acpi' # batterymon, tempmon ) makedepends=('git') |