- let this build now after the libchamplain update

This commit is contained in:
jasper 2010-09-30 12:22:42 +00:00
parent e339ebff3c
commit f1d75898da
2 changed files with 34 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.46 2010/09/28 08:57:34 jasper Exp $
# $OpenBSD: Makefile,v 1.47 2010/09/30 12:22:42 jasper Exp $
COMMENT= telepathy based messenger for GNOME
GNOME_PROJECT= empathy
GNOME_VERSION= 2.30.3
REVISION= 3
REVISION= 4
CATEGORIES= net
@ -34,8 +34,8 @@ WANTLIB += pixman-1 plc4 plds4 png proxy pthread pthread-stubs
WANTLIB += smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3 stdc++ notify
WANTLIB += tasn1 telepathy-glib vorbis vorbisfile xcb xcb-render ltdl
WANTLIB += xcb-render-util xml2 z canberra canberra-gtk camel-1.2
WANTLIB += ebook-1.2 edataserver-1.2 json-glib-1.0 champlain-0.4
WANTLIB += champlain-gtk-0.4 clutter-gtk-0.10 telepathy-farsight
WANTLIB += ebook-1.2 edataserver-1.2 json-glib-1.0 champlain-0.8
WANTLIB += champlain-gtk-0.8 clutter-gtk-0.10 telepathy-farsight
WANTLIB += telepathy-logger
BUILD_DEPENDS= ::devel/iso-codes \
@ -67,6 +67,8 @@ DESKTOP_FILES= Yes
MODGNOME_HELP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= empathy
AUTOCONF_VERSION= 2.62
CONFIGURE_STYLE= autoconf gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-scrollkeeper \
--enable-spell=Yes \

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/09/30 12:22:43 jasper Exp $
Fix after libchamplain update.
--- configure.ac.orig Tue Sep 28 14:33:32 2010
+++ configure.ac Tue Sep 28 14:33:47 2010
@@ -38,8 +38,8 @@ ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
LIBNOTIFY_REQUIRED=0.4.4
LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.4
-LIBCHAMPLAIN_GTK_REQUIRED=0.4
+LIBCHAMPLAIN_REQUIRED=0.8
+LIBCHAMPLAIN_GTK_REQUIRED=0.8
CLUTTER_GTK_REQUIRED=0.10
GEOCLUE_REQUIRED=0.11
WEBKIT_REQUIRED=1.1.15
@@ -379,8 +379,8 @@ AC_ARG_ENABLE(map,
if test "x$enable_map" != "xno"; then
PKG_CHECK_MODULES(LIBCHAMPLAIN,
[
- champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")