Update to ekiga-3.3.2; still BROKEN as it's still a wip and I need to make
more tests.
This commit is contained in:
ajacoutot
parent
145db17fcd
commit
1b24dd66e7
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2011/09/28 09:47:46 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2011/10/26 17:02:53 ajacoutot Exp $
|
||||
|
||||
BROKEN= needs an update (GNOME3)
|
||||
BROKEN= WIP (see ajacoutot@)
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= SIP and H.323 compatible conferencing application
|
||||
|
||||
GNOME_PROJECT= ekiga
|
||||
GNOME_VERSION= 3.2.7
|
||||
|
||||
REVISION= 6
|
||||
GNOME_VERSION= 3.3.2
|
||||
|
||||
CATEGORIES= net multimedia
|
||||
|
||||
@ -19,40 +19,45 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor avahi-client camel-1.2
|
||||
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender opal
|
||||
WANTLIB += Xv asn1 atk-1.0 c cairo xcb-render xcb-render-util
|
||||
WANTLIB += com_err crypto dbus-1 dbus-glib-1 expat fontconfig notify
|
||||
WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 sigc-2.0
|
||||
WANTLIB += glib-2.0 gmodule-2.0 gnutls gobject-2.0 gpg-error
|
||||
WANTLIB += gssapi gthread-2.0 gtk-x11-2.0 krb5 lber ldap ldap_r SDL
|
||||
WANTLIB += m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += GL ORBit-2 SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86vm asn1
|
||||
WANTLIB += atk-1.0 avahi-client avahi-common avahi-glib boost_signals-mt
|
||||
WANTLIB += c cairo camel-1.2 com_err crypto dbus-1 dbus-glib-1
|
||||
WANTLIB += drm ebook-1.2 edataserver-1.2 expat ffi fontconfig
|
||||
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += gmodule-2.0 gobject-2.0 gssapi gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB += krb5 lber-2.4 ldap-2.4 ldap_r-2.4 m notify nspr4 nss3
|
||||
WANTLIB += nssutil3 opal pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pcre pixman-1 plc4 plds4 png pt pthread pthread-stubs
|
||||
WANTLIB += sasl2 smime3 sndio soup-2.4 speexdsp sqlite3 avahi-common
|
||||
WANTLIB += ssl ssl3 stdc++ tasn1 usbhid xcb xml2 z avahi-glib ebook-1.2
|
||||
WANTLIB += edataserver-1.2
|
||||
WANTLIB += sasl2 smime3 sndio softokn3 soup-2.4 speexdsp sqlite3
|
||||
WANTLIB += ssl ssl3 stdc++ usbhid xcb xcb-render xcb-shm xml2
|
||||
WANTLIB += z
|
||||
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome \
|
||||
devel/gconf2
|
||||
|
||||
LIB_DEPENDS= net/avahi \
|
||||
net/opal \
|
||||
net/opal>=3.10.3 \
|
||||
devel/sdl \
|
||||
databases/evolution-data-server \
|
||||
devel/libsigc++-2 \
|
||||
devel/libnotify>=0.7.2
|
||||
devel/libnotify>=0.7.2 \
|
||||
devel/boost
|
||||
|
||||
# /usr/local/include/boost/throw_exception.hpp:65: \
|
||||
# error: exception handling disabled, use -fexceptions to enable
|
||||
CFLAGS += -fexceptions
|
||||
|
||||
MODGCONF2_SCHEMAS_DIR= ekiga
|
||||
|
||||
MODGNOME_DESKTOP_FILE= Yes
|
||||
MODGNOME_TOOLS= yelp
|
||||
MODGCONF2_SCHEMAS_DIR= ekiga
|
||||
USE_GROFF = Yes
|
||||
|
||||
#MODGNOME_TOOLS= yelp
|
||||
MODGNOME_LDFLAGS=-L${X11BASE}/lib -pthread
|
||||
CONFIGURE_ARGS= --enable-avahi \
|
||||
--disable-gnome \
|
||||
|
||||
LIBTOOL_FLAGS= --tag=disable-static
|
||||
|
||||
CONFIGURE_ARGS= --disable-static \
|
||||
--enable-h323 \
|
||||
--with-ldap-dir=${LOCALBASE} \
|
||||
--with-libsasl2-dir=${LOCALBASE}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (gnome/ekiga-3.2.7.tar.bz2) = XPLt8ZkHWjw9EVzpuUy/Dw==
|
||||
RMD160 (gnome/ekiga-3.2.7.tar.bz2) = Doe2DxRN9l8wcMIf57gSbkKUEZY=
|
||||
SHA1 (gnome/ekiga-3.2.7.tar.bz2) = wu1XGl9fBYttgMCR3Wnf5VfBffI=
|
||||
SHA256 (gnome/ekiga-3.2.7.tar.bz2) = 8loTCbaOr+afDXrtRhvJqBlpOQYFQ9Cb0vGeC7Hj/Y8=
|
||||
SIZE (gnome/ekiga-3.2.7.tar.bz2) = 9093433
|
||||
MD5 (gnome/ekiga-3.3.2.tar.xz) = hqqfpEAJZSHUFMWBVKy+Ow==
|
||||
RMD160 (gnome/ekiga-3.3.2.tar.xz) = Jnx111IcE30Rxfz+rHkYzokb1Rw=
|
||||
SHA1 (gnome/ekiga-3.3.2.tar.xz) = wypHxTZQTbUMSEDq1Ma9UhHNo58=
|
||||
SHA256 (gnome/ekiga-3.3.2.tar.xz) = 1N1HpHaWxT5vODnu9uDolt09B7q7Lmj/j+mU1nuogHo=
|
||||
SIZE (gnome/ekiga-3.3.2.tar.xz) = 8228344
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2010/05/31 07:20:04 ajacoutot Exp $
|
||||
--- configure.orig Mon May 31 00:12:51 2010
|
||||
+++ configure Mon May 31 08:34:46 2010
|
||||
@@ -15339,8 +15339,8 @@ _ACEOF
|
||||
$OpenBSD: patch-configure,v 1.5 2011/10/26 17:02:53 ajacoutot Exp $
|
||||
--- configure.orig Tue Aug 23 00:54:32 2011
|
||||
+++ configure Tue Oct 25 12:52:40 2011
|
||||
@@ -16450,8 +16450,8 @@ fi
|
||||
|
||||
|
||||
if test ".$ac_cv_c_compiler_gnu" = .yes; then
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/31 07:20:04 ajacoutot Exp $
|
||||
fi
|
||||
|
||||
case $host in
|
||||
@@ -15390,7 +15390,7 @@ case $target_os in
|
||||
@@ -16501,7 +16501,7 @@ case $target_os in
|
||||
gm_platform="linux"
|
||||
;;
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-lib_engine_components_ldap_ldap-book_cpp,v 1.1 2010/03/23 21:18:59 ajacoutot Exp $
|
||||
--- lib/engine/components/ldap/ldap-book.cpp.orig Mon Jul 13 14:54:11 2009
|
||||
+++ lib/engine/components/ldap/ldap-book.cpp Mon Jul 13 14:54:26 2009
|
||||
@@ -479,7 +479,7 @@ extern "C" {
|
||||
} interctx;
|
||||
|
||||
static int
|
||||
- book_saslinter(LDAP *ld, unsigned flags __attribute__((unused)),
|
||||
+ book_saslinter(LDAP *ld, unsigned int __attribute__((unused)),
|
||||
void *def, void *inter)
|
||||
{
|
||||
sasl_interact_t *in = (sasl_interact_t *)inter;
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-lib_engine_components_libnotify_libnotify-main_cpp,v 1.3 2011/04/21 07:07:52 ajacoutot Exp $
|
||||
|
||||
Fix with libnotify>=0.7
|
||||
(notify_notification_new has lost its widget argument)
|
||||
|
||||
--- lib/engine/components/libnotify/libnotify-main.cpp.orig Tue Apr 19 15:28:21 2011
|
||||
+++ lib/engine/components/libnotify/libnotify-main.cpp Tue Apr 19 15:28:30 2011
|
||||
@@ -158,7 +158,7 @@ LibNotify::on_notification_added (gmref_ptr<Ekiga::Not
|
||||
|
||||
notif = notify_notification_new (notification->get_title ().c_str (),
|
||||
notification->get_body ().c_str (),
|
||||
- urgency, NULL);
|
||||
+ urgency);
|
||||
|
||||
g_signal_connect (notif, "closed",
|
||||
G_CALLBACK (on_notif_closed), notification.get ());
|
||||
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-src_gui_main_cpp,v 1.3 2011/04/21 07:07:52 ajacoutot Exp $
|
||||
|
||||
Fix with libnotify>=0.7
|
||||
(notify_notification_new has lost its widget argument)
|
||||
(notify_notification_attach_to_status_icon is gone)
|
||||
|
||||
--- src/gui/main.cpp.orig Sun May 30 23:58:01 2010
|
||||
+++ src/gui/main.cpp Tue Apr 19 16:09:59 2011
|
||||
@@ -35,7 +35,7 @@
|
||||
* build the main window.
|
||||
*/
|
||||
|
||||
-#include "revision.h"
|
||||
+// #include "revision.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@@ -2820,12 +2820,12 @@ ekiga_main_window_incoming_call_notify (EkigaMainWindo
|
||||
|
||||
body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
|
||||
|
||||
- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
|
||||
+ notify = notify_notification_new (title, body, GM_ICON_LOGO);
|
||||
notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
|
||||
notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
|
||||
notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
|
||||
notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
|
||||
- notify_notification_attach_to_status_icon (notify, statusicon);
|
||||
+// notify_notification_attach_to_status_icon (notify, statusicon);
|
||||
if (!notify_notification_show (notify, NULL)) {
|
||||
ekiga_main_window_incoming_call_dialog_show (mw, call);
|
||||
}
|
||||
15
x11/gnome/ekiga/patches/patch-src_gui_main_window_cpp
Normal file
15
x11/gnome/ekiga/patches/patch-src_gui_main_window_cpp
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-src_gui_main_window_cpp,v 1.1 2011/10/26 17:02:53 ajacoutot Exp $
|
||||
|
||||
gui/main_window.cpp:38:22: error: revision.h: No such file or directory
|
||||
|
||||
--- src/gui/main_window.cpp.orig Tue Oct 25 14:22:38 2011
|
||||
+++ src/gui/main_window.cpp Tue Oct 25 14:22:47 2011
|
||||
@@ -35,7 +35,7 @@
|
||||
* build the main window.
|
||||
*/
|
||||
|
||||
-#include "revision.h"
|
||||
+// #include "revision.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
@ -1,11 +1,22 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2010/05/31 07:20:04 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2011/10/26 17:02:53 ajacoutot Exp $
|
||||
@bin bin/ekiga
|
||||
bin/ekiga-config-tool
|
||||
@bin bin/ekiga-helper
|
||||
lib/ekiga/
|
||||
lib/ekiga/3.3.2/
|
||||
@comment lib/ekiga/3.3.2/libekiga.la
|
||||
lib/ekiga/3.3.2/libekiga.so
|
||||
lib/ekiga/3.3.2/plugins/
|
||||
@comment lib/ekiga/3.3.2/plugins/libgmevolution.la
|
||||
lib/ekiga/3.3.2/plugins/libgmevolution.so
|
||||
@comment lib/ekiga/3.3.2/plugins/libgmldap.la
|
||||
lib/ekiga/3.3.2/plugins/libgmldap.so
|
||||
@man man/man1/ekiga.1
|
||||
share/applications/ekiga.desktop
|
||||
share/dbus-1/services/org.ekiga.Ekiga.service
|
||||
share/dbus-1/services/org.ekiga.Helper.service
|
||||
share/gnome/
|
||||
share/gnome/help/
|
||||
share/gnome/help/ekiga/
|
||||
share/gnome/help/ekiga/C/
|
||||
share/gnome/help/ekiga/C/ekiga.xml
|
||||
@ -358,6 +369,33 @@ share/gnome/help/ekiga/ru/figures/monitoring_lines.png
|
||||
share/gnome/help/ekiga/ru/figures/roster.png
|
||||
share/gnome/help/ekiga/ru/figures/status.png
|
||||
share/gnome/help/ekiga/ru/figures/video_codecs.png
|
||||
share/gnome/help/ekiga/sl/
|
||||
share/gnome/help/ekiga/sl/ekiga.xml
|
||||
share/gnome/help/ekiga/sl/figures/
|
||||
share/gnome/help/ekiga/sl/figures/accounts_d1.png
|
||||
share/gnome/help/ekiga/sl/figures/accounts_ekiga_call_out.png
|
||||
share/gnome/help/ekiga/sl/figures/accounts_ekiga_net.png
|
||||
share/gnome/help/ekiga/sl/figures/accounts_h323.png
|
||||
share/gnome/help/ekiga/sl/figures/accounts_sip.png
|
||||
share/gnome/help/ekiga/sl/figures/addressbook_d1.png
|
||||
share/gnome/help/ekiga/sl/figures/addressbook_d2.png
|
||||
share/gnome/help/ekiga/sl/figures/audio_codecs.png
|
||||
share/gnome/help/ekiga/sl/figures/call_d1.png
|
||||
share/gnome/help/ekiga/sl/figures/call_history.png
|
||||
share/gnome/help/ekiga/sl/figures/chat_d1.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d1.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d2.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d3.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d4.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d5.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d6.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d7.png
|
||||
share/gnome/help/ekiga/sl/figures/config_d8.png
|
||||
share/gnome/help/ekiga/sl/figures/lumi.png
|
||||
share/gnome/help/ekiga/sl/figures/monitoring_lines.png
|
||||
share/gnome/help/ekiga/sl/figures/roster.png
|
||||
share/gnome/help/ekiga/sl/figures/status.png
|
||||
share/gnome/help/ekiga/sl/figures/video_codecs.png
|
||||
share/gnome/help/ekiga/sv/
|
||||
share/gnome/help/ekiga/sv/ekiga.xml
|
||||
share/gnome/help/ekiga/sv/figures/
|
||||
@ -412,26 +450,40 @@ share/gnome/help/ekiga/uk/figures/monitoring_lines.png
|
||||
share/gnome/help/ekiga/uk/figures/roster.png
|
||||
share/gnome/help/ekiga/uk/figures/status.png
|
||||
share/gnome/help/ekiga/uk/figures/video_codecs.png
|
||||
share/icons/hicolor/128x128/
|
||||
share/icons/hicolor/128x128/apps/
|
||||
share/gnome/help/ekiga/zh_CN/
|
||||
share/gnome/help/ekiga/zh_CN/ekiga.xml
|
||||
share/gnome/help/ekiga/zh_CN/figures/
|
||||
share/gnome/help/ekiga/zh_CN/figures/accounts_d1.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_call_out.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_net.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/accounts_h323.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/accounts_sip.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/addressbook_d1.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/addressbook_d2.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/audio_codecs.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/call_d1.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/call_history.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/chat_d1.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d1.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d2.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d3.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d4.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d5.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d6.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d7.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/config_d8.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/lumi.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/monitoring_lines.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/roster.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/status.png
|
||||
share/gnome/help/ekiga/zh_CN/figures/video_codecs.png
|
||||
share/icons/hicolor/128x128/apps/ekiga.png
|
||||
share/icons/hicolor/16x16/
|
||||
share/icons/hicolor/16x16/apps/
|
||||
share/icons/hicolor/16x16/apps/ekiga.png
|
||||
share/icons/hicolor/22x22/
|
||||
share/icons/hicolor/22x22/apps/
|
||||
share/icons/hicolor/22x22/apps/ekiga.png
|
||||
share/icons/hicolor/32x32/
|
||||
share/icons/hicolor/32x32/apps/
|
||||
share/icons/hicolor/24x24/apps/ekiga.png
|
||||
share/icons/hicolor/32x32/apps/ekiga.png
|
||||
share/icons/hicolor/48x48/
|
||||
share/icons/hicolor/48x48/apps/
|
||||
share/icons/hicolor/48x48/apps/ekiga.png
|
||||
share/icons/hicolor/64x64/
|
||||
share/icons/hicolor/64x64/apps/
|
||||
share/icons/hicolor/64x64/apps/ekiga.png
|
||||
share/icons/hicolor/72x72/
|
||||
share/icons/hicolor/72x72/apps/
|
||||
share/icons/hicolor/72x72/apps/ekiga.png
|
||||
share/locale/am/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ar/LC_MESSAGES/ekiga.mo
|
||||
@ -452,6 +504,7 @@ share/locale/da/LC_MESSAGES/ekiga.mo
|
||||
share/locale/de/LC_MESSAGES/ekiga.mo
|
||||
share/locale/dz/LC_MESSAGES/ekiga.mo
|
||||
share/locale/el/LC_MESSAGES/ekiga.mo
|
||||
share/locale/en@shaw/LC_MESSAGES/ekiga.mo
|
||||
share/locale/en_CA/LC_MESSAGES/ekiga.mo
|
||||
share/locale/en_GB/LC_MESSAGES/ekiga.mo
|
||||
share/locale/eo/LC_MESSAGES/ekiga.mo
|
||||
@ -473,6 +526,7 @@ share/locale/is/LC_MESSAGES/ekiga.mo
|
||||
share/locale/it/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ja/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ka/LC_MESSAGES/ekiga.mo
|
||||
share/locale/kk/LC_MESSAGES/ekiga.mo
|
||||
share/locale/kn/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ko/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ku/LC_MESSAGES/ekiga.mo
|
||||
@ -508,6 +562,7 @@ share/locale/ta/LC_MESSAGES/ekiga.mo
|
||||
share/locale/te/LC_MESSAGES/ekiga.mo
|
||||
share/locale/th/LC_MESSAGES/ekiga.mo
|
||||
share/locale/tr/LC_MESSAGES/ekiga.mo
|
||||
share/locale/ug/LC_MESSAGES/ekiga.mo
|
||||
share/locale/uk/LC_MESSAGES/ekiga.mo
|
||||
share/locale/vi/LC_MESSAGES/ekiga.mo
|
||||
share/locale/wa/LC_MESSAGES/ekiga.mo
|
||||
@ -515,6 +570,7 @@ share/locale/xh/LC_MESSAGES/ekiga.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/ekiga.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/ekiga.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/ekiga.mo
|
||||
share/omf/
|
||||
share/omf/ekiga/
|
||||
share/omf/ekiga/ekiga-C.omf
|
||||
share/omf/ekiga/ekiga-bg.omf
|
||||
@ -529,9 +585,10 @@ share/omf/ekiga/ekiga-fr.omf
|
||||
share/omf/ekiga/ekiga-oc.omf
|
||||
share/omf/ekiga/ekiga-pt_BR.omf
|
||||
share/omf/ekiga/ekiga-ru.omf
|
||||
share/omf/ekiga/ekiga-sl.omf
|
||||
share/omf/ekiga/ekiga-sv.omf
|
||||
share/omf/ekiga/ekiga-uk.omf
|
||||
share/pixmaps/
|
||||
share/omf/ekiga/ekiga-zh_CN.omf
|
||||
share/pixmaps/ekiga/
|
||||
share/pixmaps/ekiga/ekiga-logo.png
|
||||
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user