diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
commit | 071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch) | |
tree | 9ec266d72aaa5971dee2d1abbe2de511d971de87 /community/ccrtp | |
parent | c14218d562c03601d6d23666f77ed0c2f0025c1b (diff) | |
parent | b8ea4461e461f0e1782e28b5810eb811423afa79 (diff) |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts:
core/heimdal/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/bs/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libx86/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/vbetool/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'community/ccrtp')
-rw-r--r-- | community/ccrtp/PKGBUILD | 10 | ||||
-rw-r--r-- | community/ccrtp/gcc46.patch | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD index 9ec615de8..e50fdefcc 100644 --- a/community/ccrtp/PKGBUILD +++ b/community/ccrtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 33232 2010-11-23 12:15:12Z spupykin $ +# $Id: PKGBUILD 47033 2011-05-14 10:27:41Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=ccrtp -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=1 pkgdesc="GNU ccRTP" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,13 @@ url="http://www.gnu.org/software/ccrtp" license=('GPL' 'custom') depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt') options=('!libtool') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('9f5d34a18f2c1c779d2e5818cc4987f8') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gcc46.patch) +md5sums=('3410d2f43a6a28679bd091ed8b2ed228' + '17ce9c79c4518f35f484b539bcff570d') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/gcc46.patch # arch64 fix from Mandriva [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr diff --git a/community/ccrtp/gcc46.patch b/community/ccrtp/gcc46.patch new file mode 100644 index 000000000..a4b25b369 --- /dev/null +++ b/community/ccrtp/gcc46.patch @@ -0,0 +1,11 @@ +diff -aur ccrtp-1.8.0.old//src/ccrtp/sources.h ccrtp-1.8.0.new//src/ccrtp/sources.h +--- ccrtp-1.8.0.old//src/ccrtp/sources.h 2011-05-14 03:15:35.993564505 -0700 ++++ ccrtp-1.8.0.new//src/ccrtp/sources.h 2011-05-14 03:19:02.033569568 -0700 +@@ -46,6 +46,7 @@ + + #include <string> + #include <ccrtp/rtcppkt.h> ++#include <stddef.h> + + #ifdef CCXX_NAMESPACES + namespace ost { |