diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
| commit | 6feb300093e37e58027d52ca5734624565e09598 (patch) | |
| tree | 418d2cc8c7e631c42898a28731ade8a29e3cb955 /extra/telepathy-rakia | |
| parent | 216722b262c18f99fa53875247e7a258cb3b4b34 (diff) | |
| parent | d3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/openbox/PKGBUILD
community/powertop/PKGBUILD
core/libusb-compat/PKGBUILD
core/openssl/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/pidgin/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/xfce4-genmon-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/wine/PKGBUILD
testing/mdadm/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-server/git-fixes.patch
Diffstat (limited to 'extra/telepathy-rakia')
| -rw-r--r-- | extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch | 29 | ||||
| -rw-r--r-- | extra/telepathy-rakia/PKGBUILD | 18 |
2 files changed, 40 insertions, 7 deletions
diff --git a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch new file mode 100644 index 000000000..7f3b033bd --- /dev/null +++ b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch @@ -0,0 +1,29 @@ +From 797d2b3792a0d4c4260075c2b05a1aba63715363 Mon Sep 17 00:00:00 2001 +From: Ionut Biru <ibiru@archlinux.org> +Date: Wed, 9 May 2012 17:34:10 +0000 +Subject: [PATCH] Check for gio to avoid linking issue + +/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO +/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line + +Signed-off-by: Ionut Biru <ibiru@archlinux.org> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2a6cb2a..461d464 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,7 +62,7 @@ dnl GTK docs + GTK_DOC_CHECK + + dnl Check for Glib +-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no) ++PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no) + + if test x$have_glib = xno ; then + AC_MSG_ERROR([GLib development libraries not found]) +-- +1.7.10.1 + diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD index 4504a2256..12338fa1f 100644 --- a/extra/telepathy-rakia/PKGBUILD +++ b/extra/telepathy-rakia/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151254 2012-02-25 10:06:13Z ibiru $ +# $Id: PKGBUILD 158778 2012-05-09 17:40:49Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-rakia -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc="SIP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,16 +13,20 @@ makedepends=('libxslt' 'python2') install=telepathy-rakia.install groups=('telepathy') replaces=('telepathy-sofiasip') -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('dea76f93fe6234d18c6c7746c9ce0d6e') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz + 0001-Check-for-gio-to-avoid-linking-issue.patch) +md5sums=('f9f47f18db033afe29fd6963c7748e37' + '6d0372c4c8a22bf9682e4b45ee614d5c') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" + patch -Np1 -i $srcdir/0001-Check-for-gio-to-avoid-linking-issue.patch + autoreconf -fi ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } |