From 4cd3fcfccda5c0375669bd300834ac77a0a617fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 5 Jul 2014 03:56:09 +0000 Subject: Sat Jul 5 03:51:53 UTC 2014 --- community/agave/PKGBUILD | 27 +- community/aspell-cs/PKGBUILD | 4 +- community/avfs/PKGBUILD | 29 +- community/barcode/PKGBUILD | 4 +- community/buoh/PKGBUILD | 15 +- community/calf/PKGBUILD | 4 +- community/ccache/PKGBUILD | 4 +- community/cdargs/PKGBUILD | 4 +- community/cddb-py/PKGBUILD | 23 +- community/ctpl/PKGBUILD | 4 +- community/dcfldd/PKGBUILD | 4 +- community/devilspie/PKGBUILD | 4 +- community/dumb/PKGBUILD | 4 +- community/dvgrab/PKGBUILD | 4 +- community/flac123/PKGBUILD | 4 +- community/gavl/PKGBUILD | 4 +- community/gimp-dbp/PKGBUILD | 4 +- community/glee/PKGBUILD | 6 +- community/glitz/PKGBUILD | 4 +- community/gnac/PKGBUILD | 4 +- community/gnome-subtitles/PKGBUILD | 4 +- community/gnome-web-photo/PKGBUILD | 6 +- community/herqq/PKGBUILD | 12 +- community/iec16022/PKGBUILD | 10 +- community/julia/PKGBUILD | 7 +- community/leptonica/PKGBUILD | 8 +- community/libcoverart/PKGBUILD | 4 +- community/libsodium/PKGBUILD | 6 +- community/linuxdcpp/PKGBUILD | 2 +- community/luabitop/PKGBUILD | 6 +- community/lxinput/PKGBUILD | 6 +- community/lxmenu-data/PKGBUILD | 4 +- community/mksh/PKGBUILD | 8 +- community/notify-osd/PKGBUILD | 4 +- community/notion/PKGBUILD | 4 +- community/pidgin-encryption/PKGBUILD | 4 +- community/pygoocanvas/PKGBUILD | 4 +- community/pymad/PKGBUILD | 4 +- community/pyogg/PKGBUILD | 13 +- community/python2-fuse/PKGBUILD | 4 +- community/python2-pychm/PKGBUILD | 4 +- community/python2-pysqlite-legacy/PKGBUILD | 4 +- community/python2-pyxmpp/PKGBUILD | 2 +- community/pyvorbis/PKGBUILD | 8 +- community/regexxer/PKGBUILD | 14 +- community/ristretto/PKGBUILD | 6 +- community/scrot/PKGBUILD | 4 +- community/simplescreenrecorder/PKGBUILD | 8 +- community/synergy/PKGBUILD | 15 +- community/synergy/synergys.service | 10 - community/synergy/synergys.socket | 9 - community/synergy/synergys_at.service | 10 + community/synergy/synergys_at.socket | 9 + community/tuxpaint-config/PKGBUILD | 4 +- community/ucl/PKGBUILD | 4 +- community/vmpk/PKGBUILD | 14 +- community/vmpk/vmpk.install | 2 +- community/volumeicon/PKGBUILD | 9 +- community/xmobar/PKGBUILD | 10 +- extra/calligra/PKGBUILD | 8 +- extra/cogl/PKGBUILD | 13 +- extra/cogl/git-fixes.patch | 1242 -------------------- extra/ctags/PKGBUILD | 4 +- extra/ebook-tools/PKGBUILD | 4 +- extra/kdiff3/PKGBUILD | 15 +- extra/ladspa/PKGBUILD | 4 +- extra/libndp/PKGBUILD | 30 + extra/libqmi/PKGBUILD | 6 +- extra/libreoffice-fresh/PKGBUILD | 23 +- extra/libteam/PKGBUILD | 48 + extra/libtiger/PKGBUILD | 4 +- extra/mtools/PKGBUILD | 4 +- extra/pyqt4/PKGBUILD | 8 +- extra/pyqt5/PKGBUILD | 6 +- extra/python2/PKGBUILD | 12 +- extra/qalculate-gtk/PKGBUILD | 8 +- extra/schedtool/PKGBUILD | 4 +- extra/serd/PKGBUILD | 2 +- extra/sord/PKGBUILD | 2 +- extra/swh-plugins/PKGBUILD | 4 +- extra/webkitgtk/PKGBUILD | 11 +- .../webkitgtk-2.4.3-angle_symbol_table.patch | 13 + 82 files changed, 390 insertions(+), 1511 deletions(-) delete mode 100644 community/synergy/synergys.service delete mode 100644 community/synergy/synergys.socket create mode 100644 community/synergy/synergys_at.service create mode 100644 community/synergy/synergys_at.socket delete mode 100644 extra/cogl/git-fixes.patch create mode 100644 extra/libndp/PKGBUILD create mode 100644 extra/libteam/PKGBUILD create mode 100644 extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD index 458e721c6..6f65245af 100644 --- a/community/agave/PKGBUILD +++ b/community/agave/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68265 2012-03-20 22:39:06Z bgyorgy $ +# $Id: PKGBUILD 114853 2014-07-04 09:16:46Z fyan $ # Maintainer: Balló György # Contributor: Angel 'angvp' Velasquez # Contributor: Roman Kyrylych @@ -6,13 +6,13 @@ pkgname=agave pkgver=0.4.7 -pkgrel=4 +pkgrel=5 pkgdesc="Colorscheme designer tool for GNOME" arch=('i686' 'x86_64') url="http://home.gna.org/colorscheme/" license=('GPL') depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('gnome-doc-utils' 'intltool' 'boost') +makedepends=('gnome-doc-utils' 'intltool' 'boost' 'cppunit') install=$pkgname.install source=("http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2" agave-0.4.7-mdv-fix-str-fmt.patch @@ -23,20 +23,33 @@ md5sums=('93097881f28dcae1eca2800a763f77c3' 'c41adfd52ecbf837f4338e67693640fc' '7419d23329f847dcde12baa467b52135') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" # Fedora patch - patch -Np1 -i "$srcdir/schemebox.patch" # gcs-schemebox patch + + # Build fix from Fedora + patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" + + # Another build fix + patch -Np1 -i "$srcdir/schemebox.patch" + + # Remove deprecated libgnome dependency patch -Np1 -i "$srcdir/drop-libgnome.patch" +} +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-scrollkeeper --disable-gnome --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD index 1e409e7bc..190934451 100644 --- a/community/aspell-cs/PKGBUILD +++ b/community/aspell-cs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67108 2012-03-04 12:33:51Z stativ $ +# $Id: PKGBUILD 114800 2014-07-04 06:47:57Z stativ $ # Maintainer: Jaroslav Lichtblau # Contributor: Michal Karas pkgname=aspell-cs pkgver=20040614 -pkgrel=6 +pkgrel=7 pkgdesc="Czech dictionary for aspell" arch=('i686' 'x86_64') url="http://aspell.net/" diff --git a/community/avfs/PKGBUILD b/community/avfs/PKGBUILD index f9cdb2670..46874f6c5 100644 --- a/community/avfs/PKGBUILD +++ b/community/avfs/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 99689 2013-10-30 23:02:31Z allan $ -# Maintainer: Kevin Piche +# $Id: PKGBUILD 114766 2014-07-03 23:12:50Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Kevin Piche # Contributor: K. Piche pkgname=avfs -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="A virtual filesystem that allows browsing of compressed files" -arch=('i686' 'x86_64') +pkgdesc='Virtual filesystem that allows browsing of compressed files' +arch=('x86_64' 'i686') license=('GPL' 'LGPL') -url="http://avf.sourceforge.net/" -depends=('fuse' 'xz' 'perl') +url='http://avf.sourceforge.net/' +depends=('fuse' 'xz') options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc}) -md5sums=('f0f254d092e54da14bbf3ea22b76da99' - 'd71607de21819f3d67246473f0bc21f3') +source=("http://downloads.sourceforge.net/sourceforge/avf/$pkgname-$pkgver.tar.bz2") +sha256sums=('52693953e8290281d441a898040c5ac2989f11bc1fcb83ca5063c37a125a1c9a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ --enable-library \ --enable-fuse \ @@ -25,7 +26,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/barcode/PKGBUILD b/community/barcode/PKGBUILD index 4748943b9..ae8dc10a8 100644 --- a/community/barcode/PKGBUILD +++ b/community/barcode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102195 2013-12-06 13:05:07Z giovanni $ +# $Id: PKGBUILD 114913 2014-07-04 15:44:12Z fyan $ # Maintainer: Giovanni Scafora pkgname=barcode pkgver=0.99 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to convert text strings to printed bars" arch=('i686' 'x86_64') url="http://www.gnu.org/software/barcode/" diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD index 0d0ba0118..4dec736a7 100644 --- a/community/buoh/PKGBUILD +++ b/community/buoh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70031 2012-04-28 12:10:05Z bgyorgy $ +# $Id: PKGBUILD 114855 2014-07-04 09:18:50Z fyan $ # Maintainer: Balló György # Contributor: Eric Belanger # Contributor: William Rea pkgname=buoh pkgver=0.8.2 -pkgrel=6 +pkgrel=7 pkgdesc="Reader for online strips comics" arch=('i686' 'x86_64') url="http://buoh.steve-o.org/" @@ -18,15 +18,17 @@ source=("http://buoh.steve-o.org/downloads/$pkgname-$pkgver.tar.bz2" buoh-libsoup24.patch) md5sums=('50474a8712ad20ab36d8f8058a4647fb' 'c44f0e1828492a5d7d8efee764558fb4') -sha1sums=('29d702b485a901868f65116e753cb515b3e2a2c5' - '012badf13e33818268b744e106bdcccfd8fc66ed') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + # Port to libsoup 2.4 patch -p1 < ../buoh-libsoup24.patch - autoconf +} +build() { + cd "$srcdir/$pkgname-$pkgver" + autoconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-libgnomeui @@ -35,6 +37,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD index 694a00f9f..aafba84de 100644 --- a/community/calf/PKGBUILD +++ b/community/calf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99704 2013-10-30 23:08:18Z allan $ +# $Id: PKGBUILD 114782 2014-07-04 05:34:02Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Ray Rashif pkgname=calf pkgver=0.0.19 -pkgrel=3 +pkgrel=4 pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host' arch=('x86_64' 'i686') url='http://calf.sf.net/' diff --git a/community/ccache/PKGBUILD b/community/ccache/PKGBUILD index 9266b18eb..ff448e461 100644 --- a/community/ccache/PKGBUILD +++ b/community/ccache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102197 2013-12-06 13:08:34Z giovanni $ +# $Id: PKGBUILD 114916 2014-07-04 15:45:24Z fyan $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=ccache pkgver=3.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A compiler cache" arch=('i686' 'x86_64') url="http://ccache.samba.org/" diff --git a/community/cdargs/PKGBUILD b/community/cdargs/PKGBUILD index fdddf911b..003a0a7aa 100644 --- a/community/cdargs/PKGBUILD +++ b/community/cdargs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83130 2013-01-27 16:11:01Z pierre $ +# $Id: PKGBUILD 114784 2014-07-04 05:35:37Z fyan $ # Maintainer: Aaron Griffin # Contributor: Damir Perisa pkgname=cdargs pkgver=1.35 -pkgrel=3 +pkgrel=4 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/cddb-py/PKGBUILD b/community/cddb-py/PKGBUILD index 6d2359f9f..7ff76667c 100644 --- a/community/cddb-py/PKGBUILD +++ b/community/cddb-py/PKGBUILD @@ -1,26 +1,19 @@ -# $Id: PKGBUILD 67459 2012-03-11 21:09:20Z lcarlier $ -# Contributor: Allan McRae -# Contributor: Hugo Ideler -# Contributor: David Keogh -# Maintainer: Daniel J Griffiths +# $Id: PKGBUILD 114779 2014-07-04 03:40:45Z eric $ +# Maintainer: Eric Bélanger pkgname=cddb-py pkgver=1.4 -pkgrel=6 +pkgrel=7 pkgdesc="CDDB-Server access from Python" arch=('i686' 'x86_64') url="http://cddb-py.sourceforge.net" license=('GPL') depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/cddb-py/CDDB-${pkgver}.tar.gz") -md5sums=('254698082bafe3030d07d88fb7e13fe2') +source=(http://downloads.sourceforge.net/sourceforge/cddb-py/CDDB-${pkgver}.tar.gz) +sha1sums=('4b101ff3a0a5895385dffac8ab807400f682a195') package() { - cd ${srcdir}/CDDB-${pkgver} - - for file in CDDB.py DiscID.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - python2 setup.py install --root=${pkgdir} --optimize=1 + cd CDDB-${pkgver} + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' CDDB.py DiscID.py + python2 setup.py install --root="${pkgdir}" --optimize=1 } diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD index b60f5bea2..8859ded8a 100644 --- a/community/ctpl/PKGBUILD +++ b/community/ctpl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99721 2013-10-30 23:14:36Z allan $ +# $Id: PKGBUILD 114786 2014-07-04 05:46:37Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Angel Velasquez # Contributor: Patrick Melo pkgname=ctpl pkgver=0.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Template engine library written in C" arch=('x86_64' 'i686') url="http://ctpl.tuxfamily.org/" diff --git a/community/dcfldd/PKGBUILD b/community/dcfldd/PKGBUILD index c28ded29f..539b83cc1 100644 --- a/community/dcfldd/PKGBUILD +++ b/community/dcfldd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83134 2013-01-27 16:12:28Z pierre $ +# $Id: PKGBUILD 114788 2014-07-04 05:55:23Z fyan $ # Contributor: Paul Mattal # Maintainer: Paul Mattal pkgname=dcfldd pkgver=1.3.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing" arch=('i686' 'x86_64') url="http://dcfldd.sourceforge.net/" diff --git a/community/devilspie/PKGBUILD b/community/devilspie/PKGBUILD index 579bdc74c..4de045369 100644 --- a/community/devilspie/PKGBUILD +++ b/community/devilspie/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83136 2013-01-27 16:13:00Z pierre $ +# $Id: PKGBUILD 114790 2014-07-04 06:00:28Z fyan $ # Maintainer: Aaron Griffin # Contributor: Travis Willard # Contributor: William Rea pkgname=devilspie pkgver=0.22 -pkgrel=5 +pkgrel=6 pkgdesc="x11 window matching utility" arch=('i686' 'x86_64') url="http://www.burtonini.com/blog/computers/devilspie" diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD index c30d667a1..fcb4ade23 100644 --- a/community/dumb/PKGBUILD +++ b/community/dumb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83614 2013-02-03 23:11:33Z arodseth $ +# $Id: PKGBUILD 114792 2014-07-04 06:03:55Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Chris Brannon # Contributor: JJDaNiMoTh @@ -6,7 +6,7 @@ pkgname=dumb pkgver=0.9.3 -pkgrel=7 +pkgrel=8 pkgdesc='IT, XM, S3M and MOD player library' arch=('x86_64' 'i686') license=('custom:dumb' 'GPL') diff --git a/community/dvgrab/PKGBUILD b/community/dvgrab/PKGBUILD index c39f319f7..e0c7336c8 100644 --- a/community/dvgrab/PKGBUILD +++ b/community/dvgrab/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102099 2013-12-05 09:01:04Z giovanni $ +# $Id: PKGBUILD 114920 2014-07-04 15:47:23Z fyan $ # Maintainer: Giovanni Scafora # Contributor: Jason Chu pkgname=dvgrab pkgver=3.5 -pkgrel=4 +pkgrel=5 pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source" arch=('i686' 'x86_64') url="http://www.kinodv.org/" diff --git a/community/flac123/PKGBUILD b/community/flac123/PKGBUILD index e101e6f20..496a7fa9a 100644 --- a/community/flac123/PKGBUILD +++ b/community/flac123/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78533 2012-10-20 10:17:22Z ebelanger $ +# $Id: PKGBUILD 114794 2014-07-04 06:14:07Z fyan $ # Maintainer: Chris Brannon # Contributor: Corrado Primier # Contributor: Patrick Burroughs pkgname=flac123 pkgver=0.0.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') pkgdesc="A command-line program for playing FLAC audio files" diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD index 1cc9c109c..c7f3733ba 100644 --- a/community/gavl/PKGBUILD +++ b/community/gavl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99746 2013-10-30 23:27:40Z allan $ +# $Id: PKGBUILD 114798 2014-07-04 06:40:25Z fyan $ # Maintainer: Lukas Fleischer # Contributor: Robert Emil Berge # Contributor: Mateusz Herych pkgname=gavl pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='A low level library, upon which multimedia APIs can be built.' arch=('i686' 'x86_64') url='http://gmerlin.sourceforge.net/' diff --git a/community/gimp-dbp/PKGBUILD b/community/gimp-dbp/PKGBUILD index d41ad9b66..3bdd67b28 100644 --- a/community/gimp-dbp/PKGBUILD +++ b/community/gimp-dbp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83142 2013-01-27 16:14:44Z pierre $ +# $Id: PKGBUILD 114796 2014-07-04 06:33:43Z fyan $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=gimp-dbp pkgver=1.1.9 -pkgrel=3 +pkgrel=4 pkgdesc="David's batch processor for the GIMP" arch=('i686' 'x86_64') url="http://members.ozemail.com.au/~hodsond/dbp.html" diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD index 4f89ad918..ba290ee81 100644 --- a/community/glee/PKGBUILD +++ b/community/glee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86549 2013-03-19 04:49:29Z speps $ +# $Id: PKGBUILD 114926 2014-07-04 16:20:22Z speps $ # Maintainer : speps pkgname=glee pkgver=5.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Free cross-platform extension loading library for OpenGL" arch=('i686' 'x86_64') url="http://elf-stone.com/glee.php" @@ -19,12 +19,10 @@ source=("http://pkgs.fedoraproject.org/repo/pkgs/GLee/$_spkg/$md5sums/$_spkg" glee.pc Makefile) # implement FS#32670 + fix TEXTREL for i686 build() { - cd "$srcdir" make } package() { - cd "$srcdir" make DESTDIR="$pkgdir/" install } diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD index 0072c0231..4742dd468 100644 --- a/community/glitz/PKGBUILD +++ b/community/glitz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99762 2013-10-30 23:33:29Z allan $ +# $Id: PKGBUILD 114802 2014-07-04 06:56:03Z fyan $ # Maintainer: Alexander Rødseth pkgname=glitz pkgver=0.5.6 -pkgrel=4 +pkgrel=5 pkgdesc='OpenGL image compositing library' arch=('x86_64' 'i686') url='http://cairographics.org/' diff --git a/community/gnac/PKGBUILD b/community/gnac/PKGBUILD index 42cb76b7f..73e2c6cfb 100644 --- a/community/gnac/PKGBUILD +++ b/community/gnac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71475 2012-05-27 08:59:40Z bgyorgy $ +# $Id: PKGBUILD 114857 2014-07-04 09:20:34Z fyan $ # Maintainer: Balló György pkgname=gnac pkgver=0.2.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Audio converter for GNOME" arch=('i686' 'x86_64') url="http://gnac.sourceforge.net/" diff --git a/community/gnome-subtitles/PKGBUILD b/community/gnome-subtitles/PKGBUILD index 9d175bf53..2b1d536dd 100644 --- a/community/gnome-subtitles/PKGBUILD +++ b/community/gnome-subtitles/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99776 2013-10-30 23:38:47Z allan $ +# $Id: PKGBUILD 114859 2014-07-04 09:23:38Z fyan $ # Maintainer: Balló György pkgname=gnome-subtitles pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Video subtitle editor for GNOME" arch=('i686' 'x86_64') url="http://gnomesubtitles.org/" diff --git a/community/gnome-web-photo/PKGBUILD b/community/gnome-web-photo/PKGBUILD index ee29c7b08..cf3ae676f 100644 --- a/community/gnome-web-photo/PKGBUILD +++ b/community/gnome-web-photo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 70732 2012-05-15 22:59:27Z bgyorgy $ +# $Id: PKGBUILD 114861 2014-07-04 09:26:41Z fyan $ # Maintainer: Balló György # Contributor: Phillip Smith # Contributor: Adam pkgname=gnome-web-photo pkgver=0.10.6 -pkgrel=1 +pkgrel=2 pkgdesc="Generate full-size image files and thumbnails from HTML files and web pages" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/gnome-web-photo/" license=('LGPL') -depends=('libwebkit3') +depends=('webkitgtk3') makedepends=('intltool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('1353fc1abe9fcd38b3e09c6282e43aeb0c306201a4df9e25d4834407ba2cbe7f') diff --git a/community/herqq/PKGBUILD b/community/herqq/PKGBUILD index 9728f46c3..a12248c2c 100644 --- a/community/herqq/PKGBUILD +++ b/community/herqq/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 85358 2013-03-01 10:33:17Z andrea $ +# $Id: PKGBUILD 114804 2014-07-04 06:57:52Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Andrea Scarpino pkgname=herqq pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Software library for building UPnP devices (HUPnP)' arch=('x86_64' 'i686') -url='http://www.herqq.org/' +url='http://hupnp.linada.fi/index.html' license=('GPL') depends=('qt4') source=("http://downloads.sourceforge.net/hupnp/$pkgname-$pkgver.zip") sha256sums=('cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e') build() { - cd "$srcdir/$pkgname-$pkgver" - qmake PREFIX=/usr + cd $pkgname-$pkgver + qmake-qt4 PREFIX=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make INSTALL_ROOT="$pkgdir" install } diff --git a/community/iec16022/PKGBUILD b/community/iec16022/PKGBUILD index 7240bcec4..204eba716 100644 --- a/community/iec16022/PKGBUILD +++ b/community/iec16022/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99813 2013-10-31 01:52:00Z allan $ +# $Id: PKGBUILD 114866 2014-07-04 09:38:15Z fyan $ # Maintainer: Balló György pkgname=iec16022 pkgver=0.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Produce 2D barcodes often also referenced as DataMatrix" arch=('i686' 'x86_64') url="http://datenfreihafen.org/projects/iec16022.html" @@ -20,6 +20,12 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/julia/PKGBUILD b/community/julia/PKGBUILD index d1ff10621..064fbd10a 100644 --- a/community/julia/PKGBUILD +++ b/community/julia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114739 2014-07-03 15:11:03Z arodseth $ +# $Id: PKGBUILD 114770 2014-07-03 23:57:26Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Lex Black # Contributor: Michael Jakl @@ -6,7 +6,7 @@ pkgname=julia pkgver=0.3.0_prerelease -pkgrel=7 +pkgrel=8 pkgdesc='High-level, high-performance, dynamic programming language' arch=('x86_64' 'i686') url='http://julialang.org' @@ -79,6 +79,9 @@ package() { # Remove duplicate man-page from julia/doc rm -rv "$pkgdir/usr/share/julia/doc/man" + # Remove this file in order for Julia to start, see FS#39721 + rm -v "$pkgdir/usr/lib/julia/sys.so" + # Fix wonky permission chmod 644 "$pkgdir/usr/lib/julia/libuv.a" } diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index cc7f1edae..bbaf8c46e 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113164 2014-06-14 19:22:18Z andyrtr $ +# $Id: PKGBUILD 114932 2014-07-04 16:39:54Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christoph Drexler pkgname=leptonica -pkgver=1.70 -pkgrel=2 +pkgver=1.71 +pkgrel=1 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64') url="http://www.leptonica.com/" @@ -12,7 +12,7 @@ license=('custom') depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz giflib6.patch) -md5sums=('5ac2a31cf5b4f0e8f5a853a5266c42ef' +md5sums=('9840f758ff83ca0b5ec847a9fa8099b6' 'deeea9d5dccd9a0fb4e0e4433db49086') prepare() { diff --git a/community/libcoverart/PKGBUILD b/community/libcoverart/PKGBUILD index f0f4e2012..5e2ddcb86 100644 --- a/community/libcoverart/PKGBUILD +++ b/community/libcoverart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87381 2013-03-30 13:00:20Z bgyorgy $ +# $Id: PKGBUILD 114874 2014-07-04 15:13:34Z fyan $ # Maintainer: Balló György pkgname=libcoverart pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ library for accessing the MusicBrainz Cover Art Archive" arch=('i686' 'x86_64') url="http://musicbrainz.org/doc/libcoverart" diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD index 5cc15961a..70de00d90 100644 --- a/community/libsodium/PKGBUILD +++ b/community/libsodium/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111111 2014-05-14 03:38:53Z fyan $ +# $Id: PKGBUILD 114780 2014-07-04 03:59:18Z fyan $ # Maintainer: Felix Yan # Contributor: namelessjon # Contributor: Alessio Sergi pkgname=libsodium -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=1 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" arch=('i686' 'x86_64') @@ -38,4 +38,4 @@ package() { } # vim:set ts=2 sw=2 et: -sha512sums=('6a483a4699daaa9f047fd362b405b21eb058c44e240f0f910fbd2167239f51bc092e807f875fc971a1e70decc6fa861b6904bef86156b27790960aba88ce253a') +sha512sums=('3a47468d3db1447fcb223de330ee3ffd11394ecd31440bfd2d89999003bdf01f85c0644b6075d73d670bf94ab9ea2162417a0dcd290ad2a9a46ae76cd467fc85') diff --git a/community/linuxdcpp/PKGBUILD b/community/linuxdcpp/PKGBUILD index 28f0261c0..21f918e10 100644 --- a/community/linuxdcpp/PKGBUILD +++ b/community/linuxdcpp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=linuxdcpp pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A Gtk+ Direct Connect client based on DC++." url="https://launchpad.net/linuxdcpp/" license=('GPL') diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD index 7dacdad3e..b1db9fede 100644 --- a/community/luabitop/PKGBUILD +++ b/community/luabitop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81388 2012-12-19 13:22:34Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 114808 2014-07-04 07:07:54Z fyan $ +# Maintainer: Sébastien Luttringer # Contributor: Lucas Hermann Negri pkgbase=luabitop pkgname=(lua-bitop lua51-bitop) pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='C extension adding bitwise operations on numbers' arch=(i686 x86_64) url='http://bitop.luajit.org/index.html' diff --git a/community/lxinput/PKGBUILD b/community/lxinput/PKGBUILD index 7ed91636f..49aa116df 100644 --- a/community/lxinput/PKGBUILD +++ b/community/lxinput/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72002 2012-06-05 13:35:16Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 114911 2014-07-04 15:42:18Z fyan $ +# Contributor: Bartłomiej Piotrowski # Contributor: Filipp "Scorp" Andjelo pkgname=lxinput pkgver=0.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="A small program to configure keyboard and mouse for LXDE." arch=('i686' 'x86_64') url="http://lxde.org/" diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD index 6087648d9..4fc2dc70a 100644 --- a/community/lxmenu-data/PKGBUILD +++ b/community/lxmenu-data/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52895 2011-07-29 18:44:33Z angvp $ +# $Id: PKGBUILD 114909 2014-07-04 15:41:41Z fyan $ # Maintainer: Angel Velasquez # Maintainer: Juergen Hoetzel pkgname=lxmenu-data pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="freedesktop.org desktop menus for LXDE" arch=('i686' 'x86_64') license=('GPL2') diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 6dfdf611d..973ac789b 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103962 2014-01-14 07:07:04Z ttoepper $ +# $Id: PKGBUILD 114942 2014-07-04 17:53:25Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Daniel Hommel pkgname=mksh -_pkgver=R49 -pkgver=49 +_pkgver=R50 +pkgver=50 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -14,7 +14,7 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('e8c205cac72c3dc8540bbc3897421422' +md5sums=('436a448f4124d3743adb9e4a1562b77e' 'fd6f7b5eb01280b0110af736d6188f34') check() { diff --git a/community/notify-osd/PKGBUILD b/community/notify-osd/PKGBUILD index 431581ae0..65a9d6053 100644 --- a/community/notify-osd/PKGBUILD +++ b/community/notify-osd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79663 2012-11-10 19:03:29Z bgyorgy $ +# $Id: PKGBUILD 114882 2014-07-04 15:19:15Z fyan $ # Maintainer: Balló György # Contributor: Johannes Pfau pkgname=notify-osd pkgver=0.9.34 -pkgrel=1 +pkgrel=2 pkgdesc="Canonical's on-screen-display notification agent, implementing the freedesktop.org Desktop Notifications Specification with semi-transparent click-through bubbles" arch=('i686' 'x86_64') url="https://launchpad.net/notify-osd" diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 56b97d14c..094b4a6ac 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109578 2014-04-16 10:25:03Z spupykin $ +# $Id: PKGBUILD 114944 2014-07-04 18:18:04Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20140416 +pkgver=20140704 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" diff --git a/community/pidgin-encryption/PKGBUILD b/community/pidgin-encryption/PKGBUILD index ae2cb0f96..32eca69d0 100644 --- a/community/pidgin-encryption/PKGBUILD +++ b/community/pidgin-encryption/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99953 2013-10-31 02:39:54Z allan $ +# $Id: PKGBUILD 114812 2014-07-04 07:22:16Z fyan $ # Maintainer: Andrea Scarpino # Contributor: Dan McGee # Contributor: Dale Blount pkgname=pidgin-encryption pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD index 71aefc8b2..b524a966a 100644 --- a/community/pygoocanvas/PKGBUILD +++ b/community/pygoocanvas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99967 2013-10-31 02:44:37Z allan $ +# $Id: PKGBUILD 114940 2014-07-04 17:00:11Z jelle $ # Maintainer: Douglas Soares de Andrade # Contributor: William Rea pkgname=pygoocanvas pkgver=0.14.1 -pkgrel=5 +pkgrel=6 pkgdesc="GooCanvas python bindings" arch=('i686' 'x86_64') url="http://developer.berlios.de/projects/pygoocanvas" diff --git a/community/pymad/PKGBUILD b/community/pymad/PKGBUILD index ace77f357..c7ee32fb5 100644 --- a/community/pymad/PKGBUILD +++ b/community/pymad/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83176 2013-01-27 16:25:07Z pierre $ +# $Id: PKGBUILD 114816 2014-07-04 07:28:34Z fyan $ # Maintainer: Mark Rosenstand pkgname=pymad pkgver=0.6 -pkgrel=4 +pkgrel=5 pkgdesc="Python interface to libmad." arch=('i686' 'x86_64') url="http://www.spacepants.org/src/pymad/" diff --git a/community/pyogg/PKGBUILD b/community/pyogg/PKGBUILD index 50eebb60e..6dcc3073d 100644 --- a/community/pyogg/PKGBUILD +++ b/community/pyogg/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 64982 2012-02-19 11:17:06Z jelle $ +# $Id: PKGBUILD 114924 2014-07-04 16:19:26Z jelle $ # Maintainer: Eric Belanger # Contributor: Jason Chu pkgname=pyogg pkgver=1.3 -pkgrel=7 +pkgrel=8 pkgdesc="Python ogg wrapper library" arch=('i686' 'x86_64') url="http://ekyo.nerim.net/software/pyogg/index.html" -license=('LGPL2') +license=('GPL2') depends=('python2' 'libogg' 'glibc') source=(http://ekyo.nerim.net/software/pyogg/$pkgname-$pkgver.tar.gz) md5sums=('45a4ecc4d0600661199e4040a81ea3fe') @@ -16,10 +16,15 @@ sha1sums=('2811ad401e3b5fc5025958bddab3d7b8775e5acd') build() { cd $srcdir/$pkgname-$pkgver - python2 ./config_unix.py --prefix=$pkgdir/usr + python2 ./config_unix.py } package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --prefix=$pkgdir/usr } + +check(){ + cd $srcdir/$pkgname-$pkgver + python2 setup.py check +} diff --git a/community/python2-fuse/PKGBUILD b/community/python2-fuse/PKGBUILD index ef79aceef..891152fe1 100644 --- a/community/python2-fuse/PKGBUILD +++ b/community/python2-fuse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77237 2012-10-07 19:35:53Z dwallace $ +# $Id: PKGBUILD 114901 2014-07-04 15:35:31Z fyan $ # Maintainer: Daniel Wallace # Contributor: Chris Brannon # Contributor: Jaroslaw Swierczynski @@ -6,7 +6,7 @@ pkgname=python2-fuse pkgver=0.2.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="Python bindings for FUSE" url="http://fuse.sourceforge.net/wiki/index.php/FusePython" diff --git a/community/python2-pychm/PKGBUILD b/community/python2-pychm/PKGBUILD index 3b53d9005..6fd6853ab 100644 --- a/community/python2-pychm/PKGBUILD +++ b/community/python2-pychm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67234 2012-03-05 14:21:09Z arodseth $ +# $Id: PKGBUILD 114936 2014-07-04 16:45:31Z jelle $ # Maintainer: Alexander Rødseth # Contributor: Angel 'angvp' Velasquez # Contributor: Roman Kyrylych @@ -6,7 +6,7 @@ pkgname=python2-pychm pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for chmlib" arch=('x86_64' 'i686') url="http://gnochm.sourceforge.net/" diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD index 9c5ed703d..5e9443f91 100644 --- a/community/python2-pysqlite-legacy/PKGBUILD +++ b/community/python2-pysqlite-legacy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83742 2013-02-04 21:03:18Z arodseth $ +# $Id: PKGBUILD 114826 2014-07-04 08:10:29Z fyan $ # Maintainer: Alexander Rødseth # Contributor: Ronald van Haren # Contributor: Aaron Griffin pkgname=python2-pysqlite-legacy pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Python DB-API 2.0 interface for the legacy SQLite 2' arch=('x86_64' 'i686') url='http://initd.org/tracker/pysqlite' diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD index e1aa144d0..909278da3 100644 --- a/community/python2-pyxmpp/PKGBUILD +++ b/community/python2-pyxmpp/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python2-pyxmpp pkgver=1.1.2 -pkgrel=3 +pkgrel=4 pkgdesc='Python XMPP and Jabber implementation based on libxml2' arch=('x86_64' 'i686') url='http://pyxmpp.jajcus.net/' diff --git a/community/pyvorbis/PKGBUILD b/community/pyvorbis/PKGBUILD index 6e5de6442..ac9c5da5e 100644 --- a/community/pyvorbis/PKGBUILD +++ b/community/pyvorbis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64987 2012-02-19 11:27:59Z jelle $ +# $Id: PKGBUILD 114928 2014-07-04 16:23:05Z jelle $ # Contributor: Jason Chu # Maintainer: Daniel J Griffiths pkgname=pyvorbis pkgver=1.4 -pkgrel=6 +pkgrel=7 pkgdesc="Python vorbis wrapper library" url="http://ekyo.nerim.net/software/pyogg/index.html" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ md5sums=('b4921e792c0a74f75b9d3057df10ee7c' build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch || return 1 - patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch || return 1 + patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch + patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch python2 ./config_unix.py --prefix=/usr } diff --git a/community/regexxer/PKGBUILD b/community/regexxer/PKGBUILD index c570f654d..f16a5668f 100644 --- a/community/regexxer/PKGBUILD +++ b/community/regexxer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68556 2012-03-28 05:13:10Z bgyorgy $ +# $Id: PKGBUILD 114889 2014-07-04 15:22:36Z fyan $ # Maintainer: Balló György pkgname=regexxer pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Interactive search and replace tool for GNOME" arch=('i686' 'x86_64') url="http://regexxer.sourceforge.net/" @@ -16,11 +16,18 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver sha256sums=('2a7832541a0306b3d4eb63a1cf8978d7bbfc7927e9304473fe801d71fd99736c' '1addebc552e4374f3f9ee778fb734c08c1ed3a4b2b5e70905f7c9287c9b34882') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + + # Port to glib 2.32 patch -Np1 -i "$srcdir/regexxer-glib2.32.patch" + + # Don't try to compile GSettings schemas when packaging sed -i '/GLIB_COMPILE_SCHEMAS/ d' Makefile.in +} +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-schemas-compile make @@ -28,6 +35,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index 4dfed59fa..ecc24449a 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78443 2012-10-18 17:04:59Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 114838 2014-07-04 08:38:07Z fyan $ +# Contributor: Bartłomiej Piotrowski # Contributor: AndyRTR # Contributor: Ronald van Haren pkgname=ristretto pkgver=0.6.3 -pkgrel=3 +pkgrel=4 pkgdesc='A fast and lightweight picture-viewer for Xfce' arch=('i686' 'x86_64') url='http://goodies.xfce.org/projects/applications/ristretto' diff --git a/community/scrot/PKGBUILD b/community/scrot/PKGBUILD index 7282f7869..56cef3d8f 100644 --- a/community/scrot/PKGBUILD +++ b/community/scrot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81818 2012-12-31 15:37:13Z dwallace $ +# $Id: PKGBUILD 114905 2014-07-04 15:38:05Z fyan $ # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora pkgname=scrot pkgver=0.8 -pkgrel=6 +pkgrel=7 pkgdesc="A simple command-line screenshot utility for X" arch=('i686' 'x86_64') url="http://scrot.sourcearchive.com/" diff --git a/community/simplescreenrecorder/PKGBUILD b/community/simplescreenrecorder/PKGBUILD index 56cd0c2d3..9f3f41616 100644 --- a/community/simplescreenrecorder/PKGBUILD +++ b/community/simplescreenrecorder/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 106433 2014-03-03 02:44:00Z kkeen $ +# $Id: PKGBUILD 114886 2014-07-04 15:21:06Z kkeen $ # Maintainer: Kyle Keen # Contributor: Maarten Baert pkgname=simplescreenrecorder -pkgver=0.2.2 +pkgver=0.3.0 pkgrel=1 pkgdesc="A feature-rich screen recorder that supports X11 and OpenGL." arch=("i686" "x86_64") url="http://www.maartenbaert.be/simplescreenrecorder/" license=("GPL3") -depends=("qt4" "ffmpeg" "alsa-lib" "libpulse" "jack" "libgl" "glu" "libx11" "libxext" "libxfixes") +depends=("qt4" "ffmpeg" "alsa-lib" "libpulse" "jack" "libgl" "glu" "libx11" "libxext" "libxfixes" "libxi") optdepends=("lib32-simplescreenrecorder: OpenGL recording of 32-bit applications") makedepends=("git") source=("git+https://github.com/MaartenBaert/ssr.git#tag=$pkgver") @@ -25,5 +25,5 @@ build() { } package() { cd ssr - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 97563aa42..8e72464f4 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -12,7 +12,7 @@ pkgname=synergy pkgver=1.5.0 _pkgver=2278 -pkgrel=1 +pkgrel=2 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" arch=('i686' 'x86_64') @@ -21,12 +21,12 @@ makedepends=('libxt' 'cmake' 'qt5-base' 'unzip') optdepends=('qt5-base: gui support') license=('GPL2') source=("http://synergy-project.org/files/packages/synergy-${pkgver}-r${_pkgver}-Source.tar.gz" - "synergys.socket" - "synergys.service" + "synergys_at.socket" + "synergys_at.service" "unfuck-cryptopp-thanks-gentoo.patch") sha1sums=('808f1d793e5e977241bbef7e28fd02990adf8a47' - '947406e72351145c65ba9884ed175bf781482d46' - '00f2259c31c9551c0830d9e889fd0a0790cf9045' + '7ec33221725fc496b807e0f435c5e87b590beb5d' + '4bd12cd0674ef317af1f7df32d84e94582855140' '8e321e664ae4b7a763175524dd938a88d85c7909') build() { @@ -62,9 +62,8 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1" # install systemd service and socket - install -d "$pkgdir/usr/lib/systemd/system" - install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" - install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys@.service" + install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys@.socket" # install desktop/icon stuff cd ../res diff --git a/community/synergy/synergys.service b/community/synergy/synergys.service deleted file mode 100644 index 56c1ac061..000000000 --- a/community/synergy/synergys.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Synergy Server Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/synergys --config /etc/synergy.conf - -[Install] -WantedBy=multi-user.target diff --git a/community/synergy/synergys.socket b/community/synergy/synergys.socket deleted file mode 100644 index dda1537ca..000000000 --- a/community/synergy/synergys.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Conflicts=synergys.service - -[Socket] -ListenStream=24800 -Accept=false - -[Install] -WantedBy=sockets.target diff --git a/community/synergy/synergys_at.service b/community/synergy/synergys_at.service new file mode 100644 index 000000000..64cbb7bcf --- /dev/null +++ b/community/synergy/synergys_at.service @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +User=%i +ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/synergy/synergys_at.socket b/community/synergy/synergys_at.socket new file mode 100644 index 000000000..9ab4bca7d --- /dev/null +++ b/community/synergy/synergys_at.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys@.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target diff --git a/community/tuxpaint-config/PKGBUILD b/community/tuxpaint-config/PKGBUILD index 26c9ae9c8..b77cfee25 100644 --- a/community/tuxpaint-config/PKGBUILD +++ b/community/tuxpaint-config/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79472 2012-11-06 00:37:14Z arodseth $ +# $Id: PKGBUILD 114841 2014-07-04 08:41:49Z fyan $ # Maintainer: Alexander Rødseth # Contributor: royrocks pkgname=tuxpaint-config pkgver=0.0.12 -pkgrel=2 +pkgrel=3 pkgdesc='Tux Paint configuration tool' arch=('x86_64' 'i686') url='http://www.tuxpaint.org' diff --git a/community/ucl/PKGBUILD b/community/ucl/PKGBUILD index 885c5b2fc..1d76cbe20 100644 --- a/community/ucl/PKGBUILD +++ b/community/ucl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100007 2013-10-31 02:58:06Z allan $ +# $Id: PKGBUILD 114847 2014-07-04 09:01:31Z fyan $ # Maintainer: Sergej Pupykin # Contributor: Geoffroy Carrier # Previous Contributor: arjan @@ -6,7 +6,7 @@ pkgname=ucl pkgver=1.03 -pkgrel=5 +pkgrel=6 pkgdesc="Portable lossless data compression library written in ANSI C" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/vmpk/PKGBUILD b/community/vmpk/PKGBUILD index 5ce3556ad..5737bafe0 100644 --- a/community/vmpk/PKGBUILD +++ b/community/vmpk/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 114946 2014-07-04 18:27:42Z speps $ # Maintainer : speps pkgname=vmpk pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Virtual MIDI Piano Keyboard" arch=('i686' 'x86_64') url="http://vmpk.sourceforge.net/" @@ -13,16 +14,19 @@ install="$pkgname.install" source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2") md5sums=('07e376936c38c7c244374ff9ddca6a72') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd $pkgname-$pkgver + [ -d b ] || mkdir b +} - [ -d bld ] || mkdir bld && cd bld +build() { + cd $pkgname-$pkgver/b cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=release make } package() { - cd "$srcdir/$pkgname-$pkgver/bld" + cd $pkgname-$pkgver/b make DESTDIR="$pkgdir/" install } diff --git a/community/vmpk/vmpk.install b/community/vmpk/vmpk.install index 293ff852a..8c0bcc270 100644 --- a/community/vmpk/vmpk.install +++ b/community/vmpk/vmpk.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null update-desktop-database -q } diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD index f52222c64..027a68214 100644 --- a/community/volumeicon/PKGBUILD +++ b/community/volumeicon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 113124 2014-06-13 21:48:36Z arodseth $ +# $Id: PKGBUILD 114769 2014-07-03 23:43:00Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Maato @@ -8,14 +8,14 @@ pkgname=volumeicon pkgver=0.5.0 -pkgrel=3 +pkgrel=4 pkgdesc='Volume control for your system tray' arch=('x86_64' 'i686') url='http://softwarebakery.com/maato/volumeicon.html' license=('GPL3') depends=('gtk3' 'alsa-lib' 'libnotify') makedepends=('intltool' 'git') -source=('git://github.com/Maato/volumeicon.git#commit=9e3755fdbe') +source=('git://github.com/stevenhoneyman/volumeicon.git#commit=72322940a5') md5sums=('SKIP') pkgver() { @@ -27,9 +27,6 @@ pkgver() { prepare() { cd "$pkgname" - #aclocal - #autoconf - #automake --add-missing ./autogen.sh } diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 7ce009aa9..92c7ccdc9 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 110642 2014-05-04 13:55:20Z td123 $ +# $Id: PKGBUILD 114922 2014-07-04 16:08:23Z jelle $ # Maintainer: Sergej Pupykin # Contributor: Arch Haskell Team pkgname=xmobar -pkgver=0.20.1 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.8.2-2' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' +makedepends=('ghc=7.8.2-4' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-stm=2.4.3' 'haskell-parsec=3.1.5' 'haskell-mtl=2.1.3.1' 'haskell-regex-base' 'haskell-regex-compat haskell-http') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) -md5sums=('cee66bfa9aa36d25329ffd5ac044aeaf') +md5sums=('8d4442d3772ad9f475d96b955fda220d') build() { cd ${srcdir}/xmobar-$pkgver diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index c00d3193b..a1b0a71c0 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215145 2014-06-14 19:16:51Z andyrtr $ +# $Id: PKGBUILD 216503 2014-07-04 18:26:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Ronald van Haren @@ -18,8 +18,8 @@ pkgname=('calligra-braindump' 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.8.3 -pkgrel=3 +pkgver=2.8.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -31,7 +31,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 0001-switch-to-librevenge-based-import-libs.patch) -md5sums=('78ad97127a3cc6d2c5c79ac6ae56f130' +md5sums=('8538e740b69dbf6b574312200cac969a' '2589200d3f2199a8bff5755ff3245e33') prepare() { diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index c6941582d..0ae57885c 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 213665 2014-05-27 21:44:20Z jgc $ +# $Id: PKGBUILD 216497 2014-07-04 17:10:14Z heftig $ # Maintainer: Ionut Biru pkgname=cogl -pkgver=1.18.0 -pkgrel=2 +pkgver=1.18.2 +pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -11,14 +11,11 @@ license=('GPL2') depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr') makedepends=('gobject-introspection') options=(!emptydirs) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - git-fixes.patch) -sha256sums=('a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e' - '40f8cd44858e8e604248c1a1c86b1f499ba15562102bf5974401369961d82849') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/cogl/git-fixes.patch b/extra/cogl/git-fixes.patch deleted file mode 100644 index bb0178fbb..000000000 --- a/extra/cogl/git-fixes.patch +++ /dev/null @@ -1,1242 +0,0 @@ -diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt -index 72e25b0..13303df 100644 ---- a/build/win32/vs10/README.txt -+++ b/build/win32/vs10/README.txt -@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: - - https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - --Please do not attempt to compile COGL in a path that contains spaces -+Please do not attempt to compile Cogl in a path that contains spaces - to avoid potential problems during compilation, linking or usage. - - This VS10 solution and the projects it includes are intented to be used -@@ -18,7 +18,10 @@ You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib. - External dependencies are at least zlib, libpng, - gettext-runtime* and Cairo*, and glext.h from - http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder --in your include directories or in \vs10\\include\GL). -+in your include directories or in \vs10\\include\GL). Please -+note that although the Cogl source package does allow one to build Cogl without -+a previously built and installed GLib, the Visual Studio projects only support -+builds that does depend on GLib. - - Please see the README file in the root directory of this Cogl source package - for the versions of the dependencies required. See also -@@ -27,11 +30,16 @@ where to unpack them. It is recommended that at least the dependencies - from GNOME are also built with VS10 to avoid crashes caused by mixing different - CRTs-please see also the build/win32/vs10/README.txt in those respective packages. - --If building the SDL winsys is desired, you will also need the SDL libraries --from www.libsdl.org-building the SDL source package with Visual C++ 2010 --is recommended (working Visual C++ 2005 projects are included with it, upgrade --the projects one prompted), but one may want to use the VC8 binary packages --from that website. -+If building the SDL2 winsys is desired (the *_SDL configs), you will also need the -+SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2010 -+is recommended via CMake, but one may want to use the Visual C++ binary packages -+from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated -+to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys -+as SDL-2.x has been released for some time. Please note, as builds with the SDL2 -+winsys includes the SDL2 headers, main() will be defined to SDL2's special main() -+implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib -+for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your -+"preprocessor definitions" options. - - The recommended build sequence of the dependencies are as follows (the non-GNOME - packages that are not downloaded as binaries from ftp://ftp.gnome.org have -@@ -46,9 +54,10 @@ in the next unstable release): - -libpng - -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is - recommended-please see build/win32/vs10/README.txt in the GLib source package) ---(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG -+-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo - -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] ---(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff -+-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo) -+ libtiff - -GLib - -Cairo - -Pango -diff --git a/build/win32/vs10/cogl-build-defines.props b/build/win32/vs10/cogl-build-defines.props -index 27b2e4c..eefe1a6 100644 ---- a/build/win32/vs10/cogl-build-defines.props -+++ b/build/win32/vs10/cogl-build-defines.props -@@ -11,6 +11,7 @@ - G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" - G_LOG_DOMAIN="CoglPath" - G_LOG_DOMAIN="Cogl-Pango" -+ SDL_MAIN_HANDLED - - - <_PropertySheetDisplayName>coglbuilddefinesprops -@@ -51,5 +52,8 @@ - - $(CoglPangoBuildDefines) - -+ -+ $(CoglAppAvoidForcedSDLLinkingDefines) -+ - - -diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj -index a64e669..d99a487 100644 ---- a/build/win32/vs10/cogl-crate.vcxproj -+++ b/build/win32/vs10/cogl-crate.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -94,7 +94,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -118,7 +118,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -137,7 +137,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/cogl-gen-srcs.props b/build/win32/vs10/cogl-gen-srcs.props -index b68b92c..0ec0e63 100644 ---- a/build/win32/vs10/cogl-gen-srcs.props -+++ b/build/win32/vs10/cogl-gen-srcs.props -@@ -48,15 +48,15 @@ cd $(SolutionDir) - - - echo EXPORTS > $(DefDir)\cogl.def --cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def - - - echo EXPORTS > $(DefDir)\cogl.def --cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def - - - echo EXPORTS > $(DefDir)\cogl-path.def --cl -EP ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def -+cl -EP -DCOGL_HAS_GTYPE_SUPPORT ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def - - - echo EXPORTS > $(DefDir)\cogl-pango.def -diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj -index 4b6c732..a754c0d 100644 ---- a/build/win32/vs10/cogl-hello.vcxproj -+++ b/build/win32/vs10/cogl-hello.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - -@@ -110,7 +110,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -130,7 +130,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj -index 17b3ba8..45f75ff 100644 ---- a/build/win32/vs10/cogl-info.vcxproj -+++ b/build/win32/vs10/cogl-info.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -116,7 +116,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -134,7 +134,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj -index 4518872..28de260 100644 ---- a/build/win32/vs10/cogl-msaa.vcxproj -+++ b/build/win32/vs10/cogl-msaa.vcxproj -@@ -75,7 +75,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -93,7 +93,7 @@ - - - Disabled -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -116,7 +116,7 @@ - - MaxSpeed - true -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -134,7 +134,7 @@ - - - -- COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin -index 753a188..a4aded6 100644 ---- a/build/win32/vs10/test-conformance-cogl.vcxprojin -+++ b/build/win32/vs10/test-conformance-cogl.vcxprojin -@@ -76,7 +76,7 @@ - - Disabled - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -96,7 +96,7 @@ - - Disabled - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -121,7 +121,7 @@ - MaxSpeed - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) - true -- COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -141,7 +141,7 @@ - - - ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) -- COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) -+ COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - -diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt -index cd1695d..f277f97 100644 ---- a/build/win32/vs9/README.txt -+++ b/build/win32/vs9/README.txt -@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: - - https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - --Please do not attempt to compile COGL in a path that contains spaces -+Please do not attempt to compile Cogl in a path that contains spaces - to avoid potential problems during compilation, linking or usage. - - This VS9 solution and the projects it includes are intented to be used -@@ -14,31 +14,33 @@ first need to use some Unix-like environment or manual work to expand - the files needed, like config.h.win32.in into config.h.win32 and the - .vcprojin files here into corresponding actual .vcproj files. - --Decide whether you want to build the SDL winsys with your COGL build, and --use one of the .sln for building COGL (note that both will build the Windows --OpenGL (WGL) winsys): ---cogl.sln for building COGL without the SDL winsys ---cogl_sdl.sln for building COGL with the SDL winsys -- - You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib. - External dependencies are at least zlib, libpng, - gettext-runtime* and Cairo*, and glext.h from - http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder --in your include directories or in \vs9\\include\GL). -+in your include directories or in \vs9\\include\GL). Please -+note that although the Cogl source package does allow one to build Cogl without -+a previously built and installed GLib, the Visual Studio projects only support -+builds that does depend on GLib. - --As Cogl 1.99.x and later will now use C99 types in lieu of GLib types, a --compatible implementation of stdint.h for Visual C++ is required, such --as the one from http://code.google.com/p/msinttypes/, so one would need --to download and extract the .zip file from that website and extract stdint.h --into \vs9\\include or somewhere where it can be -+As Cogl use C99 types in lieu of GLib types, a compatible implementation of -+stdint.h for Visual C++ is required, such as the one from -+http://code.google.com/p/msinttypes/, so one would need to download and extract -+the .zip file from that website and extract stdint.h into -+\vs9\\include or somewhere where it can be found - automatically found by the compiler. Note that Visual C++ 2010 and later - ships with stdint.h, so it is only required for Visual C++ 2008 builds. - --If building the SDL winsys is desired, you will also need the SDL libraries --from www.libsdl.org-building the SDL source package with Visual C++ 2008 --is recommended (working Visual C++ 2005 projects are included with it, upgrade --the projects one prompted), but one may want to use the VC8 binary packages --from that website. -+If building the SDL2 winsys is desired (the *_SDL configs), you will also need the -+SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2008 -+is recommended via CMake, but one may want to use the Visual C++ binary packages -+from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated -+to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys -+as SDL-2.x has been released for some time. Please note, as builds with the SDL2 -+winsys includes the SDL2 headers, main() will be defined to SDL2's special main() -+implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib -+for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your -+"preprocessor definitions" options. - - Please see the README file in the root directory of this Cogl source package - for the versions of the dependencies required. See also -@@ -60,9 +62,10 @@ in the next unstable release): - -libpng - -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is - recommended-please see build/win32/vs9/README.txt in the GLib source package) ---(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG -+-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo - -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library] ---(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff -+-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo) -+ libtiff - -GLib - -Cairo - -Pango -@@ -75,15 +78,13 @@ built DLLs go into \vs9\\bin, built LIBs into - \vs9\\include\Cogl-2.0. - - *There is no known official VS9 build support for fontconfig -- (required for Pango and Pango at the moment-I will see whether this -- requirement can be made optional for VS builds) - (along with freetype and expat) and gettext-runtime, so - please use the binaries from: - - ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) - ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) - --Note: If you see C4819 warnings and you are compiling Cogl on a DBCS -+Note: If you see C4819 errors and you are compiling Cogl on a DBCS - (Chinese/Korean/Japanese) version of Windows, you may need to switch - to an English locale in Control Panel->Region and Languages->System-> - Change System Locale, reboot and rebuild to ensure Cogl and its -diff --git a/build/win32/vs9/cogl-build-defines.vsprops b/build/win32/vs9/cogl-build-defines.vsprops -index fc68d47..5fc6282 100644 ---- a/build/win32/vs9/cogl-build-defines.vsprops -+++ b/build/win32/vs9/cogl-build-defines.vsprops -@@ -46,4 +46,8 @@ - Name="CoglPangoBuildDefines" - Value="G_LOG_DOMAIN=\"Cogl-Pango\"" - /> -+ - -diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj -index 0fa2382..359289c 100644 ---- a/build/win32/vs9/cogl-crate.vcproj -+++ b/build/win32/vs9/cogl-crate.vcproj -@@ -31,7 +31,7 @@ - - - - - - - - atlases; l; l = l->next) -- /* Try to make some space in the atlas for the texture */ -- if (_cogl_atlas_reserve_space (atlas = l->data, -- /* Add two pixels for the border */ -- width + 2, height + 2, -- atlas_tex)) -- { -- cogl_object_ref (atlas); -- break; -- } -+ { -+ /* We need to take a reference on the atlas before trying to -+ * reserve space because in some circumstances atlas migration -+ * can cause the atlas to be freed */ -+ atlas = cogl_object_ref (l->data); -+ /* Try to make some space in the atlas for the texture */ -+ if (_cogl_atlas_reserve_space (atlas, -+ /* Add two pixels for the border */ -+ width + 2, height + 2, -+ atlas_tex)) -+ { -+ /* keep the atlas reference */ -+ break; -+ } -+ else -+ { -+ cogl_object_unref (atlas); -+ } -+ } - - /* If we couldn't find a suitable atlas then start another */ - if (l == NULL) -diff --git a/cogl/cogl-gtype-private.h b/cogl/cogl-gtype-private.h -index 03832ef..8498385 100644 ---- a/cogl/cogl-gtype-private.h -+++ b/cogl/cogl-gtype-private.h -@@ -133,9 +133,9 @@ cogl_##name##_get_gtype (void) \ - return type_id__volatile; \ - } - --#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,interfaces...) \ -- _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ -- {interfaces;} \ -+#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,...) \ -+ _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ -+ {__VA_ARGS__;} \ - _COGL_GTYPE_DEFINE_BASE_CLASS_END() - - #define _COGL_GTYPE_DEFINE_INTERFACE_EXTENDED_BEGIN(Name,name) \ -@@ -230,7 +230,7 @@ cogl_##name##_get_gtype (void) \ - } /* closes name##_get_type() */ - - --#define COGL_GTYPE_DEFINE_CLASS(Name,name,interfaces...) \ -+#define COGL_GTYPE_DEFINE_CLASS(Name,name,...) \ - typedef struct _Cogl##Name##Class Cogl##Name##Class; \ - struct _Cogl##Name##Class { \ - CoglObjectClass parent_class; \ -@@ -239,7 +239,7 @@ cogl_##name##_get_gtype (void) \ - cogl_##name, \ - cogl_object_get_gtype(), \ - 0) \ -- {interfaces;} \ -+ {__VA_ARGS__;} \ - _COGL_GTYPE_DEFINE_TYPE_EXTENDED_END() \ - static void \ - cogl_##name##_init (Cogl##Name *instance) \ -diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h -index 220e004..44d308d 100644 ---- a/cogl/cogl-sdl.h -+++ b/cogl/cogl-sdl.h -@@ -52,15 +52,6 @@ - #include - #include - --#ifdef _MSC_VER --/* We need to link to SDL.lib/SDLmain.lib -- * if we are using Cogl -- * that uses the SDL winsys -- */ --#pragma comment (lib, "SDL.lib") --#pragma comment (lib, "SDLmain.lib") --#endif -- - COGL_BEGIN_DECLS - - /** -diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols -index d1eb319..c48314a 100644 ---- a/cogl/cogl.symbols -+++ b/cogl/cogl.symbols -@@ -4,14 +4,25 @@ - cogl_android_set_native_window - #endif - --/* cogl-atlas-texture.h */ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_atlas_texture_get_gtype -+#endif - cogl_atlas_texture_new_with_size - cogl_atlas_texture_new_from_file - cogl_atlas_texture_new_from_data - cogl_atlas_texture_new_from_bitmap - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_attribute_buffer_get_gtype -+#endif - cogl_attribute_buffer_new_with_size - -+cogl_attribute_buffer_new -+cogl_attribute_get_buffer -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_attribute_get_gtype -+#endif -+cogl_attribute_get_normalized - cogl_attribute_new - cogl_attribute_new_const_1f - cogl_attribute_new_const_2f -@@ -23,9 +34,6 @@ cogl_attribute_new_const_3x3fv - cogl_attribute_new_const_4f - cogl_attribute_new_const_4fv - cogl_attribute_new_const_4x4fv --cogl_attribute_buffer_new --cogl_attribute_get_buffer --cogl_attribute_get_normalized - cogl_attribute_set_buffer - cogl_attribute_set_normalized - cogl_attribute_type_get_type -@@ -35,6 +43,9 @@ cogl_begin_gl - cogl_bitmap_error_get_type - cogl_bitmap_get_buffer - cogl_bitmap_get_format -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_bitmap_get_gtype -+#endif - cogl_bitmap_get_height - cogl_bitmap_get_rowstride - cogl_bitmap_get_size_from_file -@@ -111,6 +122,9 @@ cogl_color_get_blue_float - cogl_color_get_green - cogl_color_get_green_byte - cogl_color_get_green_float -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_color_get_gtype -+#endif - cogl_color_get_red - cogl_color_get_red_byte - cogl_color_get_red_float -@@ -149,6 +163,9 @@ cogl_glx_context_get_glx_context - #endif - - cogl_context_get_display -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_context_get_gtype -+#endif - cogl_context_get_renderer - cogl_context_new - -@@ -172,6 +189,9 @@ cogl_depth_test_function_get_type - - cogl_disable_fog - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_display_get_gtype -+#endif - cogl_display_get_renderer - cogl_display_new - cogl_display_setup -@@ -188,6 +208,9 @@ cogl_error_matches - cogl_euler_copy - cogl_euler_equal - cogl_euler_free -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_euler_get_gtype -+#endif - cogl_euler_init - cogl_euler_init_from_matrix - #if 0 -@@ -239,6 +262,9 @@ cogl_framebuffer_get_depth_texture_enabled - cogl_framebuffer_get_depth_write_enabled - cogl_framebuffer_get_dither_enabled - cogl_framebuffer_get_green_bits -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_framebuffer_get_gtype -+#endif - cogl_framebuffer_get_height - cogl_framebuffer_get_modelview_matrix - cogl_framebuffer_get_projection_matrix -@@ -284,7 +310,14 @@ cogl_framebuffer_translate - cogl_framebuffer_vdraw_attributes - /* cogl_framebuffer_vdraw_indexed_attributes */ /* Not Implemented! */ - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_frame_closure_get_gtype -+#endif - cogl_frame_info_get_frame_counter -+ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_frame_info_get_gtype -+#endif - cogl_frame_info_get_output - cogl_frame_info_get_presentation_time - cogl_frame_info_get_refresh_rate -@@ -311,6 +344,9 @@ cogl_get_static_identity_quaternion - cogl_get_static_zero_quaternion - cogl_get_viewport - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_gles2_context_get_gtype -+#endif - cogl_gles2_context_get_vtable - cogl_gles2_context_new - cogl_gles2_get_current_vtable -@@ -322,8 +358,8 @@ cogl_glib_renderer_source_new - cogl_glib_source_new - #endif - --#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION --/* cogl_gtype_matrix_get_type */ /* Not Implemented */ -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_gtype_matrix_get_type - #endif - - cogl_handle_get_type -@@ -333,8 +369,14 @@ cogl_handle_unref - cogl_has_feature - cogl_has_features - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_index_buffer_get_gtype -+#endif - cogl_index_buffer_new - cogl_indices_get_buffer -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_indices_get_gtype -+#endif - cogl_indices_get_offset - cogl_indices_get_type - cogl_indices_new -@@ -448,6 +490,9 @@ cogl_matrix_copy - cogl_matrix_entry_calculate_translation - cogl_matrix_entry_equal - cogl_matrix_entry_get -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_entry_get_gtype -+#endif - cogl_matrix_entry_is_identity - cogl_matrix_entry_ref - cogl_matrix_entry_unref -@@ -455,6 +500,9 @@ cogl_matrix_equal - cogl_matrix_free - cogl_matrix_frustum - cogl_matrix_get_array -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_get_gtype -+#endif - cogl_matrix_get_inverse - cogl_matrix_init_from_array - cogl_matrix_init_translation -@@ -481,6 +529,9 @@ cogl_matrix_scale - cogl_matrix_stack_frustum - cogl_matrix_stack_get - cogl_matrix_stack_get_entry -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_matrix_stack_get_gtype -+#endif - cogl_matrix_stack_get_inverse - cogl_matrix_stack_load_identity - cogl_matrix_stack_multiply -@@ -504,11 +555,17 @@ cogl_matrix_view_2d_in_perspective - - cogl_meta_texture_foreach_in_region - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_object_get_gtype -+#endif - cogl_object_get_user_data - cogl_object_ref - cogl_object_set_user_data - cogl_object_unref - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_offscreen_get_gtype -+#endif - cogl_offscreen_new_to_texture - cogl_offscreen_new_with_texture - -@@ -519,8 +576,14 @@ cogl_onscreen_add_swap_buffers_callback - #ifndef COGL_WINSYS_INTEGRATED - cogl_onscreen_clutter_backend_set_size_CLUTTER - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_dirty_closure_get_gtype -+#endif - cogl_onscreen_get_buffer_age - cogl_onscreen_get_frame_counter -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_get_gtype -+#endif - cogl_onscreen_get_resizable - cogl_onscreen_hide - cogl_onscreen_new -@@ -529,18 +592,27 @@ cogl_onscreen_remove_dirty_callback - cogl_onscreen_remove_frame_callback - cogl_onscreen_remove_resize_callback - cogl_onscreen_remove_swap_buffers_callback -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_resize_closure_get_gtype -+#endif - cogl_onscreen_set_resizable - cogl_onscreen_set_swap_throttled - cogl_onscreen_show - cogl_onscreen_swap_buffers - cogl_onscreen_swap_buffers_with_damage - cogl_onscreen_swap_region -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_onscreen_template_get_gtype -+#endif - cogl_onscreen_template_new - cogl_onscreen_template_set_samples_per_pixel - cogl_onscreen_template_set_swap_throttled - - cogl_ortho - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_output_get_gtype -+#endif - cogl_output_get_height - cogl_output_get_mm_height - cogl_output_get_mm_width -@@ -566,6 +638,9 @@ cogl_pipeline_get_depth_state - cogl_pipeline_get_diffuse - cogl_pipeline_get_emission - cogl_pipeline_get_front_face_winding -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_pipeline_get_gtype -+#endif - cogl_pipeline_get_layer_mag_filter - cogl_pipeline_get_layer_min_filter - cogl_pipeline_get_layer_point_sprite_coords_enabled -@@ -618,6 +693,9 @@ cogl_pipeline_set_uniform_1f - cogl_pipeline_set_uniform_1i - cogl_pipeline_set_user_program - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_pixel_buffer_get_gtype -+#endif - cogl_pixel_buffer_new - #if 0 - /* not exported in the main APIs for now */ -@@ -641,6 +719,9 @@ cogl_pop_source - cogl_primitive_copy - cogl_primitive_foreach_attribute - cogl_primitive_get_first_vertex -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_primitive_get_gtype -+#endif - cogl_primitive_get_indices - cogl_primitive_get_mode - cogl_primitive_get_n_vertices -@@ -701,6 +782,9 @@ cogl_quaternion_copy - cogl_quaternion_dot_product - cogl_quaternion_equal - cogl_quaternion_free -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_quaternion_get_gtype -+#endif - cogl_quaternion_get_rotation_angle - cogl_quaternion_get_rotation_axis - cogl_quaternion_init -@@ -733,6 +817,9 @@ cogl_renderer_check_onscreen_template - cogl_renderer_connect - cogl_renderer_foreach_output - cogl_renderer_get_driver -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_renderer_get_gtype -+#endif - cogl_renderer_get_n_fragment_texture_units - cogl_renderer_error_get_type - cogl_renderer_get_winsys_id -@@ -793,6 +880,9 @@ cogl_snippet_get_hook - cogl_snippet_get_post - cogl_snippet_get_pre - cogl_snippet_get_replace -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_snippet_get_gtype -+#endif - cogl_snippet_new - cogl_snippet_set_declarations - cogl_snippet_set_post -@@ -801,9 +891,15 @@ cogl_snippet_set_replace - - cogl_sqrti - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_sub_texture_get_gtype -+#endif - cogl_sub_texture_get_parent - cogl_sub_texture_new - -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_swap_chain_get_gtype -+#endif - cogl_swap_chain_new - cogl_swap_chain_set_has_alpha - cogl_swap_chain_set_length -@@ -811,12 +907,16 @@ cogl_swap_chain_set_length - cogl_system_error_get_type - - cogl_texture_allocate -+cogl_texture_components_get_type - cogl_texture_error_get_type - cogl_texture_flags_get_type - cogl_texture_get_components - cogl_texture_get_data - cogl_texture_get_format - cogl_texture_get_gl_texture -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_get_gtype -+#endif - cogl_texture_get_height - cogl_texture_get_max_waste - cogl_texture_get_premultiplied -@@ -831,11 +931,17 @@ cogl_texture_new_from_sub_texture - cogl_texture_new_with_size - #ifdef COGL_HAS_X11 - cogl_texture_pixmap_x11_error_domain -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_pixmap_x11_get_gtype -+#endif - cogl_texture_pixmap_x11_is_using_tfp_extension - cogl_texture_pixmap_x11_new - cogl_texture_pixmap_x11_set_damage_object - cogl_texture_pixmap_x11_update_area - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_rectangle_get_gtype -+#endif - cogl_texture_rectangle_new_from_bitmap - cogl_texture_rectangle_new_from_foreign - cogl_texture_rectangle_new_with_size -@@ -851,14 +957,23 @@ cogl_texture_type_get_type - #ifndef COGL_DISABLE_DEPRECATED - cogl_texture_unref - #endif -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_2d_get_gtype -+#endif - cogl_texture_2d_new_from_bitmap - cogl_texture_2d_new_from_data - cogl_texture_2d_new_from_file - cogl_texture_2d_new_with_size -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_2d_sliced_get_gtype -+#endif - cogl_texture_2d_sliced_new_from_bitmap - cogl_texture_2d_sliced_new_from_data - cogl_texture_2d_sliced_new_from_file - cogl_texture_2d_sliced_new_with_size -+#ifdef COGL_HAS_GTYPE_SUPPORT -+cogl_texture_3d_get_gtype -+#endif - cogl_texture_3d_new_from_bitmap - cogl_texture_3d_new_from_data - cogl_texture_3d_new_with_size -diff --git a/cogl/deprecated/cogl-framebuffer-deprecated.h b/cogl/deprecated/cogl-framebuffer-deprecated.h -index 2ac29b1..68ed9d3 100644 ---- a/cogl/deprecated/cogl-framebuffer-deprecated.h -+++ b/cogl/deprecated/cogl-framebuffer-deprecated.h -@@ -33,6 +33,8 @@ - - #include - -+COGL_BEGIN_DECLS -+ - /** - * cogl_set_framebuffer: - * @buffer: A #CoglFramebuffer object, either onscreen or offscreen. -@@ -257,4 +259,6 @@ COGL_DEPRECATED_IN_1_18 - CoglPixelFormat - cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer); - -+COGL_END_DECLS -+ - #endif /* __COGL_FRAMEBUFFER_DEPRECATED_H__ */ -diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c -index 8c4176e..ec54095 100644 ---- a/cogl/winsys/cogl-winsys-egl-kms.c -+++ b/cogl/winsys/cogl-winsys-egl-kms.c -@@ -196,6 +196,31 @@ free_current_bo (CoglOnscreen *onscreen) - } - - static void -+queue_swap_notify_for_onscreen (CoglOnscreen *onscreen) -+{ -+ CoglOnscreenEGL *egl_onscreen = onscreen->winsys; -+ CoglOnscreenKMS *kms_onscreen = egl_onscreen->platform; -+ CoglContext *context = COGL_FRAMEBUFFER (onscreen)->context; -+ CoglRenderer *renderer = context->display->renderer; -+ CoglRendererEGL *egl_renderer = renderer->winsys; -+ CoglRendererKMS *kms_renderer = egl_renderer->platform; -+ -+ /* We only want to notify that the swap is complete when the -+ * application calls cogl_context_dispatch so instead of -+ * immediately notifying we queue an idle callback */ -+ if (!kms_renderer->swap_notify_idle) -+ { -+ kms_renderer->swap_notify_idle = -+ _cogl_poll_renderer_add_idle (renderer, -+ flush_pending_swap_notify_idle, -+ context, -+ NULL); -+ } -+ -+ kms_onscreen->pending_swap_notify = TRUE; -+} -+ -+static void - page_flip_handler (int fd, - unsigned int frame, - unsigned int sec, -@@ -217,19 +242,7 @@ page_flip_handler (int fd, - CoglRendererEGL *egl_renderer = renderer->winsys; - CoglRendererKMS *kms_renderer = egl_renderer->platform; - -- /* We only want to notify that the swap is complete when the -- * application calls cogl_context_dispatch so instead of -- * immediately notifying we queue an idle callback */ -- if (!kms_renderer->swap_notify_idle) -- { -- kms_renderer->swap_notify_idle = -- _cogl_poll_renderer_add_idle (renderer, -- flush_pending_swap_notify_idle, -- context, -- NULL); -- } -- -- kms_onscreen->pending_swap_notify = TRUE; -+ queue_swap_notify_for_onscreen (onscreen); - - free_current_bo (onscreen); - -@@ -283,12 +296,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, - egl_renderer->platform = g_slice_new0 (CoglRendererKMS); - kms_renderer = egl_renderer->platform; - -- /* The EGL API doesn't provide for a way to explicitly select a -- * platform when the driver can support multiple. Mesa allows -- * selection using an environment variable though so that's what -- * we're doing here... */ -- g_setenv ("EGL_PLATFORM", "drm", 1); -- - kms_renderer->fd = -1; - kms_renderer->opened_fd = -1; - -@@ -909,6 +916,8 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen, - kms_onscreen->next_fb_id = 0; - g_slice_free (CoglFlipKMS, flip); - flip = NULL; -+ -+ queue_swap_notify_for_onscreen (onscreen); - } - else - { -diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c -index c631080..2b359cb 100644 ---- a/cogl/winsys/cogl-winsys-egl-wayland.c -+++ b/cogl/winsys/cogl-winsys-egl-wayland.c -@@ -242,12 +242,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, - - egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable; - -- /* The EGL API doesn't provide for a way to explicitly select a -- * platform when the driver can support multiple. Mesa allows -- * selection using an environment variable though so that's what -- * we're doing here... */ -- g_setenv ("EGL_PLATFORM", "wayland", 1); -- - if (renderer->foreign_wayland_display) - { - wayland_renderer->wayland_display = renderer->foreign_wayland_display; diff --git a/extra/ctags/PKGBUILD b/extra/ctags/PKGBUILD index 4b8996c57..d9e613df7 100644 --- a/extra/ctags/PKGBUILD +++ b/extra/ctags/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143723 2011-11-28 17:13:34Z giovanni $ +# $Id: PKGBUILD 216454 2014-07-04 04:05:31Z fyan $ # Maintainer: Giovanni Scafora # Contributor: John Proctor pkgname=ctags pkgver=5.8 -pkgrel=3 +pkgrel=4 pkgdesc="Generates an index file of language objects found in source files" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index 439163598..351ffcdde 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166337 2012-09-06 15:49:53Z giovanni $ +# $Id: PKGBUILD 216456 2014-07-04 04:07:16Z fyan $ # Maintainer: Giovanni Scafora pkgname=ebook-tools pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for accessing and converting various ebook file formats" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/ebook-tools/" diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index 8f6f601c0..05b316fee 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168298 2012-10-08 05:04:03Z eric $ +# $Id: PKGBUILD 216451 2014-07-04 01:18:59Z eric $ # Maintainer: Eric Bélanger pkgname=kdiff3 pkgver=0.9.97 -pkgrel=2 +pkgrel=3 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64') url="http://kdiff3.sourceforge.net/" @@ -17,16 +17,19 @@ source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver} sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547' 'b5359dcec2ebb8221a232ecc2ea9982b290172e5') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p2 -i "${srcdir}/kdiff3-relative-path.patch" mkdir release - cd release +} + +build() { + cd ${pkgname}-${pkgver}/release cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}/release" + cd ${pkgname}-${pkgver}/release make DESTDIR="${pkgdir}" install } diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD index 4885aaa34..09d5a854d 100644 --- a/extra/ladspa/PKGBUILD +++ b/extra/ladspa/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167138 2012-09-26 05:02:07Z foutrelis $ +# $Id: PKGBUILD 216472 2014-07-04 04:23:46Z fyan $ # Maintainer: damir pkgname=ladspa pkgver=1.13 -pkgrel=4 +pkgrel=5 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/libndp/PKGBUILD b/extra/libndp/PKGBUILD new file mode 100644 index 000000000..c446261bf --- /dev/null +++ b/extra/libndp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 216514 2014-07-04 20:47:43Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libndp +pkgver=1.3 +pkgrel=1 +pkgdesc="Library for Neighbor Discovery Protocol" +arch=(i686 x86_64) +url="http://libndp.org/" +license=(LGPL2.1) +depends=(glibc) +source=($url/files/$pkgname-$pkgver.tar.gz) +sha256sums=('58a013427debfc554f1ff6555bccfd3ba910d50effc8231cfcad79f0f19c3f9e') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --libexecdir=/usr/lib + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD index ebd5b5f84..1e976d823 100644 --- a/extra/libqmi/PKGBUILD +++ b/extra/libqmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 202885 2013-12-28 22:44:05Z bpiotrowski $ +# $Id: PKGBUILD 216513 2014-07-04 20:47:05Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libqmi -pkgver=1.8.0 +pkgver=1.10.0 pkgrel=1 pkgdesc="QMI modem protocol helper library" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=(GPL2) depends=(glib2 bash) makedepends=(gtk-doc python) source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d') +sha256sums=('ea1a2389a7c790b54ed21a349d443d2e99ac02b8a05e20a41636e833f2bc805d') build() { cd $pkgname-$pkgver diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 49bc8a696..067c436ef 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 215297 2014-06-18 17:56:43Z bpiotrowski $ +# $Id: PKGBUILD 216449 2014-07-04 00:12:07Z bpiotrowski $ # Maintainer: AndyRTR # Maintainer: Bartłomiej Piotrowski pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=4.3.0.1 +_LOver=4.3.0.2 pkgver=4.3.0 -pkgrel=0.9 +pkgrel=0.10 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -61,7 +61,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/libe-book-0.1.1.tar.bz2 ${_additional_source_url}/libabw-0.1.0.tar.bz2 ${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2 - ${_additional_source_url}/3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2 + ${_additional_source_url}/9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2 ${_additional_source_url}/CoinMP-1.7.6.tgz # do not use system glm, LibO patches it! ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip @@ -107,12 +107,12 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 OpenCOLLADA-master-6509aa13af.tar.bz2 - 3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2) -md5sums=('cc2c8af3cf8ae265173086f353bc7532' + 9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2) +md5sums=('868f1ecb0b3326dc567466428f5b619b' 'SKIP' - '5cf628cd4c201f291f72d2d66fadae62' + 'b031689c5d715aecb63a31ba3ddaae24' 'SKIP' - 'b556de6bb78ae2673819c191a777053d' + '96fef4a636161cfd8df181e2a9d2f130' 'SKIP' 'd6eef4b4cacb2183f2bf265a5a03a354' '1f24ab1d39f4a51faf22244c94a6203f' @@ -147,7 +147,7 @@ md5sums=('cc2c8af3cf8ae265173086f353bc7532' 'c25a881d21abc5b4da19205db513cc22' '9317e967c8fa8ff50e049744c4b33c87' '49c94710f7858b1969d74ff72e6aac84' - '3c62598ccbecb65998bf7602bb09a791' + '9c8d3455e0d8ef51269784e9a473feeb' '1cce53bf4b40ae29790d2c5c9f8b1129' 'bae83fa5dc7f081768daace6e199adc3' '4b87018f7fff1d054939d19920b751a0' @@ -321,7 +321,7 @@ package_libreoffice-fresh() { 'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'glu' + 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'gst-plugins-base-libs') optdepends=('libreoffice-fresh-langpack: additional language support' 'java-runtime: adds java support' @@ -337,6 +337,7 @@ package_libreoffice-fresh() { 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' 'libpaper: takes care of papersize' 'postgresql-libs: for postgresql-connector' + 'gtk2: for GTK2 integration' 'gtk3: for GTK3 integration' 'kdelibs: for KDE desktop integration') backup=(etc/libreoffice/sofficerc @@ -394,7 +395,7 @@ package_libreoffice-fresh() { # add application descriptions install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ - ${pkgdir}/usr/share/appdata + ${pkgdir}/usr/share/appdata # fix insecure rpath chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3 diff --git a/extra/libteam/PKGBUILD b/extra/libteam/PKGBUILD new file mode 100644 index 000000000..fc4aedfa0 --- /dev/null +++ b/extra/libteam/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 216517 2014-07-04 21:12:04Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libteam +pkgver=1.11 +pkgrel=1 +pkgdesc="Library for controlling team network device" +arch=(i686 x86_64) +url="http://libteam.org/" +license=(LGPL2.1) +depends=(libnl libdaemon jansson libdbus bash) +makedepends=(python python2 swig) +source=($url/files/$pkgname-$pkgver.tar.gz) +sha256sums=('b89e81258f8a8f4abd718ec1c91f85cb66d4d29e4d50095a3d2a4ffd8ce4bf7a') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --libexecdir=/usr/lib + make + + cp -aT binding/python binding/python2 + + cd binding/python + python ./setup.py build + cd ../python2 + python2 ./setup.py build +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -Dm644 teamd/redhat/systemd/teamd@.service \ + "$pkgdir/usr/lib/systemd/system/teamd@.service" + install -Dm644 teamd/dbus/teamd.conf \ + "$pkgdir/etc/dbus-1/system.d/teamd.conf" + + cd binding/python + python ./setup.py install --root "$pkgdir" -O1 + cd ../python2 + python2 ./setup.py install --root "$pkgdir" -O1 +} diff --git a/extra/libtiger/PKGBUILD b/extra/libtiger/PKGBUILD index 6bc26bc01..ae025cd8e 100644 --- a/extra/libtiger/PKGBUILD +++ b/extra/libtiger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198248 2013-10-30 13:42:59Z allan $ +# $Id: PKGBUILD 216458 2014-07-04 04:10:50Z fyan $ # Maintainer: Giovanni Scafora # Contributor: Emmanuel Gil Peyrot pkgname=libtiger pkgver=0.3.4 -pkgrel=3 +pkgrel=4 pkgdesc="A rendering library for Kate streams using Pango and Cairo" url="http://libtiger.googlecode.com/" license=('LGPL') diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD index 0349e3124..11dc35235 100644 --- a/extra/mtools/PKGBUILD +++ b/extra/mtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176074 2013-01-27 10:11:32Z giovanni $ +# $Id: PKGBUILD 216460 2014-07-04 04:12:10Z fyan $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=mtools pkgver=4.0.18 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of utilities to access MS-DOS disks" arch=('i686' 'x86_64') url="http://www.gnu.org/software/mtools/" diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD index 2a6635557..fbfa6a84e 100644 --- a/extra/pyqt4/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 215219 2014-06-16 21:35:22Z andrea $ +# $Id: PKGBUILD 216493 2014-07-04 14:33:54Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai Ben pkgbase=pyqt4 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') -pkgver=4.11 -pkgrel=2 +pkgver=4.11.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.riverbankcomputing.com/software/pyqt/intro' license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('8b991f95fec9582cdcc1bf1f4ac02406') +md5sums=('9d0203c46ad8c838abd5d33b814ca659') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD index 45bb2a420..d39147f2b 100644 --- a/extra/pyqt5/PKGBUILD +++ b/extra/pyqt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215132 2014-06-14 15:46:49Z andrea $ +# $Id: PKGBUILD 216495 2014-07-04 14:34:16Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Yichao Yu # Contributor: Douglas Soares de Andrade @@ -7,7 +7,7 @@ pkgbase=pyqt5 pkgname=pyqt5 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') -pkgver=5.3 +pkgver=5.3.1 pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -16,7 +16,7 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl' 'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'qt5-serialport') source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz") -md5sums=('1e00c13e3627a3568d7f7dbc608c6525') +md5sums=('c24b1a4040292fcfdbf128a9a5a38e66') build() { cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver} diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 26d205200..bab408200 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214287 2014-06-05 03:59:39Z fyan $ +# $Id: PKGBUILD 216452 2014-07-04 03:58:53Z fyan $ # Maintainer: Felix Yan # Contributor: Stéphane Gaudreault # Contributor: Allan McRae # Contributor: Jason Chu pkgname=python2 -pkgver=2.7.7 +pkgver=2.7.8 pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" @@ -13,11 +13,11 @@ arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk>=8.6.0' 'bluez-libs') +makedepends=('tk' 'bluez-libs') optdepends=('tk: for IDLE') conflicts=('python<3') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('5f82557cac5abf18d1df6f8bb2029aa335b321f4') +sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4') prepare() { cd Python-${pkgver} @@ -33,7 +33,7 @@ prepare() { sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \ - Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py + Lib/distutils/tests/test_install_scripts.py # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball @@ -45,7 +45,7 @@ prepare() { find . -name '*.py' | \ xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - # Workaround asdl_c.py error + # Workaround asdl_c.py error after we touched the shebangs touch Include/Python-ast.h Python/Python-ast.c } diff --git a/extra/qalculate-gtk/PKGBUILD b/extra/qalculate-gtk/PKGBUILD index 5c7d40e06..20da2d83d 100644 --- a/extra/qalculate-gtk/PKGBUILD +++ b/extra/qalculate-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149453 2012-02-08 03:00:54Z eric $ +# $Id: PKGBUILD 216447 2014-07-03 23:50:40Z eric $ # Maintainer: Eric Bélanger pkgname=qalculate-gtk pkgver=0.9.7 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME frontend for libqalculate" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" @@ -16,12 +16,12 @@ source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgv sha1sums=('c714c91224045fa49f261686e985df0aefa1d678') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/schedtool/PKGBUILD b/extra/schedtool/PKGBUILD index 2987ec6ca..c525748cd 100644 --- a/extra/schedtool/PKGBUILD +++ b/extra/schedtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151233 2012-02-25 09:26:59Z allan $ +# $Id: PKGBUILD 216474 2014-07-04 04:25:24Z fyan $ # Maintainer: Ray Rashif # Contributor: James Rayner pkgname=schedtool pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Query or alter a process' scheduling policy" arch=('i686' 'x86_64') url="http://freequaos.host.sk/schedtool/" diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD index f191b5125..0cee3cba7 100644 --- a/extra/serd/PKGBUILD +++ b/extra/serd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=serd pkgver=0.18.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." arch=(i686 x86_64) url="http://drobilla.net/software/$pkgname/" diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD index f9895597d..ca6eb902b 100644 --- a/extra/sord/PKGBUILD +++ b/extra/sord/PKGBUILD @@ -4,7 +4,7 @@ pkgname=sord pkgver=0.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for storing RDF data in memory" arch=('i686' 'x86_64') url="http://drobilla.net/software/sord/" diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD index 50685f19a..08b3b2513 100644 --- a/extra/swh-plugins/PKGBUILD +++ b/extra/swh-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151225 2012-02-25 09:04:22Z allan $ +# $Id: PKGBUILD 216481 2014-07-04 05:20:48Z fyan $ # Maintainer: Ray Rashif # Contributor: Damir Perisa # Contributor: Robert Emil Berge pkgname=swh-plugins pkgver=0.4.15 -pkgrel=5 +pkgrel=6 pkgdesc="Steve Harris' LADSPA plug-ins suite" arch=('i686' 'x86_64') url="http://plugin.org.uk/" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 10c4eb186..748cc7c50 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 214360 2014-06-07 18:26:36Z heftig $ +# $Id: PKGBUILD 216508 2014-07-04 19:12:59Z heftig $ # Maintainer: Andreas Radke pkgbase=webkitgtk pkgname=(webkitgtk webkitgtk2) pkgver=2.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) url="http://webkitgtk.org/" @@ -17,9 +17,11 @@ optdepends=('gst-plugins-base: free media decoding' 'gst-libav: nonfree media decoding') options=(!emptydirs) source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz - fix-pretty-quotes.patch) + fix-pretty-quotes.patch + webkitgtk-2.4.3-angle_symbol_table.patch) sha256sums=('9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6' + 'a2c0b96a1671d43c18baf3cbe53c84738181aa08c3ac448c423b50722953a50b') prepare() { mkdir build-gtk{,2} path @@ -28,6 +30,7 @@ prepare() { cd $pkgbase-$pkgver patch -Np0 -i ../fix-pretty-quotes.patch + patch -Np1 -i ../webkitgtk-2.4.3-angle_symbol_table.patch } _build() ( diff --git a/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch b/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch new file mode 100644 index 000000000..8d3096670 --- /dev/null +++ b/extra/webkitgtk/webkitgtk-2.4.3-angle_symbol_table.patch @@ -0,0 +1,13 @@ +--- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp ++++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp +@@ -171,7 +171,8 @@ TFunction::~TFunction() + TSymbolTableLevel::~TSymbolTableLevel() + { + for (tLevel::iterator it = level.begin(); it != level.end(); ++it) +- delete (*it).second; ++ if ((*it).first == (*it).second->getMangledName()) ++ delete (*it).second; + } + + // + -- cgit v1.2.3