Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-dotnet/evolution-sharp/files: evolution-sharp-0.19.2.1-newer-eds.patch evolution-sharp-0.18.0-respectlibdir.patch
Date: Sun, 22 Mar 2009 01:41:33
Message-Id: E1LlCgs-000266-RR@stork.gentoo.org
1 loki_val 09/03/22 01:41:30
2
3 Added: evolution-sharp-0.19.2.1-newer-eds.patch
4 Removed: evolution-sharp-0.18.0-respectlibdir.patch
5 Log:
6 Add patch to build 0.19.2.1 with evolution-data-server-2.26.0, patch snatched from OpenSuse, remove no-longer-used patch.
7 (Portage version: 2.2_rc26/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch?rev=1.1&content-type=text/plain
14
15 Index: evolution-sharp-0.19.2.1-newer-eds.patch
16 ===================================================================
17 Index: evolution-sharp-0.19.2.1/configure.in
18 ===================================================================
19 --- evolution-sharp-0.19.2.1.orig/configure.in
20 +++ evolution-sharp-0.19.2.1/configure.in
21 @@ -16,8 +16,8 @@ fi
22 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no]))
23 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no]))
24 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no]))
25 -PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92, edsver="2.24", AC_MSG_RESULT([no]))
26 -PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.25.92, edsver="unsupported", AC_MSG_RESULT([no]))
27 +PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27, edsver="2.24", AC_MSG_RESULT([no]))
28 +PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27, edsver="unsupported", AC_MSG_RESULT([no]))
29
30 if test "x$edsver" = "x1.8"; then
31 EDS_VERSION=-1.2
32 Index: evolution-sharp-0.19.2.1/configure
33 ===================================================================
34 --- evolution-sharp-0.19.2.1.orig/configure
35 +++ evolution-sharp-0.19.2.1/configure
36 @@ -20552,12 +20552,12 @@ if test -n "$EVOLUTION_DATA_SERVER_2_24_
37 pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS="$EVOLUTION_DATA_SERVER_2_24_CFLAGS"
38 elif test -n "$PKG_CONFIG"; then
39 if test -n "$PKG_CONFIG" && \
40 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92\"") >&5
41 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92") 2>&5
42 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27\"") >&5
43 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27") 2>&5
44 ac_status=$?
45 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
46 (exit $ac_status); }; then
47 - pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>/dev/null`
48 + pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>/dev/null`
49 else
50 pkg_failed=yes
51 fi
52 @@ -20568,12 +20568,12 @@ if test -n "$EVOLUTION_DATA_SERVER_2_24_
53 pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS="$EVOLUTION_DATA_SERVER_2_24_LIBS"
54 elif test -n "$PKG_CONFIG"; then
55 if test -n "$PKG_CONFIG" && \
56 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92\"") >&5
57 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92") 2>&5
58 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27\"") >&5
59 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27") 2>&5
60 ac_status=$?
61 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
62 (exit $ac_status); }; then
63 - pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>/dev/null`
64 + pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>/dev/null`
65 else
66 pkg_failed=yes
67 fi
68 @@ -20591,9 +20591,9 @@ else
69 _pkg_short_errors_supported=no
70 fi
71 if test $_pkg_short_errors_supported = yes; then
72 - EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>&1`
73 + EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>&1`
74 else
75 - EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>&1`
76 + EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>&1`
77 fi
78 # Put the nasty error message in config.log where it belongs
79 echo "$EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS" >&5
80 @@ -20621,12 +20621,12 @@ if test -n "$TOO_NEW_EDS_CFLAGS"; then
81 pkg_cv_TOO_NEW_EDS_CFLAGS="$TOO_NEW_EDS_CFLAGS"
82 elif test -n "$PKG_CONFIG"; then
83 if test -n "$PKG_CONFIG" && \
84 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.25.92\"") >&5
85 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.25.92") 2>&5
86 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.27\"") >&5
87 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.27") 2>&5
88 ac_status=$?
89 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
90 (exit $ac_status); }; then
91 - pkg_cv_TOO_NEW_EDS_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.25.92" 2>/dev/null`
92 + pkg_cv_TOO_NEW_EDS_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.27" 2>/dev/null`
93 else
94 pkg_failed=yes
95 fi
96 @@ -20637,12 +20637,12 @@ if test -n "$TOO_NEW_EDS_LIBS"; then
97 pkg_cv_TOO_NEW_EDS_LIBS="$TOO_NEW_EDS_LIBS"
98 elif test -n "$PKG_CONFIG"; then
99 if test -n "$PKG_CONFIG" && \
100 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.25.92\"") >&5
101 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.25.92") 2>&5
102 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.27\"") >&5
103 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.27") 2>&5
104 ac_status=$?
105 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
106 (exit $ac_status); }; then
107 - pkg_cv_TOO_NEW_EDS_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.25.92" 2>/dev/null`
108 + pkg_cv_TOO_NEW_EDS_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.27" 2>/dev/null`
109 else
110 pkg_failed=yes
111 fi
112 @@ -20660,9 +20660,9 @@ else
113 _pkg_short_errors_supported=no
114 fi
115 if test $_pkg_short_errors_supported = yes; then
116 - TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.25.92" 2>&1`
117 + TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.27" 2>&1`
118 else
119 - TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.25.92" 2>&1`
120 + TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.27" 2>&1`
121 fi
122 # Put the nasty error message in config.log where it belongs
123 echo "$TOO_NEW_EDS_PKG_ERRORS" >&5