diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/avidemux/PKGBUILD | 28 | ||||
-rw-r--r-- | extra/avidemux/avidemux.install | 11 | ||||
-rw-r--r-- | extra/boost/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/brltty/PKGBUILD | 5 | ||||
-rw-r--r-- | extra/enchant/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/gnutls/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/gptfdisk/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/hugin/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/hunspell/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/icu/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/kdesdk/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libreoffice/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/libwebkit/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/libwebkit/replace-switch-with-given-when.patch | 45 | ||||
-rw-r--r-- | extra/php/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/swh-plugins/PKGBUILD | 51 | ||||
-rw-r--r-- | extra/swh-plugins/mbeq_crash_fix.patch | 39 | ||||
-rw-r--r-- | extra/wireshark/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/xulrunner/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/zziplib/PKGBUILD | 37 | ||||
-rw-r--r-- | extra/zziplib/zziplib-0.13.60-ldflags.patch | 14 |
21 files changed, 257 insertions, 94 deletions
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 3f34eaf4f..59dec52ad 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,29 +1,22 @@ -# $Id: PKGBUILD 117286 2011-03-30 16:57:22Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 126410 2011-06-05 07:19:37Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.5.4 -pkgrel=4 +pkgver=2.5.5 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz 2.5.4_audioDevice.patch - x264.patch) -md5sums=('b849460f6480df92bfd72d1a3dc288d4' - 'ef375051a12c911c6bd8a7bf85b76330' - '0d01294b8171a856f718ab8131bea074') + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +md5sums=('33bbe210c6826cea1987ed18a41d57a7') build() { cd "${srcdir}/${pkgbase}_${pkgver}" - #gcc 4.6 workaround - export CXXFLAGS="$CXXFLAGS -fpermissive" - patch -p0 < ../2.5.4_audioDevice.patch - patch -Np1 -i "${srcdir}/x264.patch" mkdir build cd build cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. @@ -53,6 +46,7 @@ package_avidemux-cli() { 'opencore-amr: for the corresponding audio decoder plugin' 'esound: for the corresponding audio device plugin' 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' 'sdl: for the corresponding audio device plugin' 'x264: for the corresponding video encoder plugin' 'xvidcore: for the corresponding video encoder plugin') @@ -81,7 +75,8 @@ package_avidemux-cli() { package_avidemux-gtk() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv') + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" @@ -100,7 +95,8 @@ package_avidemux-gtk() { package_avidemux-qt() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt') + depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" diff --git a/extra/avidemux/avidemux.install b/extra/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index d95541e63..9329f188a 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ +# $Id: PKGBUILD 126149 2011-06-01 20:01:54Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.46.1 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 431cf11ec..e173c7e6c 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 102193 2010-12-06 16:20:30Z andrea $ +# $Id: PKGBUILD 126155 2011-06-01 20:36:52Z andyrtr $ +# Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64') url="http://mielke.cc/brltty" diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD index f59305f2c..1f95981e7 100644 --- a/extra/enchant/PKGBUILD +++ b/extra/enchant/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77532 2010-04-15 13:26:42Z andrea $ +# $Id: PKGBUILD 126152 2011-06-01 20:31:07Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=enchant pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" @@ -20,11 +20,11 @@ build() { ./configure --prefix=/usr \ --disable-static \ --disable-ispell \ - --with-myspell-dir=/usr/share/myspell || return 1 - make || return 1 + --with-myspell-dir=/usr/share/myspell + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 14d2ba1b4..9ade982c2 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123950 2011-05-14 15:29:59Z andyrtr $ +# $Id: PKGBUILD 126447 2011-06-05 13:11:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.12.5 +pkgver=2.12.6.1 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2d0bd5ae11534074fcd78da6ea384e64') +md5sums=('e724e37f96984f3b0a215c11f03729bd') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,7 +28,8 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make check # passes all || /bin/true + #make check # passes all || /bin/true + make check || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html } package() { diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index e5f2470f3..c3e5215e6 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124135 2011-05-16 17:24:42Z foutrelis $ +# $Id: PKGBUILD 126131 2011-06-01 17:33:51Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" @@ -19,13 +19,13 @@ md5sums=('7c8d810df61e81c821bef399b832e89e') build() { cd "$srcdir/$pkgname-$pkgver" - + make } package () { cd "$srcdir/$pkgname-$pkgver" - + install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} install -t "$pkgdir/sbin" gdisk sgdisk fixparts install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index d09e302dd..10ba90ba6 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ +# $Id: PKGBUILD 126376 2011-06-05 04:38:18Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin -pkgver=2010.4.0 -pkgrel=4 +pkgver=2011.0.0 +pkgrel=1 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" @@ -14,23 +14,18 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') makedepends=('zip' 'cmake' 'boost') install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) -md5sums=('bfd716655461987312b2f2f00c90dcc5' - '4393c7b31da60f230c85e63a6a2e43a0') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' - '52798a155a037f853f41402f797e8a4cb6bb3e07') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ac8a129b4c3021233df6d9368c8164cf') +sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116') build() { cd "${srcdir}" - (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) mkdir build && cd build - cmake "${srcdir}/${pkgname}-${pkgver}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ -DENABLE_LAPACK=yes - make } diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD index e73e0e875..fefa04db4 100644 --- a/extra/hunspell/PKGBUILD +++ b/extra/hunspell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108140 2011-01-30 10:19:56Z andyrtr $ +# $Id: PKGBUILD 125861 2011-05-30 15:55:43Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=hunspell -pkgver=1.2.15 +pkgver=1.3.2 pkgrel=1 pkgdesc="Spell checker and morphological analyzer library and program" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('gcc-libs' 'readline') optdepends=('perl: for ispellaff2myspell') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz) -md5sums=('3fa2644b8d48cae48cb0967ffba91c9d') +md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8') build() { cd "$srcdir/hunspell-$pkgver" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 6e7524f53..8321c3e82 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 123623 2011-05-11 21:09:44Z andyrtr $ +# $Id: PKGBUILD 125862 2011-05-30 16:53:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=4.6.1 -pkgrel=2 +pkgver=4.8 +pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) url="http://www.icu-project.org/" license=('custom:"icu"') depends=('gcc-libs' 'sh') -source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz - #http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz - icu.8198.revert.icu5431.patch -) -md5sums=('da64675d85f0c2191cef93a8cb5eea88' +source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz + #http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz + icu.8198.revert.icu5431.patch) +md5sums=('e78194c49d7fd8131353aa180d11b789' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index df9574067..afb12e671 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121103 2011-04-29 00:28:04Z andrea $ +# $Id: PKGBUILD 126168 2011-06-02 00:51:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') pkgver=4.6.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -89,7 +89,7 @@ package_kdesdk-kapptemplate() { package_kdesdk-kate() { pkgdesc='Advanced Text Editor' - depends=('kdebase-runtime') + depends=('kdebase-runtime' 'kdebase-lib') url="http://kde.org/applications/utilities/kate/" install='kdesdk-kate.install' cd $srcdir/build/kate diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 4c3853010..4fd0cf1a8 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125824 2011-05-30 09:43:02Z andyrtr $ +# $Id: PKGBUILD 126270 2011-06-03 14:47:40Z stephane $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-wiki-publisher') _LOver=3.4.0.2 pkgver=3.4.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -36,19 +36,19 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-runtime' + 'mesa' 'gstreamer0.10-base' 'java-runtime' #'saxon' - currently broken # the depends from libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests + 'ttf-dejavu') # to satisfy regression tests # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -#_mirror="http://download.documentfoundation.org/libreoffice/src" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +_mirror="http://download.documentfoundation.org/libreoffice/src" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 1e32e8195..032056ae3 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121025 2011-04-27 21:44:28Z ibiru $ +# $Id: PKGBUILD 126165 2011-06-01 22:31:25Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" @@ -13,13 +13,17 @@ depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'encha makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool') install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch) +source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz + gcc46.patch + replace-switch-with-given-when.patch) md5sums=('10c969db3b5484c71df1aa9a338377ff' - '970a2fa91b9827dff8e9b9edb4867701') + '970a2fa91b9827dff8e9b9edb4867701' + '3ba708a26b7af0e1e853867966fe14f7') build() { cd "${srcdir}/webkit-${pkgver}" patch -Np1 -i "${srcdir}/gcc46.patch" + patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch" mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) diff --git a/extra/libwebkit/replace-switch-with-given-when.patch b/extra/libwebkit/replace-switch-with-given-when.patch new file mode 100644 index 000000000..4e64610bb --- /dev/null +++ b/extra/libwebkit/replace-switch-with-given-when.patch @@ -0,0 +1,45 @@ +diff -upr webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl webkit-1.4.0/Source/WebCore/make-hash-tools.pl +--- webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl 2011-04-25 22:27:15.000000000 +0300 ++++ webkit-1.4.0/Source/WebCore/make-hash-tools.pl 2011-06-02 00:41:26.000000000 +0300 +@@ -20,7 +20,7 @@ + # Boston, MA 02110-1301, USA. + + use strict; +-use Switch; ++use feature 'switch'; + use File::Basename; + + my $outdir = $ARGV[0]; +@@ -28,9 +28,9 @@ shift; + my $option = basename($ARGV[0],".gperf"); + + +-switch ($option) { ++given ($option) { + +-case "DocTypeStrings" { ++when ("DocTypeStrings") { + + my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp"; + my $docTypeStringsGperf = $ARGV[0]; +@@ -38,9 +38,9 @@ case "DocTypeStrings" { + + system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; + +-} # case "DocTypeStrings" ++} # when ("DocTypeStrings") + +-case "ColorData" { ++when ("ColorData") { + + my $colorDataGenerated = "$outdir/ColorData.cpp"; + my $colorDataGperf = $ARGV[0]; +@@ -48,6 +48,6 @@ case "ColorData" { + + system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?"; + +-} # case "ColorData" ++} # when ("ColorData") + +-} # switch ($option) ++} # given ($option) diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index d8daf9053..ccbaae0cd 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $ +# $Id: PKGBUILD 126095 2011-06-01 12:12:00Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -24,7 +24,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.3.6 -pkgrel=3 +pkgrel=4 _suhosinver=${pkgver}-0.9.10 arch=('i686' 'x86_64') license=('PHP') diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD index a8db515c6..b51701d23 100644 --- a/extra/swh-plugins/PKGBUILD +++ b/extra/swh-plugins/PKGBUILD @@ -1,29 +1,46 @@ -# $Id: PKGBUILD 77978 2010-04-19 08:02:08Z dgriffiths $ -#Maintainer: Damir Perisa <damir.perisa@bluewin.ch> -#Contributor: Robert Emil Berge +# $Id: PKGBUILD 126506 2011-06-05 21:13:52Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Robert Emil Berge pkgname=swh-plugins pkgver=0.4.15 -pkgrel=3 -pkgdesc="LADSPA Plugin-Collection from plugin.org.uk" -arch=(i686 x86_64) +pkgrel=4 +pkgdesc="Steve Harris' LADSPA plug-ins suite" +arch=('i686' 'x86_64') url="http://plugin.org.uk/" license=('GPL') depends=('fftw' 'ladspa') +makedepends=('libxml2') groups=('ladspa-plugins') -source=(http://plugin.org.uk/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2fbdccef2462ea553901acd429fa3573') +source=("http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz" + 'mbeq_crash_fix.patch') +md5sums=('2fbdccef2462ea553901acd429fa3573' + 'a60422c8dea95bee6f9adcdc70dff7e0') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" -#Arch64 fix, -fPIC seems to be the only option -if [ "$CARCH" = "x86_64" ]; then - export CFLAGS="$CFLAGS -fPIC" - export CXXFLAGS="$CFLAGS" -fi + # Arch64 fix; + # -fPIC seems to be the only option + if [ "$CARCH" = 'x86_64' ]; then + export CFLAGS="$CFLAGS -fPIC" + export CXXFLAGS="$CFLAGS" + fi - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + # fix Firefox crash on x64 when + # plugin is in use by ALSA; + # see https://bugs.archlinux.org/task/24579 + patch -Np1 -i "$srcdir/mbeq_crash_fix.patch" + + ./configure --prefix=/usr + make } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/swh-plugins/mbeq_crash_fix.patch b/extra/swh-plugins/mbeq_crash_fix.patch new file mode 100644 index 000000000..37ddd33a9 --- /dev/null +++ b/extra/swh-plugins/mbeq_crash_fix.patch @@ -0,0 +1,39 @@ +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.c swh-plugins-0.4.15/mbeq_1197.c +--- swh-plugins-0.4.15.orig/mbeq_1197.c 2006-08-09 01:49:15.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.c 2011-06-05 10:57:17.929107102 +1000 +@@ -457,7 +457,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.so.c swh-plugins-0.4.15/mbeq_1197.so.c +--- swh-plugins-0.4.15.orig/mbeq_1197.so.c 2003-10-22 02:13:40.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.so.c 2011-06-05 10:57:52.265774336 +1000 +@@ -446,7 +446,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.xml swh-plugins-0.4.15/mbeq_1197.xml +--- swh-plugins-0.4.15.orig/mbeq_1197.xml 2005-06-01 19:51:58.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.xml 2011-06-05 10:57:39.335774121 +1000 +@@ -171,7 +171,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 5181428a6..a617eb19e 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 126090 2011-06-01 11:36:55Z guillaume $ +# $Id: PKGBUILD 126496 2011-06-05 16:47:00Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark pkgver=1.4.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) @@ -17,13 +17,17 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" - ./configure --prefix=/usr --with-ssl --with-zlib=no + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=no \ + --with-lua make all } package_wireshark-cli() { pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2') + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua') install=wireshark.install conflicts=(wireshark) diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 0656c37d7..d9ad07e87 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121212 2011-04-29 14:12:33Z ibiru $ +# $Id: PKGBUILD 126161 2011-06-01 20:45:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=2.0.1 _ffoxver=4.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD new file mode 100644 index 000000000..4783fc5ee --- /dev/null +++ b/extra/zziplib/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 126501 2011-06-05 18:50:29Z remy $ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> + +pkgname=zziplib +pkgver=0.13.60 +pkgrel=1 +pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file" +arch=('i686' 'x86_64') +url="http://zziplib.sourceforge.net" +license=('LGPL' 'MPL') +depends=('zlib') +makedepends=('python2') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + zziplib-0.13.60-ldflags.patch) +md5sums=('54a6aa53262483a4d54f7c59f0a7258b' + 'e585052f884525a338ca341b5d2957dc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + patch -p1 -i ../zziplib-0.13.60-ldflags.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + +#fix permission + chmod -s "${pkgdir}/usr/share/man/man3" + chmod 644 "${pkgdir}"/usr/share/man/man3/* + chown -R root:root "${pkgdir}/usr/share/man/man3" +} diff --git a/extra/zziplib/zziplib-0.13.60-ldflags.patch b/extra/zziplib/zziplib-0.13.60-ldflags.patch new file mode 100644 index 000000000..3c95ff465 --- /dev/null +++ b/extra/zziplib/zziplib-0.13.60-ldflags.patch @@ -0,0 +1,14 @@ +https://sourceforge.net/tracker/?func=detail&aid=3175466&group_id=6389&atid=306389 +https://bugs.gentoo.org/354051 + +--- a/configure ++++ b/configure +@@ -292,7 +292,7 @@ + # --------------------------------------------------------------- + AC_MSG_CHECKING([link options]) + ZZIPLIB_LDFLAGS="" +-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic" ++test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic" + RESOLVES=" # " + case "$host_os" in mingw*) + ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole" |