diff options
Diffstat (limited to 'chat/empathy/patches/patch-ad')
| -rw-r--r-- | chat/empathy/patches/patch-ad | 72 |
1 files changed, 71 insertions, 1 deletions
diff --git a/chat/empathy/patches/patch-ad b/chat/empathy/patches/patch-ad index 5348b0213de..1ad690a0bcb 100644 --- a/chat/empathy/patches/patch-ad +++ b/chat/empathy/patches/patch-ad @@ -1,7 +1,18 @@ -$NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $ +$NetBSD: patch-ad,v 1.3 2018/11/18 11:48:56 bsiegert Exp $ + +Enchant2 support. --- configure.orig 2011-03-24 15:18:52.000000000 +0000 +++ configure +@@ -2667,7 +2667,7 @@ UNIQUE_REQUIRED=1.1.2 + + # Optionnal deps + CLUTTER_GTK_REQUIRED=0.10 +-ENCHANT_REQUIRED=1.2.0 ++ENCHANT_REQUIRED=2.0.0 + GEOCLUE_REQUIRED=0.11 + ISO_CODES_REQUIRED=0.35 + LIBCHAMPLAIN_GTK_REQUIRED=0.7.1 @@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem .SECONDARY: $(gsettings_SCHEMAS) @@ -13,3 +24,62 @@ $NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) @$(NORMAL_INSTALL) +@@ -16648,18 +16648,18 @@ if test -n "$ENCHANT_CFLAGS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- enchant >= \$ENCHANT_REQUIRED, ++ enchant-2 >= \$ENCHANT_REQUIRED, + iso-codes >= \$ISO_CODES_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + " 2>/dev/null` + else +@@ -16673,18 +16673,18 @@ if test -n "$ENCHANT_LIBS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- enchant >= \$ENCHANT_REQUIRED, ++ enchant-2 >= \$ENCHANT_REQUIRED, + iso-codes >= \$ISO_CODES_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + " 2>/dev/null` + else +@@ -16707,12 +16707,12 @@ else + fi + if test $_pkg_short_errors_supported = yes; then + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + " 2>&1` + else + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors " +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + " 2>&1` + fi |