From 3f17dc8e7f5d59d90e0d22f2a77476914d915c12 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Thu, 19 Jan 2012 16:10:29 +0000 Subject: [PATCH] updated on Thu Jan 19 16:10:29 UTC 2012 --- abiword-minimal/PKGBUILD | 6 +- areca/PKGBUILD | 9 +-- bigreqsproto-git/PKGBUILD | 28 ++++----- bin32-wine-suse/PKGBUILD | 21 ++++--- citrix-client/PKGBUILD | 48 ++++++---------- citrix-client/citrix-client.install | 23 ++------ compositeproto-git/PKGBUILD | 26 ++++----- daggerfall/PKGBUILD | 6 +- duff/PKGBUILD | 6 +- eggdrop/PKGBUILD | 55 ++++++++++++------ eggdrop/dlopen.c | 28 +++++++++ firefox-beta-bin-es-es/PKGBUILD | 6 +- firefox-beta-bin-fr/PKGBUILD | 6 +- firefox-beta-bin/PKGBUILD | 6 +- fontsproto-git/PKGBUILD | 28 ++++----- frescobaldi/PKGBUILD | 17 +++--- gearmand/PKGBUILD | 6 +- git-git/PKGBUILD | 41 ++++++------- glances/PKGBUILD | 4 +- gnumeric-minimal/PKGBUILD | 44 ++++++++++++++ gnumeric-minimal/gnumeric-minimal.install | 13 +++++ goffice-light/PKGBUILD | 33 +++++++++++ goffice-light/use-apiver-for-dirs.patch | 32 +++++++++++ icecream1/PKGBUILD | 6 +- icecream1/icecream.install | 1 + inputproto-git/PKGBUILD | 26 ++++----- kbproto-git/PKGBUILD | 30 +++++----- libpciaccess-git/PKGBUILD | 33 ++++++----- litmus/PKGBUILD | 7 ++- mach64drm/PKGBUILD | 16 +++--- npapi-vlc-git/PKGBUILD | 86 +++++++++++++--------------- ocaml-omagic-git/PKGBUILD | 50 ++++++++++++++++ osdlyrics/PKGBUILD | 9 ++- paulstretch/PKGBUILD | 8 ++- pngcrush/PKGBUILD | 4 +- python-couleur/PKGBUILD | 7 ++- python-rhodecode/PKGBUILD | 4 +- {python-couleur => python2-couleur}/PKGBUILD | 6 +- randrproto-git/PKGBUILD | 26 ++++----- recordproto-git/PKGBUILD | 29 ++++------ recordproto-git/{PKGBUILD => PKGBUILD~} | 28 ++++----- renderproto-git/PKGBUILD | 26 ++++----- resourceproto-git/PKGBUILD | 26 ++++----- rr62x/PKGBUILD | 4 +- rr62x/rr62x.install | 2 +- rtl2832u-git/PKGBUILD | 22 +++---- rtl2832u-git/makefile.patch | 35 +++++++++++ rtl2832u-git/rtl2832u-git.install | 2 +- rtl2832u-git/second_interface_bind.patch | 13 ----- scrnsaverproto-git/PKGBUILD | 28 ++++----- sdesktop/PKGBUILD | 4 +- speed2fritz/PKGBUILD | 2 +- tegra-toolkit/PKGBUILD | 85 +++++++++++++++++++++++++++ tegra-toolkit/license | 66 +++++++++++++++++++++ tegra-toolkit/oprofile-analyze.patch | 44 ++++++++++++++ theide-nogtk-svn/PKGBUILD | 2 +- theide-svn/PKGBUILD | 2 +- thunderbird-beta-bin/PKGBUILD | 2 +- thunderbird-beta/PKGBUILD | 2 +- upp-svn/PKGBUILD | 2 +- videoproto-git/PKGBUILD | 26 ++++----- viewnior-wp/PKGBUILD | 10 +++- vusb-analyzer/PKGBUILD | 33 +++++++++++ xcmiscproto-git/PKGBUILD | 28 ++++----- xextproto-git/PKGBUILD | 28 ++++----- xf86-input-evdev-git/PKGBUILD | 14 ++--- xf86dgaproto-git/PKGBUILD | 26 ++++----- xineramaproto-git/PKGBUILD | 29 ++++------ xmlstarlet/PKGBUILD | 4 +- xproto-git/PKGBUILD | 29 ++++------ 70 files changed, 921 insertions(+), 543 deletions(-) create mode 100644 eggdrop/dlopen.c create mode 100644 gnumeric-minimal/PKGBUILD create mode 100644 gnumeric-minimal/gnumeric-minimal.install create mode 100644 goffice-light/PKGBUILD create mode 100644 goffice-light/use-apiver-for-dirs.patch rewrite npapi-vlc-git/PKGBUILD (71%) create mode 100644 ocaml-omagic-git/PKGBUILD copy {python-couleur => python2-couleur}/PKGBUILD (83%) copy recordproto-git/{PKGBUILD => PKGBUILD~} (52%) create mode 100644 rtl2832u-git/makefile.patch delete mode 100644 rtl2832u-git/second_interface_bind.patch create mode 100644 tegra-toolkit/PKGBUILD create mode 100644 tegra-toolkit/license create mode 100644 tegra-toolkit/oprofile-analyze.patch create mode 100644 vusb-analyzer/PKGBUILD diff --git a/abiword-minimal/PKGBUILD b/abiword-minimal/PKGBUILD index 9ec2c8a0d..bea4533cf 100644 --- a/abiword-minimal/PKGBUILD +++ b/abiword-minimal/PKGBUILD @@ -2,13 +2,13 @@ pkgname=abiword-minimal pkgver=2.8.6 -pkgrel=3 +pkgrel=4 pkgdesc="A fully-featured word processor (GNOME free!)" arch=('i686' 'x86_64') license=('GPL') url="http://www.abisource.com" makedepends=('boost') -depends=('fribidi' 'wv' 'librsvg' 'enchant' 'desktop-file-utils') +depends=('fribidi' 'wv' 'librsvg' 'enchant' 'desktop-file-utils' 'goffice-light') conflicts=('abiword' 'abiword-plugins') provides=('abiword') install=abiword-minimal.install @@ -26,7 +26,7 @@ build() { autoreconf ./configure --prefix=/usr --enable-clipart --enable-templates --without-gnomevfs --with-gio \ --disable-default-plugins --disable-builtin-plugins --disable-static --with-psiconv-config=/nothere \ - --enable-plugins="opendocument openwriter openxml pdf" + --with-goffice --enable-plugins="opendocument openwriter openxml pdf goffice" make } diff --git a/areca/PKGBUILD b/areca/PKGBUILD index 46dcc96a8..5ed907fa9 100644 --- a/areca/PKGBUILD +++ b/areca/PKGBUILD @@ -3,7 +3,7 @@ pkgname=areca pkgver=7.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Easy-to-use personal file backup software supporting compression, encryption and incremental backups" arch=('i686' 'x86_64') license=('GPL2') @@ -16,15 +16,16 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-linux- "areca_decrypt.sh" "areca_dezip.sh" "areca.desktop") -md5sums=('eef3d5b66ceb9070e9d22485401c413f' +md5sums=('bbeb80e794f9d4bf0dd07adca6489dea' '024e3fe74c518a9dee889f3ea1ff9f71' '662d65e44fe0806cff69850dae55f107' '8e0088445454ab80a9f04c84b3363814' '2f1bd15c94600065c43366f440cc0c37' '5e978edc20d715cefec098e3e77a3721') # for 64bit -[ "$CARCH" = "x86_64" ] && source[0]="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-linux-gtk-64.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='13ebf34dc4b7b31b5cf0f03925021493' +#[ "$CARCH" = "x86_64" ] && source[0]="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-linux-gtk-64.tar.gz" +[ "$CARCH" = "x86_64" ] && source[0]="http://downloads.sourceforge.net/project/areca/areca-stable/areca-${pkgver}/areca-${pkgver}-linux-gtk-64.tar.gz" +[ "$CARCH" = "x86_64" ] && md5sums[0]='10fba4482b4f5bcc2bee9f119f9b0b8f' build() { diff --git a/bigreqsproto-git/PKGBUILD b/bigreqsproto-git/PKGBUILD index 8e70bf323..61e00cb23 100644 --- a/bigreqsproto-git/PKGBUILD +++ b/bigreqsproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s bigreqsproto pkgname=bigreqsproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Big Requests extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Big Requests extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('bigreqsproto=1.1.1') +provides=('bigreqsproto=99') conflicts=('bigreqsproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/bin32-wine-suse/PKGBUILD b/bin32-wine-suse/PKGBUILD index f95b68530..78ff046bb 100644 --- a/bin32-wine-suse/PKGBUILD +++ b/bin32-wine-suse/PKGBUILD @@ -5,9 +5,7 @@ pkgname=bin32-wine-suse pkgver=1.3.37 pkgrel=2 -# _suserel=1.$pkgrel _suserel=$pkgrel.1 -# _suserel=3.5 pkgdesc="A compatibility layer for running Windows programs - prebuilt openSUSE i586 build" url="http://en.opensuse.org/Wine" install=$pkgname.install @@ -15,24 +13,25 @@ arch=('x86_64') license=('LGPL') depends=('lib32-fontconfig' 'lib32-mesa' 'lib32-libxcursor' 'lib32-libxrandr' 'lib32-libxdamage' 'lib32-libxi' 'lib32-gettext' 'desktop-file-utils') optdepends=('lib32-giflib' 'lib32-libpng' 'lib32-libldap' 'lib32-lcms' 'lib32-libxml2' 'lib32-mpg123' 'lib32-openal' 'lib32-libcups' 'lib32-v4l-utils' 'lib32-libpulse' 'lib32-alsa-plugins' 'lib32-alsa-lib' 'wine_gecko') -provides=("wine=$pkgver" "bin32-wine=$pkgver" "bin32-winetricks=$pkgver") -conflicts=('wine' 'bin32-wine' 'bin32-winetricks') +provides=("wine=$pkgver" "winetricks") +conflicts=('wine' 'wine-git' 'winetricks' 'winetricks-svn') source=(http://download.opensuse.org/repositories/Emulators:/Wine/openSUSE_Factory/i586/wine-$pkgver-$_suserel.i586.rpm - http://download.opensuse.org/repositories/Emulators:/Wine/openSUSE_Factory/i586/wine-32bit-$pkgver-$_suserel.i586.rpm http://download.opensuse.org/repositories/Emulators:/Wine/openSUSE_Factory/i586/wine-devel-$pkgver-$_suserel.i586.rpm) md5sums=(`curl -s $source.md5 | cut -d " " -f1` - `curl -s ${source[1]}.md5 | cut -d " " -f1` - `curl -s ${source[2]}.md5 | cut -d " " -f1`) + `curl -s ${source[1]}.md5 | cut -d " " -f1`) + +# -- Reduce compression time -- +# Delete this line if you want to keep the instalation package +PKGEXT='.pkg.tar' package() { msg2 "Cleaning up unnecessary desktop entries" - rm usr/share/applications/wine-* + rm -f usr/share/applications/wine-* msg2 "Re-arranging docs" mv usr/share/doc/{packages/wine,wine} - rmdir usr/share/doc/packages + rm -rf usr/share/doc/packages msg2 "Moving everything in place" - mv usr/ "$pkgdir" + mv -f usr/ "$pkgdir/" } - diff --git a/citrix-client/PKGBUILD b/citrix-client/PKGBUILD index 04201580c..0bbf95638 100644 --- a/citrix-client/PKGBUILD +++ b/citrix-client/PKGBUILD @@ -8,7 +8,7 @@ pkgrel="0" pkgdesc="Provides XenApp(Citrix) for linux (x86_64 & i686)." url="http://www.citrix.com" -source=('http://download.citrix.com.edgesuite.net/akdlm/6527/linuxx86-12.0.0.189834.tar.gz?__gda__=1321897125_2ee2fd1ec07c8aa513106fd80015c832&__dlmgda__=1321983225_fe34ab5440b7215ddeb18dd0a809b471&fileExt=.gz') +source=(linuxx86-$pkgver.tar::'http://www.citrix.com/English/SS/downloads/EULA_p.asp?downloadID=2316611&versionID=2316622&productID=1689163') arch=('i686' 'x86_64') license=('CAL') md5sums=('d99029de72f8bb6ada8297d16f39ad90') @@ -25,6 +25,7 @@ case ${CARCH} in 'libxp' 'libxpm' 'libxt' + 'libcanberra' 'openmotif' 'printproto' 'xextproto' @@ -36,6 +37,7 @@ case ${CARCH} in x86_64 ) depends=( 'gtk2' + 'libcanberra' 'lib32-gcc-libs' 'lib32-libjpeg' 'lib32-libpng' @@ -89,40 +91,22 @@ build() { # Go ahead and do the different operations pursiant with the architecture... if [[ "${CARCH}" == "i686" ]]; then - # The installer works beautifully here, no reason to not just use that. - # I removed teh old script code that manually built the package, namely because - # it wasn't working and bothered the hell out of me, and then wrote a quick expect - # script to do the installation... -echo "#!/usr/bin/expect -spawn -noecho ./setupwfc -expect 'Enter option number 1-3' -send '1\r' -expect 'abandon the installation:' -send '/usr/lib/ICAClient\r' -expect 'Proceed with installation?' -send 'y\r' -expect 'Enter option number 1-2' -send '1\r' -expect 'Do you want to integrate Citrix Receiver with KDE and GNOME' -send 'n\r' -expect 'Do you want GStreamer to use the plugin from this client' -send 'n\r' -expect 'Do you want to install USB support?' -send 'n\r' -expect 'Enter option number 1-3' -send '3\r' -exit 0" > citrix_install.sh - chmod 755 citrix_install.sh - cd "${pkgdir}${instdir}"/ - # Remove the 64 bit plugins to prevent issues when stripping - find ${pkgdir} -iname "*64*" -exec rm {} \; - else - # We're 64 bit - Create executable wrapper for the binaries - echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\nexport GCONV_PATH=/usr/lib32/gconv/\n\${ICAROOT}/wfica -file \"\$1\"" > ./wfica.sh - echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\nexport GCONV_PATH=/usr/lib32/gconv/\n\${ICAROOT}/wfica -associate -fileparam \"\$1\"" > ./wfica_assoc.sh + # Create the 32 bit client script + echo -e "#!/bin/sh\n${instdir}/wfcmgr" > "${pkgdir}"/usr/bin/citrix-client.sh + chmod a+x "${pkgdir}"/usr/bin/citrix-client.sh + # Create executable wrapper for the binaries + echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\n\${ICAROOT}/wfica -file \$1" > ./wfica.sh + echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\n\${ICAROOT}\n\${ICAROOT}/wfica -associate -fileparam \$1" > ./wfica_assoc.sh cp ./wfica.sh "${pkgdir}"/usr/bin/wfica cp ./wfica_assoc.sh "${pkgdir}"/usr/bin/wfica_assoc chmod 755 ${pkgdir}/usr/bin/{wfica,wfica_assoc} chmod 755 ./{wfica.sh,wfica_assoc.sh} + # Copy Firefox plugin into plugin directory + cp ./npica.so "${pkgdir}"/usr/lib/mozilla/plugins/ + else + # We're 64 bit - Create executable wrapper for the binaries + echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\nexport GCONV_PATH=/usr/lib32/gconv/\n\${ICAROOT}/wfica -file \"\$1\"" > ./wfica.sh + echo -e "#!/bin/sh\nexport ICAROOT=${instdir}\nexport GCONV_PATH=/usr/lib32/gconv/\n\${ICAROOT}/wfica -associate -fileparam \"\$1\"" > ./wfica_assoc.sh + chmod a+x ./{wfica.sh,wfica_assoc.sh} fi } diff --git a/citrix-client/citrix-client.install b/citrix-client/citrix-client.install index a9f08cc2c..826c7082c 100644 --- a/citrix-client/citrix-client.install +++ b/citrix-client/citrix-client.install @@ -42,30 +42,17 @@ post_install() { [ -e "${tmpdir}"/module.ini ] && mv "${tmpdir}"/module.ini "${instdir}"/config/ && echo " Copied 'module.ini'" fi chmod 666 "${instdir}"/config/{appsrv,wfclient,module}.ini - if [[ "${ARCH}" == "x86_64" ]]; then - [ -d /usr/share/ca-certificates/mozilla ] && ln -s /usr/share/ca-certificates/mozilla/* ${instdir}/keystore/cacerts/ > /dev/null 2>&1 - echo "" - echo "CA certs SymLinked for SSL support." - echo "All done." - else - cd /usr/lib/ICAClient - ./client_install.sh - fi + [ -d /usr/share/ca-certificates/mozilla ] && ln -s /usr/share/ca-certificates/mozilla/* ${instdir}/keystore/cacerts/ > /dev/null 2>&1 + echo "" + echo "CA certs SymLinked for SSL support." + echo "All done." echo -e "\e[1;31m\nYou have to create '\e[1;33m\$HOME/.ICAClient/cache\e[1;31m' for each user who uses this program and then populate it with the appropriate ini files. Copy paste the below to do this easily:\n" echo -e "\e[1;37mmkdir -p \$HOME/.ICAClient/cache" echo -e "cp ${instdir}/config/{All_Regions,Trusted_Region,Unknown_Region,canonicalization,regions}.ini \$HOME/.ICAClient/\n" - echo -e "\e[1;37mx86_64 users will need to set firefox to use the command '${firefox_command}' for .ICA files." + echo -e "\e[1;37mFinally, set firefox to use the command '${firefox_command}' for .ICA files." echo -e "\e[0m" } pre_upgrade() { pre_install; } post_upgrade() { post_install; } -post_remove() { - ARCH="`uname -m`" - if [[ "${ARCH}" == "x86_64" ]]; then - rm -rf /usr/lib32/ICAClient - else - rm -rf /usr/lib/ICAClient - fi -} diff --git a/compositeproto-git/PKGBUILD b/compositeproto-git/PKGBUILD index d48d76766..686d65456 100644 --- a/compositeproto-git/PKGBUILD +++ b/compositeproto-git/PKGBUILD @@ -2,15 +2,15 @@ # Based on [extra]'s compositeproto pkgname=compositeproto-git -pkgver=20110112 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Composite extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Composite extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') depends=('fixesproto') makedepends=('xorg-util-macros' 'git') -provides=('compositeproto=0.4.2') +provides=('compositeproto=99') conflicts=('compositeproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -19,27 +19,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/daggerfall/PKGBUILD b/daggerfall/PKGBUILD index 5c810e375..267139790 100644 --- a/daggerfall/PKGBUILD +++ b/daggerfall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Andrzej Giniewicz pkgname=daggerfall pkgver=1.07.213 -pkgrel=9 +pkgrel=10 pkgdesc="The Elder Scrolls II: Daggerfall" arch=('any') url="http://www.elderscrolls.com/daggerfall/" @@ -16,7 +16,7 @@ source=(http://cms.elderscrolls.com/sites/default/files/tes/extras/DFInstall.zip http://download.narechk.net/dos32a-912-bin.zip license daggerfall-launcher.pl RUN.BAT Z.CFG HMISET.CFG unpk.py maps.patch dagger.conf) -noextract=(addquest.zip fixsa175.zip) +noextract=(addquest.zip fixsa175.zip dos32a-912-bin.zip DFInstall.zip) md5sums=('3cdd09a5696c2b94c58b85488be7cba2' '1074c3e593375542e8e45256c6f9ada4' 'e5647c7acba32973eb6b2fba621ae536' @@ -32,6 +32,8 @@ md5sums=('3cdd09a5696c2b94c58b85488be7cba2' build() { cd "$srcdir" + unzip -q DFInstall.zip + unzip -q dos32a-912-bin.zip _target="${pkgdir}"/usr/share/games/daggerfall install -d "$_target" cp -rf "$srcdir/DFCD/DAGGER" "$_target" diff --git a/duff/PKGBUILD b/duff/PKGBUILD index c97271ca7..94ecea52a 100644 --- a/duff/PKGBUILD +++ b/duff/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 44930 2011-04-13 03:50:28Z shusmann $ +# Maintainer: Stefan Husmann # Contributor: Aaron Schaefer pkgname=duff -pkgver=0.5 +pkgver=0.5.1 pkgrel=1 pkgdesc="A command-line utility for quickly finding duplicates in a given set of files" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://duff.sourceforge.net/" license=('custom') depends=('glibc' 'sh') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e42bedb278ab41081df3ebb9ce1cbe1d') +md5sums=('2d6abee90385edf43d1ae53f221955fe') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/eggdrop/PKGBUILD b/eggdrop/PKGBUILD index 215f56efd..c83ffc1d3 100644 --- a/eggdrop/PKGBUILD +++ b/eggdrop/PKGBUILD @@ -2,24 +2,25 @@ # Contributor: Mantas Mikulėnas pkgname=eggdrop -_rpkgname=eggdrop +_pkgname=eggdrop pkgver=1.6.21 _pkgver=${pkgver%.*} -pkgrel=3 +pkgrel=4 pkgdesc="The world's most popular Open Source IRC bot." arch=('i686' 'x86_64') url="http://www.eggheads.org/" license=('GPL2') -depends=('tcl>=8.3' 'zlib') +depends=('sh' 'tcl>=8.3' 'zlib') makedepends=('hardened-cc') -source=("http://ftp.eggheads.org/pub/$_rpkgname/source/$_pkgver/$_rpkgname$pkgver.tar.bz2"{,.asc}) +source=("http://ftp.eggheads.org/pub/$_pkgname/source/$_pkgver/$_pkgname$pkgver.tar.bz2"{,.asc} + 'dlopen.c') backup=("etc/$pkgname.conf") options=('!makeflags') - sha256sums=('75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754' - '37729631794111496d0843e2f64f0dc2fc1744924fce41cdf1a55a3680399c21') + '37729631794111496d0843e2f64f0dc2fc1744924fce41cdf1a55a3680399c21' + 'd1758f84a69173a852e598fa55e69df0d73b8b62c6993b0ba04aa21d539213e6') -# Want *unique* multiple installations? Change the pkgname, it will just work. +# Want multiple *unique* installations? Change the pkgname, it will just work. _usrdir="/usr" _sharedir="$_usrdir/share" _modulesdir="$_usrdir/lib/$pkgname" @@ -30,28 +31,50 @@ _mandir="$_sharedir/man/man1" readonly -a _usrdir _sharedir _modulesdir _scriptsdir _helpdir _bin _mandir build() { - cd "$srcdir/$_rpkgname$pkgver" + cd "$srcdir/$_pkgname$pkgver" - export CC="/usr/bin/hgcc" + # Force hardened build unless CC is already set. + if [[ ! $CC ]]; then + export CC="/usr/bin/hgcc" + fi + # Don't complain about language files on startup. sed -i "s|\"./language\"|\"/$_usrdir/$pkgname/language\"|g" src/eggdrop.h ./configure make config + # Include LDFLAGS. sed -i "s|-L/usr/lib|${LDFLAGS}|g" Makefile make } +check() { + cd "$srcdir/$_pkgname$pkgver" + + # If this fails, theres a good change something is broken. + + gcc "$srcdir/dlopen.c" -o dlopen -ldl + + for module in *.so ; do + if ! env LD_PRELOAD='' ./dlopen "${module}" ; then + error "Sanity check failed: "${module}" cannot be loaded. Proceeding anyway.." + fi + done + + rm dlopen + +} + package() { - eggtmp="$pkgdir/tmp" + readonly eggtmp="$pkgdir/tmp" # This is ugly.. - cd "$srcdir/$_rpkgname$pkgver" + cd "$srcdir/$_pkgname$pkgver" make DEST="$eggtmp" install - find "$eggtmp" -name 'CONTENTS' -exec rm -v {} + + find "$eggtmp" -name 'CONTENTS' -exec rm {} + mkdir -p -m 0755 "$pkgdir/etc" \ "$pkgdir/$_usrdir/"{bin,lib} \ @@ -59,11 +82,12 @@ package() { mv "$eggtmp/modules-$pkgver" "$pkgdir/$_modulesdir" mv "$eggtmp/eggdrop-$pkgver" "$pkgdir/$_bin" - mv "$eggtmp/doc/man1/$_rpkgname.1" "$pkgdir/$_mandir/$pkgname.1" + mv "$eggtmp/doc/man1/$_pkgname.1" "$pkgdir/$_mandir/$pkgname.1" + rm -r "$eggtmp/doc/man1" mv "$eggtmp/doc" "$pkgdir/$_sharedir/doc/$pkgname-$pkgver" for d in language scripts help text; do - mv "$eggtmp/${d}" "$pkgdir/$_sharedir/$pkgname" + mv "$eggtmp/${d}" "$pkgdir/$_sharedir/$pkgname" done sed -e '2d' \ @@ -73,8 +97,7 @@ package() { -e "s@modules/@$_modulesdir/@g" \ eggdrop.conf > "$pkgdir/etc/$pkgname.conf" - rm -fr "$eggtmp" - + rm -r "$eggtmp" find "$pkgdir/$_sharedir" -type f -exec chmod 0444 {} + } diff --git a/eggdrop/dlopen.c b/eggdrop/dlopen.c new file mode 100644 index 000000000..0a96da8ae --- /dev/null +++ b/eggdrop/dlopen.c @@ -0,0 +1,28 @@ +#include +#include +#include +#include +/* Simple program to see if dlopen() would succeed. */ +int main(int argc, char **argv) +{ + int i; + struct stat st; + char buf[PATH_MAX]; + for (i = 1; i < argc; i++) { + if (dlopen(argv[i], RTLD_NOW)) { + fprintf(stdout, "dlopen() of \"%s\" succeeded.\n", + argv[i]); + } else { + snprintf(buf, sizeof(buf), "./%s", argv[i]); + if ((stat(buf, &st) == 0) && dlopen(buf, RTLD_NOW)) { + fprintf(stdout, "dlopen() of \"./%s\" " + "succeeded.\n", argv[i]); + } else { + fprintf(stdout, "dlopen() of \"%s\" failed: " + "%s\n", argv[i], dlerror()); + return 1; + } + } + } + return 0; +} diff --git a/firefox-beta-bin-es-es/PKGBUILD b/firefox-beta-bin-es-es/PKGBUILD index cbcd7454a..0f9b47250 100644 --- a/firefox-beta-bin-es-es/PKGBUILD +++ b/firefox-beta-bin-es-es/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: megadriver pkgname=firefox-beta-bin-es-es -pkgver=10.0b4 +pkgver=10.0b5 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org (Beta channel, Castilian Spanish)" url="http://www.mozilla.org/es-ES/firefox/channel/" @@ -11,11 +11,11 @@ depends=('sqlite3' 'nss' 'libxt' 'gtk2' 'desktop-file-utils' 'alsa-lib' 'dbus-gl install=${pkgname}.install source=(ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-${CARCH}/es-ES/firefox-${pkgver}.tar.bz2 firefox-beta.desktop firefox-beta-safe.desktop) -md5sums=('dcefd632e0cb4481d9b5c55a3e69d608' +md5sums=('7a0cd72b69ce2d4ec7c997095c585bd0' 'f66d831fcf7a6a60be44a78e44a34fb0' '1f947ba2b9ec501268cd5bdf9e20e540') -[[ "$CARCH" == "x86_64" ]] && md5sums[0]="8de81023bfacc415ae14cb79c422cfbf" +[[ "$CARCH" == "x86_64" ]] && md5sums[0]="50be5451c6325d967f620efe3073e736" build() { install -d $pkgdir/usr/lib/$pkgname $pkgdir/usr/bin/ diff --git a/firefox-beta-bin-fr/PKGBUILD b/firefox-beta-bin-fr/PKGBUILD index e6e323199..2803516fa 100755 --- a/firefox-beta-bin-fr/PKGBUILD +++ b/firefox-beta-bin-fr/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: machmalabala pkgname=firefox-beta-bin-fr -pkgver=10.0b4 +pkgver=10.0b5 pkgrel=1 pkgdesc='Standalone web browser from mozilla.org, beta build - binaries - french.' url='http://www.mozilla.org/projects/firefox' @@ -10,12 +10,12 @@ depends=('dbus-glib' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mim license=('MPL' 'GPL' 'LGPL') source=("ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-${CARCH}/fr/firefox-${pkgver}.tar.bz2" "$pkgname.desktop" "$pkgname-safe.desktop") -sha1sums=('69533f54e869a9763684c32a9a166f56553fec53' +sha1sums=('4c6c42e3ff343b51b2aa828f3dd8229ae62b7922' 'a93c7f75b2325b499170228f58aaa0d9e235f7a8' '512319635dca399c90c947e3293607bfb515ac4f') [[ "$CARCH" == "i686" ]] && - sha1sums[0]="acb91a4065ea802dccabd4ee5f0dde0810e00ed6" + sha1sums[0]="ce31fafaa28a4f2f80df090893c136854f2908c4" build() { cd $srcdir diff --git a/firefox-beta-bin/PKGBUILD b/firefox-beta-bin/PKGBUILD index 27901244a..79e4c96fe 100644 --- a/firefox-beta-bin/PKGBUILD +++ b/firefox-beta-bin/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer : Axilleas P pkgname=firefox-beta-bin -pkgver=10.0b4 +pkgver=10.0b5 pkgrel=1 pkgdesc='Standalone web browser from mozilla.org, beta build binaries.' url='http://www.mozilla.com/en-US/firefox/fx/' @@ -14,11 +14,11 @@ source=("ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-${CARCH}/en- "$pkgname.desktop" "$pkgname-safe.desktop") -sha1sums=('db9d0b1cecc42593b4cd45a8cf0873cf1f1e0f7b' +sha1sums=('619b1dbb7159b1507692e27d5beb4901a73a471a' 'dd2afa6a6369b9c6ca549152d2df46794b3b385d' '30990dafa5bea211ea2b84dadb56ac68324f48a3') -[[ "$CARCH" == "i686" ]] && sha1sums[0]="398fc59430362dc52274549da2af90d6de2e756c" +[[ "$CARCH" == "i686" ]] && sha1sums[0]="ca2ba6b9649eab2efc8b775271360e4c7378472e" build() { diff --git a/fontsproto-git/PKGBUILD b/fontsproto-git/PKGBUILD index 9ffd61252..4392c1fce 100644 --- a/fontsproto-git/PKGBUILD +++ b/fontsproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s fontsproto pkgname=fontsproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 font extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 font extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('fontsproto=2.1.1') +provides=('fontsproto=99') conflicts=('fontsproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/frescobaldi/PKGBUILD b/frescobaldi/PKGBUILD index 2bf885682..fee7b2390 100644 --- a/frescobaldi/PKGBUILD +++ b/frescobaldi/PKGBUILD @@ -1,21 +1,22 @@ # Contributor: David Virgilio # Contributor: David Zaragoza +# Maintainer: Clément Démoulins pkgname=frescobaldi -pkgver=2.0.0 -pkgrel=3 +pkgver=2.0.2 +pkgrel=1 pkgdesc="A LilyPond sheet music editor for KDE4. It aims to be powerful, yet lightweight and easy to use." arch=('i686' 'x86_64') -url="http://www.frescobaldi.org/" -license="GPL" -depends=('lilypond' 'poppler' 'python2>=2.4.0' 'python2-poppler-qt' 'python2-pyqt' 'qt') +url="http://www.frescobaldi.org/" +license=("GPL") +depends=('lilypond' 'poppler' 'python2>=2.6.0' 'python2-poppler-qt' 'python2-pyqt' 'qt') optdepends=('rumor') -install= makedepends=('automoc4' 'cmake' 'docbook-xsl') + source=(https://github.com/downloads/wbsoft/frescobaldi/$pkgname-$pkgver.tar.gz) -md5sums=('90541f174239722ffb2e8bc158a6f1d6') +md5sums=('6fe3128286354f816038f89ee8940c9b') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver python2 setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/gearmand/PKGBUILD b/gearmand/PKGBUILD index 58f9d83d2..d8e3659b4 100644 --- a/gearmand/PKGBUILD +++ b/gearmand/PKGBUILD @@ -1,8 +1,8 @@ pkgname='gearmand' -pkgver='0.25' +pkgver='0.26' pkgrel='1' pkgdesc='Gearman is an application framework designed to distribute appropriate computer tasks to multiple computers.' -arch=('i686') +arch=('i686' 'x86_64') url="http://gearman.org/" license=('Simplified BSD License') makedepends=('boost>=1.39.0') @@ -15,7 +15,7 @@ backup=() options=() install= source=("http://launchpad.net/gearmand/trunk/$pkgver/+download/gearmand-$pkgver.tar.gz") -md5sums=('f0a8b9f5d71e655653b75a7534f65121') +md5sums=('52a8cc98f649980331cc8011d47af09f') build() { diff --git a/git-git/PKGBUILD b/git-git/PKGBUILD index 3c8499e0a..6fe1bece4 100644 --- a/git-git/PKGBUILD +++ b/git-git/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Christoph Vigano # Contributor: Marcin Karpezo # Contributor: Michael Rosset -# Contributor: Dan McGee - Thanks for Your PKGBUILD in extra +# Contributor: Dan McGee - based on [extra]'s git pkgname=git-git pkgver=20120119 -pkgrel=1 -pkgdesc="the fast distributed version control system" +pkgrel=2 +pkgdesc="The fast distributed version control system - Git version" arch=('i686' 'x86_64') url="http://git-scm.com/" license=('GPL2') -depends=('curl' 'expat' 'perl-error' 'perl') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' openssl pcre) +makedepends=('git-core' 'asciidoc' 'xmlto' 'docbook-xsl' 'python2' 'emacs') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -18,12 +19,11 @@ optdepends=('tk: gitk and git gui' 'perl-net-smtp-ssl: git send-email TLS support' 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' + 'emacs: emcas interface for git' 'subversion: git svn' 'cvsps: git cvsimport') -makedepends=('git-core' 'asciidoc' 'xmlto' 'docbook-xsl' 'emacs') -replaces=('git-core' 'git') -conflicts=('git-core' 'git') -provides=('git-core' 'git') +replaces=('git-core') +provides=('git-core') backup=('etc/conf.d/git-daemon.conf') source=('git-daemon' 'git-daemon.conf') @@ -38,20 +38,20 @@ build() { cd "$srcdir" msg "Connecting to GIT server...." - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin + if [[ -d $_gitname ]]; then + cd $_gitname && git pull origin msg "The local files are updated." else - git clone --depth 1 "$_gitroot" "$_gitname" #shallow clone + git clone --depth 1 $_gitroot $_gitname #shallow clone fi msg "GIT checkout done or server timeout" msg "Starting build..." - rm -rf "$srcdir/$_gitname-build" - mkdir "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname" && ls -A1 --indicator-style=none | grep -v "^.git" | xargs -d '\n' cp -r -t "../$_gitname-build" # do not copy over the .git folder - cd "$srcdir/$_gitname-build" + rm -rf "$srcdir/"$_gitname-build + mkdir "$srcdir/"$_gitname-build + cd "$srcdir/"$_gitname && ls -A1 --indicator-style=none | grep -v "^.git" | xargs -d '\n' cp -r -t ../$_gitname-build # do not copy over the .git folder + cd "$srcdir/"$_gitname-build export PYTHON_PATH='/usr/bin/python2' make prefix=/usr gitexecdir=/usr/lib/git-core \ @@ -66,7 +66,7 @@ build() { package() { export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$_gitname-build" + cd "$srcdir/"$_gitname-build make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -87,19 +87,10 @@ package() { cd contrib/emacs make prefix=/usr DESTDIR="$pkgdir" install - # how 'bout some manpages? - #for mansect in man1 man5 man7; do - # for manpage in "$srcdir"/$mansect/*; do - # install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - # done - #done - # remove perllocal.pod, .packlist, and empty directories. rm -rf "$pkgdir"/usr/lib/perl5 # git daemon script install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf - } - diff --git a/glances/PKGBUILD b/glances/PKGBUILD index 8adf481ad..9ad53f5c3 100644 --- a/glances/PKGBUILD +++ b/glances/PKGBUILD @@ -1,6 +1,6 @@ #Contributor: Francois Boulogne fboulogne at april dot org pkgname=glances -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 pkgdesc="Curses-based system monitor" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ license=('LGPL') depends=('ncurses' 'pystatgrab') provides=('glances') source=(https://github.com/downloads/nicolargo/glances/glances-$pkgver.tar.gz) -md5sums=("c45b371ff610d617aabd5a666dcaa869") +md5sums=("d0e4d6b1a248761c9b677d916903ce14") build() { cd $srcdir/$pkgname-$pkgver diff --git a/gnumeric-minimal/PKGBUILD b/gnumeric-minimal/PKGBUILD new file mode 100644 index 000000000..e94d1db20 --- /dev/null +++ b/gnumeric-minimal/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: megadriver +# Based on gnumeric from [extra] + +pkgname=gnumeric-minimal +_pkgname=gnumeric +pkgver=1.10.17 +pkgrel=1 +pkgdesc="A GNOME-less spreadsheet program" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/gnumeric/" +license=('GPL') +depends=('goffice-light' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool') +install=gnumeric-minimal.install +conflicts=('gnumeric') +provides=('gnumeric') +options=('libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz) +md5sums=('ee824d9656a271957d949b8769341f40') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # Create a dummy file to trick gnumeric into building without docs + # Got this from the gnumeric SlackBuild + touch doc/C/gnumeric-C.omf.out + + # Remove invalid mime type. (FS#26338) + sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-install --disable-ssindex \ + --without-gnome --without-psiconv --without-perl \ + --without-python --without-gda + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/etc/gconf" + rm -rf "${pkgdir}/usr/share/gnome" +} diff --git a/gnumeric-minimal/gnumeric-minimal.install b/gnumeric-minimal/gnumeric-minimal.install new file mode 100644 index 000000000..b9e5c6b47 --- /dev/null +++ b/gnumeric-minimal/gnumeric-minimal.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/goffice-light/PKGBUILD b/goffice-light/PKGBUILD new file mode 100644 index 000000000..5ff037736 --- /dev/null +++ b/goffice-light/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: megadriver +# Based on goffice from [extra] + +pkgname=goffice-light +_pkgname=goffice +pkgver=0.8.17 +pkgrel=1 +pkgdesc="A library of document-centric objects and utilities (GNOME free!)" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL') +options=('!libtool') +depends=('gtk2' 'libgsf') +makedepends=('intltool') +conflicts=('goffice') +provides=('goffice') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz + use-apiver-for-dirs.patch) +md5sums=('e2bc2d2f51220d6883f0797d74c385b8' '08541e72f497ce02fee774a3ccae2dce') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-config-backend=keyfile + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/goffice-light/use-apiver-for-dirs.patch b/goffice-light/use-apiver-for-dirs.patch new file mode 100644 index 000000000..e40c7993e --- /dev/null +++ b/goffice-light/use-apiver-for-dirs.patch @@ -0,0 +1,32 @@ +--- configure.in.orig 2011-09-07 08:45:49.687783970 +0000 ++++ configure.in 2011-09-07 09:12:55.709382840 +0000 +@@ -418,7 +418,7 @@ + fi + + dnl ************************************************** +-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) ++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The package name, for gettext]) + AM_GLIB_GNU_GETTEXT +@@ -638,9 +638,9 @@ + dnl ****************** + dnl + dnl These are changed in goffice.c for WIN32 packages +-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') +-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') +-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') ++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') + AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') + dnl + AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') +--- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000 ++++ libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 +@@ -11,4 +11,4 @@ + Libs.private: @EXTRA_LIBS@ + Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ + +-PluginDir=${libdir}/goffice/@VERSION@/plugins ++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins diff --git a/icecream1/PKGBUILD b/icecream1/PKGBUILD index 2e9a7b36d..25a538087 100644 --- a/icecream1/PKGBUILD +++ b/icecream1/PKGBUILD @@ -2,13 +2,15 @@ pkgname=icecream1 pkgver=0.9.7 -pkgrel=3 +pkgrel=4 pkgdesc="*This package includes a config file, following what other distros do.* Icecream takes compile jobs from your build and distributes it to remote machines allowing a parallel build on several machines." url="http://en.opensuse.org/Icecream" license="GPL" depends=('gcc') +conflicts=('icecream') +backup=('etc/icecream.conf') arch=('i686' 'x86_64') -install=(icecream.install) +install=icecream.install source=(ftp://ftp.suse.com/pub/projects/icecream/icecc-$pkgver.tar.bz2 icecream-daemon icecream-scheduler-daemon icecream.conf) md5sums=('c06900c2f4011428d0d48826a04f74fb' 'd4943e2ebf97efa9fabb70e0f31c712b' diff --git a/icecream1/icecream.install b/icecream1/icecream.install index 5eddc61fd..05aea45f1 100644 --- a/icecream1/icecream.install +++ b/icecream1/icecream.install @@ -3,6 +3,7 @@ cat << EOF ==> For more information about Icecream have a look at: ==> 'http://en.opensuse.org/Icecream' ==> You can add the daemons icecream on all machines and icecream-scheduler on one machine in /etc/rc.conf +==> Remember to prepend /opt/icecream/bin to your PATH! EOF } diff --git a/inputproto-git/PKGBUILD b/inputproto-git/PKGBUILD index 9d9945325..ecb2e2161 100755 --- a/inputproto-git/PKGBUILD +++ b/inputproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s inputproto pkgname=inputproto-git -pkgver=20111122 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Input extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Input extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('inputproto=2.0.99.1') +provides=('inputproto=99') conflicts=('inputproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/kbproto-git/PKGBUILD b/kbproto-git/PKGBUILD index 6dddbab42..59d39be98 100644 --- a/kbproto-git/PKGBUILD +++ b/kbproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s kbproto pkgname=kbproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 XKB extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 XKB extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') -makedepends=('git') -provides=('kbproto=1.0.5') +makedepends=('xorg-util-macros' 'git') +provides=('kbproto=99') conflicts=('kbproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/libpciaccess-git/PKGBUILD b/libpciaccess-git/PKGBUILD index 4f3e98db9..c9f32ebc4 100644 --- a/libpciaccess-git/PKGBUILD +++ b/libpciaccess-git/PKGBUILD @@ -4,41 +4,40 @@ # Based on [extra]'s libpciaccess pkgname=libpciaccess-git -pkgver=20111122 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 PCI access library (Git version)" -arch=(i686 x86_64) +pkgdesc="X11 PCI access library - Git version" +arch=('i686' 'x86_64') url="http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git" -license="bsd" +license=('custom') makedepends=('xorg-util-macros' 'git') options=('!libtool') -provides=('libpciaccess=0.12.901') +provides=('libpciaccess=99') conflicts=('libpciaccess') -_gitroot="git://anongit.freedesktop.org/xorg/lib/libpciaccess.git" +_gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." if [ -d $_gitname ] ; then - cd $_gitname && git pull origin && cd .. - msg "The local files are updated." + cd $_gitname && git pull origin && cd .. + msg "The local files are updated." else - git clone $_gitroot + git clone --depth 1 $_gitroot fi - msg "GIT checkout done or server timeout" - msg "Starting make..." - cp -r $_gitname $_gitname-build - cd $_gitname-build + msg "GIT checkout done or server timeout" - ./autogen.sh --prefix=/usr --sysconfdir=/etc + msg "Starting make..." + cd $_gitname + ./autogen.sh --prefix=/usr make } -package() { - cd $_gitname-build +package(){ + cd $_gitname make DESTDIR="$pkgdir" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/litmus/PKGBUILD b/litmus/PKGBUILD index 42300ff68..5b99b51ee 100644 --- a/litmus/PKGBUILD +++ b/litmus/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Illarion Kovalchuk pkgname=litmus -pkgver=0.12.1 -pkgrel=2 +pkgver=0.13 +pkgrel=1 pkgdesc="WebDAV server protocol compliance test suite" arch=('any') url="http://www.webdav.org/neon/litmus/" @@ -20,7 +20,8 @@ changelog= #source=($pkgname-$pkgver.tar.gz) source=(http://www.webdav.org/neon/litmus/$pkgname-$pkgver.tar.gz) noextract=() -md5sums=('d0bbb717196e835a5759f67f097321fb') #makepkg -g +#makepkg -g +md5sums=('7c081e182214e771bc615232ef475b00') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib diff --git a/mach64drm/PKGBUILD b/mach64drm/PKGBUILD index e3bf14550..ce15416fb 100644 --- a/mach64drm/PKGBUILD +++ b/mach64drm/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: TryA +# Maintainer: trya pkgname=mach64drm -pkgver=20110417 -pkgrel=2 +pkgver=20120119 +pkgrel=1 pkgdesc="Mach64 DRM module" arch=('i686' 'x86_64') url="http://dri.freedesktop.org/wiki/DRM" @@ -11,16 +11,16 @@ depends=('linux') makedepends=('linux-headers') optdepends=('mach64-dri: Mesa DRI drivers for Mach64' 'xf86-video-mach64: X.Org Mach64 video driver') -source=(http://trya.alwaysdata.net/linux/mach64-${pkgver}.tar.gz) -md5sums=('d9c2cee5659b77c28a2b597dbca77280') +source=(http://trya.alwaysdata.net/linux/mach64-$pkgver.tar.gz) +md5sums=('44a113c71e7a38ca1901bb58228f01ec') install="mach64drm.install" build() { - cd ${srcdir}/mach64-${pkgver} + cd "$srcdir/mach64-$pkgver" make } package() { - install -Dm644 ${srcdir}/mach64-${pkgver}/mach64.ko \ - ${pkgdir}/lib/modules/`uname -r`/kernel/drivers/gpu/drm/mach64/mach64.ko + install -Dm644 "$srcdir/mach64-$pkgver/mach64.ko" \ + "$pkgdir/lib/modules/`uname -r`/kernel/drivers/gpu/drm/mach64/mach64.ko" } diff --git a/npapi-vlc-git/PKGBUILD b/npapi-vlc-git/PKGBUILD dissimilarity index 71% index bc7ba8462..cefe182ac 100644 --- a/npapi-vlc-git/PKGBUILD +++ b/npapi-vlc-git/PKGBUILD @@ -1,45 +1,41 @@ - -# Pimper : M0Rf30 - -pkgname=npapi-vlc-git -pkgver=20101017 -pkgrel=1 -pkgdesc="Mozilla plugin based on VLC" -arch=('i686' 'x86_64') -url="http://git.videolan.org/?p=npapi-vlc.git;a=summary" -license=('LGPL-2.1') -depends=() -makedepends=('pkgconfig' 'vlc' 'xulrunner') - - -_gitroot="git://git.videolan.org/npapi-vlc.git" -_gitname="npapi-vlc" - -build() { - msg "Connecting to GIT server...." - - - [ -d $_gitname ] && { - cd $_gitname - git pull origin - cd .. - - msg "Local files have been updated." - } || { - git clone $_gitroot - } - - msg "GIT checkout done or server timeout" - - rm -rf $_gitname-build - git clone $_gitname $_gitname-build - cd $_gitname-build - - msg "Starting make..." - ./autogen.sh - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install - -} - +# Maintainer: Det +# Contributor: Pimper (M0Rf30) + +pkgname=npapi-vlc-git +pkgver=20120119 +pkgrel=1 +pkgdesc="The modern VLC Mozilla plugin" +arch=('i686' 'x86_64') +url="http://git.videolan.org/?p=npapi-vlc.git;a=summary" +license=('LGPL-2.1') +options=('!libtool') +depends=('vlc') +makedepends=('xulrunner') + +_gitroot="git://git.videolan.org/npapi-vlc.git" +_gitname="npapi-vlc" + +build() { + msg "Connecting to GIT server...." + + if [ -d $_gitname ]; then + cd $_gitname + git pull origin + msg "Local files have been updated." + else + git clone --depth 1 $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + + ./autogen.sh + ./configure --prefix=/usr + msg "Starting make..." + make +} + +package() { + cd $_gitname + make DESTDIR=$pkgdir install +} \ No newline at end of file diff --git a/ocaml-omagic-git/PKGBUILD b/ocaml-omagic-git/PKGBUILD new file mode 100644 index 000000000..8361c1608 --- /dev/null +++ b/ocaml-omagic-git/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Serge Ziryukin + +pkgname=ocaml-omagic-git +pkgver=20120119 +pkgrel=1 +pkgdesc="OCaml bindings to libmagic" +arch=('i686' 'x86_64') +url=("http://github.com/ftrvxmtrx/omagic") +# MIT + linking exception +license=('MIT') +depends=('ocaml' 'ocaml-findlib') +makedepends=('ocaml') +provides=('ocaml-omagic') +conflicts=('ocaml-omagic') + +_gitroot="git://github.com/ftrvxmtrx/omagic.git" +_gitname="omagic" + +build () { + OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)" + + cd "$srcdir" + + msg "Connecting to GIT server..." + + if [ -d "$srcdir/$_gitname" ]; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + cp -rf "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + ./configure --destdir "${OCAMLFIND_DESTDIR}" || return 1 + make || return 1 +} + +package () { + OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)" + + cd "$srcdir/$_gitname-build" + + mkdir -p "${OCAMLFIND_DESTDIR}/stublibs" + OCAMLFIND_DESTDIR="${OCAMLFIND_DESTDIR}" make install || return 1 +} diff --git a/osdlyrics/PKGBUILD b/osdlyrics/PKGBUILD index 7aa48df06..470c98c8e 100644 --- a/osdlyrics/PKGBUILD +++ b/osdlyrics/PKGBUILD @@ -2,7 +2,7 @@ pkgname=osdlyrics pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lyric show compatible with various media players" arch=('i686' 'x86_64') url="http://code.google.com/p/osd-lyrics/" @@ -13,8 +13,10 @@ makedepends=('intltool') optdepends=('libmpd: MPD support' 'xmms2: XMMS2 support') install=$pkgname.install -source=(http://osd-lyrics.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('80d704b97a72a117bb9890948adcf79c') +source=(http://osd-lyrics.googlecode.com/files/$pkgname-$pkgver.tar.gz + http://osd-lyrics.googlecode.com/files/$pkgname-$pkgver-glib.patch) +md5sums=('80d704b97a72a117bb9890948adcf79c' + '23cabc6a12a32383e8a84dd873566fc2') _ods=() _tmpfile="$pkgdir/.tmp" @@ -39,6 +41,7 @@ unset_optdepend() build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/$pkgname-$pkgver-glib.patch" aclocal autoheader diff --git a/paulstretch/PKGBUILD b/paulstretch/PKGBUILD index 7291dbc26..3759f77fb 100644 --- a/paulstretch/PKGBUILD +++ b/paulstretch/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Viaken pkgname=paulstretch pkgver=2.2_2 -pkgrel=1 +pkgrel=2 pkgver_hyph=${pkgver//_/-} pkgdesc='A program made for extreme sound stretching of the audio (like 50x) and for applying special effects by "spectral smoothing" the sounds' arch=('i686' 'x86_64') @@ -13,14 +13,16 @@ md5sums=('172dec7ad316ea4df0fda6d97758c5f2') build() { cd "$srcdir/$pkgname-$pkgver_hyph" - + sed -i '23i#include ' Input/MP3InputS.cpp + sed -i '9s/-o/-lz -logg -lvorbis -o/' compile_linux_fftw.sh + ./compile_linux_fftw.sh } package() { cd "$srcdir/$pkgname-$pkgver_hyph" - + mkdir -p "$pkgdir/usr/bin/" cp paulstretch "$pkgdir/usr/bin/" } diff --git a/pngcrush/PKGBUILD b/pngcrush/PKGBUILD index 34fd98358..e1830493e 100644 --- a/pngcrush/PKGBUILD +++ b/pngcrush/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Stefan Husmann pkgname=pngcrush -pkgver=1.7.22 +pkgver=1.7.24 pkgrel=1 pkgdesc="A tool for optimizing the compression of PNG files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('glibc') source=("http://downloads.sourceforge.net/pmt/$pkgname-$pkgver.tar.xz" LICENSE) -md5sums=('03014bfa0111284aad3f4257da1845d5' +md5sums=('eee3c4ecb532d7fb65d05f9006eca529' 'e6446a786d939c98fcada57f9ae6de1f') build() { diff --git a/python-couleur/PKGBUILD b/python-couleur/PKGBUILD index 6ccaef1aa..ff6ac5164 100755 --- a/python-couleur/PKGBUILD +++ b/python-couleur/PKGBUILD @@ -6,13 +6,14 @@ pkgrel=1 pkgdesc="ANSI terminal tool for python, colored shell and other handy fancy features" url="https://github.com/gabrielfalcao/couleur" license=(APACHE) -depends=('python2') +depends=('python') arch=('any') source=(http://pypi.python.org/packages/source/c/couleur/couleur-$pkgver.tar.gz) md5sums=('455d3ac3fa7f2408d4f1372860498203') build() { - cd $srcdir - python2 setup.py install --root=$pkgdir + cd "$srcdir" + 2to3 -nw . + python setup.py install --root="$pkgdir" } diff --git a/python-rhodecode/PKGBUILD b/python-rhodecode/PKGBUILD index 22eaf1124..811208a89 100644 --- a/python-rhodecode/PKGBUILD +++ b/python-rhodecode/PKGBUILD @@ -1,7 +1,7 @@ # $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ # Maintainer: Sebastien Binet pkgname=python-rhodecode -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Mercurial repository browser/management with build in push/pull server and full text search" url="http://rhodecode.org" @@ -10,7 +10,7 @@ license=('GPL') depends=( 'python2' 'mercurial' 'pylons' 'python-paste') optdepends=('python-celery') source=(http://pypi.python.org/packages/source/R/RhodeCode/RhodeCode-$pkgver.tar.gz) -md5sums=('f815193663e7476f59b231d21a342b65') +md5sums=('f97b9d644b7d27f274f05d67d647a351') build() { cd $startdir/src/RhodeCode-$pkgver diff --git a/python-couleur/PKGBUILD b/python2-couleur/PKGBUILD similarity index 83% copy from python-couleur/PKGBUILD copy to python2-couleur/PKGBUILD index 6ccaef1aa..d7a090a41 100755 --- a/python-couleur/PKGBUILD +++ b/python2-couleur/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Massimiliano Torromeo -pkgname=python-couleur +pkgname=python2-couleur pkgver=0.2 pkgrel=1 pkgdesc="ANSI terminal tool for python, colored shell and other handy fancy features" @@ -12,7 +12,7 @@ source=(http://pypi.python.org/packages/source/c/couleur/couleur-$pkgver.tar.gz) md5sums=('455d3ac3fa7f2408d4f1372860498203') build() { - cd $srcdir - python2 setup.py install --root=$pkgdir + cd "$srcdir" + python2 setup.py install --root="$pkgdir" } diff --git a/randrproto-git/PKGBUILD b/randrproto-git/PKGBUILD index caf1e5bc1..b092e7286 100644 --- a/randrproto-git/PKGBUILD +++ b/randrproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s randrproto pkgname=randrproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 RandR extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 RandR extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('randrproto=1.4.0') +provides=('randrproto=99') conflicts=('randrproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/recordproto-git/PKGBUILD b/recordproto-git/PKGBUILD index e96824bcd..d3a6a96f0 100644 --- a/recordproto-git/PKGBUILD +++ b/recordproto-git/PKGBUILD @@ -3,16 +3,15 @@ # Based on [extra]'s recordproto pkgname=recordproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Record extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Record extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') -provides=('recordproto=1.14.1') +provides=('recordproto=99') conflicts=('recordproto') -groups=('xorg') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} _gitname=${pkgname/-*} @@ -20,27 +19,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/recordproto-git/PKGBUILD b/recordproto-git/PKGBUILD~ similarity index 52% copy from recordproto-git/PKGBUILD copy to recordproto-git/PKGBUILD~ index e96824bcd..5de914cb0 100644 --- a/recordproto-git/PKGBUILD +++ b/recordproto-git/PKGBUILD~ @@ -3,14 +3,14 @@ # Based on [extra]'s recordproto pkgname=recordproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Record extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Record extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') -provides=('recordproto=1.14.1') +provides=('recordproto=99') conflicts=('recordproto') groups=('xorg') @@ -20,27 +20,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/renderproto-git/PKGBUILD b/renderproto-git/PKGBUILD index ce384e769..98003864b 100644 --- a/renderproto-git/PKGBUILD +++ b/renderproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s renderproto pkgname=renderproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Render extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Render extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('git') -provides=('renderproto=0.11.1') +provides=('renderproto=99') conflicts=('renderproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/resourceproto-git/PKGBUILD b/resourceproto-git/PKGBUILD index bb0a9c76f..61a4eb782 100755 --- a/resourceproto-git/PKGBUILD +++ b/resourceproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s resourceproto pkgname=resourceproto-git -pkgver=20110612 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Resource extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Resource extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('git') -provides=('resourceproto=1.2.0') +provides=('resourceproto=99') conflicts=('resourceproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/rr62x/PKGBUILD b/rr62x/PKGBUILD index e7daecfda..abd8dd554 100644 --- a/rr62x/PKGBUILD +++ b/rr62x/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alessandro Sagratini pkgname=rr62x pkgver=1.1 -pkgrel=6 +pkgrel=7 pkgdesc="Kernel modules for Highpoint RocketRAID 62x SATA/6Gbps Card. Patched for use with kernel26 >=2.6.37 and kernel >= 3 (a.k.a. linux). Thanks to Alessandro Sagratini's patches for rr264x driver to help me make this one work again." arch=('i686' 'x86_64') url="http://www.highpoint-tech.com/USA_new/series_rr620.htm" @@ -20,7 +20,7 @@ install=$pkgname.install source=(http://www.support-highpoint-tech.com/Main/RR622/Linux/opensrc/rr62x-linux-src-v1.1-091221-1456.tar.gz scsi_lck.patch kernel3.patch) noextract=() md5sums=('fd41c24e6e2beb86af86ff975b128c8d' 'b96f51f73edf509564f02f96c3ee62be' '9bfb6492fdddcb822b6f94350a231188') -_extramodules=extramodules-3.1-ARCH +_extramodules=extramodules-3.2-ARCH _kernver=`cat /lib/modules/${_extramodules}/version` build() { diff --git a/rr62x/rr62x.install b/rr62x/rr62x.install index ad9128f62..68cfc57ec 100644 --- a/rr62x/rr62x.install +++ b/rr62x/rr62x.install @@ -1,7 +1,7 @@ # This is a default template for a post-install scriptlet. You can # remove any functions you don't need (and this header). -KERNEL_VERSION=`cat /lib/modules/extramodules-3.1-ARCH/version` +KERNEL_VERSION=`cat /lib/modules/extramodules-3.2-ARCH/version` # arg 1: the new package version pre_install() { diff --git a/rtl2832u-git/PKGBUILD b/rtl2832u-git/PKGBUILD index 6cf1fb360..e96129f4e 100644 --- a/rtl2832u-git/PKGBUILD +++ b/rtl2832u-git/PKGBUILD @@ -2,23 +2,23 @@ # Contributor: Leif Warner # Contributor: Christophe Gueret pkgname=rtl2832u-git -pkgver=20111109 +pkgver=20120119 _extramodules="extramodules-$(uname -r | cut -f-2 -d.)-ARCH" _kernver="$(cat /lib/modules/${_extramodules}/version)" pkgrel=1 -pkgdesc="Kernel26 module for the RTL2832U DVB-T USB2.0 device" +pkgdesc="Linux module for the RTL2832U DVB-T USB2.0 device" arch=('i686' 'x86_64') -url="https://github.com/mbarbon/rtl2832" +url="https://github.com/ambrosa/DVB-Realtek-RTL2832U-2.2.2-10tuner-mod_kernel-3.0.0" license=('GPL') depends=('linux') makedepends=('git') install="${pkgname}.install" provides=('rtl2832u') conflicts=('rtl2832u') -source=('second_interface_bind.patch') -md5sums=('6dedc3b7b9a4978b0820dadad19b510b') +source=('makefile.patch') +md5sums=('a7cfdee7fe8f8e5cfd28a28d379c3de0') -_gitroot="git://github.com/mbarbon/rtl2832.git" +_gitroot="git://github.com/ambrosa/DVB-Realtek-RTL2832U-2.2.2-10tuner-mod_kernel-3.0.0.git" _gitname="rtl2832" @@ -39,13 +39,13 @@ build() { rm -rf "${srcdir}/${_gitname}-build" git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - patch -p1 < "$srcdir/second_interface_bind.patch" - export KERNELDIR="/usr/src/linux-${_kernver}" - make build + cd "${srcdir}/${_gitname}-build/RTL2832-2.2.2_kernel-3.0.0" + patch -p1 < "$srcdir/makefile.patch" + export KBUILD_SRC="/usr/src/linux-${_kernver}" + make } package() { - install -D -m644 "${srcdir}/${_gitname}-build/rtl2832u.ko" "${pkgdir}/lib/modules/${_extramodules}/rtl2832u.ko" + install -D -m644 "${srcdir}/${_gitname}-build/RTL2832-2.2.2_kernel-3.0.0/dvb-usb-rtl2832u.ko" "${pkgdir}/lib/modules/${_extramodules}/dvb-usb-rtl2832u.ko" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${install}" } diff --git a/rtl2832u-git/makefile.patch b/rtl2832u-git/makefile.patch new file mode 100644 index 000000000..0bc39c4a0 --- /dev/null +++ b/rtl2832u-git/makefile.patch @@ -0,0 +1,35 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2012-01-19 13:49:25.072958605 +0000 ++++ b/Makefile 2012-01-19 14:05:48.049319288 +0000 +@@ -4,7 +4,7 @@ + # Choose here wich include file to use: from kernel 3.0.0 (good for 3.1.0) or from kernel 3.2.0 + + # kernel 3.0.0 / 3.1.0 +-INCLUDE_EXTRA_DVB := include-300 ++# INCLUDE_EXTRA_DVB := include-300 + + # kernel 3.2.0 + #INCLUDE_EXTRA_DVB := include-320 +@@ -12,7 +12,7 @@ + # ---------------------------------------- + + # current dir +-SOURCEDIR := $(PWD) ++#SOURCEDIR := $(PWD) + + dvb-usb-rtl2832u-objs := demod_rtl2832.o dvbt_demod_base.o dvbt_nim_base.o \ + foundation.o math_mpi.o nim_rtl2832_mxl5007t.o nim_rtl2832_fc2580.o \ +@@ -31,11 +31,9 @@ + EXTRA_CFLAGS += -I$(KBUILD_SRC)/drivers/media/dvb/dvb-usb/ \ + -I$(KBUILD_SRC)/drivers/media/dvb/dvb-core/ \ + -I$(KBUILD_SRC)/drivers/media/dvb/frontends/ \ +- -I$(KBUILD_SRC)/drivers/media/common/tuners/ \ +- -I$(SOURCEDIR)/$(INCLUDE_EXTRA_DVB) ++ -I$(KBUILD_SRC)/drivers/media/common/tuners/ + +-KINS = /lib/modules +-KDIR = /usr/src/linux-headers-`uname -r` ++KDIR = /lib/modules/$(shell uname -r)/build + + default: + make -C $(KDIR) SUBDIRS=$(PWD) modules diff --git a/rtl2832u-git/rtl2832u-git.install b/rtl2832u-git/rtl2832u-git.install index 9b4280d50..a0a54ac99 100644 --- a/rtl2832u-git/rtl2832u-git.install +++ b/rtl2832u-git/rtl2832u-git.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.1-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/rtl2832u-git/second_interface_bind.patch b/rtl2832u-git/second_interface_bind.patch deleted file mode 100644 index cc98bf9d6..000000000 --- a/rtl2832u-git/second_interface_bind.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur a/main.c b/main.c ---- a/main.c 2011-08-11 17:58:28.000000000 +0100 -+++ b/main.c 2011-10-17 11:36:17.267073514 +0100 -@@ -640,6 +640,9 @@ - static int rtl2832u_usb_probe(struct usb_interface *intf, - const struct usb_device_id *id) - { -+ if (!intf->altsetting->desc.bNumEndpoints) -+ return -ENODEV; -+ - if ( ( 0== dvb_usb_device_init(intf,&rtl2832u_1st_properties,THIS_MODULE,NULL,adapter_nr) )|| - ( 0== dvb_usb_device_init(intf,&rtl2832u_2nd_properties,THIS_MODULE,NULL,adapter_nr) ) || - ( 0== dvb_usb_device_init(intf,&rtl2832u_3th_properties,THIS_MODULE,NULL,adapter_nr) ) || diff --git a/scrnsaverproto-git/PKGBUILD b/scrnsaverproto-git/PKGBUILD index 036b16211..6279660a7 100644 --- a/scrnsaverproto-git/PKGBUILD +++ b/scrnsaverproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s scrnsaverproto pkgname=scrnsaverproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Screen Saver extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Screen Saver extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('scrnsaverproto=1.2.1') +provides=('scrnsaverproto=99') conflicts=('scrnsaverproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/sdesktop/PKGBUILD b/sdesktop/PKGBUILD index 7f5cf8e66..e69b6e525 100644 --- a/sdesktop/PKGBUILD +++ b/sdesktop/PKGBUILD @@ -1,14 +1,14 @@ # Contributor: Tuxce pkgname=sdesktop pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Switch desktop with mouse wheel" arch=(x86_64 i686) url="http://tuxce.selfip.org/cgit/public/sdesktop/" license=('GPL') depends=(libx11) makedepends=(xproto) -source=(http://tuxce.selfip.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://tuxce.no-ip.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/speed2fritz/PKGBUILD b/speed2fritz/PKGBUILD index f85034369..41fd14e5c 100644 --- a/speed2fritz/PKGBUILD +++ b/speed2fritz/PKGBUILD @@ -1,5 +1,5 @@ pkgname=speed2fritz -pkgver=1442 +pkgver=1453 pkgrel=1 pkgdesc="speed2fritz is a script collection for flashing Speedport-routers with a custom firmware" url="http://www.ip-phone-forum.de/showthread.php?t=172137" diff --git a/tegra-toolkit/PKGBUILD b/tegra-toolkit/PKGBUILD new file mode 100644 index 000000000..a3b53d0fd --- /dev/null +++ b/tegra-toolkit/PKGBUILD @@ -0,0 +1,85 @@ +# Contributor: giniu +pkgname=tegra-toolkit +pkgver=1.0r3 +_pkgver=1.0 +_pkgdate=2011-12-16 +_pkgbuild=11617556 +pkgrel=1 +pkgdesc="The Tegra Android Toolkit, tools, samples and documentation" +license=('custom') +arch=('i686' 'x86_64') +url="http://developer.nvidia.com/category/zone/mobile-development" + +depends=('oprofile' 'gprof2dot-git' 'graphviz' 'android-sdk-platform-tools' 'qt') +optdepends=('eog: default image viewer for oprofile-analyze') + +[ "$CARCH" = "i686" ] && _pkgarch="linux" +[ "$CARCH" = "x86_64" ] && _pkgarch="linux-x64" +source=("http://developer.nvidia.com/sites/default/files/akamai/tools/files/Tegra/tegra-toolkit-$_pkgver-$_pkgarch-$_pkgdate-$_pkgbuild.run" + "oprofile-analyze.patch" "license") +[ "$CARCH" = "i686" ] && md5sums=('35120e0f8ea63eb220932d7dd2310c20') +[ "$CARCH" = "x86_64" ] && md5sums=('56684502f13aaef258ee5852d66ffe9e') +md5sums+=('65ae4180dfea679bd498394fdc73d691' + '2ea4dc7733201cd7dbc5552342fa1d26') + +options=(!strip) + +build() { + cd "${srcdir}" + if [ -e ~/NVPACK ] + then + echo "Sorry, Tegra Toolkit installer is broken" + echo "it needs to extract to ~/NVPACK and the file is already present" + echo "rename or delete the file and try again" + return 1 + fi + msg "Extracting Tegra Toolkit..." + chmod a+x tegra-toolkit-$_pkgver-$_pkgarch-$_pkgdate-$_pkgbuild.run + rm -rf "fakebin" + mkdir "fakebin" + cd "fakebin" + touch apt-cache + chmod a+x apt-cache + touch apt-get + chmod a+x apt-get + echo "#!/bin/bash" > sudo + echo "\$@" >> sudo + chmod a+x sudo + echo "#!/bin/bash" > xterm + echo "\$2 \$3 \$4" >> xterm + chmod a+x xterm + echo "#!/bin/bash" > dpkg + echo "cp \$2 \"$srcdir/\${2##*/}\"" >> dpkg + chmod a+x dpkg + cd .. + oldPATH=$PATH + export PATH="$srcdir/fakebin:$PATH" + unset LD_PRELOAD + ./tegra-toolkit-$_pkgver-$_pkgarch-$_pkgdate-$_pkgbuild.run --mode unattended + export PATH="$oldPATH" + rm -rf "$srcdir/NVPACK" + mv ~/NVPACK "$srcdir/NVPACK" + msg "Finished extracting Tegra Toolkit" + cd "$srcdir/NVPACK/oprofile" + patch -p0 < ../../oprofile-analyze.patch + install -m 644 -D "abi/arm_abi" "$pkgdir/usr/share/tegra/abi/arm_abi" + install -m 755 -D "oprofile-analyze.py" "$pkgdir/usr/bin/oprofile-analyze" + cd "$srcdir/NVPACK/TDK_Samples" + install -d "$pkgdir/usr/share/tegra/samples" + cp -rf Android_NVIDIA_samples_2_public_RC2/* "$pkgdir"/usr/share/tegra/samples + cp -rf tegra_android_lifecycle/* "$pkgdir"/usr/share/tegra/samples + cd "$srcdir/NVPACK" + install -d "$pkgdir/usr/share/tegra/docs" + cp -rf docs/* "$pkgdir/usr/share/tegra/docs" + cd "$srcdir/NVPACK/perf/PERF" + install -d "$pkgdir/usr/share/tegra/docs/perf-patches" + install -m 644 -D perf "$pkgdir/usr/share/tegra/perf" + cp -rf patch/* "$pkgdir"/usr/share/tegra/docs/perf-patches + cd "$srcdir" + [ "$CARCH" = "i686" ] && ar -x perfhudes_1.9-8_i386.deb + [ "$CARCH" = "x86_64" ] && ar -x perfhudes_1.9-8_amd64.deb + tar -xzf data.tar.gz -C "$pkgdir" + [ "$CARCH" = "x86_64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" + install -m 644 -D license "$pkgdir/usr/share/licenses/tegra-toolkit/license" +} + diff --git a/tegra-toolkit/license b/tegra-toolkit/license new file mode 100644 index 000000000..4d46cdc07 --- /dev/null +++ b/tegra-toolkit/license @@ -0,0 +1,66 @@ +Software License Agreement for NVIDIA Tegra Android Toolkit + +IMPORTANT NOTICE -- READ CAREFULLY: This Software License Agreement ("Agreement") for NVIDIA Tegra Android Toolkit, including computer software and associated documentation ("Software"), is the Agreement which governs use of the SOFTWARE of NVIDIA Corporation and its subsidiaries ("NVIDIA") downloadable herefrom. By downloading, installing, copying, or otherwise using the SOFTWARE, You (as defined below) agree to be bound by the terms of this Agreement. If You do not agree to the terms of this Agreement, do not download the SOFTWARE. + +RECITALS +Use of NVIDIA's SOFTWARE requires three elements: the SOFTWARE, an NVIDIA GPU or application processor ("NVIDIA Hardware"), and a computer system. The SOFTWARE is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE is not sold, and instead is only licensed for Your use, strictly in accordance with this Agreement. The NVIDIA Hardware is protected by various patents, and is sold, but this Agreement does not cover the sale or use of such hardware, since it may not necessarily be sold as a package with the SOFTWARE. This Agreement sets forth the terms and conditions of the SOFTWARE only. + +1. DEFINITIONS +1.1 "Licensee," "You," or "Your" shall mean the entity or individual that downloads and uses the SOFTWARE. +1.2 "Third Party SOFTWARE" shall mean the third party software components referenced in Attachment A of this Agreement. +1.3 "SOFTWARE" shall mean the NVIDIA proprietary software deliverables provided pursuant to this Agreement. + +2. GRANT OF LICENSE +2.1 Rights and Limitations of Grant. NVIDIA hereby grants Licensee the following limited, non-exclusive, non-transferable, non-sublicensable copyright license to use the SOFTWARE, with the following limitations: +2.1.1 Usage Rights. Licensee may install and use multiple copies of the SOFTWARE on a shared computer or concurrently on different computers, and make multiple back-up copies of the SOFTWARE, solely for Licensee's use within Licensee's Enterprise. "Enterprise" shall mean individual use by Licensee or any legal entity (such as a corporation or university) and the subsidiaries it owns by more than 50 percent. +2.1.2 Additional Third Party Licensing Obligations +Licensee acknowledges and agrees that its use of Third Party SOFTWARE included with the SOFTWARE shall be subject to and governed by the additional licensing terms and conditions as set forth or referenced in Attachment A of this Agreement. +2.1.3 Limitations. +No Reverse Engineering. Licensee may not reverse engineer, decompile, or disassemble the SOFTWARE, nor attempt in any other manner to obtain the source code. +No Separation of Components. The SOFTWARE is licensed as a single product. Except as authorized in this Agreement, Software component parts of the Software may not be separated for use on more than one computer, nor otherwise used separately from the other parts. +No Rental. Licensee may not rent or lease the SOFTWARE to someone else. + +3. TERM AND TERMINATION +This Agreement will continue in effect for two (2) years ("Initial Term) after Your initial download and use of the SOFTWARE, subject to the exclusive right of NVIDIA to terminate as provided herein. The term of this Agreement will automatically renew for successive one (1) year renewal terms after the Initial Term, unless either party provides to the other party at least three (3) months prior written notice of termination before the end of the applicable renewal term. +This Agreement will automatically terminate if Licensee fails to comply with any of the terms and conditions hereof. In such event, Licensee must destroy all copies of the SOFTWARE and all of its component parts. +Defensive Suspension. If Licensee commences or participates in any legal proceeding against NVIDIA, then NVIDIA may, in its sole discretion, suspend or terminate all license grants and any other rights provided under this Agreement during the pendency of such legal proceedings. + +4. COPYRIGHT +All rights, title, interest and copyrights in and to the SOFTWARE (including but not limited to all images, photographs, animations, video, audio, music, text, and other information incorporated into the SOFTWARE), the accompanying printed materials, and any copies of the SOFTWARE, are owned by NVIDIA, or its suppliers. The SOFTWARE is protected by copyright laws and international treaty provisions. Accordingly, Licensee is required to treat the SOFTWARE like any other copyrighted material, except as otherwise allowed pursuant to this Agreement and that it may make one copy of the SOFTWARE solely for backup or archive purposes. +RESTRICTED RIGHTS NOTICE. Software has been developed entirely at private expense and is commercial computer software provided with RESTRICTED RIGHTS. Use, duplication or disclosure by the U.S. Government or a U.S. Government subcontractor is subject to the restrictions set forth in the Agreement under which Software was obtained pursuant to DFARS 227.7202-3(a) or as set forth in subparagraphs (c)(1) and (2) of the Commercial Computer Software - Restricted Rights clause at FAR 52.227-19, as applicable. Contractor/manufacturer is NVIDIA, 2701 San Tomas Expressway, Santa Clara, CA 95050 + +5. APPLICABLE LAW +This Agreement shall be deemed to have been made in, and shall be construed pursuant to, the laws of the State of Delaware. The United Nations Convention on Contracts for the International Sale of Goods is specifically disclaimed. The courts of Santa Clara County, California shall have exclusive jurisdiction and venue over any dispute arising out of or relating to this Agreement. + +6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY +6.1 No Warranties. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. +6.2 No Liability for Consequential Damages. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NVIDIA OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +6.3 No Support. NVIDIA has no obligation to support or to provide any updates of the Software. + +7. MISCELLANEOUS +7.1 Feedback. Notwithstanding any Non-Disclosure Agreement executed by and between the parties, the parties agree that in the event Licensee or NVIDIA provides Feedback (as defined below) to the other party on how to design, implement, or improve the SOFTWARE or Licensee's product(s) for use with the SOFTWARE, the following terms and conditions apply the Feedback: +7.1.1 Exchange of Feedback. Both parties agree that neither party has an obligation to give the other party any suggestions, comments or other feedback, whether verbally or in written or source code form, relating to (i) the SOFTWARE; (ii) Licensee's products; (iii) Licensee's use of the SOFTWARE; or (iv) optimization/interoperability of Licensee's product with the SOFTWARE (collectively defined as "Feedback"). In the event either party provides Feedback to the other party, the party receiving the Feedback may use any Feedback that the other party voluntarily provides to improve the (i) SOFTWARE or other related NVIDIA technologies, respectively for the benefit of NVIDIA; or (ii) Licensee's product or other related Licensee technologies, respectively for the benefit of Licensee. Accordingly, if either party provides Feedback to the other party, both parties agree that the other party and its respective licensees may freely use, reproduce, license, distribute, and otherwise commercialize the Feedback in the (i) SOFTWARE or other related technologies; or (ii) Licensee's products or other related technologies, respectively, without the payment of any royalties or fees. +7.1.2 Residual Rights. Licensee agrees that NVIDIA shall be free to use any general knowledge, skills and experience, (including, but not limited to, ideas, concepts, know-how, or techniques) ("Residuals"), contained in the (i) Feedback provided by Licensee to NVIDIA; (ii) Licensee's products shared or disclosed to NVIDIA in connection with the Feedback; or (c) Licensee's confidential information voluntarily provided to NVIDIA in connection with the Feedback, which are retained in the memories of NVIDIA's employees, agents, or contractors who have had access to such Residuals. Subject to the terms and conditions of this Agreement, NVIDIA's employees, agents, or contractors shall not be prevented from using Residuals as part of such employee's, agent's or contractor's general knowledge, skills, experience, talent, and/or expertise. NVIDIA shall not have any obligation to limit or restrict the assignment of such employees, agents or contractors or to pay royalties for any work resulting from the use of Residuals +7.1.3 Disclaimer of Warranty. FEEDBACK FROM EITHER PARTY IS PROVIDED FOR THE OTHER PARTY'S USE "AS IS" AND BOTH PARTIES DISCLAIM ALL WARRANTIES, EXPRESS, IMPLIED AND STATUTORY INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. BOTH PARTIES DO NOT REPRESENT OR WARRANT THAT THE FEEDBACK WILL MEET THE OTHER PARTY'S REQUIREMENTS OR THAT THE OPERATION OR IMPLEMENTATION OF THE FEEDBACK WILL BE UNINTERRUPTED OR ERROR-FREE. +7.1.4 No Liability for Consequential Damages. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE THE FEEDBACK, EVEN IF THE OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +7.2 Freedom of Action. Licensee agrees that this Agreement is nonexclusive and NVIDIA may currently or in the future be developing software, other technology or confidential information internally, or receiving confidential information from other parties that maybe similar to the Feedback and Licensee's confidential information (as provided in Section 7.1.2 above), which may be provided to NVIDIA in connection with Feedback by Licensee. Accordingly, Licensee agrees that nothing in this Agreement will be construed as a representation or inference that NVIDIA will not develop, design, manufacture, acquire, market products, or have products developed, designed, manufactured, acquired, or marketed for NVIDIA, that compete with the Licensee's products or confidential information. +7.3 No Implied Licenses. Under no circumstances should anything in this Agreement be construed as NVIDIA granting by implication, estoppel or otherwise, (i) a license to any NVIDIA product or technology other than the SOFTWARE; or (ii) any additional license rights for the SOFTWARE other than the licenses expressly granted in this Agreement. +7.4 If any provision of this Agreement is inconsistent with, or cannot be fully enforced under, the law, such provision will be construed as limited to the extent necessary to be consistent with and fully enforceable under the law. This Agreement is the final, complete and exclusive agreement between the parties relating to the subject matter hereof, and supersedes all prior or contemporaneous understandings and agreements relating to such subject matter, whether oral or written. This Agreement may only be modified in writing signed by an authorized officer of NVIDIA. Licensee agrees that it will not ship, transfer or export the SOFTWARE into any country, or use the SOFTWARE in any manner, prohibited by the United States Bureau of Industry and Security or any export laws, restrictions or regulations. +7.5 The parties agree that the following sections of the Agreement will survive the termination of the License: Sections 2.1.2, 2.1.3, and 4-7. + +ATTACHMENT A +Additional Licensing Terms and Conditions +The following Third Party SOFTWARES are included with the SOFTWARE, or downloaded/streamed real time from a third party website at the time of installation of the SOFTWARE. +Licensee acknowledges and agrees the Third Party SOFTWARES are licensed to Licensee pursuant to the following terms and conditions: + +A. Licensee's use of the following Third Party SOFTWARE are subject to the terms and conditions of GNU GPL v2.0 (and links to the respective source codes are referenced below): +1. Oprofile (source provided with the SOFTWARE) +This product includes copyrighted third-party software licensed under the terms of the GNU General Public License v2.0 ("GPL v2.0). All third-party software packages are copyright by their respective authors. GPL v2.0 terms and conditions are hereby incorporated into the Agreement by this reference. + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +B. Licensee's use of the following Third Party SOFTWARE is subject to the terms and conditions of Apache license v2.0: +1. Tegra sample pack +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. +You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/tegra-toolkit/oprofile-analyze.patch b/tegra-toolkit/oprofile-analyze.patch new file mode 100644 index 000000000..65a9e597d --- /dev/null +++ b/tegra-toolkit/oprofile-analyze.patch @@ -0,0 +1,44 @@ +--- oprofile-analyze.py.orig 2012-01-15 12:51:40.000000000 +0100 ++++ oprofile-analyze.py 2012-01-15 13:09:09.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -E ++#!/usr/bin/python2 -E + + import os + import re +@@ -6,7 +6,7 @@ + import string + import getopt + +-script_path = os.path.realpath(os.path.dirname(sys.argv[0])) ++script_path = "/usr" + + ##### DEFAULT SETTINGS ##### + +@@ -24,7 +24,7 @@ + output_dir = '/tmp/oprofile/' + + # -f, --fs +-root_fs = script_path + "/root/" ++root_fs = os.path.expanduser("~/tegra") + + # -p, --pull + need_to_pull_binary = 1 +@@ -33,7 +33,7 @@ + oprofile_binaries_path = script_path + "/bin/" + + # -a, --abi +-oprofile_abi_path = script_path + "/abi/arm_abi" ++oprofile_abi_path = script_path + "/share/tegra/abi/arm_abi" + + # inactive now, sorry + do_backtrace = 0 +@@ -260,7 +260,7 @@ + os.system(oprofile_binaries_path + "/opreport " + " --session-dir=." + " -cl" + " --root=" + root_fs + " --symbols " + binary + ' | ' + 'python ' + oprofile_binaries_path + '/gprof2dot.py -f oprofile' + ' | ' + 'dot -Tps -o ' + output_dir + '/callgraph.ps') + os.system("convert +antialias " + output_dir + '/callgraph.ps' + " " + output_dir + '/callgraph.bmp > /dev/null 2>&1') + elif current_os == 'Linux': +- os.system(oprofile_binaries_path + "/opreport " + " --session-dir=." + " -cl" + " --root=" + root_fs + " --symbols " + binary + ' | ' + 'python ' + oprofile_binaries_path + '/gprof2dot.py -f oprofile' + ' | ' + 'dot -Tpng -o ' + output_dir + '/callgraph.png') ++ os.system(oprofile_binaries_path + "/opreport " + " --session-dir=." + " -cl" + " --root=" + root_fs + " --symbols " + binary + ' | ' + 'gprof2dot -f oprofile' + ' | ' + 'dot -Tpng -o ' + output_dir + '/callgraph.png') + if current_os == 'Cygwin': + os.system(image_viewer + ' ' + '`' + 'cygpath -w ' + output_dir + '/callgraph.bmp' + '`') + elif current_os == 'Linux': diff --git a/theide-nogtk-svn/PKGBUILD b/theide-nogtk-svn/PKGBUILD index 40127ef8c..49908c6ec 100644 --- a/theide-nogtk-svn/PKGBUILD +++ b/theide-nogtk-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=theide-nogtk-svn -pkgver=4442 +pkgver=4443 pkgrel=1 pkgdesc="Modern IDE designed for developping large U++/C++ applications (nogtk version)" arch=('i686' 'x86_64') diff --git a/theide-svn/PKGBUILD b/theide-svn/PKGBUILD index 285b3d771..8a6f0fcac 100644 --- a/theide-svn/PKGBUILD +++ b/theide-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=theide-svn -pkgver=4442 +pkgver=4443 pkgrel=1 pkgdesc="Modern IDE designed for developping large U++/C++ applications" arch=('i686' 'x86_64') diff --git a/thunderbird-beta-bin/PKGBUILD b/thunderbird-beta-bin/PKGBUILD index 67c73ba34..efeda0783 100644 --- a/thunderbird-beta-bin/PKGBUILD +++ b/thunderbird-beta-bin/PKGBUILD @@ -2,7 +2,7 @@ # Based on [extra]'s thunderbird pkgname=thunderbird-beta-bin -pkgver=10.0b3 +pkgver=10.0b4 pkgrel=1 pkgdesc="Standalone Mail/News reader - Bleeding edge binary version" arch=('i686' 'x86_64') diff --git a/thunderbird-beta/PKGBUILD b/thunderbird-beta/PKGBUILD index 8003dc4ee..1c9ee8670 100644 --- a/thunderbird-beta/PKGBUILD +++ b/thunderbird-beta/PKGBUILD @@ -5,7 +5,7 @@ _pgo="0" # "1" to enable pkgname=thunderbird-beta -pkgver=10.0b2 +pkgver=10.0b4 pkgrel=1 pkgdesc="Standalone Mail/News reader - Bleeding edge version with optional PGO" arch=('i686' 'x86_64') diff --git a/upp-svn/PKGBUILD b/upp-svn/PKGBUILD index 8ee569b6d..8de69cb05 100644 --- a/upp-svn/PKGBUILD +++ b/upp-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=upp-svn -pkgver=4442 +pkgver=4443 pkgrel=1 pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)" arch=('any') diff --git a/videoproto-git/PKGBUILD b/videoproto-git/PKGBUILD index c1684de40..afead34fd 100644 --- a/videoproto-git/PKGBUILD +++ b/videoproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s videoproto pkgname=videoproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Video extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Video extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('git') -provides=('videoproto=2.3.1') +provides=('videoproto=99') conflicts=('videoproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/viewnior-wp/PKGBUILD b/viewnior-wp/PKGBUILD index 9749c5d0b..ff677970d 100644 --- a/viewnior-wp/PKGBUILD +++ b/viewnior-wp/PKGBUILD @@ -1,15 +1,21 @@ +#Maintainer: nado +#Contributor: squarezin + + pkgname=viewnior-wp pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A simple, fast and elegant image viewer program with feh background support" arch=('i686' 'x86_64') url="http://xsisqox.github.com/Viewnior/" license=('GPL3') depends=('gtk2>=2.12' 'feh') makedepends=('make' 'intltool>=0.35' 'pkgconfig>=0.9' 'perl>=5.8.1') +provides=(viewnior) +conflicts=(viewnior) install=viewnior.install source=(http://cloud.github.com/downloads/xsisqox/Viewnior/viewnior-$pkgver.tar.gz) -md5sums=('30c19c41afe16072169669f104152fb0') +md5sums=('5b14c6edaf78fdd3259f148ae9d7f062') build() { cd "viewnior-$pkgver" diff --git a/vusb-analyzer/PKGBUILD b/vusb-analyzer/PKGBUILD new file mode 100644 index 000000000..c9467fa22 --- /dev/null +++ b/vusb-analyzer/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Yevgeny Krasovsky + +pkgname=vusb-analyzer +pkgver=1.1 +pkgrel=1 +pkgdesc="A tool for visualizing logs of USB packets, from sniffer tools like usbmon" +arch=('i686' 'x86_64') +url="http://vusb-analyzer.sourceforge.net/" +license=('MIT') +depends=('python2' 'pygtk') +optdepends=('psyco: install it for a nice speed boost' + 'usbmon: collect raw usb traces') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('de3a25c869178863e8ac5ed7d5f60532') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' vusb-analyzer + + mkdir -p usr/bin + mkdir -p usr/lib/${pkgname} + mkdir -p usr/share/licenses/${pkgname} + + cp -R ${pkgname} VUsbTools usr/lib/${pkgname}/ + install -D -m644 README.txt "usr/share/licenses/${pkgname}/LICENSE" + ln -s -f /usr/lib/${pkgname}/${pkgname} usr/bin/vusb-analyzer +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + cp -R usr/ "${pkgdir}" +} \ No newline at end of file diff --git a/xcmiscproto-git/PKGBUILD b/xcmiscproto-git/PKGBUILD index 99cd53e15..8ad0bcf13 100644 --- a/xcmiscproto-git/PKGBUILD +++ b/xcmiscproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s xcmiscproto pkgname=xcmiscproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 XC-Miscellaneous extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 XC-Miscellaneous extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros' 'git') -provides=('xcmiscproto=1.2.1') +provides=('xcmiscproto=99') conflicts=('xcmiscproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/xextproto-git/PKGBUILD b/xextproto-git/PKGBUILD index a4a8012b7..fe2612848 100644 --- a/xextproto-git/PKGBUILD +++ b/xextproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s xextproto pkgname=xextproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 various extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 various extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xmlto' 'xorg-util-macros' 'docbook-xsl' 'git') -provides=('xextproto=7.2.0') +provides=('xextproto=99') conflicts=('xextproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/xf86-input-evdev-git/PKGBUILD b/xf86-input-evdev-git/PKGBUILD index e8cb32aec..fb9a1184a 100644 --- a/xf86-input-evdev-git/PKGBUILD +++ b/xf86-input-evdev-git/PKGBUILD @@ -10,30 +10,30 @@ arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') +makedepends=('xorg-server-devel>=1.10.99.902' 'git') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') provides=('xf86-input-evdev=2.6.99.901') -conflicts=('xf86-input-evdev') +conflicts=('xf86-input-evdev' 'xorg-server<1.10.99.902') -_gitroot="git://anongit.freedesktop.org/xorg/driver/${pkgname/-g*}" +_gitroot="git://git.freedesktop.org/git/xorg/driver/${pkgname/-g*}" _gitname=${pkgname/-g*} build() { - msg "Connecting to anongit.freedesktop.org GIT server...." + msg "Connecting to git.freedesktop.org GIT server...." if [ -d $_gitname ]; then cd $_gitname && git pull origin msg "The local files are updated." else - git clone --depth 1 $_gitroot $_gitname + git clone --depth 1 $_gitroot cd $_gitname fi msg "GIT checkout done or server timeout" - sh autogen.sh --prefix=/usr + ./autogen.sh + ./configure --prefix=/usr msg "Starting make..." make } diff --git a/xf86dgaproto-git/PKGBUILD b/xf86dgaproto-git/PKGBUILD index 0ce1168aa..0563d04a9 100644 --- a/xf86dgaproto-git/PKGBUILD +++ b/xf86dgaproto-git/PKGBUILD @@ -2,14 +2,14 @@ # Based on [extra]'s xf86dgaproto pkgname=xf86dgaproto-git -pkgver=20101207 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Direct Graphics Access extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Direct Graphics Access extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('git') -provides=('xf86dgaproto=2.1') +provides=('xf86dgaproto=99') conflicts=('xf86dgaproto') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} @@ -18,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} + cd $_gitname ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/xineramaproto-git/PKGBUILD b/xineramaproto-git/PKGBUILD index eacfc6ea0..a970c51f3 100755 --- a/xineramaproto-git/PKGBUILD +++ b/xineramaproto-git/PKGBUILD @@ -2,16 +2,15 @@ # Based on [extra]'s xineramaproto pkgname=xineramaproto-git -pkgver=20110119 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 Xinerama extension wire protocol (Git version)" -arch=(any) +pkgdesc="X11 Xinerama extension wire protocol - Git version" +arch=('any') url="http://xorg.freedesktop.org/" license=('custom') makedepends=('git') -provides=('xineramaproto=1.2.1') +provides=('xineramaproto=99') conflicts=('xineramaproto') -groups=('xorg') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} _gitname=${pkgname/-*} @@ -19,27 +18,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file diff --git a/xmlstarlet/PKGBUILD b/xmlstarlet/PKGBUILD index 7ae56fcf0..7c75f53a7 100644 --- a/xmlstarlet/PKGBUILD +++ b/xmlstarlet/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: chochem pkgname=xmlstarlet -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="A set of tools to transform, query, validate, and edit XML documents" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://xmlstar.sourceforge.net/" license=('MIT') depends=('libxslt>=1.1.9') source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('4553fb51c38372e862987d0447e730ba') +md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/xproto-git/PKGBUILD b/xproto-git/PKGBUILD index a19660f06..d20a74336 100644 --- a/xproto-git/PKGBUILD +++ b/xproto-git/PKGBUILD @@ -3,16 +3,15 @@ # Based on [extra]'s xproto pkgname=xproto-git -pkgver=20110724 +pkgver=20120119 pkgrel=1 -pkgdesc="X11 core wire protocol and auxiliary headers (Git version)" -arch=(any) +pkgdesc="X11 core wire protocol and auxiliary headers - Git version" +arch=('any') license=('custom') url="http://xorg.freedesktop.org/" makedepends=('git') -provides=('xproto=7.0.22') +provides=('xproto=99') conflicts=('xproto') -groups=('xorg') _gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname/-*} _gitname=${pkgname/-*} @@ -20,27 +19,23 @@ _gitname=${pkgname/-*} build() { msg "Connecting to git.freedesktop.org GIT server...." - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin && cd .. + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin && cd .. msg "The local files are updated." else - git clone ${_gitroot} + git clone --depth 1 $_gitroot fi msg "GIT checkout done or server timeout" - msg "Creating build directory" - [ -d ${_gitname}-build ] && rm -rf ${_gitname}-build - cp -R ${_gitname} ${_gitname}-build - msg "Starting make..." - cd ${_gitname-build} - ./autogen.sh --prefix=/usr --disable-specs + cd $_gitname + ./autogen.sh --prefix=/usr make } package(){ - cd ${_gitname-build} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname/-*}/COPYING" + cd $_gitname + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname/-*}/COPYING" } \ No newline at end of file -- 2.11.4.GIT