diff options
47 files changed, 734 insertions, 149 deletions
diff --git a/community-testing/tomoyo-tools/PKGBUILD b/community-testing/tomoyo-tools/PKGBUILD new file mode 100644 index 000000000..c2e406cd5 --- /dev/null +++ b/community-testing/tomoyo-tools/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 61687 2012-01-06 17:27:08Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> + +pkgname=tomoyo-tools +_basever=2.5.0 +_timestamp=20111025 +_file=53357 +pkgver=${_basever}.${_timestamp} +pkgrel=1 +pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' +arch=('i686' 'x86_64') +url='http://tomoyo.sourceforge.jp' +#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' +license=('GPL') +depends=('ncurses') +conflicts=('ccs-tools') +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('99999779698ea5f44c74d49e8c640ec1') + +build() { + cd "${srcdir}/${pkgname}" + make -j1 +} + +package() { + cd "${srcdir}/${pkgname}" + make INSTALLDIR="${pkgdir}" install +} diff --git a/community-testing/tomoyo-tools/tomoyo-tools.install b/community-testing/tomoyo-tools/tomoyo-tools.install new file mode 100644 index 000000000..695a53f19 --- /dev/null +++ b/community-testing/tomoyo-tools/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1e678ddd7..d307ee6c4 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61409 2011-12-30 12:30:52Z giovanni $ +# $Id: PKGBUILD 61671 2012-01-06 10:40:17Z 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.33 +pkgver=0.8.34 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('042c9f9f54ad02d08668e6a010682752' +md5sums=('f0e5137c9cd4faaa6eee984b06ba6143' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD new file mode 100644 index 000000000..43ecb19f7 --- /dev/null +++ b/community/dmd/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 61677 2012-01-06 12:49:05Z cbrannon $ +# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgname=dmd +pkgver=1.072 +pkgrel=1 +pkgdesc="The Digital Mars D compiler." +arch=('i686' x86_64) +url="http://www.digitalmars.com/d/1.0/" +source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip) +install='dmd.install' +provides=('d-compiler') +license=('custom') +options=('!strip') +depends=(gcc-libs) +optdepends=('libphobos: D standard runtime library' + 'libtango: Alternative runtime library') + +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') + +build() { + # Copy the license. + install -Dm644 "$srcdir/dmd/license.txt" "$pkgdir/usr/share/licenses/dmd/LICENSE" || return 1 + + if [ $CARCH == x86_64 ]; then + cd "$srcdir/dmd/linux/bin64" + else + cd "$srcdir/dmd/linux/bin32" + fi + install -dm755 "$pkgdir/usr/bin" + install -m755 dmd rdmd dumpobj obj2asm "$pkgdir/usr/bin" + + for x in "$srcdir"/dmd/man/man1/*.1; do + install -Dm644 "$x" "$pkgdir/usr/share/man/man1/$(basename "$x")" || return 1 + done + + for x in "$srcdir"/dmd/man/man1/*.5; do + install -Dm644 "$x" "$pkgdir/usr/share/man/man5/$(basename "$x")" || return 1 + done +} +md5sums=('d5489b94f06c7ca2f4b5de62f7e6815a') diff --git a/community/dmd/dmd.install b/community/dmd/dmd.install new file mode 100644 index 000000000..62f98d07d --- /dev/null +++ b/community/dmd/dmd.install @@ -0,0 +1,21 @@ +pre_install() { + /bin/true +} +post_install() { + echo '==> Note: dmd does not come with a runtime library!' + echo '==> The D language has two competing, incompatible standard libraries.' + echo '==> In order for dmd to be useful, you must' + echo '==> install either libphobos or libtango, whichever you prefer.' +} +pre_upgrade() { + /bin/true +} +post_upgrade() { + /bin/true +} +pre_remove() { + /bin/true +} +post_remove() { + /bin/true +} diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 020cecc84..3c4fdaa7f 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=66640 +pkgver=66883 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index e5693034b..1fefb73e0 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61522 2012-01-02 10:51:45Z rvanharen $ +# $Id: PKGBUILD 61708 2012-01-06 22:05:47Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=66707 +pkgver=66935 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 721afb0b2..5e402a167 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61520 2012-01-02 10:50:24Z rvanharen $ +# $Id: PKGBUILD 61706 2012-01-06 22:04:50Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=66326 +pkgver=66792 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 7c3eba04b..3ca1b065e 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61514 2012-01-02 10:37:36Z rvanharen $ +# $Id: PKGBUILD 61699 2012-01-06 22:00:26Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=66702 +pkgver=66892 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 689561d26..b2d14c0b0 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61298 2011-12-28 09:15:21Z rvanharen $ +# $Id: PKGBUILD 61703 2012-01-06 22:03:25Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=66561 +pkgver=66943 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 661c83908..7c6e4074c 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61510 2012-01-02 10:30:50Z rvanharen $ +# $Id: PKGBUILD 61695 2012-01-06 21:58:46Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=66634 +pkgver=66804 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 1bc99366c..5bef98708 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61518 2012-01-02 10:45:51Z rvanharen $ +# $Id: PKGBUILD 61704 2012-01-06 22:04:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 3e51be7d7..fab4becb5 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61507 2012-01-02 10:24:26Z rvanharen $ +# $Id: PKGBUILD 61693 2012-01-06 21:58:03Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=66694 +pkgver=66864 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 0176ddd82..4e4254a93 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=66566 +pkgver=66938 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 74629b20a..1b04b03b1 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61516 2012-01-02 10:43:43Z rvanharen $ +# $Id: PKGBUILD 61701 2012-01-06 22:01:42Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index 98ca68dc5..296ebb37d 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61524 2012-01-02 10:53:00Z rvanharen $ +# $Id: PKGBUILD 61709 2012-01-06 22:07:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index c6af284da..b3018c5d8 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61512 2012-01-02 10:34:03Z rvanharen $ +# $Id: PKGBUILD 61697 2012-01-06 21:59:30Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=66727 +pkgver=66901 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 7e632f8bb..0db178663 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 59322 2011-11-23 15:17:06Z lfleischer $ +# $Id: PKGBUILD 61721 2012-01-06 22:32:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gecko-mediaplayer -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/gecko-mediaplayer/' license=('GPL') -depends=("gnome-mplayer>=${pkgver}" 'dbus-glib') +depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') -source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - 'firefox-8.patch') -md5sums=('7bb7665f8a1e6832907d052863e8f7aa' - 'e58a8fc33c1cf7a2453e1f6612acf028') +source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('1a96daf878d06452c0fd9a13fd186021') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../firefox-8.patch - ./configure --prefix=/usr --sysconfdir=/etc --without-gconf --enable-new-libxul make } diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD new file mode 100644 index 000000000..f7c68c23b --- /dev/null +++ b/community/gmtk/PKGBUILD @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=gmtk +pkgver=1.0.5 +pkgrel=1 +pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.' +arch=('i686' 'x86_64') +url='http://gmtk.googlecode.com/' +license=('GPL') +depends=('glib' 'gtk3' 'dconf') +makedepends=('intltool' 'pkg-config') +options=(!libtool) +source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('e06e9ca8d61d74910343bb3ef4348f7f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags gtk+-3.0)" + ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk3 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 5671d5e30..1c8a08716 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 51291 2011-07-06 15:32:05Z lfleischer $ +# $Id: PKGBUILD 61719 2012-01-06 22:32:00Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf') +depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('c97dcf12d6a6b5543d701944f95e850e') +md5sums=('1d3ab24c5501b5528e357931ca4dc6da') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 080c51871..06b3b1c50 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,35 +1,43 @@ -# $Id: PKGBUILD 58399 2011-11-12 17:17:21Z ibiru $ +# $Id: PKGBUILD 61715 2012-01-06 22:18:07Z ebelanger $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac -pkgver=0.4.5 -pkgrel=9 +pkgver=3824 +pkgrel=1 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" -depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut') license=('LGPL') +depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +optdepends=('jack: for jack support' 'a52dec: for A52 support' + 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - libpng14-infopp-null.patch openjpeg14.patch) -sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8' - '00ba08808ec46ef6b8301ede26e500b3449253c1' - '95747ca98cdf0efc33ec776764401f5a83818ab5') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('bf7039c2585d539475babc7996851627efd7ec59') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=$pkgver + _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} build() { - cd "${srcdir}/${pkgname}" - chmod +x configure - sed -i 's|--warn-common||' configure - sed -i 's#lib64#lib#g' configure - patch -p1 -i "${srcdir}/libpng14-infopp-null.patch" - patch -p1 -i "${srcdir}/openjpeg14.patch" - - export LDFLAGS=${LDFLAGS/,--as-needed/} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no make } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install-lib } diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 2f29fb30d..0644c49c9 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 56750 2011-10-11 20:34:16Z bluewind $ +# $Id: PKGBUILD 61683 2012-01-06 14:16:13Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.6 +pkgver=3.7 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2) -md5sums=('b23093dba7c44a7628ee5c97e68c9941') +md5sums=('dab2d059f4115b5ac0b5d329401d883b') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/libphobos/PKGBUILD b/community/libphobos/PKGBUILD new file mode 100644 index 000000000..227067776 --- /dev/null +++ b/community/libphobos/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 61679 2012-01-06 12:52:49Z cbrannon $ +# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> +# Contributor: Dawid Ciezarkiewicz <dawid.ciezarkiewicz@jabster.pl> + +pkgname=libphobos +pkgver=1.072 +pkgrel=1 +pkgdesc="Runtime library for the D programming language" +arch=('i686' x86_64) +url="http://www.digitalmars.com/d/1.0/" +source=(http://ftp.digitalmars.com/dmd.$pkgver.zip dmd.conf) +depends=(dmd=$pkgver) +license=('custom') +conflicts=('libtango') + +build() { + install -d "$pkgdir/usr/include/d" + cd "$srcdir/dmd/src/phobos" + cp -Rf std "$pkgdir/usr/include/d" + cp -Rf etc "$pkgdir/usr/include/d" + cp -Rf internal "$pkgdir/usr/include/d" + cp -f {crc32,object,gcstats}.d "$pkgdir/usr/include/d" + + if [ $CARCH == x86_64 ]; then + install -Dm644 "$srcdir/dmd/linux/lib64/libphobos.a" "$pkgdir/usr/lib/libphobos.a" + else + install -Dm644 "$srcdir/dmd/linux/lib32/libphobos.a" "$pkgdir/usr/lib/libphobos.a" + fi + + install -Dm644 "$srcdir/dmd.conf" "$pkgdir/etc/dmd.conf" + + # Get rid of this subdirectory; it's just an unpacked zlib source + # distribution. + rm -rf "${pkgdir}/usr/include/d/etc/c/zlib" + # Insure that files and directories under /usr/include/d have + # correct permissions. + find "${pkgdir}/usr/include/d" -type d -print0 |xargs -0 chmod 755 + find "${pkgdir}/usr/include/d" -type f -print0 |xargs -0 chmod 644 + install -Dm644 phoboslicense.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +md5sums=('d5489b94f06c7ca2f4b5de62f7e6815a' + 'e93f0ccb1e5c00cd222af5a9be3f599a') diff --git a/community/libphobos/dmd.conf b/community/libphobos/dmd.conf new file mode 100644 index 000000000..262f0b224 --- /dev/null +++ b/community/libphobos/dmd.conf @@ -0,0 +1,2 @@ +[Environment] +DFLAGS=-I/usr/include/d -L-L/usr/lib diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 101dd3636..ea3a3ba41 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,69 +1,72 @@ -# $Id: PKGBUILD 59056 2011-11-21 04:12:47Z ebelanger $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 61675 2012-01-06 12:11:34Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Eric Bélanger +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> - pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') pkgver=1.0.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" +url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('fa1de7fc920de46fb8d8b9f67732c7a3') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") +sha256sums=('e4fab8f2778c29b4c814109741d886c6f0725cfbb85b851aaf42d8f635ff515c') build() { cd "$srcdir/ruby-gtk2-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir=$pkgdir + LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir="$pkgdir" make } package_ruby-atk() { - pkgdesc="Ruby bindings for atk" - depends=("ruby-glib2=$pkgver" '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') + 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") + 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') + 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") + 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') + pkgdesc="Ruby bindings for pango" + depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 37808bbfe..2b9d1321f 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,45 +1,53 @@ -# $Id: PKGBUILD 59256 2011-11-22 03:57:15Z ebelanger $ -# Maintainer: Thomas S Hatch <thatch45@gmail.com> +# $Id: PKGBUILD 61725 2012-01-07 01:42:13Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - pkgname=scite -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 -pkgdesc='A generally useful editor with facilities for building and running programs.' +pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') url='http://www.scintilla.org/SciTE.html' license=('custom:scite') depends=('desktop-file-utils' 'gtk2') +makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=scite.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -md5sums=('e2ed3190ebf714f037d05cde7b9591de') +sha256sums=('a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa') build() { - sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile + cd "$srcdir" - sed "s/CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER \$(INCLUDEDIRS)/CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)/" -i scintilla/gtk/makefile + if [ $?CXXBASEFLAGS == 1 ]; then + sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile + setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)" + fi - sed "s/CXXFLAGS=-DNDEBUG -Os \$(CXXBASEFLAGS) \$(THREADFLAGS)/CXXFLAGS=-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)/" -i scintilla/gtk/makefile + sed '0,/CXXFLAGS=/s//nop=/' -i scintilla/gtk/makefile + setconf scintilla/gtk/makefile CXXFLAGS "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)" + setconf scintilla/gtk/makefile CXXBASEFLAGS "-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)" - cd "${srcdir}/scintilla/gtk" + cd "$srcdir/scintilla/gtk" make - cd "${srcdir}/${pkgname}/gtk" + cd "$srcdir/$pkgname/gtk" make } package() { - cd "${srcdir}/${pkgname}/gtk" + cd "$srcdir/$pkgname/gtk" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install - install -D -m644 ../License.txt \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scite" - install -D -m644 "${srcdir}/scintilla/License.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scintilla" + install -Dm644 "$srcdir/$pkgname/License.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scite" + install -Dm644 "$srcdir/scintilla/License.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scintilla" - ln -sf SciTE ${pkgdir}/usr/bin/scite + ln -sf SciTE "$pkgdir/usr/bin/scite" } + +# vim:set ts=2 sw=2 et: diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 4e165bf32..841333712 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55575 2011-09-14 10:47:03Z lfleischer $ +# $Id: PKGBUILD 61689 2012-01-06 19:23:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=1 +pkgrel=2 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -12,9 +12,11 @@ license=('GPL') makedepends=('asciidoc') backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" - 'tinyproxy') + 'tinyproxy' + 'tinyproxy.tmpfiles.conf') md5sums=('292ac51da8ad6ae883d4ebf56908400d' - '464b5d60b1c9cbae26367fe2337c2d77') + '464b5d60b1c9cbae26367fe2337c2d77' + '3c2764578f26581346fe312da0519a3e') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,6 +30,7 @@ package() { make DESTDIR="${pkgdir}" install install -Dm0755 "${srcdir}/tinyproxy" "${pkgdir}/etc/rc.d/tinyproxy" + install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf" install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}" diff --git a/community/tinyproxy/tinyproxy.tmpfiles.conf b/community/tinyproxy/tinyproxy.tmpfiles.conf new file mode 100644 index 000000000..791a99ad1 --- /dev/null +++ b/community/tinyproxy/tinyproxy.tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/tinyproxy 0770 nobody nobody - diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 74f912e37..caeb1e018 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58588 2011-11-16 05:16:51Z spupykin $ +# $Id: PKGBUILD 61691 2012-01-06 20:47:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.35 +pkgver=5.37 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') @@ -11,9 +11,9 @@ license=('BSD') depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') -source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ +source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('fdd7b876aac46f9a86497858b70e17b2' +md5sums=('526863e7e01c5038de98b996a89d2ac4' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index a96ea1c4a..83f108937 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142292 2011-11-08 00:30:49Z thomas $ +# $Id: PKGBUILD 146230 2012-01-06 14:32:39Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -12,16 +12,15 @@ depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook - encrypt_install - cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch) -sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed' + encrypt_install) +sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' + '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' - 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573' - '6fa1d3172014ba3ba96f7a67acbcae7f26b24a61abb84b3917f526a54f81dd87') + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') build() { cd "${srcdir}"/$pkgname-${pkgver} - patch -p0 -i "${srcdir}"/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make } diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index f4489153a..9184647f8 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 142215 2011-11-06 10:21:27Z thomas $ +# $Id: PKGBUILD 146220 2012-01-06 09:21:20Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap -pkgver=1.1.1 -pkgrel=4 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org/" license=('BSD') depends=('glibc' 'libnl' 'sh') makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz) - #Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch - #Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch) -sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85') - #'194aa268a3397be3ba406b7102dbdbc14fc16c6e4b535d0a0fab6b04d414563a' - #'f1f31c3e2b064f4c9d0e643e8ed1874a65ec17f770362f8ffa3b3f9ee9dc71bb') +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz + http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig) +sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' + 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4') + build() { cd ${srcdir}/${pkgname}-${pkgver} - #patch -p1 -i "${srcdir}"/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch - #patch -p1 -i "${srcdir}"/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch ./configure --prefix=/usr --enable-ipv6 make } diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index d90a8a570..6bda23d46 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135525 2011-08-14 20:37:18Z thomas $ +# $Id: PKGBUILD 146232 2012-01-06 14:32:42Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64 'mips64el') @@ -13,10 +13,12 @@ backup=(usr/share/openvpn/easy-rsa/vars usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf etc/conf.d/openvpn-tapdev) source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz + http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc openvpn.rc openvpn-tapdev.rc openvpn-tapdev.conf) -md5sums=('500bee5449b29906150569aaf2eb2730' +md5sums=('c5181e27b7945fa6276d21873329c5c7' + '81ff11ec8cd9fc3c8bc646aae24c4298' 'a3809b9727f0c2af2d0770f5c7442db2' 'd2c48e970088d679dd3c2afd914ff731' '722f483c9e3ce2ec66d3301aaf7cf3d5') diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 8ba2595fb..a380da235 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $ +# $Id: PKGBUILD 146236 2012-01-06 17:00:30Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -14,9 +14,9 @@ url="http://pulseaudio.org/" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack - openssl fftw orc json-c) + openssl fftw orc json-c gtk2) [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) -options=(!emptydirs !libtool !makeflags) +options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz $pkgbase.xinit) sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee' @@ -35,6 +35,9 @@ build() { --disable-rpath \ --disable-default-build-tests + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } @@ -50,8 +53,9 @@ package_pulseaudio() { [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install + cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install # Lower resample quality, saves CPU sed -e '/resample-method/iresample-method=speex-float-0' \ @@ -62,9 +66,8 @@ package_pulseaudio() { sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ -i "$pkgdir/usr/bin/start-pulseaudio-x11" - # Make some modules optional + # Make ConsoleKit optional sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -e '/load-module module-jackdbus-detect/s/^/#/' \ -i "$pkgdir/etc/pulse/default.pa" # Python fix @@ -93,9 +96,10 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c) + depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) + mv "$srcdir"/libpulse/* "$pkgdir" } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 33e3f2073..6677931dd 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -226,9 +226,9 @@ package_linux-libre-headers() { cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" if [ "$CARCH" = "mips64el" ]; then - cp -a "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" + cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi # fix permissions on scripts dir diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 71783fa50..a310f72e1 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -<<<<<<< HEAD -# Linux/i386 3.1.6-1 Kernel Configuration -======= # Linux/i386 3.2.0 Kernel Configuration ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index bab05ffce..3e86e1c56 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,11 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -<<<<<<< HEAD -KERNEL_VERSION=3.1.6-1-LIBRE -======= KERNEL_VERSION=3.2.0-1-LIBRE ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c post_install () { # updating module dependencies diff --git a/staging/k9copy/PKGBUILD b/staging/k9copy/PKGBUILD new file mode 100644 index 000000000..0c3b120ee --- /dev/null +++ b/staging/k9copy/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146218 2012-01-06 05:17:15Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> + +pkgname=k9copy +pkgver=2.3.8 +pkgrel=2 +pkgdesc="A small utility which allows the copy of DVD under Linux" +arch=('i686' 'x86_64') +url="http://k9copy.sourceforge.net" +license=('GPL') +depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor') +makedepends=('automoc4' 'cmake') +install=k9copy.install +source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('584f6cc50f28befbeb0d5c1ec9476456') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop + + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/k9copy/k9copy.install b/staging/k9copy/k9copy.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/k9copy/k9copy.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/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch new file mode 100644 index 000000000..2cd995e97 --- /dev/null +++ b/staging/kdelibs/fix-knotify-filepath.patch @@ -0,0 +1,13 @@ +diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp +index 88d18b6..0e76658 100644 +--- a/knotify/config/knotifyconfigactionswidget.cpp ++++ b/knotify/config/knotifyconfigactionswidget.cpp +@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( ) + KUrl soundURL = m_ui.Sound_select->url(); + if ( soundURL.isRelative() ) + { +- QString soundString = soundURL.toLocalFile(); ++ QString soundString = m_ui.Sound_select->text(); + // we need a way to get the application name in order to ba able to do this : + /*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile); + search = KGlobal::mainComponent().dirs()->findResource("data", search); diff --git a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000..bdcd39a6c --- /dev/null +++ b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <johu@gentoo.org> +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD new file mode 100644 index 000000000..99620b4cd --- /dev/null +++ b/staging/opencv/PKGBUILD @@ -0,0 +1,119 @@ +# $Id: PKGBUILD 146240 2012-01-06 22:16:16Z eric $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1_a +_realver=2.3.1 +pkgrel=3 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('opencv-docs' + 'opencv-samples' + 'eigen2' + 'python2-numpy: Python 2.x interface') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2") +md5sums=('82e4b6bfa349777233eea09b075e931e') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$_realver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + cd "$srcdir/$_realname-$_realver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + unset depends + unset optdepends + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=('bash') + unset optdepends + unset options + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD index 6fd9c4c96..d278860cb 100644 --- a/testing/kmod/PKGBUILD +++ b/testing/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146216 2012-01-06 04:24:28Z dreisner $ +# $Id: PKGBUILD 146226 2012-01-06 11:00:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=3 -pkgrel=3 +pkgrel=4 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url="http://git.profusion.mobi/cgit.cgi/kmod.git" @@ -26,6 +26,7 @@ build() { patch -Np1 <"$srcdir/return-non-zero-on-fail.patch" ./configure \ + --sysconfdir=/etc \ --with-rootprefix= \ --with-rootlibdir=/lib \ --with-zlib diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD index 6bcc909f1..c5988c0fb 100644 --- a/testing/lirc/PKGBUILD +++ b/testing/lirc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146184 2012-01-05 13:52:33Z tpowa $ +# $Id: PKGBUILD 146228 2012-01-06 12:04:39Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=9 +pkgrel=10 epoch=1 _extramodules=extramodules-3.2-ARCH _kernver="$(cat /lib/modules/${_extramodules}/version)" @@ -61,7 +61,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.1' 'linux<3.2') + depends=('lirc-utils' 'linux>=3.2' 'linux<3.3') replaces=('lirc+pctv') install=lirc.install diff --git a/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch new file mode 100644 index 000000000..993650b2c --- /dev/null +++ b/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch @@ -0,0 +1,77 @@ +From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Sun, 11 Dec 2011 13:58:05 -0500 +Subject: [PATCH] findmnt: support alternative location of fstab + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + misc-utils/findmnt.8 | 6 ++++-- + misc-utils/findmnt.c | 9 +++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 +index 24e3a52..7f3dc6c 100644 +--- a/misc-utils/findmnt.8 ++++ b/misc-utils/findmnt.8 +@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default. + .SH OPTIONS + .IP "\fB\-h, \-\-help\fP" + Print help and exit. +-.IP "\fB\-s, \-\-fstab\fP" ++.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP" + Search in + .IR /etc/fstab + and + .IR /etc/fstab.d . +-The output is in the list format (see --list). ++The output is in the list format (see --list). Optionally, search the file ++specified by ++.IR fstab . + .IP "\fB\-m, \-\-mtab\fP" + Search in + .IR /etc/mtab . +diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c +index 4577dc6..5502a87 100644 +--- a/misc-utils/findmnt.c ++++ b/misc-utils/findmnt.c +@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) + + fprintf(out, _( + "\nOptions:\n" +- " -s, --fstab search in static table of filesystems\n" ++ " -s, --fstab[=<fstab>] search in static table of filesystems\n" + " -m, --mtab search in table of mounted filesystems\n" + " -k, --kernel search in kernel table of mounted\n" + " filesystems (default)\n\n")); +@@ -839,7 +839,7 @@ int main(int argc, char *argv[]) + { "direction", 1, 0, 'd' }, + { "evaluate", 0, 0, 'e' }, + { "first-only", 0, 0, 'f' }, +- { "fstab", 0, 0, 's' }, ++ { "fstab", 2, 0, 's' }, + { "help", 0, 0, 'h' }, + { "invert", 0, 0, 'i' }, + { "kernel", 0, 0, 'k' }, +@@ -872,7 +872,8 @@ int main(int argc, char *argv[]) + tt_flags |= TT_FL_TREE; + + while ((c = getopt_long(argc, argv, +- "acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) { ++ "acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:", ++ longopts, NULL)) != -1) { + switch(c) { + case 'a': + tt_flags |= TT_FL_ASCII; +@@ -938,7 +939,7 @@ int main(int argc, char *argv[]) + case 's': /* fstab */ + if (tabfile) + errx_mutually_exclusive("--{fstab,mtab,kernel}"); +- tabfile = _PATH_MNTTAB; ++ tabfile = optarg ? optarg : _PATH_MNTTAB; + tt_flags &= ~TT_FL_TREE; + break; + case 'k': /* kernel (mountinfo) */ +-- +1.7.8.1 + diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD new file mode 100644 index 000000000..f014cd857 --- /dev/null +++ b/testing/util-linux/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 146238 2012-01-06 20:01:52Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=util-linux +pkgver=2.20.1 +pkgrel=2 +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 + 0001-findmnt-support-alternative-location-of-fstab.patch) +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 + + # backport patch needed for usr support in initramfs + patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch + + ./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' + '823e2d87885b81f245b8c368e28f8cab') diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD new file mode 100644 index 000000000..e4677e072 --- /dev/null +++ b/testing/xf86-video-nouveau/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 146234 2012-01-06 15:24:05Z ibiru $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: buddabrod <buddabrod@gmail.com> + +pkgname=xf86-video-nouveau +_gitdate=20120106 +pkgver=0.0.16_git${_gitdate} # see configure.ac +pkgrel=1 +pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" +arch=('i686' 'x86_64') +url="http://nouveau.freedesktop.org/wiki/" +license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e +depends=('libdrm' 'udev') +optdepends=('nouveau-dri: experimental gallium3d features') +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') +conflicts=('xorg-server<1.11.0') +options=('!libtool') +install=$pkgname.install +source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) +md5sums=('4b0ee8643b3322ff3a0c5d70262a54af') + +# source PKGBUILD && mksource +mksource() { + mkdir /tmp/$pkgname-${_gitdate} + pushd /tmp/$pkgname-${_gitdate} + git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau + cd xf86-video-nouveau + git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 + popd +} + +build() { + cd $srcdir/xf86-video-nouveau-${_gitdate} + ./autogen.sh --prefix=/usr + make +} + +package() { + cd $srcdir/xf86-video-nouveau-${_gitdate} + make DESTDIR=$pkgdir install +} diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install new file mode 100644 index 000000000..027154ff3 --- /dev/null +++ b/testing/xf86-video-nouveau/xf86-video-nouveau.install @@ -0,0 +1,16 @@ +post_install () { + cat << _EOF + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF +} + +post_upgrade() { + if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then + cat << _EOF + ==> ATTENTION: Usermode support has been dropped + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF + fi +} |