diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
| commit | 8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch) | |
| tree | c42a03e2b7610a39d167af36357607399aa40045 | |
| parent | 5100458465d1ed420073c3213349bf430075ddbc (diff) | |
| parent | 0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/esmtp/PKGBUILD
community/geany-plugins/PKGBUILD
community/giggle/PKGBUILD
community/guichan/PKGBUILD
community/mxml/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/libtool/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/udev/PKGBUILD
extra/audacious/PKGBUILD
extra/conky/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/kino/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/transmission/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yelp/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine/wine.install
495 files changed, 16757 insertions, 1432 deletions
diff --git a/community-staging/acetoneiso2/PKGBUILD b/community-staging/acetoneiso2/PKGBUILD new file mode 100644 index 000000000..9e0bb04cd --- /dev/null +++ b/community-staging/acetoneiso2/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Wes Brewer <brewerw@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=acetoneiso2 +pkgver=2.3 +pkgrel=3 +pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" +arch=('i686' 'x86_64') +url="http://www.acetoneteam.org" +license=('GPL3') +depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') +optdepends=("p7zip: for ISO compress/decompress support") +conflicts=('acetoneiso') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) +md5sums=('225f7af687016690ff28b9771a1ce179') + +build() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + qmake + # needed for phonon + sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile + make +} + +package() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-staging/acetoneiso2/acetoneiso2.install b/community-staging/acetoneiso2/acetoneiso2.install new file mode 100644 index 000000000..1a3984e24 --- /dev/null +++ b/community-staging/acetoneiso2/acetoneiso2.install @@ -0,0 +1,11 @@ +post_install() { +cat << EOF + --> + --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf + --> +EOF +} + +post_upgrade() { + post_install $* +} diff --git a/community-staging/clipgrab/PKGBUILD b/community-staging/clipgrab/PKGBUILD new file mode 100644 index 000000000..df3c57383 --- /dev/null +++ b/community-staging/clipgrab/PKGBUILD @@ -0,0 +1,28 @@ +# Contributor: thacrazze <thacrazze|googlemail|com> +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +pkgname=clipgrab +pkgver=3.1.0.2 +pkgrel=2 +pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' +arch=('i686' 'x86_64') +url='http://clipgrab.de/' +license=('GPL') +depends=('qt' 'qtwebkit') +optdepends=('ffmpeg: for some encodings') +source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) +md5sums=('1250e1fb29cd88b7ce1a37d937de0146' + 'ef030502ae0922e632742f47283313f4' + '9a141791f6952917c441050c3dac81ce') + +build() { + cd $srcdir/$pkgname-$pkgver + qmake && make +} +package() { + cd $srcdir/$pkgname-$pkgver + install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname} + install -Dm644 $srcdir/${pkgname}.png \ + $pkgdir/usr/share/pixmaps/${pkgname}.png + install -Dm644 $srcdir/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop +} diff --git a/community-staging/clipgrab/clipgrab.desktop b/community-staging/clipgrab/clipgrab.desktop new file mode 100644 index 000000000..dad31cfdd --- /dev/null +++ b/community-staging/clipgrab/clipgrab.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=ClipGrab +GenericName=Video Downloader +GenericName[de]=Video-Downloader +Comment=Download videos and convert it +Comment[de]=Videos herunterladen und konvertieren +Icon=/usr/share/pixmaps/clipgrab.png +Exec=clipgrab +TryExec=clipgrab +Terminal=false +Categories=Qt;AudioVideo;Audio;Video; diff --git a/community-staging/clipgrab/clipgrab.png b/community-staging/clipgrab/clipgrab.png Binary files differnew file mode 100644 index 000000000..2573fed20 --- /dev/null +++ b/community-staging/clipgrab/clipgrab.png diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD new file mode 100644 index 000000000..9f307fec3 --- /dev/null +++ b/community-staging/fatrat/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57158 2011-10-22 17:28:35Z andrea $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=fatrat +pkgver=1.1.3 +pkgrel=6 +pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +arch=('i686' 'x86_64') +url="http://fatrat.dolezel.info/" +license=('GPL') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'qtwebkit') +optdepends=('geoip: GeoIP support') +makedepends=('asio' 'cmake') +source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) +md5sums=('6d4a00cdd0b59a05b1521184508d4637') + +build() { + cd $pkgname-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD new file mode 100644 index 000000000..4956a1819 --- /dev/null +++ b/community-staging/gambas3/PKGBUILD @@ -0,0 +1,1097 @@ +# $Id: PKGBUILD 57146 2011-10-22 15:06:35Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgbase=gambas3 +pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' + 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' + 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' + 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' + 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' + 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' + 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=2.99.5 +pkgrel=2 +pkgdesc="A free development environment based on a Basic interpreter." +arch=('i686' 'x86_64') +url="http://gambas.sourceforge.net/" +license=('GPL') +groups=('gambas3') +makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' + 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') +options=('!emptydirs' '!makeflags') +source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" + 'gambas3-script.install' 'gambas3-runtime.install') +md5sums=('dfa16f5208463e81ba8ca801948c353a' + 'b284be39d147ec799f1116a6abc068b4' + 'b5cc403990f31b8ea1c5cf37366d3d29') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + ./reconf-all + ./configure --prefix=/usr -C + + make bindir=${pkgdir}/usr/bin +} + +package_gambas3-runtime() { + depends=('libffi' 'xdg-utils') + pkgdesc="Runtime environment" + install=gambas3-runtime.install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install + + cd ../gbx + make DESTDIR="${pkgdir}" install + cd ../lib/debug + make DESTDIR="${pkgdir}" install + cd ../eval + make DESTDIR="${pkgdir}" install + cd ../draw + make DESTDIR="${pkgdir}" install + install -D -m644 ../gb.component \ + ${pkgdir}/usr/lib/gambas3 + + cd ${srcdir}/${pkgbase}-${pkgver}/main + ln -s gbx3 ${pkgdir}/usr/bin/gbr3 + gbc/gbi3 -r ${pkgdir}/usr gb + rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} + + ## needed for postinst with xdg-utils + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 mime/* \ + ${pkgdir}/usr/share/gambas3/mime/ + install -d -m755 ${pkgdir}/usr/share/gambas3/icons + install -D -m644 mime/application-x-gambas3.png \ + ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png + + cd gbc + make DESTDIR="${pkgdir}" uninstall +} + +package_gambas3-devel() { + depends=('gambas3-runtime') + pkgdesc="Development environment" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install +} + +package_gambas3-ide() { + depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' + 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' + 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') + pkgdesc="Integrated Development Environment" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + +#!! with the ide !! + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ + ${pkgdir}/usr/share/applications/gambas3.desktop + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ + ${pkgdir}/usr/share/pixmaps/gambas3.png + + rm -r ${pkgdir}/usr/bin/gb* + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3 +} + +package_gambas3-script() { + depends=('gambas3-devel') + pkgdesc="Scripter and server programs support" + install=gambas3-script.install + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## needed for postinst with xdg-utils + cd ${srcdir}/${pkgbase}-${pkgver}/app/mime + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ + install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ + ## + + rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3/[c-i]* +} + +package_gambas3-examples() { + depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' + 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' + 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' + 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' + 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' + 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + pkgdesc="Applications examples" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + rm -r ${pkgdir}/usr/{bin,lib} + rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} +} + +package_gambas3-gb-cairo() { + depends=('gambas3-runtime' 'cairo') + pkgdesc="Cairo component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-chart() { + depends=('gambas3-gb-form') + pkgdesc="Chart component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* + ## +} + +package_gambas3-gb-compress() { + depends=('gambas3-runtime' 'bzip2' 'zlib') + pkgdesc="Compression support component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 + make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* + ## +} + +package_gambas3-gb-crypt() { + depends=('gambas3-runtime') + pkgdesc="MD5/DES crypting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db() { + depends=('gambas3-runtime') + pkgdesc="Database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} + ## +} + +package_gambas3-gb-db-form() { + depends=('gambas3-gb-db' 'gambas3-gb-form') + pkgdesc="Database form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} + ## +} + +package_gambas3-gb-db-mysql() { + depends=('gambas3-gb-db' 'libmysqlclient') + pkgdesc="MySQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-odbc() { + depends=('gambas3-gb-db' 'unixodbc') + pkgdesc="ODBC database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-postgresql() { + depends=('gambas3-gb-db' 'postgresql-libs') + pkgdesc="PostgreSQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite2() { + depends=('gambas3-gb-db' 'sqlite2') + pkgdesc="Sqlite2 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite3() { + depends=('gambas3-gb-db' 'sqlite3') + pkgdesc="Sqlite3 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-desktop() { + depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') + pkgdesc="Desktop component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop + make DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-dbus() { + depends=('gambas3-runtime' 'dbus-core') + pkgdesc="DBUS component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-eval-highlight() { + depends=('gambas3-runtime') + pkgdesc="Expression evaluator highlight component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* + ## +} + +package_gambas3-gb-form() { + depends=('gambas3-gb-gui') + pkgdesc="Form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + ## +} + +package_gambas3-gb-form-dialog() { + depends=('gambas3-gb-form') + pkgdesc="Form dialog component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} + ## +} + +package_gambas3-gb-form-mdi() { + depends=('gambas3-gb-form') + pkgdesc="Form MDI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} + ## +} + +package_gambas3-gb-form-stock() { + depends=('gambas3-runtime') + pkgdesc="Default stock icons component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} + ## +} + +package_gambas3-gb-gtk() { + depends=('gambas3-gb-image' 'gtk2' 'librsvg') + pkgdesc="GTK+ toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-gui() { + depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') + pkgdesc="Automatic gui toolkit chooser" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} + ## +} + +package_gambas3-gb-image() { + depends=('gambas3-runtime') + pkgdesc="Image component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} + ## +} + +package_gambas3-gb-image-effect() { + depends=('gambas3-gb-image') + pkgdesc="Image effect component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} + ## +} + +package_gambas3-gb-image-imlib() { + depends=('gambas3-gb-image' 'imlib2') + pkgdesc="Imlib component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-image-io() { + depends=('gambas3-gb-image' 'gdk-pixbuf2') + pkgdesc="Input/Output component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net() { + depends=('gambas3-runtime') + pkgdesc="Network component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-curl() { + depends=('gambas3-gb-net' 'curl') + pkgdesc="Curl component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-smtp() { + depends=('gambas3-runtime' 'glib2') + pkgdesc="SMTP component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl() { + depends=('gambas3-runtime' 'libgl' 'glew') + pkgdesc="OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glu() { + depends=('gambas3-gb-opengl') + pkgdesc="GL Utility component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glsl() { + depends=('gambas3-gb-opengl') + pkgdesc="GLSL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-option() { + depends=('gambas3-runtime') + pkgdesc="Getopt component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} + ## +} + +package_gambas3-gb-pcre() { + depends=('gambas3-runtime' 'pcre') + pkgdesc="PCRE component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-pdf() { + depends=('gambas3-runtime' 'poppler') + pkgdesc="PDF component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4() { + depends=('gambas3-gb-image' 'qt') + pkgdesc="Qt4 toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-ext() { + depends=('gambas3-gb-qt4') + pkgdesc="Qt4 toolkit extended component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-opengl() { + depends=('gambas3-gb-qt4' 'libgl') + pkgdesc="Qt4 toolkit OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-webkit() { + depends=('gambas3-gb-qt4' 'qtwebkit') + pkgdesc="Qt4 toolkit webkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-report() { + depends=('gambas3-gb-form' 'gambas3-gb-image-io') + pkgdesc="Report component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} + ## +} + +package_gambas3-gb-sdl() { + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + pkgdesc="SDL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-sdl-sound() { + depends=('gambas3-runtime' 'sdl_mixer') + pkgdesc="SDL sound component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-settings() { + depends=('gambas3-runtime') + pkgdesc="Setting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} + ## +} + +package_gambas3-gb-signal() { + depends=('gambas3-runtime') + pkgdesc="Signal component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} + ## +} + +package_gambas3-gb-v4l() { + depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') + pkgdesc="Video4linux component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-vb() { + depends=('gambas3-runtime') + pkgdesc="VB transitional component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* + ## +} + +package_gambas3-gb-xml() { + depends=('gambas3-runtime' 'libxml2') + pkgdesc="XML component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-xml-rpc() { + depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') + pkgdesc="XML-RPC component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} + ## +} + +package_gambas3-gb-xml-xslt() { + depends=('gambas3-gb-xml' 'libxslt') + pkgdesc="XML-XSLT component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-web() { + depends=('gambas3-runtime') + pkgdesc="CGI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* + ## +} diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install new file mode 100644 index 000000000..6c8201a6a --- /dev/null +++ b/community-staging/gambas3/gambas3-runtime.install @@ -0,0 +1,10 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml +} diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install new file mode 100644 index 000000000..77c1aa52f --- /dev/null +++ b/community-staging/gambas3/gambas3-script.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage + xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} diff --git a/community-staging/goldendict/PKGBUILD b/community-staging/goldendict/PKGBUILD new file mode 100644 index 000000000..edab6800d --- /dev/null +++ b/community-staging/goldendict/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 57160 2011-10-22 17:43:27Z andrea $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: m0rph <m0rph.mailbox@gmail.com> + +pkgname=goldendict +pkgver=1.0.1 +pkgrel=5 +pkgdesc="Feature-rich dictionary lookup program" +arch=('i686' 'x86_64') +url="http://goldendict.berlios.de/" +license=('GPL3') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon') +provides=('stardict') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ + $pkgname-paths.diff) +sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' + '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') + +build(){ + cd ${srcdir} + + patch -Np0 -i ${srcdir}/$pkgname-paths.diff + + qmake + make + qmake +} + +package() { + cd ${srcdir} + + make INSTALL_ROOT=${pkgdir} install + + #removing unneeded + rm -rf ${pkgdir}/usr/share/app-install +} diff --git a/community-staging/goldendict/goldendict-paths.diff b/community-staging/goldendict/goldendict-paths.diff new file mode 100644 index 000000000..812dfdb97 --- /dev/null +++ b/community-staging/goldendict/goldendict-paths.diff @@ -0,0 +1,10 @@ +--- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100 ++++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100 +@@ -63,2 +63,2 @@ +- isEmpty( PREFIX ):PREFIX = /usr/local +- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\" ++ isEmpty( PREFIX ):PREFIX = /usr ++ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\" +@@ -66 +66 @@ +- locale.path = $$PREFIX/share/apps/goldendict/locale/ ++ locale.path = $$PREFIX/share/goldendict/locale/ diff --git a/community-staging/goldendict/goldendict.changelog b/community-staging/goldendict/goldendict.changelog new file mode 100644 index 000000000..8ec311fe1 --- /dev/null +++ b/community-staging/goldendict/goldendict.changelog @@ -0,0 +1,8 @@ +2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.0.1 + +2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#18350 fixed in 0.9.0-5 + +2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] in v0.9.0 diff --git a/community-staging/google-gadgets/PKGBUILD b/community-staging/google-gadgets/PKGBUILD new file mode 100644 index 000000000..870e8dc59 --- /dev/null +++ b/community-staging/google-gadgets/PKGBUILD @@ -0,0 +1,158 @@ +# $Id: PKGBUILD 57164 2011-10-22 18:51:22Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> + +pkgbase=google-gadgets +pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt') +_realname=$pkgbase-for-linux +_basedir="$startdir/pkg/base" +pkgver=0.11.2 +_sover=1.0 +_sobump=0.0.0 +pkgrel=5 +arch=('i686' 'x86_64') +url="http://code.google.com/p/google-gadgets-for-linux/" +license=('APACHE') +makedepends=('gstreamer0.10-base-plugins' 'libwebkit' + 'desktop-file-utils' 'xdg-utils' + 'librsvg' 'curl' 'libsoup-gnome' + 'qt' + 'networkmanager' + 'zip' 'flex') +options=('!libtool') +source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2" + "wifi-types.patch") +md5sums=('279305553bcbf74f3e3615f6abc36a5e' + 'f0df71c60a174e9d629db87b8bd9e102') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # Building thrice is expensive; + # we move files around instead + # + # xulrunner 2.0 is incompatible; + # we build without smjs-script/browser-element + + patch -p1 <$srcdir/wifi-types.patch + ./configure --prefix=/usr \ + --disable-werror \ + --disable-update-desktop-database \ + --disable-update-mime-database \ + --with-oem-brand=Arch \ + --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \ + --with-browser-plugins-dir=/usr/lib/mozilla/plugins \ + --disable-gtkmoz-browser-element \ + --disable-smjs-script-runtime + make +} + +package_google-gadgets-common() { + pkgdesc="Desktop widgets from Google (common files)" + install=$pkgbase-common.install + depends=('hicolor-icon-theme' 'shared-mime-info') + optdepends=('google-gadgets-gtk: GTK+ (full) UI' + 'google-gadgets-qt: Qt (partial) UI') + + cd "$srcdir/$_realname-$pkgver" + + make -j1 DESTDIR="$pkgdir/" install + + # we need to remove stuff in this package + cp -a "$pkgdir" "$_basedir" + + # do not force any removal; we want to know in case files change + cd "$pkgdir/usr" + rm -r bin + rm -r share/applications + + cd "$pkgdir/usr/lib/$pkgbase" + + # gtk-related + #rm gtkmoz-browser-child + rm ../lib*gtk* + rm modules/gtk*.so + + # qt-related + rm ../lib*qt* + rm modules/qt*.so +} + +package_google-gadgets-gtk() { + pkgdesc="Desktop widgets from Google (full GTK+ front-end)" + groups=('google-gadgets') + install=$pkgbase.install + depends=('google-gadgets-common' + 'desktop-file-utils' 'xdg-utils' + 'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome' + 'librsvg' 'curl') + optdepends=('networkmanager: desktop integration') + + # install the gtk binary + cd "$_basedir" + install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk" + + # gtk-only browser stuff + #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \ + # "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child" + + # now the gtk libraries + mkdir -p "$pkgdir/usr/lib/$pkgbase/modules" + + install -m755 usr/lib/$pkgbase/modules/gtk*.so \ + "$pkgdir/usr/lib/$pkgbase/modules/" + + install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib" + + # fix permissions and symlinks + find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \; + + ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-gtk-$_sover.so" + + ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0" + + # freedesktop.org for gtk + install -Dm644 usr/share/applications/ggl-gtk.desktop \ + "$pkgdir/usr/share/applications/ggl-gtk.desktop" + + install -m644 usr/share/applications/ggl-designer.desktop \ + "$pkgdir/usr/share/applications/" +} + +package_google-gadgets-qt() { + pkgdesc="Desktop widgets from Google (partial Qt front-end)" + groups=('google-gadgets') + install=$pkgbase.install + depends=('google-gadgets-common' 'qt' + 'desktop-file-utils' 'xdg-utils' + 'gstreamer0.10-base-plugins' 'libwebkit') + optdepends=('networkmanager: desktop integration') + + # install the qt binary + cd "$_basedir" + install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt" + + # the qt libraries + mkdir -p "$pkgdir/usr/lib/$pkgbase/modules" + + install -m755 usr/lib/$pkgbase/modules/qt*.so \ + "$pkgdir/usr/lib/$pkgbase/modules/" + + install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/" + + # fix permissions and symlinks + find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \; + + ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-qt-$_sover.so" + + ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0" + + # freedesktop.org for qt + install -Dm644 usr/share/applications/ggl-qt.desktop \ + "$pkgdir/usr/share/applications/ggl-qt.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/google-gadgets/google-gadgets-common.install b/community-staging/google-gadgets/google-gadgets-common.install new file mode 100644 index 000000000..210cbc869 --- /dev/null +++ b/community-staging/google-gadgets/google-gadgets-common.install @@ -0,0 +1,15 @@ +post_install() { + echo "==> Updating desktop database..." + gtk-update-icon-cache --quiet usr/share/icons/hicolor + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/google-gadgets/google-gadgets.changelog b/community-staging/google-gadgets/google-gadgets.changelog new file mode 100644 index 000000000..5b8f85a71 --- /dev/null +++ b/community-staging/google-gadgets/google-gadgets.changelog @@ -0,0 +1,8 @@ +25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.11.2-3: + xulrunner rebuild + - undepend on xulrunner (2.0 incompatible) + - disable smjs-script/browser-element + Cleaned up scriptlets (too many blank lines) + Added this changelog diff --git a/community-staging/google-gadgets/google-gadgets.install b/community-staging/google-gadgets/google-gadgets.install new file mode 100644 index 000000000..fd88688fc --- /dev/null +++ b/community-staging/google-gadgets/google-gadgets.install @@ -0,0 +1,15 @@ +post_install() { + echo "==> Updating desktop database..." + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/google-gadgets/wifi-types.patch b/community-staging/google-gadgets/wifi-types.patch new file mode 100644 index 000000000..be9383a61 --- /dev/null +++ b/community-staging/google-gadgets/wifi-types.patch @@ -0,0 +1,36 @@ +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000 +@@ -23,17 +23,9 @@ + namespace framework { + namespace linux_system { + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + +-#ifdef NM_DEVICE_TYPE_ETHERNET + static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET; +-#else +-static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET; +-#endif + + static const int kDeviceTypeUnknown = 0; + +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000 +@@ -77,11 +77,7 @@ + + using namespace ggadget::dbus; + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + + // Defined in nm 0.7 + static const int kDeviceStateActivated = 8; diff --git a/community-staging/gpsbabel/PKGBUILD b/community-staging/gpsbabel/PKGBUILD new file mode 100644 index 000000000..467a2d404 --- /dev/null +++ b/community-staging/gpsbabel/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 57111 2011-10-21 23:00:10Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=gpsbabel +pkgver=1.4.2 +pkgrel=4 +pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" +arch=('i686' 'x86_64') +url="http://www.gpsbabel.org" +license=('GPL') +depends=('libusb-compat' 'expat') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit') +optdepends=('qt' 'qtwebkit') +options=('docs') +source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" + "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") +md5sums=('76ea9f7852be2e98aa18976c4697ca93' + '7bdbd243e29a8831842d31c079f04c45') + +build() { + cd $srcdir/gpsbabel-$pkgver + ./configure --prefix=/usr + make + make doc + (cd gui && qmake && make) +} + +package() { + cd $srcdir/gpsbabel-$pkgver + make DESTDIR=$pkgdir install + + # GUI + install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin + install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png + install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop + + # Header install + mkdir -p $pkgdir/usr/include/gpsbabel + cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \ + $pkgdir/usr/include/gpsbabel + + # Doc install + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/ + cp README* $pkgdir/usr/share/doc/$pkgname/ +} diff --git a/community-staging/kadu/PKGBUILD b/community-staging/kadu/PKGBUILD new file mode 100644 index 000000000..3865d1aae --- /dev/null +++ b/community-staging/kadu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57138 2011-10-22 11:49:58Z bpiotrowski $ +# Maintainer: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd $srcdir/kadu-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/kadu-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} +} diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD new file mode 100644 index 000000000..9eab1adac --- /dev/null +++ b/community-staging/kvirc/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 57113 2011-10-21 23:00:54Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=kvirc +pkgver=4.0.4 +pkgrel=4 +pkgdesc="Qt-based IRC client" +url="http://www.kvirc.net" +depends=('python2' 'qt' 'libxss' 'qtwebkit') +arch=(i686 x86_64) +makedepends=('cmake') +license=('GPL') +options=("!libtool") +install=kvirc.install +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) +md5sums=('26fd24979ae4a29bac9309b3b0c98788') + +build() { + cd $srcdir/kvirc-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . + make + make DESTDIR=$pkgdir install +} diff --git a/community-staging/kvirc/kvirc.install b/community-staging/kvirc/kvirc.install new file mode 100644 index 000000000..8f76d007f --- /dev/null +++ b/community-staging/kvirc/kvirc.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + true +} + +post_upgrade() { + post_install +} + +pre_remove() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + true +} diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD new file mode 100644 index 000000000..3f3b363bf --- /dev/null +++ b/community-staging/luminancehdr/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 57156 2011-10-22 16:03:24Z andrea $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dmitry N. Shilov <stormblast@land.ru> + +pkgname=luminancehdr +pkgver=2.1.0 +pkgrel=3 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('i686' 'x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') +optdepends=('hugin: align image stack functionality') +install=$pkgname.install +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') + +build() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + if [ ${CARCH} = i686 ]; then + sed -i 's/ -msse2//' project.pro + fi + + lrelease project.pro + qmake PREFIX=/usr + make +} + +package() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog new file mode 100644 index 000000000..378053ef5 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.changelog @@ -0,0 +1,33 @@ +2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino <andrea@archlinux.org> + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut <ionut@archlinux.ro> + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install new file mode 100644 index 000000000..279762804 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD new file mode 100644 index 000000000..d9ee4955a --- /dev/null +++ b/community-staging/mythtv/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 57173 2011-10-23 02:45:26Z jconder $ +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: <kleptophobiac@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=mythtv +pkgver=0.24.1 +pkgrel=3 +epoch=1 +pkgdesc="A Homebrew PVR project" +arch=('i686' 'x86_64') +url="http://www.mythtv.org/" +license=('GPL') +depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' + 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' + 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' + 'qtwebkit' 'wget') +makedepends=('yasm') +optdepends=('xmltv: to download tv listings') +backup=('etc/conf.d/mythbackend') +install='mythtv.install' +source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'mythbackend.rc' + 'mythbackend.conf' + 'mythtv-v4l2-fix.patch' + 'build.patch') +md5sums=('6870c679619ec58456e76839745411d8' + 'feadcc9ad064d93d6dceab1efc0bd9ed' + 'bb8e4033d82428d827570fae9ba15e6a' + 'ba5c91df80f0d3f7563a873e71a3725c' + '3188962917e98c4e07818dccd64bc423') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch + patch -Np1 -i ${srcdir}/build.patch + + ARCH="${CARCH/_/-}" + ./configure --prefix=/usr --cpu="$ARCH" \ + --enable-mmx \ + --enable-audio-oss \ + --enable-audio-alsa \ + --disable-audio-jack \ + --enable-audio-pulse \ + --disable-altivec \ + --disable-distcc \ + --disable-ccache \ + --enable-vdpau \ + --enable-dvb \ + --dvb-path=/usr/include \ + --enable-lirc \ + --enable-joystick-menu \ + --enable-v4l \ + --enable-ivtv \ + --enable-xvmc \ + --enable-xvmcw \ + --enable-xvmc-vld \ + --enable-firewire \ + --enable-opengl-vsync \ + --enable-xrandr \ + --enable-xv \ + --enable-x11 \ + --with-bindings=perl,python \ + --python=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + + install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" + install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" + install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" + + mkdir -p "$pkgdir/usr/share/mythtv" + cp -R 'contrib' "$pkgdir/usr/share/mythtv" +} diff --git a/community-staging/mythtv/build.patch b/community-staging/mythtv/build.patch new file mode 100644 index 000000000..35dccd618 --- /dev/null +++ b/community-staging/mythtv/build.patch @@ -0,0 +1,13 @@ +diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp +--- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200 ++++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300 +@@ -2,6 +2,8 @@ + #include "mythrender_opengl.h" + #include "mythxdisplay.h" + ++#include <GL/glu.h> ++ + #define LOC QString("OpenGL: ") + #define LOC_ERR QString("OpenGL Error: ") + +Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf new file mode 100644 index 000000000..e004ae5bd --- /dev/null +++ b/community-staging/mythtv/mythbackend.conf @@ -0,0 +1,92 @@ +#!/bin/bash +# +# Rename this file to: +# +# /etc/config.d/mythbackend +# +############################################################################### +# +# Copyright (c) by the MythTV Development Team. +# +# Derived from work by: +# +# Michael Thomson <linux at m-thomson dot net> +# Stu Tomlinson <stu at nosnilmot dot com> +# Axel Thimm <axel.thimm at atrpms dot net> +# Adopted for ArchLinux: +# Jürgen Hoetzel <juergen@archinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +############################################################################### +# +# Config variables for the mythbackend startup script, which is usually +# located in /etc/rc.d/mythbackend +# +# When the startup script is executed, it sources this file if it exists, +# otherwise it will fall back on default values. +# +# Leave variables commented out to use default values in init script +# (/etc/rc.d/mythbackend). +# +# To override defaults, uncomment the relevant variable definition and +# edit as required. +# + +# +# User who should start the mythbackend processes +# +# Running mythbackend as non-root requires you to ensure that audio/video +# devices used for recording have suitable user permissions. One way +# to achieve this is to modify existing or create new udev rules which +# assign these devices to a non-root group with rw permissions and add +# your mythbackend user to that group. Be aware that console.perms can +# also affect device permissions and may need additional configuration. +# Running as non-root may also introduce increased process latency. +# +# MBE_USER='root' + +# +# Directory holding the mythbackend binary (empty means autodetect). +# +# MBE_DIR='' + +# +# Name of mythbackend binary. +# +# MBE_PROG='mythbackend' + +# +# Other startup options for mythbackend (see 'mythbackend --help' for a list). +# +# MBE_OPTIONS='' + +# +# Directory holding the mythbackend log file +# +# LOG_DIR='/var/log/mythtv' + +# +# Name of mythbackend log file. +# +# NOTE: If you are running as non-root take care to ensure the mythbackend user +# has permission to write to this log file. +# +# LOG_FILE='mythbackend.log' + +# +# Logging options for mythbackend (see 'mythbackend -v help' for a list) +# +# LOG_OPTS='' diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc new file mode 100644 index 000000000..410e8de41 --- /dev/null +++ b/community-staging/mythtv/mythbackend.rc @@ -0,0 +1,82 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# Default values to use if none are supplied in the config file. + +# Running mythbackend as non-root requires you to ensure that audio/video +# devices used for recording have suitable user permissions. One way +# to achieve this is to modify existing or create new udev rules which +# assign these devices to a non-root group with rw permissions and add +# your mythbackend user to that group. Be aware that console.perms can +# also affect device permissions and may need additional configuration. +# Running as non-root may also introduce increased process latency. +# +# User who should start the mythbackend processes +MBE_USER='root' + +# Startup options for mythbackend +MBE_OPTIONS='' + +# Name of mythbackend log file +LOG_FILE='/var/log/mythbackend.log' + +# Logging options for mythbackend (empty means '-v important,general') +LOG_OPTS='' + +############################################################################### + +CONFIG_FILE=/etc/conf.d/mythbackend +PIDFILE=/var/run/mythbackend.pid + +if [[ -f ${CONFIG_FILE} ]]; then + . ${CONFIG_FILE} +fi + +pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)"; + +# fix FS#11890 +mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)" + +case "$1" in + start) + stat_busy "Starting MythTV Backend" + + # already running ? + if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then + stat_fail + exit 1; + fi + touch ${PIDFILE} ${LOG_FILE} + chown "$MBE_USER" ${PIDFILE} ${LOG_FILE} + if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \ + --daemon \ + --logfile $LOG_FILE $LOG_OPTS \ + --pidfile ${PIDFILE} $MBE_OPTIONS"; + then + add_daemon mythbackend + stat_done + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping MythTV Backend" + if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then + rm_daemon mythbackend + stat_done + rm ${PIDFILE} 2>/dev/null + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/mythtv/mythtv-v4l2-fix.patch b/community-staging/mythtv/mythtv-v4l2-fix.patch new file mode 100644 index 000000000..e26e16615 --- /dev/null +++ b/community-staging/mythtv/mythtv-v4l2-fix.patch @@ -0,0 +1,724 @@ +diff --git a/mythtv/configure b/mythtv/configure +index 1efe803..7bcdf06 100755 +--- a/mythtv/configure ++++ b/mythtv/configure +@@ -109,7 +109,8 @@ Advanced options (experts only): + --disable-iptv disable support for recording RTSP/UDP/RTP streams + --disable-hdhomerun disable support for HDHomeRun boxes + --disable-v4l disable Video4Linux support +- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support ++ --disable-v4l2 disable Video4Linux2 support ++ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support + --disable-hdpvr disable HD-PVR support + --disable-dvb disable DVB support + --dvb-path=HDRLOC location of directory containing +@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST=' + qtwebkit + quartz_video + v4l ++ v4l2 + valgrind + x11 + xrandr +@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h" + dvb_deps="backend" + firewire_deps="backend" + iptv_deps="backend" +-ivtv_deps="backend v4l" +-hdpvr_deps="backend v4l" ++ivtv_deps="backend v4l2" ++hdpvr_deps="backend v4l2" + hdhomerun_deps="backend" + mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c" + mythtranscode_deps="backend frontend" +@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11" + opengl_video_deps="opengl" + opengl_vsync_deps="opengl" + v4l_deps="backend linux_videodev_h linux_videodev2_h" ++v4l2_deps="backend linux_videodev2_h" + vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" + xrandr_deps="x11" + xv_deps="x11" +@@ -1933,6 +1936,7 @@ enable opengl_vsync + enable opengl_video + enable quartz_video + enable v4l ++enable v4l2 + enable x11 + enable xrandr + enable xv +@@ -3062,6 +3066,7 @@ EOF + fi + disable opengl_vsync + disable v4l ++ disable v4l2 + disable x11 + # Workaround compile errors from missing gmtime_r/localtime_r/uint def + CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` +@@ -3106,6 +3111,7 @@ EOF + fi + disable symver + disable v4l ++ disable v4l2 + enable windows + disable x11 + ###### Standard ffmpeg configure stuff follows: +@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip" + + if enabled backend; then + echo "Video4Linux sup. ${v4l-no}" ++ echo "Video4Linux2 sup. ${v4l2-no}" + echo "ivtv support ${ivtv-no}" + echo "HD-PVR support ${hdpvr-no}" + echo "FireWire support ${firewire-no}" +diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +index 739634d..39e5956 100644 +--- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp ++++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +@@ -42,9 +42,13 @@ extern "C" { + #include "libswscale/swscale.h" + } + ++#if defined(USING_V4L) || defined(USING_V4L2) + #ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + #include "go7007_myth.h" + +@@ -55,9 +59,9 @@ extern "C" { + extern "C" { + #include "vbitext/vbi.h" + } +-#else // USING_V4l ++#else // USING_V4L || USING_V4L2 + #define VT_WIDTH 0 +-#endif // USING_V4l ++#endif // USING_V4l || USING_V4L2 + + #define KEYFRAMEDIST 30 + +@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void) + + void NuppelVideoRecorder::ProbeV4L2(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + usingv4l2 = true; + + struct v4l2_capability vcap; +@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void) + QString driver = (char *)vcap.driver; + if (driver == "go7007") + go7007 = true; +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + void NuppelVideoRecorder::StartRecording(void) +@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void) + audio_device->Close(); + } + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + struct VBIData + { + NuppelVideoRecorder *nvr; +@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) + act_text_buffer = 0; + textbuffer[act]->freeToEncode = 1; + } +-#else // USING_V4L ++#else // USING_V4L || USING_V4L2 + void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {} +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + void NuppelVideoRecorder::FormatCC(struct cc *cc) + { +@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void) + //VERBOSE(VB_RECORD, LOC + "vbi end"); + } + +-#else // USING_V4L ++#else // USING_V4L + void NuppelVideoRecorder::doVbiThread(void) { } + #endif // USING_V4L + +diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp +index 2a4f4c5..fa5823a 100644 +--- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp ++++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp +@@ -6,7 +6,9 @@ + #include <sys/ioctl.h> + #include <poll.h> + ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif + + #include "mythverbose.h" + #include "analogsignalmonitor.h" +@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void) + } + else + { ++#ifdef USING_V4L + struct video_tuner tuner; + bzero(&tuner, sizeof(tuner)); + +@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void) + { + isLocked = tuner.signal; + } ++#endif + } + + { +diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp +index 8852682..494f48a 100644 +--- a/mythtv/libs/libmythtv/cardutil.cpp ++++ b/mythtv/libs/libmythtv/cardutil.cpp +@@ -4,7 +4,7 @@ + + #include <algorithm> + +-#if defined(USING_V4L) || defined(USING_DVB) ++#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB) + #include <sys/ioctl.h> + #endif + +@@ -28,6 +28,8 @@ + + #ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> + #endif + +@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name) + bool CardUtil::hasV4L2(int videofd) + { + (void) videofd; +-#ifdef USING_V4L ++#ifdef USING_V4L2 + struct v4l2_capability vcap; + bzero(&vcap, sizeof(vcap)); + + return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) && + (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE)); +-#else // if !USING_V4L ++#else // if !USING_V4L2 + return false; +-#endif // !USING_V4L ++#endif // !USING_V4L2 + } + + bool CardUtil::GetV4LInfo( +@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo( + if (videofd < 0) + return false; + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + // First try V4L2 query + struct v4l2_capability capability; + bzero(&capability, sizeof(struct v4l2_capability)); +@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo( + } + else // Fallback to V4L1 query + { ++#ifdef USING_V4L + struct video_capability capability; + if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0) + card = QString::fromAscii((const char*)capability.name); ++#endif //USING_V4L + } +-#endif // !USING_V4L ++#endif // !USING_V4L || USING_V4L2 + + if (!driver.isEmpty()) + driver.remove( QRegExp("\\[[0-9]\\]$") ); +@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + InputNames list; + ok = false; + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + bool usingv4l2 = hasV4L2(videofd); +- ++#ifdef USING_V4L2 + // V4L v2 query + struct v4l2_input vin; + bzero(&vin, sizeof(vin)); +@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + ok = true; + return list; + } ++#endif + + // V4L v1 query ++#ifdef USING_V4L + struct video_capability vidcap; + bzero(&vidcap, sizeof(vidcap)); + if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0) +@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + + list[i] = test.name; + } +- ++#endif + // Create an input on single input cards that don't advertise input + if (!list.size()) + list[0] = "Television"; + + ok = true; +-#else // if !USING_V4L ++#else // if !USING_V4L || USING_V4L2 + list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs"); +-#endif // !USING_V4L ++#endif // !USING_V4L || USING_V4L2 + return list; + } + +diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp +index 832d0a8..e35b186 100644 +--- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp ++++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp +@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const + + V4LChannel *ChannelScanSM::GetV4LChannel(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + return dynamic_cast<V4LChannel*>(channel); + #else + return NULL; +diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp +index 1595d6a..4d2b2cf 100644 +--- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp ++++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp +@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon( + channel = new DVBChannel(device); + #endif + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (("V4L" == card_type) || ("MPEG" == card_type)) + channel = new V4LChannel(NULL, device); + #endif +diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp +index 00fd9d3..70e3469 100644 +--- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp ++++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp +@@ -27,14 +27,14 @@ static QString card_types(void) + cardTypes += "'DVB'"; + #endif // USING_DVB + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (!cardTypes.isEmpty()) + cardTypes += ","; + cardTypes += "'V4L'"; + # ifdef USING_IVTV + cardTypes += ",'MPEG'"; + # endif // USING_IVTV +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_IPTV + if (!cardTypes.isEmpty()) +diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro +index 3d26e0a..ea06ee7 100644 +--- a/mythtv/libs/libmythtv/libmythtv.pro ++++ b/mythtv/libs/libmythtv/libmythtv.pro +@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32 + using_valgrind:DEFINES += USING_VALGRIND + + # old libvbitext (Caption decoder) +-using_v4l { ++using_v4l || using_v4l2 { + HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h + HEADERS += vbitext/vbi.h vbitext/vt.h + SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c +@@ -471,11 +471,17 @@ using_backend { + SOURCES += channelchangemonitor.cpp + + # Support for Video4Linux devices +- using_v4l { ++ using_v4l || using_v4l2 { + HEADERS += v4lchannel.h analogsignalmonitor.h + SOURCES += v4lchannel.cpp analogsignalmonitor.cpp + +- DEFINES += USING_V4L ++ using_v4l { ++ DEFINES += USING_V4L ++ } ++ ++ using_v4l2 { ++ DEFINES += USING_V4L2 ++ } + } + + # Support for cable boxes that provide Firewire out +diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp +index 221efef..c199b3b 100644 +--- a/mythtv/libs/libmythtv/signalmonitor.cpp ++++ b/mythtv/libs/libmythtv/signalmonitor.cpp +@@ -23,7 +23,7 @@ extern "C" { + # include "dvbchannel.h" + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + # include "analogsignalmonitor.h" + # include "v4lchannel.h" + #endif +@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum, + } + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + if ((cardtype.toUpper() == "HDPVR")) + { + V4LChannel *chan = dynamic_cast<V4LChannel*>(channel); +diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp +index b885eaa..3d9c7ad 100644 +--- a/mythtv/libs/libmythtv/tv_rec.cpp ++++ b/mythtv/libs/libmythtv/tv_rec.cpp +@@ -57,7 +57,7 @@ using namespace std; + + #include "channelgroup.h" + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + #include "v4lchannel.h" + #endif + +@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel) + } + else // "V4L" or "MPEG", ie, analog TV + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + channel = new V4LChannel(this, genOpt.videodev); + if (!channel->Open()) + return false; +@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile) + } + else + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + // V4L/MJPEG/GO7007 from here on + recorder = new NuppelVideoRecorder(this, channel); + recorder->SetOption("skipbtaudio", genOpt.skip_btaudio); +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + if (recorder) +@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void) + + V4LChannel *TVRec::GetV4LChannel(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + return dynamic_cast<V4LChannel*>(channel); + #else + return NULL; +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + /** \fn TVRec::EventThread(void*) +@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData) + channel->GetCurrentName()); + } + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (GetV4LChannel()) + { + channel->InitPictureAttributes(); +diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp +index bc82b49..7aa47ef 100644 +--- a/mythtv/libs/libmythtv/v4lchannel.cpp ++++ b/mythtv/libs/libmythtv/v4lchannel.cpp +@@ -16,8 +16,12 @@ + #include <iostream> + using namespace std; + ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + // MythTV headers + #include "v4lchannel.h" +@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version) + { + if (fmt == "NTSC-JP") + return 6; ++#ifdef USING_V4L + else if (fmt.left(5) == "SECAM") + return VIDEO_MODE_SECAM; ++#endif + else if (fmt == "PAL-NC") + return 3; + else if (fmt == "PAL-M") +@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) + else if (fmt == "PAL-N") + return 5; + // generics... ++#ifdef USING_V4L + else if (fmt.left(3) == "PAL") + return VIDEO_MODE_PAL; + else if (fmt.left(4) == "NTSC") +@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) + else if (fmt.left(4) == "ATSC") + return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support... + return VIDEO_MODE_NTSC; ++#endif + } + + VERBOSE(VB_IMPORTANT, +@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version) + } + else if (1 == v4l_version) + { ++#ifdef USING_V4L + if (mode == VIDEO_MODE_NTSC) + return "NTSC"; + else if (mode == VIDEO_MODE_PAL) +@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version) + return "PAL-N"; + else if (mode == 6) + return "NTSC-JP"; ++#endif + } + else + { +@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, + return true; + } + ++#ifdef USING_V4L + // Video4Linux version 1 tuning + uint freq = frequency / 62500; + ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq); +@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, + .arg(device).arg(ioctlval).arg(strerror(errno))); + return false; + } ++#endif + + SetSIStandard(si_std); + +@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) + + if (usingv4l1) + { ++#ifdef USING_V4L + VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)"); + + // read in old settings +@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) + { + VERBOSE(VB_IMPORTANT, LOC_ERR + msg + + "\n\t\t\twhile setting format (v4l v1)" + ENO); +- } +- else if (usingv4l2) ++ } else ++#endif ++ if (usingv4l2) + { + VERBOSE(VB_IMPORTANT, LOC + msg + + "\n\t\t\tSetting video mode with v4l version 1 worked"); +@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting) + return ok; + } + ++#ifdef USING_V4L + static unsigned short *get_v4l1_field( + int v4l2_attrib, struct video_picture &vid_pic) + { +@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field( + } + return NULL; + } ++#endif + + static int get_v4l2_attribute(const QString &db_col_name) + { +@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) + } + + // V4L1 ++#ifdef USING_V4L + unsigned short *setfield; + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); +@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) + VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO); + return false; + } +- ++#endif + return true; + } + +@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib) + + static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) + { ++#ifdef USING_V4L + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); + +@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) + unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic); + if (setfield) + return *setfield; ++#endif + + return -1; + } +@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue) + + static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) + { ++#ifdef USING_V4L + unsigned short *setfield; + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); +@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) + // ??? + return -1; + } +- ++#endif + return 0; + } + +diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h +index b059c64..aa6d934 100644 +--- a/mythtv/libs/libmythtv/v4lchannel.h ++++ b/mythtv/libs/libmythtv/v4lchannel.h +@@ -4,11 +4,11 @@ + #define CHANNEL_H + + #include "dtvchannel.h" +-#ifdef USING_V4L ++#ifdef USING_V4L2 + #include <linux/videodev2.h> // needed for v4l2_std_id type + #else + typedef uint64_t v4l2_std_id; +-#endif //USING_V4L ++#endif //USING_V4L2 + + using namespace std; + +diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c +index 15f8d85..4c50e8d 100644 +--- a/mythtv/libs/libmythtv/vbitext/vbi.c ++++ b/mythtv/libs/libmythtv/vbitext/vbi.c +@@ -14,8 +14,12 @@ + // compiling with -std=c99. We could remove this in the .pro file, + // but that would disable it for all .c files. + #undef __STRICT_ANSI__ ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + // vbitext headers + #include "vt.h" +@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size + + + /***** bttv api *****/ ++#ifdef USING_V4L + #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) +- ++#else // !USING_V4L ++#ifdef USING_V4L2 ++#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int) ++#endif // USING_V4L2 ++#endif // !USING_V4L + + static void + error(const char *str, ...) +diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp +index 5d7a508..635faeb 100644 +--- a/mythtv/libs/libmythtv/videosource.cpp ++++ b/mythtv/libs/libmythtv/videosource.cpp +@@ -45,7 +45,7 @@ using namespace std; + #include "dvbtypes.h" + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + #include <linux/videodev2.h> + #endif + +@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : + setTrigger(cardtype); + setSaveAll(false); + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + addTarget("V4L", new V4LConfigurationGroup(parent)); + # ifdef USING_IVTV + addTarget("MPEG", new MPEGConfigurationGroup(parent)); +@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : + # ifdef USING_HDPVR + addTarget("HDPVR", new HDPVRConfigurationGroup(parent)); + # endif // USING_HDPVR +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_DVB + addTarget("DVB", new DVBConfigurationGroup(parent)); +@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) : + + void CardType::fillSelections(SelectSetting* setting) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + setting->addSelection( + QObject::tr("Analog V4L capture card"), "V4L"); + setting->addSelection( +@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting) + setting->addSelection( + QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR"); + # endif // USING_HDPVR +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_DVB + setting->addSelection( +@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting) + QObject::tr("FireWire cable box"), "FIREWIRE"); + #endif // USING_FIREWIRE + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + setting->addSelection( + QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"), + "GO7007"); +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_HDHOMERUN + setting->addSelection( diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install new file mode 100644 index 000000000..c29a53454 --- /dev/null +++ b/community-staging/mythtv/mythtv.install @@ -0,0 +1,11 @@ +post_install() { + echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!" +} + +post_upgrade() { + return +} + +post_remove() { + echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'" +} diff --git a/community-staging/paraview/PKGBUILD b/community-staging/paraview/PKGBUILD new file mode 100644 index 000000000..38e3fab49 --- /dev/null +++ b/community-staging/paraview/PKGBUILD @@ -0,0 +1,86 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Michele Mocciola <mickele> +# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> + +pkgname=paraview +pkgver=3.10.1 +pkgrel=3 +pkgdesc='Parallel Visualization Application using VTK.' +arch=('i686' 'x86_64') +url='http://www.paraview.org' +license=('custom') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' +makedepends=('cmake' 'desktop-file-utils') +source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" + 'paraview.png' + 'paraview.desktop' + 'fixkernelversioncheck.diff') +md5sums=('d8a9d4a997a720589ffd57568bcdd449' + 'db623002bc71a257ddfdd0c9c7b14c3f' + '4e4b7172ed18171c37446fd7c4f1e8f5' + '9e137af23701f76fc727222ebac23389') + +build() { + cd ParaView-${pkgver} + + # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568 + # remove next pkgver bump + cd VTK + patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + cd .. + + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx + sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx + sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + + # Paraview wants to be built out of source + mkdir -p build + cd build + + # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_USE_PTHREADS:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_SKIP_RPATH:BOOL=YES \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \ + -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ + -DVTK_USE_BOOST:BOOL=OFF \ + -DVTK_USE_OFFSCREEN=TRUE \ + -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ + -DPARAVIEW_USE_MPI:BOOL=ON \ + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ + -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ + .. + + make +} + +package() { + cd ParaView-${pkgver}/build + + make DESTDIR=${pkgdir} install + + # Install license + install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE + + # Install desktop shortcuts + install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png + desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop + + # Removes VTK plugin for designer - if you need, you can install vtk + #rm -rf ${pkgdir}/opt/paraview/plugins +} diff --git a/community-staging/paraview/fixkernelversioncheck.diff b/community-staging/paraview/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community-staging/paraview/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community-staging/paraview/paraview.desktop b/community-staging/paraview/paraview.desktop new file mode 100644 index 000000000..2f5b8ec69 --- /dev/null +++ b/community-staging/paraview/paraview.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Name=ParaView +GenericName=Data Viewer +Comment=ParaView allows visualization of large data sets +Type=Application +Terminal=false +Icon=paraview +Categories=Graphics; +Exec=/usr/bin/paraview diff --git a/community-staging/paraview/paraview.png b/community-staging/paraview/paraview.png Binary files differnew file mode 100644 index 000000000..6e39f3d4f --- /dev/null +++ b/community-staging/paraview/paraview.png diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD new file mode 100644 index 000000000..555de294c --- /dev/null +++ b/community-staging/qbittorrent/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.9.1 +pkgrel=2 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python2: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('093bb1f7779378a339c20aa3e4ea6d36') + +build() { + cd qbittorrent-${pkgver} + + sed -i \ + -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd qbittorrent-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-staging/qbittorrent/qbittorrent.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/qmc2/PKGBUILD b/community-staging/qmc2/PKGBUILD new file mode 100644 index 000000000..6f94c41ac --- /dev/null +++ b/community-staging/qmc2/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57115 2011-10-21 23:01:43Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> + +pkgname=qmc2 +pkgver=0.2.b20 +pkgrel=2 +pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME." +url="http://qmc2.arcadehits.net" +license=("GPL") +arch=('i686' 'x86_64') +depends=('qt' 'phonon' 'sdl' 'libxmu' 'qtwebkit') +makedepends=('rsync' 'mesa') +source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") +md5sums=('e868144815ff44a2146e839c2395c6d1') + +build() { + cd "$srcdir/$pkgname" + export CTIME=0 + make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr +} + +package() { + cd "$srcdir/$pkgname" + make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/{applications,pixmaps} + install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" +} diff --git a/community-staging/qtcreator/PKGBUILD b/community-staging/qtcreator/PKGBUILD new file mode 100644 index 000000000..ab30a1577 --- /dev/null +++ b/community-staging/qtcreator/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 57122 2011-10-22 02:45:08Z svenstaro $ +# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname="qtcreator" +pkgver=2.3.1 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt.nokia.com/products/developer-tools' +license=('LGPL') +depends=('qt>=4.7.4') +makedepends=('qt-private-headers>=4.7.4' 'git') +options=('docs') +source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('8aa296ed9034f847bd53ee0424e5ef08' + 'f1f4680b9838ff0b8f4cf11eb850d662') + +build() { + cd ${srcdir} + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro + make +} + +package() { + optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support') + + cd ${srcdir}/build + + make INSTALL_ROOT="${pkgdir}/usr/" install + + install -Dm644 ${srcdir}/qtcreator.desktop \ + ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ + ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/community-staging/qtcreator/qtcreator.desktop b/community-staging/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0fd562bd9 --- /dev/null +++ b/community-staging/qtcreator/qtcreator.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qtcreator +Name=Qt-Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development diff --git a/community-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD new file mode 100644 index 000000000..0b61ea9bf --- /dev/null +++ b/community-staging/sigil/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 57149 2011-10-22 15:18:04Z andrea $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> + +pkgname=sigil +pkgver=0.4.2 +pkgrel=2 +pkgdesc="A WYSIWYG ebook editor" +arch=('i686' 'x86_64') +url="http://code.google.com/p/sigil/" +license=('GPL3') +depends=('qt' 'qtwebkit') +makedepends=('cmake') +install=sigil.install +source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip + ${pkgname}.desktop) +md5sums=('ce27976254236f8b11b787fd05be9acb' + 'fef6aa492af487ccccd6b133635cee5a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON .. + + make +} + +package() { + cd "${srcdir}"/build + make install DESTDIR="${pkgdir}" + + install -d -m 0755 "${pkgdir}"/usr/share/applications + install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications + + for _pic in 16 32 48 128 256; do + install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \ + "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png + done +} diff --git a/community-staging/sigil/sigil.desktop b/community-staging/sigil/sigil.desktop new file mode 100755 index 000000000..4f3a14d20 --- /dev/null +++ b/community-staging/sigil/sigil.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Sigil +Comment=E-book reader and WYSIWYG editor +TryExec=sigil +Exec=sigil +Icon=sigil +Categories=Office; +Terminal=false +StartupNotify=false diff --git a/community-staging/sigil/sigil.install b/community-staging/sigil/sigil.install new file mode 100644 index 000000000..ec506fa93 --- /dev/null +++ b/community-staging/sigil/sigil.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/texmaker/PKGBUILD b/community-staging/texmaker/PKGBUILD new file mode 100644 index 000000000..7db874e08 --- /dev/null +++ b/community-staging/texmaker/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: furester <xfurester@hotmail.com> +# Contributor: Firmicus <firmicus gmx net> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> + +pkgname=texmaker +pkgver=3.1 +pkgrel=2 +pkgdesc='Free cross-platform latex editor' +arch=('i686' 'x86_64') +url="http://www.xm1math.net/texmaker/index.html" +license=('GPL') +depends=('poppler-qt' 'ghostscript' 'qtwebkit') +source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") +md5sums=('10a14c75abbb7234d4e5e58a7c85b110') + +build() { + cd ${pkgname}-${pkgver} + + export INSTALL_ROOT=${pkgdir} + + qmake -unix PREFIX=//usr texmaker.pro + + make +} + +package() { + cd ${pkgname}-${pkgver} + + export INSTALL_PATH=${pkgdir} + + make install +} diff --git a/community-staging/vtk/PKGBUILD b/community-staging/vtk/PKGBUILD new file mode 100644 index 000000000..7f17b62cd --- /dev/null +++ b/community-staging/vtk/PKGBUILD @@ -0,0 +1,101 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> +# Contributor: leepesjee <lpeschier at xs4all dot nl> +# Contributor: Olivier Medoc +# Contributor: ignotus +# Contributor: Fabian Moser +# Contributor: djscholl + +pkgname=vtk +pkgver=5.8.0 +pkgrel=3 +pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' +arch=('i686' 'x86_64') +url='http://www.vtk.org' +license=('BSD') +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' + 'graphviz: drawing tools') +source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" + "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" + 'fixkernelversioncheck.diff') +md5sums=('37b7297d02d647cc6ca95b38174cb41f' + 'a05295b81930e894fc0e31866f399151' + '9e137af23701f76fc727222ebac23389') + +build() { + cd VTK + + # fix compilation error: http://vtk.org/Bug/view.php?id=12568 + # remove next pkgver bump + patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + + cd ${srcdir} + + rm -rf build + mkdir build + cd build + + cmake \ + -Wno-dev \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ + -DBUILD_DOCUMENTATION:BOOL=ON \ + -DDOCUMENTATION_HTML_HELP:BOOL=ON \ + -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=ON \ + -DVTK_USE_HYBRID:BOOL=ON \ + -DVTK_USE_PARALLEL:BOOL=ON \ + -DVTK_USE_PATENTED:BOOL=ON \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ + -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ + -DVTK_USE_BOOST:BOOL=ON \ + -DVTK_USE_INFOVIS:BOOL=ON \ + -DVTK_USE_GL2PS:BOOL=ON \ + -DVTK_USE_MYSQL:BOOL=ON \ + -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ + -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \ + -DVTK_WRAP_JAVA:BOOL=ON \ + -DVTK_WRAP_PYTHON:BOOL=ON \ + -DVTK_WRAP_TCL:BOOL=ON \ + -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ + -DVTK_USE_QT:BOOL=ON \ + -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ + -DVTK_USE_GUISUPPORT:BOOL=ON \ + -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + ${srcdir}/VTK + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install + + # Move the vtk.jar to the arch-specific location + install -dv ${pkgdir}/usr/share/java/vtk + mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \ + ${pkgdir}/usr/share/java/vtk + + # Install license + install -dv ${pkgdir}/usr/share/licenses/vtk + install -m644 ${srcdir}/VTK/Copyright.txt \ + ${pkgdir}/usr/share/licenses/vtk + + # Put an entry in /etc/ld.so.conf.d + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf +} diff --git a/community-staging/vtk/fixkernelversioncheck.diff b/community-staging/vtk/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community-staging/vtk/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community-staging/wkhtmltopdf/PKGBUILD b/community-staging/wkhtmltopdf/PKGBUILD new file mode 100644 index 000000000..ba585ae29 --- /dev/null +++ b/community-staging/wkhtmltopdf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 57150 2011-10-22 15:18:09Z andrea $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> + +pkgname=wkhtmltopdf +pkgver=0.9.9 +pkgrel=2 +pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt" +arch=('i686' 'x86_64') +url="http://code.google.com/p/wkhtmltopdf/" +license=('GPL3') +depends=('qt' 'qtwebkit') +optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate') +source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + qmake wkhtmltopdf.pro + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir/usr" install + + # Generate and install man page + install -d "$pkgdir/usr/share/man/man1" + ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1" +} diff --git a/community-testing/acetoneiso2/PKGBUILD b/community-testing/acetoneiso2/PKGBUILD new file mode 100644 index 000000000..9e0bb04cd --- /dev/null +++ b/community-testing/acetoneiso2/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Wes Brewer <brewerw@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=acetoneiso2 +pkgver=2.3 +pkgrel=3 +pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" +arch=('i686' 'x86_64') +url="http://www.acetoneteam.org" +license=('GPL3') +depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') +optdepends=("p7zip: for ISO compress/decompress support") +conflicts=('acetoneiso') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) +md5sums=('225f7af687016690ff28b9771a1ce179') + +build() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + qmake + # needed for phonon + sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile + make +} + +package() { + cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-testing/acetoneiso2/acetoneiso2.install b/community-testing/acetoneiso2/acetoneiso2.install new file mode 100644 index 000000000..1a3984e24 --- /dev/null +++ b/community-testing/acetoneiso2/acetoneiso2.install @@ -0,0 +1,11 @@ +post_install() { +cat << EOF + --> + --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf + --> +EOF +} + +post_upgrade() { + post_install $* +} diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD new file mode 100644 index 000000000..8e5412cd3 --- /dev/null +++ b/community-testing/cdfs/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57350 2011-10-26 12:09:08Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> + +pkgname=cdfs +pkgver=2.6.27 +pkgrel=17 +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." +arch=(i686 x86_64) +url="http://www.elis.UGent.be/~ronsse/cdfs/" +license=('GPL') +makedepends=('linux-headers') +install=cdfs.install +source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2" + "cdfs-3.0.0.patch") +md5sums=('ac64c014a90e3c488394832ea29605b3' + 'aba7da94a9dcbb8a93ea423cb6958fef') + +build() { + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") + _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/cdfs-3.0.0.patch + make KDIR=/lib/modules/${_kernverfull}/build + install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko +} diff --git a/community-testing/cdfs/cdfs-3.0.0.patch b/community-testing/cdfs/cdfs-3.0.0.patch new file mode 100644 index 000000000..20194b848 --- /dev/null +++ b/community-testing/cdfs/cdfs-3.0.0.patch @@ -0,0 +1,274 @@ +diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c +--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 ++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 +@@ -83,7 +83,7 @@ + #else + .mmap = generic_file_readonly_mmap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) +- .sendfile = generic_file_sendfile ++// .sendfile = generic_file_sendfile + #else + .splice_read = generic_file_splice_read + #endif +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 +@@ -32,19 +30,14 @@ + * Added code to transform /proc/cdfs into a sequential synthetic file. * + *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ + +- + #include <linux/seq_file.h> +- +-#ifndef OLD_KERNEL + #include <linux/statfs.h> +-#endif ++#include <linux/sched.h> + + extern struct seq_operations cdfs_operations; + extern struct _track_info *dummy_track_p; + +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); +-#endif + /*============================================================================* + * cdfs_open() * + * Description: * +@@ -115,15 +108,8 @@ + + /********************************************************************/ + +-#ifdef OLD_KERNEL +-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ +- kdev_t dev = sb->s_dev; +- int i, j, t; +- struct cdrom_tochdr hdr; +-#else + static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ + int i, t; +-#endif + struct cdrom_tocentry entry; + int no_audio=0, no_data=0; + cd * this_cd; +@@ -131,24 +117,13 @@ + + PRINT("cdfs_mount\n"); + +-#ifdef OLD_KERNEL +- MOD_INC_USE_COUNT; +- +- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd +-#else + sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd +-#endif + + sb->s_blocksize = CD_FRAMESIZE; + sb->s_blocksize_bits = 11; + + if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + return -ENOMEM; +-#endif + } + + this_cd->mode = MODE; +@@ -160,13 +135,8 @@ + + // Initialize cache for maximum sector size + if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + kfree(cdfs_info(sb)); + return -ENOMEM; +-#endif + } + + // Cache is still invalid +@@ -183,23 +153,13 @@ + if (this_cd->toc_scsi){ + if (cdfs_toc_read_full(sb)){ + printk("TOC read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } else { + //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ + if (cdfs_toc_read(sb)){ + printk("cdfs_toc_read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } + +@@ -365,11 +325,7 @@ + sb->s_flags |= MS_RDONLY; + sb->s_op = &cdfs_ops; + /* always get inode status */ +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + retinode=cdfs_iget(sb, 0); +-#else +- retinode=iget(sb, 0); +-#endif + if ( IS_ERR(retinode) ) + return PTR_ERR(retinode); + +@@ -379,16 +335,12 @@ + + cdfs_proc_cd = this_cd; + +-#ifdef OLD_KERNEL +- return sb; +-#else + return 0; + + invalid: + kfree(this_cd->cache); + kfree(cdfs_info(sb)); + return -EINVAL; +-#endif + } + + /************************************************************************/ +@@ -410,27 +362,12 @@ + // Remove /proc entry + cdfs_proc_cd = NULL; + kfree(cdfs_info(sb)); +- +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +-#endif +- + } + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { + cd * this_cd = cdfs_info(d->d_sb); +-#else +-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#endif +-#endif + PRINT("rmfs_statfs\n"); + + buf->f_type = CDFS_MAGIC; +@@ -460,11 +397,7 @@ + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ +-#else + static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ +-#endif + struct inode * inode; + int i; + cd * this_cd = cdfs_info(dir->i_sb); +@@ -480,15 +413,9 @@ + /* Use goto and read inode with iget()/cdfs_iget() */ + /* Thanks to David Howells for patch and Master class in his mail */ + found: +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + inode = cdfs_iget(dir->i_sb, i); + if (IS_ERR(inode)) + return ERR_CAST(inode); +-#else +- inode = iget(dir->i_sb, i); +- if (!inode) +- return ERR_PTR(-ENOMEM); +-#endif + d_add(dentry, inode); + return NULL; + } +@@ -529,12 +456,8 @@ + i->i_fop = &cdfs_dir_operations; + } else { /* file */ + i->i_size = this_cd->track[i->i_ino].size; +-#ifdef OLD_KERNEL +- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; +-#else + i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; + i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; +-#endif + i->i_mode = this_cd->mode; + if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { + i->i_fop = &cdfs_cddata_file_operations; +@@ -587,33 +510,21 @@ + /******************************************************************/ + + static struct super_operations cdfs_ops = { +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +- .read_inode = cdfs_read_inode, +-#endif + .put_super = cdfs_umount, + .statfs = cdfs_statfs + }; + +-#ifdef OLD_KERNEL +-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); +-#else +-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); +-#endif +-} ++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { ++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); ++//} + + static struct file_system_type cdfs_fs_type = { + .owner = THIS_MODULE, + .name = "cdfs", +- .get_sb = cdfs_get_sb, ++// .get_sb = cdfs_get_sb, + .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV + }; +-#endif + + /******************************************************/ + +@@ -621,10 +532,6 @@ + MODULE_DESCRIPTION("CDfs: a CD filesystem"); + MODULE_LICENSE("GPL"); + +-#ifdef OLD_KERNEL +-EXPORT_NO_SYMBOLS; +-#endif +- + /******************************************************************/ + + static int __init cdfs_init(void) { +@@ -676,11 +583,7 @@ + + if (!options) return; + +-#ifdef OLD_KERNEL +- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { +-#else + while ((this_char = strsep(&options,",")) != NULL) { +-#endif + + if (!strcmp(this_char,"single")) + this_cd->single=TRUE; diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install new file mode 100644 index 000000000..3693d60ed --- /dev/null +++ b/community-testing/cdfs/cdfs.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/depmod -a +} + +post_upgrade() { + /sbin/depmod -a +} + +post_remove() { + /sbin/depmod -a +} diff --git a/community-testing/clipgrab/PKGBUILD b/community-testing/clipgrab/PKGBUILD new file mode 100644 index 000000000..df3c57383 --- /dev/null +++ b/community-testing/clipgrab/PKGBUILD @@ -0,0 +1,28 @@ +# Contributor: thacrazze <thacrazze|googlemail|com> +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +pkgname=clipgrab +pkgver=3.1.0.2 +pkgrel=2 +pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' +arch=('i686' 'x86_64') +url='http://clipgrab.de/' +license=('GPL') +depends=('qt' 'qtwebkit') +optdepends=('ffmpeg: for some encodings') +source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) +md5sums=('1250e1fb29cd88b7ce1a37d937de0146' + 'ef030502ae0922e632742f47283313f4' + '9a141791f6952917c441050c3dac81ce') + +build() { + cd $srcdir/$pkgname-$pkgver + qmake && make +} +package() { + cd $srcdir/$pkgname-$pkgver + install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname} + install -Dm644 $srcdir/${pkgname}.png \ + $pkgdir/usr/share/pixmaps/${pkgname}.png + install -Dm644 $srcdir/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop +} diff --git a/community-testing/clipgrab/clipgrab.desktop b/community-testing/clipgrab/clipgrab.desktop new file mode 100644 index 000000000..dad31cfdd --- /dev/null +++ b/community-testing/clipgrab/clipgrab.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=ClipGrab +GenericName=Video Downloader +GenericName[de]=Video-Downloader +Comment=Download videos and convert it +Comment[de]=Videos herunterladen und konvertieren +Icon=/usr/share/pixmaps/clipgrab.png +Exec=clipgrab +TryExec=clipgrab +Terminal=false +Categories=Qt;AudioVideo;Audio;Video; diff --git a/community-testing/clipgrab/clipgrab.png b/community-testing/clipgrab/clipgrab.png Binary files differnew file mode 100644 index 000000000..2573fed20 --- /dev/null +++ b/community-testing/clipgrab/clipgrab.png diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD new file mode 100644 index 000000000..b1f6021ac --- /dev/null +++ b/community-testing/fatrat/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57223 2011-10-24 20:32:21Z andrea $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=fatrat +pkgver=1.1.3 +pkgrel=6 +pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +arch=('i686' 'x86_64') +url="http://fatrat.dolezel.info/" +license=('GPL') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'qtwebkit') +optdepends=('geoip: GeoIP support') +makedepends=('asio' 'cmake') +source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) +md5sums=('6d4a00cdd0b59a05b1521184508d4637') + +build() { + cd $pkgname-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD new file mode 100644 index 000000000..517c91293 --- /dev/null +++ b/community-testing/gambas3/PKGBUILD @@ -0,0 +1,1097 @@ +# $Id: PKGBUILD 57225 2011-10-24 20:32:33Z andrea $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgbase=gambas3 +pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' + 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' + 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' + 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' + 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' + 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' + 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=2.99.5 +pkgrel=2 +pkgdesc="A free development environment based on a Basic interpreter." +arch=('i686' 'x86_64') +url="http://gambas.sourceforge.net/" +license=('GPL') +groups=('gambas3') +makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' + 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') +options=('!emptydirs' '!makeflags') +source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" + 'gambas3-script.install' 'gambas3-runtime.install') +md5sums=('dfa16f5208463e81ba8ca801948c353a' + 'b284be39d147ec799f1116a6abc068b4' + 'b5cc403990f31b8ea1c5cf37366d3d29') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + ./reconf-all + ./configure --prefix=/usr -C + + make bindir=${pkgdir}/usr/bin +} + +package_gambas3-runtime() { + depends=('libffi' 'xdg-utils') + pkgdesc="Runtime environment" + install=gambas3-runtime.install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install + + cd ../gbx + make DESTDIR="${pkgdir}" install + cd ../lib/debug + make DESTDIR="${pkgdir}" install + cd ../eval + make DESTDIR="${pkgdir}" install + cd ../draw + make DESTDIR="${pkgdir}" install + install -D -m644 ../gb.component \ + ${pkgdir}/usr/lib/gambas3 + + cd ${srcdir}/${pkgbase}-${pkgver}/main + ln -s gbx3 ${pkgdir}/usr/bin/gbr3 + gbc/gbi3 -r ${pkgdir}/usr gb + rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} + + ## needed for postinst with xdg-utils + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 mime/* \ + ${pkgdir}/usr/share/gambas3/mime/ + install -d -m755 ${pkgdir}/usr/share/gambas3/icons + install -D -m644 mime/application-x-gambas3.png \ + ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png + + cd gbc + make DESTDIR="${pkgdir}" uninstall +} + +package_gambas3-devel() { + depends=('gambas3-runtime') + pkgdesc="Development environment" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install +} + +package_gambas3-ide() { + depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' + 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' + 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') + pkgdesc="Integrated Development Environment" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + +#!! with the ide !! + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ + ${pkgdir}/usr/share/applications/gambas3.desktop + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ + ${pkgdir}/usr/share/pixmaps/gambas3.png + + rm -r ${pkgdir}/usr/bin/gb* + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3 +} + +package_gambas3-script() { + depends=('gambas3-devel') + pkgdesc="Scripter and server programs support" + install=gambas3-script.install + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## needed for postinst with xdg-utils + cd ${srcdir}/${pkgbase}-${pkgver}/app/mime + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ + install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ + ## + + rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3/[c-i]* +} + +package_gambas3-examples() { + depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' + 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' + 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' + 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' + 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' + 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + pkgdesc="Applications examples" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + rm -r ${pkgdir}/usr/{bin,lib} + rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} +} + +package_gambas3-gb-cairo() { + depends=('gambas3-runtime' 'cairo') + pkgdesc="Cairo component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-chart() { + depends=('gambas3-gb-form') + pkgdesc="Chart component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* + ## +} + +package_gambas3-gb-compress() { + depends=('gambas3-runtime' 'bzip2' 'zlib') + pkgdesc="Compression support component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 + make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* + ## +} + +package_gambas3-gb-crypt() { + depends=('gambas3-runtime') + pkgdesc="MD5/DES crypting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db() { + depends=('gambas3-runtime') + pkgdesc="Database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} + ## +} + +package_gambas3-gb-db-form() { + depends=('gambas3-gb-db' 'gambas3-gb-form') + pkgdesc="Database form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} + ## +} + +package_gambas3-gb-db-mysql() { + depends=('gambas3-gb-db' 'libmysqlclient') + pkgdesc="MySQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-odbc() { + depends=('gambas3-gb-db' 'unixodbc') + pkgdesc="ODBC database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-postgresql() { + depends=('gambas3-gb-db' 'postgresql-libs') + pkgdesc="PostgreSQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite2() { + depends=('gambas3-gb-db' 'sqlite2') + pkgdesc="Sqlite2 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite3() { + depends=('gambas3-gb-db' 'sqlite3') + pkgdesc="Sqlite3 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-desktop() { + depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') + pkgdesc="Desktop component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop + make DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-dbus() { + depends=('gambas3-runtime' 'dbus-core') + pkgdesc="DBUS component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-eval-highlight() { + depends=('gambas3-runtime') + pkgdesc="Expression evaluator highlight component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* + ## +} + +package_gambas3-gb-form() { + depends=('gambas3-gb-gui') + pkgdesc="Form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + ## +} + +package_gambas3-gb-form-dialog() { + depends=('gambas3-gb-form') + pkgdesc="Form dialog component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} + ## +} + +package_gambas3-gb-form-mdi() { + depends=('gambas3-gb-form') + pkgdesc="Form MDI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} + ## +} + +package_gambas3-gb-form-stock() { + depends=('gambas3-runtime') + pkgdesc="Default stock icons component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} + ## +} + +package_gambas3-gb-gtk() { + depends=('gambas3-gb-image' 'gtk2' 'librsvg') + pkgdesc="GTK+ toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-gui() { + depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') + pkgdesc="Automatic gui toolkit chooser" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} + ## +} + +package_gambas3-gb-image() { + depends=('gambas3-runtime') + pkgdesc="Image component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} + ## +} + +package_gambas3-gb-image-effect() { + depends=('gambas3-gb-image') + pkgdesc="Image effect component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} + ## +} + +package_gambas3-gb-image-imlib() { + depends=('gambas3-gb-image' 'imlib2') + pkgdesc="Imlib component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-image-io() { + depends=('gambas3-gb-image' 'gdk-pixbuf2') + pkgdesc="Input/Output component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net() { + depends=('gambas3-runtime') + pkgdesc="Network component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-curl() { + depends=('gambas3-gb-net' 'curl') + pkgdesc="Curl component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-smtp() { + depends=('gambas3-runtime' 'glib2') + pkgdesc="SMTP component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl() { + depends=('gambas3-runtime' 'libgl' 'glew') + pkgdesc="OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glu() { + depends=('gambas3-gb-opengl') + pkgdesc="GL Utility component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glsl() { + depends=('gambas3-gb-opengl') + pkgdesc="GLSL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-option() { + depends=('gambas3-runtime') + pkgdesc="Getopt component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} + ## +} + +package_gambas3-gb-pcre() { + depends=('gambas3-runtime' 'pcre') + pkgdesc="PCRE component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-pdf() { + depends=('gambas3-runtime' 'poppler') + pkgdesc="PDF component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4() { + depends=('gambas3-gb-image' 'qt') + pkgdesc="Qt4 toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-ext() { + depends=('gambas3-gb-qt4') + pkgdesc="Qt4 toolkit extended component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-opengl() { + depends=('gambas3-gb-qt4' 'libgl') + pkgdesc="Qt4 toolkit OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-webkit() { + depends=('gambas3-gb-qt4' 'qtwebkit') + pkgdesc="Qt4 toolkit webkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-report() { + depends=('gambas3-gb-form' 'gambas3-gb-image-io') + pkgdesc="Report component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} + ## +} + +package_gambas3-gb-sdl() { + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + pkgdesc="SDL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-sdl-sound() { + depends=('gambas3-runtime' 'sdl_mixer') + pkgdesc="SDL sound component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-settings() { + depends=('gambas3-runtime') + pkgdesc="Setting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} + ## +} + +package_gambas3-gb-signal() { + depends=('gambas3-runtime') + pkgdesc="Signal component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} + ## +} + +package_gambas3-gb-v4l() { + depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') + pkgdesc="Video4linux component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-vb() { + depends=('gambas3-runtime') + pkgdesc="VB transitional component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* + ## +} + +package_gambas3-gb-xml() { + depends=('gambas3-runtime' 'libxml2') + pkgdesc="XML component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-xml-rpc() { + depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') + pkgdesc="XML-RPC component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} + ## +} + +package_gambas3-gb-xml-xslt() { + depends=('gambas3-gb-xml' 'libxslt') + pkgdesc="XML-XSLT component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-web() { + depends=('gambas3-runtime') + pkgdesc="CGI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* + ## +} diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install new file mode 100644 index 000000000..6c8201a6a --- /dev/null +++ b/community-testing/gambas3/gambas3-runtime.install @@ -0,0 +1,10 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml +} diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install new file mode 100644 index 000000000..77c1aa52f --- /dev/null +++ b/community-testing/gambas3/gambas3-script.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage + xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} diff --git a/community-testing/goldendict/PKGBUILD b/community-testing/goldendict/PKGBUILD new file mode 100644 index 000000000..7b64f04e8 --- /dev/null +++ b/community-testing/goldendict/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 57227 2011-10-24 20:32:42Z andrea $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: m0rph <m0rph.mailbox@gmail.com> + +pkgname=goldendict +pkgver=1.0.1 +pkgrel=5 +pkgdesc="Feature-rich dictionary lookup program" +arch=('i686' 'x86_64') +url="http://goldendict.berlios.de/" +license=('GPL3') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon') +provides=('stardict') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ + $pkgname-paths.diff) +sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' + '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') + +build(){ + cd ${srcdir} + + patch -Np0 -i ${srcdir}/$pkgname-paths.diff + + qmake + make + qmake +} + +package() { + cd ${srcdir} + + make INSTALL_ROOT=${pkgdir} install + + #removing unneeded + rm -rf ${pkgdir}/usr/share/app-install +} diff --git a/community-testing/goldendict/goldendict-paths.diff b/community-testing/goldendict/goldendict-paths.diff new file mode 100644 index 000000000..812dfdb97 --- /dev/null +++ b/community-testing/goldendict/goldendict-paths.diff @@ -0,0 +1,10 @@ +--- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100 ++++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100 +@@ -63,2 +63,2 @@ +- isEmpty( PREFIX ):PREFIX = /usr/local +- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\" ++ isEmpty( PREFIX ):PREFIX = /usr ++ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\" +@@ -66 +66 @@ +- locale.path = $$PREFIX/share/apps/goldendict/locale/ ++ locale.path = $$PREFIX/share/goldendict/locale/ diff --git a/community-testing/goldendict/goldendict.changelog b/community-testing/goldendict/goldendict.changelog new file mode 100644 index 000000000..8ec311fe1 --- /dev/null +++ b/community-testing/goldendict/goldendict.changelog @@ -0,0 +1,8 @@ +2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.0.1 + +2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#18350 fixed in 0.9.0-5 + +2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] in v0.9.0 diff --git a/community-testing/google-gadgets/PKGBUILD b/community-testing/google-gadgets/PKGBUILD new file mode 100644 index 000000000..ee3646c7a --- /dev/null +++ b/community-testing/google-gadgets/PKGBUILD @@ -0,0 +1,158 @@ +# $Id: PKGBUILD 57229 2011-10-24 20:32:57Z andrea $ +# Maintainer: Ray Rashif <schiv@archlinux.org> + +pkgbase=google-gadgets +pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt') +_realname=$pkgbase-for-linux +_basedir="$startdir/pkg/base" +pkgver=0.11.2 +_sover=1.0 +_sobump=0.0.0 +pkgrel=5 +arch=('i686' 'x86_64') +url="http://code.google.com/p/google-gadgets-for-linux/" +license=('APACHE') +makedepends=('gstreamer0.10-base-plugins' 'libwebkit' + 'desktop-file-utils' 'xdg-utils' + 'librsvg' 'curl' 'libsoup-gnome' + 'qt' + 'networkmanager' + 'zip' 'flex') +options=('!libtool') +source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2" + "wifi-types.patch") +md5sums=('279305553bcbf74f3e3615f6abc36a5e' + 'f0df71c60a174e9d629db87b8bd9e102') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # Building thrice is expensive; + # we move files around instead + # + # xulrunner 2.0 is incompatible; + # we build without smjs-script/browser-element + + patch -p1 <$srcdir/wifi-types.patch + ./configure --prefix=/usr \ + --disable-werror \ + --disable-update-desktop-database \ + --disable-update-mime-database \ + --with-oem-brand=Arch \ + --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \ + --with-browser-plugins-dir=/usr/lib/mozilla/plugins \ + --disable-gtkmoz-browser-element \ + --disable-smjs-script-runtime + make +} + +package_google-gadgets-common() { + pkgdesc="Desktop widgets from Google (common files)" + install=$pkgbase-common.install + depends=('hicolor-icon-theme' 'shared-mime-info') + optdepends=('google-gadgets-gtk: GTK+ (full) UI' + 'google-gadgets-qt: Qt (partial) UI') + + cd "$srcdir/$_realname-$pkgver" + + make -j1 DESTDIR="$pkgdir/" install + + # we need to remove stuff in this package + cp -a "$pkgdir" "$_basedir" + + # do not force any removal; we want to know in case files change + cd "$pkgdir/usr" + rm -r bin + rm -r share/applications + + cd "$pkgdir/usr/lib/$pkgbase" + + # gtk-related + #rm gtkmoz-browser-child + rm ../lib*gtk* + rm modules/gtk*.so + + # qt-related + rm ../lib*qt* + rm modules/qt*.so +} + +package_google-gadgets-gtk() { + pkgdesc="Desktop widgets from Google (full GTK+ front-end)" + groups=('google-gadgets') + install=$pkgbase.install + depends=('google-gadgets-common' + 'desktop-file-utils' 'xdg-utils' + 'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome' + 'librsvg' 'curl') + optdepends=('networkmanager: desktop integration') + + # install the gtk binary + cd "$_basedir" + install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk" + + # gtk-only browser stuff + #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \ + # "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child" + + # now the gtk libraries + mkdir -p "$pkgdir/usr/lib/$pkgbase/modules" + + install -m755 usr/lib/$pkgbase/modules/gtk*.so \ + "$pkgdir/usr/lib/$pkgbase/modules/" + + install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib" + + # fix permissions and symlinks + find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \; + + ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-gtk-$_sover.so" + + ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0" + + # freedesktop.org for gtk + install -Dm644 usr/share/applications/ggl-gtk.desktop \ + "$pkgdir/usr/share/applications/ggl-gtk.desktop" + + install -m644 usr/share/applications/ggl-designer.desktop \ + "$pkgdir/usr/share/applications/" +} + +package_google-gadgets-qt() { + pkgdesc="Desktop widgets from Google (partial Qt front-end)" + groups=('google-gadgets') + install=$pkgbase.install + depends=('google-gadgets-common' 'qt' + 'desktop-file-utils' 'xdg-utils' + 'gstreamer0.10-base-plugins' 'libwebkit') + optdepends=('networkmanager: desktop integration') + + # install the qt binary + cd "$_basedir" + install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt" + + # the qt libraries + mkdir -p "$pkgdir/usr/lib/$pkgbase/modules" + + install -m755 usr/lib/$pkgbase/modules/qt*.so \ + "$pkgdir/usr/lib/$pkgbase/modules/" + + install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/" + + # fix permissions and symlinks + find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \; + + ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-qt-$_sover.so" + + ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \ + "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0" + + # freedesktop.org for qt + install -Dm644 usr/share/applications/ggl-qt.desktop \ + "$pkgdir/usr/share/applications/ggl-qt.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/google-gadgets/google-gadgets-common.install b/community-testing/google-gadgets/google-gadgets-common.install new file mode 100644 index 000000000..210cbc869 --- /dev/null +++ b/community-testing/google-gadgets/google-gadgets-common.install @@ -0,0 +1,15 @@ +post_install() { + echo "==> Updating desktop database..." + gtk-update-icon-cache --quiet usr/share/icons/hicolor + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/google-gadgets/google-gadgets.changelog b/community-testing/google-gadgets/google-gadgets.changelog new file mode 100644 index 000000000..5b8f85a71 --- /dev/null +++ b/community-testing/google-gadgets/google-gadgets.changelog @@ -0,0 +1,8 @@ +25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.11.2-3: + xulrunner rebuild + - undepend on xulrunner (2.0 incompatible) + - disable smjs-script/browser-element + Cleaned up scriptlets (too many blank lines) + Added this changelog diff --git a/community-testing/google-gadgets/google-gadgets.install b/community-testing/google-gadgets/google-gadgets.install new file mode 100644 index 000000000..fd88688fc --- /dev/null +++ b/community-testing/google-gadgets/google-gadgets.install @@ -0,0 +1,15 @@ +post_install() { + echo "==> Updating desktop database..." + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/google-gadgets/wifi-types.patch b/community-testing/google-gadgets/wifi-types.patch new file mode 100644 index 000000000..be9383a61 --- /dev/null +++ b/community-testing/google-gadgets/wifi-types.patch @@ -0,0 +1,36 @@ +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000 +@@ -23,17 +23,9 @@ + namespace framework { + namespace linux_system { + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + +-#ifdef NM_DEVICE_TYPE_ETHERNET + static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET; +-#else +-static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET; +-#endif + + static const int kDeviceTypeUnknown = 0; + +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000 +@@ -77,11 +77,7 @@ + + using namespace ggadget::dbus; + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + + // Defined in nm 0.7 + static const int kDeviceStateActivated = 8; diff --git a/community-testing/gpsbabel/PKGBUILD b/community-testing/gpsbabel/PKGBUILD new file mode 100644 index 000000000..d68e1a290 --- /dev/null +++ b/community-testing/gpsbabel/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 57231 2011-10-24 20:33:01Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=gpsbabel +pkgver=1.4.2 +pkgrel=4 +pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" +arch=('i686' 'x86_64') +url="http://www.gpsbabel.org" +license=('GPL') +depends=('libusb-compat' 'expat') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit') +optdepends=('qt' 'qtwebkit') +options=('docs') +source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" + "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") +md5sums=('76ea9f7852be2e98aa18976c4697ca93' + '7bdbd243e29a8831842d31c079f04c45') + +build() { + cd $srcdir/gpsbabel-$pkgver + ./configure --prefix=/usr + make + make doc + (cd gui && qmake && make) +} + +package() { + cd $srcdir/gpsbabel-$pkgver + make DESTDIR=$pkgdir install + + # GUI + install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin + install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png + install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop + + # Header install + mkdir -p $pkgdir/usr/include/gpsbabel + cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \ + $pkgdir/usr/include/gpsbabel + + # Doc install + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/ + cp README* $pkgdir/usr/share/doc/$pkgname/ +} diff --git a/community-testing/kadu/PKGBUILD b/community-testing/kadu/PKGBUILD new file mode 100644 index 000000000..d28694770 --- /dev/null +++ b/community-testing/kadu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57233 2011-10-24 20:33:05Z andrea $ +# Maintainer: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd $srcdir/kadu-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/kadu-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} +} diff --git a/community-testing/kvirc/PKGBUILD b/community-testing/kvirc/PKGBUILD new file mode 100644 index 000000000..361089ccb --- /dev/null +++ b/community-testing/kvirc/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 57235 2011-10-24 20:33:11Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=kvirc +pkgver=4.0.4 +pkgrel=4 +pkgdesc="Qt-based IRC client" +url="http://www.kvirc.net" +depends=('python2' 'qt' 'libxss' 'qtwebkit') +arch=(i686 x86_64) +makedepends=('cmake') +license=('GPL') +options=("!libtool") +install=kvirc.install +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) +md5sums=('26fd24979ae4a29bac9309b3b0c98788') + +build() { + cd $srcdir/kvirc-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . + make + make DESTDIR=$pkgdir install +} diff --git a/community-testing/kvirc/kvirc.install b/community-testing/kvirc/kvirc.install new file mode 100644 index 000000000..8f76d007f --- /dev/null +++ b/community-testing/kvirc/kvirc.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + true +} + +post_upgrade() { + post_install +} + +pre_remove() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + true +} diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD new file mode 100644 index 000000000..ed673808d --- /dev/null +++ b/community-testing/luminancehdr/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 57237 2011-10-24 20:33:19Z andrea $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dmitry N. Shilov <stormblast@land.ru> + +pkgname=luminancehdr +pkgver=2.1.0 +pkgrel=3 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('i686' 'x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') +optdepends=('hugin: align image stack functionality') +install=$pkgname.install +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') + +build() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + if [ ${CARCH} = i686 ]; then + sed -i 's/ -msse2//' project.pro + fi + + lrelease project.pro + qmake PREFIX=/usr + make +} + +package() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog new file mode 100644 index 000000000..378053ef5 --- /dev/null +++ b/community-testing/luminancehdr/luminancehdr.changelog @@ -0,0 +1,33 @@ +2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino <andrea@archlinux.org> + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut <ionut@archlinux.ro> + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Package moved to [community] diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install new file mode 100644 index 000000000..279762804 --- /dev/null +++ b/community-testing/luminancehdr/luminancehdr.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/musescore/PKGBUILD b/community-testing/musescore/PKGBUILD new file mode 100644 index 000000000..642ba03e0 --- /dev/null +++ b/community-testing/musescore/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 57239 2011-10-24 20:33:27Z andrea $ +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de +# Contributor: Cristian Maureira <saint [at] archlinux.cl> +# Contributor: Dr.Egg <rwhite @ archlinux . us> + +pkgname=musescore +pkgver=1.1 +pkgrel=3 +pkgdesc="A music score editor written in Qt" +arch=('i686' 'x86_64') +url="http://www.musescore.org/en/" +license=('GPL') +depends=('qt' 'qtwebkit' 'libsndfile' 'qtscriptgenerator') +makedepends=('cmake' 'doxygen') +optdepends=('portaudio' 'jack') +install=musescore.install +source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2" + 'paths.patch') +md5sums=('68b43af92093a16f7f074c0eb560a867' + 'e5011154d217f633f21b4bb70e589510') + +build() { + cd $srcdir/mscore-${pkgver} + export QT_PLUGINS_DIR=/usr/lib/qt/plugins + [ -d build ] && make clean + patch -p1 < $srcdir/paths.patch + sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \ + "$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt + sed -i 's+BUILD_SCRIPTGEN TRUE+BUILD_SCRIPTGEN FALSE+' \ + "$srcdir"/mscore-$pkgver/mscore/CMakeLists.txt + sed -i 's+static_cast<const+static_cast<+' \ + $srcdir/mscore-$pkgver/mscore/mscore/exportxml.cpp + make PREFIX=/usr release +} +package() { + cd $srcdir/mscore-${pkgver} + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/musescore/musescore.install b/community-testing/musescore/musescore.install new file mode 100644 index 000000000..d6abb5470 --- /dev/null +++ b/community-testing/musescore/musescore.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/musescore/paths.patch b/community-testing/musescore/paths.patch new file mode 100644 index 000000000..98bf4b3d5 --- /dev/null +++ b/community-testing/musescore/paths.patch @@ -0,0 +1,22 @@ +diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp +--- musescore-svn.orig//mscore/mscore/mscore.cpp 2010-06-16 23:10:27.000000000 +0200 ++++ musescore-svn.new//mscore/mscore/mscore.cpp 2010-06-16 23:13:59.000000000 +0200 +@@ -897,15 +897,15 @@ + if (debugMode) + printf("open handbook for language <%s>\n", qPrintable(lang)); + +- QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf")); ++ QFileInfo mscoreHelp(mscoreGlobalShare + QString("../doc/musescore/MuseScore-") + lang + QString(".pdf")); + if (!mscoreHelp.isReadable()) { + if (debugMode) { + printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath())); + } + lang = lang.left(2); +- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf")); ++ mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-") + lang + QString(".pdf")); + if(!mscoreHelp.isReadable()){ +- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf")); ++ mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-en.pdf")); + if (!mscoreHelp.isReadable()) { + QString info(tr("MuseScore handbook not found at: \n")); + info += mscoreHelp.filePath(); diff --git a/community-testing/mythtv/PKGBUILD b/community-testing/mythtv/PKGBUILD new file mode 100644 index 000000000..3808740f3 --- /dev/null +++ b/community-testing/mythtv/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 57241 2011-10-24 20:33:41Z andrea $ +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: <kleptophobiac@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=mythtv +pkgver=0.24.1 +pkgrel=3 +epoch=1 +pkgdesc="A Homebrew PVR project" +arch=('i686' 'x86_64') +url="http://www.mythtv.org/" +license=('GPL') +depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' + 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' + 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' + 'qtwebkit' 'wget') +makedepends=('yasm') +optdepends=('xmltv: to download tv listings') +backup=('etc/conf.d/mythbackend') +install='mythtv.install' +source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'mythbackend.rc' + 'mythbackend.conf' + 'mythtv-v4l2-fix.patch' + 'build.patch') +md5sums=('6870c679619ec58456e76839745411d8' + 'feadcc9ad064d93d6dceab1efc0bd9ed' + 'bb8e4033d82428d827570fae9ba15e6a' + 'ba5c91df80f0d3f7563a873e71a3725c' + '3188962917e98c4e07818dccd64bc423') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch + patch -Np1 -i ${srcdir}/build.patch + + ARCH="${CARCH/_/-}" + ./configure --prefix=/usr --cpu="$ARCH" \ + --enable-mmx \ + --enable-audio-oss \ + --enable-audio-alsa \ + --disable-audio-jack \ + --enable-audio-pulse \ + --disable-altivec \ + --disable-distcc \ + --disable-ccache \ + --enable-vdpau \ + --enable-dvb \ + --dvb-path=/usr/include \ + --enable-lirc \ + --enable-joystick-menu \ + --enable-v4l \ + --enable-ivtv \ + --enable-xvmc \ + --enable-xvmcw \ + --enable-xvmc-vld \ + --enable-firewire \ + --enable-opengl-vsync \ + --enable-xrandr \ + --enable-xv \ + --enable-x11 \ + --with-bindings=perl,python \ + --python=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + + install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" + install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" + install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" + + mkdir -p "$pkgdir/usr/share/mythtv" + cp -R 'contrib' "$pkgdir/usr/share/mythtv" +} diff --git a/community-testing/mythtv/build.patch b/community-testing/mythtv/build.patch new file mode 100644 index 000000000..35dccd618 --- /dev/null +++ b/community-testing/mythtv/build.patch @@ -0,0 +1,13 @@ +diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp +--- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200 ++++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300 +@@ -2,6 +2,8 @@ + #include "mythrender_opengl.h" + #include "mythxdisplay.h" + ++#include <GL/glu.h> ++ + #define LOC QString("OpenGL: ") + #define LOC_ERR QString("OpenGL Error: ") + +Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ diff --git a/community-testing/mythtv/mythbackend.conf b/community-testing/mythtv/mythbackend.conf new file mode 100644 index 000000000..e004ae5bd --- /dev/null +++ b/community-testing/mythtv/mythbackend.conf @@ -0,0 +1,92 @@ +#!/bin/bash +# +# Rename this file to: +# +# /etc/config.d/mythbackend +# +############################################################################### +# +# Copyright (c) by the MythTV Development Team. +# +# Derived from work by: +# +# Michael Thomson <linux at m-thomson dot net> +# Stu Tomlinson <stu at nosnilmot dot com> +# Axel Thimm <axel.thimm at atrpms dot net> +# Adopted for ArchLinux: +# Jürgen Hoetzel <juergen@archinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +############################################################################### +# +# Config variables for the mythbackend startup script, which is usually +# located in /etc/rc.d/mythbackend +# +# When the startup script is executed, it sources this file if it exists, +# otherwise it will fall back on default values. +# +# Leave variables commented out to use default values in init script +# (/etc/rc.d/mythbackend). +# +# To override defaults, uncomment the relevant variable definition and +# edit as required. +# + +# +# User who should start the mythbackend processes +# +# Running mythbackend as non-root requires you to ensure that audio/video +# devices used for recording have suitable user permissions. One way +# to achieve this is to modify existing or create new udev rules which +# assign these devices to a non-root group with rw permissions and add +# your mythbackend user to that group. Be aware that console.perms can +# also affect device permissions and may need additional configuration. +# Running as non-root may also introduce increased process latency. +# +# MBE_USER='root' + +# +# Directory holding the mythbackend binary (empty means autodetect). +# +# MBE_DIR='' + +# +# Name of mythbackend binary. +# +# MBE_PROG='mythbackend' + +# +# Other startup options for mythbackend (see 'mythbackend --help' for a list). +# +# MBE_OPTIONS='' + +# +# Directory holding the mythbackend log file +# +# LOG_DIR='/var/log/mythtv' + +# +# Name of mythbackend log file. +# +# NOTE: If you are running as non-root take care to ensure the mythbackend user +# has permission to write to this log file. +# +# LOG_FILE='mythbackend.log' + +# +# Logging options for mythbackend (see 'mythbackend -v help' for a list) +# +# LOG_OPTS='' diff --git a/community-testing/mythtv/mythbackend.rc b/community-testing/mythtv/mythbackend.rc new file mode 100644 index 000000000..410e8de41 --- /dev/null +++ b/community-testing/mythtv/mythbackend.rc @@ -0,0 +1,82 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# Default values to use if none are supplied in the config file. + +# Running mythbackend as non-root requires you to ensure that audio/video +# devices used for recording have suitable user permissions. One way +# to achieve this is to modify existing or create new udev rules which +# assign these devices to a non-root group with rw permissions and add +# your mythbackend user to that group. Be aware that console.perms can +# also affect device permissions and may need additional configuration. +# Running as non-root may also introduce increased process latency. +# +# User who should start the mythbackend processes +MBE_USER='root' + +# Startup options for mythbackend +MBE_OPTIONS='' + +# Name of mythbackend log file +LOG_FILE='/var/log/mythbackend.log' + +# Logging options for mythbackend (empty means '-v important,general') +LOG_OPTS='' + +############################################################################### + +CONFIG_FILE=/etc/conf.d/mythbackend +PIDFILE=/var/run/mythbackend.pid + +if [[ -f ${CONFIG_FILE} ]]; then + . ${CONFIG_FILE} +fi + +pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)"; + +# fix FS#11890 +mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)" + +case "$1" in + start) + stat_busy "Starting MythTV Backend" + + # already running ? + if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then + stat_fail + exit 1; + fi + touch ${PIDFILE} ${LOG_FILE} + chown "$MBE_USER" ${PIDFILE} ${LOG_FILE} + if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \ + --daemon \ + --logfile $LOG_FILE $LOG_OPTS \ + --pidfile ${PIDFILE} $MBE_OPTIONS"; + then + add_daemon mythbackend + stat_done + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping MythTV Backend" + if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then + rm_daemon mythbackend + stat_done + rm ${PIDFILE} 2>/dev/null + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/mythtv/mythtv-v4l2-fix.patch b/community-testing/mythtv/mythtv-v4l2-fix.patch new file mode 100644 index 000000000..e26e16615 --- /dev/null +++ b/community-testing/mythtv/mythtv-v4l2-fix.patch @@ -0,0 +1,724 @@ +diff --git a/mythtv/configure b/mythtv/configure +index 1efe803..7bcdf06 100755 +--- a/mythtv/configure ++++ b/mythtv/configure +@@ -109,7 +109,8 @@ Advanced options (experts only): + --disable-iptv disable support for recording RTSP/UDP/RTP streams + --disable-hdhomerun disable support for HDHomeRun boxes + --disable-v4l disable Video4Linux support +- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support ++ --disable-v4l2 disable Video4Linux2 support ++ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support + --disable-hdpvr disable HD-PVR support + --disable-dvb disable DVB support + --dvb-path=HDRLOC location of directory containing +@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST=' + qtwebkit + quartz_video + v4l ++ v4l2 + valgrind + x11 + xrandr +@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h" + dvb_deps="backend" + firewire_deps="backend" + iptv_deps="backend" +-ivtv_deps="backend v4l" +-hdpvr_deps="backend v4l" ++ivtv_deps="backend v4l2" ++hdpvr_deps="backend v4l2" + hdhomerun_deps="backend" + mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c" + mythtranscode_deps="backend frontend" +@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11" + opengl_video_deps="opengl" + opengl_vsync_deps="opengl" + v4l_deps="backend linux_videodev_h linux_videodev2_h" ++v4l2_deps="backend linux_videodev2_h" + vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" + xrandr_deps="x11" + xv_deps="x11" +@@ -1933,6 +1936,7 @@ enable opengl_vsync + enable opengl_video + enable quartz_video + enable v4l ++enable v4l2 + enable x11 + enable xrandr + enable xv +@@ -3062,6 +3066,7 @@ EOF + fi + disable opengl_vsync + disable v4l ++ disable v4l2 + disable x11 + # Workaround compile errors from missing gmtime_r/localtime_r/uint def + CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` +@@ -3106,6 +3111,7 @@ EOF + fi + disable symver + disable v4l ++ disable v4l2 + enable windows + disable x11 + ###### Standard ffmpeg configure stuff follows: +@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip" + + if enabled backend; then + echo "Video4Linux sup. ${v4l-no}" ++ echo "Video4Linux2 sup. ${v4l2-no}" + echo "ivtv support ${ivtv-no}" + echo "HD-PVR support ${hdpvr-no}" + echo "FireWire support ${firewire-no}" +diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +index 739634d..39e5956 100644 +--- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp ++++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp +@@ -42,9 +42,13 @@ extern "C" { + #include "libswscale/swscale.h" + } + ++#if defined(USING_V4L) || defined(USING_V4L2) + #ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + #include "go7007_myth.h" + +@@ -55,9 +59,9 @@ extern "C" { + extern "C" { + #include "vbitext/vbi.h" + } +-#else // USING_V4l ++#else // USING_V4L || USING_V4L2 + #define VT_WIDTH 0 +-#endif // USING_V4l ++#endif // USING_V4l || USING_V4L2 + + #define KEYFRAMEDIST 30 + +@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void) + + void NuppelVideoRecorder::ProbeV4L2(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + usingv4l2 = true; + + struct v4l2_capability vcap; +@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void) + QString driver = (char *)vcap.driver; + if (driver == "go7007") + go7007 = true; +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + void NuppelVideoRecorder::StartRecording(void) +@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void) + audio_device->Close(); + } + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + struct VBIData + { + NuppelVideoRecorder *nvr; +@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) + act_text_buffer = 0; + textbuffer[act]->freeToEncode = 1; + } +-#else // USING_V4L ++#else // USING_V4L || USING_V4L2 + void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {} +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + void NuppelVideoRecorder::FormatCC(struct cc *cc) + { +@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void) + //VERBOSE(VB_RECORD, LOC + "vbi end"); + } + +-#else // USING_V4L ++#else // USING_V4L + void NuppelVideoRecorder::doVbiThread(void) { } + #endif // USING_V4L + +diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp +index 2a4f4c5..fa5823a 100644 +--- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp ++++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp +@@ -6,7 +6,9 @@ + #include <sys/ioctl.h> + #include <poll.h> + ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif + + #include "mythverbose.h" + #include "analogsignalmonitor.h" +@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void) + } + else + { ++#ifdef USING_V4L + struct video_tuner tuner; + bzero(&tuner, sizeof(tuner)); + +@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void) + { + isLocked = tuner.signal; + } ++#endif + } + + { +diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp +index 8852682..494f48a 100644 +--- a/mythtv/libs/libmythtv/cardutil.cpp ++++ b/mythtv/libs/libmythtv/cardutil.cpp +@@ -4,7 +4,7 @@ + + #include <algorithm> + +-#if defined(USING_V4L) || defined(USING_DVB) ++#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB) + #include <sys/ioctl.h> + #endif + +@@ -28,6 +28,8 @@ + + #ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> + #endif + +@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name) + bool CardUtil::hasV4L2(int videofd) + { + (void) videofd; +-#ifdef USING_V4L ++#ifdef USING_V4L2 + struct v4l2_capability vcap; + bzero(&vcap, sizeof(vcap)); + + return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) && + (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE)); +-#else // if !USING_V4L ++#else // if !USING_V4L2 + return false; +-#endif // !USING_V4L ++#endif // !USING_V4L2 + } + + bool CardUtil::GetV4LInfo( +@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo( + if (videofd < 0) + return false; + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + // First try V4L2 query + struct v4l2_capability capability; + bzero(&capability, sizeof(struct v4l2_capability)); +@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo( + } + else // Fallback to V4L1 query + { ++#ifdef USING_V4L + struct video_capability capability; + if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0) + card = QString::fromAscii((const char*)capability.name); ++#endif //USING_V4L + } +-#endif // !USING_V4L ++#endif // !USING_V4L || USING_V4L2 + + if (!driver.isEmpty()) + driver.remove( QRegExp("\\[[0-9]\\]$") ); +@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + InputNames list; + ok = false; + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + bool usingv4l2 = hasV4L2(videofd); +- ++#ifdef USING_V4L2 + // V4L v2 query + struct v4l2_input vin; + bzero(&vin, sizeof(vin)); +@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + ok = true; + return list; + } ++#endif + + // V4L v1 query ++#ifdef USING_V4L + struct video_capability vidcap; + bzero(&vidcap, sizeof(vidcap)); + if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0) +@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) + + list[i] = test.name; + } +- ++#endif + // Create an input on single input cards that don't advertise input + if (!list.size()) + list[0] = "Television"; + + ok = true; +-#else // if !USING_V4L ++#else // if !USING_V4L || USING_V4L2 + list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs"); +-#endif // !USING_V4L ++#endif // !USING_V4L || USING_V4L2 + return list; + } + +diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp +index 832d0a8..e35b186 100644 +--- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp ++++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp +@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const + + V4LChannel *ChannelScanSM::GetV4LChannel(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + return dynamic_cast<V4LChannel*>(channel); + #else + return NULL; +diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp +index 1595d6a..4d2b2cf 100644 +--- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp ++++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp +@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon( + channel = new DVBChannel(device); + #endif + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (("V4L" == card_type) || ("MPEG" == card_type)) + channel = new V4LChannel(NULL, device); + #endif +diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp +index 00fd9d3..70e3469 100644 +--- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp ++++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp +@@ -27,14 +27,14 @@ static QString card_types(void) + cardTypes += "'DVB'"; + #endif // USING_DVB + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (!cardTypes.isEmpty()) + cardTypes += ","; + cardTypes += "'V4L'"; + # ifdef USING_IVTV + cardTypes += ",'MPEG'"; + # endif // USING_IVTV +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_IPTV + if (!cardTypes.isEmpty()) +diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro +index 3d26e0a..ea06ee7 100644 +--- a/mythtv/libs/libmythtv/libmythtv.pro ++++ b/mythtv/libs/libmythtv/libmythtv.pro +@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32 + using_valgrind:DEFINES += USING_VALGRIND + + # old libvbitext (Caption decoder) +-using_v4l { ++using_v4l || using_v4l2 { + HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h + HEADERS += vbitext/vbi.h vbitext/vt.h + SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c +@@ -471,11 +471,17 @@ using_backend { + SOURCES += channelchangemonitor.cpp + + # Support for Video4Linux devices +- using_v4l { ++ using_v4l || using_v4l2 { + HEADERS += v4lchannel.h analogsignalmonitor.h + SOURCES += v4lchannel.cpp analogsignalmonitor.cpp + +- DEFINES += USING_V4L ++ using_v4l { ++ DEFINES += USING_V4L ++ } ++ ++ using_v4l2 { ++ DEFINES += USING_V4L2 ++ } + } + + # Support for cable boxes that provide Firewire out +diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp +index 221efef..c199b3b 100644 +--- a/mythtv/libs/libmythtv/signalmonitor.cpp ++++ b/mythtv/libs/libmythtv/signalmonitor.cpp +@@ -23,7 +23,7 @@ extern "C" { + # include "dvbchannel.h" + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + # include "analogsignalmonitor.h" + # include "v4lchannel.h" + #endif +@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum, + } + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + if ((cardtype.toUpper() == "HDPVR")) + { + V4LChannel *chan = dynamic_cast<V4LChannel*>(channel); +diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp +index b885eaa..3d9c7ad 100644 +--- a/mythtv/libs/libmythtv/tv_rec.cpp ++++ b/mythtv/libs/libmythtv/tv_rec.cpp +@@ -57,7 +57,7 @@ using namespace std; + + #include "channelgroup.h" + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + #include "v4lchannel.h" + #endif + +@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel) + } + else // "V4L" or "MPEG", ie, analog TV + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + channel = new V4LChannel(this, genOpt.videodev); + if (!channel->Open()) + return false; +@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile) + } + else + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + // V4L/MJPEG/GO7007 from here on + recorder = new NuppelVideoRecorder(this, channel); + recorder->SetOption("skipbtaudio", genOpt.skip_btaudio); +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + if (recorder) +@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void) + + V4LChannel *TVRec::GetV4LChannel(void) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + return dynamic_cast<V4LChannel*>(channel); + #else + return NULL; +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + } + + /** \fn TVRec::EventThread(void*) +@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData) + channel->GetCurrentName()); + } + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + if (GetV4LChannel()) + { + channel->InitPictureAttributes(); +diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp +index bc82b49..7aa47ef 100644 +--- a/mythtv/libs/libmythtv/v4lchannel.cpp ++++ b/mythtv/libs/libmythtv/v4lchannel.cpp +@@ -16,8 +16,12 @@ + #include <iostream> + using namespace std; + ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + // MythTV headers + #include "v4lchannel.h" +@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version) + { + if (fmt == "NTSC-JP") + return 6; ++#ifdef USING_V4L + else if (fmt.left(5) == "SECAM") + return VIDEO_MODE_SECAM; ++#endif + else if (fmt == "PAL-NC") + return 3; + else if (fmt == "PAL-M") +@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) + else if (fmt == "PAL-N") + return 5; + // generics... ++#ifdef USING_V4L + else if (fmt.left(3) == "PAL") + return VIDEO_MODE_PAL; + else if (fmt.left(4) == "NTSC") +@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) + else if (fmt.left(4) == "ATSC") + return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support... + return VIDEO_MODE_NTSC; ++#endif + } + + VERBOSE(VB_IMPORTANT, +@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version) + } + else if (1 == v4l_version) + { ++#ifdef USING_V4L + if (mode == VIDEO_MODE_NTSC) + return "NTSC"; + else if (mode == VIDEO_MODE_PAL) +@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version) + return "PAL-N"; + else if (mode == 6) + return "NTSC-JP"; ++#endif + } + else + { +@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, + return true; + } + ++#ifdef USING_V4L + // Video4Linux version 1 tuning + uint freq = frequency / 62500; + ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq); +@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, + .arg(device).arg(ioctlval).arg(strerror(errno))); + return false; + } ++#endif + + SetSIStandard(si_std); + +@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) + + if (usingv4l1) + { ++#ifdef USING_V4L + VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)"); + + // read in old settings +@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) + { + VERBOSE(VB_IMPORTANT, LOC_ERR + msg + + "\n\t\t\twhile setting format (v4l v1)" + ENO); +- } +- else if (usingv4l2) ++ } else ++#endif ++ if (usingv4l2) + { + VERBOSE(VB_IMPORTANT, LOC + msg + + "\n\t\t\tSetting video mode with v4l version 1 worked"); +@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting) + return ok; + } + ++#ifdef USING_V4L + static unsigned short *get_v4l1_field( + int v4l2_attrib, struct video_picture &vid_pic) + { +@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field( + } + return NULL; + } ++#endif + + static int get_v4l2_attribute(const QString &db_col_name) + { +@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) + } + + // V4L1 ++#ifdef USING_V4L + unsigned short *setfield; + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); +@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) + VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO); + return false; + } +- ++#endif + return true; + } + +@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib) + + static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) + { ++#ifdef USING_V4L + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); + +@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) + unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic); + if (setfield) + return *setfield; ++#endif + + return -1; + } +@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue) + + static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) + { ++#ifdef USING_V4L + unsigned short *setfield; + struct video_picture vid_pic; + bzero(&vid_pic, sizeof(vid_pic)); +@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) + // ??? + return -1; + } +- ++#endif + return 0; + } + +diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h +index b059c64..aa6d934 100644 +--- a/mythtv/libs/libmythtv/v4lchannel.h ++++ b/mythtv/libs/libmythtv/v4lchannel.h +@@ -4,11 +4,11 @@ + #define CHANNEL_H + + #include "dtvchannel.h" +-#ifdef USING_V4L ++#ifdef USING_V4L2 + #include <linux/videodev2.h> // needed for v4l2_std_id type + #else + typedef uint64_t v4l2_std_id; +-#endif //USING_V4L ++#endif //USING_V4L2 + + using namespace std; + +diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c +index 15f8d85..4c50e8d 100644 +--- a/mythtv/libs/libmythtv/vbitext/vbi.c ++++ b/mythtv/libs/libmythtv/vbitext/vbi.c +@@ -14,8 +14,12 @@ + // compiling with -std=c99. We could remove this in the .pro file, + // but that would disable it for all .c files. + #undef __STRICT_ANSI__ ++#ifdef USING_V4L + #include <linux/videodev.h> ++#endif ++#ifdef USING_V4L2 + #include <linux/videodev2.h> ++#endif + + // vbitext headers + #include "vt.h" +@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size + + + /***** bttv api *****/ ++#ifdef USING_V4L + #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) +- ++#else // !USING_V4L ++#ifdef USING_V4L2 ++#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int) ++#endif // USING_V4L2 ++#endif // !USING_V4L + + static void + error(const char *str, ...) +diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp +index 5d7a508..635faeb 100644 +--- a/mythtv/libs/libmythtv/videosource.cpp ++++ b/mythtv/libs/libmythtv/videosource.cpp +@@ -45,7 +45,7 @@ using namespace std; + #include "dvbtypes.h" + #endif + +-#ifdef USING_V4L ++#ifdef USING_V4L2 + #include <linux/videodev2.h> + #endif + +@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : + setTrigger(cardtype); + setSaveAll(false); + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + addTarget("V4L", new V4LConfigurationGroup(parent)); + # ifdef USING_IVTV + addTarget("MPEG", new MPEGConfigurationGroup(parent)); +@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : + # ifdef USING_HDPVR + addTarget("HDPVR", new HDPVRConfigurationGroup(parent)); + # endif // USING_HDPVR +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_DVB + addTarget("DVB", new DVBConfigurationGroup(parent)); +@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) : + + void CardType::fillSelections(SelectSetting* setting) + { +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + setting->addSelection( + QObject::tr("Analog V4L capture card"), "V4L"); + setting->addSelection( +@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting) + setting->addSelection( + QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR"); + # endif // USING_HDPVR +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_DVB + setting->addSelection( +@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting) + QObject::tr("FireWire cable box"), "FIREWIRE"); + #endif // USING_FIREWIRE + +-#ifdef USING_V4L ++#if defined(USING_V4L) || defined(USING_V4L2) + setting->addSelection( + QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"), + "GO7007"); +-#endif // USING_V4L ++#endif // USING_V4L || USING_V4L2 + + #ifdef USING_HDHOMERUN + setting->addSelection( diff --git a/community-testing/mythtv/mythtv.install b/community-testing/mythtv/mythtv.install new file mode 100644 index 000000000..c29a53454 --- /dev/null +++ b/community-testing/mythtv/mythtv.install @@ -0,0 +1,11 @@ +post_install() { + echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!" +} + +post_upgrade() { + return +} + +post_remove() { + echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'" +} diff --git a/community-testing/open-vm-tools-modules/PKGBUILD b/community-testing/open-vm-tools-modules/PKGBUILD new file mode 100644 index 000000000..41d09db91 --- /dev/null +++ b/community-testing/open-vm-tools-modules/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 57352 2011-10-26 12:09:45Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Krzysztof Raczkowski <raczkow@gmail.com> + +pkgname=open-vm-tools-modules +pkgver=2011.09.23 +_pkgsubver=491607 +pkgrel=2 +pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" +arch=('i686' 'x86_64') +url="http://open-vm-tools.sourceforge.net/" +license=('GPL') +makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') +depends=("linux") +install=$pkgname.install +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") +md5sums=('599342eee8d531b35ca1cc948b61868f') + +build() { + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + + cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \ + --without-x --with-kernel-release=$KERNEL_RELEASE + (cd modules && make modules) +} + +package() { + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") + KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + msg "Kernel = $KERNEL_VERSION" + + cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ + for MOD in `find -type f -name '*.ko'`; do + install -D -m644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ + done + sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install +} diff --git a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install new file mode 100644 index 000000000..801d2c5b3 --- /dev/null +++ b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install @@ -0,0 +1,34 @@ +KERNEL_VERSION='2.6.38-ARCH' + +post_install() { + depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 + + VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;" + VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;" + VMXNET="$VMXNET /bin/true;" + + echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + echo ">>> (this will disable pcnet32 driver)" + sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf + echo + + echo ">>>" + echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" + echo ">>> disable loading of pcnet32 driver" + echo ">>>" +} + +post_upgrade() { + depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 +} + +post_remove() { + depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 + + echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf + + echo ">>>" + echo ">>> Remember to un-blacklist pcnet32 driver" + echo ">>>" +} diff --git a/community-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD new file mode 100644 index 000000000..38e3fab49 --- /dev/null +++ b/community-testing/paraview/PKGBUILD @@ -0,0 +1,86 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Michele Mocciola <mickele> +# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> + +pkgname=paraview +pkgver=3.10.1 +pkgrel=3 +pkgdesc='Parallel Visualization Application using VTK.' +arch=('i686' 'x86_64') +url='http://www.paraview.org' +license=('custom') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' +makedepends=('cmake' 'desktop-file-utils') +source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" + 'paraview.png' + 'paraview.desktop' + 'fixkernelversioncheck.diff') +md5sums=('d8a9d4a997a720589ffd57568bcdd449' + 'db623002bc71a257ddfdd0c9c7b14c3f' + '4e4b7172ed18171c37446fd7c4f1e8f5' + '9e137af23701f76fc727222ebac23389') + +build() { + cd ParaView-${pkgver} + + # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568 + # remove next pkgver bump + cd VTK + patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + cd .. + + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx + sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx + sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + + # Paraview wants to be built out of source + mkdir -p build + cd build + + # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_USE_PTHREADS:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_SKIP_RPATH:BOOL=YES \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \ + -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ + -DVTK_USE_BOOST:BOOL=OFF \ + -DVTK_USE_OFFSCREEN=TRUE \ + -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ + -DPARAVIEW_USE_MPI:BOOL=ON \ + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ + -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ + .. + + make +} + +package() { + cd ParaView-${pkgver}/build + + make DESTDIR=${pkgdir} install + + # Install license + install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE + + # Install desktop shortcuts + install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png + desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop + + # Removes VTK plugin for designer - if you need, you can install vtk + #rm -rf ${pkgdir}/opt/paraview/plugins +} diff --git a/community-testing/paraview/fixkernelversioncheck.diff b/community-testing/paraview/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community-testing/paraview/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop new file mode 100644 index 000000000..2f5b8ec69 --- /dev/null +++ b/community-testing/paraview/paraview.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Name=ParaView +GenericName=Data Viewer +Comment=ParaView allows visualization of large data sets +Type=Application +Terminal=false +Icon=paraview +Categories=Graphics; +Exec=/usr/bin/paraview diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png Binary files differnew file mode 100644 index 000000000..6e39f3d4f --- /dev/null +++ b/community-testing/paraview/paraview.png diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD new file mode 100644 index 000000000..acf9a20ad --- /dev/null +++ b/community-testing/percona-server/PKGBUILD @@ -0,0 +1,99 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=percona-server +pkgver=5.5.16_rel22.0 +pkgrel=1 +pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" +arch=('i686' 'x86_64') + +depends=('mysql-clients' 'net-tools' 'libaio') +conflicts=('mysql') +provides=('mysql') +optdepends=('perl-dbi' 'perl-dbd-mysql') +makedepends=('cmake' 'openssl' 'zlib') + +license=('GPL') +url="http://www.percona.com/software/percona-server/" +options=('!libtool' 'emptydirs') +backup=('etc/mysql/my.cnf') +install=percona.install +source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" + 'mysqld' + 'my.cnf') + +build() { + cd "${srcdir}/Percona-Server-${pkgver/_/-}" + sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt + + cd "${srcdir}" + rm -rf build + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + + cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf + install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld + + # provided by libmysqlclient + rm ${pkgdir}/usr/bin/mysql_config + rm ${pkgdir}/usr/lib/libmysql* + rm -r ${pkgdir}/usr/include/ + rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by mysql-clients + rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/mysql +} + +md5sums=('cfc4523a7110f07c193391f3e73d59ae' + '243864805611764a7e5883c1dba7afd8' + '1c949c0dbea5206af0db14942d9927b6') diff --git a/community-testing/percona-server/my.cnf b/community-testing/percona-server/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/community-testing/percona-server/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, +# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; +# +# where you replace <host>, <user>, <password> by quoted strings and +# <port> by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = <hostname> +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = <username> +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = <password> +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = <port> +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/community-testing/percona-server/mysqld b/community-testing/percona-server/mysqld new file mode 100755 index 000000000..07f6b7e4c --- /dev/null +++ b/community-testing/percona-server/mysqld @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting Percona Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Percona Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/percona-server/percona.install b/community-testing/percona-server/percona.install new file mode 100644 index 000000000..caacccf1b --- /dev/null +++ b/community-testing/percona-server/percona.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + /usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/community-testing/python2-poppler/PKGBUILD b/community-testing/python2-poppler/PKGBUILD new file mode 100644 index 000000000..42a670494 --- /dev/null +++ b/community-testing/python2-poppler/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 57166 2011-10-22 19:04:38Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=python2-poppler +_realname=pypoppler +pkgver=0.12.1 +pkgrel=6 +pkgdesc="Python 2.x bindings for Poppler" +arch=('i686' 'x86_64') +url="https://launchpad.net/poppler-python" +license=('GPL') +depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2') +provides=('pypoppler' 'python-poppler') +conflicts=('python-poppler') +replaces=('python-poppler') +options=(!libtool) +source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz" + 'pypoppler-0.12.1-poppler-0.16.0.patch') +md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a' + '683c5b67866d56adc2494120cc329dc8') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # poppler 0.16 compat + patch -Np0 -i \ + "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + + # poppler 0.18 compat + sed -i "/pixbuf/,/^)/d" poppler.defs + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch b/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch new file mode 100644 index 000000000..0e99b57ec --- /dev/null +++ b/community-testing/python2-poppler/pypoppler-0.12.1-poppler-0.16.0.patch @@ -0,0 +1,11 @@ +--- poppler.defs.orig 2010-12-30 05:55:07.000000000 +0000 ++++ poppler.defs 2010-12-30 05:55:27.000000000 +0000 +@@ -1794,7 +1794,7 @@ + + (define-method get_text + (of-object "PopplerPage") +- (c-name "poppler_page_get_text") ++ (c-name "poppler_page_get_selected_text") + (return-type "char*") + (parameters + '("PopplerSelectionStyle" "style") diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD new file mode 100644 index 000000000..555de294c --- /dev/null +++ b/community-testing/qbittorrent/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.9.1 +pkgrel=2 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python2: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('093bb1f7779378a339c20aa3e4ea6d36') + +build() { + cd qbittorrent-${pkgver} + + sed -i \ + -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd qbittorrent-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-testing/qbittorrent/qbittorrent.install b/community-testing/qbittorrent/qbittorrent.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-testing/qbittorrent/qbittorrent.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD new file mode 100644 index 000000000..51fc7aaf5 --- /dev/null +++ b/community-testing/qlandkartegt/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 57247 2011-10-24 20:34:11Z andrea $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Matthias Maennich <arch@maennich.net> +# Contributor: <boenki@gmx.de> + +pkgname=qlandkartegt +pkgver=1.2.4 +pkgrel=2 +pkgdesc="Use your GPS with Linux" +arch=('i686' 'x86_64') +url="http://www.qlandkarte.org/" +license=('GPL') +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info' 'qtwebkit') +makedepends=('cmake' 'garmindev') +optdepends=('garmindev: to connect garmin devices') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-mimetypes.xml + 'fix-glu-header.patch') +sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + + patch -R -p2 -i "${srcdir}"/fix-glu-header.patch + + cd "${srcdir}" + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package(){ + cd "${srcdir}/build" + + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ + "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" +} diff --git a/community-testing/qlandkartegt/fix-glu-header.patch b/community-testing/qlandkartegt/fix-glu-header.patch new file mode 100644 index 000000000..214ad395d --- /dev/null +++ b/community-testing/qlandkartegt/fix-glu-header.patch @@ -0,0 +1,12 @@ +--- QLandkarteGT/trunk/src/CMap3D.cpp 2011/08/23 16:34:50 2943 ++++ QLandkarteGT/trunk/src/CMap3D.cpp 2011/09/03 07:58:02 2961 +@@ -31,8 +31,8 @@ + #include "CWptDB.h" + #include "WptIcons.h" + +-#include <GL/glu.h> + #include <QtGui> ++#include <QtOpenGL> + #include <math.h> + + #ifndef GL_CLAMP_TO_EDGE diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml new file mode 100644 index 000000000..46d3d402c --- /dev/null +++ b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/vnd.qlandkartegt.qlb"> + <comment>QLandkarteGT File</comment> + <glob pattern="*.qlb"/> + </mime-type> +</mime-info> diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog new file mode 100644 index 000000000..531d2ebe5 --- /dev/null +++ b/community-testing/qlandkartegt/qlandkartegt.changelog @@ -0,0 +1,27 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.4-1 + +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.3-1 + +2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.2-1 + +2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.1-1 + +2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.0-1 + +2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.1.2-1 + +2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.1.1-1 + +2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.1.0-1 + +2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.0.1-2 + * moved to [community] with 59 AUR votes diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install new file mode 100644 index 000000000..e55805570 --- /dev/null +++ b/community-testing/qlandkartegt/qlandkartegt.install @@ -0,0 +1,7 @@ +post_install() { + update-mime-database usr/share/mime > /dev/null +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/qmc2/PKGBUILD b/community-testing/qmc2/PKGBUILD new file mode 100644 index 000000000..779aff5bd --- /dev/null +++ b/community-testing/qmc2/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57249 2011-10-24 20:34:16Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> + +pkgname=qmc2 +pkgver=0.2.b20 +pkgrel=2 +pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME." +url="http://qmc2.arcadehits.net" +license=("GPL") +arch=('i686' 'x86_64') +depends=('qt' 'phonon' 'sdl' 'libxmu' 'qtwebkit') +makedepends=('rsync' 'mesa') +source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") +md5sums=('e868144815ff44a2146e839c2395c6d1') + +build() { + cd "$srcdir/$pkgname" + export CTIME=0 + make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr +} + +package() { + cd "$srcdir/$pkgname" + make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/{applications,pixmaps} + install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" +} diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD new file mode 100644 index 000000000..3ac8fa55a --- /dev/null +++ b/community-testing/qtcreator/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 57251 2011-10-24 20:34:23Z andrea $ +# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname="qtcreator" +pkgver=2.3.1 +pkgrel=2 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt.nokia.com/products/developer-tools' +license=('LGPL') +depends=('qt>=4.7.4') +makedepends=('qt-private-headers>=4.7.4' 'git') +options=('docs') +source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('8aa296ed9034f847bd53ee0424e5ef08' + 'f1f4680b9838ff0b8f4cf11eb850d662') + +build() { + cd ${srcdir} + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro + make +} + +package() { + optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support') + + cd ${srcdir}/build + + make INSTALL_ROOT="${pkgdir}/usr/" install + + install -Dm644 ${srcdir}/qtcreator.desktop \ + ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ + ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0fd562bd9 --- /dev/null +++ b/community-testing/qtcreator/qtcreator.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qtcreator +Name=Qt-Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development diff --git a/community-testing/sigil/PKGBUILD b/community-testing/sigil/PKGBUILD new file mode 100644 index 000000000..934bbbad7 --- /dev/null +++ b/community-testing/sigil/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 57253 2011-10-24 20:34:33Z andrea $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> + +pkgname=sigil +pkgver=0.4.2 +pkgrel=2 +pkgdesc="A WYSIWYG ebook editor" +arch=('i686' 'x86_64') +url="http://code.google.com/p/sigil/" +license=('GPL3') +depends=('qt' 'qtwebkit') +makedepends=('cmake') +install=sigil.install +source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip + ${pkgname}.desktop) +md5sums=('ce27976254236f8b11b787fd05be9acb' + 'fef6aa492af487ccccd6b133635cee5a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON .. + + make +} + +package() { + cd "${srcdir}"/build + make install DESTDIR="${pkgdir}" + + install -d -m 0755 "${pkgdir}"/usr/share/applications + install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications + + for _pic in 16 32 48 128 256; do + install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \ + "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png + done +} diff --git a/community-testing/sigil/sigil.desktop b/community-testing/sigil/sigil.desktop new file mode 100755 index 000000000..4f3a14d20 --- /dev/null +++ b/community-testing/sigil/sigil.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Sigil +Comment=E-book reader and WYSIWYG editor +TryExec=sigil +Exec=sigil +Icon=sigil +Categories=Office; +Terminal=false +StartupNotify=false diff --git a/community-testing/sigil/sigil.install b/community-testing/sigil/sigil.install new file mode 100644 index 000000000..ec506fa93 --- /dev/null +++ b/community-testing/sigil/sigil.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/texmaker/PKGBUILD b/community-testing/texmaker/PKGBUILD new file mode 100644 index 000000000..7db874e08 --- /dev/null +++ b/community-testing/texmaker/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: furester <xfurester@hotmail.com> +# Contributor: Firmicus <firmicus gmx net> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> + +pkgname=texmaker +pkgver=3.1 +pkgrel=2 +pkgdesc='Free cross-platform latex editor' +arch=('i686' 'x86_64') +url="http://www.xm1math.net/texmaker/index.html" +license=('GPL') +depends=('poppler-qt' 'ghostscript' 'qtwebkit') +source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") +md5sums=('10a14c75abbb7234d4e5e58a7c85b110') + +build() { + cd ${pkgname}-${pkgver} + + export INSTALL_ROOT=${pkgdir} + + qmake -unix PREFIX=//usr texmaker.pro + + make +} + +package() { + cd ${pkgname}-${pkgver} + + export INSTALL_PATH=${pkgdir} + + make install +} diff --git a/community-testing/virtualbox-modules/60-vboxguest.rules b/community-testing/virtualbox-modules/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/community-testing/virtualbox-modules/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox-modules/LocalConfig.kmk b/community-testing/virtualbox-modules/LocalConfig.kmk new file mode 100644 index 000000000..af79f90cd --- /dev/null +++ b/community-testing/virtualbox-modules/LocalConfig.kmk @@ -0,0 +1,19 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD new file mode 100644 index 000000000..ced055501 --- /dev/null +++ b/community-testing/virtualbox-modules/PKGBUILD @@ -0,0 +1,101 @@ +# $Id: PKGBUILD 57348 2011-10-26 10:15:54Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=virtualbox-modules +pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') +pkgver=4.1.4 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 + LocalConfig.kmk 60-vboxguest.rules) +md5sums=('dc6e6801b3823332b6ca2e9915221aae' + '4c88bd122677a35f68abd76eb01b378b' + 'ed1341881437455d9735875ddf455fbe') + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" + +export KERN_DIR=/lib/modules/${_kernver}/build +export KERN_INCL=/usr/src/linux-${_kernver}/include/ + +build() { + cd "$srcdir/VirtualBox-${pkgver}_OSE" + + cp "$srcdir/LocalConfig.kmk" . + + ./configure \ + --with-linux=/usr/src/linux-${_kernver} \ + --disable-java \ + --disable-docs \ + --disable-xpcom \ + --disable-python \ + --disable-sdl-ttf \ + --disable-alsa \ + --disable-pulse \ + --disable-dbus \ + --disable-opengl \ + --build-headless \ + --nofatal + source ./env.sh + kmk all + + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" +} + +package_virtualbox-archlinux-modules(){ + pkgdesc="Additions only for Arch Linux guests (kernel modules)" + license=('GPL') + install=virtualbox-archlinux-modules.install + depends=('linux>=3.1' 'linux<3.2') + replaces=('virtualbox-guest-modules') + conflicts=('virtualbox-guest-modules') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + + for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do + install -D -m644 ${module} \ + "$pkgdir/lib/modules/${_extramodules}/${module}" + done + + install -D -m 0644 "$srcdir/60-vboxguest.rules" \ + "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install" +} + +package_virtualbox-modules(){ + pkgdesc="Kernel modules for VirtualBox" + license=('GPL') + install=virtualbox-modules.install + depends=('linux>=3.1' 'linux<3.2') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + + install -D -m644 vboxdrv.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" + + install -D -m644 vboxnetadp.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" + + install -D -m644 vboxnetflt.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" + + install -D -m644 vboxpci.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" +} diff --git a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install new file mode 100644 index 000000000..39a0e4063 --- /dev/null +++ b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install new file mode 100644 index 000000000..188c1874c --- /dev/null +++ b/community-testing/virtualbox-modules/virtualbox-modules.install @@ -0,0 +1,19 @@ +post_install() { +/bin/cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules new file mode 100644 index 000000000..37403ae2f --- /dev/null +++ b/community-testing/virtualbox/10-vboxdrv.rules @@ -0,0 +1,5 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" +SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk new file mode 100644 index 000000000..e5cbcebcd --- /dev/null +++ b/community-testing/virtualbox/LocalConfig.kmk @@ -0,0 +1,19 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD new file mode 100644 index 000000000..b39c517a6 --- /dev/null +++ b/community-testing/virtualbox/PKGBUILD @@ -0,0 +1,185 @@ +# $Id: PKGBUILD 57347 2011-10-26 10:09:31Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgbase=virtualbox +pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') +pkgver=4.1.4 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL' 'custom') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') +#'xorg-server-devel' 'xf86driproto' 'libxcomposite') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 + UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild + change_default_driver_dir.patch vbox-service.conf vbox-service.rc) + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" + +build() { + cd "$srcdir/VirtualBox-${pkgver}_OSE" + + patch -Np1 -i "$srcdir/vboxdrv-reference.patch" + patch -Np1 -i "$srcdir/change_default_driver_dir.patch" + + cp "$srcdir/LocalConfig.kmk" . + + ./configure --disable-docs \ + --enable-webservice \ + --enable-vde \ + --enable-vnc \ + --nofatal \ + --with-linux=/usr/src/linux-${_kernver} + source ./env.sh + kmk all + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" +} + +package_virtualbox() { + pkgdesc="Powerful x86 virtualization for enterprise as well as home use" + depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') + optdepends=('qt: for VirtualBox GUI' + 'vde2: Virtual Distributed Ethernet support' + 'virtualbox-sdk: developer kit' + 'virtualbox-source: host kernel source modules for non-stock kernels') + + replaces=('virtualbox-ose') + conflicts=('virtualbox-ose') + install=virtualbox.install + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} + + #doc + install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" + + #Binaries and Wrapper with Launchers + install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" + + for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do + ln -sf VBox "$pkgdir/usr/bin/$i" + done + install -m 0755 VBoxTunctl "$pkgdir/usr/bin" + + #components + install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" + + #lib + install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" + install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" + + #setuid root binaries + install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" + #other binaries + install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" + + #language + install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" + + #useless scripts + install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" + + #icons + install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" + + pushd icons + for i in *; do + install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + done + popd + + #desktop + install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" + install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" + + #install configuration + mkdir -p "$pkgdir/etc/vbox" + echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" + + #udev and licence + install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ + "$pkgdir/usr/share/licenses/virtualbox/LICENSE" + install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ + "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" +} + +package_virtualbox-source() { + pkgdesc="VirtualBox kernel modules source" + depends=(linux-headers gcc make) + install=virtualbox-source.install + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + mkdir -p $pkgdir/usr/lib/virtualbox + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + #sources for modules + cp -r src ${pkgdir}/usr/lib/virtualbox + #install compilation script + install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild" +} + +package_virtualbox-sdk() { + pkgdesc="VirtualBox Software Developer Kit (SDK)" + depends=('python2') + + mkdir -p "$pkgdir/usr/lib/virtualbox" + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" + #python sdk + pushd sdk/installer + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" + popd + rm -rf sdk/installer + mv sdk "$pkgdir/usr/lib/virtualbox" +} + +package_virtualbox-archlinux-additions(){ + pkgdesc="Additions only for Arch Linux guests (userspace tools)" + depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') + replaces=('virtualbox-guest-additions') + conflicts=('virtualbox-guest-additions') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + + install -d "$pkgdir"/{usr/bin,sbin} + install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" + install -m755 mount.vboxsf "$pkgdir/sbin" + + install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + "$pkgdir"/usr/bin/VBoxClient-all + install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + "$pkgdir"/etc/xdg/autostart/vboxclient.desktop + install -D vboxvideo_drv_111.so \ + "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" + install -d "$pkgdir/usr/lib/xorg/modules/dri" + install -m755 VBoxOGL*.so "$pkgdir/usr/lib" + ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" + install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" + + # install rc.d script + install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service" + + # install sample config + install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" +} +md5sums=('dc6e6801b3823332b6ca2e9915221aae' + 'bc048d1e58d84ece4a186199ee48d4c8' + '5f85710e0b8606de967716ded7b2d351' + 'cc3f278bc273011aa95277500a76f677' + '78ffa67ff131680f1d2b6f06d4325c5b' + 'a82d698e7868315cdf876cfb02fd2268' + '97e193f050574dd272a38e5ee5ebe62b' + '3c08ad30b89add47d3f45121200a5360' + '778d865e56e31cc592fbfa257fdcfce7') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch new file mode 100644 index 000000000..d8531499d --- /dev/null +++ b/community-testing/virtualbox/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000 +@@ -36,13 +36,8 @@ + //#define DEBUG_DRI_CALLS + + //@todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vbox-service.conf b/community-testing/virtualbox/vbox-service.conf new file mode 100644 index 000000000..9d4ec629f --- /dev/null +++ b/community-testing/virtualbox/vbox-service.conf @@ -0,0 +1,2 @@ +# VBoxService -h +VBOX_SERVICE_OPTION="" diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc new file mode 100755 index 000000000..c1af2134d --- /dev/null +++ b/community-testing/virtualbox/vbox-service.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/vbox-service + +name=VBoxService +PID=$(pidof -o %PPID $name) + +case "$1" in + start) + stat_busy "Starting $name service" + [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; + stop) + stat_busy "Stopping $name service" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + status) + stat_busy "Checking $name status"; + ck_status $name + ;; + *) + echo "usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox/vboxbuild b/community-testing/virtualbox/vboxbuild new file mode 100755 index 000000000..cfc3c0a66 --- /dev/null +++ b/community-testing/virtualbox/vboxbuild @@ -0,0 +1,78 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/vbox/vbox.cfg + +MODLIST=() +LOG="/var/log/vbox-install.log" +>| "$LOG" + +if [[ $INSTALL_DIR ]]; then + VBOXMANAGE=$INSTALL_DIR/VBoxManage + BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp + BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp + BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp + BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp +else + echo "error: missing vbox.cfg" + exit 1 +fi + +if [[ -f /proc/modules ]]; then + IFS=$'\n' read -r -d '' -a MODLIST < \ + <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules) +fi + +if (( ${#MODLIST[*]} )); then + stat_busy "Unloading VirtualBox kernel modules" + modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail +fi + +for kdir in /lib/modules/[2-3]*; do + if [[ ! -d $kdir/kernel ]]; then + # found a stale kernel + mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*) + if (( ${#mods[@]} )); then + stat_busy "Removing all old VirtualBox kernel modules" + if rm -f "${mods[@]}" && + rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then + stat_done + else + stat_fail + fi + fi + fi +done + +# default to the currently running kernel +if (( ! $# )); then + set -- $(uname -r) +fi + +for kernver; do + export KERN_DIR=/lib/modules/$kernver/build + if [[ ! -d $KERN_DIR ]]; then + printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \ + "$KERN_DIR" + continue + fi + + stat_busy "Recompiling VirtualBox kernel modules ($kernver)" + for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do + if ! ${!build} \ + --save-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + stat_fail + continue + fi + done + stat_done +done + +if (( ${#MODLIST[*]} )); then + stat_busy "Reloading VirtualBox kernel modules" + modprobe -a "${MODLIST[@]}" && stat_done || stat_fail +fi + diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch new file mode 100644 index 000000000..c310dbc8d --- /dev/null +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -0,0 +1,45 @@ +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000 +@@ -75,9 +75,8 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " + "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " + "module by executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " +- "package first. This package keeps track of Linux kernel changes and " ++ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" ++ "as root. This package keeps track of Linux kernel changes and" + "recompiles the vboxdrv kernel module if necessary." + ); + +@@ -92,7 +91,7 @@ + "The VirtualBox kernel modules do not match this version of " + "VirtualBox. The installation of VirtualBox was apparently not " + "successful. Executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" ++ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" + "may correct this. Make sure that you do not mix the " + "OSE version and the PUEL version of VirtualBox." + ); +diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000 ++++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000 +@@ -34,7 +34,7 @@ + available for the current kernel (`uname -r`) or it failed to + load. Please recompile the kernel module and install it by + +- sudo /etc/init.d/vboxdrv setup ++ sudo /usr/bin/vboxbuild + + You will not be able to start VMs until this problem is fixed. + EOF +@@ -42,7 +42,7 @@ + cat << EOF + WARNING: The character device /dev/vboxdrv does not exist. Try + +- sudo /etc/init.d/vboxdrv restart ++ sudo /usr/bin/vboxbuild + + and if that is not successful, try to re-install the package. + diff --git a/community-testing/virtualbox/virtualbox-source.install b/community-testing/virtualbox/virtualbox-source.install new file mode 100644 index 000000000..24d90b1c2 --- /dev/null +++ b/community-testing/virtualbox/virtualbox-source.install @@ -0,0 +1,12 @@ +post_install() { +/bin/cat << EOF +===> To compile the modules do /usr/bin/vboxbuild +EOF + +} + +post_upgrade() { +/bin/cat << EOF +===> To recompile the modules do /usr/bin/vboxbuild +EOF +} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install new file mode 100644 index 000000000..b2d2e8858 --- /dev/null +++ b/community-testing/virtualbox/virtualbox.install @@ -0,0 +1,34 @@ +utils() { + if [ -x usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime > /dev/null 2>&1 + fi + + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 + fi + + if [ -x usr/bin/update-desktop-database ]; then + usr/bin/update-desktop-database -q + fi +} + +post_install() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + utils +} + +post_upgrade() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + utils + if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then +/bin/cat << EOF +===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules. +===> Use virtualbox-source package if you don't use our stock linux package. +EOF + fi +} + +post_remove() { + groupdel vboxusers >/dev/null 2>&1 || true + utils +} diff --git a/community-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD new file mode 100644 index 000000000..7f17b62cd --- /dev/null +++ b/community-testing/vtk/PKGBUILD @@ -0,0 +1,101 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> +# Contributor: leepesjee <lpeschier at xs4all dot nl> +# Contributor: Olivier Medoc +# Contributor: ignotus +# Contributor: Fabian Moser +# Contributor: djscholl + +pkgname=vtk +pkgver=5.8.0 +pkgrel=3 +pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' +arch=('i686' 'x86_64') +url='http://www.vtk.org' +license=('BSD') +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' + 'graphviz: drawing tools') +source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" + "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" + 'fixkernelversioncheck.diff') +md5sums=('37b7297d02d647cc6ca95b38174cb41f' + 'a05295b81930e894fc0e31866f399151' + '9e137af23701f76fc727222ebac23389') + +build() { + cd VTK + + # fix compilation error: http://vtk.org/Bug/view.php?id=12568 + # remove next pkgver bump + patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + + cd ${srcdir} + + rm -rf build + mkdir build + cd build + + cmake \ + -Wno-dev \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ + -DBUILD_DOCUMENTATION:BOOL=ON \ + -DDOCUMENTATION_HTML_HELP:BOOL=ON \ + -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=ON \ + -DVTK_USE_HYBRID:BOOL=ON \ + -DVTK_USE_PARALLEL:BOOL=ON \ + -DVTK_USE_PATENTED:BOOL=ON \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ + -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ + -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ + -DVTK_USE_BOOST:BOOL=ON \ + -DVTK_USE_INFOVIS:BOOL=ON \ + -DVTK_USE_GL2PS:BOOL=ON \ + -DVTK_USE_MYSQL:BOOL=ON \ + -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ + -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \ + -DVTK_WRAP_JAVA:BOOL=ON \ + -DVTK_WRAP_PYTHON:BOOL=ON \ + -DVTK_WRAP_TCL:BOOL=ON \ + -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ + -DVTK_USE_QT:BOOL=ON \ + -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ + -DVTK_USE_GUISUPPORT:BOOL=ON \ + -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + ${srcdir}/VTK + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install + + # Move the vtk.jar to the arch-specific location + install -dv ${pkgdir}/usr/share/java/vtk + mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \ + ${pkgdir}/usr/share/java/vtk + + # Install license + install -dv ${pkgdir}/usr/share/licenses/vtk + install -m644 ${srcdir}/VTK/Copyright.txt \ + ${pkgdir}/usr/share/licenses/vtk + + # Put an entry in /etc/ld.so.conf.d + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf +} diff --git a/community-testing/vtk/fixkernelversioncheck.diff b/community-testing/vtk/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community-testing/vtk/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community-testing/wkhtmltopdf/PKGBUILD b/community-testing/wkhtmltopdf/PKGBUILD new file mode 100644 index 000000000..040e13dd1 --- /dev/null +++ b/community-testing/wkhtmltopdf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 57259 2011-10-24 20:34:47Z andrea $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> + +pkgname=wkhtmltopdf +pkgver=0.9.9 +pkgrel=2 +pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt" +arch=('i686' 'x86_64') +url="http://code.google.com/p/wkhtmltopdf/" +license=('GPL3') +depends=('qt' 'qtwebkit') +optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate') +source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + qmake wkhtmltopdf.pro + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir/usr" install + + # Generate and install man page + install -d "$pkgdir/usr/share/man/man1" + ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1" +} diff --git a/community/alleyoop/PKGBUILD b/community/alleyoop/PKGBUILD new file mode 100644 index 000000000..bac994fe6 --- /dev/null +++ b/community/alleyoop/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57362 2011-10-26 12:52:41Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> +# Contributor: Lex Rivera aka x-demon <aur@x-demon.org> +pkgname=alleyoop +pkgver=0.9.7 +pkgrel=2 +pkgdesc="A Valgrind front-end for the GNOME environment" +arch=('x86_64' 'i686') +url="http://alleyoop.sourceforge.net/" +license=('GPL') +depends=('valgrind' 'libgnomeui') +makedepends=('intltool') +install=alleyoop.install +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('b45ab041dea15cd0ae663183bef893c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -m755 -d ${pkgdir}/usr/share/gconf/schemas + gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas \ + --domain alleyoop ${pkgdir}/etc/gconf/schemas/*.schemas + rm -rf ${pkgdir}/etc +} + +# vim:set ts=2 sw=2 et: diff --git a/community/alleyoop/alleyoop.install b/community/alleyoop/alleyoop.install new file mode 100644 index 000000000..4f8183a70 --- /dev/null +++ b/community/alleyoop/alleyoop.install @@ -0,0 +1,17 @@ +pkgname=alleyoop + +post_install() { +usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { +pre_remove $1 +} + +post_upgrade() { +post_install $1 +} + +pre_remove() { +usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index 17aaa438b..03cb2247e 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $ +# $Id: PKGBUILD 57278 2011-10-25 09:57:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.15 -_dnrel=86 +pkgver=5.0.16 +_dnrel=87 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64 'mips64el') @@ -14,14 +14,14 @@ license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc') +md5sums=('30549bc6a95f5814b2efe433edeb6f85') build() { cd $srcdir/aqbanking-$pkgver export PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr \ - --with-backends="aqhbci aqofxconnect" \ - --enable-gwenhywfar + --with-backends="aqhbci aqofxconnect" \ + --enable-gwenhywfar make make DESTDIR=$pkgdir install } diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD index 66979829b..35b2fd534 100644 --- a/community/aspell-pl/PKGBUILD +++ b/community/aspell-pl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43278 2011-03-24 13:25:37Z andrea $ +# $Id: PKGBUILD 57128 2011-10-22 10:35:07Z bpiotrowski $ # Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Arkadiusz Laczynski <alaczynski@gmail.com> pkgname=aspell-pl -pkgver=20110324 +pkgver=20111022 pkgrel=1 pkgdesc="Polish dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,17 @@ url="http://www.sjp.pl/slownik/en/" license=('GPL' 'LGPL' 'MPL') depends=('aspell') source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) -md5sums=('5f4e91bcbcf525945679064127e263c8') +md5sums=('7f14136d18152bde46bfef34e5088349') build() { cd "$srcdir/aspell6-pl-6.0_$pkgver-0" ./configure make +} + +package() { + cd "$srcdir/aspell6-pl-6.0_$pkgver-0" + make DESTDIR="$pkgdir" install } diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD new file mode 100644 index 000000000..d5ee232b4 --- /dev/null +++ b/community/audit/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 57389 2011-10-26 20:55:52Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Connor Behan <connor.behan@gmail.com> +# Contributor: henning mueller <henning@orgizm.net> + +pkgname=audit +pkgver=2.1.3 +pkgrel=1 +pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' +url=http://people.redhat.com/sgrubb/$pkgname +arch=(i686 x86_64) +depends=(linux-headers python2 libldap) +makedepends=(libldap swig) +license=(GPL) +options=(!libtool emptydirs) +backup=( + etc/libaudit.conf + etc/audit/audit.rules + etc/audit/auditd.conf + etc/audisp/audispd.conf + etc/audisp/audisp-remote.conf + etc/audisp/zos-remote.conf + etc/audisp/plugins.d/af_unix.conf + etc/audisp/plugins.d/audispd-zos-remote.conf + etc/audisp/plugins.d/au-remote.conf + etc/audisp/plugins.d/syslog.conf +) +source=( + $url/$pkgname-$pkgver.tar.gz + auditd.rc + python2.patch +) +md5sums=( + abf26e3ac09f666905c5636dd24611fa + bd5574064e0c88748aebf0cd92ebcf0c + 45a33c6bef84f8e1701cb0b5e187336b +) + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/python2.patch" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/audit \ + --with-apparmor + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd + install -d var/log/audit + rm -rf etc/rc.d/init.d etc/sysconfig + mv usr/sbin sbin +} diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc new file mode 100755 index 000000000..ea2e305ba --- /dev/null +++ b/community/audit/auditd.rc @@ -0,0 +1,55 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID auditd` + +case "$1" in + start) + stat_busy "Starting auditd" + [ -z "$PID" ] && { + /sbin/auditctl -R /etc/audit/audit.rules >/dev/null + /sbin/auditd + } + if [ $? -ne 0 ]; then + stat_fail + else + add_daemon auditd + stat_done + fi + ;; + + stop) + stat_busy "Stopping auditd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon auditd + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + reload) + stat_busy "Reloading auditd" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon auditd + stat_done + fi + ;; + + *) + echo "usage: $0 {start|stop|restart|reload}" +esac + +exit 0 diff --git a/community/audit/python2.patch b/community/audit/python2.patch new file mode 100644 index 000000000..b5f6cbc25 --- /dev/null +++ b/community/audit/python2.patch @@ -0,0 +1,11 @@ +--- configure.old 2010-10-22 15:54:13.193333452 +0200 ++++ configure 2010-10-22 15:54:52.546667020 +0200 +@@ -10662,7 +10662,7 @@ + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ++ for ac_prog in python2 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1ec370976..212ad291b 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56939 2011-10-17 08:20:07Z ibiru $ +# $Id: PKGBUILD 57135 2011-10-22 11:01:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.22 -pkgrel=2 +pkgver=0.8.23 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch') -md5sums=('b4e968cda582f362124a52ad588f8af0' +md5sums=('a8841578d16786af3c797fa2422905e9' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index d8395bf76..843ccca9b 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 46907 2011-05-13 17:37:41Z giovanni $ +# $Id: PKGBUILD 57177 2011-10-23 13:23:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') url="http://pcsclite.alioth.debian.org/ccid.html" license=('LGPL' 'GPL') depends=('pcsclite') -makedepends=('pkgconfig') +makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3579/${pkgname}-${pkgver}.tar.bz2") -md5sums=('79ef91103bcdd99a3b31cb5c5721a829') +source=("https://alioth.debian.org/frs/download.php/3672/${pkgname}-${pkgver}.tar.bz2") +md5sums=('cb9a77194ac335c39b262ea83a5b7d2e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index 7643573c6..f84a0aa74 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 55940 2011-09-26 09:58:23Z lfleischer $ +# $Id: PKGBUILD 57078 2011-10-20 17:07:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' license=('GPL3') -depends=('boost-libs' 'quvi') +depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('714ecd9952f79ac9d2c954e5e84fb843') +md5sums=('8265be865a22fb477bcc050f0dc310dc') build() { cd "$pkgname-$pkgver" diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD index d8e765b25..95df39a45 100644 --- a/community/ccmalloc/PKGBUILD +++ b/community/ccmalloc/PKGBUILD @@ -1,22 +1,28 @@ # $Id: PKGBUILD 2304 2008-05-31 05:00:40Z paul $ -# Maintainer: aurelien <aurelien@archlinux.org> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: aurelien <aurelien@archlinux.org> + pkgname=ccmalloc pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Track down memory related problems with C and C++ programs" arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/sid/ccmalloc" license=('GPL2') -depends=() +depends=('sh') source=(http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver.orig.tar.gz - http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver-9.diff.gz) + http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver-9.diff.gz) md5sums=('b90d955149569bbc6e801739f099db3d' '25c2654e6f3880bb58b82f46a7296dc6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/ccmalloc_$pkgver-9.diff + patch -p1 -i $srcdir/ccmalloc_$pkgver-9.diff ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir/usr install } diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD index f33a3f7bf..b8b4192d0 100644 --- a/community/cksfv/PKGBUILD +++ b/community/cksfv/PKGBUILD @@ -1,9 +1,10 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# $Id: PKGBUILD 57202 2011-10-23 23:26:43Z andrea $ +# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl> pkgname=cksfv pkgver=1.3.14 -pkgrel=1 +pkgrel=2 pkgdesc="SFV (Simple File Verification) Checker" arch=('i686' 'x86_64' 'mips64el') url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" @@ -13,9 +14,13 @@ source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz) md5sums=('2e15289753ea0b90b6ea86993f93b383') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --package-prefix=$startdir/pkg - make || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --package-prefix=$pkgdir + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make install - chmod 644 $startdir/pkg/usr/share/man/man1/$pkgname.1 + chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 } diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD index 2822328d8..ae887294d 100644 --- a/community/clamz/PKGBUILD +++ b/community/clamz/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53892 2011-08-09 12:18:03Z lfleischer $ +# $Id: PKGBUILD 57215 2011-10-24 18:32:20Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=clamz -pkgver=0.4 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store." arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/clamz/' @@ -12,7 +12,7 @@ license=('GPL3') depends=('libgcrypt' 'curl' 'expat' 'shared-mime-info' 'desktop-file-utils') install='clamz.install' source=("http://clamz.googlecode.com/files/clamz-${pkgver}.tar.gz") -md5sums=('ab7661340ee27d206f36064cfbd5bfa4') +md5sums=('84543c9346b285bdc218879e241941a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/clamz/unencrypted-amz.patch b/community/clamz/unencrypted-amz.patch new file mode 100644 index 000000000..49b03ba8a --- /dev/null +++ b/community/clamz/unencrypted-amz.patch @@ -0,0 +1,27 @@ +--- playlist.c 2010-04-19 16:01:59.000000000 -0700 ++++ clamz-0.4/playlist.c 2011-10-18 20:35:39.850146353 -0700 +@@ -499,12 +499,21 @@ + { + struct parseinfo pi; + unsigned char *decrypted, *xml; +- unsigned long decrypted_len; ++ unsigned long decrypted_len, i; + int xerr; + + decrypted = decrypt_amz_file(b64data, b64len, fname); +- if (!decrypted) +- return 1; ++ if (!decrypted){ ++ // XXX Perhaps the code file is unencrypted already. ++ decrypted = malloc((b64len + 1) * sizeof(char)); ++ if (!decrypted) { ++ print_error("Out of memory"); ++ return 1; ++ } ++ for (i = 0; i < b64len; i++) { ++ decrypted[i] = b64data[i]; ++ } ++ } + decrypted_len = strlen((char*) decrypted); + + pi.parser = XML_ParserCreate(NULL); diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD new file mode 100644 index 000000000..3715eb04c --- /dev/null +++ b/community/converseen/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 57374 2011-10-26 14:37:55Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: archtux <antonio.arias99999 at gmail.com> + +pkgname=converseen +pkgver=0.4.6 +pkgrel=3 +pkgdesc="The batch image converter and resizer" +arch=('i686' 'x86_64') +url="http://converseen.sourceforge.net/" +license=('GPL3') +depends=('imagemagick' 'qt') +makedepends=('cmake') +install=converseen.install +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('07c876b52e1982b8b2493c3aea3c3071') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/build" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/converseen/converseen.install b/community/converseen/converseen.install new file mode 100644 index 000000000..9af7fa81f --- /dev/null +++ b/community/converseen/converseen.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index be3c974d1..5042e9358 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48640 2011-06-03 16:55:04Z stephane $ +# $Id: PKGBUILD 57280 2011-10-25 09:58:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff -pkgver=1.9 -pkgrel=2 +pkgver=2.0 +pkgrel=1 pkgdesc="a front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=(http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz) -md5sums=('f483d8d8dab7a972ef21d5096e07fd47') +md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD new file mode 100644 index 000000000..128defb93 --- /dev/null +++ b/community/e4rat/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 57392 2011-10-26 21:18:24Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: graysky <graysky AT archlinux DOT us> + +pkgname=e4rat +pkgver=0.2.1 +pkgrel=3 +pkgdesc="Toolset to accelerate the boot process and application startups. Root partition must be ext4 ONLY!" +arch=('i686' 'x86_64') +url="http://e4rat.sourceforge.net/" +license=('GPL') +depends=('e2fsprogs' 'util-linux') +makedepends=('audit' 'boost' 'cmake' 'e2fsprogs' 'perl' 'util-linux') +options=(!strip) +install=("$pkgname.install") +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_"$pkgver"_src.tar.gz) + +build() { + unset LDFLAGS + cd "$srcdir/$pkgname-$pkgver" + cmake -DCMAKE_BUILD_TYPE=Release . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -dm755 "$pkgdir"/var/lib/$pkgname +} + +md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') +sha256sums=('c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769') diff --git a/community/e4rat/e4rat.install b/community/e4rat/e4rat.install new file mode 100644 index 000000000..4990280e3 --- /dev/null +++ b/community/e4rat/e4rat.install @@ -0,0 +1,20 @@ +post_install() { + echo '--------------------------------------------------------------------------' + echo ' SETUP INSTRUCTIONS' + echo + echo ' https://wiki.archlinux.org/index.php/E4rat' + echo '--------------------------------------------------------------------------' + echo + echo '--------------------------------------------------------------------------' + echo ' SUMMARY' + echo 'add to grub kernel line:' + echo ' init=/sbin/e4rat-collect' + echo + echo 'log data for 2 min, then' + echo ' sudo init 1' + echo ' e4rat-realloc /var/lib/e4rat/startup.log' + echo + echo 'substitute init=/sbin/e4rat-collect with' + echo ' init=/sbin/e4rat-preload' + echo '--------------------------------------------------------------------------' +} diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD new file mode 100644 index 000000000..611b45f8b --- /dev/null +++ b/community/efax-gtk/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 57276 2011-10-25 09:32:03Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=efax-gtk +pkgver=3.2.8 +pkgrel=1 +pkgdesc="A GUI front end for the 'efax' fax program" +arch=('i686' 'x86_64') +url="http://efax-gtk.sourceforge.net/" +license=('GPL') +depends=('dbus-glib' 'gtk3' 'ghostscript') +makedepends=('pkg-config') +optdepends=('heirloom-mailx: to use the mail_fax script') +backup=('etc/efax-gtkrc') +install=efax-gtk.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") +md5sums=('275ad1706e5c38e2b153dddd8a16724f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-spooldir=/usr/bin + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -m 755 mail_fax print_fax "${pkgdir}/usr/bin" +} diff --git a/community/efax-gtk/efax-gtk.install b/community/efax-gtk/efax-gtk.install new file mode 100644 index 000000000..69e30acd6 --- /dev/null +++ b/community/efax-gtk/efax-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index a65ae4bb0..a29008e29 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -1,27 +1,36 @@ -# Maintainer: Loui Chang <louipc dot ist at gmail company> -# Contributor : Jeff Mickey <j@codemac.net> -# Contributor : Aaron Griffin <aaron@archlinux.org> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Loui Chang <louipc dot ist at gmail company> +# Contributor: Jeff Mickey <j@codemac.net> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=esmtp pkgver=1.2 -pkgrel=3 -pkgdesc="An easy smtp forwarder" +pkgrel=4 +pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64' 'mips64el') -url="http://esmtp.sourceforge.net" +url='http://esmtp.sourceforge.net' license=('GPL') depends=('libesmtp' 'openssl') -optdepends=('liblockfile: for esmtp-wrapper script') +optdepends=('liblockfile: for esmtp-wrapper script' + 'procmail: for local mail delivery') provides=('smtp-forwarder') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('79a9c1f9023d53f35bb82bf446150a72') -build(){ - cd ${srcdir}/${pkgname}-${pkgver} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m644 README ${pkgdir}/usr/share/esmtp/README - install -m755 esmtp-wrapper ${pkgdir}/usr/share/esmtp/esmtp-wrapper - install -m755 ylwrap ${pkgdir}/usr/share/esmtp/ylwrap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm0644 README "${pkgdir}/usr/share/doc/esmtp/README" + install -Dm0644 sample.esmtprc "${pkgdir}/usr/share/doc/esmtp/sample.esmtprc" + install -Dm0755 esmtp-wrapper "${pkgdir}/usr/share/esmtp/esmtp-wrapper" + install -Dm0755 ylwrap "${pkgdir}/usr/share/esmtp/ylwrap" } diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 6e4643454..3c93e3764 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 44294 2011-04-05 06:50:48Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 57322 2011-10-25 20:25:24Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> -pkgname=('gcompris' 'gcompris-data') -pkgver=9.6.1 +pkgname=gcompris +pkgver=11.09 pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64' 'mips64el') url="http://gcompris.net/" license=('GPL3') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess' - 'pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' - 'gstreamer0.10-base-plugins') +depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' + 'gstreamer0.10-base-plugins') +optdepends=('gnucap: for computer simulation within the electricity activity' + 'tuxpaint: for the painting activity' + 'gnuchess: for the chess activity') +makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('2fb1dbb331166dd19d0a758220e4caf0') +sha1sums=('aaa3b9abc2626593f7db6ddbab7e66849419e025') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,28 +26,11 @@ build() { make } -package_gcompris() { - depends=('gcompris-data' 'pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' - 'gstreamer0.10-base-plugins') - optdepends=('gnucap: for computer simulation within the electricity activity' - 'tuxpaint: for the painting activity' - 'gnuchess: for the chess activity') +package() { + depends+=('gcompris-data') cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install-exec } -package_gcompris-data() { - pkgdesc="Data files for GCompris" - #arch=('any') - install=gcompris-data.install - - cd "$srcdir/gcompris-$pkgver" - make DESTDIR="$pkgdir" install-data - - # Place GCompris menu entry under Education - sed -i 's|^Categories=.*|Categories=Education;|' \ - "$pkgdir/usr/share/applications/gcompris.desktop" -} - # vim:set ts=2 sw=2 et: diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 8bf014c10..094c45c08 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,24 +1,39 @@ -# $Id: PKGBUILD 37244 2011-01-12 15:09:23Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 57206 2011-10-24 12:59:03Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: djgera # Contributor: Patrick Melo <patrick@patrickmelo.eti.br> pkgname=geany-plugins -pkgver=0.20 +pkgver=0.21 pkgrel=1 -pkgdesc="The combined plugins release for Geany" +pkgdesc="Combined plugins release for Geany" arch=('i686' 'x86_64' 'mips64el') -url="http://plugins.geany.org" +url="http://plugins.geany.org/" license=('GPL') -depends=('geany' 'lua' 'gtkspell' 'enchant' 'intltool') -source=(http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2) -md5sums=('94bc4901217641a07f840d92179643b0') +depends=('geany' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme') +makedepends=('intltool') +optdepends=('hspell: hebrew spell checker') +conflicts=('geany-plugins-svn') +install=geany-plugins.install +source=("http://plugins.geany.org/geany-plugins/${pkgname}-${pkgver}.tar.bz2") +md5sums=('22e106d7a026e720dd91feb79e44456f') build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib # Thx djgera + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --libexecdir=/usr/lib make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + rmdir \ + "${pkgdir}/usr/share/geany-plugins/devhelp" \ + "${pkgdir}/usr/share/doc/geany-plugins/devhelp" \ + "${pkgdir}/usr/share/geany-plugins/debugger" \ + "${pkgdir}/usr/share/doc/geany-plugins/debugger" } + +# vim:set ts=2 sw=2 et: diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install new file mode 100644 index 000000000..f26807673 --- /dev/null +++ b/community/geany-plugins/geany-plugins.install @@ -0,0 +1,13 @@ +post_upgrade() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 4c40ff518..507bd09b0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56108 2011-10-01 18:56:09Z ibiru $ +# $Id: PKGBUILD 57063 2011-10-20 05:50:26Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('c8d617a107478dba6ef0ab16e87707c5526e97eefab24a65891dbf9aa32e7839') +sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD index 19f2d0e0f..c74572d99 100644 --- a/community/giggle/PKGBUILD +++ b/community/giggle/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 44519 2011-04-08 03:41:57Z tdziedzic $ +# $Id: PKGBUILD 57210 2011-10-24 13:47:08Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: neodreams <yanbrodeur@gmail.com> pkgname=giggle -pkgver=0.5 -pkgrel=5 -pkgdesc="Graphical frontend for the git directory tracker (think of gitk on GTK+)." +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Git repository viewer" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/giggle" license=('GPL') -depends=('git' 'gtksourceview2') -makedepends=('intltool' 'vte' 'evolution-data-server>=2.30.2.1') -optdepends=('vte: for terminal plugin support' - 'evolution-data-server: details autocompletion') -source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.5/${pkgname}-${pkgver}.tar.bz2) +depends=('git' 'gtksourceview3' 'vte3') +makedepends=('intltool' 'itstool') +source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz) options=(!libtool) install=giggle.install -sha256sums=('2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259') +sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr - make } diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 19c3e0fcd..53f0c8ac6 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 57270 2011-10-25 06:09:22Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Blaž TomžiÄ <blaz.tomazic@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,20 +7,22 @@ # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=gitg -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64' 'mips64el') url='http://trac.novowork.com/gitg/' license=('GPL') -depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') +depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ + 'hicolor-icon-theme') makedepends=('intltool') +options=('!libtool') install="${pkgname}.install" -source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('96705b0edf6525a131a34d015544da67add9ed992babbd45fc768cdd032b65d0') +source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.xz") +sha256sums=('d3dfff65834d8371d43b2e91926af1421f8ec2128580dfeceb6925b6b1ce6d8c') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr @@ -27,7 +30,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/gitg/gitg.install b/community/gitg/gitg.install index 787d6085e..7b356a632 100644 --- a/community/gitg/gitg.install +++ b/community/gitg/gitg.install @@ -5,6 +5,7 @@ post_install() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { @@ -14,4 +15,5 @@ post_upgrade() { post_remove() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 83075f22c..0c7a1dfd0 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57035 2011-10-18 22:47:54Z heftig $ +# $Id: PKGBUILD 57387 2011-10-26 20:25:11Z heftig $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.19.14 +pkgver=1.19.15 pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('18dbbf572045380c07fb6cb2bdbca1893bbd322fb1283e1f0d0d2b295b4a28c8') +sha256sums=('882519d634861567746d1f923d8437e24d01d917610dad2d9ae08a2cc1ec52d3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 12c7e56bc..5b3439648 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56182 2011-10-03 06:12:55Z jconder $ +# $Id: PKGBUILD 57170 2011-10-23 01:44:24Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.packagekit.org/' @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" 'arch.patch') -sha256sums=('a91efca58ac0781f925927772281e72abf16314ef3b9577bf42f8ab3f5b5c0e9' +sha256sums=('7a6383a2a91fd29c0b6fd9b8900d498efd2e38b89149470433748d989926c341' '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') build() { diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index 600afe34b..07f1d6f7b 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55914 2011-09-24 20:06:05Z ibiru $ +# $Id: PKGBUILD 57195 2011-10-23 18:34:02Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f009852b264fb8754575524ef2937147c4d2c25eff97ecca507624ca8730c213') +sha256sums=('d20ad13814e016679e74aa51e2619000bd4468c13d219c760daa633e398bea43') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 901d1a25b..327d7ad40 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 50208 2011-06-26 20:13:31Z spupykin $ +# $Id: PKGBUILD 57325 2011-10-25 20:41:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools -pkgver=0.12.0 -pkgrel=3 +pkgver=0.12.1 +pkgrel=1 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') @@ -11,8 +11,9 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('ghc' 'alex' 'happy') depends=('gmp') options=('strip') +provides=('haskell-gtk2hs-buildtools') source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('cbcdfd6031725d8b70ff7804f8d93648') +md5sums=('225cbf3736b5ac3053f8c797687c7554') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index 385738db0..48791d7ab 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,37 +1,39 @@ +# $Id: PKGBUILD 57344 2011-10-26 07:36:21Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.26 +pkgver=3.3.27 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64' 'mips64el') url='http://gtkwave.sourceforge.net' license=('GPL' 'MIT') -depends=('gtk2') +depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('8b25a82cfece9611b38d6abd22125192') +md5sums=('0ab7f1a239c73ed7773ef0a33db6a683') build() { - cd gtkwave-${pkgver} + cd "${srcdir}/gtkwave-${pkgver}" ./configure \ --prefix=/usr \ - --mandir=/usr/share/man \ --disable-tcl make CFLAGS=-D_LARGEFILE64_SOURCE } package() { - cd gtkwave-${pkgver} + cd "${srcdir}/gtkwave-${pkgver}" - make -j1 prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/gtkwave-${pkgver}/.gtkwaverc \ - ${pkgdir}/usr/share/gtkwave/sample.gtkwaverc - install -D -m644 ${srcdir}/gtkwave-${pkgver}/MIT.TXT \ - ${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT + install -D -m644 "${srcdir}/gtkwave-${pkgver}/.gtkwaverc" \ + "${pkgdir}/usr/share/gtkwave/sample.gtkwaverc" + install -D -m644 "${srcdir}/gtkwave-${pkgver}/LICENSE.TXT" \ + "${pkgdir}/usr/share/licenses/gtkwave/LICENSE.TXT" + install -D -m644 "${srcdir}/gtkwave-${pkgver}/MIT.TXT" \ + "${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT" } diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD index 5b3fe7e96..fe5467a56 100644 --- a/community/guichan/PKGBUILD +++ b/community/guichan/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 4400 2009-10-22 15:03:46Z ibiru $ +# $Id: PKGBUILD 57204 2011-10-23 23:29:35Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl> +# Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl> + pkgname=guichan pkgver=0.8.2 -pkgrel=1 -pkgdesc="Guichan is a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL." +pkgrel=2 +pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL." arch=('i686' 'x86_64' 'mips64el') url="http://guichan.sourceforge.net/" license=('BSD') @@ -18,9 +19,13 @@ md5sums=('af535d7f387e774e3197cef8023ea105') build() { cd $srcdir/$pkgname-$pkgver CXXFLAGS="-g" ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install # Install the license, as required for BSD - install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index ebc3df2bc..db3dee6f6 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54696 2011-08-23 10:04:10Z spupykin $ +# $Id: PKGBUILD 57282 2011-10-25 09:59:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar -pkgver=4.2.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64 'mips64el') @@ -13,13 +13,14 @@ license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=63&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('b1673f601af5f07d591f6716d822275b') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('6c3647c5a9065d0126b0e2b77752527b') build() { pacman -Q gwenhywfar && return 1 cd $srcdir/gwenhywfar-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl + sed -i 's|gnutls_transport_set_lowat||g' src/sio/syncio_tls.c make make DESTDIR=$pkgdir install } diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD new file mode 100644 index 000000000..66280463d --- /dev/null +++ b/community/haskell-cairo/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 57332 2011-10-25 21:57:45Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-cairo +pkgver=0.12.1 +pkgrel=2 +pkgdesc="Binding to the cairo library for Gtk2Hs." +url="http://hackage.haskell.org/package/cairo" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'cairo' 'haskell-mtl') +makedepends=("gtk2hs-buildtools=$pkgver") +options=('strip') +conflicts=('gtk2hs-cairo') +provides=('gtk2hs-cairo') +replaces=('gtk2hs-cairo') +install=gtk2hs-cairo.install +source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) +md5sums=('b63d31dabb6af6f63c25a93d3ebffcbb') + +build() { + cd ${srcdir}/cairo-$pkgver + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') + + cd ${srcdir}/cairo-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community/haskell-cairo/gtk2hs-cairo.install b/community/haskell-cairo/gtk2hs-cairo.install new file mode 100644 index 000000000..4ec5096b6 --- /dev/null +++ b/community/haskell-cairo/gtk2hs-cairo.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-cairo +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD new file mode 100644 index 000000000..82d9fca13 --- /dev/null +++ b/community/haskell-glib/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 57333 2011-10-25 21:58:40Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-glib +pkgver=0.12.1 +pkgrel=2 +pkgdesc="Binding to the GLIB library for Gtk2Hs." +url="http://hackage.haskell.org/package/glib" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'glib2') +makedepends=("haskell-gtk2hs-buildtools=$pkgver") +options=('strip') +install=gtk2hs-glib.install +provides=('gtk2hs-glib') +replaces=('gtk2hs-glib') +conflicts=('gtk2hs-glib') +source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) +md5sums=('1ec61fc88876c127949adea6ed528328') + +build() { + cd ${srcdir}/glib-$pkgver + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "glib2") + + cd ${srcdir}/glib-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community/haskell-glib/gtk2hs-glib.install b/community/haskell-glib/gtk2hs-glib.install new file mode 100644 index 000000000..24025f5d8 --- /dev/null +++ b/community/haskell-glib/gtk2hs-glib.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-glib +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD new file mode 100644 index 000000000..cae4ee57c --- /dev/null +++ b/community/haskell-gtk/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 57337 2011-10-25 22:08:54Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-gtk +pkgver=0.12.1 +pkgrel=2 +pkgdesc="Binding to the gtk library for Gtk2Hs." +url="http://hackage.haskell.org/package/gtk" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') +makedepends=("gtk2hs-buildtools=$pkgver") +provides=('gtk2hs-gtk') +replaces=('gtk2hs-gtk') +conflicts=('gtk2hs-gtk') +options=('strip') +install=gtk2hs-gtk.install +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) +md5sums=('57b9432ea8d4d7ef3b96f0c19f805ed8') + +build() { + cd ${srcdir}/gtk-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') + + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community/haskell-gtk/gtk2hs-gtk.install b/community/haskell-gtk/gtk2hs-gtk.install new file mode 100644 index 000000000..7ed674b78 --- /dev/null +++ b/community/haskell-gtk/gtk2hs-gtk.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-gtk +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD new file mode 100644 index 000000000..c6aef05ff --- /dev/null +++ b/community/haskell-pango/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 57335 2011-10-25 21:59:42Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-pango +pkgver=0.12.1 +pkgrel=2 +pkgdesc="Binding to the pango library for Gtk2Hs." +url="http://hackage.haskell.org/package/pango" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') +makedepends=("gtk2hs-buildtools=$pkgver") +provides=('gtk2hs-pango') +replaces=('gtk2hs-pango') +conflicts=('gtk2hs-pango') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) +install=gtk2hs-pango.install +md5sums=('a9127d5b1dd5935ecdb0a5cc2d406f48') + +build() { + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community/haskell-pango/gtk2hs-pango.install b/community/haskell-pango/gtk2hs-pango.install new file mode 100644 index 000000000..f2be2100f --- /dev/null +++ b/community/haskell-pango/gtk2hs-pango.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-pango +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index add437082..8c7b6060e 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=3.0_20110427 +pkgver=4.0_20111003 pkgrel=1 pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.' arch=('i686' 'x86_64' 'mips64el') url='http://www.threadingbuildingblocks.org/' license=('GPL') -source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz") -md5sums=('ba406f4767592179e7930e790036f00a') +source=("http://threadingbuildingblocks.org/uploads/77/177/4.0%20update%201/tbb40_20111003oss_src.tgz") +md5sums=('7b5d94eb35a563b29ef402e0fd8f15c9') build() { cd tbb${pkgver/\./}oss diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index a5924f311..8ae36bfbb 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 55999 2011-09-28 14:40:31Z mherych $ +# $Id: PKGBUILD 57067 2011-10-20 15:00:52Z bpiotrowski $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('6d3e9889f53cf10c2cd9499aabbff67a') +md5sums=('6211a9a9e02d645268cbf055892601a0') build() { cd $srcdir/kadu-$pkgver diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD index 7ae985734..be06d5eb3 100644 --- a/community/kdbg/PKGBUILD +++ b/community/kdbg/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 44133 2011-04-03 20:08:17Z spupykin $ +# $Id: PKGBUILD 57376 2011-10-26 15:29:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Jason Taylor <jftaylor21@gmail.com> # Contributor: Georg Grabler <ggrabler@chello.at> pkgname=kdbg -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="A gdb GUI for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdbg.org" license=('GPL') depends=('kdebase-runtime' 'gdb') -makedepends=('automoc4') +makedepends=('automoc4' 'cmake') options=('!libtool') source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz") -md5sums=('687f2892a5751d1e7d8708e37ec1a367') +md5sums=('a19095dce4cb5df0dbaa9368d400fc30') build() { cd $srcdir - mkdir build + mkdir -p build cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD new file mode 100644 index 000000000..b19320316 --- /dev/null +++ b/community/leptonica/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 57293 2011-10-25 10:37:42Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Christoph Drexler <chrdr at gmx dot at> + +pkgname=leptonica +pkgver=1.68 +pkgrel=1 +pkgdesc="Software that is broadly useful for image processing and image analysis applications" +arch=('i686' 'x86_64') +url="http://www.leptonica.com/" +license=('custom') +depends=('glibc') +optdepends=('giflib: for supporting gif files' + 'gnuplot: gnuplot support' + 'libjpeg: for supporting jpeg files' + 'libpng: for supporting png files' + 'libtiff: for supporting tiff files' + 'webp: for supporting webp files' + 'zlib: for supporting compressed files') +source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) +md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403') + +build() { + cd ${srcdir}/leptonica-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/leptonica-${pkgver} + make DESTDIR=${pkgdir} install + install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt +} diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD index fa9ae5ac0..7d20e122b 100644 --- a/community/libcuefile/PKGBUILD +++ b/community/libcuefile/PKGBUILD @@ -1,26 +1,33 @@ +# $Id: PKGBUILD 57124 2011-10-22 02:51:18Z ebelanger $ # Maintainer: Corrado Primier <bardo@aur.archlinux.org> + pkgname=libcuefile -pkgver=453 +pkgver=475 pkgrel=1 pkgdesc="A library to work with CUE files" arch=('i686' 'x86_64' 'mips64el') url="http://www.musepack.net/index.php?pg=src" -license=('LGPL') +license=('GPL2') depends=('glibc') makedepends=('cmake') source=(http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz) -md5sums=('59826363984c51546258fe4213beb272') +md5sums=('1a6ac52e1080fd54f0f59372345f1e4e') build() { mkdir "${srcdir}/${pkgname}_r${pkgver}/build" cd "${srcdir}/${pkgname}_r${pkgver}/build" cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${srcdir}/${pkgname}_r${pkgver}/build" make DESTDIR="${pkgdir}/" install mkdir -p "${pkgdir}/usr/include/cuetools" - install -Dm644 ${srcdir}/${pkgname}_r${pkgver}/include/cuetools/{cd,cdtext,cuefile}.h \ - ${pkgdir}/usr/include/cuetools + install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/cuetools/{cd,cdtext,cuefile}.h \ + "${pkgdir}/usr/include/cuetools" } # vim:set ts=2 sw=2 et: diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index e0e3ad970..d4c978a1f 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=0.1.16 -pkgrel=2 +pkgver=0.1.17 +pkgrel=1 pkgdesc="the core of next generation file manager PCManFM" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -14,11 +14,12 @@ options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('c09bce415ff6dc2dd835e28aeddeabe3') +md5sums=('a97e03d973e6ac727f28d0934d6c9ad5') build() { cd $srcdir/$pkgname-$pkgver - sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure + +# sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-udisks \ @@ -28,5 +29,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD index eabda7cc4..080555e83 100644 --- a/community/libgda4/PKGBUILD +++ b/community/libgda4/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 56183 2011-10-03 07:07:15Z jelle $ +# $Id: PKGBUILD 57409 2011-10-27 03:51:27Z ebelanger $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda4 -pkgver=4.2.9 +pkgver=4.2.10 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') -depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup' +depends=('gtksourceview2' 'libunique' 'libxslt' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('intltool' 'gobject-introspection' ) @@ -16,7 +16,7 @@ options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz) -sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814') +sha256sums=('cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431') build() { cd "${srcdir}/libgda-${pkgver}" @@ -31,6 +31,8 @@ build() { package() { cd "${srcdir}/libgda-${pkgver}" make DESTDIR="${pkgdir}" install - rm -rf $pkgdir/usr/share/icons - rm -rf $pkgdir/usr/share/gtk-doc + rm -rf "$pkgdir/usr/share/icons" + rm -rf "$pkgdir/usr/share/gtk-doc" + rm -rf "$pkgdir"/usr/bin/{gda-list-config,gda-list-server-op,gda-sql} + rm -rf "$pkgdir"/usr/share/man/man1/gda-sql.1 } diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install index c317fbaca..eb5d48353 100644 --- a/community/libgda4/libgda.install +++ b/community/libgda4/libgda.install @@ -1,6 +1,6 @@ post_install() { update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/libgda-4.0/icons/hicolor } post_upgrade() { diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD new file mode 100644 index 000000000..1f0d35065 --- /dev/null +++ b/community/libquvi/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 57076 2011-10-20 17:03:18Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=libquvi +pkgver=0.4.0 +pkgrel=2 +pkgdesc='Library for parsing video download links.' +arch=('i686' 'x86_64') +url='http://quvi.sourceforge.net/' +license=('LGPL') +depends=('libquvi-scripts' 'curl' 'lua') +conflicts=('quvi<0.4.0') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz") +md5sums=('85c47035105b6b523a28793d4f6da9f1') + +build() { + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index a1d5c6cc7..76316a371 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" url="http://kornelix.squarespace.com/$pkgname" @@ -11,22 +11,18 @@ license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') +md5sums=('517555734dac1d9298f4c36e91b9e122') build() { cd $srcdir/$pkgname-$pkgver sed -i 's+xdg-deskto+#xdg-deskto+' Makefile - make PREFIX=/usr \ - CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \ - LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" - sed -i 's#/local##' data/desktop - sed -i 's+# ++' data/desktop + make PREFIX=/usr } package() { cd $srcdir/$pkgname-$pkgver - install -Dm644 data/desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop - make DESTDIR=$pkgdir PREFIX=/usr install + install -Dm644 desktop $pkgdir/usr/share/applications/$pkgname.desktop + make DESTDIR=$pkgdir install rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop + rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man } diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 9b7e46910..0d163dab1 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56569 2011-10-08 17:55:12Z schuay $ +# $Id: PKGBUILD 57102 2011-10-21 09:33:23Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.5 +pkgver=4.8.0 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ef1582651115ca8aa52f8d11e99f7da3') -sha1sums=('be428f4c5f0cb180277eed7387e29e69c042aadc') +md5sums=('592478c3edfa2ad64c8cd165b9bec446') +sha1sums=('2584a681350e07d1e6703b9f7fd77cec45a6e061') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD index 787c2c340..5f7a83796 100644 --- a/community/medit/PKGBUILD +++ b/community/medit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56067 2011-09-30 09:08:26Z spupykin $ +# $Id: PKGBUILD 57284 2011-10-25 09:59:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=medit -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="A GTK text editor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ctags' 'vte: terminal emulator') makedepends=(pkgconfig perlxml intltool gcc-objc) install=medit.install source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2) -md5sums=('dc3a24e7f23deaa21f59d221fd321131') +md5sums=('ca790a6153eab7e2a47ac965940c0c7d') build() { cd $srcdir/medit-$pkgver diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 0a3b38e91..431c91632 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf') -md5sums=('52763985c13e06d85bc125c7d3eb03d9' +md5sums=('cb8579074b7c9752eb382a2094ac4523' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318') diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index 9777149b4..5356d74ba 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 4277 2009-10-19 20:28:23Z giovanni $ +# $Id: PKGBUILD 57065 2011-10-20 07:22:50Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml pkgver=2.6 -pkgrel=1 -pkgdesc="A small XML parsing library " +pkgrel=2 +pkgdesc="A small XML parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.minixml.org/" license=('LGPL') -depends=('glibc') -source=(http://ftp.easysw.com/pub/mxml/$pkgver/$pkgname-$pkgver.tar.gz) +source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('68977789ae64985dddbd1a1a1652642e') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DSTROOT=$pkgdir install - chmod -x $pkgdir/usr/lib/libmxml.a + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DSTROOT="$pkgdir" install + chmod -x "$pkgdir/usr/lib/libmxml.a" } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 81422f0a5..11e52b97e 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48169 2011-05-29 12:28:03Z jconder $ +# $Id: PKGBUILD 57172 2011-10-23 02:27:54Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.24.1 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' - 'wget') + 'qtwebkit' 'wget') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') @@ -24,17 +24,20 @@ install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf' - 'mythtv-v4l2-fix.patch') + 'mythtv-v4l2-fix.patch' + 'build.patch') md5sums=('6870c679619ec58456e76839745411d8' 'feadcc9ad064d93d6dceab1efc0bd9ed' 'bb8e4033d82428d827570fae9ba15e6a' - 'ba5c91df80f0d3f7563a873e71a3725c') + 'ba5c91df80f0d3f7563a873e71a3725c' + '3188962917e98c4e07818dccd64bc423') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch + patch -Np1 -i ${srcdir}/build.patch ARCH="${CARCH/_/-}" ./configure --prefix=/usr --cpu="$ARCH" \ diff --git a/community/mythtv/build.patch b/community/mythtv/build.patch new file mode 100644 index 000000000..35dccd618 --- /dev/null +++ b/community/mythtv/build.patch @@ -0,0 +1,13 @@ +diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp +--- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200 ++++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300 +@@ -2,6 +2,8 @@ + #include "mythrender_opengl.h" + #include "mythxdisplay.h" + ++#include <GL/glu.h> ++ + #define LOC QString("OpenGL: ") + #define LOC_ERR QString("OpenGL Error: ") + +Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD new file mode 100644 index 000000000..aa1c44307 --- /dev/null +++ b/community/nemiver/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 57366 2011-10-26 13:00:32Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: jordz <jordz@archlinux.us> +pkgname=nemiver +pkgver=0.9.0 +pkgrel=3 +pkgdesc="A C/C++ debugger for GNOME" +arch=('x86_64' 'i686') +license=('GPL') +url="http://www.gnome.org/projects/nemiver/" +depends=('gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gconf') +makedepends=('boost' 'intltool' 'gnome-doc-utils') +install=nemiver.install +source=("http://ftp.acc.umu.se/pub/GNOME/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.xz") +options=('!libtool' '!emptydirs') +md5sums=('03a2c34d4c04fd69749c01975a97c0c2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-boost --disable-scrollkeeper \ + --enable-symsvis=yes --enable-gio=yes \ + --enable-memoryview=yes + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ + --domain nemiver ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install new file mode 100644 index 000000000..a14d235b9 --- /dev/null +++ b/community/nemiver/nemiver.install @@ -0,0 +1,21 @@ +pkgname=nemiver + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 9826d2031..b58674215 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=17.0 +pkgver=17.2 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('af274dc9b7da5713a49c9976e6750b3c') +md5sums=('1c41ade70c164ebb9d9b291b24316984') build() { cd ${pkgname}-${pkgver} diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 7d2be84e7..1880c5743 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="File manager of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" license=('GPL') groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm=0.1.16' 'lxmenu-data') +depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('f31ed6defb600f7046a456220d8efa3a') +md5sums=('d34a3530a6c5dcd674d23021d71c3e95') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD index 7bd7ae5b5..37b59a9be 100644 --- a/community/php-geoip/PKGBUILD +++ b/community/php-geoip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36134 2010-12-27 13:40:37Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 57315 2011-10-25 17:20:28Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-geoip -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="GeoIP module for PHP" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/geoip" @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'geoip') backup=('etc/php/conf.d/geoip.ini') source=(http://pecl.php.net/get/geoip-$pkgver.tgz) -md5sums=('ca5397a1dacb62afd426c2065fc1e106') +sha1sums=('f8d17da3e192002332ab54b9b4ab0f5deeaf9f15') build() { cd "$srcdir/geoip-$pkgver" diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 655d032f0..bd8ef5f87 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53236 2011-08-02 00:40:12Z bisson $ +# $Id: PKGBUILD 57200 2011-10-23 22:18:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard -pkgver=0.15.1 +pkgver=0.16 pkgrel=1 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg') optdepends=('libdiscid: CD-Lookup feature') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('21b51e229c246e2d17b746649bfa370f') +sha1sums=('274071410550ee29051bb0137d72602921a015f9') install=install diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 046cfcd1e..7b331d3c7 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 56752 2011-10-11 20:37:22Z lcarlier $ +# $Id: PKGBUILD 57378 2011-10-26 15:40:42Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus -pkgver=0.7.4 -pkgrel=2 +pkgver=0.7.5 +pkgrel=1 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" license=('GPL') depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.47') makedepends=('scons' 'boost>=1.47' 'mesa') -source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('82742bc9906cad98338cfd3ea700b396' +source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +md5sums=('68e0bd1327e0eedcaab64d64528540ba' '9eec34047bdcff49e08f41e81764e20c') -sha1sums=('e61e5ffefcecebed83286c25b3626f70ed75d2a5' +sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' '579a1144f161ce89e6e024cea37210149b89c0c0') build() { @@ -25,9 +25,6 @@ build() { package() { cd ${pkgname}-${pkgver} - # fix launcher - sed -i 's/echo/echo -e/g' ./Makefile - make install DESTDIR="${pkgdir}" PREFIX="/usr" install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 2b7fbe2f4..379774e3e 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51024 2011-07-04 13:40:25Z stephane $ +# $Id: PKGBUILD 57370 2011-10-26 14:27:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://postgis.refractions.net/" @@ -13,7 +13,7 @@ license=('GPL') depends=('postgresql' 'proj' 'geos') changelog=$pkgname.changelog source=(http://postgis.refractions.net/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('05a61df5e1b78bf51c9ce98bea5526fc') +sha256sums=('a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 86c0b336b..16f9b925d 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#26159 fix in postgis-1.5.3-2 + 2010-10-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 1.5.2 diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 6a2717093..ab91b797e 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9179 +pkgver=9306 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('MIT') makedepends=('pkgconfig') depends=('gtk2') source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") -md5sums=('f724413049ff2a3cc00799793190b1d0') +md5sums=('30eac18bcfe1e202003709a8281a81bc') build() { cd ${srcdir}/${pkgname}-r${pkgver} diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index 652cfe8c1..7f86ce232 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40381 2011-02-23 18:15:16Z stephane $ -# Maintainer: Andrea Scarpino <bash.lnx@gmail.com> +# $Id: PKGBUILD 57093 2011-10-21 05:48:48Z kchen $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python-openbabel -pkgver=2.3.0 -pkgrel=3 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Python bindings of openbabel library" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Python" @@ -13,7 +13,7 @@ depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen') makedepends=('swig' 'cmake') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('effda01ed4a31d18d8e3d08191799608') +md5sums=('1f029b0add12a3b55582dc2c832b04f8') build() { cd "${srcdir}/openbabel-$pkgver" @@ -23,12 +23,13 @@ build() { # Regenerate interface with the patched swig 2.0.2 cd scripts - swig -I../include/ -python -c++ openbabel-python.i + swig -I../include/ -python -py3 -c++ openbabel-python.i mv openbabel-python_wrap.cxx python/openbabel-python.cpp mv openbabel.py python/ cd python sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py } package() { diff --git a/community/python2-openbabel/PKGBUILD b/community/python2-openbabel/PKGBUILD index 94d84accc..6ca534313 100644 --- a/community/python2-openbabel/PKGBUILD +++ b/community/python2-openbabel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32948 2010-11-20 08:38:00Z kchen $ -# Maintainer: -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> +# $Id: PKGBUILD 57091 2011-10-21 05:24:19Z kchen $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python2-openbabel -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Python 2 bindings of openbabel library" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Python" @@ -14,10 +14,11 @@ depends=('python2' 'gcc-libs' "openbabel=${pkgver}" 'eigen') makedepends=('swig') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('effda01ed4a31d18d8e3d08191799608') +md5sums=('1f029b0add12a3b55582dc2c832b04f8') -build() { +package() { cd ${srcdir}/openbabel-$pkgver/scripts/python sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py python2 setup.py install --prefix=/usr --root=${pkgdir} } diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 444494714..aa37fdf10 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.9.0 +pkgver=2.9.1 pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('python2: needed for search' 'geoip: improves peer country resolution') install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") -md5sums=('a13e199ebbc3411688683e587814d6aa') +md5sums=('093bb1f7779378a339c20aa3e4ea6d36') build() { cd qbittorrent-${pkgver} diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD index c1726cd86..7822b704a 100644 --- a/community/qmpdclient/PKGBUILD +++ b/community/qmpdclient/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 40012 2011-02-19 13:47:31Z jlichtblau $ +# $Id: PKGBUILD 57154 2011-10-22 15:37:23Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=qmpdclient -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="A Qt4 client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://bitcheese.net/wiki/QMPDClient" license=('GPL') -depends=('qt' 'openssl' 'hicolor-icon-theme') +depends=('qt') makedepends=('cmake') install=$pkgname.install changelog=$pkgname.changelog source=(http://dump.bitcheese.net/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('9d57ffbf2985c1dbc9e8856e9c5edf5171e85152d8cf58ad692e85233a9b0773') +sha256sums=('ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289') build() { cd ${srcdir} - mkdir build cd build - - cmake ../${pkgname} -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/qmpdclient/qmpdclient.changelog b/community/qmpdclient/qmpdclient.changelog index 2dc991d38..1e43c6a15 100644 --- a/community/qmpdclient/qmpdclient.changelog +++ b/community/qmpdclient/qmpdclient.changelog @@ -1,3 +1,6 @@ +2011-10-22 Andrea Scarpino <andrea@archlinux.org> + * qmpdclient 1.2.2-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmpdclient 1.2.1-1 diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index bfe9d2175..84e1983f7 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,27 +1,26 @@ +# $Id: PKGBUILD 57268 2011-10-25 05:38:14Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=5.0 +pkgver=5.1 pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.qtfm.org" license=('GPL') depends=('qt') +install=qtfm.install source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -md5sums=('ad8e6d2d1533b2b1327cda557251a35d') +md5sums=('e7e079d2586b46ce80998c52b777cb88') build() { - cd "$startdir/src/$pkgname-$pkgver" - qmake - make + cd "$srcdir/$pkgname-$pkgver" + qmake + make } package() { - cd "$startdir/src/$pkgname-$pkgver" - install -Dm 755 ${startdir}/src/$pkgname-$pkgver/qtfm ${startdir}/pkg/usr/bin/qtfm - install -Dm 644 ${startdir}/src/$pkgname-$pkgver/qtfm.desktop ${startdir}/pkg/usr/share/applications/qtfm.desktop - install -Dm 644 ${startdir}/src/$pkgname-$pkgver/images/qtfm.png ${startdir}/pkg/usr/share/pixmaps/qtfm.png + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install } - diff --git a/community/qtfm/qtfm.install b/community/qtfm/qtfm.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/community/qtfm/qtfm.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 0b95cd2d6..26a78deb0 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $ +# $Id: PKGBUILD 57074 2011-10-20 16:44:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.19 +pkgver=0.4.0 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') url='http://quvi.sourceforge.net/' license=('LGPL') -depends=('curl' 'pcre' 'lua') +depends=('libquvi') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c96627374377b049ac60e7642eb7f838') +md5sums=('302652f7e3d97051d7250e3a7bc04250') build() { cd "${pkgname}-${pkgver}" diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 7a191b9eb..6db305207 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.30.02 +pkgver=5.30.03 pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('8a5a5451ddaae276abc9d2e263b29b88' +md5sums=('d2c39bf7640bdd26d4645c52c504cc24' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 040ac0f68..c4a2d5bae 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,28 +1,69 @@ -# $Id: PKGBUILD 53871 2011-08-09 01:21:52Z bfanella $ +# $Id: PKGBUILD 57406 2011-10-27 00:37:47Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> -pkgname=ruby-gtk2 -pkgver=1.0.0 +pkgbase=ruby-gtk2 +pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') +pkgver=1.0.3 pkgrel=1 -pkgdesc="Ruby bindings for gtk2." arch=('i686' 'x86_64' 'mips64el') url="http://ruby-gnome2.sourceforge.jp" license=('LGPL') -depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2') -makedepends=('ruby-pkgconfig' 'ruby-cairo') +makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') +md5sums=('fa1de7fc920de46fb8d8b9f67732c7a3') build() { cd "$srcdir/ruby-gtk2-$pkgver" - - export LANG="en_US.UTF-8" - ruby extconf.rb gtk2 --topdir=$pkgdir + ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir=$pkgdir make } -package() { - cd "$srcdir/ruby-gtk2-$pkgver" + +package_ruby-atk() { + pkgdesc="Ruby bindings for atk" + depends=("ruby-glib2=$pkgver" 'atk') + + cd "$srcdir/ruby-gtk2-$pkgver/atk" + make DESTDIR="$pkgdir" install +} + +package_ruby-gdkpixbuf2() { + pkgdesc="Ruby bindings for gdkpixbuf2" + depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') + + cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" + make DESTDIR="$pkgdir" install +} + +package_ruby-gio2() { + pkgdesc="Ruby bindings for gio2" + depends=("ruby-glib2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gio2" + make DESTDIR="$pkgdir" install +} + +package_ruby-glib2() { + pkgdesc="Ruby bindings for glib2" + depends=('glib2' 'ruby') + + cd "$srcdir/ruby-gtk2-$pkgver/glib2" + make DESTDIR="$pkgdir" install +} + +package_ruby-gtk2() { + pkgdesc="Ruby bindings for gtk2" + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gtk2" + make DESTDIR="$pkgdir" install +} + +package_ruby-pango() { + pkgdesc="Ruby bindings for pango" + depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') + + cd "$srcdir/ruby-gtk2-$pkgver/pango" make DESTDIR="$pkgdir" install } diff --git a/community/sdcv/PKGBUILD b/community/sdcv/PKGBUILD new file mode 100644 index 000000000..dd1d87971 --- /dev/null +++ b/community/sdcv/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 57381 2011-10-26 16:44:58Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=sdcv +pkgver=0.4.2 +pkgrel=6 +pkgdesc="StarDict Console Version" +arch=('i686' 'x86_64') +url="http://sdcv.sourceforge.net/" +license=('GPL') +depends=('glib2' 'readline' 'zlib') +makedepends=('patch') +provides=('stardict') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ + $pkgname-$pkgver-headers.patch) +sha256sums=('a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2' + '4746e32a6aaddf7744f373b539879598b48219a3b35f41ceb839f04c27921eb4') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + patch -Np1 -i ${srcdir}/$pkgname-$pkgver-headers.patch + + ./configure --prefix=/usr --mandir=/usr/share/man + +#quick fix for x86_64 + if [ "${CARCH}" == "x86_64" ]; then + sed -i 's|guint32 page_size|guint64 page_size|' src/lib/lib.cpp + fi + + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community/sdcv/sdcv-0.4.2-headers.patch b/community/sdcv/sdcv-0.4.2-headers.patch new file mode 100644 index 000000000..9affec151 --- /dev/null +++ b/community/sdcv/sdcv-0.4.2-headers.patch @@ -0,0 +1,46 @@ +diff -ruN sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp +--- sdcv-0.4.2-orig/src/lib/lib.cpp 2006-04-24 10:17:27.000000000 +0200 ++++ sdcv-0.4.2/src/lib/lib.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -513,7 +513,7 @@ + { + fseek(idxfile, wordoffset[page_idx], SEEK_SET); + guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx]; +- fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. ++ fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. + return wordentry_buf; + } + +diff -ruN sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp +--- sdcv-0.4.2-orig/src/libwrapper.cpp 2006-04-24 12:40:29.000000000 +0200 ++++ sdcv-0.4.2/src/libwrapper.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include <glib/gi18n.h> + #include <map> ++#include <cstring> + + #include "utils.hpp" + +diff -ruN sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp +--- sdcv-0.4.2-orig/src/readline.cpp 2005-12-07 23:07:23.000000000 +0100 ++++ sdcv-0.4.2/src/readline.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -23,6 +23,7 @@ + #endif + + #include <cstdio> ++#include <cstdlib> + #ifdef WITH_READLINE + # include <readline/readline.h> + # include <readline/history.h> +diff -ruN sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp +--- sdcv-0.4.2-orig/src/utils.cpp 2006-04-24 11:03:47.000000000 +0200 ++++ sdcv-0.4.2/src/utils.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -22,6 +22,8 @@ + # include "config.h" + #endif + ++#include <cstdio> ++#include <cstdlib> + #include <glib.h> + #include <glib/gi18n.h> + diff --git a/community/sdcv/sdcv.changelog b/community/sdcv/sdcv.changelog new file mode 100644 index 000000000..f742d12c7 --- /dev/null +++ b/community/sdcv/sdcv.changelog @@ -0,0 +1,3 @@ +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sdcv 0.4.2-6 + * moved to [community] with 206 votes diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index cd68816cb..b92bcc3cf 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56492 2011-10-07 10:33:31Z lfleischer $ +# $Id: PKGBUILD 57095 2011-10-21 06:30:14Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.1.1 +pkgver=2.9.1.2 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1179' +source=('http://www.snort.org/downloads/1207' 'snort' 'snort.conf.d') -md5sums=('7a245c6e7cdf298cab196f0f69108468' +md5sums=('9e94f20b934566469c239966e1b41eba' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 02fa70f7d..e3ed3f61e 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55918 2011-09-24 21:57:57Z dreisner $ +# $Id: PKGBUILD 57310 2011-10-25 14:35:46Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.44 +pkgver=4.45 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('c9dd51fc02b913ce5bf7b3fc12f9cb4a' - 'e86fc2578e5304ae5a7b586ce170f843' +md5sums=('dee104214a7c13593c1053cdff9a850f' + 'be46793ceb4ce44f40edd70bbdd21c90' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 98335d8ee..b75561d87 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 28735 2010-10-05 05:30:06Z spupykin $ +# $Id: PKGBUILD 57295 2011-10-25 11:18:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> pkgname=tesseract -pkgver=3.00 -pkgrel=2 +pkgver=3.01 +pkgrel=1 pkgdesc="An OCR programm" arch=(x86_64 i686 'mips64el') url="http://code.google.com/p/tesseract-ocr" license=("APACHE") -depends=(libpng libtiff libjpeg zlib gcc-libs) +depends=(libpng libtiff libjpeg zlib gcc-libs leptonica) source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz @@ -44,7 +44,7 @@ source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz) -md5sums=('cc812a261088ea0c3d2da735be35d09f' +md5sums=('1ba496e51a42358fb9d3ffe781b2d20a' '06fce5f5c0221286eab591819406d91e' '127e0b742b615d81c3b97a555acd8285' 'f4ae2e5668f693cc51c6e3c3f57a8f1d' @@ -81,10 +81,15 @@ md5sums=('cc812a261088ea0c3d2da735be35d09f' build() { cd $srcdir/$pkgname-$pkgver + [ -f Makefile.in ] || automake + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/tessdata cp $srcdir/*.traineddata $pkgdir/usr/share/tessdata/ - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 find $pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \; } diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index e463b65c9..828f01308 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $ +# $Id: PKGBUILD 57058 2011-10-20 04:40:39Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module -pkgver=20110416 +pkgver=20110915 _kernver='3.0-ARCH' -pkgrel=2 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -14,7 +14,7 @@ depends=('linux>=3.0' 'linux<3.1') makedepends=('linux-headers>=3.0') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) -md5sums=('2f91dd4ee8648da92d625221d4275b60') +md5sums=('fb90cd8fc4cd74d08c92e8235f99f1f4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index edb9e8d2b..75669d1a5 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.39-ARCH' + KERNEL_VERSION='3.0-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.39-ARCH' + KERNEL_VERSION='3.0-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 40c07c280..ea04d4520 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 48138 2011-05-28 22:59:33Z lcarlier $ +# $Id: PKGBUILD 57212 2011-10-24 14:41:07Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.8 +pkgver=2.3.9 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'mesa' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') +depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'mesa') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('612306c1b6a9d38b632ea3168b824f5e') +md5sums=('7185090a089c9c0e0eca7535a8f25dca') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --with-distributor="Arch linux" make } diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index f868fcfa9..4070ff775 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 56091 2011-09-30 23:44:20Z svenstaro $ +# $Id: PKGBUILD 57119 2011-10-22 01:45:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.29 -pkgrel=2 +pkgver=1.3.31 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('6c4159ef53c81faf5e52f29211ac50de') +md5sums=('9c575dbbb308d269ad76e1c6f5a0866d') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -25,7 +25,6 @@ depends=( libxcursor lib32-libxcursor libxrandr lib32-libxrandr libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga libxi lib32-libxi alsa-lib lib32-alsa-lib desktop-file-utils @@ -64,6 +63,7 @@ optdepends=( gnutls lib32-gnutls v4l-utils lib32-v4l-utils libpulse lib32-libpulse + alsa-plugins lib32-alsa-plugins oss ) diff --git a/community/wine/wine.install b/community/wine/wine.install index f71262186..0548b7ffd 100644 --- a/community/wine/wine.install +++ b/community/wine/wine.install @@ -1,10 +1,10 @@ post_install() { update-desktop-database -q - echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - echo "If you are on x86_64, the default WINEARCH will be win64." - echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - echo "See the Arch wiki on wine for more information." + #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + #echo "If you are on x86_64, the default WINEARCH will be win64." + #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + #echo "See the Arch wiki on wine for more information." } post_remove() { diff --git a/community/xautomation/PKGBUILD b/community/xautomation/PKGBUILD new file mode 100644 index 000000000..1fc7aff75 --- /dev/null +++ b/community/xautomation/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 57187 2011-10-23 16:31:38Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com> + +pkgname=xautomation +pkgver=1.05 +pkgrel=1 +pkgdesc='Controls X from the command line and does "visual scraping".' +url='http://hoopajoo.net/projects/xautomation.html' +arch=('i686' 'x86_64') +license=('GPL') +depends=('libpng' 'libxtst') +source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz") +md5sums=('4526ea5085a680a3ae8629af1731e5fa') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 035286bd9..9ec816419 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 52111 2011-07-20 09:27:48Z spupykin $ +# $Id: PKGBUILD 57288 2011-10-25 10:02:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 -pkgver=0.7DrNo -pkgrel=9 +pkgver=0.8DrO_o +pkgrel=1 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" license=('LGPL') backup=('etc/conf.d/xmms2d.conf') depends=('sqlite3' 'libmad') -makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' # avahi +makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' 'boost: C++ language bindings' @@ -38,12 +38,12 @@ optdepends=('alsa-lib: ALSA audio output' 'pulseaudio: PulseAudio audio output' 'pyrex: Python language bindings' 'ruby: Ruby language bindings' -# 'sidplay: to play a Commodore 64 music files AKA zaks' -# we do not have sidplay 2 series in repos; also it's -# somehow connected with resid i guess(not in repos also) 'smbclient: direct CIFS/SMB access' 'speex: Speex support' 'wavpack: WavPack support') +# 'sidplay: to play a Commodore 64 music files AKA zaks' +# we do not have sidplay 2 series in repos; also it's +# somehow connected with resid i guess(not in repos also) conflicts=('xmms2-devel') install=xmms2.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 @@ -51,7 +51,7 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.rc xmms2-helpers.patch vorbis-albumart.patch) -md5sums=('60e50b591078acb6a85cd83de0f2b077' +md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '9d8e3e1a434f271423bdd228a1e9bd7c' 'eddb800ebcc495b8574044a110a34add' @@ -60,14 +60,14 @@ md5sums=('60e50b591078acb6a85cd83de0f2b077' build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 < ${srcdir}/xmms2-helpers.patch - patch -p1 <$srcdir/vorbis-albumart.patch +# patch -Np1 < ${srcdir}/xmms2-helpers.patch +# patch -p1 <$srcdir/vorbis-albumart.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,cli,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli ./waf build ./waf --destdir=${pkgdir} install diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD new file mode 100644 index 000000000..940a9cadb --- /dev/null +++ b/community/yaml-cpp/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Markus Martin <markus@archwyrm.net> +pkgname=yaml-cpp +pkgver=0.2.7 +pkgrel=1 +pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" +url="http://code.google.com/p/yaml-cpp/" +arch=('i686' 'x86_64') +license=('MIT') +makedepends=('cmake') +source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('6878e14bad90c69a8f2caca273eb24c2') + +build() { + cd $srcdir/$pkgname-$pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install +} diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 58314f6ab..fd861bd2f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140113 2011-10-07 08:18:56Z ibiru $ +# $Id: PKGBUILD 140832 2011-10-20 05:41:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1' +sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index e44659732..fe30473d1 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $ +# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=1.15.3 -pkgrel=1 +pkgrel=2 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" @@ -11,7 +11,8 @@ license=('GPL') depends=('glibc') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz fix-es.po.patch) -md5sums=('8143e179a0f3c25646ce5085e8777200') +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -25,6 +26,7 @@ build() { mv data/keymaps/i386/olpc/pt{,-olpc}.map mv data/keymaps/i386/dvorak/no{,-dvorak}.map mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map + mv data/keymaps/i386/colemak/{en-latin9,colemak}.map ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes @@ -40,5 +42,3 @@ package() { mkdir ${pkgdir}/bin ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } -md5sums=('8143e179a0f3c25646ce5085e8777200' - '4ded3edb50fb7a3277bae6a870cee812') diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 741c8c390..13e75c5ee 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $ +# $Id: PKGBUILD 141000 2011-10-21 02:57:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-1.9.1-config-script.patch - krb5-1.9.1-canonicalize-fallback.patch) + krb5-1.9.1-canonicalize-fallback.patch + krb5-1.9.1-2011-006.patch) sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7342410760cf44bfa01bb99bb4c49e12496cb46f' - '238c268fa6cb42fc7324ab54db9abda5cd77f833') + '238c268fa6cb42fc7324ab54db9abda5cd77f833' + '0b0016b0e341dcf720f67925b0d451b328e02583') options=('!emptydirs') build() { @@ -47,6 +49,10 @@ build() { # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + # KDC denial of service vulnerabilities + # http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-006.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-006.patch + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ diff --git a/core/krb5/krb5-1.9.1-2011-006.patch b/core/krb5/krb5-1.9.1-2011-006.patch new file mode 100644 index 000000000..05a22caf5 --- /dev/null +++ b/core/krb5/krb5-1.9.1-2011-006.patch @@ -0,0 +1,75 @@ +diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c +index b473611..50c60b7 100644 +--- a/src/plugins/kdb/db2/lockout.c ++++ b/src/plugins/kdb/db2/lockout.c +@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!db_ctx->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, &lockout_duration); +@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context, + return code; + } + ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; ++ + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ + if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) { +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +index 552e39a..c2f44ab 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor, + CHECK_LDAP_HANDLE(ldap_context); + + if (is_principal_in_realm(ldap_context, searchfor) != 0) { ++ st = KRB5_KDB_NOENTRY; + krb5_set_error_message (context, st, "Principal does not belong to realm"); + goto cleanup; + } +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +index a218dc7..fd164dd 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!ldap_context->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, +@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context, + return code; + } + +- entry->mask = 0; ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; + +- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry)); ++ entry->mask = 0; + + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 26aaa626d..41e5f70e5 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 137228 2011-09-06 21:10:41Z dan $ +# $Id: PKGBUILD 140981 2011-10-20 13:56:51Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=libarchive pkgver=2.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90') -sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + release-2.8-fixes.patch) +md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90' + '14dbbf2d31d68d8eedb93ec5531f3b0c') +sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d' + 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 < ../release-2.8-fixes.patch ./configure --prefix=/usr --without-xml2 make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING } diff --git a/core/libarchive/release-2.8-fixes.patch b/core/libarchive/release-2.8-fixes.patch new file mode 100644 index 000000000..c21eeaa7b --- /dev/null +++ b/core/libarchive/release-2.8-fixes.patch @@ -0,0 +1,234 @@ +Index: build/cmake/config.h.in +=================================================================== +--- build/cmake/config.h.in (revision 3670) ++++ build/cmake/config.h.in (revision 3737) +@@ -1,5 +1,8 @@ + /* config.h. Generated from config.h.cmake by cmake configure */ + ++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */ ++#cmakedefine ZLIB_WINAPI 1 ++ + /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */ + #cmakedefine ARCHIVE_HASH_MD5_LIBC + +Index: libarchive/archive_read_support_format_all.c +=================================================================== +--- libarchive/archive_read_support_format_all.c (revision 3670) ++++ libarchive/archive_read_support_format_all.c (revision 3737) +@@ -1,5 +1,5 @@ + /*- +- * Copyright (c) 2003-2007 Tim Kientzle ++ * Copyright (c) 2003-2011 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -39,5 +39,13 @@ + archive_read_support_format_tar(a); + archive_read_support_format_xar(a); + archive_read_support_format_zip(a); ++ ++ /* Note: We always return ARCHIVE_OK here, even if some of the ++ * above return ARCHIVE_WARN. The intent here is to enable ++ * "as much as possible." Clients who need specific ++ * compression should enable those individually so they can ++ * verify the level of support. */ ++ /* Clear any warning messages set by the above functions. */ ++ archive_clear_error(a); + return (ARCHIVE_OK); + } +Index: libarchive/archive_write_disk.c +=================================================================== +--- libarchive/archive_write_disk.c (revision 3670) ++++ libarchive/archive_write_disk.c (revision 3737) +@@ -1513,6 +1513,22 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) ++static int ++guidword(const char *p, int n) ++{ ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if ((*p >= '0' && *p <= '9') || ++ (*p >= 'a' && *p <= 'f') || ++ (*p >= 'A' && *p <= 'F')) ++ p++; ++ else ++ return (-1); ++ } ++ return (0); ++} ++ + /* + * 1. Convert a path separator from '\' to '/' . + * We shouldn't check multi-byte character directly because some +@@ -1521,26 +1537,92 @@ + * 2. Replace unusable characters in Windows with underscore('_'). + * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx + */ +-static void ++static int + cleanup_pathname_win(struct archive_write_disk *a) + { + wchar_t wc; + char *p; + size_t alen, l; + +- alen = 0; +- l = 0; +- for (p = a->name; *p != '\0'; p++) { +- ++alen; +- if (*p == '\\') +- l = 1; ++ p = a->name; ++ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or ++ * "\\?\Volume{GUID}\" ++ * (absolute path prefixes used by Windows API) */ ++ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) && ++ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/')) ++ { ++ /* A path begin with "\\?\UNC\" */ ++ if (p[2] == '?' && ++ (p[4] == 'U' || p[4] == 'u') && ++ (p[5] == 'N' || p[5] == 'n') && ++ (p[6] == 'C' || p[6] == 'c') && ++ (p[7] == '\\' || p[7] == '/')) ++ p += 8; ++ /* A path begin with "\\?\Volume{GUID}\" */ ++ else if (p[2] == '?' && ++ (p[4] == 'V' || p[4] == 'v') && ++ (p[5] == 'O' || p[5] == 'o') && ++ (p[6] == 'L' || p[6] == 'l') && ++ (p[7] == 'U' || p[7] == 'u') && ++ (p[8] == 'M' || p[8] == 'm') && ++ (p[9] == 'E' || p[9] == 'e') && ++ p[10] == '{') { ++ if (guidword(p+11, 8) == 0 && p[19] == '-' && ++ guidword(p+20, 4) == 0 && p[24] == '-' && ++ guidword(p+25, 4) == 0 && p[29] == '-' && ++ guidword(p+30, 4) == 0 && p[34] == '-' && ++ guidword(p+35, 12) == 0 && p[47] == '}' && ++ (p[48] == '\\' || p[48] == '/')) ++ p += 49; ++ else ++ p += 4; ++ /* A path begin with "\\.\PhysicalDriveX" */ ++ } else if (p[2] == '.' && ++ (p[4] == 'P' || p[4] == 'p') && ++ (p[5] == 'H' || p[5] == 'h') && ++ (p[6] == 'Y' || p[6] == 'y') && ++ (p[7] == 'S' || p[7] == 's') && ++ (p[8] == 'I' || p[8] == 'i') && ++ (p[9] == 'C' || p[9] == 'c') && ++ (p[9] == 'A' || p[9] == 'a') && ++ (p[9] == 'L' || p[9] == 'l') && ++ (p[9] == 'D' || p[9] == 'd') && ++ (p[9] == 'R' || p[9] == 'r') && ++ (p[9] == 'I' || p[9] == 'i') && ++ (p[9] == 'V' || p[9] == 'v') && ++ (p[9] == 'E' || p[9] == 'e') && ++ (p[10] >= '0' && p[10] <= '9') && ++ p[11] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a physical drive name"); ++ return (ARCHIVE_FAILED); ++ } else ++ p += 4; ++ } ++ ++ /* Skip leading drive letter from archives created ++ * on Windows. */ ++ if (((p[0] >= 'a' && p[0] <= 'z') || ++ (p[0] >= 'A' && p[0] <= 'Z')) && ++ p[1] == ':') { ++ if (p[2] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a drive name"); ++ return (ARCHIVE_FAILED); ++ } ++ if (p[2] == '\\' || p[2] == '/') ++ p += 3; ++ } ++ ++ for (; *p != '\0'; p++) { + /* Rewrite the path name if its character is a unusable. */ + if (*p == ':' || *p == '*' || *p == '?' || *p == '"' || + *p == '<' || *p == '>' || *p == '|') + *p = '_'; + } +- if (alen == 0 || l == 0) +- return; ++ alen = p - a->name; ++ if (alen == 0 || strchr(a->name, '\\') == NULL) ++ return (ARCHIVE_OK); + /* + * Convert path separator. + */ +@@ -1560,6 +1642,7 @@ + p += l; + alen -= l; + } ++ return (ARCHIVE_OK); + } + #endif + +@@ -1583,7 +1666,8 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) +- cleanup_pathname_win(a); ++ if (cleanup_pathname_win(a) != ARCHIVE_OK) ++ return (ARCHIVE_FAILED); + #endif + /* Skip leading '/'. */ + if (*src == '/') +Index: libarchive/archive_util.c +=================================================================== +--- libarchive/archive_util.c (revision 3670) ++++ libarchive/archive_util.c (revision 3737) +@@ -155,6 +155,7 @@ + { + archive_string_empty(&a->error_string); + a->error = NULL; ++ a->archive_error_number = 0; + } + + void +Index: libarchive/archive_read_extract.c +=================================================================== +--- libarchive/archive_read_extract.c (revision 3670) ++++ libarchive/archive_read_extract.c (revision 3737) +@@ -108,7 +108,7 @@ + if (r != ARCHIVE_OK) + /* If _write_header failed, copy the error. */ + archive_copy_error(&a->archive, ad); +- else if (archive_entry_size(entry) > 0) ++ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0) + /* Otherwise, pour data into the entry. */ + r = copy_data(_a, ad); + r2 = archive_write_finish_entry(ad); +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 3670) ++++ CMakeLists.txt (revision 3737) +@@ -154,6 +154,13 @@ + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) ++ IF(WIN32 AND NOT CYGWIN) ++ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) ++ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) ++ CHECK_C_SOURCE_Runs( ++ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" ++ ZLIB_WINAPI) ++ ENDIF(WIN32 AND NOT CYGWIN) + ENDIF(ZLIB_FOUND) + MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /trunk:r1989,3247,3722 + diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 76b0b92b1..0fe30c70f 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 138461 2011-09-24 03:53:12Z allan $ +# $Id: PKGBUILD 141008 2011-10-21 09:35:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # NOTE: requires rebuilt with each new gcc version pkgname=('libtool' 'libltdl') -pkgver=2.4 -pkgrel=5 +pkgver=2.4.2 +pkgrel=1 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig} nopic.patch) -md5sums=('4e6144439d95d7332dc50ace6dd24c55' +md5sums=('2ec8997e0c07249eb4cbd072417d70fe' + '1e6ba57420c82c663c85e745d11c7eed' '46443cf0e3e1b4e4891812af73385615') build() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}/nopic.patch" + [ "$CARCH" = "mips64el" ] && patch -Np1 -i "${srcdir}/nopic.patch" ./configure --prefix=/usr make } diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index e2e797741..9c03696d4 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $ +# $Id: PKGBUILD 141112 2011-10-24 09:59:21Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=mkinitcpio-busybox -pkgver=1.18.5 +pkgver=1.19.2 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" license=('GPL') depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' - '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') +options=('!buildflags') +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config') +sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9' + '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8') build() { - cd "${srcdir}/busybox-${pkgver}" + cd "$srcdir/busybox-$pkgver" - unset CFLAGS CXXFLAGS case $CARCH in - x86_64) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; - i686) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; mips64el) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-O2 -march=loongson2f -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; + local safeflags='-O2 -march=loongson2f -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;; + *) + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;; esac + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config + make } package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" } + # vim:set ts=2 sw=2 et: diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 31a9d4330..86160a203 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.5 -# Sun Aug 14 01:22:25 2011 +# Busybox version: 1.19.2 +# Sun Oct 16 15:24:19 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=0 CONFIG_FEATURE_FAST_TOP=y @@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y @@ -106,6 +109,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y CONFIG_FEATURE_NON_POSIX_CP=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_HWIB is not set @@ -169,12 +173,17 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set # CONFIG_CAL is not set # CONFIG_CATV is not set CONFIG_CHGRP=y @@ -212,10 +221,8 @@ CONFIG_FALSE=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set -# CONFIG_ID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y @@ -262,12 +269,11 @@ CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set # CONFIG_SYNC is not set -# CONFIG_TAC is not set +CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y @@ -279,7 +285,6 @@ CONFIG_UNIQ=y # CONFIG_UUENCODE is not set CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set # CONFIG_WHOAMI is not set CONFIG_YES=y @@ -350,20 +355,13 @@ CONFIG_MKTEMP=y # Editors # # CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -372,6 +370,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -419,7 +425,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set +CONFIG_INIT=y # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -430,6 +436,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # # Login/Password Management Utilities @@ -515,6 +522,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FBSET is not set @@ -523,7 +531,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set # CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -618,10 +626,25 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -662,15 +685,6 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -704,11 +718,17 @@ CONFIG_STRINGS=y # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -781,17 +801,12 @@ CONFIG_IPRULE=y # CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -824,12 +839,14 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" @@ -865,15 +882,19 @@ CONFIG_FEATURE_MIME_CHARSET="" # # CONFIG_IOSTAT is not set # CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set # CONFIG_PMAP is not set # CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set CONFIG_PGREP=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y @@ -894,7 +915,6 @@ CONFIG_FEATURE_PS_WIDE=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y # CONFIG_WATCH is not set # @@ -932,6 +952,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_GETOPTS=y @@ -972,6 +993,7 @@ CONFIG_SH_MATH_SUPPORT=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities @@ -980,6 +1002,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index 00b5cc450..0bb067f67 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 136192 2011-08-24 03:36:11Z allan $ +# $Id: PKGBUILD 141157 2011-10-25 05:06:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.13 -pkgrel=2 +pkgver=8.20 +pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 - r661.diff) -md5sums=('5e595edbcded141813fa1a10dbce05cb' - '70e2725b46ff6f3f114ce5067fd03405') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('a1931c70e1273e3450d5036fe273d25c' + '41c2dceac25c6ebf192ec128021be339') build() { cd "${srcdir}"/${pkgname}-${pkgver} - # http://bugs.exim.org/show_bug.cgi?id=1136 - patch -Np2 -i "${srcdir}"/r661.diff - sed -i '12140d' testdata/testoutput2 - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties + ./configure --prefix=/usr --enable-jit \ + --enable-utf8 --enable-unicode-properties make } diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index d26d3fc2f..a4dfa77de 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135926 2011-08-20 07:14:30Z allan $ +# $Id: PKGBUILD 141155 2011-10-25 05:06:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.2 +_ver=1.8.3 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -13,9 +13,10 @@ license=('custom') depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('000f458e7391be9fdf459a9ad6a4912a' +md5sums=('9e5517bbf3aee420b38c2d1d7a71bcad' + '9320510b4fde1c98a1846d9a21c5442a' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules index 71f1a883b..6bdf4e249 100644 --- a/core/udev/81-arch.rules +++ b/core/udev/81-arch.rules @@ -1,71 +1,9 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> # do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# +# this file is going away in the near future -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" +# this might belong in <http://aur.archlinux.org/packages.php?ID=22698> +# see also /usr/src/*/Documentation/laptops/sonypi.txt KERNEL=="sonypi", MODE="0666" -# USB devices +# this might belong in <https://aur.archlinux.org/packages.php?ID=18393> KERNEL=="legousbtower*", MODE="0666" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index f959e9b3c..15ab470d2 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $ +# $Id: PKGBUILD 141114 2011-10-24 09:59:24Z dreisner $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,23 +6,20 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=173 -pkgrel=3 +pkgver=174 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') groups=('base') -# older initscripts versions required start_udev options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - bluetooth.patch +makedepends=('gobject-introspection' 'gperf') +#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 +source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2 81-arch.rules) build() { cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/25356 (submitted upstream) - patch -Np1 -i ../bluetooth.patch if [ "$CARCH" = "mips64el" ]; then msg "Remove -Wl,--gc-sections" @@ -36,13 +33,13 @@ build() { --with-systemdsystemunitdir=/lib/systemd/system\ --disable-rule-generator\ --enable-udev_acl + make } package_udev() { pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') + depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils') install=udev.install backup=(etc/udev/udev.conf) conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') @@ -59,11 +56,14 @@ package_udev() { echo "blacklist $mod" done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 + # /dev/loop0 is created for convenience, to autoload the module if necessary + # may be obsoleted by https://lkml.org/lkml/2011/7/30/111 mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # udevd moved, symlink to make life easy for restarting udevd manually + ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; @@ -102,6 +102,5 @@ package_udev-compat() { # /dev/ppp mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 } -md5sums=('91a88a359b60bbd074b024883cc0dbde' - '36cb9bfb55a8d931b7498d2e46730745' - 'ec529eb1ddaabb70c61b38f80bb8462a') +md5sums=('3b84706046a33d7a7e00491a1136804d' + '3da2bb9891592f9438a07bd641465531') diff --git a/core/udev/udev.install b/core/udev/udev.install index 272ab60c0..2cc8caaa0 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -2,7 +2,7 @@ # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 172)" -lt 0 ]; then + if [ "$(vercmp $2 174)" -lt 0 ]; then echo "ATTENTION UDEV:" echo "----------" if [ "$(vercmp $2 168)" -lt 0 ]; then @@ -32,41 +32,31 @@ post_upgrade() { echo "Add them to MODULES in rc.conf if you need them." echo " --" fi - echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat." - echo " --" - echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo "takes precedence." + if [ "$(vercmp $2 172)" -lt 0 ]; then + echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat." + echo " --" + echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" + echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" + echo "takes precedence." + echo " --" + echo "kbd and rtc devices are no longer world readable." + echo " --" + echo "rtc is no longer in the audio group and fb devices are no longer in" + echo "the video group, as permissions and ownership of fb devices are controlled" + echo "by X." + echo " --" + fi + echo "We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo "'scanner' and 'video' groups. Beware of any changes." echo " --" - echo "kbd and rtc devices are no longer world readable." + echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0." echo " --" - echo "rtc is no longer in the audio group and fb devices are no longer in" - echo "the video group, as permissions and ownership of fb devices are controlled" - echo "by X." + echo "For security reasons, we no longer add devices to the 'storage' group. Use" + echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo "this functionality back." + echo " --" + echo "We no longer create the static nodes on install needed for an initrd-less and" + echo "devtmpfs-less boot, this only affects fresh installs." echo "---------------" fi } - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 818051b79..61ef4e610 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138467 2011-09-24 11:28:45Z tomegun $ +# $Id: PKGBUILD 141022 2011-10-21 21:39:17Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index a71edea4e..22eb0e4b1 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139215 2011-10-01 18:55:37Z ibiru $ +# $Id: PKGBUILD 140834 2011-10-20 05:41:34Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Solitaire card games" arch=(mips64el) @@ -14,7 +14,7 @@ makedepends=(gnome-doc-utils intltool itstool) options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dba561dc35641cb393626151cf048f407c47960c7a254f378b986ab95d899d85') +sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index fa829a121..70cb9519f 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $ +# $Id: PKGBUILD 141200 2011-10-25 22:29:00Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro pkgver=5.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64' 'mips64el') url="http://alleg.sourceforge.net/" license=('custom') depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') -makedepends=('cmake' 'mesa') +makedepends=('cmake' 'mesa' 'freetype2') source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) md5sums=('e2e314ee7116c7efddd0497d6c885e46') diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index f16153495..4baf7e714 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139217 2011-10-01 18:55:41Z ibiru $ +# $Id: PKGBUILD 140836 2011-10-20 05:41:37Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('2ff968af17e9202fcdb12c47aadaa9d3cb4b98d78c22db8a0cedcb4bf0a81fb8') +sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 07037b49c..bd62ef75f 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139223 2011-10-01 18:55:48Z ibiru $ +# $Id: PKGBUILD 140838 2011-10-20 05:41:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,8 @@ depends=('at-spi2-core' 'libx11' 'atk' 'dconf') makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') -groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7fd0e043d2a32f06cab1ca116f36114d9b0c482ca421e26b1d565687db171150') +sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 58c7a2793..872d9006c 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139225 2011-10-01 18:55:51Z ibiru $ +# $Id: PKGBUILD 140840 2011-10-20 05:41:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b3f645560749067ea250c26b281248e3eb912316323a02d358fc2be5dea3848') +sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD index 806c39d81..9bc7244d4 100644 --- a/extra/atkmm/PKGBUILD +++ b/extra/atkmm/PKGBUILD @@ -3,15 +3,15 @@ pkgbase=atkmm pkgname=(atkmm atkmm-docs) -pkgver=2.22.5 +pkgver=2.22.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++') license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 0df8b5229..8af53c3d5 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 138257 2011-09-19 16:24:40Z bisson $ +# $Id: PKGBUILD 141068 2011-10-23 03:27:31Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' -arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' license=('GPL3') +arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') -optdepends=('unzip: zipped skins support') +optdepends=('p7zip-libre: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('713cc7ee277ca548ea143b4ec3bd40bcacdb327f') +sha1sums=('d4bb828e4ead275bded85cf8b0aa258c347106cb') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index 478c142dc..dddf5cf4b 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 138164 2011-09-17 22:07:10Z andrea $ +# $Id: PKGBUILD 140975 2011-10-20 08:57:44Z eric $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=bigloo -_pkgver=3.6a +_pkgver=3.7a-2 pkgver=${_pkgver/-/_} -pkgrel=3 +pkgrel=1 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" license=('GPL' 'LGPL') -depends=('openssl' 'sqlite3') +depends=('openssl' 'sqlite3' 'alsa-lib') makedepends=('java-environment' 'emacs' 'zip') optdepends=('emacs') options=('!makeflags') install=bigloo.install source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz) -md5sums=('484c09cd0e0f84c96999d889de35cd1e') +md5sums=('1a692b950843e36910e13e0e91f90534') build() { cd "${srcdir}/${pkgname}${_pkgver}" @@ -33,6 +33,11 @@ build() { make build compile-bee } +check() { + cd "${srcdir}/${pkgname}${_pkgver}" + make test +} + package() { cd "${srcdir}/${pkgname}${_pkgver}" make DESTDIR="${pkgdir}" install install-bee diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 85354f042..806a08c5e 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ +# $Id: PKGBUILD 140830 2011-10-20 05:01:46Z eric $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -12,8 +12,8 @@ _svn=false pkgname=blender -pkgver=2.59 -pkgrel=3 +pkgver=2.60 +pkgrel=1 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') @@ -21,12 +21,12 @@ license=('GPL') url="http://www.blender.org" depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') -makedepends=('cmake') # 'subversion' + 'freetype2' 'openal' 'libsndfile' 'ffmpeg') +makedepends=('cmake') install=blender.install if [ $_svn = false ]; then source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') + md5sums=('2951df9d5f004c5e0375b53969205a38') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) md5sums=('7579d1139d0d6025df8afcfca64a65c4') @@ -34,6 +34,7 @@ fi # source PKGBUILD && mksource mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) _svnver=38016 _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" _svnmod="$pkgname-$pkgver" diff --git a/extra/blender/blender.install b/extra/blender/blender.install index f4d7cc443..724bfce00 100644 --- a/extra/blender/blender.install +++ b/extra/blender/blender.install @@ -5,13 +5,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index ea9b5a6cc..0feb4c2bc 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139466 2011-10-01 23:23:01Z ibiru $ +# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') url="http://live.gnome.org/Caribou" license=('LGPL') depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('9d9aeab26956371e9a8e807e2554be5ca08e32f6a27632598065cf2e85e66d16') +sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index ca3e41400..c0a9544e0 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139231 2011-10-01 18:56:02Z ibiru $ +# $Id: PKGBUILD 140845 2011-10-20 05:41:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b') +sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 1ddff2183..e0525fa43 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139233 2011-10-01 18:56:07Z ibiru $ +# $Id: PKGBUILD 140847 2011-10-20 05:41:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c8bd379154d40400b19932934dfa05e8a02057bbff2455f09afda7aa6c4b5ef8') +sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 84718b6dd..e8d745d94 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139237 2011-10-01 18:56:15Z ibiru $ +# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('b1551c129d5570b63e7130971622fc2ab8d4ecbf0dc1773df1c54fa9c1cb0a2c') +sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index 48fb72e1a..4f1af6db7 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z bisson $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky -pkgver=1.8.1 -pkgrel=3 -pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.8.2git20111026 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' -license=('custom') -replaces=('torsmo') -makedepends=('pkg-config') +license=('BSD' 'GPL') +arch=('i686' 'x86_64' 'mips64el') +options=('!emptydirs') +makedepends=('pkg-config' 'docbook2x') depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'current-power.patch') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b') -sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f' - '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b') +# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz + +replaces=('torsmo') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../current-power.patch # See FS#21984 + sh autogen.sh - ./configure \ + CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --enable-ibm \ diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake new file mode 100644 index 000000000..7f980868f --- /dev/null +++ b/extra/conky/PKGBUILD.cmake @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=conky +pkgver=1.8.2git20111021 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' +url='http://conky.sourceforge.net/' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +makedepends=('pkg-config' 'cmake' 'git' 'docbook2x') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua') + +replaces=('torsmo') + +build() { + cd "${srcdir}" + + cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git + rm -fr build; mkdir build; cd build + + cmake \ + -D CMAKE_BUILD_TYPE:STRING="Release" \ + -D MAINTAINER_MODE:BOOL=ON \ + -D BUILD_CURL:BOOL=ON \ + -D BUILD_IMLIB2:BOOL=ON \ + -D BUILD_LUA_IMLIB2:BOOL=OFF \ + -D BUILD_MYSQL:BOOL=OFF \ + -D BUILD_RSS:BOOL=ON \ + -D BUILD_WEATHER_METAR:BOOL=ON \ + -D BUILD_WEATHER_XOAP:BOOL=ON \ + -D BUILD_WLAN:BOOL=ON \ + -D CMAKE_INSTALL_PREFIX:PATH=/usr \ + ../conky + + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index baeddbc94..59eb011b1 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 125668 2011-05-27 23:18:08Z eric $ +# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.08 +pkgver=9.11 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64' 'mips64el') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') -depends=('lcms') +depends=('lcms' 'jasper') source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) -md5sums=('eb1d365c27495a513c0768b2f696ba66' - '110b4604a6dacd5537339c4082e9e12a') -sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e' +sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234' '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { cd "${srcdir}/${pkgname}" - gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" + gcc ${CFLAGS} -O3 -o dcraw dcraw.c \ + -Wall -Wno-unused-result -Wno-array-bounds \ + -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" } package() { diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 1b584820d..7a68faa04 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $ +# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('29d43f182ecad06d64b3598c02380a80' +md5sums=('b5757ef2d7b651748eeebb88af29d7d6' '66479e99123faeab83ebaed709ef95b5' '9f180cc236808bbd02ca8652fd2e8217' 'f329d86f8ba1cd85f9b6ee59e0ce3791') diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 6576f1976..e59d233d7 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $ +# $Id: PKGBUILD 141134 2011-10-24 16:36:03Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.0.1 +pkgver=3.2.1.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' 'libcanberra' 'iso-codes' 'networkmanager') +depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' +'libcanberra' 'iso-codes' 'networkmanager') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-butterfly: MSN support' @@ -20,7 +21,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512') +sha256sums=('2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 8800d6d31..e07ca0bca 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139249 2011-10-01 18:56:37Z ibiru $ +# $Id: PKGBUILD 140977 2011-10-20 11:11:57Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=eog-plugins.install options=('!libtool') groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('49a78e862a1967733b439ca4a4cde42084e8d4b1947c4a5ddb1b3581bec64dc0') +sha256sums=('f78ac3e72a6f04d9fa4b1a9f973967ae9530b3265abd4b78180730d23c295d9c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index b0b7c2c88..26a877beb 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139247 2011-10-01 18:56:34Z ibiru $ +# $Id: PKGBUILD 140853 2011-10-20 05:41:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('79184d0cf420d4b8c1d1de92c30f1d95afc7cd686876e07b20cb82a2ec20d8e3') +sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index ccc751b2f..a47982e99 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139251 2011-10-01 18:56:40Z ibiru $ +# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -14,14 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - fix_crash::http://git.gnome.org/browse/epiphany/patch/?id=1cb7fb1109aecedd224d03fda202165adf3423a7) -sha256sums=('e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2' - 'ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_crash" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD index 3a9533fdd..12150c3c6 100644 --- a/extra/erlang/PKGBUILD +++ b/extra/erlang/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 110837 2011-02-22 18:42:08Z vesa $ -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R14B -pkgrel=2 +pkgver=R14B04 +pkgrel=1 pkgdesc="A small concurrent functional programming language developed by Ericsson." arch=(i686 x86_64 'mips64el') url="http://www.erlang.org/index.html" license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') optdepends=('wxgtk: for wx support' 'unixodbc: database') options=('!makeflags') @@ -22,14 +23,11 @@ build() { ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) - # fix for #17001 - sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS --libs` -lGLU"|' lib/wx/configure || return 1 - - sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure || return 1 + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --enable-ethread-pre-pentium4-compatibility enable_ethread_pre_pentium4_compatibilit=yes --prefix=/usr --enable-smp-support --enable-threads || return 1 - make || return 1 - make INSTALL_PREFIX="$pkgdir" install || return 1 + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + make + make INSTALL_PREFIX="$pkgdir" install # fix prefix cd "$pkgdir" @@ -37,22 +35,22 @@ build() { usr/lib/erlang/bin/start \ usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i || return 1 + usr/lib/erlang/releases/RELEASES ;do + sed -i "s#$pkgdir##" $i done # fix symlinks cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd + ln -sf ../erts-${ERTSVERSION}/bin/epmd cd "$pkgdir/usr/bin" for file in *; do - ln -sfv ../lib/erlang/bin/$file || return 1 + ln -sfv ../lib/erlang/bin/$file done - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" || return 1 + ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" -# install documentation +# install documentation install -d "$pkgdir/usr/share/doc/erlang" install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" @@ -60,5 +58,5 @@ build() { install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } -md5sums=('5292a04556d17ad528d570e02357dfbb' - '011530a24fbcc194be9bd01f779325a2') +md5sums=('4b469729f103f52702bfb1fb24529dc0' + 'f31e72518daae4007f595c0b224dd59f') diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index dfb163f9c..cf1cbcd38 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $ +# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' - 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235') +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 308c9d890..e70bce5d4 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139257 2011-10-01 18:56:49Z ibiru $ +# $Id: PKGBUILD 140863 2011-10-20 05:42:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('de2a75e5256143ed7eb273a78a45ff2ba8af81c894dbf17c5dade5be349fc427') +sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index c0b698272..2a6e166fc 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139259 2011-10-01 18:56:51Z ibiru $ +# $Id: PKGBUILD 140865 2011-10-20 05:42:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f61a5e5e5a51a6bc45c0df20d7a99a8c5361fac07eb9eadc15dd5329af1f1f29') +sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD index 5a79f4628..786ecc16a 100644 --- a/extra/evolution-groupwise/PKGBUILD +++ b/extra/evolution-groupwise/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $ +# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=evolution-groupwise -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GroupWise connector for evolution" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(intltool evolution) optdepends=('evolution: evolution plugin') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3) +sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,6 +27,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index daf315c25..394ef098a 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139255 2011-10-01 18:56:46Z ibiru $ +# $Id: PKGBUILD 140861 2011-10-20 05:42:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d') +sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index db5811f80..e6a5d5ab2 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $ +# $Id: PKGBUILD 141087 2011-10-23 16:12:32Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo pkgver=0.6.2 -pkgrel=1 +pkgrel=3 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL') @@ -28,7 +28,6 @@ build() { --libexecdir=/usr/lib/xfce4 \ --localstatedir=/var \ --disable-static \ - --enable-gio-unix \ --enable-python \ --enable-gtk-doc \ --disable-debug diff --git a/extra/exo/exo.install b/extra/exo/exo.install index 3525fa4a2..17ca8f78a 100644 --- a/extra/exo/exo.install +++ b/extra/exo/exo.install @@ -1,6 +1,5 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - usr/bin/gio-querymodules usr/lib/gio/modules } post_upgrade() { diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index a91686c88..1b508835d 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139263 2011-10-01 18:56:56Z ibiru $ +# $Id: PKGBUILD 140871 2011-10-20 05:42:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.3.2 +pkgver=0.6.4.1 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialw makedepends=('gobject-introspection' 'vala' 'intltool') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414') +sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 3fc7ee10d..e08d033e3 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $ +# $Id: PKGBUILD 141107 2011-10-24 08:04:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.6 +pkgver=2.4.7 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('5e6510613f612809d2d7862592b92ab7' +md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index 1722f517c..374660ce8 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139267 2011-10-01 18:57:03Z ibiru $ +# $Id: PKGBUILD 141222 2011-10-26 16:28:37Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') @@ -17,7 +17,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('f371745529d7ed209b0b222f33f5996231cc153e901aea3ce0ad0a46b5a96d0b' +sha256sums=('bca02495552b40d2f3867b66d490283481417ec0e489ba0cbff9e0f48b82822d' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 61725c08e..72a36a17e 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139472 2011-10-02 01:28:00Z ibiru $ +# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1.1 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,27 +16,24 @@ depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'me makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') optdepends=('gnome-shell: new login interface') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam - check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d) -sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7' + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4' + '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834' - 'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d') + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/check-for-shell.patch" patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index 7beda835a..aa4d4dd47 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -14,7 +14,7 @@ password required pam_unix.so session required pam_loginuid.so -session optional pam_systemd.so -session optional pam_keyinit.so revoke +session optional pam_keyinit.so force revoke session required pam_limits.so session required pam_unix.so session optional pam_gnome_keyring.so auto_start diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index b9732be50..fda42d319 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -9,6 +9,7 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor gconfpkg --install ${pkgname} glib-compile-schemas usr/share/glib-2.0/schemas + dconf update } pre_remove() { @@ -23,6 +24,7 @@ post_upgrade() { post_remove() { glib-compile-schemas usr/share/glib-2.0/schemas + dconf update gtk-update-icon-cache -q -t -f usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index a7934cd27..ad8f4860a 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139273 2011-10-01 18:57:12Z ibiru $ +# $Id: PKGBUILD 140875 2011-10-20 05:42:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348') +sha256sums=('bdde2dae05bf08e67088c441eac3456d6861b5076d5f00d4c381291ef4c85651') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index c6d138e8b..5d9e5cdbb 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $ +# $Id: PKGBUILD 141151 2011-10-24 22:00:23Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.7 +pkgver=1.7.7.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('5d645884e688921e773186783b65ce33' - '2ee47bd79dfd391bc7d1b466539b9734' +md5sums=('7cfb3e7ea585037272a7ad8e35f4ac0a' + 'b6ec6c3a08855b7393284675643be95c' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6' - 'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb' +sha256sums=('6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f' + '28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index cc7b36ef6..c09e20c45 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139279 2011-10-01 18:57:20Z ibiru $ +# $Id: PKGBUILD 140877 2011-10-20 05:42:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c') +sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index 34e939187..87dca22fc 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139281 2011-10-01 18:57:22Z ibiru $ +# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('18e41753d98644689126c3f237f4bf2e1b973cac15544166cef299ba6faa95ef') +sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 031264334..e4c84cba3 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139284 2011-10-01 18:57:27Z ibiru $ +# $Id: PKGBUILD 140881 2011-10-20 05:42:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca' +sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 324206a95..887d73675 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139883 2011-10-05 19:06:43Z andrea $ +# $Id: PKGBUILD 140883 2011-10-20 05:42:30Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') url="http://projects.gnome.org/gnome-color-manager/" @@ -14,7 +14,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273') +sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436') build(){ cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index c9bcbfa68..ccbdbcb4e 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139288 2011-10-01 18:57:32Z ibiru $ +# $Id: PKGBUILD 141004 2011-10-21 08:06:14Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.2.0.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') makedepends=('intltool' 'vala') install= source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('2d8e2a325ecc661805f6e7c6339b3876e766c1e227ff084dc02a7535e5983641') +sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 6360bb938..991bc2a65 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 139290 2011-10-01 18:57:35Z ibiru $ +# $Id: PKGBUILD 140887 2011-10-20 05:42:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') optdepends=('mesa-demos-libre: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts') + 'apg: adds password generation for user accounts' + 'gnome-color-manager: for color management tasks') makedepends=('gnome-doc-utils' 'intltool') url="http://www.gnome.org" groups=('gnome') @@ -16,7 +17,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('06c927dcbee2bf63e4960441ccb9bea55d12aa83078e5d71e9832d52fd1966aa') +sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index dc3c88a51..1faf9806b 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139292 2011-10-01 18:57:38Z ibiru $ +# $Id: PKGBUILD 140889 2011-10-20 05:42:36Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c5e8ba08f3c7ba12b5f4062c9b5bcef58383d1e3ec26161eb8bcf49dfea62ff5') +sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 1837e56bc..94d5475bc 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139294 2011-10-01 18:57:41Z ibiru $ +# $Id: PKGBUILD 140891 2011-10-20 05:42:38Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" @@ -15,7 +15,7 @@ optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('51c171a6b8a36ebe0b251d0b4d0acb360b5d7738fe8106006ea5504c03ad4932') +sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index 2f02992f5..fb899dd13 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139296 2011-10-01 18:57:45Z ibiru $ +# $Id: PKGBUILD 140893 2011-10-20 05:42:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d8595b09ecbb3c94cd4a655f5fb56cd585fd9441038ad334cba29b92d592279d') +sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 673fca110..fe639422f 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 139301 2011-10-01 18:57:53Z ibiru $ +#$Id: PKGBUILD 140897 2011-10-20 05:42:44Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5bd7dbe18f983aae237517d1eb4b070295c7b848d16c2a9d0a8a6046ea0801bc') +sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index c89add260..7edd769fe 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139305 2011-10-01 18:58:00Z ibiru $ +# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.2.0.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b53e1429930294872b64987bf18e8f2cf07adaac5b1a8c9c15d2fb95ea1e8b2b') +sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index addb04676..d627522a0 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139307 2011-10-01 18:58:03Z ibiru $ +# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f') +sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 16f44063a..0d91ed969 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139313 2011-10-01 18:58:13Z ibiru $ +# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d66f97f6cff716dd3c612f1a17b0e2b5dfb138deb92ea3d0a782a0144a7eab95') +sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index b1ac14f85..1e098f700 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139317 2011-10-01 18:58:19Z ibiru $ +# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e') +sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index a69a3ff75..377a7c9bb 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ +# $Id: PKGBUILD 140969 2011-10-20 06:58:10Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,16 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz -fix_color_crash.patch) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') + upower.patch) +sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d' + 'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_color_crash.patch" + + # Fix suspend via key + patch -Np1 -i "$srcdir/upower.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch new file mode 100644 index 000000000..36dad59e3 --- /dev/null +++ b/extra/gnome-settings-daemon/upower.patch @@ -0,0 +1,28 @@ +diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:19:31.818642262 +0200 ++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:23:55.127492221 +0200 +@@ -2066,15 +2066,15 @@ + (GAsyncReadyCallback) power_keyboard_ready_cb, + manager); + +- g_dbus_proxy_new (manager->priv->connection, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", +- NULL, +- (GAsyncReadyCallback) upower_ready_cb, +- manager); ++ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, ++ NULL, ++ "org.freedesktop.UPower", ++ "/org/freedesktop/UPower", ++ "org.freedesktop.UPower", ++ NULL, ++ (GAsyncReadyCallback) upower_ready_cb, ++ manager); + } + + static void diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index caf138427..3116f3315 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139662 2011-10-04 16:16:39Z ibiru $ +# $Id: PKGBUILD 140909 2011-10-20 05:43:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeShell" @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324') +sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 229fe1b37..7f26b0a44 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139324 2011-10-01 18:58:30Z ibiru $ +# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c') +sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index cae5ded12..c4ee90d1c 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139326 2011-10-01 18:58:34Z ibiru $ +# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1') +sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index b9f7c6a4d..a6d46c6ab 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139328 2011-10-01 18:58:37Z ibiru $ +# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.2.0.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('49b8177fcc6693690eceef207f78173f0ca34bdef873a6c1fed90bef28791bc1') +sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 82c43da59..f860a5fad 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 117703 2011-04-04 16:40:52Z ibiru $ +# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') makedepends=('intltool' 'gnome-doc-utils' 'nautilus') options=('!emptydirs' '!libtool') install=gnome-user-share.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1987d08ebb88bd3fecd7c76d2d9549dba2c7132a7c2b3cfe68fdc2a24260fafe') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD index b3354b31f..50c0ecbb1 100644 --- a/extra/gnome-utils/PKGBUILD +++ b/extra/gnome-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139332 2011-10-01 18:58:41Z ibiru $ +# $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-utils -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-utils.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('532e071ad772afa9bcd116144bc6b644c8af3daf2eb3f76f6fa306aced1ef5f8') +sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 5bbd882c0..37e19bfb2 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $ +# $Id: PKGBUILD 141031 2011-10-22 05:09:05Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.7 -pkgrel=2 +pkgver=2.4.8 +pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnucash.org" license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' - 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') +depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' 'perl-finance-quote: for stock information lookups' @@ -18,8 +17,7 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f85c8bfd165b2605a7853f579808823') -sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9') +sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index b57eefce4..6c9daaaa4 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $ +# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.1.17 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') -makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql') +makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' + 'rest' 'libtracker-sparql') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' - 'quvi: Youtube plugin' + 'libquvi: Youtube plugin' 'sqlite3: Podcasts plugin' 'gmime: Podcasts plugin' 'sqlite3: Bookmarks plugin' diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 432627371..ef7f376cc 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139885 2011-10-05 19:06:47Z andrea $ +# $Id: PKGBUILD 141228 2011-10-26 22:25:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=2.13.91 -pkgrel=2 +pkgver=2.14.0 +pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ optdepends=('gstreamer0.10-base: video support') options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90') +sha256sums=('9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 7337b409c..198a7c697 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $ +# $Id: PKGBUILD 140923 2011-10-20 05:43:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.6 -pkgrel=2 +pkgver=2.24.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,17 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch - gtk2-dont-ellipsize-filters.diff) -sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8') + xid-collision-debug.patch) +sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd "${srcdir}/gtk+-${pkgver}" patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=657949 - patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -36,7 +32,7 @@ build() { } package_gtk2() { - pkgdesc="The GTK+ Toolkit (v2)" + pkgdesc="GTK+ is a multi-platform toolkit (v2)" install=gtk2.install depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 2c9844ed0..dcea02a80 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $ +# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.0 -pkgrel=2 -pkgdesc="The GTK+ Toolkit (v3)" +pkgver=3.2.1 +pkgrel=1 +pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" install=gtk3.install @@ -14,15 +14,12 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz - settings.ini - a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45) -sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2') + settings.ini) +sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/a11y.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 332d577d9..7ffd4199c 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139348 2011-10-01 18:59:07Z ibiru $ +# $Id: PKGBUILD 140927 2011-10-20 05:43:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('a4e50ac159fe49ddac07a3d0fba386ac90b404afce770a89e6077580578c38af') +sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index aa8d3101c..0ddf24551 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $ +# $Id: PKGBUILD 140929 2011-10-20 05:43:47Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4') +sha256sums=('52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index e90b0a97a..0a0575363 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139354 2011-10-01 18:59:17Z ibiru $ +# $Id: PKGBUILD 140931 2011-10-20 05:43:50Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42aacc32beeb0ebb24db519aaceeb184e4212fdd7732bd7b0f6a15f00afc9501') +sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 34790722a..eea981de0 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 139360 2011-10-01 18:59:26Z ibiru $ +# $Id: PKGBUILD 140933 2011-10-20 05:43:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.0 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' - 'libarchive' 'libgdu' 'pkgconfig' 'intltool' - 'libimobiledevice' 'avahi' 'dconf') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8') +sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index 19a5223fe..26916756b 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139476 2011-10-02 02:49:32Z eric $ +# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $ # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> pkgname=hplip -pkgver=3.11.7 -pkgrel=2 +pkgver=3.11.10 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" license=('GPL') -makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat') + 'net-snmp>=5.7.1') +makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -19,22 +19,25 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - hplip-cups-1.5.0-compatibility.patch) -md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1' - 'f4422ee0dc842e1a53b75c24f468d65c' - 'a767000ce920e9f7f6a5b0a8e4392ef9') +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('6143f30f3b6905ef22105176a3b80db0' + '396bbd8c5cc92aa8295e5bcb508692f3') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch" export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + # fix sysfs rules + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + data/rules/56-hpmud_support.rules + ./configure --prefix=/usr \ --enable-qt4 \ --enable-foomatic-rip-hplip-install \ @@ -51,21 +54,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - rm -rf "$pkgdir/etc/sane.d" - # remove autostart of hp-daemon - rm -r "$pkgdir/etc/xdg" - # move udev rules to /lib/udev/rules.d - mkdir -p "$pkgdir/lib/udev/rules.d" - mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" - rm -r "$pkgdir/etc/udev" - # remove lp user, it's not used on archlinux - sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - -e 's|"bin/sh|"/bin/sh|g' \ - "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} } - diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD new file mode 100644 index 000000000..5aa4b468f --- /dev/null +++ b/extra/icedtea-web-java7/PKGBUILD @@ -0,0 +1,97 @@ +# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=icedtea-web-java7 +pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') +pkgver=1.1.3 +#_date=20110925 +#pkgrel=0.${_date}.1 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org/wiki/IcedTea-Web" +license=('GPL2') +makedepends=('jdk7-openjdk' 'zip' 'xulrunner') +source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz + http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) + #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz +md5sums=('0e2e653c7436d81edcbc1d4255571ab6') +sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37') + +_javaver=7 +_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk + +mksource() { + mkdir /tmp/${pkgbase}-${_date} + pushd /tmp/${pkgbase}-${_date} + hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date} + rm -rf ${pkgbase}-${_date}/.hg* + tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz * + popd +} + +build() { + cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + + #. /etc/profile.d/jre.sh + . /etc/profile.d/jre7-openjdk.sh + #. /etc/profile.d/jdk.sh + . /etc/profile.d/jdk7-openjdk.sh + + autoreconf --force --install + + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-jdk-home=${_jvmdir} + make +} + +check() { + cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + make -k check +} + + +package_icedtea-web-java7() { + + pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" + depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + install=${pkgname}.install + + cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="${pkgdir}" install-exec-local install-data-local + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} + install -m644 javaws.png ${pkgdir}/usr/share/pixmaps + install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications + # remove splitted doc files + rm -rf ${pkgdir}/usr/share/doc + + # link binaries into /usr/bin + jre/bin + install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}/${_jvmdir}/bin + for file in *; do + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin + ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin + done + popd + + # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml + install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ +} + +package_icedtea-web-java7-doc() { + + pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" + + cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}" +# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems +} diff --git a/extra/icedtea-web-java7/icedtea-web-java7.install b/extra/icedtea-web-java7/icedtea-web-java7.install new file mode 100644 index 000000000..80312d4a6 --- /dev/null +++ b/extra/icedtea-web-java7/icedtea-web-java7.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD new file mode 100644 index 000000000..84488e042 --- /dev/null +++ b/extra/java7-openjdk/PKGBUILD @@ -0,0 +1,263 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') +pkgbase=java7-openjdk +_java_ver=7 +_openjdk_build=b147 +_openjdk_date=27_jun_2011 +_icedtea_ver=2.0 +_date=20110922 + +# check "${srcdir}/icedtea7"/Makefile.am +_CORBA_CHANGESET=4d9e4fb8af09 +_HOTSPOT_CHANGESET=b28ae681bae0 +_JAXP_CHANGESET=948e734135ea +_JAXWS_CHANGESET=a2ebfdc9db7e +_JDK_CHANGESET=2054526dd141 +_LANGTOOLS_CHANGESET=9b85f1265346 +_OPENJDK_CHANGESET=0a76e5390e68 + +pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org" +license=('custom') +makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping + 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib' + 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2') +source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz + http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + fontconfig-paths.diff + fix_corba_cmds_path.diff + openjdk7_fix_jdk_cmds_path.diff + openjdk7_nonreparenting-wm.diff + jdk7-openjdk.profile + jdk7-openjdk.profile.csh + jre7-openjdk.profile + jre7-openjdk.profile.csh + jconsole.desktop + policytool.desktop) + +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +noextract=("${_OPENJDK_CHANGESET}.tar.gz" + "${_CORBA_CHANGESET}.tar.gz" + "${_JAXP_CHANGESET}.tar.gz" + "${_JAXWS_CHANGESET}.tar.gz" + "${_JDK_CHANGESET}.tar.gz" + "${_LANGTOOLS_CHANGESET}.tar.gz" + "${_HOTSPOT_CHANGESET}.tar.gz") +md5sums=('752721a037a625001fad7a5fc2013f60' + 'ffb12013564794e9abbffbbbd0c58502' + '8f8d222d0a6d363d06b40576da5f1ea2' + '4abf34372e34cccd74ad337e487ed790' + 'f2f40590a83889b8aa1d4631b705092d' + 'd3beed0118bbd93d4651af762eb748c7' + 'c8617700b4bd6cd5de1257bc36509bed' + 'f10b711b0c784df8707808d9d0f52abd' + 'ee1afda124d5927345014ab382ef581e' + 'f7e7a212e50abb56a6ef1a2b1bd27405' + 'c195c4865b84d9e2e0fd71ac6d88eadb' + '203640d6e79e41b0065e016818c17ccd' + 'b7b8996448c7b4fa7dd2d744488ed3bd' + 'cdabafad0ec413d9a983888bf445a443' + '612b0fec7e0943c37a6de77c43622007' + '62443459da0cb28181feb260dc0e5ce7' + '8e346f19a69b11b8dc4fcd8ea9d9d8f1' + 'b6357228d29836504a90abe006d86e56') + +# source PKGBUILD && mksource +#makedepends+=('mercurial') +mksource() { + mkdir /tmp/icedtea7-${_date} + pushd /tmp/icedtea7-${_date} + hg -v clone http://icedtea.classpath.org/hg/icedtea7 + rm -rf icedtea7/.hg* + tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz * + popd +} + +build() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + + unset JAVA_HOME + unset CLASSPATH + # default is to build with first found java-environment found in our repos - is jdk7-openjdk + [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh + + unset MAKEFLAGS + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + + . /etc/profile.d/apache-ant.sh + + cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + + # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK: +# autoreconf --force --install + + ./configure \ + --disable-bootstrap \ + --with-parallel-jobs="${MAKEFLAGS/-j}" \ + --disable-tests \ + --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \ + --with-jdk-home=${JAVA_HOME} \ + --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ + --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ + --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ + --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ + --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ + --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ + --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --enable-pulse-java \ +# --with-rhino #--help + + #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ + #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ + #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ + +# --enable-systemtap Enable inclusion of SystemTap trace support +# --enable-nss Enable inclusion of NSS security provider +# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed + + make +} + +check() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + make -k check +} + +package_jre7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas') + optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' + 'alsa-lib: for sound' + 'giflib: for gif format support') + provides=('java-runtime=7') + conflicts=('java-runtime') +# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos + backup=(etc/profile.d/jre7.sh) + install=jre7-openjdk.install + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" + + install -d -m755 ${pkgdir}/${_jvmdir}/jre/ + cp -a bin lib ${pkgdir}/${_jvmdir}/jre + + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src + + # Install man pages + pushd ../../j2re-image/man + install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ + install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 + install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 + popd + + # Install icons and menu entries + for s in 16 24 32 48 ; do + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ + install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ + ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png + done + + # Link binaries into /usr/bin + pushd ${pkgdir}/${_jvmdir}/jre/bin + install -m755 -d ${pkgdir}/usr/bin/ + for file in *; do + ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + done + popd + + # Link JKS keystore from ca-certificates-java + rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jre.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jre.csh + + # Install license + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ + install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + ${pkgdir}/usr/share/licenses/${pkgbase} +} + +package_jdk7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" + depends=('jre7-openjdk') + provides=('java-environment=7') + conflicts=('java-environment') + # replaces=('openjdk6') + backup=(etc/profile.d/jdk7.sh) + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" + + # Main files + install -m755 -d ${pkgdir}/${_jvmdir}/ + + cp -a demo include lib sample ${pkgdir}/${_jvmdir} + + # 'bin' files + pushd bin + install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + ${pkgdir}/usr/bin/ \ + ${pkgdir}/usr/share/man/{,ja/}man1/ + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + else + # Copy binary to jdk/bin/ + install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + # Copy man page + install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 + install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 + # Link from /bin/ + ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + + # Desktop files + install -m755 -d ${pkgdir}/usr/share/applications/ + install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/ + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh +} + +package_openjdk7-src() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" + + install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ + ${pkgdir}/${_jvmdir}/src.zip +} diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff new file mode 100644 index 000000000..842657880 --- /dev/null +++ b/extra/java7-openjdk/fix_corba_cmds_path.diff @@ -0,0 +1,33 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 +@@ -86,10 +86,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -136,7 +136,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -186,7 +186,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/extra/java7-openjdk/fontconfig-paths.diff b/extra/java7-openjdk/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/extra/java7-openjdk/fontconfig-paths.diff @@ -0,0 +1,134 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 +@@ -275,73 +275,61 @@ + + # Font File Names + +-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf +- +-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +- +-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf +- +-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf ++ ++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf ++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf ++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf ++ diff --git a/extra/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop new file mode 100644 index 000000000..ffbdd42ad --- /dev/null +++ b/extra/java7-openjdk/jconsole.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=/usr/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile new file mode 100644 index 000000000..91265cc86 --- /dev/null +++ b/extra/java7-openjdk/jdk7-openjdk.profile @@ -0,0 +1,6 @@ +export J2SDKDIR=/usr/lib/jvm/java-7-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk + +# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' +# in /etc/profile.d/jre7.sh diff --git a/extra/java7-openjdk/jdk7-openjdk.profile.csh b/extra/java7-openjdk/jdk7-openjdk.profile.csh new file mode 100644 index 000000000..cc7dc8ab1 --- /dev/null +++ b/extra/java7-openjdk/jdk7-openjdk.profile.csh @@ -0,0 +1 @@ +setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install new file mode 100644 index 000000000..d311e6e44 --- /dev/null +++ b/extra/java7-openjdk/jre7-openjdk.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre7.sh" +# update-desktop-database -q +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +# update-desktop-database -q +} + + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile new file mode 100644 index 000000000..c86ce857a --- /dev/null +++ b/extra/java7-openjdk/jre7-openjdk.profile @@ -0,0 +1,5 @@ +export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre +export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} + +# enable this for non-reparenting window managers +#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh new file mode 100644 index 000000000..a9aed27d1 --- /dev/null +++ b/extra/java7-openjdk/jre7-openjdk.profile.csh @@ -0,0 +1,5 @@ +setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" +setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" + +# enable this for non-reparenting window managers +#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff new file mode 100644 index 000000000..c68bd4441 --- /dev/null +++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -0,0 +1,24 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 +@@ -91,10 +91,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -141,7 +141,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff new file mode 100644 index 000000000..ba1a588e1 --- /dev/null +++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -0,0 +1,58 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 +@@ -102,7 +102,8 @@ + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -576,7 +577,7 @@ + // TODO: according to wikipedia, compiz is now reparenting. This should + // probably be updated. + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -762,9 +763,17 @@ + * supports WIN or _NET wm spec. + */ + else if (l_net_protocol.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } else if (win.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } + /* + * Check for legacy WMs. +@@ -775,6 +784,8 @@ + awt_wmgr = XWM.MOTIF_WM; + } else if (isOpenLook()) { + awt_wmgr = XWM.OPENLOOK_WM; ++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; + } +@@ -1289,6 +1300,7 @@ + res = new Insets(28, 6, 6, 6); + break; + case NO_WM: ++ case OTHER_NONREPARENTING_WM: + case LG3D_WM: + res = zeroInsets; + break; diff --git a/extra/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop new file mode 100644 index 000000000..702b44a6f --- /dev/null +++ b/extra/java7-openjdk/policytool.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=/usr/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 9aedb3d7d..92672f290 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139365 2011-10-01 18:59:34Z ibiru $ +# $Id: PKGBUILD 141211 2011-10-26 14:49:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.14.0 +pkgver=0.14.2 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz) -sha256sums=('821e90196673408a9293845e37ef572826a960a101096db9bcba45cf4c4afc56') +sha256sums=('b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 99f3206f2..72c6296a0 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0beta1 -_commit=90c59c37c68920a44860ff5b8f7bcc146850efcf +pkgver=0.9.0beta2 +_pkgver=0.8.90 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -17,14 +17,14 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('d6100be03b9114bffc079ef4b690a33e') +source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") +sha1sums=('9336049eb00f5e4fe7434e710eeb0bdfc22e0984') build() { cd "${srcdir}" mkdir build cd build - cmake ../networkmanagement \ + cmake ../networkmanagement-${_pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/kdeutils/CVE-2011-2725.patch b/extra/kdeutils/CVE-2011-2725.patch new file mode 100644 index 000000000..986bebc90 --- /dev/null +++ b/extra/kdeutils/CVE-2011-2725.patch @@ -0,0 +1,20 @@ +--- a/part/part.cpp ++++ b/part/part.cpp +@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo + if (!job->error()) { + const ArchiveEntry& entry = + m_model->entryForIndex(m_view->selectionModel()->currentIndex()); +- const QString fullName = +- m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString(); ++ ++ QString fullName = ++ m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString(); ++ ++ // Make sure a maliciously crafted archive with parent folders named ".." do ++ // not cause the previewed file path to be located outside the temporary ++ // directory, resulting in a directory traversal issue. ++ fullName.remove(QLatin1String("../")); ++ + ArkViewer::view(fullName, widget()); + } else { + KMessageBox::error(widget(), job->errorString()); diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index 80e63bfc3..f6c50a7b8 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140028 2011-10-05 19:12:50Z andrea $ +# $Id: PKGBUILD 140971 2011-10-20 07:26:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -17,7 +17,7 @@ pkgname=('kdeutils-ark' 'kdeutils-superkaramba' 'kdeutils-sweeper') pkgver=4.7.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -25,17 +25,31 @@ groups=('kde' 'kdeutils') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'CVE-2011-2725.patch') +sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4' + 'bc7428edb6851b4f3dc772bc88ace576379e93f2') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgbase}-${pkgver}/ark + patch -p1 -i "${srcdir}"/CVE-2011-2725.patch + + # Use Python2 + cd "${srcdir}"/${pkgbase}-${pkgver} + sed -i 's|/usr/bin/python|/usr/bin/python2|' \ + kcharselect/kcharselect-generate-datafile.py \ + superkaramba/examples/richtext/rtext.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py + + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } @@ -159,9 +173,6 @@ package_kdeutils-printer-applet() { make DESTDIR=$pkgdir install cd $srcdir/build/printer-applet/doc make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } package_kdeutils-superkaramba() { diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD index a32733fd7..432c6b015 100644 --- a/extra/kino/PKGBUILD +++ b/extra/kino/PKGBUILD @@ -1,26 +1,37 @@ -# $Id: PKGBUILD 56265 2009-10-20 20:59:02Z giovanni $ +# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=kino pkgver=1.3.4 -pkgrel=2 -pkgdesc="A non-linear DV editor." +pkgrel=4 +pkgdesc="A non-linear DV editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.kinodv.org/" license=('GPL') depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') -makedepends=('intltool') +makedepends=('intltool' 'v4l-utils') options=('!libtool') install=kino.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('52f8ce690e45a089e3edc6c7af61a05c') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'videodev-header.patch') +md5sums=('52f8ce690e45a089e3edc6c7af61a05c' + '940404c0eec3c9d954c289ceb52d15a6') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}"/videodev-header.patch + ./configure --prefix=/usr \ --with-udev-rules-dir=/lib/udev/rules.d - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - chown root:root -R $pkgdir/usr/share/kino/help + + # Fix permissions + chown -R root:root "${pkgdir}/usr/share/kino/help" } diff --git a/extra/kino/kino.install b/extra/kino/kino.install index 7dc309965..83b78df92 100644 --- a/extra/kino/kino.install +++ b/extra/kino/kino.install @@ -1,14 +1,13 @@ post_install() { - echo "update desktop mime database..." update-mime-database usr/share/mime 1> /dev/null update-desktop-database -q } + post_upgrade() { post_install $1 } post_remove() { - echo "update desktop mime database..." update-mime-database usr/share/mime 1> /dev/null update-desktop-database -q } diff --git a/extra/kino/videodev-header.patch b/extra/kino/videodev-header.patch new file mode 100644 index 000000000..01394fc47 --- /dev/null +++ b/extra/kino/videodev-header.patch @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" + diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index c9f882744..3c71a1460 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138121 2011-09-17 02:03:36Z allan $ +# $Id: PKGBUILD 141035 2011-10-22 08:18:19Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.2 +pkgver=4.3.3 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('18f5c5b351cfad0a0ab069592effd664') +md5sums=('91757a201c1030714ac1996f27437cc7') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -27,4 +27,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/lib -}
\ No newline at end of file +} diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 8c0e0c460..53b0aed9f 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139371 2011-10-01 18:59:41Z ibiru $ +# $Id: PKGBUILD 141224 2011-10-26 20:11:17Z heftig $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=4.99.4 +pkgver=5.0.0 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') @@ -12,12 +12,12 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') -makedepends=('intltool' 'gobject-introspection' 'java-environment' 'gtk-doc') +makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac') +sha256sums=('b8f14505d8e921b97b20a0ff99e10c611bd57c317b0f081e7f76bc2c87ae1fea') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 4fd3a2540..e98bc6ae5 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139379 2011-10-01 18:59:56Z ibiru $ +# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz gettext-not-xml.patch) -sha256sums=('7fdae4aad787759ed0d0124d66991311a24c8c9a3c9a46c56f62e4cc4575aea9' +sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5' '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3') build() { diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index ef0cd3637..353bc6673 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139387 2011-10-01 19:00:12Z ibiru $ +# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.0 +pkgver=2.36.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('db06af0f8c887abde427e5418e0e74bd39837a0f48a4161ff29607dfcd6b36ca') +sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 8e363599a..e9e202629 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139391 2011-10-01 19:00:17Z ibiru $ +# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('7cb92e6dbe8f20f4dba327fa078fb3caa35c0ae89445bbbdf1e7a17e5116f542') +sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD index 5f12019fc..1b7022396 100644 --- a/extra/liquidwar/PKGBUILD +++ b/extra/liquidwar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $ +# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $ # Maintainer: Jeff Mickey <jeff@archlinux.org> pkgname=liquidwar pkgver=5.6.4 -pkgrel=5 +pkgrel=6 pkgdesc="A unique multiplayer wargame" arch=('i686' 'x86_64' 'mips64el') url="http://www.ufoot.org/liquidwar/" @@ -12,12 +12,14 @@ depends=('allegro4') makedepends=('python2') install=liquidwar.install source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz - http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig) + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch) sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' - 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') + 'a262967d60e0f04ac5b99693144ef6b0038bb6c4' + 'e2102792c54a01b7cd14adb6d72404044175ec7e') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch" sed -i 's/python/python2/' doc/Makefile.in [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS diff --git a/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch new file mode 100644 index 000000000..446385624 --- /dev/null +++ b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch @@ -0,0 +1,18 @@ +--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 ++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 +@@ -100,12 +100,12 @@ + + data->privacy = privacy; + data->log = log; +- strncpy (data->metaserver, metaserver, URL_SIZE); ++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, URL_SIZE); +- strncpy (data->comment, comment, URL_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 3b9cc46f2..74ea2529f 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138700 2011-09-27 16:47:11Z giovanni $ +# $Id: PKGBUILD 141079 2011-10-23 13:48:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.09.19 +pkgver=2011.10.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('7834800179503377d7142b4bfbbf0dca') +md5sums=('fefff83a134a5561395b11057ad2fc09') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index a344cf176..1d1ff869f 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $ +# $Id: PKGBUILD 141066 2011-10-23 00:15:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -pkgname=mkvtoolnix +pkgbase=mkvtoolnix +pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=5.0.1 -pkgrel=1 -pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') -makedepends=('boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") +makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'\ + 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") md5sums=('93fbbe946de6013eca699c0c2a93a4e9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" # Disable automagic curl dep used for online update checking sed -i -e '/curl/d' configure.in @@ -26,13 +26,43 @@ build() { autoreconf ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui + --with-boost-libdir=/usr/lib rake } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" +package_mkvtoolnix-cli() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" + depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') + provides=('mkvtoolnix') + conflicts=('mkvtoolnix') + replaces=('mkvtoolnix') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mmg + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/applications + rm -rf "${pkgdir}"/usr/share/icons + rm -rf "${pkgdir}"/usr/share/mime +} + +package_mkvtoolnix-gtk() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" + depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') + install=mkvtoolnix.install + + cd "${srcdir}/${pkgbase}-${pkgver}" rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkv* + rm -rf "${pkgdir}"/usr/share/doc + rm -rf "${pkgdir}"/usr/share/locale + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* } diff --git a/extra/mkvtoolnix/mkvtoolnix.install b/extra/mkvtoolnix/mkvtoolnix.install new file mode 100644 index 000000000..74d9eb2ef --- /dev/null +++ b/extra/mkvtoolnix/mkvtoolnix.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + if [ -f usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime &> /dev/null + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + post_install +} diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index f11ba1f1f..0a65e8f60 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('65aeb0fb2c2eb5f0b06ec3aa8de5b3e2ccab02edd3a4a30adb7ef224baa74649') +sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 79276ebb6..68a57c53e 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $ +# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.4 +pkgver=0.16.5 pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') @@ -17,13 +17,14 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install changelog=ChangeLog -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1' +md5sums=('f7564cff12035f6a1112cce770655df7' 'e5669c2bff4031928531e52475addeb1') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-lastfm \ @@ -32,15 +33,18 @@ build() { --enable-documentation \ --disable-libwrap \ --disable-cue \ - --disable-sidplay + --disable-sidplay \ + --with-systemdsystemunitdir=/lib/systemd/system + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install - # set ours dirs in mpd.conf file + # set our dirs in mpd.conf file sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example @@ -50,8 +54,8 @@ package() { sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example - install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example + install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example" - install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd - install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd} + install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd" + install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd} } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 815858fe1..2cb667f70 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139397 2011-10-01 19:00:26Z ibiru $ +# $Id: PKGBUILD 140941 2011-10-20 05:44:03Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('225edd0dd1cdcc44e3220075728a07de7bafb8aa7e798583aa7602dcd45237c3') +sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 6613c1aad..af721f337 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138094 2011-09-16 08:53:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 141055 2011-10-22 18:07:50Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.16 +pkgver=5.5.17 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('462ab3752dd666ec06ca32f92673b59e' +md5sums=('dcb6a06e68c5e8f30f57b15300730c9c' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -102,7 +102,7 @@ package_mysql(){ pkgdesc="A fast SQL database server" backup=('etc/mysql/my.cnf') install=mysql.install - depends=('mysql-clients' 'net-tools') + depends=('mysql-clients') optdepends=('perl-dbi' 'perl-dbd-mysql') options=('emptydirs') diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index e4bb5007c..f66533aaa 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139401 2011-10-01 19:00:31Z ibiru $ +# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql') +depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd') +sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index 5fe3c71da..e382d9c4e 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137530 2011-09-08 19:55:05Z ibiru $ +# $Id: PKGBUILD 140945 2011-10-20 05:44:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=notification-daemon -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('74ccbedfe25c9559278ba35ef716125ada9ba0074fe7321a2271abfed5990661') +sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index a36a57435..9be938be0 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138456 2011-09-23 18:49:28Z ibiru $ +# $Id: PKGBUILD 141220 2011-10-26 15:42:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.12 +pkgver=3.13 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -10,9 +10,10 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.infradead.org/openconnect.html" depends=('libxml2' 'openssl' 'libproxy') +makedepends=('intltool') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2f4fceb3f921ca8deb3a7cbd19a5e008') +md5sums=('4364a779bfce66de243f39eeb7a39c1f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index e5004d6ca..d069bf092 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $ +# $Id: PKGBUILD 141099 2011-10-23 23:25:40Z eric $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64' 'mips64el') url="http://oprofile.sourceforge.net" @@ -29,7 +29,7 @@ package() { install -d "$pkgdir/var/lib/oprofile" # installing development libraries - FS#20089 - install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" + install -m644 libop/op_*.h libregex/op_*.h libutil/op_*.h libutil++/op_*.h libdb/odb.h "$pkgdir/usr/include" install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/" install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a" install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a" diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD index b0c654815..ffa00e5d3 100644 --- a/extra/pangomm/PKGBUILD +++ b/extra/pangomm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138625 2011-09-27 13:05:44Z ibiru $ +# $Id: PKGBUILD 141215 2011-10-26 14:54:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pangomm pkgname=('pangomm' 'pangomm-docs') -pkgver=2.28.3 +pkgver=2.28.4 pkgrel=1 arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('cf6eb58d58dc92df5c94012299e2c4f556ae55b4bafdf8f3768f74b7d60be0c3') +sha256sums=('778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD index 6da4e07c2..47c0062f7 100644 --- a/extra/polkit-gnome/PKGBUILD +++ b/extra/polkit-gnome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139416 2011-10-01 19:00:54Z ibiru $ +# $Id: PKGBUILD 140948 2011-10-20 05:44:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=polkit-gnome -pkgver=0.103 +pkgver=0.104 pkgrel=1 pkgdesc="PolicyKit integration for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz polkit-gnome-authentication-agent-1.desktop) -sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b' +sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94' 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') build() { diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 4a60a554c..0dc121bbf 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 140587 2011-10-17 08:15:19Z jgc $ +# $Id: PKGBUILD 141011 2011-10-21 10:45:03Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.18.0 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) -md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77') +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz + fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e) +md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77' + '8f4a296fdd98446858d5ea74d7c496ab') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf + + patch -Np1 -i "${srcdir}/fix_cairo.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-cairo-output \ diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index f5ee29640..6fe88d6a2 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $ +# $Id: PKGBUILD 141172 2011-10-25 11:07:35Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> +# Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix -pkgver=2.8.5 +pkgver=2.8.6 pkgrel=1 -pkgdesc='Secure, fast, easy to administer alternative to Sendmail' +pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' -arch=('i686' 'x86_64' 'mips64el') license=('custom') +arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80' +sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') @@ -60,5 +60,5 @@ package() { install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" cd "${pkgdir}" - patch -p0 < "${srcdir}"/aliases.patch + patch -p0 -i "${srcdir}"/aliases.patch } diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index b01befd3c..724d02fd6 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $ +# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,8 +7,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=1.0 -pkgrel=4 +pkgver=1.1 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -18,18 +18,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) options=(!emptydirs !libtool !makeflags) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit version-number.patch dont-require-dbus.patch) -sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530' - '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4') + $pkgbase.xinit) +sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -Np1 -i "$srcdir/version-number.patch" - patch -Np1 -i "$srcdir/dont-require-dbus.patch" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -44,7 +39,8 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc + libsamplerate) optdepends=('avahi: zeroconf support' 'bluez: bluetooth support' 'gconf: configuration through gconf (paprefs)' @@ -97,7 +93,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c) + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 0a2c96287..44cf408a9 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139423 2011-10-01 19:01:08Z ibiru $ +# $Id: PKGBUILD 141033 2011-10-22 07:52:40Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 arch=('i686' 'x86_64') url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) options=('!libtool') -sha256sums=('ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1') +sha256sums=('e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462') build() { cd "${srcdir}" diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD index ed5fb8b2a..93e1e3106 100644 --- a/extra/qtcurve-gtk2/PKGBUILD +++ b/extra/qtcurve-gtk2/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140659 2011-10-17 19:15:55Z ronald $ +# $Id: PKGBUILD 141029 2011-10-22 02:18:45Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.11 +pkgver=1.8.12 pkgrel=1 +pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64' 'mips64el') -groups=('qtcurve') +url="http://www.kde-look.org/content/show.php?content=40492" license=('GPL') -pkgdesc='A configurable set of widget styles for KDE and Gtk' -url='http://www.kde-look.org/content/show.php?content=40492' depends=('gtk2') -makedepends=('pkgconfig' 'cmake') +makedepends=('cmake') +groups=('qtcurve') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c') +sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f') build() { cd "${srcdir}" diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD index f49e53fac..96e5e179d 100644 --- a/extra/quodlibet/PKGBUILD +++ b/extra/quodlibet/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 134307 2011-08-02 21:13:14Z eric $ +# $Id: PKGBUILD 140990 2011-10-20 22:44:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quodlibet -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="An audio player written in pygtk" arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,7 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'media-player-info: for media devices support') options=('!makeflags') source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('354b411bd68b3ae4a687c35f6666265b') -sha1sums=('2521011633d0195084e5937eeeb01c0efefa69b1') +sha1sums=('21bc5fb988ca6c09959fc7212c05272a126a5be5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index 7caacdfef..9e75c2104 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140478 2011-10-15 10:11:04Z andyrtr $ +# $Id: PKGBUILD 141037 2011-10-22 08:22:04Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=1 pkgdesc="Ristretto is a image viewer for Xfce" arch=('i686' 'x86_64' 'mips64el') @@ -13,9 +13,9 @@ depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'gettext' 'pkg-config') options=('!libtool') groups=('xfce4-goodies') -source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) +source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) install=ristretto.install -md5sums=('4b0f58c00ef99f13ebf134979ee76980') +md5sums=('85e9b3d83309cdd84898f35b8d223121') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 80ea1a4b9..4dac5ba85 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $ +# $Id: PKGBUILD 140951 2011-10-20 05:44:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7' +sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2' '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') build() { diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 49419846b..d2258230d 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127374 2011-06-14 00:06:39Z giovanni $ +# $Id: PKGBUILD 141049 2011-10-22 14:30:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=5.41 +pkgver=5.42 pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives." url="http://smartmontools.sourceforge.net" @@ -17,7 +17,7 @@ backup=('etc/smartd.conf' source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ smartd.conf smartd.rc) -md5sums=('4577886bea79d4ff12bd9a7d323ce692' +md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a' '28c1b80c41dac52d433961dcfb4f70e0' 'fb30e07f87f2c1d99532e018291ad3e8') diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 854c11cc9..689723fa3 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136927 2011-09-03 00:05:20Z giovanni $ +# $Id: PKGBUILD 141128 2011-10-24 13:35:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=0.10.73 +pkgver=0.10.90 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('GPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=smb4k.install -source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f161a1b1146dc44217826901deb35c8') +source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28development%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('6e166eead700e0a21d4f324be4471e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/smb4k/smb4k.install b/extra/smb4k/smb4k.install index c5e097f49..91d7da03d 100644 --- a/extra/smb4k/smb4k.install +++ b/extra/smb4k/smb4k.install @@ -1,14 +1,10 @@ -# $Id: smb4k.install,v 1.2 2009/02/23 03:09:26 travis Exp $ -# arg 1: the new package version post_install() { echo "==> Note: To enable mounting and unmounting of smb/cifs shares as" echo "==> user, you will need to issue the following command as root:" - echo "# chmod +s \$(which mount.cifs) \$(which umount.cifs)" + echo "# chmod +s \$(which mount.cifs)" echo "==> These command will need to be re-run every upgrade of smbclient" } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { post_install $1 } diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 743cf732c..9523fa924 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134583 2011-08-06 08:22:40Z andrea $ +# $Id: PKGBUILD 141136 2011-10-24 17:18:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.7.0 +pkgver=2.7.2 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('52f216c82e731499bb25bf3b4cf0eecb') +md5sums=('0cc853aee90e40db49ac7cb25cdf3619') build() { cd "${srcdir}" diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index e4aafe2e3..721620a38 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139431 2011-10-01 19:01:21Z ibiru $ +# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtkso makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('cdefa909afe31403c118f5c4f356dcb4787161f5a4f4ee92054f84b4c13eb59b') +sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index df4a775e3..476f33695 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140532 2011-10-16 19:26:18Z ibiru $ +# $Id: PKGBUILD 141174 2011-10-25 11:30:46Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('071ed1b34ace45109188df73933609e4') +md5sums=('22dd16bdf4f987c602c719a1efc3d268') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 7519cf400..0eccfcb05 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139443 2011-10-01 19:01:43Z ibiru $ +# $Id: PKGBUILD 140955 2011-10-20 05:44:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulru } options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139') +sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -45,7 +45,8 @@ package_totem() { 'libepc: Publish Playlist plugin' 'libgdata: YouTube Browser plugin' 'bluez: Bemused plugin' - 'grilo-plugins: Browse sidebar (remote media)') + 'grilo-plugins: Browse sidebar (remote media)' + 'pyxdg: opensubtitles plugin') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -60,7 +61,7 @@ package_totem() { } package_totem-plugin() { - pkgdesc="Totem mozilla/firefox plugin" + pkgdesc="Totem plugin for web browsers" depends=("totem=${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 329ce8e55..7494ce1fc 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140581 2011-10-17 08:15:06Z jgc $ +# $Id: PKGBUILD 141014 2011-10-21 15:49:31Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.5 +pkgver=0.12.6 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b') +sha256sums=('4dc5fe0fe97d4095653935969b12c15888e620e5b6ef135331ce7f55af3654b8') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 5a6c35916..76b7e4407 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 140241 2011-10-10 15:24:45Z ibiru $ +# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.41 -pkgrel=2 +pkgver=2.42 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz transmissiond transmissiond.conf) -md5sums=('0d0a061dfb92c0cb359dc531d5da0a94' +md5sums=('50f6dd76c5c01f45d5ed20783c686815' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { @@ -43,7 +43,7 @@ package_transmission-cli() { package_transmission-gtk() { pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('notification-daemon: Desktop notification support' 'transmission-cli: daemon and web support') install=transmission-gtk.install diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD index f6272e2a9..ff3a03d79 100644 --- a/extra/truecrypt/PKGBUILD +++ b/extra/truecrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $ +# $Id: PKGBUILD 141202 2011-10-25 22:33:47Z eric $ # Maintainer: Paul Mattal <paul.archlinux.org> pkgname=truecrypt -pkgver=7.0a -pkgrel=3 +pkgver=7.1 +pkgrel=1 pkgdesc="Free open-source cross-platform disk encryption software" url="http://www.truecrypt.org/" arch=('i686' 'x86_64' 'mips64el') @@ -15,33 +15,36 @@ conflicts=('truecrypt-utils') replaces=('truecrypt-utils') # N.B. Truecrypt's web-based source download is incompatible with # makepkg. Source has been placed on ftp.archlinux.org instead -source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \ +source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ "${pkgname}.desktop" \ "${pkgname}-arch-detection.patch") +md5sums=('a8268630a870faff07af940f63fb29eb' + 'ddee7c4b2419ecb44b02c8294a08fbed' + 'ce6a707b79411e82e8e558aa03e764b0' + '183b9bf04a943454d4e216130bcbac01' + '00ea70fa8437de877b31b027ac2b4060') build() { - export PKCS11_INC="${srcdir}/pkcs-2.20" - - cd ${srcdir}/${pkgname}-${pkgver}-source || return 1 + cd "${srcdir}/${pkgname}-${pkgver}-source" # Work around buggy CPU type detection - patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1 + patch -Np1 -i ../${pkgname}-arch-detection.patch # Build - make || return 1 + make PKCS11_INC="${srcdir}/pkcs-2.20" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-source" # Install Binary - install -D -m755 Main/${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1 + install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" # Install Desktop file and Icon - install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 - install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm ${pkgdir}/usr/share/pixmaps/truecrypt.xpm || return 1 + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" # Install License - install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/License.txt || return 1 + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" } -md5sums=('0a61616bc5c5ad90e876b4014c004ac9' - 'ce6a707b79411e82e8e558aa03e764b0' - '183b9bf04a943454d4e216130bcbac01' - '00ea70fa8437de877b31b027ac2b4060') diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 8fbcfcc5a..a8bf6cf0e 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139451 2011-10-01 19:01:59Z ibiru $ +# $Id: PKGBUILD 140957 2011-10-20 05:44:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9ba0d13000d81d0e47f456b138f52ef2cb7a603c71381993952acc87c25e2e61') +sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index c154f2fbd..13592bdf8 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139453 2011-10-01 19:02:04Z ibiru $ +# $Id: PKGBUILD 140959 2011-10-20 05:44:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2b22737aa84c15b07815d47392f9a6ef4cf6f9410cf7024bbae538496e2eda37') +sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 610261ccd..87ae483fc 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139455 2011-10-01 19:02:07Z ibiru $ +# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.30.0 +pkgver=0.30.1 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('4b4e13b46e026f1ba088a5bdf9786a339fedb88438f0e094bc7afe5e376be410') +sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64') build() { cd "${srcdir}/vte-${pkgver}" diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index b19995eaf..95801df8c 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111485 2011-02-27 10:22:27Z thomas $ +# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" @@ -14,14 +14,17 @@ backup=(etc/watchdog.conf etc/conf.d/wd_keepalive) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.sh - watchdog.cf) + watchdog.cf + watchdog-5.9-use-oom_score_adj.patch) md5sums=('d7cae3c9829f5d9a680764f314234867' '854451f554718b55186599faaa8d85f6' - '01c1e2e13f515131180b4ebe9b8b7cc3') + '01c1e2e13f515131180b4ebe9b8b7cc3' + '9a1ab454e42a7f2969ef6bf2da8a4543') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -31,14 +34,14 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" for fil in watchdog wd_keepalive ; do - install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} - install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} + install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} + install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} done - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive - sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive + sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive } diff --git a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch new file mode 100644 index 000000000..90508d777 --- /dev/null +++ b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch @@ -0,0 +1,91 @@ +diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c +--- watchdog-5.9.orig/src/watchdog.c 2010-06-16 15:45:51.000000000 +0200 ++++ watchdog-5.9/src/watchdog.c 2011-10-23 15:51:58.631689778 +0200 +@@ -636,7 +636,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); ++ filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); + if (!filename_buf) { + error(progname); + exit(1); +@@ -886,11 +886,19 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); +- (void) fclose(fp); ++ fprintf(fp, "-1000\n"); ++ (void) fclose(fp); ++ } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } + } + + /* main loop: update after <tint> seconds */ +diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c +--- watchdog-5.9.orig/src/wd_keepalive.c 2010-06-16 15:45:49.000000000 +0200 ++++ watchdog-5.9/src/wd_keepalive.c 2011-10-23 15:50:43.061563281 +0200 +@@ -212,7 +212,7 @@ + FILE *fp; + char *configfile = CONFIG_FILENAME; + char *filename_buf; +- pid_t child_pid; ++ pid_t pid, child_pid; + int count = 0; + int c; + /* allow all options watchdog understands too */ +@@ -284,7 +284,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); ++ filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); + if (!filename_buf) { + error(progname); + exit(1); +@@ -363,9 +363,10 @@ + #endif + + /* tuck my process id away */ ++ pid = getpid(); + fp = fopen(KA_PIDFILE, "w"); + if ( fp != NULL ) { +- fprintf(fp, "%d\n", getpid()); ++ fprintf(fp, "%d\n", pid); + (void) fclose(fp); + } + +@@ -403,12 +404,20 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", getpid()); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); ++ fprintf(fp, "-1000\n"); + (void) fclose(fp); + } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } ++ } + + /* main loop: update after <tint> seconds */ + while ( _running ) { diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index cc551e671..09e7c3a69 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135812 2011-08-18 15:04:52Z andyrtr $ +# $Id: PKGBUILD 141059 2011-10-22 19:05:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.5 -pkgrel=3 +pkgver=0.3.6 +pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') +md5sums=('db2392b8e31738f79f0898f77eda8daa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 7916e1320..ac95cae6c 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108896 2011-02-04 18:32:02Z giovanni $ +# $Id: PKGBUILD 141085 2011-10-23 14:30:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.11 +pkgver=5.0.12 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.gz") -md5sums=('942e2d90b0bcd7d22765c8e3344fe118') +md5sums=('1147b6a993af384ba341cb91666c7e97') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD index 2e7aec3bf..3566c2582 100755 --- a/extra/xfburn/PKGBUILD +++ b/extra/xfburn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119475 2011-04-11 17:44:33Z andyrtr $ +# $Id: PKGBUILD 141077 2011-10-23 09:32:55Z andyrtr $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> # Contributor: Alois Nespor alois.nespor@gmail.com pkgname=xfburn pkgver=0.4.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') pkgdesc="a simple CD/DVD burning tool based on libburnia libraries" url="http://goodies.xfce.org/projects/applications/xfburn" @@ -14,11 +14,17 @@ install=${pkgname}.install depends=('libburn>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26' 'hicolor-icon-theme' 'desktop-file-utils' 'librsvg') makedepends=('intltool') -source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('147cdc2d909e751125be16103b8dc81f') +source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2 + fix_empty_dir_segfault.diff) +md5sums=('147cdc2d909e751125be16103b8dc81f' + '82a85be2442c42ab93de95e21c6c11b0') build() { cd ${srcdir}/$pkgname-$pkgver + + # fix https://bugs.archlinux.org/task/26121 + patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff + ./configure --prefix=/usr \ --enable-gstreamer \ --enable-dbus \ diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff new file mode 100644 index 000000000..af3fe07c8 --- /dev/null +++ b/extra/xfburn/fix_empty_dir_segfault.diff @@ -0,0 +1,48 @@ +--- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 ++++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); + diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index df9b426b5..2a516c7fc 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 126312 2011-06-04 15:24:03Z andyrtr $ +# $Id: PKGBUILD 141039 2011-10-22 08:26:43Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.4.1 +pkgver=0.5.4.2 pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" groups=('xfce4-goodies') @@ -14,7 +14,7 @@ depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8512c0b180004e1150d8c05255c202d8') +md5sums=('b79f7c65f8155cb77d99dcf9716bb38b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 29fa8a40d..94ee20a94 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140277 2011-10-11 21:28:03Z jgc $ +# $Id: PKGBUILD 141122 2011-10-24 13:18:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.1 -pkgrel=2 +pkgver=1.11.1.901 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -18,11 +18,11 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd' +sha1sums=('bc72d860c34868aa6b1823230cb7f13136ceb092' '0249b892f27243d8fe6fe6d226bf4c2391cedf49' '962fecc159c128728f14e8ba231c5b00391ff4ac' 'd9f7d9553e772c2682c15079019d30c658a4f83b' - 'd73125bf93aea09b0beb55e75c510b9f72f5d21a' + 'cd9291fe1fa1b497aa74675afeeb025fe6b23b95' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') @@ -42,7 +42,7 @@ build() { # Add post-release patches from 1.11 branch patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch index 3c59c27c9..a62524bdb 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/git-fixes.patch @@ -1,288 +1,56 @@ -From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Wed, 15 Sep 2010 01:35:21 +0000 -Subject: Fix pixmap double-frees on error paths. - -If AddResource fails, it will automatically free the object that was -passed to it by calling the appropriate deleteFunc; and of course -FreeResource also calls the deleteFunc. In both cases it's wrong to call -the destroy hook manually. - -Commit by Jamey Sharp and Josh Triplett. - -Signed-off-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Josh Triplett <josh@joshtriplett.org> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Aaron Plattner <aplattner@nvidia.com> -(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467) ---- -diff --git a/Xext/shm.c b/Xext/shm.c -index b08af82..4141a8f 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -991,7 +991,6 @@ CreatePmap: - pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pMap->drawable.id = newPix->info[j].id; - if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) { -- (*pScreen->DestroyPixmap)(pMap); - result = BadAlloc; - break; - } -@@ -1002,10 +1001,8 @@ CreatePmap: - } - - if(result == BadAlloc) { -- while(j--) { -- (*pScreen->DestroyPixmap)(pMap); -+ while(j--) - FreeResource(newPix->info[j].id, RT_NONE); -- } - free(newPix); - } else - AddResource(stuff->pid, XRT_PIXMAP, newPix); -@@ -1110,7 +1107,6 @@ CreatePmap: - { - return Success; - } -- pDraw->pScreen->DestroyPixmap(pMap); - } - return BadAlloc; - } -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 192c8c3..f8200b1 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -1419,7 +1419,6 @@ CreatePmap: - } - if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) - return Success; -- (*pDraw->pScreen->DestroyPixmap)(pMap); - } - return BadAlloc; - } --- -cgit v0.9.0.2-2-gbebe -From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Tue, 30 Aug 2011 22:46:52 +0000 -Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices - -The corresponding DeviceIntPtr wasn't being gotten properly, -resulting in BadDevice from dixLookupDevice(). - -Signed-off-by: Carlos Garnacho <carlosg@gnome.org> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8) ---- -diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c -index ae43433..5cdd8ac 100644 ---- a/Xi/xipassivegrab.c -+++ b/Xi/xipassivegrab.c -@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client) - REQUEST(xXIPassiveUngrabDeviceReq); - REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq); - -- rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); -- if (rc != Success) -- return rc; -+ if (stuff->deviceid == XIAllDevices) -+ dev = inputInfo.all_devices; -+ else if (stuff->deviceid == XIAllMasterDevices) -+ dev = inputInfo.all_master_devices; -+ else -+ { -+ rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); -+ if (rc != Success) -+ return rc; -+ } - - if (stuff->grab_type != XIGrabtypeButton && - stuff->grab_type != XIGrabtypeKeycode && --- -cgit v0.9.0.2-2-gbebe -From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001 -From: Sam Spilsbury <sam.spilsbury@canonical.com> -Date: Wed, 14 Sep 2011 01:58:34 +0000 -Subject: Remove the SendEvent bit (0x80) before doing range checks on event type. - -Some extension libraries may set this bit before converting the event to -wire protocol and as such range checking the event will cause an invalid -BadValue error to result. As the documentation suggests the the bit -should be "forced on", remove it before doing range checks and continue -to force it on in the server. - -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39) ---- -diff --git a/dix/events.c b/dix/events.c -index 8a4c6b9..9e58edb 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5224,6 +5224,8 @@ CloseDownEvents(void) - InputEventList = NULL; - } - -+#define SEND_EVENT_BIT 0x80 -+ - /** - * Server-side protocol handling for SendEvent request. - * -@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client) - - REQUEST_SIZE_MATCH(xSendEventReq); - -+ /* libXext and other extension libraries may set the bit indicating -+ * that this event came from a SendEvent request so remove it -+ * since otherwise the event type may fail the range checks -+ * and cause an invalid BadValue error to be returned. -+ * -+ * This is safe to do since we later add the SendEvent bit (0x80) -+ * back in once we send the event to the client */ -+ -+ stuff->event.u.u.type &= ~(SEND_EVENT_BIT); -+ - /* The client's event type must be a core event type or one defined by an - extension. */ - -@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->propagate; - return BadValue; - } -- stuff->event.u.u.type |= 0x80; -+ stuff->event.u.u.type |= SEND_EVENT_BIT; - if (stuff->propagate) - { - for (;pWin; pWin = pWin->parent) --- -cgit v0.9.0.2-2-gbebe -From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001 -From: Alan Hourihane <alanh@vmware.com> -Date: Wed, 05 Oct 2011 02:42:46 +0000 -Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized. - -Signed-off-by: Alan Hourihane <alanh@vmware.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e) +From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Mon, 17 Oct 2011 20:26:12 +0000 +Subject: Fix CVE-2011-4028: File disclosure vulnerability. + +use O_NOFOLLOW to open the existing lock file, so symbolic links +aren't followed, thus avoid revealing if it point to an existing +file. + +Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> +Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> +(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34) --- -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index fbac124..d2bcb84 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c) - goto bail; - } - *new_closure = *c; -- c = new_closure; - -- len = c->endReq - c->pElt; -- c->data = malloc(len); -- if (!c->data) -+ len = new_closure->endReq - new_closure->pElt; -+ new_closure->data = malloc(len); -+ if (!new_closure->data) - { -- free(c); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -- memmove(c->data, c->pElt, len); -- c->pElt = c->data; -- c->endReq = c->pElt + len; -+ memmove(new_closure->data, new_closure->pElt, len); -+ new_closure->pElt = new_closure->data; -+ new_closure->endReq = new_closure->pElt + len; - - /* Step 2 */ - -- pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen); -+ pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen); - if (!pGC) - { -- free(c->data); -- free(c); -+ free(new_closure->data); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -- if ((err = CopyGC(c->pGC, pGC, GCFunction | -+ if ((err = CopyGC(new_closure->pGC, pGC, GCFunction | - GCPlaneMask | GCForeground | - GCBackground | GCFillStyle | - GCTile | GCStipple | -@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c) - Success) - { - FreeScratchGC(pGC); -- free(c->data); -- free(c); -+ free(new_closure->data); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -+ c = new_closure; - origGC = c->pGC; - c->pGC = pGC; - ValidateGC(c->pDraw, c->pGC); -- -+ - ClientSleep(client, (ClientSleepProcPtr)doPolyText, c); - - /* Set up to perform steps 3 and 4 */ --- -cgit v0.9.0.2-2-gbebe -From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001 -From: Kirill Elagin <kirelagin@gmail.com> -Date: Tue, 04 Oct 2011 19:02:20 +0000 -Subject: Fix server crash due to invalid images - -See https://bugs.freedesktop.org/show_bug.cgi?id=39383 - -Signed-off-by: Kirill Elagin <kirelagin@gmail.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78) ---- -diff --git a/fb/fbpict.c b/fb/fbpict.c -index d1fd0cb..57c93fd 100644 ---- a/fb/fbpict.c -+++ b/fb/fbpict.c -@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict, - (pixman_format_code_t)pict->format, - pixmap->drawable.width, pixmap->drawable.height, - (uint32_t *)bits, stride * sizeof (FbStride)); -- -+ -+ if (!image) -+ return NULL; - - #ifdef FB_ACCESS_WRAPPER - #if FB_SHIFT==5 +diff --git a/os/utils.c b/os/utils.c +index 36cb46f..9e0acb6 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -316,7 +316,7 @@ LockServer(void) + /* + * Read the pid from the existing file + */ +- lfd = open(LockFile, O_RDONLY); ++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); + if (lfd < 0) { + unlink(tmp); + FatalError("Can't read lock file %s\n", LockFile); -- cgit v0.9.0.2-2-gbebe -From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001 -From: vdb@picaros.org <vdb@picaros.org> -Date: Sat, 17 Sep 2011 16:55:47 +0000 -Subject: Fix a rare memory leak - -Signed-off-by: Servaas Vandenberghe <vdb@picaros.org> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd) +From 12f65819ffb04103f170ecd7e281348de618fc4c Mon Sep 17 00:00:00 2001 +From: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Mon, 17 Oct 2011 20:27:35 +0000 +Subject: Fix CVE-2011-4029: File permission change vulnerability. + +Use fchmod() to change permissions of the lock file instead +of chmod(), thus avoid the race that can be exploited to set +a symbolic link to any file or directory in the system. + +Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> +Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> +(cherry picked from commit b67581cf825940fdf52bf2e0af4330e695d724a4) --- -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index c2814d4..3fae039 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn, - crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr)); - if (!crtcs) - { -+ free(crtc->gamma_red); - free(crtc); - return NULL; - } +diff --git a/os/utils.c b/os/utils.c +index 9e0acb6..d9aa65e 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -295,7 +295,7 @@ LockServer(void) + FatalError("Could not create lock file in %s\n", tmp); + (void) sprintf(pid_str, "%10ld\n", (long)getpid()); + (void) write(lfd, pid_str, 11); +- (void) chmod(tmp, 0444); ++ (void) fchmod(lfd, 0444); + (void) close(lfd); + + /* -- cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD index 9b1f56573..e7b850a1d 100644 --- a/extra/xorg-sessreg/PKGBUILD +++ b/extra/xorg-sessreg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113683 2011-03-10 14:43:23Z jgc $ +# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-sessreg -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="Register X sessions in system utmp/utmpx databases" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2) -sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a') +sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52') build() { cd "${srcdir}/sessreg-${pkgver}" diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD index 084e22b54..48c4b5ae9 100644 --- a/extra/xorg-xdpyinfo/PKGBUILD +++ b/extra/xorg-xdpyinfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113736 2011-03-10 15:06:24Z jgc $ +# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Display information utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2') +sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f') build() { cd "${srcdir}/xdpyinfo-${pkgver}" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 7fa89decf..bcc94143e 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 139457 2011-10-01 19:02:12Z ibiru $ +# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' - 'xz' 'bzip2' 'desktop-file-utils' 'dconf') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc') groups=('gnome') license=('GPL') @@ -15,7 +14,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6c33bb608614cc81b1c6d9009621a0618beb39e75bf14da0f091871edcd03172') +sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/sqlite3/PKGBUILD b/libre/sqlite3/PKGBUILD index 9cf45373a..9e380bd73 100644 --- a/libre/sqlite3/PKGBUILD +++ b/libre/sqlite3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ +# $Id: PKGBUILD 138719 2011-09-27 17:41:55Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -8,10 +8,10 @@ pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl') -_amalgamationver=3070603 +_amalgamationver=3070800 _amalgamationver2=${_amalgamationver/00/} pkgver=${_amalgamationver2//0/.} -pkgrel=1 +pkgrel=2 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -21,6 +21,10 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') +md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542' + 'c1cdbc5544034d9012e421e75a5e4890') +sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724' + 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD new file mode 100644 index 000000000..883de6480 --- /dev/null +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -0,0 +1,167 @@ +# $Id: PKGBUILD 57274 2011-10-25 08:56:21Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuild with each new glibc version + +_pkgbasename=glibc +pkgname=lib32-$_pkgbasename +pkgver=2.14.1 +pkgrel=1 +_glibcdate=20111025 +pkgdesc="GNU C Library for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +depends=("glibc>=$pkgver") +makedepends=('gcc-multilib>=4.6') +options=('!strip' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz + glibc-2.10-dont-build-timezone.patch + glibc-2.10-bz4781.patch + glibc-__i686.patch + glibc-2.12.1-static-shared-getpagesize.patch + glibc-2.12.2-ignore-origin-of-privileged-program.patch + glibc-2.13-futex.patch + glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4768ae77.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch + lib32-glibc.conf) +md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + '6970bcfeb3bf88913436d5112d16f588' + '7da8c554a3b591c7401d7023b1928afc' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'a8f4549c716cd37244fbf1ed059497f8') + +build() { + cd ${srcdir}/glibc + + # timezone data is in separate package (tzdata) + patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 + patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + patch -Np1 -i ${srcdir}/glibc-__i686.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 + # using Fedora "fix" as patch in that bug report causes breakages... + patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch + + # http://www.exploit-db.com/exploits/15274/ + # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # Revert commit causing issues with crappy DNS servers... + # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! + # Note that both these patches do not fix the issue completely: + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + export CC="gcc -m32" + + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + + echo "slibdir=/lib32" >> configparms + + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/glibc/configure --prefix=/usr \ + --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ + --with-headers=/usr/include \ + --enable-add-ons=nptl,libidn \ + --enable-kernel=2.6.27 \ + --with-tls --with-__thread \ + --enable-bind-now --without-gd \ + --without-cvs --disable-profile \ + --enable-multi-arch i686-unknown-linux-gnu + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some errors are expected - manually check log files + make -k check || true +} + +package() { + cd ${srcdir}/glibc-build + make install_root=${pkgdir} install + + rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} + + # We need one 32 bit specific header file + find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete + + # manually strip files as stripping libpthread-*.so and libthread_db.so + # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks + # valgrind on x86_64 + + cd $pkgdir + strip $STRIP_BINARIES usr/lib32/getconf/* + + strip $STRIP_STATIC usr/lib32/*.a \ + lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + + strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + lib32/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib32/{pt_chown,{audit,gconv}/*.so} + + # Dynamic linker + mkdir ${pkgdir}/lib + ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/ + + # Add lib32 paths to the default library search path + install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" + + # Symlink /usr/lib32/locale to /usr/lib/locale + ln -s ../lib/locale "$pkgdir/usr/lib32/locale" +} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch new file mode 100644 index 000000000..cf1a97a18 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch @@ -0,0 +1,42 @@ +diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -120,9 +120,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (eip); + /* Note: %esi is zero. */ + movl %esi,%ebp /* terminate the stack frame */ + #ifdef RESET_PID +@@ -155,7 +152,6 @@ + jmp L(haspid) + .previous + #endif +- cfi_endproc; + + cfi_startproc + PSEUDO_END (BP_SYM (__clone)) +diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -89,9 +89,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (rip); + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp +@@ -116,7 +113,6 @@ + /* Call exit with return value from function call. */ + movq %rax, %rdi + call HIDDEN_JUMPTARGET (_exit) +- cfi_endproc; + + cfi_startproc; + PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch new file mode 100644 index 000000000..d3abeff17 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch @@ -0,0 +1,13 @@ +timezone data has been split into the package sys-libs/timezone-data + +--- glibc-2.4/Makeconfig ++++ glibc-2.4/Makeconfig +@@ -931,7 +931,7 @@ + stdlib stdio-common libio malloc string wcsmbs time dirent \ + grp pwd posix io termios resource misc socket sysvipc gmon \ + gnulib iconv iconvdata wctype manual shadow gshadow po argp \ +- crypt nss localedata timezone rt conform debug \ ++ crypt nss localedata rt conform debug \ + $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) + + ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch new file mode 100644 index 000000000..e84754279 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch @@ -0,0 +1,11 @@ +--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c +@@ -28,7 +28,7 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE ++#if 0 && defined __ASSUME_AT_PAGESIZE + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); + #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch new file mode 100644 index 000000000..ce089b49c --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch @@ -0,0 +1,26 @@ +From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 9 Dec 2010 15:00:59 +0100 +Subject: [PATCH 1/1] Ignore origin of privileged program + +--- + ChangeLog | 5 +++++ + elf/dl-object.c | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/elf/dl-object.c b/elf/dl-object.c +index 22a1635..7674d49 100644 +--- a/elf/dl-object.c ++++ b/elf/dl-object.c +@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +-- +1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch new file mode 100644 index 000000000..6c9d2718e --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch @@ -0,0 +1,132 @@ +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 73b2a2f..9bd91e3 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index 9e30594..3890d00 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + +diff --git a/elf/dl-libc.c b/elf/dl-libc.c +index 7be9483..a13fce3 100644 +--- a/elf/dl-libc.c ++++ b/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff --git a/elf/rtld.c b/elf/rtld.c +index 4a9109e..617e30e 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff --git a/include/link.h b/include/link.h +index e877104..051b99a 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch new file mode 100644 index 000000000..28d5dd424 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-__i686.patch @@ -0,0 +1,13 @@ +diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile +--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 ++++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 +@@ -1,6 +1,7 @@ + # The mpn functions need a #define for asm syntax flavor. +-# Every i386 port in use uses gas syntax (I think). +-asm-CPPFLAGS += -DGAS_SYNTAX ++# Every i386 port in use uses gas syntax (I think). Don't replace ++# __i686 in __i686.get_pc_thunk.bx. ++asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 + + # The i386 `long double' is a distinct type we support. + long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf new file mode 100644 index 000000000..a1c8c4199 --- /dev/null +++ b/multilib-testing/lib32-glibc/lib32-glibc.conf @@ -0,0 +1,2 @@ +/lib32 +/usr/lib32 diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD new file mode 100644 index 000000000..7318e71dc --- /dev/null +++ b/social/asterisk/PKGBUILD @@ -0,0 +1,41 @@ +# Contributor: Alessio Biancalana <dottorblaster@gmail.com> + +pkgname=asterisk +pkgver=1.8.7.0 +pkgrel=1 +pkgdesc="A complete PBX solution" +arch=('i686' 'x86_64') +url="http://www.asterisk.org" +license=('GPL') +depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') +makedepends=('postgresql' 'unixodbc' 'sqlite3') +optdepends=('libpri' 'libss7' 'openr2') +backup=(etc/asterisk/asterisk.conf) +source=(http://downloads.digium.com/pub/asterisk/releases/asterisk-$pkgver.tar.gz \ + asterisk \ + asterisk.logrotated) +install=$pkgname.install +md5sums=('5c6616a53fa3f300420ea17fd23abae9' + '59146273738605f1e011d8e7bed3561a' + '486e07a0a1405ea25ec5b1736034653e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} samples + + (cd ${pkgdir}/etc/asterisk +# for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done +ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default') +# cp ${srcdir}/modules.conf modules.conf + sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf + + install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk + install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk + } diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk new file mode 100644 index 000000000..f823caefc --- /dev/null +++ b/social/asterisk/asterisk @@ -0,0 +1,38 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/asterisk` +case "$1" in + start) + stat_busy "Starting Asterisk" + [ -z "$PID" ] && cd /var/lib/asterisk && /usr/sbin/asterisk -G asterisk -U asterisk + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon asterisk + stat_done + fi + ;; + stop) + stat_busy "Stopping Asterisk" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/asterisk/asterisk.pid &>/dev/null + rm_daemon asterisk + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install new file mode 100644 index 000000000..1a3b998b7 --- /dev/null +++ b/social/asterisk/asterisk.install @@ -0,0 +1,38 @@ +post_install() { + echo -n "adding asterisk system group... " + groupadd -g 5060 asterisk && echo "done." + echo -n "adding asterisk system user... " + useradd -c "Asterisk daemon" -u 5060 -d /var/lib/asterisk -g asterisk -s /bin/false asterisk \ + && echo "done." + passwd -l asterisk &>/dev/null + chown -R asterisk:asterisk /var/run/asterisk + chown -R asterisk:asterisk /var/log/asterisk + chown -R asterisk:asterisk /var/spool/asterisk + chown -R asterisk:asterisk /var/lib/asterisk + +cat << EOF +>>> +>>> To get Music on Hold working do pacman -S mpg123 +>>> To get the postgresql, unixodbc or sqlite2 modules working +>>> download the respective package and modify modules.conf to reflect +>>> your changes. +>>> +EOF + +} + +post_upgrade() { + if grep asterisk /etc/passwd &>/dev/null; then + /bin/true + else + post_install $1 + fi +} + +post_remove() { + echo -n -e "\nremoving asterisk system user... " + userdel asterisk && echo "done." +} +op=$1 +shift +$op $* diff --git a/social/asterisk/asterisk.logrotated b/social/asterisk/asterisk.logrotated new file mode 100644 index 000000000..f03d0acd3 --- /dev/null +++ b/social/asterisk/asterisk.logrotated @@ -0,0 +1,10 @@ +/var/log/asterisk/*_log /var/log/asterisk/messages { + create 640 asterisk asterisk + compress + missingok + notifempty + postrotate + /usr/sbin/asterisk -rx "logger reload" 1>/dev/null || true + endscript +} + diff --git a/social/dropbear/PKGBUILD b/social/dropbear/PKGBUILD new file mode 100644 index 000000000..2df24cb15 --- /dev/null +++ b/social/dropbear/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> +# Contributor: Jeremy Cowgar <jeremy@cowgar.com> + +pkgname=dropbear +pkgver=0.53.1 +pkgrel=1 +pkgdesc="Lightweight replacement for sshd" +arch=('i686' 'x86_64') +url="http://matt.ucc.asn.au/dropbear/dropbear.html" +license=('custom:BSD' 'custom:PD') +depends=('zlib') +source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \ + $pkgname-conf.d \ + $pkgname-rc.d) +sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393' + 'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c' + '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h + + ./configure --prefix=/usr + LIBS="-lcrypt" make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make prefix=${pkgdir}/usr install + +#man pages + install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1 + install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8 + install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8 + +#configuration files + install -d ${pkgdir}/etc/$pkgname + install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname + install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname + +#license file + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/social/dropbear/dropbear-conf.d b/social/dropbear/dropbear-conf.d new file mode 100644 index 000000000..6f3b8f0c5 --- /dev/null +++ b/social/dropbear/dropbear-conf.d @@ -0,0 +1,15 @@ +# the TCP port that Dropbear listens on +DROPBEAR_PORT="127.0.0.1:22" # Default to local-only. + +# any additional arguments for Dropbear +DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins. + +# specify an optional banner file containing a message to be +# sent to clients before they connect, such as "/etc/issue.net" +DROPBEAR_BANNER="" + +# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key) +#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key" + +# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key) +DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key" diff --git a/social/dropbear/dropbear-rc.d b/social/dropbear/dropbear-rc.d new file mode 100644 index 000000000..011880b3b --- /dev/null +++ b/social/dropbear/dropbear-rc.d @@ -0,0 +1,88 @@ +#!/bin/bash +daemon_name=dropbear + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/$daemon_name + +for port in $DROPBEAR_PORT; do + daemon_args="$daemon_args -p $port" +done + +[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER" +[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY" +[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY" +[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS" +[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid" +daemon_args="$daemon_args -P $DROPBEAR_PIDFILE" + +get_pid() { + PID='' + if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then + if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent" + PID="`< $DROPBEAR_PIDFILE`" + else # may not send signals to dropbear, because it's probably not running => remove pidfile + rm -f $DROPBEAR_PIDFILE + fi + fi +} + +case "$1" in + start) + stat_busy "Starting $daemon_name" + get_pid + if [ -z "$PID" ]; then + printhl "Checking for hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY + fi; + + $daemon_name $daemon_args # Make it Go Joe! + if [ $? -gt 0 ]; then + stat_die + else + add_daemon $daemon_name + stat_done + fi + else + stat_die + fi + ;; + + stop) + stat_busy "Stopping $daemon_name" + + get_pid + [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say! + if [ $? -gt 0 ]; then + stat_die + else + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + fingerprint) + stat_busy "Fingerprinting $daemon_name hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)" + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)" + fi; + ;; + + *) + echo "usage: $0 {start|stop|restart|fingerprint}" +esac +exit 0 diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD new file mode 100644 index 000000000..b60ca8401 --- /dev/null +++ b/social/openswan/PKGBUILD @@ -0,0 +1,46 @@ +# Contributor: Jan Fader <jan.fader@web.de> +pkgname=openswan +pkgver=2.6.36 +pkgrel=1 +pkgdesc="Open Source implementation of IPsec for the Linux operating system" +url="http://www.openswan.org" +license=('GPL' 'custom') +arch=('i686' 'x86_64') +depends=('iproute' 'gmp' 'perl') +backup=(etc/ipsec.conf \ + etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) +source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz + openswan.rc.d + compile.patch) + +build() { + # Create /etc/rc.d for init script, and license directory + mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} + + cd $srcdir/openswan-$pkgver + patch -p1 -i $srcdir/compile.patch + + # Change install paths to Arch defaults + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc + + make USE_XAUTH=true USE_OBJDIR=true programs +} + +package(){ + cd $srcdir/openswan-$pkgver + make DESTDIR=$pkgdir install + + # Change permissions in /var + chmod 755 $pkgdir/var/run/pluto + + # Copy License + cp LICENSE $pkgdir/usr/share/licenses/openswan + + # Install init script + install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan + # fix manpages + mv $pkgdir/usr/man $pkgdir/usr/share/ +} +md5sums=('b3a1733493520bb18729633b62ef8247' + '543d84162761b9cc9ec319e938c4dd2a' + '5540437bb334873da646e21ac9caa963') diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch new file mode 100644 index 000000000..8ddff67f2 --- /dev/null +++ b/social/openswan/compile.patch @@ -0,0 +1,11 @@ +--- openswan-2.6.23/Makefile 2009-09-09 02:42:54.000000000 +0200 ++++ Makefile 2009-12-30 10:13:53.000000000 +0100 +@@ -12,6 +12,8 @@ + # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + # for more details. + # ++CFLAGS=-fno-strict-aliasing ++CXXFLAGS=-fno-strict-aliasing + + + OPENSWANSRCDIR?=$(shell pwd) diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d new file mode 100755 index 000000000..30bd0d56e --- /dev/null +++ b/social/openswan/openswan.rc.d @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Openswan IPsec" + /etc/rc.d/ipsec --start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + stop) + stat_busy "Stopping Openswan IPsec" + /etc/rc.d/ipsec --stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon openswan + fi + ;; + restart) + stat_busy "Restarting Openswan IPsec" + /etc/rc.d/ipsec --restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + status) + /etc/rc.d/ipsec --status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD index 61702974c..f328607e7 100644 --- a/social/opentracker/PKGBUILD +++ b/social/opentracker/PKGBUILD @@ -1,19 +1,20 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=opentracker -pkgver=20110831 +pkgver=20111020 pkgrel=1 -pkgdesc='An open and free bittorrent tracker' +pkgdesc='An open and free bittorrent tracker (open mode)' arch=('i686' 'x86_64') url='http://erdgeist.org/arts/software/opentracker/' license=('custom:Beer' 'GPL') makedepends=('libowfat' 'cvs') depends=('bash' 'zlib') backup=('etc/opentracker/config') +install=${pkgname}.install source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" 'opentracker.rc.d' 'license.txt') -md5sums=('ad992e0b7e8f84ddab391da5307e67c6' +md5sums=('1dbace4895b4e1d290790f8ebacb2a2f' '390bde9d010e79ab1309c02dcf9972e8' '865211941e882c0aff5d36a22ac9efaa') @@ -41,18 +42,21 @@ build() { cd "${srcdir}/${_cvsmod}" msg 'Starting make...' - sed -e 's#PREFIX?=..#PREFIX?=/usr#' \ - -e 's#LIBOWFAT_HEADERS=$(PREFIX)/libowfat#LIBOWFAT_HEADERS=$(PREFIX)/include#' \ - -e 's#LIBOWFAT_LIBRARY=$(PREFIX)/libowfat#LIBOWFAT_LIBRARY=$(PREFIX)/lib#' \ - -e 's/#FEATURES+=-DWANT_ACCESSLIST_WHITE/FEATURES+=-DWANT_ACCESSLIST_WHITE/' \ - -e 's/#FEATURES+=-DWANT_RESTRICT_STATS/FEATURES+=-DWANT_RESTRICT_STATS/' \ - -e 's/FEATURES+=-DWANT_FULLSCRAPE/#FEATURES+=-DWANT_FULLSCRAPE/' \ - -i Makefile - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ + + sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ -i opentracker.conf.sample - make || return 1 +# See Makefile for available features + make PREFIX=/usr \ + LIBOWFAT_HEADERS=/usr/includes \ + LIBOWFAT_LIBRARY=/usr/lib \ + FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" +} + +package(){ + cd "${srcdir}/${_cvsmod}" + install -D -m 755 opentracker $pkgdir/usr/bin/opentracker install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config diff --git a/social/poco/PKGBUILD b/social/poco/PKGBUILD new file mode 100644 index 000000000..be15eea8a --- /dev/null +++ b/social/poco/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Rodrigo Grumiche Silva <grumiche at integrityit dot com dot br> +# Contributor: nozog +# Contributor: davidhjelm +# Contributor: Ray Kohler <ataraxia937 at gmail dot com> +# Contributor: Nathan Owe < ndowens04 at gmail dot com> + +pkgname=poco +pkgver=1.4.2p1 +pkgrel=1 +pkgdesc="C++ class libraries for network-centric, portable applications, +complete edition" +arch=('i686' 'x86_64') +url="http://www.pocoproject.org/" +license=('custom:boost') +depends=('unixodbc' 'libmysqlclient' 'openssl') +makedepends=('gcc' 'make' 'unixodbc' 'libmysqlclient' 'openssl' 'chrpath') +options=() +source=(http://downloads.sourceforge.net/poco/$pkgname-$pkgver-all.tar.bz2) + +build() { + cd $srcdir/$pkgname-$pkgver-all + ./configure --prefix=/usr --no-samples --no-tests + make +} + + +package() { + cd $srcdir/$pkgname-$pkgver-all + + make DESTDIR=$pkgdir install + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + #removing rpath information from binaries + chrpath -d $pkgdir/usr/bin/cpspc + chrpath -d $pkgdir/usr/bin/cpspcd + chrpath -d $pkgdir/usr/bin/f2cpspd + chrpath -d $pkgdir/usr/bin/f2cpsp + + #removing debugging libraries + rm $pkgdir/usr/lib/libPoco*d.so* +} + +md5sums=('752e5f5545377be24ee7c7b6b479fbbe') diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD new file mode 100644 index 000000000..98191c8d5 --- /dev/null +++ b/social/sipwitch/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Dan Serban +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: David Zaragoza <david@zaragoza.com.ve> + +pkgname=sipwitch +pkgver=1.1.2 +pkgrel=1 +pkgdesc="A call and registration server for the SIP protocol" +arch=(i686 x86_64) +url=http://www.gnutelephony.org/index.php/GNU_SIP_Witch +license=(GPL) +depends=(libexosip2 ucommon) +makedepends=(pkg-config) +options=('!libtool') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") + +build() +{ + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() +{ + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/rc.d + touch "${pkgdir}"/etc/rc.d/"${pkgname}" +} +md5sums=('08a235ddc0f75238c3670e857a30ae0b') diff --git a/social/sobby/PKGBUILD b/social/sobby/PKGBUILD new file mode 100644 index 000000000..644c74aec --- /dev/null +++ b/social/sobby/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Thomas Jost <schnouki@schnouki.net> +pkgname=sobby +pkgver=0.4.7 +pkgrel=1 +pkgdesc="Standalone obby server" +url="http://gobby.0x539.de/trac/" +license="GPL" +depends=('obby>=0.4.7' 'libxml++') +makedepends=('pkgconfig' 'net6>=1.3.12') +arch=('i686' 'x86_64') +source=(http://releases.0x539.de/sobby/sobby-$pkgver.tar.gz) +md5sums=('816ac9e2ecf2ac79306f9bbb80699464') +sha1sums=('ca20369eabce1657d090b310d78d4a35d697f28b') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/social/spectrum/PKGBUILD b/social/spectrum/PKGBUILD new file mode 100644 index 000000000..95040efb6 --- /dev/null +++ b/social/spectrum/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Sonny Piers <sonny.piers@gmail.com> +# Contributor: Tim Besard <tim.besard@gmail.com> + +pkgname=spectrum +pkgver=1.4.8 +pkgrel=1 +pkgdesc="XMPP libpurple transport/gateway." +arch=('i686' 'x86_64') +url="http://spectrum.im" +license=('GPL') +depends=('gloox' 'libpurple-minimal' 'poco' 'python2' 'libev') +makedepends=('cmake' 'gettext' 'pkg-config') +optdepends=('mysql: MySQL database backend support' + 'postgresql-libs: PostgreSQL database backend support' + 'sqlite3: SQLite database backend support' + 'libevent: support for libevent' + 'imagemagick: support for avatars synchronization with legacy networks' + + # Protocols plugins + 'mbpurple-svn: microblogging services support (like Twitter or identi.ca/StatusNet)' + 'msn-pecan: a different implementation of the MSN protocol for libpurple' + 'pidgin-facebookchat: Facebook support, with more features than Facebook XMPP server' + 'pidgin-sipe: SIPE protocol support' +) +backup=('etc/conf.d/spectrum') +source=('http://spectrum.im/attachments/download/43/spectrum-1.4.8.tar.gz' + 'logrotate.spectrum') +md5sums=('edd88e1e70f86fe9aa4b43d787529a47' + '4f9cbfe3878fe5f4137d1bb5acc9e850') + +install='spectrum.install' + + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + msg "Starting make..." + + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . + make + + cd spectrumctl + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Various needed folders -- correct permissions are set in spectrum.install + install -d "${pkgdir}/etc/spectrum" + install -d "${pkgdir}/var/log/spectrum" + install -d "${pkgdir}/var/run/spectrum" + install -d "${pkgdir}/var/lib/spectrum" + + # Install binaries and Python control script + make DESTDIR="${pkgdir}" install + + cd spectrumctl + python2 setup.py install --root="${pkgdir}" + + # Install initscript and logrotate config + install -Dm755 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-rc.d" "${pkgdir}/etc/rc.d/spectrum" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-conf.d" "${pkgdir}/etc/conf.d/spectrum" + install -Dm644 "${srcdir}/logrotate.spectrum" "${pkgdir}/etc/logrotate.d/spectrum" + + # Patch to use python2 + sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/spectrumctl" +} diff --git a/social/spectrum/logrotate.spectrum b/social/spectrum/logrotate.spectrum new file mode 100644 index 000000000..ae52ff156 --- /dev/null +++ b/social/spectrum/logrotate.spectrum @@ -0,0 +1,10 @@ +/var/log/spectrum/*.log { + notifempty + missingok + sharedscripts + postrotate + for P in /var/run/spectrum/*.pid; do + /bin/kill -HUP `cat "$P" 2>/dev/null` 2>/dev/null || true + done + endscript +} diff --git a/social/spectrum/spectrum.install b/social/spectrum/spectrum.install new file mode 100644 index 000000000..738fc5bbe --- /dev/null +++ b/social/spectrum/spectrum.install @@ -0,0 +1,47 @@ +# arg 1: the new package version +post_install() { + if [ -z "`grep '^spectrum:' /etc/group`" ]; then + groupadd -g 417 spectrum + fi + if [ -z "`grep '^spectrum:' /etc/passwd`" ]; then + useradd -u 417 -d /etc/spectrum -g spectrum -s /bin/false spectrum + fi + + chown spectrum:spectrum var/lib/spectrum + chown spectrum:spectrum var/log/spectrum + chown spectrum:spectrum var/run/spectrum + +cat << EOF + +==> Documentation: http://spectrum.im/ + +==> You must now customize the configuration file located in /etc/spectrum/. Copy and reconfigure for each seperate protocol. + +EOF + +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +post_remove() { + userdel spectrum + + paths=(/etc/spectrum /var/lib/spectrum /var/log/spectrum + /var/run/spectrum) + + first=true + for path in ${paths[@]}; do + if [ -d $path ]; then + if $first; then + first=false + echo "==> Leftover Paths:" + fi + echo "==> $path" + fi + done +} diff --git a/social/ucommon/PKGBUILD b/social/ucommon/PKGBUILD new file mode 100644 index 000000000..240fcc3db --- /dev/null +++ b/social/ucommon/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Dan Serban +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: David Zaragoza <david@zaragoza.com.ve> + +pkgname=ucommon +pkgver=5.0.6 +pkgrel=1 +pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" +arch=(i686 x86_64) +url="http://www.gnutelephony.org/index.php/GNU_uCommon_C%2B%2B" +license=(GPL) +depends=(openssl) +options=('!libtool') +source=("http://ftp.gnu.org/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz") + +build() +{ + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() +{ + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('86958df511e66bb6ea099b6ca3c3b582') diff --git a/staging/arora/PKGBUILD b/staging/arora/PKGBUILD new file mode 100644 index 000000000..b35b9afc7 --- /dev/null +++ b/staging/arora/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 141024 2011-10-21 22:01:26Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=arora +pkgver=0.11.0 +pkgrel=3 +pkgdesc='Lightweight cross-platform Web browser' +url='http://www.arora-browser.org' +license=('GPL') +arch=('i686' 'x86_64') +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake PREFIX="/usr" "CONFIG-=debug" -r + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/staging/arora/install b/staging/arora/install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/staging/arora/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD new file mode 100644 index 000000000..9f3f341ab --- /dev/null +++ b/staging/kadu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $ +# Maintainer: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd $srcdir/kadu-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/kadu-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} +} diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD new file mode 100644 index 000000000..6bf5cf20e --- /dev/null +++ b/staging/kdelibs/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 141043 2011-10-22 12:19:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.7.2 +pkgrel=3 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl' 'qtwebkit') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' + 'hspell') +replaces=('kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kdelibs-nepomuk-unicode.diff') +sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'e24aae17ef0d83085199ad7c7623afef9919b8ff') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i "${srcdir}"/archlinux-menu.patch + # nepomuk unicode character fix + patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/staging/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/staging/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/staging/kdelibs/kdelibs-nepomuk-unicode.diff b/staging/kdelibs/kdelibs-nepomuk-unicode.diff new file mode 100644 index 000000000..1c85d6fc9 --- /dev/null +++ b/staging/kdelibs/kdelibs-nepomuk-unicode.diff @@ -0,0 +1,65 @@ +diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h +index 055482e..3880e13 100644 +--- a/nepomuk/query/querybuilderdata_p.h ++++ b/nepomuk/query/querybuilderdata_p.h +@@ -32,6 +32,28 @@ + #include "query_p.h" + #include "groupterm_p.h" + ++namespace { ++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle ++/// utf8 chars which use more than one char, ie. wide chars. ++/// Thus, we simply truncate each term at the first wide char. ++QStringList stripExtendedCharsHack(const QStringList& terms) { ++ QStringList newTerms; ++ foreach(const QString& term, terms) { ++ int i = 0; ++ while(i < term.length()) { ++ if(term[i].unicode() > 0x7f) { ++ break; ++ } ++ ++i; ++ } ++ if(i > 0) { ++ newTerms.append(term.left(i)); ++ } ++ } ++ return newTerms; ++} ++} ++ + namespace Nepomuk { + namespace Query { + class QueryBuilderData +@@ -246,16 +268,23 @@ namespace Nepomuk { + for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin(); + it != m_fullTextSearchTerms.constEnd(); ++it ) { + const QString& varName = it.key(); +- const QStringList& terms = it.value(); +- // bif:search_excerpt wants a vector of all search terms +- excerptParts +- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") +- .arg( terms.join(QLatin1String("','")), +- varName ); ++ const QStringList terms = stripExtendedCharsHack(it.value()); ++ if(terms.count()) { ++ // bif:search_excerpt wants a vector of all search terms ++ excerptParts ++ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") ++ .arg( terms.join(QLatin1String("','")), ++ varName ); ++ } + } + +- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") +- .arg(excerptParts.join(QLatin1String(","))); ++ if(excerptParts.count()) { ++ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") ++ .arg(excerptParts.join(QLatin1String(","))); ++ } ++ else { ++ return QString(); ++ } + } + else { + return QString();
\ No newline at end of file diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/staging/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD new file mode 100644 index 000000000..1db03621b --- /dev/null +++ b/staging/pyqt/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 141026 2011-10-22 00:02:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> + +pkgbase=pyqt +pkgname=('pyqt' 'python2-pyqt') +pkgver=4.8.5 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://riverbankcomputing.co.uk/software/pyqt/intro" +license=('GPL') +makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('0e4264bb912edfbda319bb236ac84407') + +build() { + cd "${srcdir}" + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + python configure.py \ + --confirm-license \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make + + ### Python2 version ### + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + python2 configure.py \ + --confirm-license \ + -v /usr/share/sip \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make +} + +package_pyqt(){ + pkgdesc="A set of Python bindings for the Qt toolkit" + depends=('qt' 'python-sip' 'qtwebkit') + optdepends=('phonon: enable audio and video in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python-qt') + provides=('python-qt') + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python2-pyqt(){ + pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" + depends=('pyqt' 'python2-sip' 'dbus-python') + optdepends=('phonon: enable audio and video in PyQt applications' + 'python-opengl: enable OpenGL 3D graphics in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python2-qt') + provides=('python2-qt') + + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt + rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} + rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so + rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api +} diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD new file mode 100644 index 000000000..b0ae67199 --- /dev/null +++ b/staging/qt/PKGBUILD @@ -0,0 +1,128 @@ +# $Id: PKGBUILD 141017 2011-10-21 19:27:55Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.8.0rc1 +_pkgver=4.8.0-rc1 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0" +source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop') +md5sums=('3e003b671384df8d1cb77dd6cc804934' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd') + +build() { + cd "${srcdir}"/${_pkgfqn} + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -no-declarative-debug \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ + done +} diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/staging/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/staging/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/staging/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/qt.install b/staging/qt/qt.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/staging/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/staging/qtwebkit/PKGBUILD b/staging/qtwebkit/PKGBUILD new file mode 100644 index 000000000..0ee2a4afa --- /dev/null +++ b/staging/qtwebkit/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 141018 2011-10-21 19:29:38Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qtwebkit +pkgver=2.2.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://trac.webkit.org/wiki/QtWebKit' +pkgdesc='An open source web browser engine (Qt port)' +license=('LGPL2.1' 'GPL3') +depends=('qt' 'gperf' 'bison' 'phonon') +makedepends=('python2' 'mesa' 'chrpath') +source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" + 'python2-path.patch') +sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' + 'b0ef3d5596171e3900a685df9bcfac3068ad6330') + +build() { + cd "${srcdir}"/QtWebKit-${pkgver} + + patch -p1 -i "${srcdir}"/python2-path.patch + + cd Tools/Scripts + ./build-webkit --qt \ + --prefix=/usr \ + --makeargs="${MAKEFLAGS}" \ + --release +} + +package() { + cd "${srcdir}"/QtWebKit-${pkgver} + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so +} diff --git a/staging/qtwebkit/python2-path.patch b/staging/qtwebkit/python2-path.patch new file mode 100644 index 000000000..2e270e6fc --- /dev/null +++ b/staging/qtwebkit/python2-path.patch @@ -0,0 +1,29 @@ +--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000 ++++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000 +@@ -88,5 +88,5 @@ + retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h + retgen.wkScript = $$PWD/create_regex_tables + retgen.input = retgen.wkScript +-retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT} + addExtraCompiler(retgen) +--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000 ++++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000 +@@ -640,7 +640,7 @@ + inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl +-inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json ++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json + inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl + inspectorJSON.wkAddOutputToSources = false + addExtraCompiler(inspectorJSON) +@@ -723,7 +723,7 @@ + entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.wkScript = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES ++entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + addExtraCompiler(entities) diff --git a/testing/arora/PKGBUILD b/testing/arora/PKGBUILD new file mode 100644 index 000000000..453690ba9 --- /dev/null +++ b/testing/arora/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 141144 2011-10-24 20:29:56Z andrea $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=arora +pkgver=0.11.0 +pkgrel=3 +pkgdesc='Lightweight cross-platform Web browser' +url='http://www.arora-browser.org' +license=('GPL') +arch=('i686' 'x86_64') +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake PREFIX="/usr" "CONFIG-=debug" -r + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/testing/arora/install b/testing/arora/install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/testing/arora/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/conky/PKGBUILD b/testing/conky/PKGBUILD new file mode 100644 index 000000000..bef408f4b --- /dev/null +++ b/testing/conky/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 141103 2011-10-24 00:41:06Z bisson $ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=conky +pkgver=1.8.2git20111024 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' +url='http://conky.sourceforge.net/' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +options=('!emptydirs') +makedepends=('pkg-config' 'docbook2x') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') +backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('490f5ffb431bffee71f7bf32f94cf611ae4f0646') + +# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz + +replaces=('torsmo') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh autogen.sh + + CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-ibm \ + --enable-curl \ + --enable-rss \ + --enable-weather-xoap \ + --enable-imlib2 \ + --disable-lua \ + --enable-wlan \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/conky/PKGBUILD.cmake b/testing/conky/PKGBUILD.cmake new file mode 100644 index 000000000..7f980868f --- /dev/null +++ b/testing/conky/PKGBUILD.cmake @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=conky +pkgver=1.8.2git20111021 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' +url='http://conky.sourceforge.net/' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +makedepends=('pkg-config' 'cmake' 'git' 'docbook2x') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua') + +replaces=('torsmo') + +build() { + cd "${srcdir}" + + cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git + rm -fr build; mkdir build; cd build + + cmake \ + -D CMAKE_BUILD_TYPE:STRING="Release" \ + -D MAINTAINER_MODE:BOOL=ON \ + -D BUILD_CURL:BOOL=ON \ + -D BUILD_IMLIB2:BOOL=ON \ + -D BUILD_LUA_IMLIB2:BOOL=OFF \ + -D BUILD_MYSQL:BOOL=OFF \ + -D BUILD_RSS:BOOL=ON \ + -D BUILD_WEATHER_METAR:BOOL=ON \ + -D BUILD_WEATHER_XOAP:BOOL=ON \ + -D BUILD_WLAN:BOOL=ON \ + -D CMAKE_INSTALL_PREFIX:PATH=/usr \ + ../conky + + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD new file mode 100644 index 000000000..87c5cd135 --- /dev/null +++ b/testing/glibc/PKGBUILD @@ -0,0 +1,204 @@ +# $Id: PKGBUILD 141158 2011-10-25 05:08:15Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each major glibc version + +pkgname=glibc +pkgver=2.14.1 +pkgrel=1 +_glibcdate=20111025 +pkgdesc="GNU C Library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=('linux-api-headers>=3.0' 'tzdata') +makedepends=('gcc>=4.6') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip') +install=glibc.install +source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz + glibc-2.10-dont-build-timezone.patch + glibc-2.10-bz4781.patch + glibc-__i686.patch + glibc-2.12.1-static-shared-getpagesize.patch + glibc-2.12.2-ignore-origin-of-privileged-program.patch + glibc-2.13-futex.patch + glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4768ae77.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch + nscd + locale.gen.txt + locale-gen) +md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + '6970bcfeb3bf88913436d5112d16f588' + '7da8c554a3b591c7401d7023b1928afc' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + + +mksource() { + git clone git://sourceware.org/git/glibc.git + pushd glibc + git checkout -b glibc-2.14-arch origin/release/2.14/master + popd + tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* +} + +build() { + cd ${srcdir}/glibc + + # timezone data is in separate package (tzdata) + patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 + patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + patch -Np1 -i ${srcdir}/glibc-__i686.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 + # using Fedora "fix" as patch in that bug report causes breakages... + patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch + + # http://www.exploit-db.com/exploits/15274/ + # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # Revert commit causing issues with crappy DNS servers... + # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! + # Note that both these patches do not fix the issue completely: + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/lib" >> configparms + + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/glibc/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --enable-add-ons=nptl,libidn \ + --enable-kernel=2.6.27 \ + --with-tls --with-__thread \ + --enable-bind-now --without-gd \ + --without-cvs --disable-profile \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some errors are expected - manually check log files + make -k check || true +} + +package() { + cd ${srcdir}/glibc-build + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/etc/rc.d + install -dm755 ${pkgdir}/usr/sbin + install -dm755 ${pkgdir}/usr/lib/locale + install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf + + sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED + sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED + sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED + cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen + + if [[ ${CARCH} = "x86_64" ]]; then + # fix for the linker + sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd + # Comply with multilib binaries, they look for the linker in /lib64 + mkdir ${pkgdir}/lib64 + cd ${pkgdir}/lib64 + ln -v -s ../lib/ld* . + fi + + # manually strip files as stripping libpthread-*.so and libthread_db.so + # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks + # valgrind on x86_64 + + cd $pkgdir + strip $STRIP_BINARIES sbin/{ldconfig,sln} \ + usr/bin/{gencat,getconf,getent,iconv,locale} \ + usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ + usr/lib/getconf/* \ + usr/sbin/{iconvconfig,nscd} + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a \ + lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + + strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{pt_chown,{audit,gconv}/*.so} +} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch new file mode 100644 index 000000000..cf1a97a18 --- /dev/null +++ b/testing/glibc/glibc-2.10-bz4781.patch @@ -0,0 +1,42 @@ +diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -120,9 +120,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (eip); + /* Note: %esi is zero. */ + movl %esi,%ebp /* terminate the stack frame */ + #ifdef RESET_PID +@@ -155,7 +152,6 @@ + jmp L(haspid) + .previous + #endif +- cfi_endproc; + + cfi_startproc + PSEUDO_END (BP_SYM (__clone)) +diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -89,9 +89,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (rip); + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp +@@ -116,7 +113,6 @@ + /* Call exit with return value from function call. */ + movq %rax, %rdi + call HIDDEN_JUMPTARGET (_exit) +- cfi_endproc; + + cfi_startproc; + PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch new file mode 100644 index 000000000..d3abeff17 --- /dev/null +++ b/testing/glibc/glibc-2.10-dont-build-timezone.patch @@ -0,0 +1,13 @@ +timezone data has been split into the package sys-libs/timezone-data + +--- glibc-2.4/Makeconfig ++++ glibc-2.4/Makeconfig +@@ -931,7 +931,7 @@ + stdlib stdio-common libio malloc string wcsmbs time dirent \ + grp pwd posix io termios resource misc socket sysvipc gmon \ + gnulib iconv iconvdata wctype manual shadow gshadow po argp \ +- crypt nss localedata timezone rt conform debug \ ++ crypt nss localedata rt conform debug \ + $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) + + ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch new file mode 100644 index 000000000..e84754279 --- /dev/null +++ b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch @@ -0,0 +1,11 @@ +--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c +@@ -28,7 +28,7 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE ++#if 0 && defined __ASSUME_AT_PAGESIZE + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); + #else diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch new file mode 100644 index 000000000..ce089b49c --- /dev/null +++ b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch @@ -0,0 +1,26 @@ +From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 9 Dec 2010 15:00:59 +0100 +Subject: [PATCH 1/1] Ignore origin of privileged program + +--- + ChangeLog | 5 +++++ + elf/dl-object.c | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/elf/dl-object.c b/elf/dl-object.c +index 22a1635..7674d49 100644 +--- a/elf/dl-object.c ++++ b/elf/dl-object.c +@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +-- +1.7.2 diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/testing/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch new file mode 100644 index 000000000..6c9d2718e --- /dev/null +++ b/testing/glibc/glibc-2.14-libdl-crash.patch @@ -0,0 +1,132 @@ +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 73b2a2f..9bd91e3 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index 9e30594..3890d00 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + +diff --git a/elf/dl-libc.c b/elf/dl-libc.c +index 7be9483..a13fce3 100644 +--- a/elf/dl-libc.c ++++ b/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff --git a/elf/rtld.c b/elf/rtld.c +index 4a9109e..617e30e 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff --git a/include/link.h b/include/link.h +index e877104..051b99a 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch new file mode 100644 index 000000000..28d5dd424 --- /dev/null +++ b/testing/glibc/glibc-__i686.patch @@ -0,0 +1,13 @@ +diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile +--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 ++++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 +@@ -1,6 +1,7 @@ + # The mpn functions need a #define for asm syntax flavor. +-# Every i386 port in use uses gas syntax (I think). +-asm-CPPFLAGS += -DGAS_SYNTAX ++# Every i386 port in use uses gas syntax (I think). Don't replace ++# __i686 in __i686.get_pc_thunk.bx. ++asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 + + # The i386 `long double' is a distinct type we support. + long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install new file mode 100644 index 000000000..7f85ade96 --- /dev/null +++ b/testing/glibc/glibc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + sbin/ldconfig -r . + [ -x sbin/init ] && sbin/init u + usr/sbin/locale-gen + + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen new file mode 100755 index 000000000..5aff344c4 --- /dev/null +++ b/testing/glibc/locale-gen @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt new file mode 100644 index 000000000..ccdd81734 --- /dev/null +++ b/testing/glibc/locale.gen.txt @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# <locale> <charset> +# +# where <locale> is one of the locales given in /usr/share/i18n/locales +# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +# diff --git a/testing/glibc/nscd b/testing/glibc/nscd new file mode 100755 index 000000000..8b14f2a3f --- /dev/null +++ b/testing/glibc/nscd @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/nscd` +case "$1" in + start) + stat_busy "Starting nscd" + # create necessary directories if they don't already exist + mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null + # remove stale files + rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null + [ -z "$PID" ] && /usr/sbin/nscd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon nscd + stat_done + fi + ;; + stop) + stat_busy "Stopping nscd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon nscd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD new file mode 100644 index 000000000..db523a645 --- /dev/null +++ b/testing/kdelibs/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 141146 2011-10-24 20:29:59Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.7.2 +pkgrel=3 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl' 'qtwebkit') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' + 'hspell') +replaces=('kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kdelibs-nepomuk-unicode.diff') +sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'e24aae17ef0d83085199ad7c7623afef9919b8ff') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i "${srcdir}"/archlinux-menu.patch + # nepomuk unicode character fix + patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/testing/kdelibs/archlinux-menu.patch b/testing/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/testing/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/testing/kdelibs/kde-applications-menu.patch b/testing/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/testing/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/testing/kdelibs/kdelibs-nepomuk-unicode.diff b/testing/kdelibs/kdelibs-nepomuk-unicode.diff new file mode 100644 index 000000000..1c85d6fc9 --- /dev/null +++ b/testing/kdelibs/kdelibs-nepomuk-unicode.diff @@ -0,0 +1,65 @@ +diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h +index 055482e..3880e13 100644 +--- a/nepomuk/query/querybuilderdata_p.h ++++ b/nepomuk/query/querybuilderdata_p.h +@@ -32,6 +32,28 @@ + #include "query_p.h" + #include "groupterm_p.h" + ++namespace { ++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle ++/// utf8 chars which use more than one char, ie. wide chars. ++/// Thus, we simply truncate each term at the first wide char. ++QStringList stripExtendedCharsHack(const QStringList& terms) { ++ QStringList newTerms; ++ foreach(const QString& term, terms) { ++ int i = 0; ++ while(i < term.length()) { ++ if(term[i].unicode() > 0x7f) { ++ break; ++ } ++ ++i; ++ } ++ if(i > 0) { ++ newTerms.append(term.left(i)); ++ } ++ } ++ return newTerms; ++} ++} ++ + namespace Nepomuk { + namespace Query { + class QueryBuilderData +@@ -246,16 +268,23 @@ namespace Nepomuk { + for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin(); + it != m_fullTextSearchTerms.constEnd(); ++it ) { + const QString& varName = it.key(); +- const QStringList& terms = it.value(); +- // bif:search_excerpt wants a vector of all search terms +- excerptParts +- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") +- .arg( terms.join(QLatin1String("','")), +- varName ); ++ const QStringList terms = stripExtendedCharsHack(it.value()); ++ if(terms.count()) { ++ // bif:search_excerpt wants a vector of all search terms ++ excerptParts ++ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") ++ .arg( terms.join(QLatin1String("','")), ++ varName ); ++ } + } + +- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") +- .arg(excerptParts.join(QLatin1String(","))); ++ if(excerptParts.count()) { ++ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") ++ .arg(excerptParts.join(QLatin1String(","))); ++ } ++ else { ++ return QString(); ++ } + } + else { + return QString();
\ No newline at end of file diff --git a/testing/kdelibs/kdelibs.install b/testing/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/testing/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD new file mode 100644 index 000000000..1cb1dfb32 --- /dev/null +++ b/testing/lirc/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 141190 2011-10-25 18:44:15Z thomas $ +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgbase=lirc +pkgname=('lirc' 'lirc-utils') +pkgver=0.9.0 +pkgrel=8 +epoch=1 +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" +arch=('i686' 'x86_64') +url="http://www.lirc.org/" +license=('GPL') +makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +options=('!makeflags' '!strip') +source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 + lirc_wpc8769l.patch + lircd-handle-large-config.patch + lirc_atiusb-kfifo.patch + kernel-2.6.39.patch + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb') + +build() { + cd "${srcdir}/lirc-${pkgver}" + patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" + + sed -i '/AC_PATH_XTRA/d' configure.ac + sed -e 's/@X_CFLAGS@//g' \ + -e 's/@X_LIBS@//g' \ + -e 's/@X_PRE_LIBS@//g' \ + -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am + libtoolize + autoreconf + + PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ + --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ + --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-transmitter + + # Remove drivers already in kernel + sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ + -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ + -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ + -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + make +} + +package_lirc() { + pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" + depends=('lirc-utils' 'linux>=3.1' 'linux<3.2') + replaces=('lirc+pctv') + install=lirc.install + + cd "${srcdir}/lirc-${pkgver}/drivers" + make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install + + # set the kernel we've built for inside the install script + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" + # gzip -9 modules + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; +} + +package_lirc-utils() { + pkgdesc="Linux Infrared Remote Control utils" + depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') + optdepends=('python2: pronto2lirc utility') + options=('strip' '!libtool') + backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + + cd "${srcdir}/lirc-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" + cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + cp -rp remotes "${pkgdir}/usr/share/lirc" + chmod -R go-w "${pkgdir}/usr/share/lirc/" + + # install the logrotate config + install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" + + # install conf.d file + install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" + + # install conf.d file + install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" + + install -d "${pkgdir}/etc/lirc" + + # remove built modules + rm -r "${pkgdir}/lib/" +} diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf new file mode 100644 index 000000000..f911c7515 --- /dev/null +++ b/testing/lirc/irexec.conf @@ -0,0 +1,5 @@ +# +# Parameters for irexec daemon (path to lircrc) +# + +IREXEC_OPTS=""
\ No newline at end of file diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd new file mode 100755 index 000000000..a64b033a5 --- /dev/null +++ b/testing/lirc/irexecd @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/irexec.conf + +PID=`pidof -o %PPID /usr/bin/irexec` +case "$1" in + start) + stat_busy "Starting IREXEC Daemon" + [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon irexecd + stat_done + fi + ;; + stop) + stat_busy "Stopping IREXEC Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon irexecd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch new file mode 100644 index 000000000..7353d61ca --- /dev/null +++ b/testing/lirc/kernel-2.6.39.patch @@ -0,0 +1,54 @@ +diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c +--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 +@@ -48,7 +48,6 @@ + #include <linux/slab.h> + #include <linux/module.h> + #include <linux/kmod.h> +-#include <linux/smp_lock.h> + #include <linux/completion.h> + #include <linux/uaccess.h> + #include <linux/usb.h> +diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c +--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 +@@ -361,14 +361,14 @@ + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_zero_bit_le(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit_le(ldata, + size, next_one + 1); + + put_space_bit( +@@ -376,7 +376,7 @@ + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit_le(ldata, + size, next_zero + 1); + + put_pulse_bit( diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install new file mode 100644 index 000000000..1e7c4f4a1 --- /dev/null +++ b/testing/lirc/lirc.install @@ -0,0 +1,16 @@ +EXTRAMODULES=extramodules-3.1-ARCH + +post_install() { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 +} + +post_upgrade() { + post_install +} + +# arg 1: the old package version +post_remove() { + post_install +} diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate new file mode 100644 index 000000000..623c4f328 --- /dev/null +++ b/testing/lirc/lirc.logrotate @@ -0,0 +1,5 @@ +/var/log/lircd { + missingok + notifempty + delaycompress +} diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/testing/lirc/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin <publicmsu@gmail.com> +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch new file mode 100644 index 000000000..e4e2a049b --- /dev/null +++ b/testing/lirc/lirc_wpc8769l.patch @@ -0,0 +1,88 @@ +From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com> +Date: Wed, 30 Mar 2011 16:46:35 -0400 +Subject: [PATCH] Make lirc_wpc8769l functional again + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- + 1 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index f820d11..4d04063 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -816,10 +816,6 @@ static int set_use_inc(void *data) + /* Reset last timeout value. */ + lastus = 0; + +- /* Init the read buffer. */ +- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) +- return -ENOMEM; +- + /* Acquire the IRQ. */ + result = request_irq(irq, irq_handler, + IRQF_DISABLED | IRQF_SHARED, +@@ -863,9 +859,6 @@ static void set_use_dec(void *data) + /* Free the IRQ. */ + free_irq(irq, THIS_MODULE); + dprintk("Freed IRQ %d\n", irq); +- +- /* Free the RX buffer. */ +- lirc_buffer_free(&rbuf); + } + + static struct lirc_driver driver = { +@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) + /* Do load-time checks. */ + wpc8769l_power_up_and_check_if_we_woke_us_up(); + ++ /* Init the read buffer. */ ++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { ++ rc = -ENOMEM; ++ goto exit_platform_exit; ++ } ++ + /* Configure the driver hooks. */ + driver.features = LIRC_CAN_REC_MODE2; ++ driver.dev = &lirc_wpc8769l_platform_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + eprintk("lirc_register_driver failed!\n"); + rc = -EIO; +- goto exit_platform_exit; ++ goto exit_release_buffer; + } + + iprintk("Driver loaded.\n"); + + return 0; /* Everything OK. */ + ++exit_release_buffer: ++ lirc_buffer_free(&rbuf); ++ + exit_platform_exit: + lirc_wpc8769l_platform_exit(); + +@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); + + static void __exit lirc_wpc8769l_module_exit(void) + { +- /* Unregister the platform driver and device. */ +- lirc_wpc8769l_platform_exit(); +- + /* Unregister the LIRC driver. */ + lirc_unregister_driver(driver.minor); + ++ /* Free the buffer. */ ++ lirc_buffer_free(&rbuf); ++ ++ /* Unregister the platform driver and device. */ ++ lirc_wpc8769l_platform_exit(); ++ + /* Release the second range. */ + if (baseport2) + release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); +-- +1.7.0.1 + diff --git a/testing/lirc/lircd b/testing/lirc/lircd new file mode 100755 index 000000000..e9739b36e --- /dev/null +++ b/testing/lirc/lircd @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/lircd.conf + +PID=$(pidof -o %PPID /usr/sbin/lircd) +LIRCD_SYMLINKFILE=/dev/lircd +LIRCD_SOCKET=/var/run/lirc/lircd +case "$1" in + start) + stat_busy "Starting LIRC Daemon" + [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null + rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE + if [ $? -ne 0 ]; then + stat_fail + exit 0 + fi + [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" + [ -z "$PID" ] && + if [ -n "$LIRC_DEVICE" ] ; then + eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + else + /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + fi + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircd + stat_done + fi + ;; + stop) + stat_busy "Stopping LIRC Daemon" + rm -f $LIRCD_SYMLINKFILE + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 start|stop|restart" +esac +exit 0 diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/testing/lirc/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson <jarod@redhat.com> +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf new file mode 100644 index 000000000..760dab065 --- /dev/null +++ b/testing/lirc/lircd.conf @@ -0,0 +1,8 @@ +# +# Parameters for lirc daemon +# + +LIRC_DEVICE="/dev/lirc0" +LIRC_DRIVER="" +LIRC_EXTRAOPTS="" +LIRC_CONFIGFILE="" diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd new file mode 100755 index 000000000..220c47c9c --- /dev/null +++ b/testing/lirc/lircmd @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/lircmd` +case "$1" in + start) + stat_busy "Starting lircmd Daemon" + [ -z "$PID" ] && /usr/sbin/lircmd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircmd + stat_done + fi + ;; + stop) + stat_busy "Stopping lircmd Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircmd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD new file mode 100644 index 000000000..4861c2f33 --- /dev/null +++ b/testing/mkinitcpio-busybox/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 141095 2011-10-23 18:50:38Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=mkinitcpio-busybox +pkgver=1.19.2 +pkgrel=1 +pkgdesc="base initramfs tools" +arch=('i686' 'x86_64') +url="http://www.busybox.net/" +license=('GPL') +depends=('glibc') +options=('!buildflags') +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config') +sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9' + '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8') + +build() { + cd "$srcdir/busybox-$pkgver" + + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config + + make +} + +package() { + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config new file mode 100644 index 000000000..86160a203 --- /dev/null +++ b/testing/mkinitcpio-busybox/config @@ -0,0 +1,1013 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.19.2 +# Sun Oct 16 15:24:19 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_DESKTOP is not set +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_PIDFILE is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=0 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_FEATURE_SEAMLESS_XZ is not set +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +# CONFIG_FEATURE_SEAMLESS_GZ is not set +# CONFIG_FEATURE_SEAMLESS_Z is not set +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_BZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_FEATURE_CPIO_P is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +# CONFIG_GUNZIP is not set +# CONFIG_GZIP is not set +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +# CONFIG_LZOP is not set +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_AUTODETECT is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set +# CONFIG_UNZIP is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set +# CONFIG_CAL is not set +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set +CONFIG_CUT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +# CONFIG_FSYNC is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +# CONFIG_REALPATH is not set +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +# CONFIG_STTY is not set +# CONFIG_SUM is not set +# CONFIG_SYNC is not set +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TRUE=y +# CONFIG_TTY is not set +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +# CONFIG_RESET is not set +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETFONT=y +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set +# CONFIG_SHOWKEY is not set + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_PATCH is not set +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y +# CONFIG_FEATURE_ALLOW_EXEC is not set + +# +# Finding Utilities +# +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_PATH is not set +# CONFIG_FEATURE_FIND_REGEX is not set +# CONFIG_FEATURE_FIND_CONTEXT is not set +# CONFIG_FEATURE_FIND_LINKS is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +# CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" + +# +# Linux System Utilities +# +# CONFIG_BLOCKDEV is not set +# CONFIG_REV is not set +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +# CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_LSPCI is not set +# CONFIG_LSUSB is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_UUID is not set +# CONFIG_MORE is not set +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +# CONFIG_RDEV is not set +# CONFIG_READPROFILE is not set +# CONFIG_RTCWAKE is not set +# CONFIG_SCRIPT is not set +# CONFIG_SCRIPTREPLAY is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="" +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +# CONFIG_INOTIFYD is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +# CONFIG_SETSID is not set +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_TIME is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TTYSIZE is not set +# CONFIG_VOLNAME is not set +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +# CONFIG_NBDCLIENT is not set +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPD is not set +# CONFIG_FEATURE_FTP_WRITE is not set +# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +# CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_TFTP_DEBUG is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +# CONFIG_IOSTAT is not set +# CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set +# CONFIG_PMAP is not set +# CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +# CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set +# CONFIG_FEATURE_SHOW_THREADS is not set +# CONFIG_WATCH is not set + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +# CONFIG_SH_MATH_SUPPORT_64 is not set +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +# CONFIG_LOGGER is not set diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD new file mode 100644 index 000000000..5d3886e46 --- /dev/null +++ b/testing/pcre/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 141047 2011-10-22 13:38:23Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=pcre +pkgver=8.20 +pkgrel=1 +pkgdesc="A library that implements Perl 5-style regular expressions" +arch=('i686' 'x86_64') +url="http://www.pcre.org/" +license=('BSD') +depends=('gcc-libs') +options=('!libtool') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('a1931c70e1273e3450d5036fe273d25c' + '41c2dceac25c6ebf192ec128021be339') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + ./configure --prefix=/usr --enable-jit \ + --enable-utf8 --enable-unicode-properties + make +} + +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # grep uses pcre, so we need the libs in /lib + install -dm755 "${pkgdir}"/lib + mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ + ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so + + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD new file mode 100644 index 000000000..78bbb256f --- /dev/null +++ b/testing/postfix/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 141130 2011-10-24 13:49:51Z bisson $ +# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> +# Contributor: Paul Mattal <paul@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=postfix +pkgver=2.8.6 +pkgrel=1 +pkgdesc='Fast, easy to administer, secure mail server' +url='http://www.postfix.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ + 'aliases.patch' \ + 'rc.d') +sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28' + '5fc3de6c7df1e5851a0a379e825148868808318b' + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + +provides=('smtp-server' 'smtp-forwarder') +replaces=('postfix-mysql' 'postfix-pgsql') +conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ + -DHAS_LDAP \ + -DUSE_TLS \ + -DHAS_MYSQL -I/usr/include/mysql \ + -DHAS_PGSQL -I/usr/include/postgresql \ + -DHAS_SQLITE \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh postfix-install -non-interactive \ + install_root="${pkgdir}" \ + daemon_directory="/usr/lib/${pkgname}" \ + sample_directory="/etc/${pkgname}/sample" \ + manpage_directory="/usr/share/man" + + install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd "${pkgdir}" + patch -p0 -i "${srcdir}"/aliases.patch +} diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch new file mode 100644 index 000000000..6767870b7 --- /dev/null +++ b/testing/postfix/aliases.patch @@ -0,0 +1,18 @@ +--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 ++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 +@@ -382,6 +382,7 @@ + #alias_maps = hash:/etc/aliases + #alias_maps = hash:/etc/aliases, nis:mail.aliases + #alias_maps = netinfo:/aliases ++alias_maps = hash:/etc/postfix/aliases + + # The alias_database parameter specifies the alias database(s) that + # are built with "newaliases" or "sendmail -bi". This is a separate +@@ -392,6 +393,7 @@ + #alias_database = dbm:/etc/mail/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases ++alias_database = $alias_maps + + # ADDRESS EXTENSIONS (e.g., user+foo) + # diff --git a/testing/postfix/install b/testing/postfix/install new file mode 100644 index 000000000..c276e0919 --- /dev/null +++ b/testing/postfix/install @@ -0,0 +1,34 @@ +post_install() { + getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null + getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null + getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null + + cd var/spool/postfix + chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved + chgrp postdrop public maildrop + cd ../../../usr/sbin + chgrp postdrop postqueue postdrop + chmod g+s postqueue postdrop + cd ../.. + chown postfix var/lib/postfix + + newaliases +} + +post_upgrade() { + post_install + + if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF + +==> You must now execute "/etc/rc.d/postfix reload" (or restart). +==> This is needed because of an inter-daemon protocol change. + +EOF + fi +} + +pre_remove() { + getent passwd postfix &>/dev/null && userdel postfix >/dev/null + getent group postfix &>/dev/null && groupdel postfix >/dev/null + getent group postdrop &>/dev/null && groupdel postdrop >/dev/null +} diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d new file mode 100755 index 000000000..fa314bb84 --- /dev/null +++ b/testing/postfix/rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=postfix + +case "$1" in +start) + stat_busy "Starting $name daemon" + /usr/sbin/postfix start &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + /usr/sbin/postfix stop &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + /usr/sbin/postfix reload &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD new file mode 100644 index 000000000..219f35f7b --- /dev/null +++ b/testing/pyqt/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 141148 2011-10-24 20:30:01Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> + +pkgbase=pyqt +pkgname=('pyqt' 'python2-pyqt') +pkgver=4.8.5 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://riverbankcomputing.co.uk/software/pyqt/intro" +license=('GPL') +makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('0e4264bb912edfbda319bb236ac84407') + +build() { + cd "${srcdir}" + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + python configure.py \ + --confirm-license \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make + + ### Python2 version ### + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + python2 configure.py \ + --confirm-license \ + -v /usr/share/sip \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make +} + +package_pyqt(){ + pkgdesc="A set of Python bindings for the Qt toolkit" + depends=('qt' 'python-sip' 'qtwebkit') + optdepends=('phonon: enable audio and video in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python-qt') + provides=('python-qt') + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python2-pyqt(){ + pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" + depends=('pyqt' 'python2-sip' 'dbus-python') + optdepends=('phonon: enable audio and video in PyQt applications' + 'python-opengl: enable OpenGL 3D graphics in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python2-qt') + provides=('python2-qt') + + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt + rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} + rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so + rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api +} diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules new file mode 100644 index 000000000..c2f7317aa --- /dev/null +++ b/testing/qemu-kvm/65-kvm.rules @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD new file mode 100644 index 000000000..8097e54ac --- /dev/null +++ b/testing/qemu-kvm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 141124 2011-10-24 13:19:43Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=qemu-kvm +pkgver=0.15.1 +pkgrel=1 +pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=(i686 x86_64) +license=('GPL2' 'LGPL2.1') +url="http://www.linux-kvm.org" +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') +backup=('etc/qemu/target-x86_64.conf') +install=qemu-kvm.install +conflicts=('qemu') +provides=('qemu') +replaces=('kvm') +source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz + 65-kvm.rules) +options=(!strip) + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + # fix esound building + ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ + --sysconfdir=/etc \ + --audio-drv-list=alsa,sdl,oss \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs + make +} +package() +{ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # symbolic link for backwards compatibility + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu + # symbolic link for to qemu binary for emulator apps + ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm + # fix man page + mv ${pkgdir}/usr/share/man/man1/qemu.1 \ + ${pkgdir}/usr/share/man/man1/qemu-kvm.1 + # install udev rules + install -D -m644 ${srcdir}/65-kvm.rules \ + ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done +} +md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install new file mode 100644 index 000000000..84aa773b9 --- /dev/null +++ b/testing/qemu-kvm/qemu-kvm.install @@ -0,0 +1,16 @@ +post_install() { + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" + echo ">>> Add yourself to the group 'kvm'." + echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." + echo "" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + groupdel kvm +} diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD new file mode 100644 index 000000000..0930f2d7c --- /dev/null +++ b/testing/qt/PKGBUILD @@ -0,0 +1,128 @@ +# $Id: PKGBUILD 141140 2011-10-24 20:29:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.8.0rc1 +_pkgver=4.8.0-rc1 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0" +source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop') +md5sums=('3e003b671384df8d1cb77dd6cc804934' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd') + +build() { + cd "${srcdir}"/${_pkgfqn} + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -no-declarative-debug \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ + done +} diff --git a/testing/qt/assistant.desktop b/testing/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/testing/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/testing/qt/designer.desktop b/testing/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/testing/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/testing/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/testing/qt/qt.install b/testing/qt/qt.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/testing/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/testing/qtwebkit/PKGBUILD b/testing/qtwebkit/PKGBUILD new file mode 100644 index 000000000..fbc1d44e3 --- /dev/null +++ b/testing/qtwebkit/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 141163 2011-10-25 07:14:31Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qtwebkit +pkgver=2.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://trac.webkit.org/wiki/QtWebKit' +pkgdesc='An open source web browser engine (Qt port)' +license=('LGPL2.1' 'GPL3') +depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base') +makedepends=('python2' 'mesa' 'chrpath') +source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" + 'python2-path.patch') +sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' + 'b0ef3d5596171e3900a685df9bcfac3068ad6330') + +build() { + cd "${srcdir}"/QtWebKit-${pkgver} + + patch -p1 -i "${srcdir}"/python2-path.patch + + cd Tools/Scripts + ./build-webkit --qt \ + --prefix=/usr \ + --makeargs="${MAKEFLAGS}" \ + --release +} + +package() { + cd "${srcdir}"/QtWebKit-${pkgver} + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so +} diff --git a/testing/qtwebkit/python2-path.patch b/testing/qtwebkit/python2-path.patch new file mode 100644 index 000000000..2e270e6fc --- /dev/null +++ b/testing/qtwebkit/python2-path.patch @@ -0,0 +1,29 @@ +--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000 ++++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000 +@@ -88,5 +88,5 @@ + retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h + retgen.wkScript = $$PWD/create_regex_tables + retgen.input = retgen.wkScript +-retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT} + addExtraCompiler(retgen) +--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000 ++++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000 +@@ -640,7 +640,7 @@ + inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl +-inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json ++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json + inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl + inspectorJSON.wkAddOutputToSources = false + addExtraCompiler(inspectorJSON) +@@ -723,7 +723,7 @@ + entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.wkScript = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES ++entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + addExtraCompiler(entities) diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD new file mode 100644 index 000000000..eee2e5398 --- /dev/null +++ b/testing/samba/PKGBUILD @@ -0,0 +1,146 @@ +# $Id: PKGBUILD 141126 2011-10-24 13:21:17Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +pkgbase=samba +pkgname=('smbclient' 'samba') +pkgver=3.6.1 +# We use the 'A' to fake out pacman's version comparators. Samba chooses +# to append 'a','b',etc to their subsequent releases, which pamcan +# misconstrues as alpha, beta, etc. Bad samba! +_realver=3.6.1 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba samba.logrotate + swat.xinetd + samba.pam + samba.conf.d + fix-ipv6-mount.patch) +### UNINSTALL dmapi package before building!!! + +build() { + cd ${srcdir}/${pkgbase}-${_realver}/source3 + ./configure --prefix=/usr \ + --libdir=/usr/lib/ \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run/samba \ + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-dnsupdate \ + --with-automount \ + --with-quotas \ + --with-ads \ + --with-acl-support \ + --with-cifsmount \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ + --enable-external-libtdb + make +} + +package_smbclient () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib + install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ + for i in libnetapi* libwbclient* libsmbclient*;do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done + install -m755 script/smbtar ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb + mkdir -p ${pkgdir}/usr/include + install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ + install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/share/man/man{1,7} + for man in rpcclient smbcacls smbclient smbcquotas smbget \ + smbtree smbtar nmblookup; do + install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ + done + install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +} + +package_samba () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/samba-${_realver}/source3 + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + make DESTDIR=${pkgdir} install + chmod 644 ${pkgdir}/usr/include/*.h + rm -rf ${pkgdir}/usr/var + rm -rf ${pkgdir}/var/run/samba + (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) + install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba + install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba + mkdir -p ${pkgdir}/etc/samba + cat ../examples/smb.conf.default | \ + sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default + install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + # nsswitch libraries + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so + ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so + ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2 + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so + # remove conflict files of smbclient + for man in libsmbclient smbspool \ + mount.cifs net cifs.upcall; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do + rm -f ${pkgdir}/usr/lib/$i + done + for bin in net \ + nmblookup rpcclient smbcacls smbclient \ + smbcquotas smbget smbspool smbtar smbtree; do + rm -f ${pkgdir}/usr/bin/$bin + done + rm -f ${pkgdir}/usr/sbin/cifs.upcall + rm -f ${pkgdir}/usr/include/netapi.h + for man in rpcclient smbcacls smbclient smbcquotas \ + smbtree smbtar nmblookup smbget; do + rm -f ${pkgdir}/usr/share/man/man1/${man}.1 + done + for man in tdbbackup tdbdump tdbtool; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 + rm -f ${pkgdir}/usr/include/libsmbclient.h + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('5291717be0734e07dc07b6110e162e87' + 'a3da19515a234c703876cf850c44e996' + '5697da77590ec092cc8a883bae06093c' + 'a4bbfa39fee95bba2e7ad6b535fae7e6' + '96f82c38f3f540b53f3e5144900acf17' + 'f2f2e348acd1ccb566e95fa8a561b828' + 'c6a38a8c8fa24979e6217aed533358ea') diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch new file mode 100644 index 000000000..89bef6533 --- /dev/null +++ b/testing/samba/fix-ipv6-mount.patch @@ -0,0 +1,11 @@ +--- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 ++++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 +@@ -1563,7 +1563,7 @@ + } + } + +- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { ++ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { + strlcat(options, "%", options_size); + current_len = strnlen(options, options_size); + optionstail = options + current_len; diff --git a/testing/samba/samba b/testing/samba/samba new file mode 100755 index 000000000..458eb8e2b --- /dev/null +++ b/testing/samba/samba @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba + +[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) + +case "$1" in + start) + rc=0 + stat_busy "Starting Samba Server" + if [ ! -x /var/run/samba ] ; then + install -m755 -g 81 -o 81 -d /var/run/samba + fi + if [ ! -x /var/log/samba ] ; then + install -m755 -g 81 -o 81 -d /var/log/samba + fi + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] && /usr/sbin/$d -D + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon samba + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping Samba Server" + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] || kill $PID &> /dev/null + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + rm /var/run/samba/smbd.pid &>/dev/null + rm /var/run/samba/nmbd.pid &>/dev/null + rm /var/run/samba/winbindd.pid &>/dev/null + rm_daemon samba + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d new file mode 100644 index 000000000..8721f956a --- /dev/null +++ b/testing/samba/samba.conf.d @@ -0,0 +1,7 @@ +# +# Configuration for the samba init script +# + +# space separated list of daemons to launch +SAMBA_DAEMONS=(smbd nmbd) +#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate new file mode 100644 index 000000000..581f4c33b --- /dev/null +++ b/testing/samba/samba.logrotate @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/samba/samba.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd new file mode 100644 index 000000000..2e62a82b2 --- /dev/null +++ b/testing/samba/swat.xinetd @@ -0,0 +1,10 @@ +service swat +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/swat + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..bb7635aaa --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 141045 2011-10-22 13:25:45Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sudo +_ver=1.8.3 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="http://www.sudo.ws/sudo/" +license=('custom') +depends=('glibc' 'pam') +backup=('etc/sudoers' 'etc/pam.d/sudo') +options=('!libtool' '!makeflags') +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} + sudo.pam) +md5sums=('9e5517bbf3aee420b38c2d1d7a71bcad' + '9320510b4fde1c98a1846d9a21c5442a' + '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') + +build() { + cd "$srcdir/$pkgname-$_ver" + + ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ + --with-env-editor --with-all-insults --with-logfac=auth + make +} + +package() { + cd "$srcdir/$pkgname-$_ver" + install -dm755 "$pkgdir/var/lib" + + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" + + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" +} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so diff --git a/testing/truecrypt/PKGBUILD b/testing/truecrypt/PKGBUILD new file mode 100644 index 000000000..9cdc1bc33 --- /dev/null +++ b/testing/truecrypt/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 140995 2011-10-21 02:53:15Z eric $ +# Maintainer: Paul Mattal <paul.archlinux.org> + +pkgname=truecrypt +pkgver=7.1 +pkgrel=1 +pkgdesc="Free open-source cross-platform disk encryption software" +url="http://www.truecrypt.org/" +arch=('i686' 'x86_64') +license=('custom') # TrueCrypt License v2.6 +depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper') +makedepends=('nasm') +optdepends=('sudo: mounting encrypted volumes as nonroot users') +conflicts=('truecrypt-utils') +replaces=('truecrypt-utils') +# N.B. Truecrypt's web-based source download is incompatible with +# makepkg. Source has been placed on ftp.archlinux.org instead +source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ + 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ + "${pkgname}.desktop" \ + "${pkgname}-arch-detection.patch") +md5sums=('a8268630a870faff07af940f63fb29eb' + 'ddee7c4b2419ecb44b02c8294a08fbed' + 'ce6a707b79411e82e8e558aa03e764b0' + '183b9bf04a943454d4e216130bcbac01' + '00ea70fa8437de877b31b027ac2b4060') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-source" + + # Work around buggy CPU type detection + patch -Np1 -i ../${pkgname}-arch-detection.patch + + # Build + make PKCS11_INC="${srcdir}/pkcs-2.20" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-source" + + # Install Binary + install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" + + # Install Desktop file and Icon + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" + + # Install License + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" +} diff --git a/testing/truecrypt/truecrypt-arch-detection.patch b/testing/truecrypt/truecrypt-arch-detection.patch new file mode 100644 index 000000000..bc16a2a36 --- /dev/null +++ b/testing/truecrypt/truecrypt-arch-detection.patch @@ -0,0 +1,15 @@ +diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile +--- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400 ++++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400 +@@ -120,10 +120,7 @@ + + export CPU_ARCH ?= unknown + +-ARCH = $(shell uname -p) +-ifeq "$(ARCH)" "unknown" +- ARCH = $(shell uname -m) +-endif ++ARCH = $(shell uname -m) + + ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) + CPU_ARCH = x86 diff --git a/testing/truecrypt/truecrypt.desktop b/testing/truecrypt/truecrypt.desktop new file mode 100644 index 000000000..53626f29f --- /dev/null +++ b/testing/truecrypt/truecrypt.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Exec=truecrypt +Icon=truecrypt +Comment=On-the-fly encryption +Terminal=false +Name=TrueCrypt +StartupNotify=true +Categories=System; diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD new file mode 100644 index 000000000..534a3d336 --- /dev/null +++ b/testing/util-linux/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 140979 2011-10-20 11:26:22Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=util-linux +pkgver=2.20.1 +pkgrel=1 +pkgdesc="Miscellaneous system utilities for Linux" +url="http://userweb.kernel.org/~kzak/util-linux-ng/" +arch=('i686' 'x86_64') +groups=('base') +depends=('filesystem') +replaces=('linux32' 'util-linux-ng') +conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') +provides=('linux32' "util-linux-ng=${pkgver}") +license=('GPL2') +options=('!libtool') +#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2) +optdepends=('perl: for chkdupexe support') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # hardware clock + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + + ./configure --enable-arch\ + --enable-write\ + --enable-raw\ + --disable-wall\ + --enable-partx\ + --enable-libmount-mount + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm755 "${pkgdir}/var/lib/hwclock" + + make DESTDIR="${pkgdir}" install +} +md5sums=('079b37517fd4e002a2e6e992e8b4e361') |
