[arch-commits] Commit in ekiga/repos (8 files)
Jan de Groot
jgc at archlinux.org
Tue Oct 23 12:35:23 UTC 2012
Date: Tuesday, October 23, 2012 @ 08:35:22
Author: jgc
Revision: 169549
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
ekiga/repos/testing-i686/
ekiga/repos/testing-i686/PKGBUILD
(from rev 169548, ekiga/trunk/PKGBUILD)
ekiga/repos/testing-i686/ekiga.install
(from rev 169548, ekiga/trunk/ekiga.install)
ekiga/repos/testing-i686/gcc47.patch
(from rev 169548, ekiga/trunk/gcc47.patch)
ekiga/repos/testing-x86_64/
ekiga/repos/testing-x86_64/PKGBUILD
(from rev 169548, ekiga/trunk/PKGBUILD)
ekiga/repos/testing-x86_64/ekiga.install
(from rev 169548, ekiga/trunk/ekiga.install)
ekiga/repos/testing-x86_64/gcc47.patch
(from rev 169548, ekiga/trunk/gcc47.patch)
------------------------------+
testing-i686/PKGBUILD | 36 ++++++++++++++
testing-i686/ekiga.install | 22 +++++++++
testing-i686/gcc47.patch | 99 +++++++++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 36 ++++++++++++++
testing-x86_64/ekiga.install | 22 +++++++++
testing-x86_64/gcc47.patch | 99 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 314 insertions(+)
Copied: ekiga/repos/testing-i686/PKGBUILD (from rev 169548, ekiga/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+
+pkgname=ekiga
+pkgver=3.9.90
+pkgrel=1
+pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
+url="http://www.ekiga.org"
+license=(GPL)
+arch=(i686 x86_64)
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+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)
+sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-schemas-install \
+ --disable-scrollkeeper --enable-dbus
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
Copied: ekiga/repos/testing-i686/ekiga.install (from rev 169548, ekiga/trunk/ekiga.install)
===================================================================
--- testing-i686/ekiga.install (rev 0)
+++ testing-i686/ekiga.install 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,22 @@
+pkgname=ekiga
+
+post_install() {
+ gconfpkg --install $pkgname
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: ekiga/repos/testing-i686/gcc47.patch (from rev 169548, ekiga/trunk/gcc47.patch)
===================================================================
--- testing-i686/gcc47.patch (rev 0)
+++ testing-i686/gcc47.patch 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,99 @@
+From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Date: Sat, 24 Mar 2012 09:17:40 +0000
+Subject: Fix compile error with gcc 4.7
+
+---
+diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
+index e16848e..b0a8775 100644
+--- a/lib/engine/account/bank-impl.h
++++ b/lib/engine/account/bank-impl.h
+@@ -203,7 +203,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
+ {
+- add_object (account);
++ this->add_object (account);
+
+ account->questions.connect (boost::ref (questions));
+ }
+@@ -213,7 +213,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
+ {
+- remove_object (account);
++ this->remove_object (account);
+ }
+
+ #endif
+diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
+index 711d8d9..4fea7d5 100644
+--- a/lib/engine/addressbook/book-impl.h
++++ b/lib/engine/addressbook/book-impl.h
+@@ -204,7 +204,7 @@ void
+ Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
+ {
+ contact->questions.connect (boost::ref (questions));
+- add_object (contact);
++ this->add_object (contact);
+ }
+
+
+@@ -212,7 +212,7 @@ template<typename ContactType>
+ void
+ Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
+ {
+- remove_object (contact);
++ this->remove_object (contact);
+ }
+
+ #endif
+diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
+index a30cd03..630236f 100644
+--- a/lib/engine/addressbook/source-impl.h
++++ b/lib/engine/addressbook/source-impl.h
+@@ -206,7 +206,7 @@ template<typename BookType>
+ void
+ Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
+ {
+- add_object (book);
++ this->add_object (book);
+
+ add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
+
+diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
+index 245a7c6..92074a8 100644
+--- a/lib/engine/presence/cluster-impl.h
++++ b/lib/engine/presence/cluster-impl.h
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
+
+ add_connection (heap, heap->questions.connect (boost::ref (questions)));
+
+- add_object (heap);
++ this->add_object (heap);
+ }
+
+ template<typename HeapType>
+diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
+index d63c491..15fe86f 100644
+--- a/lib/engine/presence/heap-impl.h
++++ b/lib/engine/presence/heap-impl.h
+@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
+ {
+ presentity->questions.connect (boost::ref (questions));
+
+- add_object (presentity);
++ this->add_object (presentity);
+ }
+
+ template<typename PresentityType>
+ void
+ Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
+ {
+- remove_object (presentity);
++ this->remove_object (presentity);
+ }
+
+ #endif
+--
+cgit v0.9.0.2
Copied: ekiga/repos/testing-x86_64/PKGBUILD (from rev 169548, ekiga/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+
+pkgname=ekiga
+pkgver=3.9.90
+pkgrel=1
+pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
+url="http://www.ekiga.org"
+license=(GPL)
+arch=(i686 x86_64)
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+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)
+sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9')
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-schemas-install \
+ --disable-scrollkeeper --enable-dbus
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
Copied: ekiga/repos/testing-x86_64/ekiga.install (from rev 169548, ekiga/trunk/ekiga.install)
===================================================================
--- testing-x86_64/ekiga.install (rev 0)
+++ testing-x86_64/ekiga.install 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,22 @@
+pkgname=ekiga
+
+post_install() {
+ gconfpkg --install $pkgname
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Copied: ekiga/repos/testing-x86_64/gcc47.patch (from rev 169548, ekiga/trunk/gcc47.patch)
===================================================================
--- testing-x86_64/gcc47.patch (rev 0)
+++ testing-x86_64/gcc47.patch 2012-10-23 12:35:22 UTC (rev 169549)
@@ -0,0 +1,99 @@
+From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Date: Sat, 24 Mar 2012 09:17:40 +0000
+Subject: Fix compile error with gcc 4.7
+
+---
+diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
+index e16848e..b0a8775 100644
+--- a/lib/engine/account/bank-impl.h
++++ b/lib/engine/account/bank-impl.h
+@@ -203,7 +203,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
+ {
+- add_object (account);
++ this->add_object (account);
+
+ account->questions.connect (boost::ref (questions));
+ }
+@@ -213,7 +213,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
+ {
+- remove_object (account);
++ this->remove_object (account);
+ }
+
+ #endif
+diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
+index 711d8d9..4fea7d5 100644
+--- a/lib/engine/addressbook/book-impl.h
++++ b/lib/engine/addressbook/book-impl.h
+@@ -204,7 +204,7 @@ void
+ Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
+ {
+ contact->questions.connect (boost::ref (questions));
+- add_object (contact);
++ this->add_object (contact);
+ }
+
+
+@@ -212,7 +212,7 @@ template<typename ContactType>
+ void
+ Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
+ {
+- remove_object (contact);
++ this->remove_object (contact);
+ }
+
+ #endif
+diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
+index a30cd03..630236f 100644
+--- a/lib/engine/addressbook/source-impl.h
++++ b/lib/engine/addressbook/source-impl.h
+@@ -206,7 +206,7 @@ template<typename BookType>
+ void
+ Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
+ {
+- add_object (book);
++ this->add_object (book);
+
+ add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
+
+diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
+index 245a7c6..92074a8 100644
+--- a/lib/engine/presence/cluster-impl.h
++++ b/lib/engine/presence/cluster-impl.h
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
+
+ add_connection (heap, heap->questions.connect (boost::ref (questions)));
+
+- add_object (heap);
++ this->add_object (heap);
+ }
+
+ template<typename HeapType>
+diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
+index d63c491..15fe86f 100644
+--- a/lib/engine/presence/heap-impl.h
++++ b/lib/engine/presence/heap-impl.h
+@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
+ {
+ presentity->questions.connect (boost::ref (questions));
+
+- add_object (presentity);
++ this->add_object (presentity);
+ }
+
+ template<typename PresentityType>
+ void
+ Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
+ {
+- remove_object (presentity);
++ this->remove_object (presentity);
+ }
+
+ #endif
+--
+cgit v0.9.0.2
More information about the arch-commits
mailing list