diff options
44 files changed, 1558 insertions, 384 deletions
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index be7875459..7266aabe3 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71674 2012-05-31 23:36:16Z jlichtblau $ +# $Id: PKGBUILD 75948 2012-09-06 19:45:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.4 +pkgver=3.3.5 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('x86_64' 'i686') @@ -13,8 +13,9 @@ url="http://trac.osgeo.org/geos/" license=('LGPL') depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') +changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('cd5400aa5f3fe32246dfed5d238c5017e1808162c865c016480b3e6c07271904') +sha256sums=('3b513fbe2d155364d61e76d9c250d6d8e75b5166783a233596c744373cb5874f') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog new file mode 100644 index 000000000..ea7b3b411 --- /dev/null +++ b/community/geos/geos.changelog @@ -0,0 +1,2 @@ +2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * geos 3.3.5-1 diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 49fbff6b5..7ee43a4d0 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73400 2012-07-07 07:56:30Z jlichtblau $ +# $Id: PKGBUILD 75950 2012-09-06 20:00:35Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('439137d4864217c350678d8357c07a0f80455f2cff35a736dd6b58a2d3d683b4' +sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index abf10ce78..47c05ab04 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.5.1-1 + 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.5.0-1 diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 15c721641..20a00cb2a 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75731 2012-08-29 20:24:22Z jlichtblau $ +# $Id: PKGBUILD 75946 2012-09-06 19:40:02Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> pkgname=skrooge -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl') install=$pkgname.install changelog=$pkgname.changelog source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('d96cd0ac7d503e22ae809f4646ad6008818485804c4569adbddcfd5e953743a2') +sha256sums=('251ffca5ad8e3696901fb29df2714fcb30541fe9e3107b9de2c2cb9f6b47cee9') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index f866264c2..9c6ad4384 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * skrooge 1.3.3-1 + 2012-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.3.2-1 diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 4fc673922..38c71a492 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75892 2012-09-05 01:14:27Z dwallace $ +# $Id: PKGBUILD 75944 2012-09-06 14:39:06Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="a document viewer" arch=('i686' 'x86_64') url="http://pwmt.org/projects/zathura/" @@ -21,6 +21,7 @@ md5sums=('2b606a5db61c80b0f1208e9f1df468c2' build() { cd $srcdir/zathura-$pkgver + sed -i 's/rst2man/&2/' config.mk make ZATHURA_GTK_VERSION=2 } diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 189ef3e55..73f18b65a 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164233 2012-07-28 01:51:21Z eric $ +# $Id: PKGBUILD 166323 2012-09-06 08:36:59Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ license=("GPL") depends=("libnl") makedepends=("linux-api-headers") source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a') +sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index 4b1289429..36a8ebf50 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149934 2012-02-11 23:29:36Z allan $ +# $Id: PKGBUILD 166324 2012-09-06 11:47:33Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less -pkgver=444 -pkgrel=3 +pkgver=451 +pkgrel=1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('56f9f76ffe13f70155f47f6b3c87d421' - 'd5fafbd94a9cfdeaad0c82143a033fe5') +md5sums=('765f082658002b2b46b86af4a0da1842' + 'a5493f4598ba7c9f81782683f3c27119') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index 812beb3af..439163598 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143766 2011-11-29 01:07:45Z giovanni $ +# $Id: PKGBUILD 166337 2012-09-06 15:49:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ebook-tools -pkgver=0.2.1 -pkgrel=4 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Tools for accessing and converting various ebook file formats" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/ebook-tools/" @@ -11,7 +11,7 @@ license=('custom') depends=('libzip' 'libxml2' 'convertlit') makedepends=('pkgconfig' 'cmake') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045') +md5sums=('67bce67ceb72dcc3578d6a81ef92b29b') build() { cd "${srcdir}" diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 7f6a2ca12..f69861820 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $ +# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=fontconfig -pkgver=2.8.0 +pkgver=2.10.1 pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) @@ -11,27 +12,43 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz - 29-replace-bitmap-fonts.conf - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - 'f6b67e8cc79197ed6abd4701911e83da' - '51bc6cb633b50f3c28793361738aac5b') + 29-replace-bitmap-fonts.conf) +md5sums=('c94e380eea42f2f23ca9537035ef1899' + 'f6b67e8cc79197ed6abd4701911e83da') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well + libtoolize -f + autoreconf -f + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-xmldir=/etc/fonts \ + --localstatedir=/var \ + --disable-static \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/share/fonts make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \ - "$pkgdir/etc/fonts/conf.avail" - rm -f "$pkgdir"/etc/fonts/conf.d/*.conf + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd #Install license install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/fontconfig/fontconfig.install b/extra/fontconfig/fontconfig.install index 20feb6e52..3a0ca573b 100644 --- a/extra/fontconfig/fontconfig.install +++ b/extra/fontconfig/fontconfig.install @@ -1,100 +1,39 @@ -configs=('20-fix-globaladvance.conf' - '20-unhint-small-vera.conf' - '29-replace-bitmap-fonts.conf' - '30-metric-aliases.conf' - '30-urw-aliases.conf' - '40-nonlatin.conf' - '45-latin.conf' - '49-sansserif.conf' - '50-user.conf' - '51-local.conf' - '60-latin.conf' - '65-fonts-persian.conf' - '65-nonlatin.conf' - '69-unifont.conf' - '80-delicious.conf' - '90-synthetic.conf') - post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - /usr/bin/fc-cache -f - echo "done." -} - -post_upgrade() { - rm -f /etc/fonts/conf.d/10-bitmaps.conf cat << _EOF - -===> Important Fontconfig configuration change <=== - - The way fontconfig is configured has been changed. - Configuration is done via /etc/fonts/conf.avail and conf.d. + + Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d. Read /etc/fonts/conf.d/README for more information. Configuration via /etc/fonts/local.conf is still possible, but is no longer recommended for options available in conf.avail. -_EOF - - if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then - # Upgrade from old version, place all symlinks. pre-symlink package version - echo -n "Linking configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - echo "done." - fi + Main systemwide configuration should be done by symlinks + (especially for autohinting, sub-pixel and lcdfilter): + + cd /etc/fonts/conf.d + ln -s ../conf.avail/XX-foo.conf + + Check also https://wiki.archlinux.org/index.php/Font_Configuration + and https://wiki.archlinux.org/index.php/Fonts. - if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then - # pre-2.6.0 versions have missing config - echo -n "Adding missing configuration files... " - pushd /etc/fonts/conf.d > /dev/null - ln -sf ../conf.avail/30-metric-aliases.conf . - ln -sf ../conf.avail/40-nonlatin.conf . - ln -sf ../conf.avail/45-latin.conf . - popd > /dev/null - echo "done." - fi +_EOF - # Remove dead links - echo -n "Removing outdated configuration files... " - for config in /etc/fonts/conf.d/*; do - if [ ! -f ${config} ]; then - rm -f ${config} - fi - done - echo "done." - echo -n "updating font cache... " /usr/bin/fc-cache -f echo "done." } -pre_upgrade() { - # Link new config files not present on system yet - echo -n "Symlinking new configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - if [ ! -f ../conf.avail/${config} ]; then - ln -sf ../conf.avail/${config} . - fi - done - popd > /dev/null +post_upgrade() { + echo -n "updating font cache... " + /usr/bin/fc-cache -f echo "done." } post_remove() { - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - rm -f ${config} - done - popd > /dev/null + cat << _EOF + + Check for dead symlinks and leftover files + in /etc/fonts/conf.d/ + +_EOF } diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 0383b1d05..01300dc14 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165451 2012-08-20 08:01:40Z giovanni $ +# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('3260bdc49e72ccc9dc63b1e2fb02eae5') +md5sums=('a4bc97804e630dbf26dfac8f28c78091') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 415e603af..39bd6c1cb 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,32 +3,33 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "${srcdir}"/icedtea-web* - - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz + cd "${srcdir}"/icedtea-web* ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} + --with-jdk-home=${_jvmdir} \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 1d90a13db..0d1537aba 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $ +# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "$srcdir/$pkgname-$pkgver" + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ - --datarootdir=/usr/share + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 9ecc4d9c7..1a2185e75 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163018 2012-07-05 19:22:35Z andrea $ +# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.2.0.20120705 +pkgver=1.3.0 pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="http://opendesktop.org/content/show.php?content=127960" @@ -11,8 +11,8 @@ license=('LGPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('659f9737bcc79f0bfbd08ff37ad0e232') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('27f72c8044fc798add9f4cbf9c799154') build() { cd "${srcdir}" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 973985940..f68f66b5d 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165439 2012-08-19 15:29:10Z andrea $ +# $Id: PKGBUILD 166364 2012-09-06 22:13:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.27 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" @@ -37,7 +37,7 @@ build() { -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 0f573142c..395fe2873 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -52,7 +51,7 @@ package_qscintilla() { } package_python-qscintilla-common() { - pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD new file mode 100644 index 000000000..70a61c17b --- /dev/null +++ b/extra/sbc/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 166341 2012-09-06 18:04:29Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=sbc +pkgver=1.0 +pkgrel=1 +pkgdesc="Bluetooth Subband Codec (SBC) library" +arch=('i686' 'x86_64') +url="http://www.bluez.org/" +license=('GPL' 'LGPL') +depends=('glibc') +options=(!libtool) +source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz) +md5sums=('aa2bc39c4a09aade064efea4bbbc4b2d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-tester + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 332cb5a36..638587d1e 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $ +# $Id: PKGBUILD 166346 2012-09-06 20:23:30Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt pkgver=3.7.2 -pkgrel=1 +pkgrel=2 _date=201202080800 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" license=('EPL') -depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') +depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst') optdepends=('libgnomeui' 'mesa' 'libwebkit') makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 98952ae13..277778cfc 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.23 +pkgver=1.1.24 pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=("Apache") depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('f2a55b5a19adbe491edc98e0c11d9028') +md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index d0c30fd0b..e55352c56 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $ +# $Id: PKGBUILD 166321 2012-09-06 07:34:07Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=600 -__hgrev=11d40fc82f11 +_patchlevel=659 +__hgrev=1052677493be _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda' - '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083' +sha1sums=('5f9bc51f6935368edda0aab6251d2c5cd5350acd' + 'cb2b2c50a9582e27fe71ac77fc9191122adf0a44' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' @@ -57,9 +57,9 @@ mksource() { build() { # remove -O2 because there is a crash with python because of it # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196 - export CFLAGS="${CFLAGS/-O2 /}" + #export CFLAGS="${CFLAGS/-O2 /}" - cd "${srcdir}" + #cd "${srcdir}" cp -a ${pkgname}-${pkgver} vim-build diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD index 938ef597b..23934a11a 100644 --- a/extra/xchm/PKGBUILD +++ b/extra/xchm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144000 2011-12-01 15:58:58Z giovanni $ +# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=xchm -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=1 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64') url="http://xchm.sourceforge.net/" @@ -13,7 +13,7 @@ install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' 'xchm.xml') -md5sums=('85943645d20af536704a20b58ebd5849' +md5sums=('9bfe439ce94554ebae95d84f7a1db8e7' '31fb9692b9ee9f2a205f58b9ff4bc4fe' '4102b0a393f5c60236143cc034664dd0') diff --git a/extra/xchm/xchm.install b/extra/xchm/xchm.install index 1ad77f9aa..df90cb5ac 100644 --- a/extra/xchm/xchm.install +++ b/extra/xchm/xchm.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } @@ -9,7 +9,7 @@ post_upgrade() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD new file mode 100644 index 000000000..b1608804d --- /dev/null +++ b/gnome-unstable/clutter/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 166355 2012-09-06 21:24:56Z jgc $ +# 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.11.14 +pkgrel=1 +pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') +makedepends=('gobject-introspection' 'mesa') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2da2c220dd966a2657eb6f02e835e2527bc1b5a10cc649b70a8906e08a61a832') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --enable-introspection + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gcr/PKGBUILD b/gnome-unstable/gcr/PKGBUILD new file mode 100644 index 000000000..ace88daa9 --- /dev/null +++ b/gnome-unstable/gcr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 166366 2012-09-06 22:17:08Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gcr +pkgver=3.5.90 +pkgrel=1 +pkgdesc="A library for bits of crypto UI and parsing" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +install=gcr.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('279a5b6db60bec078a0bef9b52a43713d715b622fc4e3c4695982a4a030462ce') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexec=/usr/lib/gcr \ + --disable-static \ + --disable-update-mime \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gcr/gcr.install b/gnome-unstable/gcr/gcr.install new file mode 100644 index 000000000..8677671c4 --- /dev/null +++ b/gnome-unstable/gcr/gcr.install @@ -0,0 +1,14 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade () { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD new file mode 100644 index 000000000..83ef5bd13 --- /dev/null +++ b/gnome-unstable/gjs/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 166357 2012-09-06 21:31:23Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gjs +pkgver=1.33.10 +pkgrel=1 +pkgdesc="Javascript Bindings for GNOME" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Gjs" +license=('GPL') +depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b856e329eac8208e6618d7e5a7176828ffcc8bb8bb72cf13c34d66524d0ecafd') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|python|python2|' scripts/make-tests + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD new file mode 100644 index 000000000..15103ec4e --- /dev/null +++ b/gnome-unstable/json-glib/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 166351 2012-09-06 20:52:29Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=json-glib +pkgver=0.15.2 +pkgrel=1 +pkgdesc="JSON library built on GLib" +arch=('i686' 'x86_64') +url="http://live.gnome.org/JsonGlib" +license=('GPL') +depends=('glib2') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} + +check(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD new file mode 100644 index 000000000..fc3d4d3ba --- /dev/null +++ b/gnome-unstable/polkit/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166359 2012-09-06 21:43:48Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=polkit +pkgver=0.107 +pkgrel=1 +pkgdesc="Application development toolkit for controlling system-wide privileges" +arch=(i686 x86_64) +license=('LGPL') +url="http://www.freedesktop.org/wiki/Software/PolicyKit" +depends=('glib2' 'pam' 'expat' 'libsystemd' 'js') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +replaces=('policykit') +options=('!libtool') +install=polkit.install +source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz + polkit.pam) +md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1' + '6564f95878297b954f0572bc1610dd15') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --disable-static --enable-gtk-doc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + chown 102 "$pkgdir/etc/polkit-1/rules.d" + chown 102 "$pkgdir/usr/share/polkit-1/rules.d" + + install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" +} diff --git a/gnome-unstable/polkit/autogen.sh b/gnome-unstable/polkit/autogen.sh new file mode 100755 index 000000000..d08b00a49 --- /dev/null +++ b/gnome-unstable/polkit/autogen.sh @@ -0,0 +1,123 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory $srcdir does not look like the" + echo " top-level package directory" + exit 1 +} + +olddir=`pwd` +cd "$srcdir" + +touch ChangeLog + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have autoconf installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && { + (libtoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have libtool installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + } +} + +(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have gtk-doc installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have automake installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing aclocal. The version of automake" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + + +# if no automake, don't bother testing for autoreconf +test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have autoreconf installed." + echo "You can get autoreconf from ..." + DIE=1 +} + + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "**Warning**: I am going to run configure with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo $0 " command line." + echo +fi + +case $CC in +xlc ) + am_opt=--include-deps;; +esac + + aclocalinclude="$ACLOCAL_FLAGS" + + echo "Running autoreconf on test/mocklibc ..." + (cd "test/mocklibc"; autoreconf --install) + + if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu -Wno-portability $am_opt ..." + automake --add-missing --gnu -Wno-portability $am_opt + echo "Running autoconf ..." + autoconf + +intltoolize --copy --force --automake || exit 1 + +cd "$olddir" + +conf_flags="--enable-maintainer-mode --enable-gtk-doc" + +if test x$NOCONFIGURE = x; then + echo "Running $srcdir/configure $conf_flags $@ ..." + $srcdir/configure $conf_flags "$@" \ + && echo "Now type make to compile." || exit 1 +else + echo "Skipping configure process." +fi diff --git a/gnome-unstable/polkit/logind+ConsoleKit.patch b/gnome-unstable/polkit/logind+ConsoleKit.patch new file mode 100644 index 000000000..042d1043a --- /dev/null +++ b/gnome-unstable/polkit/logind+ConsoleKit.patch @@ -0,0 +1,638 @@ +From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Tue, 7 Aug 2012 21:06:18 +0200 +Subject: [PATCH] session tracking: always require consolekit + +Only systemd is now optional at compile-time, and if enabled we fallback to consolekit +at runtime, if not booted with systemd. + +Bits-stolen-from: Jan Alexander Steffens <jan.steffens@gmail.com> +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + configure.ac | 6 +- + src/polkit/polkitunixsession-systemd.c | 96 ++++++- + src/polkitbackend/polkitbackendjsauthority.c | 10 +- + .../polkitbackendsessionmonitor-systemd.c | 313 +++++++++++++++++++-- + 4 files changed, 380 insertions(+), 45 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7a0d938..1d1e4ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login], + [enable_libsystemd_login=auto]) + if test "$enable_libsystemd_login" != "no"; then + PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, +- [libsystemd-login], ++ [libsystemd-login libsystemd-daemon], + have_libsystemd_login=yes, + have_libsystemd_login=no) + if test "$have_libsystemd_login" = "yes"; then +- SESSION_TRACKING=libsystemd-login ++ SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)" + AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) + else + if test "$enable_libsystemd_login" = "yes"; then +- AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found]) ++ AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found]) + fi + fi + fi +diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c +index 8a8bf65..bb89044 100644 +--- a/src/polkit/polkitunixsession-systemd.c ++++ b/src/polkit/polkitunixsession-systemd.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2011 Red Hat, Inc. ++ * Copyright (C) 2008, 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -17,6 +17,7 @@ + * Boston, MA 02111-1307, USA. + * + * Author: Matthias Clasen ++ * Author: David Zeuthen <davidz@redhat.com> + */ + + #ifdef HAVE_CONFIG_H +@@ -31,6 +32,7 @@ + #include "polkitprivate.h" + + #include <systemd/sd-login.h> ++#include <systemd/sd-daemon.h> + + /** + * SECTION:polkitunixsession +@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject *subject, + PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); + gboolean ret = FALSE; + uid_t uid; ++ GDBusConnection *connection; /* consolekit */ ++ GVariant *result; /* consolekit */ + +- if (sd_session_get_uid (session->session_id, &uid) == 0) +- ret = TRUE; ++ if (sd_booted()) ++ { ++ if (sd_session_get_uid (session->session_id, &uid) == 0) ++ ret = TRUE; ++ } ++ else /* consolekit */ ++ { ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); ++ if (connection == NULL) ++ goto out; ++ ++ result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.ConsoleKit", /* name */ ++ session->session_id, /* object path */ ++ "org.freedesktop.ConsoleKit.Session", /* interface name */ ++ "GetUser", /* method */ ++ NULL, /* parameters */ ++ G_VARIANT_TYPE ("(u)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ cancellable, ++ error); ++ if (result == NULL) ++ goto out; ++ ++ ret = TRUE; ++ g_variant_unref (result); ++ ++ out: ++ if (connection != NULL) ++ g_object_unref (connection); ++ } + + return ret; + } +@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable *initable, + PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); + gboolean ret = FALSE; + char *s; ++ GDBusConnection *connection; /* consolekit */ ++ GVariant *result; /* consolekit */ ++ connection = NULL; /* consolekit */ + + if (session->session_id != NULL) + { + /* already set, nothing to do */ +- ret = TRUE; +- goto out; ++ return TRUE; + } + +- if (sd_pid_get_session (session->pid, &s) == 0) ++ if (sd_booted()) ++ { ++ if (sd_pid_get_session (session->pid, &s) == 0) ++ { ++ session->session_id = g_strdup (s); ++ free (s); ++ return TRUE; ++ } ++ ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "No session for pid %d", ++ (gint) session->pid); ++ } ++ else /* consolekit */ + { +- session->session_id = g_strdup (s); +- free (s); ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); ++ if (connection == NULL) ++ goto out; ++ ++ result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.ConsoleKit", /* name */ ++ "/org/freedesktop/ConsoleKit/Manager", /* object path */ ++ "org.freedesktop.ConsoleKit.Manager", /* interface name */ ++ "GetSessionForUnixProcess", /* method */ ++ g_variant_new ("(u)", session->pid), /* parameters */ ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ cancellable, ++ error); ++ if (result == NULL) ++ goto out; ++ ++ g_variant_get (result, "(o)", &session->session_id); ++ g_variant_unref (result); ++ + ret = TRUE; +- goto out; + } + +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "No session for pid %d", +- (gint) session->pid); ++ out: ++ if (connection != NULL) /* consolekit */ ++ g_object_unref (connection); + +-out: + return ret; + } + +diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c +index bdfaa73..ee38739 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.c ++++ b/src/polkitbackend/polkitbackendjsauthority.c +@@ -36,6 +36,7 @@ + + #ifdef HAVE_LIBSYSTEMD_LOGIN + #include <systemd/sd-login.h> ++#include <systemd/sd-daemon.h> + #endif /* HAVE_LIBSYSTEMD_LOGIN */ + + #include <jsapi.h> +@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority *authority, + } + + #ifdef HAVE_LIBSYSTEMD_LOGIN +- if (sd_pid_get_session (pid, &session_str) == 0) ++ if (sd_booted()) + { +- if (sd_session_get_seat (session_str, &seat_str) == 0) ++ if (sd_pid_get_session (pid, &session_str) == 0) + { +- /* do nothing */ ++ if (sd_session_get_seat (session_str, &seat_str) == 0) ++ { ++ /* do nothing */ ++ } + } + } + #endif /* HAVE_LIBSYSTEMD_LOGIN */ +diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c +index 58593c3..5114dfa 100644 +--- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c ++++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c +@@ -26,11 +26,15 @@ + #include <string.h> + #include <glib/gstdio.h> + #include <systemd/sd-login.h> ++#include <systemd/sd-daemon.h> + #include <stdlib.h> + + #include <polkit/polkit.h> + #include "polkitbackendsessionmonitor.h" + ++/* consolekit */ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + /* <internal> + * SECTION:polkitbackendsessionmonitor + * @title: PolkitBackendSessionMonitor +@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor + GDBusConnection *system_bus; + + GSource *sd_source; ++ ++ /* consolekit */ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; + }; + + struct _PolkitBackendSessionMonitorClass +@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY + + /* ---------------------------------------------------------------------------------------------------- */ + ++/* consolekit */ ++static gboolean ++reload_database (PolkitBackendSessionMonitor *monitor, ++ GError **error) ++{ ++ gboolean ret; ++ struct stat statbuf; ++ ++ ret = FALSE; ++ ++ if (monitor->database != NULL) ++ { ++ g_key_file_free (monitor->database); ++ monitor->database = NULL; ++ } ++ ++ if (stat (CKDB_PATH, &statbuf) != 0) ++ { ++ g_set_error (error, ++ G_IO_ERROR, ++ g_io_error_from_errno (errno), ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ monitor->database_mtime = statbuf.st_mtime; ++ ++ monitor->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (monitor->database, ++ CKDB_PATH, ++ G_KEY_FILE_NONE, ++ error)) ++ { ++ goto out; ++ } ++ ++ ret = TRUE; ++ ++ out: ++ return ret; ++} ++ ++static gboolean ++ensure_database (PolkitBackendSessionMonitor *monitor, ++ GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (monitor->database != NULL) ++ { ++ struct stat statbuf; ++ ++ if (stat (CKDB_PATH, &statbuf) != 0) ++ { ++ g_set_error (error, ++ G_IO_ERROR, ++ g_io_error_from_errno (errno), ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ if (statbuf.st_mtime == monitor->database_mtime) ++ { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (monitor, error); ++ ++ out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor *file_monitor, ++ GFile *file, ++ GFile *other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ if (monitor->database != NULL) ++ { ++ g_key_file_free (monitor->database); ++ monitor->database = NULL; ++ } ++ g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); ++} ++ ++/* consolekit - end */ ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -163,6 +267,7 @@ static void + polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) + { + GError *error; ++ GFile *file; /* consolekit */ + + error = NULL; + monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); +@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) + g_error_free (error); + } + +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted()) ++ { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ } ++ else /* consolekit */ ++ { ++ error = NULL; ++ if (!ensure_database (monitor, &error)) ++ { ++ g_printerr ("Error loading " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, ++ G_FILE_MONITOR_NONE, ++ NULL, ++ &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) ++ { ++ g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } ++ else ++ { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object) + g_source_unref (monitor->sd_source); + } + ++ /* consolekit */ ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ g_key_file_free (monitor->database); ++ /* consolekit - end */ ++ + if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object); + } +@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor + GError **error) + { + PolkitIdentity *ret; ++ GError *local_error; /* consolekit */ ++ gchar *group; /* consolekit */ + guint32 uid; + + ret = NULL; +@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor + else if (POLKIT_IS_UNIX_SESSION (subject)) + { + +- if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) ++ if (sd_booted()) + { +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "Error getting uid for session"); +- goto out; ++ if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) ++ { ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Error getting uid for session"); ++ goto out; ++ } ++ ++ ret = polkit_unix_user_new (uid); ++ } ++ else /* consolekit */ ++ { ++ if (!ensure_database (monitor, error)) ++ { ++ g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); ++ goto out; ++ } ++ ++ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); ++ local_error = NULL; ++ uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); ++ if (local_error != NULL) ++ { ++ g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); ++ g_free (group); ++ goto out; ++ } ++ g_free (group); + } +- +- ret = polkit_unix_user_new (uid); + } + + out: +@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + + if (POLKIT_IS_UNIX_PROCESS (subject)) + { +- gchar *session_id; +- pid_t pid; ++ if (sd_booted()) ++ { ++ gchar *session_id; ++ pid_t pid; + +- pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); +- if (sd_pid_get_session (pid, &session_id) < 0) +- goto out; ++ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); ++ if (sd_pid_get_session (pid, &session_id) < 0) ++ goto out; + +- session = polkit_unix_session_new (session_id); +- free (session_id); ++ session = polkit_unix_session_new (session_id); ++ free (session_id); ++ } ++ else /* consolekit */ ++ { ++ const gchar *session_id; ++ GVariant *result; ++ result = g_dbus_connection_call_sync (monitor->system_bus, ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", ++ "GetSessionForUnixProcess", ++ g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, /* timeout_msec */ ++ NULL, /* GCancellable */ ++ error); ++ if (result == NULL) ++ goto out; ++ g_variant_get (result, "(&o)", &session_id); ++ session = polkit_unix_session_new (session_id); ++ g_variant_unref (result); ++ } + } + else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) + { + guint32 pid; +- gchar *session_id; + GVariant *result; + + result = g_dbus_connection_call_sync (monitor->system_bus, +@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + g_variant_get (result, "(u)", &pid); + g_variant_unref (result); + +- if (sd_pid_get_session (pid, &session_id) < 0) +- goto out; ++ if (sd_booted()) ++ { ++ gchar *session_id; ++ if (sd_pid_get_session (pid, &session_id) < 0) ++ goto out; + +- session = polkit_unix_session_new (session_id); +- free (session_id); ++ session = polkit_unix_session_new (session_id); ++ free (session_id); ++ } ++ else /* consolekit */ ++ { ++ const gchar *session_id; ++ result = g_dbus_connection_call_sync (monitor->system_bus, ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", ++ "GetSessionForUnixProcess", ++ g_variant_new ("(u)", pid), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, /* timeout_msec */ ++ NULL, /* GCancellable */ ++ error); ++ if (result == NULL) ++ goto out; ++ g_variant_get (result, "(&o)", &session_id); ++ session = polkit_unix_session_new (session_id); ++ g_variant_unref (result); ++ } + } + else + { +@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + return session; + } + ++static gboolean ++get_boolean (PolkitBackendSessionMonitor *monitor, ++ PolkitSubject *session, ++ const gchar *key_name) ++{ ++ gboolean ret; ++ gchar *group; ++ GError *error; ++ ++ ret = FALSE; ++ ++ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) ++ { ++ g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s", ++ key_name, ++ group, ++ error->message); ++ g_error_free (error); ++ goto out; ++ } ++ ++ error = NULL; ++ ret = g_key_file_get_boolean (monitor->database, group, key_name, &error); ++ if (error != NULL) ++ { ++ g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n", ++ key_name, ++ group, ++ error->message); ++ g_error_free (error); ++ goto out; ++ } ++ ++ out: ++ g_free (group); ++ return ret; ++} ++ + gboolean + polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, + PolkitSubject *session) + { + char *seat; + ++ if (!sd_booted()) /* consolekit */ ++ { ++ return get_boolean (monitor, session, "is_local"); ++ } ++ + if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) + { + free (seat); +@@ -409,6 +671,9 @@ gboolean + polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, + PolkitSubject *session) + { +- return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ if (sd_booted()) ++ return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ else /* consolekit */ ++ return get_boolean (monitor, session, "is_active"); + } + +-- +1.7.11.4 + diff --git a/gnome-unstable/polkit/polkit.install b/gnome-unstable/polkit/polkit.install new file mode 100644 index 000000000..fbb98919e --- /dev/null +++ b/gnome-unstable/polkit/polkit.install @@ -0,0 +1,18 @@ +post_install() { + getent group polkitd >/dev/null || groupadd -g 102 polkitd + getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd + passwd -l polkitd &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + if getent passwd polkitd >/dev/null; then + userdel polkitd + fi + if getent group polkitd >/dev/null; then + groupdel polkitd + fi +} diff --git a/gnome-unstable/polkit/polkit.pam b/gnome-unstable/polkit/polkit.pam new file mode 100644 index 000000000..04f53e0db --- /dev/null +++ b/gnome-unstable/polkit/polkit.pam @@ -0,0 +1,7 @@ +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +password required pam_unix.so diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 2739a7c7c..addf86ef3 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165189 2012-08-12 19:45:00Z andyrtr $ +# $Id: PKGBUILD 166387 2012-09-07 13:33:10Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.20 -pkgrel=2 +pkgver=1.0.24 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.20.3') +depends=('lcms2' 'poppler>=0.20.3' 'qpdf') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('fc1d2b8cb5b0513224d7e2b01f900704') +md5sums=('242ea48cd41f8546d71b00bf2b06c564') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index bed0b129a..f69e561be 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164089 2012-07-26 16:54:32Z andrea $ +# $Id: PKGBUILD 165939 2012-09-03 21:49:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('f5c358e3c7902b15328908a9966f98774827988e' +sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 45ef65005..ba6273763 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_lite.desktop') -sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d' +sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 27fb5d504..e5fdb1ea6 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164789 2012-08-05 12:10:43Z andrea $ +# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.0 -pkgrel=4 +pkgver=4.9.1 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46' +sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 1244e21bb..0ec26edcd 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164151 2012-07-26 16:58:38Z andrea $ +# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d') +sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') build() { cd "${srcdir}" diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 7d80e341e..a71990231 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164156 2012-07-26 16:58:54Z andrea $ +# $Id: PKGBUILD 165999 2012-09-03 21:52:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('60c535370da1edf03481fdc1ef3f04f9269d54e2') +sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91') build() { cd "${srcdir}" diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD new file mode 100644 index 000000000..be2b8de26 --- /dev/null +++ b/libre/tp_smapi-libre/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com> +# Contributor: Nick B <Shirakawasuna ð gmail đ com> +# Contributor: Christof Musik <christof ð senfdax đ de> +# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de> +# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=tp_smapi +pkgname=tp_smapi-libre +pkgver=0.41 +pkgrel=5 +pkgdesc="Modules for ThinkPad's SMAPI functionality" +arch=('i686' 'x86_64') +url='https://github.com/evgeni/tp_smapi' +license=('GPL') +depends=('linux-libre>=3.5' 'linux-libre<3.6') +makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +install="${_pkgname}.install" +source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('63c683415c764568f6bf17c7eabe4752') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ + -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile + + make HDAPS=1 +} + +package() { + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + make -C "${_extramodules%/*}/${_kernver}/build" \ + INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ + M="${srcdir}/${_pkgname}-${pkgver}" modules_install + + cd "${pkgdir}/${_extramodules%/*}" + mv "${_kernver}/extra" "${_extramodules##*/}" + rmdir "${_kernver}" + + # compress kernel libre modules + find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + + + # load module on startup + echo tp_smapi > "${srcdir}/${_pkgname}.conf" + install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf" + + # update kernel libre version in install file + sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install" +} diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install new file mode 100644 index 000000000..5fe1bab90 --- /dev/null +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -0,0 +1,13 @@ +extramodules=/usr/lib/modules/extramodules-3.5-ARCH + +post_install() { + depmod -v $(< "$extramodules/version") &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD index e4f96e5ae..d2d0d4bbe 100644 --- a/pcr/mesa-git/PKGBUILD +++ b/pcr/mesa-git/PKGBUILD @@ -17,15 +17,22 @@ true && pkgname=( libwayland-egl-git osmesa-git ati-dri-git + intel-gallium-dri-git intel-dri-git nouveau-dri-git + #ati-va-git + #nouveau-va-git + #soft-va-git + ati-vdpau-git + nouveau-vdpau-git + soft-vdpau-git ati-xvmc-git nouveau-xvmc-git soft-xvmc-git mesa-git ) -true && pkgver=9.0.0.git20120906 -true && pkgrel=1 +true && pkgver=9.0.0.git20120907 +true && pkgrel=2 _mesaver=9.0 arch=( i686 @@ -33,20 +40,27 @@ arch=( mips64el ) makedepends=( - clang - dri2proto - git - glproto-git - imake - libdrm-git - libxdamage - libxml2 - libxxf86vm - libxvmc - llvm - python2 - wayland -) # wine for d3d1x api + clang # needed for compilation + git # needed for git source + glproto-git # needed for compilation + imake # needed for compilation + libdrm-git # needed for compilation + libgbm-git # needed for 'make install' (ld error) + libgl-git # needed for 'make install' (ld error) + #libva # for va support + libvdpau # for vdpau support + libvg-git # needed for 'make install' (ld error) + libxdamage # needed for compilation + libxml2 # needed for compilation + libxxf86vm # needed for compilation + libxvmc # for xvmc support + llvm # for llvm support + python2 # needed for compilation + wayland # for wayland support + #wine # for d3d1x api support + xf86driproto # needed for compilation error + xorg-server-devel # for xorg suport +) license=( MIT Khronos @@ -102,14 +116,16 @@ build() { --enable-shared-glapi \ --enable-texture-float \ --enable-xa \ + --enable-xorg \ --enable-xvmc \ + --enable-vdpau \ --with-clang-libdir=/usr/lib \ --with-egl-platforms=drm,x11,wayland \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=i915,i965,r200,nouveau,radeon,swrast \ - --with-gallium-drivers=r300,r600,nouveau,swrast + --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast #--enable-d3d1x \ - echo -e "\ninstall: " >> src/mesa/drivers/osmesa/Makefile + #--enable-va \ make } @@ -118,16 +134,16 @@ package_khrplatform-devel-git() { khrplatform-devel ) provides=( - khrplatform-devel=${_mesaver} + khrplatform-devel=$_mesaver ) pkgdesc='Khronos platform development package' cd $srcdir/build install -m755 -d $pkgdir/usr/include/KHR install -m755 -d $pkgdir/usr/share/licenses/khrplatform-devel - bin/minstall include/KHR/khrplatform.h $pkgdir/usr/include/KHR - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/khrplatform-devel - bin/minstall docs/license.html $pkgdir/usr/share/licenses/khrplatform-devel + install -Dm644 include/KHR/khrplatform.h $pkgdir/usr/include/KHR + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/khrplatform-devel + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/khrplatform-devel } package_libcl-libre-git() { @@ -140,9 +156,11 @@ package_libcl-libre-git() { ) conflicts=( libcl + libcl-libre ) provides=( libcl + libcl-libre ) replaces=( libcl @@ -152,13 +170,13 @@ package_libcl-libre-git() { make -C $srcdir/build/src/gallium/targets/opencl DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/opencl + #install -m755 -d $pkgdir/usr/lib/opencl install -m755 -d $pkgdir/usr/share/licenses/libcl - #bin/minstall src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib - #bin/minstall lib/libOpenCL.so* $pkgdir/usr/lib - #bin/minstall src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/opencl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libcl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libcl + #install -Dm644 src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib + #install -Dm644 lib/libOpenCL.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/opencl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libcl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libcl } package_libegl-wayland-git() { @@ -172,32 +190,32 @@ package_libegl-wayland-git() { ) conflicts=( libegl - libegl-git libegl-wayland ) provides=( libegl=$_mesaver - libegl-git=$_mesaver + libegl-wayland=$_mesaver ) pkgdesc='Mesa EGL libraries and headers, with wayland Support' - #make -C $srcdir/build/src/egl DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install + make -C $srcdir/build/src/egl DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/include/EGL - install -m755 -d $pkgdir/usr/lib/egl - install -m755 -d $pkgdir/usr/lib/pkgconfig + rm -fvr $pkgdir/usr/include/KHR + #install -m755 -d $pkgdir/usr/include/EGL + #install -m755 -d $pkgdir/usr/lib/egl + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/doc/libegl install -m755 -d $pkgdir/usr/share/licenses/libegl - bin/minstall include/EGL/* $pkgdir/usr/include/EGL - bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib - bin/minstall lib/libEGL.so* $pkgdir/usr/lib - bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl - bin/minstall src/egl/main/egl.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/egl.html $pkgdir/usr/share/doc/libegl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libegl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libegl + #install -Dm644 include/EGL/* $pkgdir/usr/include/EGL + #install -Dm644 src/egl/main/libEGL.la $pkgdir/usr/lib + #install -Dm644 lib/libEGL.so* $pkgdir/usr/lib + #install -Dm644 lib/egl/egl_gallium.so $pkgdir/usr/lib/egl + #install -Dm644 src/egl/main/egl.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/egl.html $pkgdir/usr/share/doc/libegl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libegl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libegl } package_libgbm-git() { @@ -217,22 +235,22 @@ package_libgbm-git() { ) pkgdesc='Mesa GBM libraries and header' - #make -C $srcdir/build/src/gbm DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install + make -C $srcdir/build/src/gbm DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/include - install -m755 -d $pkgdir/usr/lib/gbm - install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/include + #install -m755 -d $pkgdir/usr/lib/gbm + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libgbm - bin/minstall src/gbm/main/gbm.h $pkgdir/usr/include - bin/minstall src/gbm/libgbm.la $pkgdir/usr/lib - bin/minstall lib/libgbm.so* $pkgdir/usr/lib - bin/minstall src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm - bin/minstall src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/gbm - bin/minstall src/gbm/main/gbm.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgbm - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgbm + #install -Dm644 src/gbm/main/gbm.h $pkgdir/usr/include + #install -Dm644 src/gbm/libgbm.la $pkgdir/usr/lib + #install -Dm644 lib/libgbm.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm + #install -Dm644 src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/gbm + #install -Dm644 src/gbm/main/gbm.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgbm + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgbm } package_libgl-gallium-git() { @@ -246,30 +264,30 @@ package_libgl-gallium-git() { ) conflicts=( libgl - libgl-git + libgl-gallium ) provides=( libgl=$_mesaver - libgl-git=$_mesaver + libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer' - #make -C $srcdir/build/src/glx DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install + make -C $srcdir/build/src/glx DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - bin/minstall src/glx/libGL.la $pkgdir/usr/lib - bin/minstall lib/libGL.so* $pkgdir/usr/lib - bin/minstall src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib - bin/minstall lib/libdricore*.so* $pkgdir/usr/lib - bin/minstall lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/libGL.txt $pkgdir/usr/share/doc/libgl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgl + #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib + #install -Dm644 lib/libGL.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore*.so* $pkgdir/usr/lib + #install -Dm644 lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgl } package_libgl-git() { @@ -283,31 +301,31 @@ package_libgl-git() { ) conflicts=( libgl - libgl-gallium-git + libgl-gallium ) provides=( libgl=$_mesaver - libgl-gallium-git=$_mesaver + libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer' - #make -C $srcdir/build/src/glx DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install + make -C $srcdir/build/src/glx DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - bin/minstall src/glx/libGL.la $pkgdir/usr/lib - bin/minstall lib/libGL.so* $pkgdir/usr/lib - bin/minstall src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib - bin/minstall lib/libdricore*.so* $pkgdir/usr/lib - bin/minstall src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/libGL.txt $pkgdir/usr/share/doc/libgl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgl + #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib + #install -Dm644 lib/libGL.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore*.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgl } package_libglapi-git() { @@ -325,12 +343,12 @@ package_libglapi-git() { make -C $srcdir/build/src/mapi/shared-glapi DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/libglapi - #bin/minstall src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib - #bin/minstall lib/libglapi.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libglapi - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libglapi + #install -Dm644 src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib + #install -Dm644 lib/libglapi.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libglapi + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libglapi } package_libgles-git() { @@ -347,23 +365,23 @@ package_libgles-git() { ) pkgdesc='Mesa GLES libraries and headers' - #make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install + make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install + make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/include/GLES - install -m755 -d $pkgdir/usr/include/GLES2 - install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/include/GLES + #install -m755 -d $pkgdir/usr/include/GLES2 + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libgles - bin/minstall include/GLES/* $pkgdir/usr/include/GLES - bin/minstall include/GLES2/* $pkgdir/usr/include/GLES2 - bin/minstall src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib - bin/minstall src/mapi/es2api/libGLESv2.la $pkgdir/usr/lib - bin/minstall lib/libGLESv*.so* $pkgdir/usr/lib - bin/minstall src/mapi/es1api/glesv1_cm.pc $pkgdir/usr/lib/pkgconfig - bin/minstall src/mapi/es2api/glesv2.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgles - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgles + #install -Dm644 include/GLES/* $pkgdir/usr/include/GLES + #install -Dm644 include/GLES2/* $pkgdir/usr/include/GLES2 + #install -Dm644 src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib + #install -Dm644 src/mapi/es2api/libGLESv2.la $pkgdir/usr/lib + #install -Dm644 lib/libGLESv*.so* $pkgdir/usr/lib + #install -Dm644 src/mapi/es1api/glesv1_cm.pc $pkgdir/usr/lib/pkgconfig + #install -Dm644 src/mapi/es2api/glesv2.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgles + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgles } package_libvg-git() { @@ -381,17 +399,17 @@ package_libvg-git() { make -C $srcdir/build/src/mapi/vgapi DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/include/VG - #install -m755 -d $pkgdir/usr/lib/pkgconfig - #install -m755 -d $pkgdir/usr/share/doc/libvg + #install -m755 -d $pkgdir/usr/include/VG + #install -m755 -d $pkgdir/usr/lib/pkgconfig + install -m755 -d $pkgdir/usr/share/doc/libvg install -m755 -d $pkgdir/usr/share/licenses/libvg - #bin/minstall include/VG/* $pkgdir/usr/include/VG - #bin/minstall src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib - #bin/minstall lib/libOpenVG.so* $pkgdir/usr/lib - #bin/minstall src/mapi/vgapi/vg.pc $pkgdir/usr/lib/pkgconfig - #bin/minstall docs/openvg.html $pkgdir/usr/share/doc/libvg - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libvg - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libvg + #install -Dm644 include/VG/* $pkgdir/usr/include/VG + #install -Dm644 src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib + #install -Dm644 lib/libOpenVG.so* $pkgdir/usr/lib + #install -Dm644 src/mapi/vgapi/vg.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/openvg.html $pkgdir/usr/share/doc/libvg + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libvg + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libvg } package_libwayland-egl-git() { @@ -409,13 +427,13 @@ package_libwayland-egl-git() { make -C $srcdir/build/src/egl/wayland/wayland-egl DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libwayland - #bin/minstall src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib - #bin/minstall lib/libwayland-egl.so* $pkgdir/usr/lib - #bin/minstall src/egl/wayland/wayland-egl/wayland-egl.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libwayland - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libwayland + #install -Dm644 src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib + #install -Dm644 lib/libwayland-egl.so* $pkgdir/usr/lib + #install -Dm644 src/egl/wayland/wayland-egl/wayland-egl.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libwayland + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libwayland } package_osmesa-git() { @@ -436,15 +454,15 @@ package_osmesa-git() { make -C $srcdir/build/src/mesa/drivers/osmesa DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/pkgconfig - #install -m755 -d $pkgdir/usr/share/doc/osmesa + #install -m755 -d $pkgdir/usr/lib/pkgconfig + install -m755 -d $pkgdir/usr/share/doc/osmesa install -m755 -d $pkgdir/usr/share/licenses/osmesa - #bin/minstall src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib - #bin/minstall lib/libOSMesa.so* $pkgdir/usr/lib - #bin/minstall src/mesa/drivers/osmesa/osmesa.pc $pkgdir/usr/lib/pkgconfig - #bin/minstall docs/osmesa.html $pkgdir/usr/share/doc/osmesa - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/osmesa - bin/minstall docs/license.html $pkgdir/usr/share/licenses/osmesa + #install -Dm644 src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib + #install -Dm644 lib/libOSMesa.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/drivers/osmesa/osmesa.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/osmesa.html $pkgdir/usr/share/doc/osmesa + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/osmesa + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/osmesa } package_ati-dri-git() { @@ -458,26 +476,69 @@ package_ati-dri-git() { provides=( ati-dri=$_mesaver ) - pkgdesc='Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon' + pkgdesc='Mesa DRI radeon/r200 + Gallium3D r300,r600,radeonsi drivers for AMD/ATI Radeon' - # classic mesa driver for R300 r300_dri.so - #make -C $srcdir/build/src/mesa/drivers/dri/r200 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/radeon DESTDIR=$pkgdir install - # gallium3D driver for R300 r300_dri.so - #make -C $srcdir/build/src/gallium/targets/dri-r300 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/dri-r600 DESTDIR=$pkgdir install + # classic mesa driver for radeon,r200 + make -C $srcdir/build/src/mesa/drivers/dri/r200 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/radeon DESTDIR=$pkgdir install + # gallium3D (dri) driver for r300,r600,radeonsi + make -C $srcdir/build/src/gallium/targets/dri-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-radeonsi DESTDIR=$pkgdir install + # gallium3D (xorg) driver for r300,r600g,radeonsi + make -C $srcdir/build/src/gallium/targets/xorg-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-radeonsi DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers install -m755 -d $pkgdir/usr/share/licenses/ati-dri - # classic mesa driver for R300 r300_dri.so - bin/minstall lib/r200_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/radeon_dri.so $pkgdir/usr/lib/xorg/modules/dri - # gallium3D driver for R300 r300_dri.so - bin/minstall lib/gallium/r300_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/gallium/r600_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/ati-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/ati-dri + # classic mesa driver for radeon,r200 + #install -Dm644 src/mesa/drivers/dri/r200/r200_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/r200_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/radeon/radeon_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/radeon_dri.so $pkgdir/usr/lib/xorg/modules/dri + # gallium3D (dri) driver for r300,r600,radeonsi + #install -Dm644 lib/gallium/r300_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/r600_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/radeonsi_dri.so $pkgdir/usr/lib/xorg/modules/dri + # gallium3D (xorg) driver for r300,r600g,radeonsi + #install -Dm644 lib/gallium/r300_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 lib/gallium/r600g_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 lib/gallium/radeonsi_drv.so $pkgdir/usr/lib/xorg/modules/drivers + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-dri +} + +package_intel-gallium-dri-git() { + depends=( + libgl-git + ) + conflicts=( + intel-dri + intel-gallium-dri + ) + provides=( + intel-dri=$_mesaver + intel-gallium-dri=$_mesaver + ) + pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )' + + make -C $srcdir/build/src/gallium/targets/dri-i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers + install -m755 -d $pkgdir/usr/share/licenses/intel-dri + #install -Dm644 src/gallium/targets/dri-i915/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/modesetting_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 src/mesa/drivers/dri/i965/i965_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/intel-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/intel-dri } package_intel-dri-git() { @@ -486,22 +547,26 @@ package_intel-dri-git() { ) conflicts=( intel-dri + intel-gallium-dri ) provides=( intel-dri=$_mesaver + intel-gallium-dri=$_mesaver ) pkgdesc='Mesa DRI drivers for Intel' - #make -C $srcdir/build/src/mesa/drivers/dri/i915 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/licenses/intel-dri - bin/minstall lib/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/intel-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/intel-dri + #install -Dm644 src/mesa/drivers/dri/i915/i915_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/i915/.libs/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/i965/i965_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/intel-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/intel-dri } package_nouveau-dri-git() { @@ -517,17 +582,94 @@ package_nouveau-dri-git() { pkgdesc='Mesa classic DRI + Gallium3D drivers for Nouveau' # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - #make -C $srcdir/build/src/mesa/drivers/dri/nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/nouveau DESTDIR=$pkgdir install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - #make -C $srcdir/build/src/gallium/targets/dri-nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-nouveau DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers install -m755 -d $pkgdir/usr/share/licenses/nouveau-dri - bin/minstall lib/nouveau_vieux_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/gallium/nouveau_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/nouveau-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/nouveau-dri + #install -Dm644 src/mesa/drivers/dri/nouveau/nouveau_vieux_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/nouveau_vieux_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/nouveau_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/nouveau2_drv.so $pkgdir/usr/lib/xorg/modules/drivers + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-dri +} + +package_ati-vdpau-git() { + depends=( + gcc-libs + libdrm-git + libx11 + ) + conflicts=( + ati-vdpau + ) + provides=( + ati-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D VDPAU libraries for ATI' + + make -C $srcdir/build/src/gallium/targets/vdpau-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/vdpau-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/vdpau-radeonsi DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/ati-vdpau + #install -Dm644 lib/gallium/libvdpau_r*00.so* $pkgdir/usr/lib/vdpau + #install -Dm644 lib/gallium/libvdpau_radeonsi.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-vdpau +} + +package_nouveau-vdpau-git() { + depends=( + gcc-libs + libdrm-git + libx11 + ) + conflicts=( + nouveau-vdpau + ) + provides=( + nouveau-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D XvMC library for Nouveau' + + make -C $srcdir/build/src/gallium/targets/vdpau-nouveau DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/nouveau-vdpau + #install -Dm644 lib/gallium/libvdpau_nouveau.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-vdpau +} + +package_soft-vdpau-git() { + depends=( + gcc-libs + ) + conflicts=( + soft-vdpau + ) + provides=( + soft-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D XvMC library for Software Rasterizer' + + make -C $srcdir/build/src/gallium/targets/vdpau-softpipe DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/soft-vdpau + #install -Dm644 lib/gallium/libvdpau_softpipe.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/soft-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/soft-vdpau } package_ati-xvmc-git() { @@ -544,15 +686,15 @@ package_ati-xvmc-git() { ) pkgdesc='Mesa Gallium3D XvMC libraries for ATI' - make -C $srcdir/build/src/gallium/targets/xvmc-r300 DESTDIR=$pkgdir install - make -C $srcdir/build/src/gallium/targets/xvmc-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xvmc-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xvmc-r600 DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/ati-xvmc - #bin/minstall lib/gallium/libXvMCr?00.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libxvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libxvmc + #install -Dm644 lib/gallium/libXvMCr*00.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-xvmc } package_nouveau-xvmc-git() { @@ -572,11 +714,11 @@ package_nouveau-xvmc-git() { make -C $srcdir/build/src/gallium/targets/xvmc-nouveau DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/nouveau-xvmc - #bin/minstall lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/nouveau-xvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/nouveau-xvmc + #install -Dm644 lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-xvmc } package_soft-xvmc-git() { @@ -596,11 +738,11 @@ package_soft-xvmc-git() { make -C $srcdir/build/src/gallium/targets/xvmc-softpipe DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/soft-xvmc - #bin/minstall lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/soft-xvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/soft-xvmc + #install -Dm644 lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/soft-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/soft-xvmc } package_mesa-git() { @@ -613,6 +755,9 @@ package_mesa-git() { 'ati-dri-git: for ATI Video Hardware' 'intel-dri-git: for Intel Video Hardware' 'nouveau-dri-git: for nVidia Video Hardware' + 'ati-vdpau-git: for VDPAU on ATI Video Hardware' + 'nouveau-vdpau-git: for VDPAU on nVidia Video Hardware' + 'soft-vdpau-git: for VDPAU on DRI Software Rasterizer' 'ati-xvmc-git: for X11 Video Motion Compensation on ATI Video Hardware' 'nouveau-xvmc-git: for X11 Video Motion Compensation on nVidia Video Hardware' 'soft-xvmc-git: for X11 Video Motion Compensation on DRI Software Rasterizer' @@ -630,11 +775,11 @@ package_mesa-git() { cd $srcdir/build make DESTDIR=$pkgdir install - rm -fr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} - rm -fr $pkgdir/usr/lib/{egl,gbm,opencl,xorg} - rm -f $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} - rm -f $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} + rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} + rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg} + rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} + rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} install -m755 -d $pkgdir/usr/share/licenses/mesa - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/mesa - bin/minstall docs/license.html $pkgdir/usr/share/licenses/mesa + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/mesa + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa } diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD index 0c358f943..57a4e49f1 100644 --- a/testing/libmpc/PKGBUILD +++ b/testing/libmpc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165240 2012-08-14 08:30:00Z allan $ +# $Id: PKGBUILD 166368 2012-09-07 01:12:26Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=libmpc -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ license=('LGPL') depends=('mpfr>=3.0.0') options=('!libtool') install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) -md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig}) +md5sums=('b32a2e1a3daa392372fbd586d1ed3679' + 'c064863fbbb5831ba4f75f1181333862') build() { cd "${srcdir}/mpc-${pkgver}" |