diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-11 00:02:38 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-11 00:02:38 +0000 |
| commit | 503034bfe282c58ff13c42c7a6b92aa062d779b5 (patch) | |
| tree | ece09793a2bf096dd717bcd4082f0814784b8b27 | |
| parent | 3792e3874accbc868e7032042f1ecefdef25638e (diff) | |
Sun Mar 11 00:02:37 UTC 2012
90 files changed, 3172 insertions, 222 deletions
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index efecf86b0..79d258e7b 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59799 2011-11-30 12:25:12Z spupykin $ +# $Id: PKGBUILD 67339 2012-03-09 11:49:16Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ optdepends=('dnsmasq: For creating PAN network' 'notification-daemon: for desktop notifications' 'libnotify: for desktop notifications' 'modemmanager: for modem management service' - 'gnome-icon-theme:icon theme') + 'gnome-icon-theme: icon theme') options=('!libtool') install=$pkgname.install source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz) @@ -33,11 +33,15 @@ build() { done sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py - [ -f Makefile ] || ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/blueman \ --with-no-runtime-deps-check make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop } diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 815e16643..de185bc66 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67138 2012-03-04 23:52:43Z pschmitz $ +# $Id: PKGBUILD 67337 2012-03-09 05:57:19Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('900037557b82818d79d2dd1c5a7d7fd2') +md5sums=('a6578ebfd237c0f22cce49113b95f70c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 79d358184..002a79432 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -1,8 +1,10 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Seppo Porspakka <sporspak@paju.oulu.fi> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scorched3d -pkgver=43.3 +pkgver=43.3.d +_pkgver=43.3d pkgrel=1 pkgdesc="A 3d artillery combat game" arch=('i686' 'x86_64') @@ -11,14 +13,14 @@ license=('GPL') depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils') makedepends=('sharutils') install=scorched3d.install -source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" 'scorched3d.desktop' 'scorched3d.png.uu' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' 'scorched3d-libpng1.5.patch' 'libpng14.patch') -md5sums=('3e4aa690ddb2d7dfa26d283faf59f897' +md5sums=('9c3043282a9e7451468ff325bef3b04c' 'b951f2150004e10fdff3e6226f1a3939' '178a281333006c6a5a92919865c1d7af' '053769f77a38c252eef1d967b18e93e6' @@ -31,7 +33,7 @@ build() { # patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch # patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch - patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch + patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch # patch -Np0 -i ${srcdir}/libpng14.patch WANT_WXGTK=gtk2 @@ -52,13 +54,10 @@ package() { make DESTDIR=${pkgdir} install - # freedesktop stuff - png and desktop file ganked from debian cd ${srcdir} uudecode --output-file=scorched3d.png scorched3d.png.uu - install -D -m644 scorched3d.png \ - ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png - install -D -m644 scorched3d.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 scorched3d.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png + install -D -m644 scorched3d.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop } diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD index 659282e24..9a01eb7c3 100644 --- a/community/xonotic/PKGBUILD +++ b/community/xonotic/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> pkgname=xonotic -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=1 pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('unzip' 'mesa') source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip" "xonotic-glx.desktop" "xonotic-sdl.desktop") -md5sums=('7382f195386b8e51df65e57e6be413e5' +md5sums=('47e8468054bf1346c57f3f8fdc97575e' '914c7b9163e92b35f0ab57fdb1653ac5' 'da7d812ff231c9332cd694b39757adda') diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index d0b714fde..1605d798f 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,39 +1,28 @@ -# $Id: PKGBUILD 150335 2012-02-16 23:20:12Z dreisner $ +# $Id: PKGBUILD 152815 2012-03-09 17:34:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=5 -pkgrel=4 +pkgver=6 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') -url="http://git.profusion.mobi/cgit.cgi/kmod.git" +url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' license=('GPL2') depends=('glibc' 'zlib') options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') -source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch' - '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch' +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('b271c2ec54aba1c67bda63c8579d8c15' - '81545a1509b43008f85c03fb980f0e86' - '662a85dbe420f04c1ef24f9cd4e4c990' +md5sums=('bad08102fad212cd34405136d9a7eb94' '4b8cbcbc54b9029c99fd730e257d4436') build() { cd "$pkgname-$pkgver" - # fix modprobe --show-depends failures on loaded modules - patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch" - - # fix infinite loop with softdeps - patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch" - ./configure \ --sysconfdir=/etc \ - --with-rootprefix= \ --with-zlib make diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index cdcbf3e86..73a8fd32e 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139845 2011-10-05 07:58:34Z tpowa $ +# $Id: PKGBUILD 152724 2012-03-09 12:06:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -30,7 +30,7 @@ md5sums=('8395ac770720b83c5c469f88306d7765' 'dd0d65fc6e8f422fa12520813098264b' 'f73f197a16b02c3e248488ec35c4cf43' 'e619f18354ff958ed624d05d08853d8f' - '2bf71def3263325643a09458635520f0' + '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' 'e9144277a89a620d9bc80413158a7d27' diff --git a/core/nfs-utils/nfs-server.conf b/core/nfs-utils/nfs-server.conf index 4054d6b88..581e26350 100644 --- a/core/nfs-utils/nfs-server.conf +++ b/core/nfs-utils/nfs-server.conf @@ -18,7 +18,7 @@ PROCNFSD_MOUNTOPTS="" # If you have a port-based firewall, you might want to set up # a fixed port here using the --port option. # See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 2" +MOUNTD_OPTS="" # Do you want to start the svcgssd daemon? It is only required for Kerberos # exports. Valid alternatives are "yes" and "no"; the default is "no". diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD index a27d77fc6..fe234f1e0 100644 --- a/extra/gif2png/PKGBUILD +++ b/extra/gif2png/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152702 2012-03-09 00:04:15Z giovanni $ +# $Id: PKGBUILD 152849 2012-03-09 23:27:27Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Andrew Rose <ody@netrux.com> pkgname=gif2png -pkgver=2.5.7 +pkgver=2.5.8 pkgrel=1 pkgdesc="A GIF to PNG image format converter" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('ZLIB') depends=('libpng') optdepends=('python2: for using web2png') source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6da196f7923b7c329b83aa9a1dbf72be') +md5sums=('0f5caeeca561ade7f267ef3f2a9944b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index ba651684f..74a75275a 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151214 2012-02-25 08:26:04Z pierre $ +# $Id: PKGBUILD 152805 2012-03-09 17:06:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64') @@ -13,18 +13,18 @@ makedepends=('pkgconfig' 'xproto' 'perl') optdepends=('perl: for mkhtmlindex') source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2' 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2' 'linuxconfig.patch' 'LICENSE') -md5sums=('48133c75bd77c127c7eff122e08ebbf6' - 'b533c0771dbbaf9b041ff35bb941d3a2' - '619acbb2ed766d7762f02328513b1f72' - '4e6cb97bbecfbb34f3f644a75e513093' - '700c6d040d36a569e657a3ba5e1d8b24' - 'b3385d8efbbe7c7fc50ed3a96ce37a16' - 'f5767133ef7a98a0bfa15139e0e3d32e') +sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1' + 'a3d971a507a460233afd8ed46e9f06135fed634d' + 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' + '1f0f8aea1526c6c022f2cf16f7a6c67118c68336' + 'c58b7252df481572ec1ccd77b9f1ab561ed89e45' + '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' + 'c5ecffb25ad079ba3858e3aec047d046df603a89') build() { cd ${srcdir}/xorg-cf-files-1.0.4 diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD index 96972796a..7265dc7ca 100644 --- a/extra/libdmx/PKGBUILD +++ b/extra/libdmx/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151404 2012-02-26 10:27:46Z pierre $ +# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdmx -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('49aeab743cb8b667829efda140487b69a7148676') +sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD index 619024f09..16d6470f0 100644 --- a/extra/libxcursor/PKGBUILD +++ b/extra/libxcursor/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 130855 2011-07-08 13:02:13Z andyrtr $ +# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxcursor -pkgver=1.1.12 +pkgver=1.1.13 pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64) @@ -12,7 +13,7 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c') +sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') build() { cd "${srcdir}/libXcursor-${pkgver}" diff --git a/extra/libxdmcp/PKGBUILD b/extra/libxdmcp/PKGBUILD index e07fc3fc8..541f81ef7 100644 --- a/extra/libxdmcp/PKGBUILD +++ b/extra/libxdmcp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151412 2012-02-26 10:38:01Z pierre $ +# $Id: PKGBUILD 152771 2012-03-09 16:07:19Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxdmcp -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="X11 Display Manager Control Protocol library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('xproto' 'glibc') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2") -sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f') +sha1sums=('3b63e8fc1600c51d9897d017da190fc6c16245b6') build() { cd "${srcdir}/libXdmcp-${pkgver}" diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index a9f1a38ff..cfc998d9a 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151416 2012-02-26 10:41:55Z pierre $ +# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxext -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") -sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d') +sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD index c9f7fa2d4..709f6b6e9 100644 --- a/extra/libxft/PKGBUILD +++ b/extra/libxft/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151420 2012-02-26 10:44:21Z pierre $ +# $Id: PKGBUILD 152776 2012-03-09 16:13:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxft -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.0 +pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') @@ -12,7 +12,7 @@ depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") -sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') +sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23') build() { cd "${srcdir}/libXft-${pkgver}" diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD index 854639a03..043cf6f9b 100644 --- a/extra/libxinerama/PKGBUILD +++ b/extra/libxinerama/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151422 2012-02-26 10:45:32Z pierre $ +# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxinerama -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -13,7 +13,7 @@ depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") -sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4') +sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') build() { cd "${srcdir}/libXinerama-${pkgver}" diff --git a/extra/libxkbfile/PKGBUILD b/extra/libxkbfile/PKGBUILD index ce7599452..a4fb52c27 100644 --- a/extra/libxkbfile/PKGBUILD +++ b/extra/libxkbfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151424 2012-02-26 10:46:54Z pierre $ +# $Id: PKGBUILD 152781 2012-03-09 16:19:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxkbfile -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 keyboard file manipulation library" arch=('i686' 'x86_64') license=('custom') @@ -12,7 +12,7 @@ depends=('libx11') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('0fed539ffbc05859bc666b425fafa42e046bef5f') +sha1sums=('05139829837c26e3a14a40a700f058c018bc71f5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD index 864adaad3..9fe0bc1df 100644 --- a/extra/libxpm/PKGBUILD +++ b/extra/libxpm/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 151430 2012-02-26 10:50:09Z pierre $ +# $Id: PKGBUILD 152783 2012-03-09 16:22:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libxpm -pkgver=3.5.9 -pkgrel=2 +pkgver=3.5.10 +pkgrel=1 pkgdesc="X11 pixmap library" arch=('i686' 'x86_64') license=('custom') @@ -11,7 +12,7 @@ depends=('libxt' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2") -sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b') +sha1sums=('eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c') build() { cd "${srcdir}/libXpm-${pkgver}" diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD index c38329d49..66025d5c7 100644 --- a/extra/libxrender/PKGBUILD +++ b/extra/libxrender/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150404 2012-02-17 12:10:58Z allan $ +# $Id: PKGBUILD 152786 2012-03-09 16:24:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxrender -pkgver=0.9.6 -pkgrel=2 +pkgver=0.9.7 +pkgrel=1 pkgdesc="X Rendering Extension client library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11>=1.3.4' 'renderproto') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc') +sha1sums=('6e4d75d8316d5217324258f555eba3a5d383feb2') build() { cd "${srcdir}/libXrender-${pkgver}" diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD index c697ad4de..b2b18476e 100644 --- a/extra/libxres/PKGBUILD +++ b/extra/libxres/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151432 2012-02-26 10:51:47Z pierre $ +# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxres -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" @@ -12,7 +12,7 @@ depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") -sha1sums=('d3a36f9b6ae430da91f2cbae409916f605074195') +sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') build() { cd "${srcdir}/libXres-${pkgver}" diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD index 66c2834b4..5fafc2d8d 100644 --- a/extra/libxss/PKGBUILD +++ b/extra/libxss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151434 2012-02-26 10:53:02Z pierre $ +# $Id: PKGBUILD 152791 2012-03-09 16:28:04Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxss -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X11 Screen Saver extension library" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +13,7 @@ depends=('libxext' 'scrnsaverproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2") -sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19') +sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88') build() { cd "${srcdir}/libXScrnSaver-${pkgver}" diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index 92fffec19..264f85673 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151437 2012-02-26 10:54:39Z pierre $ +# $Id: PKGBUILD 152767 2012-03-09 16:01:47Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") -sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') +sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf') build() { cd "${srcdir}/libXt-${pkgver}" diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD index 2945d5a89..810b6d11b 100644 --- a/extra/libxtst/PKGBUILD +++ b/extra/libxtst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151438 2012-02-26 10:55:16Z pierre $ +# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxext' 'libxi' 'recordproto' 'inputproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") -sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72') +sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD index ffaebd312..4484ad5e2 100644 --- a/extra/libxv/PKGBUILD +++ b/extra/libxv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151440 2012-02-26 10:56:31Z pierre $ +# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxv -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64') license=('custom') @@ -12,7 +12,7 @@ depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") -sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c') +sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') build() { cd "${srcdir}/libXv-${pkgver}" diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD index 413672bd1..7f06c8c00 100644 --- a/extra/libxvmc/PKGBUILD +++ b/extra/libxvmc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151442 2012-02-26 10:57:39Z pierre $ +# $Id: PKGBUILD 152797 2012-03-09 16:34:16Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxvmc -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X11 Video Motion Compensation extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxv') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2") -sha1sums=('4ace7e7ce6b646b5715b2efa561affc89bc87f91') +sha1sums=('b8ee482514dfdf226694c830bdf292cc14e1cb91') build() { cd ${srcdir}/libXvMC-${pkgver} diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD index ad6ad264b..c5be1ace8 100644 --- a/extra/libxxf86dga/PKGBUILD +++ b/extra/libxxf86dga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151312 2012-02-25 13:26:08Z allan $ +# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxxf86dga -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -13,7 +13,7 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('333a9f5c61eba896f420969561606551174645cd') +sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') build() { cd "${srcdir}/libXxf86dga-${pkgver}" diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD index dc77c59ba..0be6a068b 100644 --- a/extra/libxxf86vm/PKGBUILD +++ b/extra/libxxf86vm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151308 2012-02-25 13:23:04Z allan $ +# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') license=('custom') @@ -12,7 +12,7 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') +sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') build() { cd "${srcdir}/libXxf86vm-${pkgver}" diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD new file mode 100644 index 000000000..eb9060df9 --- /dev/null +++ b/gnome-unstable/clutter-gst/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 152750 2012-03-09 13:58:48Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=clutter-gst +pkgver=1.5.4 +pkgrel=1 +pkgdesc="GStreamer bindings for clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org/" +license=('LGPL') +depends=('clutter' 'gstreamer0.10-base' 'libxdamage') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7') + +build() { + cd "$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/clutter-gtk/PKGBUILD b/gnome-unstable/clutter-gtk/PKGBUILD new file mode 100644 index 000000000..903ff8618 --- /dev/null +++ b/gnome-unstable/clutter-gtk/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 152752 2012-03-09 14:04:37Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=clutter-gtk +pkgver=1.1.2 +pkgrel=1 +pkgdesc="GTK clutter widget" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('clutter' 'gtk3') +makedepends=('gobject-introspection') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e000594770df759a638bfe814c88d4ab089c93d56553811d6947fc9ed85e6aa0') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD new file mode 100644 index 000000000..dfb5bddc3 --- /dev/null +++ b/gnome-unstable/farstream/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 152819 2012-03-09 18:01:22Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=farstream +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/Farstream" +license=('LGPL2.1') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad' 'gstreamer0.10-good') +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('farsight2') +replaces=('farsight2') +options=(!libtool) +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('74f8048c915e8f4675cb749bc10f54e9') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --with-package-name='Arch Linux farstream package' \ + --with-package-origin='http://archlinux.org' \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD new file mode 100644 index 000000000..8e88a2573 --- /dev/null +++ b/gnome-unstable/folks/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 152720 2012-03-09 10:52:43Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=folks +pkgver=0.6.7 +pkgrel=1 +pkgdesc="Library to aggregates people into metacontacts" +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org/wiki/Folks" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') +makedepends=('gobject-introspection' 'intltool') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) +sha256sums=('d9ce3fd1f0ea3e0cb3780521cfda161062cf7ed1a016261e8d244fe41cbae8f3') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD new file mode 100644 index 000000000..471c9a68f --- /dev/null +++ b/gnome-unstable/gjs/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 152779 2012-03-09 16:16:24Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gjs +pkgver=1.31.20 +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=('4601f1423dbc0326529cba95cd0475a32ca62ee3215812665cf58e32080a9d11') + +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/glade/PKGBUILD b/gnome-unstable/glade/PKGBUILD new file mode 100644 index 000000000..ef5a3a619 --- /dev/null +++ b/gnome-unstable/glade/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 152756 2012-03-09 14:31:34Z ibiru $ +# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=glade +pkgver=3.11.0 +pkgrel=1 +pkgdesc="User interface builder for GTK+ and GNOME." +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject') +optdepends=('python2: Python widgets support') +options=('!libtool') +url="http://glade.gnome.org/" +install=glade.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('fffbd4b79ca46cbb9332c0377735de34f01cdc31921a911f609edf0e87bdd4da') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/glade/glade.install b/gnome-unstable/glade/glade.install new file mode 100644 index 000000000..bce670aff --- /dev/null +++ b/gnome-unstable/glade/glade.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD new file mode 100644 index 000000000..4f533a2cc --- /dev/null +++ b/gnome-unstable/glibmm/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 152754 2012-03-09 14:13:33Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase=glibmm +pkgname=('glibmm' 'glibmm-docs') +pkgver=2.31.20 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +options=('!libtool') +url="http://www.gtkmm.org/" +sha256sums=('09c5d915eee485fecdbc13405ca34be5c5d55e9a3923dd0acfe6982804daa34d') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package_glibmm() { + pkgdesc="Glib-- (glibmm) is a C++ interface for glib" + depends=('glib2' 'libsigc++2.0') + cd "$pkgbase-$pkgver" + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + make DESTDIR="$pkgdir" install +} + +package_glibmm-docs() { + pkgdesc="Developer documentation for glibmm" + cd "$pkgbase-$pkgver/docs" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD new file mode 100644 index 000000000..af1597c00 --- /dev/null +++ b/gnome-unstable/gnome-desktop/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 152841 2012-03-09 20:15:28Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-desktop +pkgver=3.3.91 +pkgrel=1 +pkgdesc="Library with common API for various GNOME modules" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('gsettings-desktop-schemas' 'gtk3') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('62816d00d5a0d47df75b560785427635954d45d933f196c41992b9e308b0f3e3') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Arch Linux" \ + --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD new file mode 100644 index 000000000..37d0db881 --- /dev/null +++ b/gnome-unstable/gnome-disk-utility/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 152833 2012-03-09 19:02:37Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Silvio Knizek (killermoehre) + +pkgname=gnome-disk-utility +pkgver=3.3.93 +pkgrel=1 +pkgdesc="Disk Management Utility for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +depends=('gtk3' 'udisks2' 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +install=gnome-disk-utility.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('714d6a986ae04762d1a4ee6696ae3869f301e82a23701e2d4378e4263e04f20f') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install new file mode 100644 index 000000000..71d138f2d --- /dev/null +++ b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD index 8dfff4269..66ab5e9ab 100644 --- a/gnome-unstable/gnome-keyring/PKGBUILD +++ b/gnome-unstable/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 152646 2012-03-07 19:32:38Z ibiru $ +#$Id: PKGBUILD 152746 2012-03-09 13:51:29Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.3.5 +pkgver=3.3.91 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('25a6b87d10dbb34ea2b634f97aa018260cf1a4e75fe3ba663ce313f30698a419') +sha256sums=('df0e0716ddf150ebb0e5f3b5f2b2765e2f567d55c4d8a552836b1fb9149d0a7f') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD new file mode 100644 index 000000000..02778780c --- /dev/null +++ b/gnome-unstable/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 152847 2012-03-09 21:34:34Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-menus +pkgver=3.3.5 +pkgrel=1 +pkgdesc="GNOME menu specifications" +arch=('i686' 'x86_64') +depends=('glib2' 'python2') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('GPL' 'LGPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('92f640bdb96dacbfcbf183bac1657cc52dd2ddf866b4b33504d01719dbd951d5' + 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/env python$|&2|" \ + "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" +} diff --git a/gnome-unstable/gnome-menus/menus.patch b/gnome-unstable/gnome-menus/menus.patch new file mode 100644 index 000000000..bf73e86cd --- /dev/null +++ b/gnome-unstable/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + <Directory>Applications.directory</Directory> + + <!-- Scan legacy dirs first, as later items take priority --> +- <KDELegacyDirs/> + <LegacyDir>/etc/X11/applnk</LegacyDir> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> + +@@ -18,6 +17,14 @@ + <!-- Read in overrides and child menus from applications-merged/ --> + <DefaultMergeDirs/> + ++ <!-- Archlinux submenu --> ++ <Menu> ++ <Name>Archlinux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> <!-- End Archlinux --> + <!-- Accessories submenu --> + <Menu> + <Name>Accessories</Name> diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD new file mode 100644 index 000000000..a4cbe34ee --- /dev/null +++ b/gnome-unstable/gtkmm3/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 152760 2012-03-09 15:35:15Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=gtkmm3 +_pkgbasename=gtkmm +pkgname=('gtkmm3' 'gtkmm3-docs') +pkgver=3.3.18 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') +license=('LGPL') +options=('!libtool' '!emptydirs') +url="http://www.gtkmm.org/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('495330e2d697b04be161247003d5eb3dd45a5988dd631e789b631c5a05fb00bf') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr + make +} + +package_gtkmm3() { + pkgdesc="C++ bindings for gtk3" + depends=('gtk3' 'pangomm' 'atkmm') + cd "$_pkgbasename-$pkgver" + + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + + make DESTDIR="$pkgdir" install +} + +package_gtkmm3-docs() { + pkgdesc="Developer documentation for gtkmm v3" + + cd "$_pkgbasename-$pkgver" + make -C docs DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD new file mode 100644 index 000000000..dd0fc3b9b --- /dev/null +++ b/gnome-unstable/gtksourceview3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 152774 2012-03-09 16:10:21Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtksourceview3 +_pkgbasename=gtksourceview +pkgver=3.3.4 +pkgrel=1 +pkgdesc="A text widget adding syntax highlighting and more to GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libxml2') +makedepends=('intltool' 'gobject-introspection' 'glade') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('90dea698561b437adf4ee4264cf5c52120a11824a9c5d38bbd7497ed99861086') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-glade-catalog + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD new file mode 100644 index 000000000..cafc8f1c2 --- /dev/null +++ b/gnome-unstable/gvfs/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 152762 2012-03-09 15:52:56Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.11.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('67445aa4e40daac6f235a7d2db935c64b7f30c8420b71403f29561fd0a5c6718') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/etc/bash_completion.d + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support') + install=gvfs.install + + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ + -i monitor/Makefile + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=$pkgver" 'libimobiledevice') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=$pkgver") + install=gvfs-module.install + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" +} diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install new file mode 100644 index 000000000..da6a2ab6d --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install new file mode 100644 index 000000000..3482d99e3 --- /dev/null +++ b/gnome-unstable/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD new file mode 100644 index 000000000..405af8293 --- /dev/null +++ b/gnome-unstable/libgdata/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 152813 2012-03-09 17:21:56Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgdata +pkgver=0.11.0 +pkgrel=1 +pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup-gnome' 'liboauth') +makedepends=('intltool' 'gobject-introspection') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('819a077fab77cca9408409bf86da5b028699972c2c9bbf96e41755f801acea6b') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD index 058fab645..ef690f9b6 100644 --- a/gnome-unstable/libgnome-keyring/PKGBUILD +++ b/gnome-unstable/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 152642 2012-03-07 18:59:20Z ibiru $ +#$Id: PKGBUILD 152741 2012-03-09 13:31:36Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.3.5 +pkgver=3.3.91 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('73a65e5aed0a99fc91c3264a4fc172b4346973bb3b8ce7eca51f7807346e7b4c') +sha256sums=('a6b89766642e4835b916873d5784597476cd06a81b0c69f87ed8b7b55fd806fa') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD new file mode 100644 index 000000000..a5cb53ad1 --- /dev/null +++ b/gnome-unstable/libgnomekbd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 152736 2012-03-09 12:35:48Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgnomekbd +pkgver=3.3.90 +pkgrel=1 +pkgdesc="Gnome keyboard library" +url="http://gswitchit.sourceforge.net" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libxklavier' 'gtk3' 'dconf') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=libgnomekbd.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9c5c8dbb43f2b2b772d4411d788b288283edb5e47bc8de9fd38b6a9dfe788482') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libgnomekbd/libgnomekbd.install b/gnome-unstable/libgnomekbd/libgnomekbd.install new file mode 100644 index 000000000..a3d820459 --- /dev/null +++ b/gnome-unstable/libgnomekbd/libgnomekbd.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD index eb67c2686..d67a3bb3e 100644 --- a/gnome-unstable/libgweather/PKGBUILD +++ b/gnome-unstable/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152694 2012-03-08 21:18:37Z ibiru $ +# $Id: PKGBUILD 152744 2012-03-09 13:48:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch) -sha256sums=('db8fdfc022fffd1ef97615c19af278fb6e1fca5ebf4ff2da5e255d54869c9e18' +sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60' '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330') build() { diff --git a/gnome-unstable/libgweather/libgweather.install b/gnome-unstable/libgweather/libgweather.install index 1549117b8..0d646b872 100644 --- a/gnome-unstable/libgweather/libgweather.install +++ b/gnome-unstable/libgweather/libgweather.install @@ -14,7 +14,7 @@ post_upgrade() { } pre_remove() { - sbin/gconfpkg --uninstall $pkgname + gconfpkg --uninstall $pkgname } post_remove() { diff --git a/gnome-unstable/libwacom/PKGBUILD b/gnome-unstable/libwacom/PKGBUILD new file mode 100644 index 000000000..d93a77598 --- /dev/null +++ b/gnome-unstable/libwacom/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 152826 2012-03-09 18:41:43Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libwacom +pkgver=0.3 +pkgrel=1 +pkgdesc="Library to identify Wacom tablets and their features" +arch=('x86_64' 'i686') +depends=('glib2' 'udev') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('b24494b4ed524e8665d94372a6d57afa153e8d8e893cb882907ec462c35e3eac') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libwnck3/PKGBUILD b/gnome-unstable/libwnck3/PKGBUILD new file mode 100644 index 000000000..d89a87b43 --- /dev/null +++ b/gnome-unstable/libwnck3/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 152758 2012-03-09 15:06:07Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libwnck3 +_pkgbasename=libwnck +pkgver=3.3.5 +pkgrel=1 +pkgdesc="Window Navigator Construction Kit (GTK+3)" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'startup-notification' 'libxres') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('440340d4733f78130d581e88131df178367458004558c6a32f7c5f63a731ba19') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libxklavier/PKGBUILD b/gnome-unstable/libxklavier/PKGBUILD new file mode 100644 index 000000000..c1dee53d2 --- /dev/null +++ b/gnome-unstable/libxklavier/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 152734 2012-03-09 12:31:57Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan Timmerman <arjan@archlinux.org> + +pkgname=libxklavier +pkgver=5.2.1 +pkgrel=2 +pkgdesc="High-level API for X Keyboard Extension" +arch=(i686 x86_64) +license=('LGPL') +depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') +makedepends=('gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://gswitchit.sourceforge.net" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --with-xkb-base=/usr/share/X11/xkb --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/metacity/PKGBUILD b/gnome-unstable/metacity/PKGBUILD new file mode 100644 index 000000000..a72350a8c --- /dev/null +++ b/gnome-unstable/metacity/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 152837 2012-03-09 19:35:19Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=metacity +pkgver=2.34.2 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=metacity.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3ca1a658bc0daa8b31872b89add2c73892a5369e767cafd636f2b15bd0675ee6') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/metacity \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/metacity/metacity.install b/gnome-unstable/metacity/metacity.install new file mode 100644 index 000000000..ba0feffc1 --- /dev/null +++ b/gnome-unstable/metacity/metacity.install @@ -0,0 +1,19 @@ +pkgname=metacity + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD new file mode 100644 index 000000000..c024a3609 --- /dev/null +++ b/gnome-unstable/pygobject/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 152738 2012-03-09 13:01:41Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=pygobject +pkgname=(python-gobject python2-gobject pygobject-devel) +pkgver=3.1.1 +pkgrel=1 +arch=('i686' 'x86_64') +url="https://live.gnome.org/PyGObject" +license=('LGPL') +makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +options=('!libtool') +sha256sums=('ae6da0f95c0d6b93694191133a3b046f7811ba047e3bd5e9c13c9e6907f71515') + +build() { + cp -a "$pkgbase-$pkgver" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr + make + ) +} + +package_python-gobject() { + pkgdesc="Python 3 bindings for GObject" + depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{include,lib/pkgconfig} +} + +package_python2-gobject() { + pkgdesc="Python 2 bindings for GObject" + depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + + cd "python2-build" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" +} + +package_pygobject-devel() { + pkgdesc="Development files for the pygobject bindings" + cd "devel" + mkdir -p "$pkgdir"/usr/{include,lib} + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" +} diff --git a/gnome-unstable/telepathy-farstream/PKGBUILD b/gnome-unstable/telepathy-farstream/PKGBUILD new file mode 100644 index 000000000..35728eeb0 --- /dev/null +++ b/gnome-unstable/telepathy-farstream/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 152822 2012-03-09 18:16:38Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=telepathy-farstream +pkgver=0.2.2 +pkgrel=1 +pkgdesc="A telepathy-backend to use stream engine." +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org" +license=('LGPL2.1') +depends=('telepathy-glib' 'farstream') +makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('telepathy-farsight') +replaces=('telepathy-farsight') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('ec97eb4bbe302246e012bcb53712a9e5') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/telepathy \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/telepathy-gabble/PKGBUILD b/gnome-unstable/telepathy-gabble/PKGBUILD new file mode 100644 index 000000000..2292ff469 --- /dev/null +++ b/gnome-unstable/telepathy-gabble/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 152828 2012-03-09 18:47:17Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Daniel Balieiro <daniel@balieiro.com> +# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> +pkgname=telepathy-gabble +pkgver=0.15.4 +pkgrel=1 +pkgdesc="A Jabber/XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL2.1') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +makedepends=('libxslt' 'python2') +options=('!libtool' '!emptydirs') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +install=telepathy-gabble.install +md5sums=('3eb3ee032da4064f07781427384b94e0') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy --with-tls=openssl + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" +} diff --git a/gnome-unstable/telepathy-gabble/telepathy-gabble.install b/gnome-unstable/telepathy-gabble/telepathy-gabble.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/gnome-unstable/telepathy-gabble/telepathy-gabble.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/telepathy-haze/PKGBUILD b/gnome-unstable/telepathy-haze/PKGBUILD new file mode 100644 index 000000000..e043226ad --- /dev/null +++ b/gnome-unstable/telepathy-haze/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 152830 2012-03-09 18:52:51Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Timm Preetz <timm@preetz.us> +pkgname=telepathy-haze +pkgver=0.5.0 +pkgrel=2 +pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('GPL') +depends=('telepathy-glib' 'libpurple') +makedepends=('libxslt') +replaces=('telepathy-butterfly') +install=telepathy-haze.install +groups=('telepathy') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('4378726d61e1e5df789a05760a94d172') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/telepathy-haze/telepathy-haze.install b/gnome-unstable/telepathy-haze/telepathy-haze.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/gnome-unstable/telepathy-haze/telepathy-haze.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..e1ae84be9 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 152824 2012-03-09 18:36:37Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Ju Liu <liuju86 at gmail dot com> +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Contributor: Andreas Zwinkau <beza1e1@web.de> + +pkgname=telepathy-mission-control +pkgver=5.11.0 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf') +makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f7503d52cb432e03ba7b4ad5bb6165c6') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD new file mode 100644 index 000000000..9a06ce219 --- /dev/null +++ b/gnome-unstable/vte3/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 152789 2012-03-09 16:26:26Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=vte3 +pkgname=(vte3 vte-common) +pkgver=0.31.0 +pkgrel=1 +pkgdesc="Virtual Terminal Emulator widget for use with GTK3" +arch=('i686' 'x86_64') +license=('LGPL') +options=('!libtool' '!emptydirs') +makedepends=('intltool' 'gobject-introspection' 'gtk3') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('3e5925acc9d3eefe80a11683492d94b85bb4fe0b3c33d204c123f411c0efd60f' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') + +build() { + cd "vte-$pkgver" + #warning: type-punning to incomplete type might break strict-aliasing rules + export CFLAGS="$CFLAGS -fno-strict-aliasing" + + patch -Np1 -R -i "$srcdir/make_alt_work.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vte \ + --localstatedir=/var --disable-static \ + --enable-introspection + make +} + +package_vte3(){ + depends=('gtk3' 'vte-common') + cd "vte-$pkgver" + make DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib/vte/gnome-pty-helper +} + +package_vte-common() { + pkgdesc="Common files used by vte and vte3" + cd "vte-$pkgver" + + make -C gnome-pty-helper DESTDIR="$pkgdir" install +} diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD index 9f42e977d..4853d79c0 100644 --- a/libre/java-asm2/PKGBUILD +++ b/libre/java-asm2/PKGBUILD @@ -2,8 +2,9 @@ _pkgname=asm pkgname=java-asm2 +_pkgver=2 pkgver=2.2.3 -pkgrel=1 +pkgrel=4 pkgdesc="An all purpose Java bytecode manipulation and analysis framework." arch=('any') url="http://asm.ow2.org/" @@ -15,22 +16,29 @@ makedepends=( ) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") +_M2_LOCALREPO='/usr/share/maven/repository' +_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' +_m2_packages=( + asm + asm-analysis + asm-attrs + asm-commons + asm-tree + asm-util + asm-xml + asm-all) + build() { cd "$srcdir/$_pkgname-$pkgver" mkdir -p test/lib - echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties - ant dist -} -mvn-install() { - group=$1 - pkg=$2 - ver=$3 + echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties + ant dist - dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver - install -d "$dir" - cp $pkg-$pkgver.* "$dir" + # This will make package() easier: + cd output/dist/lib + ln -s all/* . } package() { @@ -47,28 +55,22 @@ package() { # Install Apache Maven modules cd lib - mvn-install asm asm $pkgver - mvn-install asm asm-analysis $pkgver - mvn-install asm asm-attrs $pkgver - mvn-install asm asm-commons $pkgver - mvn-install asm asm-tree $pkgver - mvn-install asm asm-util $pkgver - mvn-install asm asm-xml $pkgver - cd all - mvn-install asm asm-all $pkgver - - # Synlink Maven modules to /usr/share/java install -d "$pkgdir"/usr/share/java/asm - cd "$pkgdir" - find usr/share/maven/repository/asm \ - -type f -name '*.jar' -printf '/%p\n' | while read jar; do - ln -s "$jar" "$pkgdir"/usr/share/java/asm + for pkg in "${_m2_packages[@]}"; do + dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver + # Create the Maven directory + install -d "$pkgdir$dir" + # Install the files + cp $pkg-$pkgver.* "$pkgdir$dir" + # Symlink them to /usr/share/java + ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/ + ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar done - # Put the finishing touches on /usr/share/java - ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-2.jar + # Install a README file about the -all files cd "$srcdir/$_pkgname-$pkgver" - install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt + install -m644 output/dist/lib/all/README.txt \ + "$pkgdir"/usr/share/java/asm/README-$pkgver.txt } md5sums=('7a92c87bf067925685cf68dcc0dd8998') diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD index 2c6a7f933..7e66a5b5a 100644 --- a/libre/java-asm3/PKGBUILD +++ b/libre/java-asm3/PKGBUILD @@ -2,8 +2,9 @@ _pkgname=asm pkgname=java-asm3 +_pkgver=3 pkgver=3.3.1 -pkgrel=3 +pkgrel=4.1 pkgdesc="An all purpose Java bytecode manipulation and analysis framework." arch=('any') url="http://asm.ow2.org/" @@ -15,30 +16,31 @@ makedepends=( ) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") +_M2_LOCALREPO='/usr/share/maven/repository' +_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' +_m2_packages=( + asm + asm-analysis + asm-commons + asm-parent + asm-tree + asm-util + asm-xml + asm-all + asm-debug-all) + build() { cd "$srcdir/$_pkgname-$pkgver" rm cobertura.ser # We regenerate this rm examples/jasmin/test/jasmin.jar - echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties + echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties ant dist -} - -# Tests have more dependencies, and I can't be bothered to package them. -#check() { -# cd "$srcdir/$_pkgname-$pkgver" -# ant test -#} -mvn-install() { - group=$1 - pkg=$2 - ver=$3 - - dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver - install -d "$dir" - cp $pkg-$pkgver.* "$dir" + # This will make package() easier: + cd output/dist/lib + ln -s all/* . } package() { @@ -55,29 +57,22 @@ package() { # Install Apache Maven modules cd lib - mvn-install asm asm $pkgver - mvn-install asm asm-analysis $pkgver - mvn-install asm asm-commons $pkgver - mvn-install asm asm-parent $pkgver - mvn-install asm asm-tree $pkgver - mvn-install asm asm-util $pkgver - mvn-install asm asm-xml $pkgver - cd all - mvn-install asm asm-all $pkgver - mvn-install asm asm-debug-all $pkgver - - # Synlink Maven modules to /usr/share/java install -d "$pkgdir"/usr/share/java/asm - cd "$pkgdir" - find usr/share/maven/repository/asm \ - -type f -name '*.jar' -printf '/%p\n' | while read jar; do - ln -s "$jar" "$pkgdir"/usr/share/java/asm + for pkg in "${_m2_packages[@]}"; do + dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver + # Create the Maven directory + install -d "$pkgdir$dir" + # Install the files + cp $pkg-$pkgver.* "$pkgdir$dir" + # Symlink them to /usr/share/java + ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/ + ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar done - # Put the finishing touches on /usr/share/java - ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-3.jar + # Install a README file about the -all files cd "$srcdir/$_pkgname-$pkgver" - install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt + install -m644 output/dist/lib/all/README.txt \ + "$pkgdir"/usr/share/java/asm/README-$pkgver.txt } md5sums=('433024df8176f09922646316e415631c') diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD index fbc5b5cd5..bd3f7f7ef 100644 --- a/multilib/lib32-gnutls/PKGBUILD +++ b/multilib/lib32-gnutls/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66913 2012-03-01 15:39:49Z bluewind $ +# $Id: PKGBUILD 67351 2012-03-09 20:47:15Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Christoph Vigano <mail at cvigano dot de> # Contributor: Biru Ionut <ionut@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gnutls pkgname=lib32-$_pkgbasename -pkgver=3.0.14 +pkgver=3.0.15 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" arch=('x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.11' $_pkgbasename) makedepends=('gcc-multilib' 'lib32-libidn') source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz) -md5sums=('0d613985c867846ccb5cbaba8fa576ef') +md5sums=('37bdac12b5c039c7a8738b5d85eda968') build() { export CC="gcc -m32" diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD index aa897475c..10f3a0682 100644 --- a/multilib/lib32-libtiff/PKGBUILD +++ b/multilib/lib32-libtiff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63490 2012-02-05 11:45:27Z ibiru $ +# $Id: PKGBUILD 67353 2012-03-09 20:50:06Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> _pkgbasename=libtiff pkgname=lib32-$_pkgbasename -pkgver=4.0.0 +pkgver=4.0.1 pkgrel=1 pkgdesc="Library for manipulation of TIFF images (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename) makedepends=(gcc-multilib) options=('!libtool') source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') +sha1sums=('8baf382231c9051a1b3eb294581289aa21447171') build() { export CC="gcc -m32" diff --git a/testing/freetype2/PKGBUILD b/testing/freetype2/PKGBUILD new file mode 100644 index 000000000..7b63249ca --- /dev/null +++ b/testing/freetype2/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 152722 2012-03-09 11:24:37Z bluewind $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=freetype2 +pkgver=2.4.9 +pkgrel=1 +pkgdesc="TrueType font rendering library" +arch=(i686 x86_64) +license=('GPL') +url="http://freetype.sourceforge.net" +depends=('zlib' 'bzip2' 'sh') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + freetype-2.3.0-enable-spr.patch + freetype-2.2.1-enable-valid.patch) +md5sums=('77a893dae81fd5b896632715ca041179' + '816dc8619a6904a7385769433c0a8653' + '214119610444c9b02766ccee5e220680') + +build() { + cd "${srcdir}/freetype-${pkgver}" + patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" + patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + +package() { + cd "${srcdir}/freetype-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/freetype2/freetype-2.2.1-enable-valid.patch b/testing/freetype2/freetype-2.2.1-enable-valid.patch new file mode 100644 index 000000000..c78b6b70f --- /dev/null +++ b/testing/freetype2/freetype-2.2.1-enable-valid.patch @@ -0,0 +1,20 @@ +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/testing/freetype2/freetype-2.3.0-enable-spr.patch b/testing/freetype2/freetype-2.3.0-enable-spr.patch new file mode 100644 index 000000000..8432e28a4 --- /dev/null +++ b/testing/freetype2/freetype-2.3.0-enable-spr.patch @@ -0,0 +1,11 @@ +--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 ++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 +@@ -92,7 +92,7 @@ + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD index e57c9be0b..208856a72 100644 --- a/testing/libxcb/PKGBUILD +++ b/testing/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149997 2012-02-12 09:43:54Z andyrtr $ +# $Id: PKGBUILD 152764 2012-03-09 15:54:53Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.8 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xcb.freedesktop.org/" @@ -14,8 +14,8 @@ options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be' - '3455e84642283bc91c8313af319002a20bbcbdf4') +sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch index f17de1b1d..8e8162f0a 100644 --- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -1,10 +1,9 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -35,7 +35,7 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/testing/libxi/PKGBUILD b/testing/libxi/PKGBUILD index e77d7c3d5..200a2b96d 100644 --- a/testing/libxi/PKGBUILD +++ b/testing/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149999 2012-02-12 09:43:58Z andyrtr $ +# $Id: PKGBUILD 152807 2012-03-09 17:09:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.5.99.3 +pkgver=1.6.0 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('55de70d18b20341f307b80da035400ed0467c920') +sha1sums=('b7edf48f93e8abd13ca688fa7f597452c4b74346') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 3b9d56e50..e3bd1f687 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150370 2012-02-17 09:35:04Z andyrtr $ +# $Id: PKGBUILD 152845 2012-03-09 20:43:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri') +pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') #_git=true _gitdate=20111031 @@ -15,7 +15,7 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.1 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -42,7 +42,7 @@ if [ "${_git}" = "true" ]; then autoreconf -vfi ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ --enable-gallium-llvm \ --enable-gallium-egl --enable-shared-glapi\ --enable-glx-tls \ @@ -53,6 +53,7 @@ if [ "${_git}" = "true" ]; then --enable-gles2 \ --enable-egl \ --enable-texture-float \ + --enable-xa \ --enable-shared-dricore # --enable-gallium-svga \ @@ -61,7 +62,7 @@ if [ "${_git}" = "true" ]; then autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ --enable-gallium-llvm \ --enable-gallium-egl --enable-shared-glapi\ --enable-glx-tls \ @@ -72,6 +73,7 @@ if [ "${_git}" = "true" ]; then --enable-gles2 \ --enable-egl \ --enable-texture-float \ + --enable-xa \ --enable-shared-dricore fi @@ -191,7 +193,8 @@ package_mesa() { rm -f "${pkgdir}/usr/lib/libGLESv"* rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} + rm -f "${pkgdir}/usr/lib/libOSMesa"* + rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" @@ -233,3 +236,10 @@ package_nouveau-dri() { # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } + +package_svga-dri() { + depends=("mesa=${pkgver}") + pkgdesc="Gallium3D VMware guest GL driver" + + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install +} diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD new file mode 100644 index 000000000..ef8e56403 --- /dev/null +++ b/testing/mpfr/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 152748 2012-03-09 13:54:49Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=mpfr +_pkgver=3.1.0 +_patchlevel=p7 +pkgver=${_pkgver}.${_patchlevel} +pkgrel=1 +pkgdesc="Multiple-precision floating-point library" +arch=('i686' 'x86_64') +url="http://www.mpfr.org/" +license=('LGPL') +depends=('gmp>=5.0') +options=('!libtool') +install=mpfr.install +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} + mpfr-${_pkgver}.${_patchlevel}.patch) +md5sums=('6e495841bb026481567006cec0f821c3' + '293374ee4b01527f8f7889fdfa9016f8' + 'fb1bf603a2ad5e6ecc1903c3c53f5e13') + +build() { + cd "${srcdir}/${pkgname}-${_pkgver}" + patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make +} + +check() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mpfr/mpfr-3.1.0.p7.patch b/testing/mpfr/mpfr-3.1.0.p7.patch new file mode 100644 index 000000000..f3de639bc --- /dev/null +++ b/testing/mpfr/mpfr-3.1.0.p7.patch @@ -0,0 +1,1236 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 +@@ -0,0 +1 @@ ++gmp41compat +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p3 ++3.1.0-p4 +diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info +--- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 +@@ -2994,11 +2994,12 @@ + + * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their + behavior no longer depends on the platform (assuming this is also +- true for GMP's random generator). As a consequence, the returned +- values can be different between MPFR 3.1 and previous MPFR +- versions. Note: as the reproducibility of these functions was not +- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded +- as backward incompatible with previous versions. ++ true for GMP's random generator, which is not the case between GMP ++ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, ++ the returned values can be different between MPFR 3.1 and previous ++ MPFR versions. Note: as the reproducibility of these functions ++ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ ++ regarded as backward incompatible with previous versions. + + + +@@ -4239,13 +4240,13 @@ + Node: Type and Macro Changes129308 + Node: Added Functions132029 + Node: Changed Functions134972 +-Node: Removed Functions139167 +-Node: Other Changes139579 +-Node: Contributors141108 +-Node: References143574 +-Node: GNU Free Documentation License145315 +-Node: Concept Index167758 +-Node: Function and Type Index173677 ++Node: Removed Functions139253 ++Node: Other Changes139665 ++Node: Contributors141194 ++Node: References143660 ++Node: GNU Free Documentation License145401 ++Node: Concept Index167844 ++Node: Function and Type Index173763 + + End Tag Table + +diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi +--- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 +@@ -3466,8 +3466,9 @@ + a lack of specification. + + @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. +-Their behavior no longer depends on the platform (assuming this is also +-true for GMP's random generator). As a consequence, the returned values ++Their behavior no longer depends on the platform (assuming this is also true ++for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if ++@code{gmp_randinit_default} is used). As a consequence, the returned values + can be different between MPFR 3.1 and previous MPFR versions. + Note: as the reproducibility of these functions was not specified + before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p3" ++#define MPFR_VERSION_STRING "3.1.0-p4" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p3"; ++ return "3.1.0-p4"; + } +diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c +--- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -114,21 +114,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.895943" ++# define C2 "0.848824" ++#else ++# define C1 "0.479652" ++# define C2 "0.648529" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.895943") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.895943, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandomb (x, s); +- if (mpfr_cmp_str1 (x, "0.848824") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.848824, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c +--- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 +@@ -160,23 +160,29 @@ + mpfr_t x; + gmp_randstate_t s; + ++#if __MPFR_GMP(4,2,0) ++# define C1 "0.8488312" ++# define C2 "0.8156509" ++#else ++# define C1 "0.6485367" ++# define C2 "0.9362717" ++#endif ++ + gmp_randinit_default (s); + gmp_randseed_ui (s, 42); + mpfr_init2 (x, 17); + mpfr_urandom (x, s, MPFR_RNDN); +- /* the following values are obtained on a 32-bit computer, we should get +- the same values on a 64-bit computer */ +- if (mpfr_cmp_str1 (x, "0.8488312") != 0) ++ if (mpfr_cmp_str1 (x, C1) != 0) + { +- printf ("Error in bug20100914, expected 0.8488312, got "); ++ printf ("Error in bug20100914, expected " C1 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); + } + mpfr_urandom (x, s, MPFR_RNDN); +- if (mpfr_cmp_str1 (x, "0.8156509") != 0) ++ if (mpfr_cmp_str1 (x, C2) != 0) + { +- printf ("Error in bug20100914, expected 0.8156509, got "); ++ printf ("Error in bug20100914, expected " C2 ", got "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); + printf ("\n"); + exit (1); +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 +@@ -0,0 +1 @@ ++logging-freeze +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p4 ++3.1.0-p5 +diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c +--- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c +--- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 +@@ -29,7 +29,7 @@ + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg u=%d rnd=%d", + mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), +- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); ++ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); + + if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ + { +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p4" ++#define MPFR_VERSION_STRING "3.1.0-p5" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c +--- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 +@@ -34,7 +34,7 @@ + (("b[%Pu]=%.*Rg c=%.20g rnd=%d", + mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), + ("a[%Pu]=%.*Rg inexact=%d", +- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); ++ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); + + MPFR_SAVE_EXPO_MARK (expo); + +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p4"; ++ return "3.1.0-p5"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 +@@ -0,0 +1 @@ ++logging-varfmt +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p5 ++3.1.0-p6 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 +@@ -1592,7 +1592,7 @@ + do \ + if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ + (mpfr_log_current <= mpfr_log_level)) \ +- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ ++ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ + #x, mpfr_get_prec (x), mpfr_log_prec, x); \ + while (0) + +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p5" ++#define MPFR_VERSION_STRING "3.1.0-p6" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p5"; ++ return "3.1.0-p6"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 +@@ -0,0 +1 @@ ++large-prec +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p6 ++3.1.0-p7 +diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c +--- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 +@@ -44,12 +44,12 @@ + bq = MPFR_PREC(b); + cq = MPFR_PREC(c); + +- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ ++ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ + aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; + sh = aq2 - aq; /* non-significant bits in low limb */ + +- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ +- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + + ap = MPFR_MANT(a); + bp = MPFR_MANT(b); +@@ -124,7 +124,7 @@ + dif = aq2 - diff_exp; + /* dif is the number of bits of c which overlap with a' */ + +- difn = (dif-1)/GMP_NUMB_BITS + 1; ++ difn = MPFR_PREC2LIMBS (dif); + /* only the highest difn limbs from c have to be considered */ + if (MPFR_UNLIKELY(difn > cn)) + { +diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c +--- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -107,7 +107,7 @@ + + /* Read prec and num of limbs */ + p = MPFR_PREC(b); +- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; ++ n = MPFR_PREC2LIMBS (p); + MPFR_UNSIGNED_MINUS_MODULO(sh, p); + bx = MPFR_GET_EXP(b); + d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); +diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c +--- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 +@@ -91,7 +91,7 @@ + q = MPFR_PREC(r); + p = q + MPFR_INT_CEIL_LOG2(q) + 15; + MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ +- s = (p - 1) / GMP_NUMB_BITS + 1; ++ s = MPFR_PREC2LIMBS (p); + + /* b (op2) and a (op1) are the 2 operands but we want b >= a */ + compare = mpfr_cmp (op1, op2); +@@ -285,7 +285,7 @@ + + /* Next iteration */ + MPFR_ZIV_NEXT (loop, p); +- s = (p - 1) / GMP_NUMB_BITS + 1; ++ s = MPFR_PREC2LIMBS (p); + } + MPFR_ZIV_FREE (loop); + +diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c +--- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 +@@ -56,8 +56,8 @@ + if (uexp != vexp) + return 0; /* no bit agree */ + +- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; +- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; ++ usize = MPFR_LIMB_SIZE (u); ++ vsize = MPFR_LIMB_SIZE (v); + + if (vsize > usize) /* exchange u and v */ + { +diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c +--- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -133,7 +133,7 @@ + mp_size_t yn; + int sh; + +- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; ++ yn = MPFR_LIMB_SIZE (y); + sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); + MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; + inexact = 1; +diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c +--- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 +@@ -100,7 +100,7 @@ + nbits += (1021 + e); + MPFR_ASSERTD (nbits >= 1); + } +- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ np = MPFR_PREC2LIMBS (nbits); + MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); + carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, + nbits, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c +--- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 +@@ -92,7 +92,7 @@ + nbits += (125 + e); + MPFR_ASSERTD (nbits >= 1); + } +- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ np = MPFR_PREC2LIMBS (nbits); + MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); + carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, + nbits, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c +--- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 +@@ -2351,7 +2351,7 @@ + + /* the first digit will contain only r bits */ + prec = (m - 1) * pow2 + r; /* total number of bits */ +- n = (prec - 1) / GMP_NUMB_BITS + 1; ++ n = MPFR_PREC2LIMBS (prec); + + MPFR_TMP_MARK (marker); + x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); +@@ -2417,12 +2417,12 @@ + exact = 1; + + /* number of limbs */ +- n = 1 + (prec - 1) / GMP_NUMB_BITS; ++ n = MPFR_PREC2LIMBS (prec); + + /* a will contain the approximation of the mantissa */ + a = MPFR_TMP_LIMBS_ALLOC (n); + +- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; ++ nx = MPFR_LIMB_SIZE (x); + + if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or + division to perform */ +diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c +--- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 +@@ -51,7 +51,7 @@ + which both have an odd mantissa */ + MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); + +- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; ++ xsize = MPFR_PREC2LIMBS (p); + tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); + + MPFR_PREC(x) = p; /* Set prec */ +diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c +--- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 +@@ -67,7 +67,7 @@ + + /* Now, the unit bit is represented. */ + +- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; ++ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; + /* number of represented fractional bits (including the trailing 0's) */ + + x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-08 15:17:03.000000000 +0000 +@@ -646,10 +646,15 @@ + **************** mpfr_t properties ******************* + ******************************************************/ + ++/* In the following macro, p is usually a mpfr_prec_t, but this macro ++ works with other integer types (without integer overflow). */ ++#define MPFR_PREC2LIMBS(p) \ ++ (MPFR_ASSERTD (p >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) ++ + #define MPFR_PREC(x) ((x)->_mpfr_prec) + #define MPFR_EXP(x) ((x)->_mpfr_exp) + #define MPFR_MANT(x) ((x)->_mpfr_d) +-#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) ++#define MPFR_LIMB_SIZE(x) (MPFR_PREC2LIMBS (MPFR_PREC ((x)))) + + + /****************************************************** +@@ -1213,8 +1218,8 @@ + _destp = MPFR_MANT (dest); \ + if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ + { \ +- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ +- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ ++ _srcs = MPFR_PREC2LIMBS (_srcprec); \ ++ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ + MPN_COPY (_destp + _dests, srcp, _srcs); \ + MPN_ZERO (_destp, _dests); \ + inexact = 0; \ +@@ -1227,8 +1232,8 @@ + mp_limb_t _rb, _sb, _ulp; \ + \ + /* Compute Position and shift */ \ +- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ +- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ ++ _srcs = MPFR_PREC2LIMBS (_srcprec); \ ++ _dests = MPFR_PREC2LIMBS (_destprec); \ + MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ + _sp = (srcp) + _srcs - _dests; \ + \ +@@ -1372,7 +1377,7 @@ + if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ + { \ + MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ +- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ ++ MPFR_LIMB_SIZE (src)); \ + inexact = 0; \ + } \ + else \ +@@ -1682,7 +1687,7 @@ + MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ + if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ + mpfr_abort_prec_max (); \ +- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ ++ _size = MPFR_PREC2LIMBS (_prec); \ + if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ + { \ + (g).alloc = (num) * _size * sizeof (mp_limb_t); \ +@@ -1733,7 +1738,7 @@ + MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ + if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ + mpfr_abort_prec_max (); \ +- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ ++ _size = MPFR_PREC2LIMBS (_prec); \ + (g).alloc = (num) * _size * sizeof (mp_limb_t); \ + if (MPFR_LIKELY (_oalloc == 0)) \ + (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ +@@ -1886,7 +1891,7 @@ + MPFR_NORETURN_ATTR; + + __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, +- unsigned long)); ++ mpfr_prec_t)); + + __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, + unsigned long)); +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p6" ++#define MPFR_VERSION_STRING "3.1.0-p7" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c +--- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 +@@ -93,15 +93,15 @@ + + ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); + +- bq = MPFR_PREC(b); +- cq = MPFR_PREC(c); ++ bq = MPFR_PREC (b); ++ cq = MPFR_PREC (c); + +- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); + +- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ +- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ +- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ tn = MPFR_PREC2LIMBS (bq + cq); + /* <= k, thus no int overflow */ + MPFR_ASSERTD(tn <= k); + +@@ -292,12 +292,12 @@ + bq = MPFR_PREC (b); + cq = MPFR_PREC (c); + +- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); + +- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ +- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ ++ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ ++ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ + k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ +- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ tn = MPFR_PREC2LIMBS (bq + cq); + MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ + + /* Check for no size_t overflow*/ +diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c +--- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 +@@ -136,7 +136,7 @@ + (b) all the 'z' bits are zero + */ + +- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; ++ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; + /* number of z+0 bits */ + + yn = prec / GMP_NUMB_BITS; +diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c +--- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 +@@ -84,7 +84,7 @@ + int i; + mpfr_prec_t count = 0; + char c; +- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; ++ mp_size_t n = MPFR_PREC2LIMBS (r); + + printf("%s ", str); + for(n-- ; n>=0 ; n--) +@@ -109,7 +109,7 @@ + int i; + mpfr_prec_t count = 0; + char c; +- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; ++ mp_size_t n = MPFR_PREC2LIMBS (r); + + for(n-- ; n>=0 ; n--) + { +diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c +--- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 +@@ -55,12 +55,12 @@ + + MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); + +- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ ++ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ + + /* check if x has enough allocated space for the significand */ + /* Get the number of limbs from the precision. + (Compatible with all allocation methods) */ +- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; ++ ow = MPFR_LIMB_SIZE (x); + if (nw > ow) + { + /* FIXME: Variable can't be created using custom allocation, +diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c +--- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 +@@ -80,7 +80,7 @@ + (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) + return 0; + +- xsize = (xprec-1)/GMP_NUMB_BITS + 1; ++ xsize = MPFR_PREC2LIMBS (xprec); + nw = yprec / GMP_NUMB_BITS; + rw = yprec & (GMP_NUMB_BITS - 1); + +diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c +--- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 +@@ -48,8 +48,7 @@ + /* Same precision and b is not singular: + * just copy the mantissa, and set the exponent and the sign + * The result is exact. */ +- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), +- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); ++ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); + MPFR_RET (0); + } + else +diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c +--- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 +@@ -43,7 +43,7 @@ + if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) + MPFR_CHANGE_SIGN (y); + +- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; ++ sy = MPFR_LIMB_SIZE (y); + my = MPFR_MANT(y); + mx = PTR(x); + +diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c +--- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 +@@ -32,7 +32,7 @@ + MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); + + /* Calculate the new number of limbs */ +- xsize = (p - 1) / GMP_NUMB_BITS + 1; ++ xsize = MPFR_PREC2LIMBS (p); + + /* Realloc only if the new size is greater than the old */ + xoldsize = MPFR_GET_ALLOC_SIZE (x); +diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c +--- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 +@@ -32,7 +32,7 @@ + mp_limb_t *xp; + + MPFR_SET_EXP (x, e); +- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; ++ xn = MPFR_LIMB_SIZE (x); + sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); + xp = MPFR_MANT(x); + xp[0] = MP_LIMB_T_MAX << sh; +diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c +--- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 +@@ -56,11 +56,11 @@ + ax = 2 * MPFR_GET_EXP (b); + bq = MPFR_PREC(b); + +- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ ++ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); + +- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ +- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, +- 2*bn or 2*bn-1 */ ++ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ ++ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, ++ 2*bn or 2*bn-1 */ + + if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) + return mpfr_mul (a, b, b, rnd_mode); +diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c +--- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 +@@ -26,7 +26,7 @@ + size_t + mpfr_custom_get_size (mpfr_prec_t prec) + { +- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; ++ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; + } + + #undef mpfr_custom_init +diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c +--- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 +@@ -467,7 +467,7 @@ + /* Set y to the value of the ~prec most significant bits of pstr->mant + (as long as we guarantee correct rounding, we don't need to get + exactly prec bits). */ +- ysize = (prec - 1) / GMP_NUMB_BITS + 1; ++ ysize = MPFR_PREC2LIMBS (prec); + /* prec bits corresponds to ysize limbs */ + ysize_bits = ysize * GMP_NUMB_BITS; + /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ +diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c +--- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 +@@ -155,8 +155,8 @@ + MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); + + /* Read prec and num of limbs */ +- p = MPFR_PREC(b); +- n = (p-1)/GMP_NUMB_BITS+1; ++ p = MPFR_PREC (b); ++ n = MPFR_PREC2LIMBS (p); + + /* Fast cmp of |b| and |c|*/ + bx = MPFR_GET_EXP (b); +diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c +--- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 +@@ -31,13 +31,20 @@ + a sufficient number of limbs */ + void + mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, +- unsigned long int nbits) ++ mpfr_prec_t nbits) + { + mpz_t z; + ++ MPFR_ASSERTN (nbits >= 1); + /* To be sure to avoid the potential allocation of mpz_urandomb */ +- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; ++ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); + PTR(z) = mp; ++#if __MPFR_GMP(5,0,0) ++ /* Check for integer overflow (unless mp_bitcnt_t is signed, ++ but according to the GMP manual, this shouldn't happen). ++ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ ++ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); ++#endif + mpz_urandomb (z, rstate, nbits); + } + +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2012-02-24 13:50:05.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p6"; ++ return "3.1.0-p7"; + } +diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c +--- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. ++/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. + + Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Contributed by the Arenaire and Caramel projects, INRIA. +@@ -20,18 +20,43 @@ + http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++#include <stdlib.h> ++ + #include "mpfr-test.h" + + int + main (void) + { + mpfr_t a, b, c; ++ long large_prec; + + tests_start_mpfr (); ++ + mpfr_inits (a, b, c, (mpfr_ptr) 0); + mpfr_clears (a, b, c, (mpfr_ptr) 0); + mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); + mpfr_clears (a, b, c, (mpfr_ptr) 0); ++ ++ /* test for precision 2^31-1, see ++ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ ++ large_prec = 2147483647; ++ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) ++ { ++ /* We assume that the precision won't be increased internally. */ ++ if (large_prec > MPFR_PREC_MAX) ++ large_prec = MPFR_PREC_MAX; ++ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); ++ mpfr_set_ui (a, 17, MPFR_RNDN); ++ mpfr_set (b, a, MPFR_RNDN); ++ if (mpfr_get_ui (a, MPFR_RNDN) != 17) ++ { ++ printf ("Error in mpfr_init2 with precision 2^31-1\n"); ++ exit (1); ++ } ++ mpfr_clears (a, b, (mpfr_ptr) 0); ++ } ++ + tests_end_mpfr (); ++ + return 0; + } diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install new file mode 100644 index 000000000..d6dd0475b --- /dev/null +++ b/testing/mpfr/mpfr.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(mpfr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD new file mode 100644 index 000000000..d2470708d --- /dev/null +++ b/testing/samba/PKGBUILD @@ -0,0 +1,153 @@ +# $Id: PKGBUILD 152742 2012-03-09 13:35:22Z heftig $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +pkgbase=samba +pkgname=('libwbclient' 'smbclient' 'samba') +pkgver=3.6.3 +# We use the 'A' to fake out pacman's version comparators. Samba chooses +# to append 'a','b',etc to their subsequent releases, which pamcan +# misconstrues as alpha, beta, etc. Bad samba! +_realver=3.6.3 +pkgrel=4 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba samba.logrotate + swat.xinetd + samba.pam + samba.conf.d) +### UNINSTALL dmapi package before building!!! + +build() { + cd ${srcdir}/${pkgbase}-${_realver}/source3 + ./configure --prefix=/usr \ + --libdir=/usr/lib/ \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run/samba \ + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-dnsupdate \ + --with-automount \ + --with-quotas \ + --with-ads \ + --with-acl-support \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ + --enable-external-libtdb + make +} + +package_libwbclient () { +pkgdesc="Samba winbind client library" +depends=('glibc') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/lib + for i in libwbclient*; do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done +} + +package_smbclient () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib + install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ + for i in libnetapi* libsmbclient*;do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done + install -m755 script/smbtar ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb + mkdir -p ${pkgdir}/usr/include + install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ + install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/share/man/man{1,7} + for man in rpcclient smbcacls smbclient smbcquotas smbget \ + smbtree smbtar nmblookup; do + install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ + done + install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +} + +package_samba () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/samba-${_realver}/source3 + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + make DESTDIR=${pkgdir} install + chmod 644 ${pkgdir}/usr/include/*.h + rm -rf ${pkgdir}/usr/var + rm -rf ${pkgdir}/var/run/samba + (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) + install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba + install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba + mkdir -p ${pkgdir}/etc/samba + cat ../examples/smb.conf.default | \ + sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default + install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + # nsswitch libraries + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so + ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so + ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2 + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so + # remove conflict files of smbclient + for man in libsmbclient smbspool \ + mount.cifs net cifs.upcall; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do + rm -f ${pkgdir}/usr/lib/$i + done + for bin in net \ + nmblookup rpcclient smbcacls smbclient \ + smbcquotas smbget smbspool smbtar smbtree; do + rm -f ${pkgdir}/usr/bin/$bin + done + rm -f ${pkgdir}/usr/sbin/cifs.upcall + rm -f ${pkgdir}/usr/include/netapi.h + for man in rpcclient smbcacls smbclient smbcquotas \ + smbtree smbtar nmblookup smbget; do + rm -f ${pkgdir}/usr/share/man/man1/${man}.1 + done + for man in tdbbackup tdbdump tdbtool; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 + rm -f ${pkgdir}/usr/include/libsmbclient.h + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1' + 'dfc6f9018c556b9783c7140de183727f' + '5697da77590ec092cc8a883bae06093c' + 'a4bbfa39fee95bba2e7ad6b535fae7e6' + '96f82c38f3f540b53f3e5144900acf17' + 'f2f2e348acd1ccb566e95fa8a561b828') diff --git a/testing/samba/samba b/testing/samba/samba new file mode 100755 index 000000000..2a04bfec4 --- /dev/null +++ b/testing/samba/samba @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba + +[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) + +case "$1" in + start) + rc=0 + stat_busy "Starting Samba Server" + if [ ! -x /var/run/samba ] ; then + install -m755 -d /var/run/samba + fi + if [ ! -x /var/log/samba ] ; then + install -m755 -d /var/log/samba + fi + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] && /usr/sbin/$d -D + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon samba + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping Samba Server" + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] || kill $PID &> /dev/null + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + rm /var/run/samba/smbd.pid &>/dev/null + rm /var/run/samba/nmbd.pid &>/dev/null + rm /var/run/samba/winbindd.pid &>/dev/null + rm_daemon samba + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d new file mode 100644 index 000000000..8721f956a --- /dev/null +++ b/testing/samba/samba.conf.d @@ -0,0 +1,7 @@ +# +# Configuration for the samba init script +# + +# space separated list of daemons to launch +SAMBA_DAEMONS=(smbd nmbd) +#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate new file mode 100644 index 000000000..581f4c33b --- /dev/null +++ b/testing/samba/samba.logrotate @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/samba/samba.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd new file mode 100644 index 000000000..2e62a82b2 --- /dev/null +++ b/testing/samba/swat.xinetd @@ -0,0 +1,10 @@ +service swat +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/swat + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD new file mode 100644 index 000000000..977999a38 --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD @@ -0,0 +1,25 @@ +# Contributor: Gökmen Görgen <gkmngrgn_gmail.com> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +pkgname=xchat-xsys-noaudacious +pkgver=2.2.0 +pkgrel=3 +pkgdesc="Sysinfo plugin without audacious for X-Chat" +url="http://dev.gentoo.org/~chainsaw/xsys" +depends=('xchat-libre' 'pciutils') +arch=('i686' 'x86_64') +source=(http://dev.gentoo.org/~chainsaw/xsys/download/xsys-$pkgver.tar.bz2 xchat-xsys-parabola.patch no-audacious.patch) +md5sums=('d57def00f96c7389ab593c009595f6f4' '4d22883f24606dbab588d685c553e5a1' '588e5f6d9037a07385079a5cf6ee2dbe') +license=('GPL') + +build() { + cd $srcdir/xsys-$pkgver + patch -p1 -i ../no-audacious.patch || return 1 + sed -i -e "s:/usr/share/misc/:/usr/share/hwdata/:" Makefile + sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" Makefile + sed -i -e "s:#BUTTON:BUTTON:" Makefile + sed -i -e "s:# FOR AUDACIOUS # ::g" Makefile + patch -p1 -i ../xchat-xsys-parabola.patch || return 1 + make || return 1 + mkdir -p $pkgdir/usr/lib/xchat/plugins + cp xsys-$pkgver.so $pkgdir/usr/lib/xchat/plugins +} diff --git a/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch new file mode 100644 index 000000000..749234e7a --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch @@ -0,0 +1,244 @@ +diff -uNr xsys-2.2.0.ORIG/Makefile xsys-2.2.0/Makefile +--- xsys-2.2.0.ORIG/Makefile 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/Makefile 2008-01-30 11:59:39.000000000 +0000 +@@ -10,7 +10,6 @@ + VER_PATCH = 0 + CC = gcc + CFLAGS += -O2 -Wall -fPIC +-CFLAGS += $(shell pkg-config dbus-1 --cflags) $(shell pkg-config glib-2.0 --cflags) + CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \ + -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DPCIIDS=\"$(PCIIDS)\" $(BUTTON) + LDFLAGS = $(CFLAGS) -shared +@@ -20,7 +19,7 @@ + ALL : $(LIBRARY) + + $(LIBRARY) : $(OBJECTS) +- $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci $(shell pkg-config dbus-1 --libs) $(shell pkg-config glib-2.0 --libs) -laudclient ++ $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci + + xsys.o : xsys.c + parse.o : parse.c +diff -uNr xsys-2.2.0.ORIG/parse.h xsys-2.2.0/parse.h +--- xsys-2.2.0.ORIG/parse.h 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/parse.h 2008-01-30 11:58:03.000000000 +0000 +@@ -33,7 +33,6 @@ + int xs_parse_video(char *vid_card); + int xs_parse_agpbridge(char *agp_bridge); + int xs_parse_ether(char *ethernet_card); +-int xs_parse_xmms_info(char **title, unsigned int *songtime, unsigned int *playtime); + int xs_parse_distro(char *name); + int xs_parse_hwmon_chip(char *chip); + int xs_parse_hwmon_temp(char *temp, unsigned int *sensor); +diff -uNr xsys-2.2.0.ORIG/xsys.c xsys-2.2.0/xsys.c +--- xsys-2.2.0.ORIG/xsys.c 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/xsys.c 2008-01-30 12:00:36.000000000 +0000 +@@ -28,24 +28,17 @@ + #include "parse.h" + #include "match.h" + #include "xsys.h" +-#include <audacious/dbus.h> +-#include <audacious/audctrl.h> + + static xchat_plugin *ph; + + static char format[bsize] = "%B%1%B[%2]"; +-static char playing[42] = "now_playing"; + unsigned int percentages = 1; +-static unsigned int action = 0; + + static void load_config(); + static void save_config(); +-static gboolean dbus_init(void); + + static int format_cb (char *word[], char *word_eol[], void *userdata); +-static int playing_cb (char *word[], char *word_eol[], void *userdata); + static int percentages_cb (char *word[], char *word_eol[], void *userdata); +-static int action_cb (char *word[], char *word_eol[], void *userdata); + static int sysinfo_cb (char *word[], char *word_eol[], void *userdata); + static int xsys_cb (char *word[], char *word_eol[], void *userdata); + static int cpuinfo_cb (char *word[], char *word_eol[], void *userdata); +@@ -62,22 +55,17 @@ + #if 0 + static int hwmon_cb (char *word[], char *word_eol[], void *userdata); + #endif +-static int np_cb (char *word[], char *word_eol[], void *userdata); +-static DBusGProxy *dbus_proxy = NULL; +-static DBusGConnection *connection = NULL; + + int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, + char **plugin_desc, char **plugin_version, char *arg) + { + ph = plugin_handle; + *plugin_name = "X-Sys_2"; +- *plugin_desc = "A sysinfo/audacious plugin"; ++ *plugin_desc = "A sysinfo plugin"; + *plugin_version = VER_STRING; + + xchat_hook_command(ph, "XSYS2FORMAT",XCHAT_PRI_NORM, format_cb, NULL, NULL); +- xchat_hook_command(ph, "PLAYING", XCHAT_PRI_NORM, playing_cb, NULL, NULL); + xchat_hook_command(ph, "PERCENTAGES",XCHAT_PRI_NORM, percentages_cb, NULL, NULL); +- xchat_hook_command(ph, "NPACTION", XCHAT_PRI_NORM, action_cb, NULL, NULL); + xchat_hook_command(ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 0); + xchat_hook_command(ph, "ESYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 1); + xchat_hook_command(ph, "XSYS", XCHAT_PRI_NORM, xsys_cb, NULL, (void *) 0); +@@ -108,13 +96,6 @@ + xchat_hook_command(ph, "HWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 0); + xchat_hook_command(ph, "EHWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 1); + #endif +- if (dbus_init()) +- { +- xchat_hook_command(ph, "NP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 0); +- xchat_hook_command(ph, "ENP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 1); +- xchat_printf(ph, "D-Bus MPRIS support initialized", VER_STRING); +- } +- + load_config(); + + xchat_printf(ph, "X-Sys %s Loaded Succesfully", VER_STRING); +@@ -122,11 +103,6 @@ + return 1; + } + +-static void xchat_plugin_deinit() +-{ +- /* blahblahblah */ +-} +- + static void save_config() + { + FILE *fp; +@@ -139,9 +115,7 @@ + return; + } + fprintf(fp, "format: %s\n", format); +- fprintf(fp, "playing: %s\n", playing); + fprintf(fp, "percentages: %i\n", percentages); +- fprintf(fp, "action: %i\n", action); + fclose(fp); + return; + } +@@ -158,30 +132,11 @@ + while(fgets(buffer, bsize, fp) != NULL) + { + find_match_char(buffer, "format", format); +- find_match_char(buffer, "playing", playing); + find_match_int(buffer, "percentages", &percentages); +- find_match_int(buffer, "action", &action); + } + fclose(fp); + } + +-static gboolean dbus_init(void) +-{ +- GError *error = NULL; +- +- connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); +- if (connection == NULL) +- return FALSE; +- +- dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, +- AUDACIOUS_DBUS_PATH, +- AUDACIOUS_DBUS_INTERFACE); +- if (dbus_proxy == NULL) +- return FALSE; +- +- return TRUE; +-} +- + static int format_cb(char *word[], char *word_eol[], void *userdata) + { + if(*(word[2]) == '\0') +@@ -194,18 +149,6 @@ + return XCHAT_EAT_ALL; + } + +-static int playing_cb(char *word[], char *word_eol[], void *userdata) +-{ +- if(*(word[2]) == '\0') +- xchat_printf(ph, "Current playing string:\n%s", playing); +- else +- { +- strncpy(playing, word_eol[2], 42); +- save_config(); +- } +- return XCHAT_EAT_ALL; +-} +- + static int percentages_cb(char *word[], char *word_eol[], void *userdata) + { + if(*(word[2]) == '\0') +@@ -221,21 +164,6 @@ + return XCHAT_EAT_ALL; + } + +-static int action_cb(char *word[], char *word_eol[], void *userdata) +-{ +- if(*(word[2]) == '\0') +- if (action != 0) +- xchat_printf(ph, "Now playing action currently enabled"); +- else +- xchat_printf(ph, "Now playing action currently disabled"); +- else +- { +- action = atoi(word[2]); +- save_config(); +- } +- return XCHAT_EAT_ALL; +-} +- + static int sysinfo_cb(char *word[], char *word_eol[], void *userdata) + { + char sysinfo[bsize], buffer[bsize], cpu_model[bsize], cpu_cache[bsize], cpu_vendor[bsize]; +@@ -683,52 +611,3 @@ + return XCHAT_EAT_ALL; + } + #endif +- +-static int np_cb(char *word[], char *word_eol[], void *userdata) +-{ +- char *buffer = NULL, title[bsize], length[42]; +- int pos, len, p = audacious_remote_get_playlist_pos(dbus_proxy); +- +- if (!audacious_remote_is_running(dbus_proxy)) +- { +- xchat_printf(ph, "Audacious is not currently running"); +- return XCHAT_EAT_ALL; +- } +- +- pos = audacious_remote_get_output_time(dbus_proxy); +- len = audacious_remote_get_playlist_time(dbus_proxy, p); +- buffer = decruft_filename(audacious_remote_get_playlist_title(dbus_proxy, p)); +- +- strncpy(title, buffer, bsize); +- +- if (action != 0) +- flat_format_output(playing, title, format); +- else +- format_output(playing, title, format); +- strcat(title, "\017 "); +- +- if(len == -1) +- snprintf(length, 42, "%d:%02d/stream", +- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60); +- else +- snprintf(length, 42, "%d:%02d/%d:%02d", +- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60, +- ((len/1000)-((len/1000)%60))/60, (len/1000)%60); +- +- if (action != 0) +- flat_format_output("length", length, format); +- else +- format_output("length", length, format); +- strncat(title, length, bsize); +- +- if ((action != 0) && (long)userdata) +- xchat_printf(ph, "You are %s", title); +- else if (action != 0) +- xchat_commandf(ph, "me is %s", title); +- else if ((long)userdata) +- xchat_printf(ph, "%s", title); +- else +- xchat_commandf(ph, "say %s", title); +- +- return XCHAT_EAT_ALL; +-} diff --git a/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch b/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch new file mode 100644 index 000000000..a3b905be9 --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch @@ -0,0 +1,37 @@ +--- xsys-2.2.0/parse.c 2007-11-12 18:42:20.000000000 -0200 ++++ xsys-2.2.0.new/parse.c 2012-03-10 20:36:46.301892322 -0200 +@@ -389,32 +389,8 @@ + } + snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release); + } +- else if((fp = fopen("/etc/make.conf", "r")) != NULL) +- { +- char keywords[bsize]; +- while(fgets(buffer, bsize, fp) != NULL) +- find_match_char(buffer, "ACCEPT_KEYWORDS", keywords); +- if (strstr(keywords, "\"") == NULL) +- snprintf(buffer, bsize, "Gentoo Linux (stable)"); +- else +- snprintf(buffer, bsize, "Gentoo Linux %s", keywords); +- } +- else if((fp = fopen("/etc/redhat-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/slackware-version", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/mandrake-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/debian_version", "r")) != NULL) +- { +- char release[bsize]; +- fgets(release, bsize, fp); +- snprintf(buffer, bsize, "Debian %s", release); +- } +- else if((fp = fopen("/etc/SuSE-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/turbolinux-release", "r")) != NULL) +- fgets(buffer, bsize, fp); ++ else if((fp = fopen("/etc/arch-release", "r")) != NULL) ++ snprintf(buffer, bsize, "Parabola GNU/Linux-libre"); + else + snprintf(buffer, bsize, "Unknown Distro"); + if(fp != NULL) fclose(fp); diff --git a/~lukeshu/maildirproc/PKGBUILD b/~lukeshu/maildirproc/PKGBUILD new file mode 100644 index 000000000..9197fc6e3 --- /dev/null +++ b/~lukeshu/maildirproc/PKGBUILD @@ -0,0 +1,17 @@ +# Maintainer: Mick Koch <kchmck@gmail.com> + +pkgname="maildirproc" +pkgver="0.5.0" +pkgrel="1" +pkgdesc="Sorts mail based on a Python configuration file" +arch=("any") +url="http://joel.rosdahl.net/maildirproc/" +license=("GPL") +depends=("python") +source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2") +md5sums=("eaa001f6cd1befee99528ca55da979ca") + +build() { + cd "$srcdir/$pkgname-$pkgver" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} |