summaryrefslogtreecommitdiff
path: root/chat/empathy/patches/patch-ad
blob: 1ad690a0bcba9f24681cd2d81577d04f579c691e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
$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)
 
 gsettings__base_list = \
-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
 
 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