diff options
Diffstat (limited to 'extra')
38 files changed, 536 insertions, 598 deletions
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 660bc6894..430a3002e 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,143 +1,89 @@ -# $Id: PKGBUILD 101917 2010-12-02 16:14:10Z ibiru $ +# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z eric $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> -# TODO: -# - consider switching to scons when it is better supported - # Apparently, the blender guys refuse to release source tarballs for # intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from cvs. 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 cvs -# tags if necessary. -#cvs=true -cvs=false +# 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.49b +pkgver=2.57b pkgrel=2 +epoch=1 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.blender.org" -depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python2' 'desktop-file-utils' \ - 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal') -makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm' 'csv') -options=('!makeflags') +depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'sdl' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gettext' 'libxi' 'libxmu' 'mesa' \ + 'freetype2' 'openal' 'libsndfile' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' install=blender.install -source=($pkgname.desktop $pkgname.svg) -if [ ! $cvs -o $cvs = false ]; then - makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm') - source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8' - '0e53299444ff5570639c8f59372bc98c' - '718eef6a4ff377989e829b92a886cc5b') - sha1sums=('9ae82b5df21b4803f981e3df4a256b4be7137273' - '1e5452f56f590d5ce1af8c174113f0e639714c0c' - '43f71e7de4efe79c518d45f4b5a04e03c28d5fc5') +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('e6cb5523323a71c070051e6fe6efe497') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('59e344d4ec48750a86e4ef079c3acbfc') fi -build() { - if [ $cvs = true ]; then - cd "$srcdir/" - #cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login - cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender checkout $pkgname - _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release - cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel - find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null - cd $pkgname - else - cd "$srcdir/$pkgname-$pkgver" - fi - - rm -f user-def.mk - - ########################################################################## - # tweak the makefiles to prepare build for ArchLinux - # disable static binaries and enable blenderplayer binary - sed -i "s|^.*\(BINTARGETS += blenderstatic\)| #\1|g" source/Makefile - sed -i "s|^#\(.*BINTARGETS += blenderplayer\)|\1|g" source/Makefile - # link freetype and openal dynamically - sed -i 's|LOPTS)|LOPTS) -lfreetype -lopenal|g' source/Makefile - sed -i 's|COMLIB.*libfreetype\.a|#\0|g' source/Makefile - sed -i 's|NAN_SND_LIBS.*libopenal\.a|#\0|g' source/Makefile - # make ode (alternative physics engine) - # does not work for Arch64 - #[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile - # make the nan_makefiles happy - export NAN_PYTHON_VERSION=2.7 - export INTERNATIONAL=true - export WITH_FREETYPE2=true - export NAN_FREETYPE=/usr - export WITH_ICONV=true - - export NAN_NO_PLUGIN=true - - export NAN_OPENAL=/usr - export NAN_FMOD=/usr - export NAN_JPEG=/usr - export NAN_PNG=/usr - export WITH_OPENEXR=true - export NAN_OPENEXR=/usr - export NAN_ODE=/usr - export NAN_OPENEXR_LIBS=$(pkg-config --libs-only-l OpenEXR) - - export NAN_SDL=/usr - export NAN_ZLIB=/usr - export NAN_MESA=/usr +# source PKGBUILD && mksource +mksource() { + _svnver=36339 + _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 +} - export NAN_USE_BULLET=true - export NAN_USE_FFMPEG_CONFIG=true - export WITH_BF_VERSE=true - export WITH_VERSE=true - export WITH_BF_OPENMP=true - # there is an issue with a file - export NAN_DEBUG=-O - ########################################################################### - # build - LDFLAGS="-Wl,--hash-style=gnu" +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=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER: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() { - if [ $cvs = true ]; then - cd "$srcdir/$pkgname" - else - cd "$srcdir/$pkgname-$pkgver" - fi - - cd obj/linux-glibc2*/bin - -# common part - - mkdir -p "$pkgdir/usr/share/" - - # install binaries - install -Dm755 blender "$pkgdir/usr/bin/blender" - install -Dm755 blenderplayer "$pkgdir/usr/bin/blenderplayer" - - # install internationalization support - cd ../../../bin/.blender - install -D -m644 .Blanguages \ - "$pkgdir/usr/share/$pkgname/.Blanguages" - install -D -m644 .bfont.ttf \ - "$pkgdir/usr/share/$pkgname/.bfont.ttf" - - cp -R locale "$pkgdir/usr/share/" - - # install scripts - cd ../../release/ - cp -R scripts "$pkgdir/usr/share/$pkgname/" -sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "$pkgdir/usr/share/blender/scripts/bpymodules/blend2renderinfo.py" - - # install all additional stuff - # install a freedesktop.org compliant menu entry - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - # install some freedesktop.org compatibility - install -D -m644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg" - # finally we render a png as fallback for not svg aware menu applications - # Attention: always make sure you check the dimensions of the source-svg, - # you can read the dimensions via inkscape's export function - rsvg -w 64 -h 64 -f png "$pkgdir/usr/share/pixmaps/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.png" + 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/extra/blender/blender.desktop b/extra/blender/blender.desktop deleted file mode 100644 index 71893dc4a..000000000 --- a/extra/blender/blender.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Blender -Name[da]=Blender -Name[nl]=Blender -Name[no]=Blender -Name[de]=Blender -Name[es]=Blender -Comment=A 3D program -Comment[es]=Un programa de 3D -Comment[no]=Et 3d-program -Comment[da]=Et program til 3d-modelering -Exec=blender -Icon=blender -Terminal=false -X-MultipleArgs=false -Type=Application -Categories=Application;Graphics;3DGraphics; -MimeType=application/blender;application/x-blender; diff --git a/extra/blender/blender.install b/extra/blender/blender.install index 0cc7aef46..2fcf98022 100644 --- a/extra/blender/blender.install +++ b/extra/blender/blender.install @@ -3,26 +3,25 @@ post_install() { NOTE ---- -blender is using the NAN makefiles to build, so we can access some better -features: - - i18n support - - anti-aliased interface fonts - - gameplayer + We also ship the plugins, but most of these features can be accessed only -from the users home directory. Therefore, you wanna copy everything from -/usr/share/blender to ~/.blender (some are hidden files!). The browser- -plugin builds but is using an old mozilla API, this is why it doesn't work -and we don't ship it. -Happy blending! +from the users home directory. Therefore, you want to copy everything from +/usr/share/blender/2.57 to ~/.blender (some are hidden files!). EOF update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_remove() { update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } diff --git a/extra/blender/blender.svg b/extra/blender/blender.svg deleted file mode 100644 index ab61cc362..000000000 --- a/extra/blender/blender.svg +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - id="svg1573" - sodipodi:version="0.32" - inkscape:version="0.39" - width="100.00000pt" - height="100.00000pt" - sodipodi:docbase="/home/build/abs/extra/multimedia/blender" - sodipodi:docname="blender.svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs - id="defs1575"> - <linearGradient - id="linearGradient1792"> - <stop - style="stop-color:#000000;stop-opacity:0.42937854;" - offset="0.0000000" - id="stop1793" /> - <stop - style="stop-color:#000000;stop-opacity:0.12429378;" - offset="0.63222224" - id="stop1795" /> - <stop - style="stop-color:#000000;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop1794" /> - </linearGradient> - <radialGradient - xlink:href="#linearGradient1792" - id="radialGradient1950" - cx="0.50000000" - cy="0.50000000" - r="0.50000000" - fx="0.67944252" - fy="0.19298245" /> - <linearGradient - id="linearGradient1606"> - <stop - style="stop-color:#000000;stop-opacity:0.62745100;" - offset="0.0000000" - id="stop1607" /> - <stop - style="stop-color:#000000;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop1608" /> - </linearGradient> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="7.9999998" - inkscape:cx="50.134523" - inkscape:cy="35.997949" - inkscape:window-width="1272" - inkscape:window-height="1002" - showgrid="true" - snaptogrid="false" - gridspacingy="10.000000pt" - gridspacingx="10.000000pt" - gridoriginy="0.0000000pt" - gridoriginx="0.0000000pt" - gridtolerance="2.0000000px" - inkscape:grid-bbox="true" - inkscape:grid-points="true" - inkscape:window-x="1282" - inkscape:window-y="0" /> - <metadata - id="metadata1576"> - <rdf:RDF - id="RDF1577"> - <cc:Work - rdf:about="" - id="Work1578"> - <dc:description - id="description1579">Created with Inkscape -http://www.inkscape.org/</dc:description> - <dc:format - id="format1581">image/svg+xml</dc:format> - <dc:type - id="type1583" - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title - id="title1606">ML-Term Icon</dc:title> - <dc:date - id="date1608">2004-07-14</dc:date> - <dc:creator - id="creator1610"> - <cc:Agent - id="Agent1611"> - <dc:title - id="title1612">Tobias Kieslich</dc:title> - </cc:Agent> - </dc:creator> - <dc:coverage - id="coverage1614" /> - <cc:license - id="license1616" - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/" - id="License1624"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" - id="permits1625" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" - id="permits1626" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" - id="requires1627" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" - id="permits1628" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" - id="requires1629" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" - id="requires1630" /> - </cc:License> - </rdf:RDF> - </metadata> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient1950);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:1.0000000pt;" - id="path1827" - sodipodi:cx="29.010935" - sodipodi:cy="58.727592" - sodipodi:rx="23.157850" - sodipodi:ry="23.157850" - d="M 52.168785 58.727592 A 23.157850 23.157850 0 1 0 5.8530846,58.727592 A 23.157850 23.157850 0 1 0 52.168785 58.727592 z" - transform="matrix(2.556262,0.000000,0.000000,0.770827,-8.357083,60.08188)" /> - <g - id="g1084" - transform="matrix(4.277757,0.000000,0.000000,4.277757,-244.4442,-256.4384)"> - <path - style="fill:#e79100;fill-rule:evenodd;stroke:#000000;stroke-width:2.5581360;" - d="M 70.183754,64.486103 C 70.970246,65.122765 71.746941,65.771669 72.540115,66.399985 C 69.453580,66.550314 66.336707,66.536916 63.267234,66.751339 C 61.553800,66.933280 62.119503,69.750024 63.656883,69.617641 C 64.925860,69.617641 66.194837,69.617641 67.463814,69.617641 C 64.899642,71.537080 62.334113,73.454704 59.769421,75.373447 C 57.974777,76.830324 59.759220,79.624301 61.528139,78.790956 C 62.843668,78.218932 63.672855,76.918567 64.775590,76.029244 C 65.272386,75.762533 66.061744,74.237148 66.195454,75.421789 C 66.812356,77.527269 68.113458,79.532317 70.023285,80.657078 C 78.453997,86.618341 88.293096,75.890516 82.467250,70.321032 C 81.347167,68.630878 79.527221,67.572142 77.996121,66.287702 C 76.220705,64.972085 74.509428,63.515316 72.695293,62.285243 C 70.961182,60.910865 68.645443,63.114782 70.183754,64.486103 z " - id="path1829" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#e79100;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.63953400pt;" - d="M 70.479501,64.479682 C 71.265993,65.116344 72.042688,65.765247 72.835862,66.393564 C 69.749327,66.543893 66.632454,66.530495 63.562981,66.744917 C 61.849547,66.926859 62.415250,69.743603 63.952630,69.611219 C 65.221607,69.611219 66.490584,69.611219 67.759561,69.611219 C 65.195389,71.530659 62.629860,73.448283 60.065168,75.367025 C 58.270524,76.823903 60.054967,79.617880 61.823886,78.784535 C 63.139415,78.212510 63.968602,76.912146 65.071337,76.022823 C 65.568133,75.756111 66.357491,74.230727 66.491201,75.415368 C 67.108103,77.520848 68.409205,79.525896 70.319032,80.650657 C 78.749744,86.611920 88.588843,75.884095 82.762997,70.314611 C 81.642914,68.624457 79.822968,67.565721 78.291868,66.281281 C 76.516452,64.965664 74.805175,63.508895 72.991040,62.278821 C 71.256929,60.904444 68.941190,63.108361 70.479501,64.479682 z " - id="path1831" - sodipodi:nodetypes="cccccccccccccc" /> - <path - sodipodi:type="arc" - style="fill:#345c87;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.4483387;" - id="path1832" - sodipodi:cx="28.791338" - sodipodi:cy="24.460691" - sodipodi:rx="5.3983760" - sodipodi:ry="5.0384841" - d="M 34.189714 24.460691 A 5.3983760 5.0384841 0 1 0 23.392962,24.460691 A 5.3983760 5.0384841 0 1 0 34.189714 24.460691 z" - transform="matrix(0.822413,0.000000,0.000000,0.822413,51.33976,53.33570)" /> - </g> -</svg> diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 4fe433b89..5978c8b5e 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121271 2011-04-30 00:03:52Z andrea $ +# $Id: PKGBUILD 122436 2011-05-04 06:56:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.92 +pkgver=4.93 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' 'rc.bluetooth') -md5sums=('33bb9a75239889c5ee5fbc666ad41c5c' +md5sums=('f60027b7c3bf0f9d24b5935d5f51477e' '8f60a5eb9d84b9c64c478d63e1c24b10' 'ca4c39eb4bb201bd2eacad01492cd735') @@ -44,11 +44,12 @@ build() { --enable-tools \ --enable-bccmd \ --enable-dfutool \ + --enable-hid2hci \ --enable-hidd \ --enable-pand \ --enable-dund \ --enable-cups \ - --enable-udevrules \ + --disable-udevrules \ --enable-configfiles make } diff --git a/extra/dcron/PKGBUILD b/extra/dcron/PKGBUILD new file mode 100644 index 000000000..5583d9267 --- /dev/null +++ b/extra/dcron/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Paul Mattal <paul.archlinux.org> + +pkgname=dcron +pkgver=4.5 +pkgrel=2 +pkgdesc="dillon's lightweight cron daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.jimpryor.net/linux/dcron" +backup=('var/spool/cron/root' 'etc/conf.d/crond') +depends=('bash') +provides=('cron') +conflicts=('cron') +source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz") +md5sums=('078833f3281f96944fc30392b1888326') +optdepends=('smtp-server: sending cron job output via email') +install=$pkgname.install + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + # by default, any member of group "users" can edit their own crontab + make \ + PREFIX=/usr \ + CRONTAB_GROUP=users \ + CRONTABS=/var/spool/cron \ + CRONSTAMPS=/var/spool/cronstamps +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + + # install standard configuration and scripts + install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} + + install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" + install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" + install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond" + install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond" + install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim" + sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps + install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps" +} diff --git a/extra/dcron/dcron.install b/extra/dcron/dcron.install new file mode 100644 index 000000000..df23d0224 --- /dev/null +++ b/extra/dcron/dcron.install @@ -0,0 +1,6 @@ +post_upgrade() { + if [ $(vercmp $2 4.0) -lt 0 ] + then + echo "Restart crond, since you're upgrading to the dcron 4.x series." + fi +} diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index ca60ae568..d896ab734 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 90915 2010-09-18 23:05:52Z giovanni $ +# $Id: PKGBUILD 122449 2011-05-04 07:27:45Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ebook-tools pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for accessing and converting various ebook file formats" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ebook-tools" license=('custom') depends=('libzip' 'libxml2') makedepends=('pkgconfig' 'cmake') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045') build() { - cd $srcdir + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install - install -D ${srcdir}/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/evolution-sharp/PKGBUILD b/extra/evolution-sharp/PKGBUILD index 1dc7b6742..edd8a44bf 100644 --- a/extra/evolution-sharp/PKGBUILD +++ b/extra/evolution-sharp/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 94159 2010-10-04 20:47:03Z ibiru $ +# $Id: PKGBUILD 122598 2011-05-04 19:22:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-sharp pkgver=0.21.1 -pkgrel=2 +pkgrel=3 pkgdesc="C# bindings for Novell Evolution" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/" -depends=('evolution-data-server>=2.32.0') -makedepends=('pkg-config' 'gtk-sharp-2>=2.12.8') +depends=('evolution-data-server') +makedepends=('pkg-config' 'gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.21/${pkgname}-${pkgver}.tar.bz2 evolution-sharp-0.21.1-fix-retarded-version-check.patch evolution-data-server-lib-target.patch) sha256sums=('3cb78088e332f71b2a7958d2e8c6af3c9ff168731c8fb423aad7038cbdef3a1c' '80f98baf3336383241deac73c3f0d3a0905c9a2a3790db7ec4bf6089a577cf5b' - '177492c896d6cfc34f728d578e6948463f16ed731ffbf6aa555f9ec4b7f7af9e') + '910783e0213002d40d3111b0a5bc5103ca21a8d1a33bd1a305238dc147cf1401') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,12 +25,11 @@ build() { patch -Np1 -i "${srcdir}/evolution-data-server-lib-target.patch" autoreconf -fi - export MONO_SHARED_DIR="${startdir}/src/.wabi" + export MONO_SHARED_DIR="${srcdir}/.wabi" mkdir -p "${MONO_SHARED_DIR}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib/libevolutionglue.a" -} - +} diff --git a/extra/evolution-sharp/evolution-data-server-lib-target.patch b/extra/evolution-sharp/evolution-data-server-lib-target.patch index c713b1ca4..a2e7b82a4 100644 --- a/extra/evolution-sharp/evolution-data-server-lib-target.patch +++ b/extra/evolution-sharp/evolution-data-server-lib-target.patch @@ -1,15 +1,16 @@ diff -Nur evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in --- evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in 2009-05-26 00:25:06.000000000 -0700 -+++ evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in 2010-10-04 13:31:36.573339607 -0700 ++++ evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in 2011-05-04 12:14:58.087467727 -0700 @@ -1,7 +1,7 @@ <configuration> - <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.@EBOOK_SOVERSION@@LIB_SUFFIX@"/> - <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.@ECAL_SOVERSION@@LIB_SUFFIX@"/> - <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.@EDS_SOVERSION@@LIB_SUFFIX@"/> +- <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/> +- <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/> + <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.10@LIB_SUFFIX@"/> + <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.8@LIB_SUFFIX@"/> + <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.14@LIB_SUFFIX@"/> - <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/> -- <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/> -+ <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.10@LIB_SUFFIX@"/> ++ <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.1@LIB_SUFFIX@"/> ++ <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.11@LIB_SUFFIX@"/> </configuration> diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index ebfebbd14..a7f0f6536 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $ +# $Id: PKGBUILD 122612 2011-05-05 01:46:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.6.1 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -url='http://cle.linux.org.tw/gcin/download/' +url='http://cle.linux.org.tw/trac/' depends=('gtk2' 'libxtst') makedepends=('qt' 'gtk3' 'anthy') optdepends=('qt: support for qt4 input method' 'gtk3: support for gtk3 input method' 'anthy: support for anthy input method') -source=("${url}${pkgname}-${pkgver}.tar.bz2" +source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2" 'fix_x86_64_libdir.patch' 'fix_qt4_paths.patch') -sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51' +sha1sums=('50522908d3e64319baafb5317c0b4327bbe0fb18' 'e5c113e50420bf4750f5547641df6ec4b7e437e0' '16d004424caed541d5baaa6874f708b1c138ab08') diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index 9745b642e..d1fcb285c 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 87283 2010-08-11 20:42:35Z andyrtr $ +# $Id: PKGBUILD 122412 2011-05-04 06:25:40Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint -pkgver=5.2.6 +pkgver=5.2.7 pkgrel=1 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64' 'mips64el') license=('GPL') install=gutenprint.install -depends=('readline' 'gnutls>=2.8.5') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it -makedepends=('gimp>=2.6.8' 'gtk2>=2.18.6' 'cups>=1.4.2' 'foomatic-db-engine' 'ghostscript>=8.71') +depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it +makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02') optdepends=('cups: to use cups printer spooler(recommended)' 'foomatic-db-engine: to use foomatic spooler' 'ghostscript: adds postscript support for ijsgutenprint' @@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2) url="http://gimp-print.sourceforge.net/" replaces=('gimp-print') options=('!libtool' '!emptydirs') -md5sums=('1f0d0cbef6c089f4f095e21869fa70db') +md5sums=('b19029972bf28f6efd693270daf8f5de') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD index ecc352ab3..4a974bd14 100644 --- a/extra/hdf5/PKGBUILD +++ b/extra/hdf5/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 122530 2011-05-04 11:32:45Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: damir <damir@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=hdf5 -pkgver=1.8.5_patch1 +pkgver=1.8.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="General purpose library and file format for storing scientific data" @@ -14,7 +15,7 @@ depends=('zlib' 'sh') makedepends=('time') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -md5sums=('27308a145e6c208d57db3f6f2634a0f6') +sha1sums=('348bd881c03a9568ac4ea9071833d6119c733757') build() { cd $srcdir/${pkgname}-${pkgver/_/-} @@ -29,13 +30,13 @@ build() { --docdir=/usr/share/doc/hdf5/ \ --with-pthread=/usr/lib/ \ --disable-sharedlib-rpath - make || return 1 + make } package() { cd $srcdir/${pkgname}-${pkgver/_/-} - make -j1 prefix=$pkgdir/usr install + make -j1 DESTDIR=${pkgdir} install install -d -m755 $pkgdir/usr/share/licenses/${pkgname} install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \ diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 93e781170..b3d455918 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -3,8 +3,9 @@ # Contributor: Jakub Schmidtke <sjakub-at-gmail.com> pkgname=kdeplasma-applets-networkmanagement -pkgver=git20110502 -_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61 +epoch=1 +pkgver=git20110323 +_commit=986cae8974998213496a8678ad03523dba83e69d pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +15,15 @@ depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('6ac9e04cb917a8ac875b2bffde4b5420') +source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}" + 'nm-09.patch') +md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04' + 'b7ad3dac9a5022c99dfd2ad0dc8549cb') build() { + cd "${srcdir}/networkmanagement" + patch -p1 -i "${srcdir}/nm-09.patch" + cd "${srcdir}" mkdir build cd build @@ -32,3 +38,5 @@ package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install } +md5sums=('8373cd729b12a821b28b483e3e9d253f' + 'c46839bc0503f2dbec76282b8ab163bd') diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch new file mode 100644 index 000000000..52b875513 --- /dev/null +++ b/extra/kdeplasma-applets-networkmanagement/nm-09.patch @@ -0,0 +1,44 @@ +From: Lamarque V. Souza <lamarque@gmail.com> +Date: Sun, 17 Apr 2011 00:09:43 +0000 +Subject: Fix compilation against NetworkManager-0.8.98. +X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&a=commitdiff&h=e87ceccadc833e220f73d86352968655cedc0485 +--- +Fix compilation against NetworkManager-0.8.98. + +BUG: 271101 +--- + + +--- a/backends/NetworkManager/nmdbussettingsservice.cpp ++++ b/backends/NetworkManager/nmdbussettingsservice.cpp +@@ -59,7 +59,7 @@ public: + QHash<QUuid, QDBusObjectPath> uuidToPath; + }; + +-const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS); ++const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings"); + const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager"); + + NMDBusSettingsService::NMDBusSettingsService(QObject * parent) + +--- a/backends/NetworkManager/settings/gsmdbus.cpp ++++ b/backends/NetworkManager/settings/gsmdbus.cpp +@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap + if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) { + setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>()); + } else { +- setting->setNetworktype(NM_GSM_NETWORK_ANY); ++ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY); + } + if (map.contains("band")) { + setting->setBand(map.value("band").value<int>()); +@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap() + map.insert("apn", setting->apn()); + if (!setting->networkid().isEmpty()) + map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid()); +- if (setting->networktype() != NM_GSM_NETWORK_ANY) { ++ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) { + map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype()); + } + + diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD index ab2ddfb63..ed1535009 100644 --- a/extra/libidn/PKGBUILD +++ b/extra/libidn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94460 2010-10-07 10:45:51Z ronald $ +# $Id: PKGBUILD 122517 2011-05-04 11:21:40Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc.archlinux.org> # Contributor: Eric Johnson <eric.archlinux.org> pkgname=libidn -pkgver=1.19 +pkgver=1.21 pkgrel=1 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications" url="http://www.gnu.org/software/libidn/" @@ -15,8 +15,8 @@ makedepends=('pkgconfig') options=('!libtool') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) install=libidn.install -md5sums=('a45142126d28162014c995f969bdb5a8') - +sha1sums=('991d5d4e24118d7672d53ed692a8a6ab87212f8f') + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 8ae96209f..9696ea620 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101448 2010-11-29 09:38:40Z jgc $ +# $Id: PKGBUILD 122471 2011-05-04 08:36:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.7 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xcb.freedesktop.org/" @@ -14,13 +14,16 @@ conflicts=('libx11<1.1.99.2') options=('!libtool') license=('custom') source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2 + xcb_auth-fix-memory-leak.patch libxcb-1.1-no-pthread-stubs.patch) sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '3455e84642283bc91c8313af319002a20bbcbdf4') + '0c9246fd2ea270bfa06cb8ef93df2f8227d83c2a' + '3455e84642283bc91c8313af319002a20bbcbdf4') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" + patch -Np1 -i "${srcdir}/xcb_auth-fix-memory-leak.patch" libtoolize --force --copy aclocal autoconf diff --git a/extra/libxcb/xcb_auth-fix-memory-leak.patch b/extra/libxcb/xcb_auth-fix-memory-leak.patch new file mode 100644 index 000000000..d1000913a --- /dev/null +++ b/extra/libxcb/xcb_auth-fix-memory-leak.patch @@ -0,0 +1,38 @@ +From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001 +From: Nick Bowler <nbowler@draconx.ca> +Date: Thu, 11 Nov 2010 01:49:41 +0000 +Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info. + +If the initial get_peer_sock_name(getpeername ...) succeeds, the +pointer to allocated memory is overwritten by the later call to +get_peer_sock_name(getsockname ...). Fix that up by freeing +the allocated memory before overwriting the pointer. + +Signed-off-by: Nick Bowler <nbowler@draconx.ca> +Signed-off-by: Julien Danjou <julien@danjou.info> +--- +diff --git a/src/xcb_auth.c b/src/xcb_auth.c +index 1af27fc..4839b78 100644 +--- a/src/xcb_auth.c ++++ b/src/xcb_auth.c +@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display) + if (!info->namelen) + goto no_auth; /* out of memory */ + +- if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL) ++ if (!gotsockname) + { +- free(info->name); +- goto no_auth; /* can only authenticate sockets */ ++ free(sockname); ++ ++ if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL) ++ { ++ free(info->name); ++ goto no_auth; /* can only authenticate sockets */ ++ } + } + + ret = compute_auth(info, authptr, sockname); +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD index 916dfd2da..5c485cce0 100644 --- a/extra/libzip/PKGBUILD +++ b/extra/libzip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77453 2010-04-13 12:26:29Z andrea $ +# $Id: PKGBUILD 122444 2011-05-04 07:26:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip -pkgver=0.9.3 +pkgver=0.10 pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" @@ -11,16 +11,20 @@ license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('zlib') options=('!libtool') -source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9') +source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'fix-headers.patch') +md5sums=('47cdfcbc08c8bea0b52fdee4bf591622' + '249395bd3a426c4c4e993e9d4753e1dd') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}/fix-headers.patch" ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install } diff --git a/extra/libzip/fix-headers.patch b/extra/libzip/fix-headers.patch new file mode 100644 index 000000000..759171070 --- /dev/null +++ b/extra/libzip/fix-headers.patch @@ -0,0 +1,15 @@ +diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am +--- libzip-0.10rc1.old/lib/Makefile.am 2011-03-05 01:07:33.921722002 +0100 ++++ libzip-0.10rc1/lib/Makefile.am 2011-03-05 20:29:30.349388003 +0100 +@@ -2,8 +2,9 @@ + + lib_LTLIBRARIES = libzip.la + noinst_HEADERS = zipint.h +-include_HEADERS = zip.h +-libinclude_HEADERS = zipconf.h ++include_HEADERS = \ ++ zip.h \ ++ zipconf.h + + # also update CMakeLists.txt when changing version + libzip_la_LDFLAGS=-no-undefined -version-info 2:0 diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index ecbabb486..fcd327069 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,31 +1,38 @@ -# $Id: PKGBUILD 117234 2011-03-30 11:00:13Z juergen $ +# $Id: PKGBUILD 122501 2011-05-04 10:25:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.23.2 -pkgrel=3 +pkgver=5.24.0 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://maxima.sourceforge.net" depends=('sbcl=1.0.47' 'texinfo' 'sh') +makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version # needs a rebuild when sbcl changes version options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -md5sums=('ae2f2eaca33de95636e36652ed281902' - '24aa81126fbb8b726854e5a80d4c2415') -sha1sums=('f7300058faf730ce6cf63c18e59ec068df01b4a6' +sha1sums=('13586c1221bb5f36067a4cce1e6d5fb31e44e41c' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # set correct python executable to create docs + sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \ --libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install # install some freedesktop.org compatibility diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index 00c16135b..14f66eb60 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 118802 2011-04-07 20:14:30Z andyrtr $ +# $Id: PKGBUILD 122421 2011-05-04 06:44:02Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori #_gitdate=20090306 -pkgver=0.3.3 #_git${_gitdate} -pkgrel=2 +pkgver=0.3.5 #_git${_gitdate} +pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -18,7 +18,7 @@ optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 #midori-${_gitdate}.tar.bz2 ) -md5sums=('e1262cc7cc0c1773c331ab794480f037') +md5sums=('f92f0f11276d63150fd321dc08d575fb') # source PKGBUILD && mksource mksource() { diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index c1b40bd2b..1259b3b7e 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 82759 2010-06-16 18:15:09Z ibiru $ +# $Id: PKGBUILD 122603 2011-05-04 20:10:03Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager -pkgver=0.4 +pkgver=0.4.996 pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" license=('GPL2') -depends=('dbus-glib>=0.86' 'udev>=151' 'ppp>=2.4.5') +depends=('dbus-glib' 'udev' 'ppp') makedepends=('intltool') options=('!libtool') source=(http://download.gnome.org/sources/${_realname}/0.4/${_realname}-${pkgver}.tar.bz2) -sha256sums=('8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f') +optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') +sha256sums=('4e82b8ef5f5e5e737212b8d077a59ac9e1fb21b65e8df98005b2beaad265c16b') build() { cd "$srcdir/${_realname}-${pkgver}" @@ -20,6 +21,10 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --disable-static - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + make +} + +package() { + cd "$srcdir/${_realname}-${pkgver}" + make DESTDIR="$pkgdir" install } diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 32cec1b97..37a064a87 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122004 2011-05-01 11:09:24Z ibiru $ +# $Id: PKGBUILD 122476 2011-05-04 09:08:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,8 +6,8 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.8.998 -pkgrel=2 +pkgver=0.8.999 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,13 +19,11 @@ makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc') optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool') install=network-manager-applet.install -source=(ftp://ftp.archlinux.org/other/networkmanager/$pkgname-$pkgver-20110501.tar.xz) -#source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('d83a489766b3f04c80444697f4aacbd6c8e53a9ea31d9a5348f165eb20504438') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('95249953fad924240fbe85ae7742405622c7edc3c6391dcb823346d5c37fd63b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 219b95244..46b500642 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 122013 2011-05-01 11:25:47Z ibiru $ +# $Id: PKGBUILD 122496 2011-05-04 09:27:02Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.8.998 +pkgver=0.8.999 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf' 'libgnome-keyring') -makedepends=('intltool') +makedepends=('intltool' 'namcap') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-openconnect-${pkgver}-20110501.tar.xz) -#source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2) -sha256sums=('7f18ce15d985037c1bcf7208555182c296ab1a42a4dc33f78e5ceeb3492cdba5') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2) +sha256sums=('e191c71ff23268eac427609aeb0fb3df7bb1b6da2645bac84c62872cdfc218f5') build() { cd "${srcdir}/NetworkManager-openconnect-${pkgver}" - ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 05bc1d322..7463def53 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 118022 2011-04-05 06:52:18Z heftig $ +# $Id: PKGBUILD 122487 2011-05-04 09:23:49Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.8.998 +pkgver=0.8.999 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'openvpn') -makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring') +depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2) -sha256sums=('8c95cf23b5f6abc07f3b7383bb47a4be32d6232046b2a89d5259cc96e9c25d3c') +sha256sums=('be1837025226b9f85621b32d0ebe5f971a4fb7e9094c39f89ce1af7403ee8da1') build() { cd "${srcdir}/NetworkManager-openvpn-${pkgver}" diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 579bfb7f6..ff234bf25 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 118030 2011-04-05 06:53:52Z heftig $ +# $Id: PKGBUILD 122486 2011-05-04 09:21:32Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.8.998 +pkgver=0.8.999 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'pptpclient') -makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring') +depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2) -sha256sums=('2cc2093dd2d81b0c4f82d44a8589f8c867c6b88ef0d8801631bd417f8480b9b9') +sha256sums=('81cfbe647c1d155a9bf0e7e4d4f3fad4b54dce50fd7162964e7a0f5c85fb2325') build() { cd "${srcdir}/NetworkManager-pptp-${pkgver}" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 9c2dbf41f..ad33dc5f0 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 118033 2011-04-05 06:54:12Z heftig $ +# $Id: PKGBUILD 122481 2011-05-04 09:16:50Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.8.998 +pkgver=0.8.999 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' - 'gtk-update-icon-cache') -makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring') + 'gtk3' 'libgnome-keyring') +makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2) -sha256sums=('996ae3b504ad49433955baa6467f828fd161a7fbe16c7080fdcab7f7c5b92fc6') +sha256sums=('b3802070fb25872c9cc59d82bee27b6f8ec3c3feb36b5fd148a7da2b6371c3f3') build() { cd "${srcdir}/NetworkManager-vpnc-${pkgver}" diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index e9e534238..4c7617bff 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122001 2011-05-01 11:08:27Z ibiru $ +# $Id: PKGBUILD 122462 2011-05-04 08:30:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,8 +6,8 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.8.998 -pkgrel=3 +pkgver=0.8.999 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -22,10 +22,9 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 -source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-${pkgver}-20110501.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 NetworkManager.conf disable_set_hostname.patch) -sha256sums=('f9362e5db1f700df927c5ce5a4089e67270a0ce8ca9ab1c5384ae93d2d8ec0e2' +sha256sums=('fc2430e4babe1f53ac071746cd3f662f064a7d338f0e324f42f82fe9512968cd' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553') @@ -34,7 +33,6 @@ build() { patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - ./autogen.sh ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index faafa575d..b90751d34 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109758 2011-02-12 15:04:53Z schiv $ +# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=opencv _realname=OpenCV pkgver=2.2.0 -pkgrel=3 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -18,18 +18,19 @@ optdepends=('eigen' 'python2-numpy') options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 - ptrcvcapture.patch) + ptrcvcapture.patch + gcc46.patch + v4l_2.6.38.patch) md5sums=('122c9ac793a46854ef2819fedbbd6b1b' - '461a8b1b0f2264521e13d9ae051d13be') + '461a8b1b0f2264521e13d9ae051d13be' + 'b5fb8d6786578ae7bf272615279e8865' + '82c8a8a76275acd4a73a4f8e948c3f78') build() { cd "$srcdir/$_realname-$pkgver" # Please do not remove any patches from trunk # - # libpng 1.4 compatibility - #patch -Np1 -i "$srcdir/libpng-1.4.patch" - # fix v4l issue #patch -Np0 -i "$srcdir/v4l-mmap.patch" @@ -41,6 +42,14 @@ build() { # see https://bugs.archlinux.org/task/22841 patch -Np0 -i "$srcdir/ptrcvcapture.patch" + # gcc 4.6 compatibility + # see https://bugs.archlinux.org/task/23741 + patch -Np3 -i "$srcdir/gcc46.patch" + + # distro kernel no longer has v4l1 + # see https://bugs.archlinux.org/task/23826 + patch -Np1 -i "$srcdir/v4l_2.6.38.patch" + cmake . -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/opencv/gcc46.patch b/extra/opencv/gcc46.patch new file mode 100644 index 000000000..a69499b4f --- /dev/null +++ b/extra/opencv/gcc46.patch @@ -0,0 +1,10 @@ +Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp +=================================================================== +--- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804) ++++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861) +@@ -56,4 +56,5 @@ + #include <algorithm> + #include <cmath> ++#include <cstddef> + #include <complex> + #include <map> diff --git a/extra/opencv/libpng-1.4.patch b/extra/opencv/libpng-1.4.patch deleted file mode 100644 index c34c5a58a..000000000 --- a/extra/opencv/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp ---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 2010-01-21 01:08:46.000000000 -0500 -+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-01-21 01:13:11.000000000 -0500 -@@ -223,7 +223,7 @@ - png_set_palette_to_rgb( png_ptr ); - - if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) -- png_set_gray_1_2_4_to_8( png_ptr ); -+ png_set_expand_gray_1_2_4_to_8( png_ptr ); - - if( CV_MAT_CN(m_type) > 1 && color ) - png_set_bgr( png_ptr ); // convert RGB to BGR diff --git a/extra/opencv/v4l_2.6.38.patch b/extra/opencv/v4l_2.6.38.patch new file mode 100644 index 000000000..dd23cd133 --- /dev/null +++ b/extra/opencv/v4l_2.6.38.patch @@ -0,0 +1,33 @@ +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800 +@@ -214,7 +214,7 @@ + #include <sys/types.h> + #include <sys/mman.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include <string.h> + #include <stdlib.h> +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800 +@@ -224,7 +224,7 @@ + #include "highgui.h" + #include "precomp.hpp" + +-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 ++#if !defined WIN32 && defined HAVE_CAMV4L2 + + #define CLEAR(x) memset (&(x), 0, sizeof (x)) + +@@ -241,7 +241,7 @@ + #include <sys/stat.h> + #include <sys/ioctl.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <linux/videodev2.h> + + #include <libv4l1.h> diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index 36f180814..70d8a705e 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 105850 2011-01-13 11:54:50Z pierre $ +# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license="PHP" source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('94239866e5d1b90e02675e988a5cbad4') +md5sums=('bb1147933a61aa70ceffe53cc6f2920f') build() { cd $srcdir/APC-$pkgver diff --git a/extra/python2-cairo/PKGBUILD b/extra/python2-cairo/PKGBUILD index 5e7f06e1f..5629199d2 100644 --- a/extra/python2-cairo/PKGBUILD +++ b/extra/python2-cairo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102340 2010-12-07 11:21:30Z jgc $ +# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=python2-cairo -pkgver=1.8.10 +pkgver=1.10.0 pkgrel=1 pkgdesc="Python2 bindings for the cairo graphics library" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,21 @@ options=('!libtool') provides=("pycairo=${pkgver}") conflicts=('pycairo') replaces=('pycairo') -source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.gz) +source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2) url="http://www.cairographics.org/pycairo" -md5sums=('87421a6a70304120555ba7ba238f3dc3') +md5sums=('20337132c4ab06c1146ad384d55372c5') build() { - cd "${srcdir}/pycairo-${pkgver}" - PYTHON=python2 ./configure --prefix=/usr - make + cd "${srcdir}/py2cairo-${pkgver}" + sed -i 's:bin/env python:bin/env python2:' waf + python2 ./waf --version + pushd .waf-* + popd + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr + PYTHON=/usr/bin/python2 ./waf build } package() { - cd "${srcdir}/pycairo-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/py2cairo-${pkgver}" + PYTHON=/usr/bin/python2 ./waf install --destdir="${pkgdir}" } diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index c691233ea..b3fc7aacd 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 117207 2011-03-29 18:21:55Z andrea $ +# $Id: PKGBUILD 122539 2011-05-04 13:21:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.7.2 -pkgrel=6 +pkgver=4.7.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -17,14 +17,12 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'blacklist-fraudulent-comodo-certificates.patch') -md5sums=('66b992f5c21145df08c99d21847f4fdb' + 'qtconfig.desktop') +md5sums=('49b96eefb1224cc529af6fe5608654fe' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'af1259401447f4de59f1d4c2cbedafed') + '6b771c8a81dd90b45e8a79afa0e5bbfd') build() { unset QMAKESPEC diff --git a/extra/qt/blacklist-fraudulent-comodo-certificates.patch b/extra/qt/blacklist-fraudulent-comodo-certificates.patch deleted file mode 100644 index bd2da5bb3..000000000 --- a/extra/qt/blacklist-fraudulent-comodo-certificates.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 618ac79..a5cdf01 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
- Returns true if this certificate is valid; otherwise returns
- false.
-
-- Note: Currently, this function only checks that the current
-+ Note: Currently, this function checks that the current
- data-time is within the date-time range during which the
-- certificate is considered valid. No other checks are
-- currently performed.
-+ certificate is considered valid, and checks that the
-+ certificate is not in a blacklist of fraudulent certificates.
-
- \sa isNull()
- */
- bool QSslCertificate::isValid() const
- {
- const QDateTime currentTime = QDateTime::currentDateTime();
-- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
-+ return currentTime >= d->notValidBefore &&
-+ currentTime <= d->notValidAfter &&
-+ ! QSslCertificatePrivate::isBlacklisted(*this);
- }
-
- /*!
-@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- return certificates;
- }
-
-+// These certificates are known to be fraudulent and were created during the comodo
-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
-+static const char *certificate_blacklist[] = {
-+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+ 0
-+};
-+
-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
-+{
-+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
-+ if (certificate.serialNumber() == certificate_blacklist[a])
-+ return true;
-+ }
-+ return false;
-+}
-+
- #ifndef QT_NO_DEBUG_STREAM
- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
- {
-diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
-index cdceb0f..1ce33d3 100644
---- a/src/network/ssl/qsslcertificate_p.h
-+++ b/src/network/ssl/qsslcertificate_p.h
-@@ -96,6 +96,7 @@ public:
- static QSslCertificate QSslCertificate_from_X509(X509 *x509);
- static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
- static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
-+ static bool isBlacklisted(const QSslCertificate &certificate);
-
- friend class QSslSocketBackendPrivate;
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 0866534..2427193 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
- X509 *x509 = q_SSL_get_peer_certificate(ssl);
- configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
- q_X509_free(x509);
-+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+ plainSocket->disconnectFromHost();
-+ return false;
-+ }
-
- // Start translating errors.
- QList<QSslError> errors;
diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD index c753541fc..7c0873eb7 100644 --- a/extra/texlive-bin/PKGBUILD +++ b/extra/texlive-bin/PKGBUILD @@ -2,12 +2,12 @@ pkgname=texlive-bin pkgver=2010.1 -_luatex_ver=0.62.0 -pkgrel=7 +_luatex_ver=0.66.0 +pkgrel=8 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv') +depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam') @@ -20,7 +20,9 @@ source=('texmf.cnf' 'dvipng-fix-options.patch' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20100926.tar.xz' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20101105.tar.xz' - "http://foundry.supelec.fr/gf/download/frsrelease/381/1533/luatex-beta-${_luatex_ver}.tar.bz2") + #"http://foundry.supelec.fr/gf/download/frsrelease/387/1715/luatex-beta-${_luatex_ver}-source.tar.bz2" + "ftp://ftp.archlinux.org/other/texlive/luatex-svn4193.tar.xz" +) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ etc/texmf/web2c/mktex.cnf \ @@ -35,6 +37,14 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/dvipdfm/config/config \ etc/texmf/xdvi/XDvi) +md5sums=('626f900fb59f036d6fea95f08c74b00b' + 'bfb9716aa00c86c08cd31e5b32edeb98' + '393a4bf67adc7ca5df2b386759d1a637' + '60e405158f53519348d9783e8d420670' + '0b2c3a4a1b1e4befb90d7fbb5f08a6e9' + '7ae1400dafdb079dcd08d233de83ec44' + '523802a23bc174374403415d9cc87946') + build() { if [ "${CARCH}" = "x86_64" ]; then export CFLAGS="${CFLAGS} -fPIC" @@ -43,7 +53,8 @@ build() { cd $srcdir # Building LuaTeX - cd luatex-beta-${_luatex_ver} + #cd luatex-beta-${_luatex_ver} + cd luatex patch -p0 -i ../fix-fontforge-encoding.patch mkdir build cd build @@ -67,6 +78,7 @@ build() { --with-system-libpng \ --without-system-teckit \ --with-system-zlib \ + --with-system-zziplib \ --with-system-t1lib \ --disable-shared \ --disable-largefile \ @@ -74,7 +86,6 @@ build() { --without-mf-x-toolkit \ --without-x make - make -C libs/zziplib make -C libs/obsdcompat make -C texk/kpathsea make -C texk/web2c luatex @@ -224,7 +235,8 @@ package() { done ## install luatex binary - install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/ + #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/ + install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/ cd $pkgdir/usr/bin /bin/ln -s luatex texlua /bin/ln -s luatex texluac @@ -247,47 +259,90 @@ package() { echo "--> Create symlinks for TeX formats ..." PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ ############################################################# - # remove symlinks to scripts that are not in texlive-bin or texlive-core: - SYMLINKS_TO_REMOVE="authorindex \ -ebong \ -bibexport \ -cachepic \ -epspdf \ -epspdftk \ -fig4latex \ + # remove dangling symlinks + _bibtexextra_scripts="bibexport" + _core_scripts=" +afm2afm +arlatex +autoinst +bundledoc +cmap2enc +de-macro +dviasm +epstopdf +findhyph +font2afm +fragmaster +installfont-tl +latex2man +latexdiff +latexdiff-vc +latexmk +latexrevise +listings-ext.sh +mkjobtexmf +mkluatexfontdb +mkt1font +mptopdf +ot2kpx +pdf180 +pdf270 +pdf90 +pdfatfi +pdfbook +pdfcrop +pdfflip +pdfjam +pdfjam-pocketmod +pdfjam-slides3up +pdfjam-slides6up +pdfjoin +pdfnup +pdfpun +pfm2kpx +pkfix +pkfix-helper +purifyeps +repstopdf +rpdfcrop +showglyphs +texcount +texdiff +texdirflatten +texloganalyser +thumbpdf +vpl2ovp +vpl2vpl +" + _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" + _langextra_scripts="ebong" + _langgreek_scripts="mkgrkindex" + _latexextra_scripts="authorindex \ makeglossaries \ -mathspic \ -mkgrkindex \ pdfannotextractor \ -perltex \ pdfthumb \ +perltex \ ppower4 \ -pst2pdf \ ps4pdf \ splitindex \ svn-multi \ -htcontext \ -htlatex \ -htmex \ -ht \ -httexi \ -httex \ -htxelatex \ -htxetex \ -mk4ht \ -ulqda \ -vpe \ -tlmgr" - for s in $SYMLINKS_TO_REMOVE; do +vpe" + _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" + _pstricks_scripts="pst2pdf" + _science_scripts="ulqda" + for s in \ + ${_bibtexextra_scripts} \ + ${_core_scripts} \ + ${_htmlxml_scripts} \ + ${_langextra_scripts} \ + ${_langgreek_scripts} \ + ${_latexextra_scripts} \ + ${_pictures_scripts} \ + ${_pstricks_scripts} \ + ${_science_scripts} \ + tlmgr; do rm -f $pkgdir/usr/bin/$s done ################################################################### } -md5sums=('626f900fb59f036d6fea95f08c74b00b' - 'bfb9716aa00c86c08cd31e5b32edeb98' - '393a4bf67adc7ca5df2b386759d1a637' - '60e405158f53519348d9783e8d420670' - '0b2c3a4a1b1e4befb90d7fbb5f08a6e9' - '7ae1400dafdb079dcd08d233de83ec44' - '4b22a50866849ec14886906474a72a01') |
