diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/ekiga | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/ekiga')
| -rw-r--r-- | extra/ekiga/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/ekiga/fix-generation-po.patch | 24 |
2 files changed, 5 insertions, 33 deletions
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 71e2f1d5a..eea93da40 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $ +# $Id: PKGBUILD 136102 2011-08-23 01:57:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga -pkgver=3.3.1 -pkgrel=2 +pkgver=3.3.2 +pkgrel=1 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -15,15 +15,11 @@ optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - fix-generation-po.patch) -sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06' - 'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-generation-po.patch" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch deleted file mode 100644 index ebec28433..000000000 --- a/extra/ekiga/fix-generation-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Tue, 19 Jul 2011 08:15:52 +0000 -Subject: Fix generation of po translation files - -Bug introduced by commit 2bfaf29. ---- -diff --git a/configure.ac b/configure.ac -index 63d8685..eefae22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes") - dnl ######################################################################### - dnl Support for internationalization - dnl ######################################################################## --AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix]) -+GETTEXT_PACKAGE=AC_PACKAGE_NAME -+AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) - AM_GLIB_GNU_GETTEXT - - --- -cgit v0.9 |