1 |
eva 09/10/29 23:16:37 |
2 |
|
3 |
Added: evolution-2.28.0-delete-key.patch |
4 |
evolution-2.28.0-automagic-plugins.patch |
5 |
Log: |
6 |
New version for GNOME 2.28. Clean up old revision. |
7 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 mail-client/evolution/files/evolution-2.28.0-delete-key.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/files/evolution-2.28.0-delete-key.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/files/evolution-2.28.0-delete-key.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: evolution-2.28.0-delete-key.patch |
16 |
=================================================================== |
17 |
From 76f6959d381774924ce872c0318c1459234168ce Mon Sep 17 00:00:00 2001 |
18 |
From: Romain Perier <mrpouet@g.o> |
19 |
Date: Fri, 2 Oct 2009 23:54:41 +0200 |
20 |
Subject: [PATCH] Delete keyboard shortcut |
21 |
|
22 |
--- |
23 |
mail/em-folder-view.c | 2 -- |
24 |
ui/evolution-mail-message.xml | 6 +++--- |
25 |
2 files changed, 3 insertions(+), 5 deletions(-) |
26 |
|
27 |
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c |
28 |
index 5923e6e..8931d2e 100644 |
29 |
--- a/mail/em-folder-view.c |
30 |
+++ b/mail/em-folder-view.c |
31 |
@@ -167,7 +167,6 @@ static const EMFolderViewEnable emfv_enable_map[] = { |
32 |
{ "MessageFilterJunk", EM_POPUP_SELECT_MANY }, |
33 |
{ "MessageCopy", EM_POPUP_SELECT_MANY }, |
34 |
{ "MessageDelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE }, |
35 |
- { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, |
36 |
{ "MessageForward", EM_POPUP_SELECT_MANY }, |
37 |
{ "MessageForwardAttached", EM_POPUP_SELECT_MANY }, |
38 |
{ "MessageForwardInline", EM_POPUP_SELECT_ONE }, |
39 |
@@ -2034,7 +2033,6 @@ static BonoboUIVerb emfv_message_verbs[] = { |
40 |
BONOBO_UI_UNSAFE_VERB ("MessageFilterJunk", emfv_message_filter_junk), |
41 |
BONOBO_UI_UNSAFE_VERB ("MessageCopy", emfv_message_copy), |
42 |
BONOBO_UI_UNSAFE_VERB ("MessageDelete", emfv_message_delete), |
43 |
- BONOBO_UI_UNSAFE_VERB ("MessageDeleteKey", emfv_message_delete), |
44 |
BONOBO_UI_UNSAFE_VERB ("MessageForward", emfv_message_forward), |
45 |
BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", emfv_message_forward_attached), |
46 |
BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", emfv_message_forward_inline), |
47 |
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml |
48 |
index f90e737..65ba88d 100644 |
49 |
--- a/ui/evolution-mail-message.xml |
50 |
+++ b/ui/evolution-mail-message.xml |
51 |
@@ -58,6 +58,7 @@ |
52 |
|
53 |
<cmd name="MessageDelete" |
54 |
_tip="Mark the selected messages for deletion" |
55 |
+ accel="*Control*d" |
56 |
pixtype="pixbuf"/> |
57 |
|
58 |
<cmd name="MessageFollowUpFlag" |
59 |
@@ -232,9 +233,8 @@ |
60 |
<accel verb="MailNextUnread" name="*Control*period"/> |
61 |
<accel verb="MailNextUnread" name="period"/> |
62 |
<accel verb="MailNextUnread" name="bracketright"/> |
63 |
- <accel verb="MessageDeleteKey" name="Delete"/> |
64 |
- <accel verb="MessageDeleteKey" name="KP_Delete"/> |
65 |
- <accel verb="MessageDeleteKey" name="*Control*d"/> |
66 |
+ <accel verb="MessageDelete" name="Delete"/> |
67 |
+ <accel verb="MessageDelete" name="KP_Delete"/> |
68 |
</keybindings> |
69 |
|
70 |
<menu> |
71 |
-- |
72 |
1.6.5.rc2 |
73 |
|
74 |
|
75 |
|
76 |
|
77 |
1.1 mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch |
78 |
|
79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch?rev=1.1&view=markup |
80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/evolution/files/evolution-2.28.0-automagic-plugins.patch?rev=1.1&content-type=text/plain |
81 |
|
82 |
Index: evolution-2.28.0-automagic-plugins.patch |
83 |
=================================================================== |
84 |
From 350f9cef12d6395d9d006d3101e251e035eb701b Mon Sep 17 00:00:00 2001 |
85 |
From: Romain Perier <mrpouet@g.o> |
86 |
Date: Sat, 3 Oct 2009 10:54:26 +0200 |
87 |
Subject: [PATCH] Fix automagic dependencies for PST[1] and GStreamer[2] |
88 |
|
89 |
[1] https://bugs.gentoo.org/show_bug.cgi?id=271451 |
90 |
[2] https://bugs.gentoo.org/show_bug.cgi?id=204300 |
91 |
|
92 |
--- |
93 |
configure.ac | 86 +++++++++++++++++++++++++++++++++------------------------ |
94 |
1 files changed, 50 insertions(+), 36 deletions(-) |
95 |
|
96 |
diff --git a/configure.ac b/configure.ac |
97 |
index 92dc7cf..97b9895 100644 |
98 |
--- a/configure.ac |
99 |
+++ b/configure.ac |
100 |
@@ -1704,9 +1704,9 @@ dnl Add any new plugins here |
101 |
plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup" |
102 |
|
103 |
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " |
104 |
-all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" |
105 |
+all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin mono" |
106 |
|
107 |
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline" |
108 |
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline" |
109 |
|
110 |
plugins_standard="$plugins_standard_always" |
111 |
all_plugins_standard="$plugins_standard" |
112 |
@@ -1762,29 +1762,31 @@ if test "x${enable_python}" = "xyes"; then |
113 |
msg_plugins="$msg_plugins (and python)" |
114 |
fi |
115 |
|
116 |
-AC_SUBST(plugins_enabled) |
117 |
-AC_SUBST(all_plugins_base) |
118 |
-AC_SUBST(all_plugins_standard) |
119 |
-AC_SUBST(all_plugins_experimental) |
120 |
- |
121 |
-if echo ${plugins_enabled} | grep "audio-inline" > /dev/null |
122 |
+dnl ********************* |
123 |
+dnl gstreamer |
124 |
+dnl ********************* |
125 |
+AC_ARG_ENABLE([audio-inline], |
126 |
+ AC_HELP_STRING([--disable-audio-inline], |
127 |
+ [Disable audio-inline plugin @<:@default=yes@:>@]), |
128 |
+ [enable_audio_inline="$enableval"], [enable_audio_inline=yes]) |
129 |
+ |
130 |
+if test "x$enable_audio_inline" = "xyes" |
131 |
then |
132 |
- if ${PKG_CONFIG} --exists gstreamer-0.10 |
133 |
- then |
134 |
- dnl ********************* |
135 |
- dnl gstreamer |
136 |
- dnl ********************* |
137 |
- PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10]) |
138 |
- AC_SUBST(GSTREAMER_CFLAGS) |
139 |
- AC_SUBST(GSTREAMER_LIBS) |
140 |
- else |
141 |
- plugins_enabled=`echo $plugins_enabled | sed -e "s/audio-inline//g"` |
142 |
- echo "warning: gstreamer was not found, audio-inline plugin will not be built." |
143 |
- echo "you are probably missing gstreamer-devel package." |
144 |
- fi |
145 |
+ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, have_gst=yes, have_gst=no) |
146 |
+ AC_SUBST(GSTREAMER_CFLAGS) |
147 |
+ AC_SUBST(GSTREAMER_LIBS) |
148 |
+ |
149 |
+ if test "$have_gst" = "yes"; then |
150 |
+ plugins_enabled="$plugins_enabled audio-inline" |
151 |
+ msg_plugins="$msg_plugins (audio-inline)" |
152 |
+ else |
153 |
+ AC_MSG_WARN([gstreamer was not found, audio-inline plugin will not be built. |
154 |
+ You are probably missing gstreamer-devel package.]) |
155 |
+ fi |
156 |
fi |
157 |
|
158 |
-if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then |
159 |
+ |
160 |
+if test "x$enable_exchange" = "xyes"; then |
161 |
PKG_CHECK_MODULES([LIBEXCHANGESTORAGE], [libexchange-storage-$EDS_PACKAGE >= eds_minimum_version], [have_libexchange="yes"], [have_libexchange="no"]) |
162 |
if test "x$have_libexchange" = "xyes"; then |
163 |
dnl ************************************************** |
164 |
@@ -1799,23 +1801,35 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then |
165 |
fi |
166 |
fi |
167 |
|
168 |
-if echo ${plugins_enabled} | grep "pst-import" > /dev/null |
169 |
+dnl ********************* |
170 |
+dnl libpst |
171 |
+dnl ********************* |
172 |
+ |
173 |
+AC_ARG_ENABLE([pst-import], |
174 |
+ AC_HELP_STRING([--disable-pst-import], |
175 |
+ [Disable pst import plugin @<:@default=yes@:>@]), |
176 |
+ [enable_pst="$enableval"], [enable_pst=yes]) |
177 |
+ |
178 |
+if test "x$enable_pst" = "xyes" |
179 |
then |
180 |
- if ${PKG_CONFIG} --exists libpst |
181 |
- then |
182 |
- dnl ********************* |
183 |
- dnl libpst |
184 |
- dnl ********************* |
185 |
- PKG_CHECK_MODULES([LIBPST], [libpst >= libpst_minimum_version]) |
186 |
- AC_SUBST(LIBPST_CFLAGS) |
187 |
- AC_SUBST(LIBPST_LIBS) |
188 |
- else |
189 |
- plugins_enabled=`echo $plugins_enabled | sed -e "s/pst-import//g"` |
190 |
- echo "warning: libpst was not found, pst-import plugin will not be built." |
191 |
- echo "you are probably missing libpst-devel package." |
192 |
- fi |
193 |
+ PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no) |
194 |
+ AC_SUBST(LIBPST_CFLAGS) |
195 |
+ AC_SUBST(LIBPST_LIBS) |
196 |
+ |
197 |
+ if test "$have_pst" = "yes"; then |
198 |
+ plugins_enabled="$plugins_enabled pst-import" |
199 |
+ msg_plugins="$msg_plugins (pst-import)" |
200 |
+ else |
201 |
+ AC_MSG_WARN([libpst was not found, pst-import plugin will not be built. |
202 |
+ You are probably missing libpst-devel package.]) |
203 |
+ fi |
204 |
fi |
205 |
|
206 |
+AC_SUBST(plugins_enabled) |
207 |
+AC_SUBST(all_plugins_base) |
208 |
+AC_SUBST(all_plugins_standard) |
209 |
+AC_SUBST(all_plugins_experimental) |
210 |
+ |
211 |
dnl *********** |
212 |
dnl GConf stuff |
213 |
dnl *********** |
214 |
-- |
215 |
1.6.5.rc2 |