Compare commits
286 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c43580f77 | ||
|
|
a485cde8d2 | ||
|
|
984c082a4a | ||
|
|
0b85490400 | ||
|
|
e96e01d89c | ||
|
|
9a02da726b | ||
|
|
b6316f0d61 | ||
|
|
b150c7f93f | ||
|
|
1ec7fe02ac | ||
|
|
cc74a292b6 | ||
|
|
8d7c63d472 | ||
|
|
a167a13c49 | ||
|
|
eac5f5381a | ||
|
|
b763edfc69 | ||
|
|
399118cf1a | ||
|
|
1b2dcdb774 | ||
|
|
2b76adb6fb | ||
|
|
142e8b59ce | ||
|
|
75da879e46 | ||
|
|
d148c78e2a | ||
|
|
c028e25e36 | ||
|
|
9743ead8f3 | ||
|
|
3dd073cda3 | ||
|
|
5343d971e1 | ||
|
|
d3e47d3088 | ||
|
|
2097a6e4ed | ||
|
|
94619c361f | ||
|
|
3fb2d0402b | ||
|
|
dac6de3858 | ||
|
|
66d7a4c6a2 | ||
|
|
920b04003d | ||
|
|
4b9b71db69 | ||
|
|
6aba648d1d | ||
|
|
5ab7ebe2d6 | ||
|
|
e6a9f7854c | ||
|
|
d66ffdba8c | ||
|
|
dba1a573f9 | ||
|
|
85ae6ddbcc | ||
|
|
96192b5ebe | ||
|
|
4a21eb4e73 | ||
|
|
f343b7d042 | ||
|
|
cbd7978593 | ||
|
|
35b1e39396 | ||
|
|
94b7d02ae6 | ||
|
|
62aa5fee9d | ||
|
|
f1d990a2a3 | ||
|
|
b2c19b10ca | ||
|
|
6118b98b2f | ||
|
|
833a21f7e0 | ||
|
|
a0a96af9e3 | ||
|
|
85f99bf210 | ||
|
|
2839058c81 | ||
|
|
465dc8b552 | ||
|
|
128b437b59 | ||
|
|
5f594361b0 | ||
|
|
03d14d0dde | ||
|
|
2142967252 | ||
|
|
99431c4c71 | ||
|
|
f8afc027ec | ||
|
|
f4bcb14fb9 | ||
|
|
f53283e4b6 | ||
|
|
d27f3a3618 | ||
|
|
067799c686 | ||
|
|
e71d9f2208 | ||
|
|
c7bbe3fb62 | ||
|
|
f0cc6e1d83 | ||
|
|
b0a176ba9c | ||
|
|
7b81ae4e19 | ||
|
|
8c5ea8c543 | ||
|
|
757aeece0e | ||
|
|
3ee812cbed | ||
|
|
ccacb1c349 | ||
|
|
028c80efcb | ||
|
|
a262612227 | ||
|
|
0747cea409 | ||
|
|
377014ebd4 | ||
|
|
8eb691149b | ||
|
|
3934420b3c | ||
|
|
e4a015cb0d | ||
|
|
2a08fd0fd6 | ||
|
|
e4d74fc368 | ||
|
|
8db144cf83 | ||
|
|
90276bd075 | ||
|
|
9d9cb45655 | ||
|
|
5872f97d17 | ||
|
|
a907cced91 | ||
|
|
b5a535891e | ||
|
|
483aa3bdd0 | ||
|
|
e2768c8955 | ||
|
|
041e2e033f | ||
|
|
694cc17198 | ||
|
|
309fa2b63e | ||
|
|
d2805d52d6 | ||
|
|
0ebf9eec51 | ||
|
|
dd6e5b22bb | ||
|
|
f03f5e6d5d | ||
|
|
2dbea5a9cc | ||
|
|
e191be3188 | ||
|
|
94dccfdf96 | ||
|
|
e6383f64f6 | ||
|
|
085d0a5ca3 | ||
|
|
40034cda8c | ||
|
|
82fc4dba16 |
||
|
|
d1a8e25c1b | ||
|
|
58837002c6 | ||
|
|
3b069f56c9 | ||
|
|
fa37715a0b | ||
|
|
08bdc4c973 | ||
|
|
a8e8708a2a |
||
|
|
97079f55ec | ||
|
|
3fef373d47 | ||
|
|
5c6c34c87f | ||
|
|
461c016e27 | ||
|
|
3a2a9ca9bd | ||
|
|
8fcf959670 | ||
|
|
7bc39e254a | ||
|
|
223d147c3f | ||
|
|
5f5764aa96 | ||
|
|
e7b0b89958 | ||
|
|
cded12c82f | ||
|
|
dc7980ff4e | ||
|
|
926fb3c7a9 | ||
|
|
75f7ac63ed | ||
|
|
51da7b6a76 | ||
|
|
c423ca6b67 | ||
|
|
3843f64fea | ||
|
|
fb4509bdb2 | ||
|
|
86d04b20fd | ||
|
|
e64c8a4fa4 | ||
|
|
c1397a8862 | ||
|
|
4af5097987 | ||
|
|
139076b8f0 | ||
|
|
260259b146 | ||
|
|
45e514ef04 | ||
|
|
ec2a2b0271 | ||
|
|
ce77a0418a | ||
|
|
e1ade46049 | ||
|
|
c9c5188faa | ||
|
|
8df5cd0f6d | ||
|
|
6c7b609936 | ||
|
|
685ae11132 | ||
|
|
4db00e385a | ||
|
|
2bbb579b04 | ||
|
|
2c62413444 | ||
|
|
f949fcdd6d | ||
|
|
910669d20d | ||
|
|
4593d93bd2 | ||
|
|
94696ff516 | ||
|
|
43b3efa37d | ||
|
|
5a0aeeb769 | ||
|
|
00125089c8 | ||
|
|
f5528af470 | ||
|
|
0b3ebe1869 | ||
|
|
5487933e14 | ||
|
|
bc4e04ddc2 |
||
|
|
d0d4ca7b18 | ||
|
|
c1874eab10 | ||
|
|
4d04bc5858 | ||
|
|
7180276e16 | ||
|
|
546e48c9aa | ||
|
|
bca21c79fb | ||
|
|
e3f54b98d3 | ||
|
|
35f1854fc3 | ||
|
|
2cbfa27cad | ||
|
|
4c0576c0e9 | ||
|
|
5a2e3fe03c | ||
|
|
3278e47c95 | ||
|
|
f57fa988d1 | ||
|
|
c58ae334a2 | ||
|
|
274681f206 | ||
|
|
07b198b7d7 | ||
|
|
5fe8ed1ba0 | ||
|
|
4db821e61f | ||
|
|
0826fc41c2 | ||
|
|
b35ae4759d | ||
|
|
08634aa4a7 | ||
|
|
ece73378e2 | ||
|
|
1371091dd1 | ||
|
|
4680cdd201 | ||
|
|
e59357c6c8 |
||
|
|
35158c0499 |
||
|
|
fe1f15fc48 | ||
|
|
6b13d190a6 | ||
|
|
1c5ae90ff1 | ||
|
|
16463de300 | ||
|
|
0e04492ff4 | ||
|
|
6fd4e3e138 | ||
|
|
c02662d6cd | ||
|
|
f92c864c73 | ||
|
|
a5fa200c8f | ||
|
|
1655c34839 | ||
|
|
98e2e3564b | ||
|
|
9a33dde60d | ||
|
|
4af3e1fb2f | ||
|
|
3a4128e0f9 | ||
|
|
944ed78ad4 | ||
|
|
c387b14adb | ||
|
|
d21c532c22 | ||
|
|
033eceb1c0 | ||
|
|
a84732fea9 | ||
|
|
82d3f7de2f | ||
|
|
6f4d594b8e | ||
|
|
54b54ba63c | ||
|
|
f38bf58183 | ||
|
|
62ef73354b | ||
|
|
3bc553e38e | ||
|
|
b3a2af25ad | ||
|
|
6d266770f0 | ||
|
|
ab9be396d8 | ||
|
|
5b3dd3995f | ||
|
|
31a70d8a26 | ||
|
|
15a4d36b18 | ||
|
|
b85365031d | ||
|
|
e90e472f8a | ||
|
|
0a0935f383 | ||
|
|
142ebb9bf7 | ||
|
|
832d895b17 | ||
|
|
e3627764f6 | ||
|
|
3dd8772098 | ||
|
|
c0dbee3bf3 | ||
|
|
949618baa0 | ||
|
|
5e6effdfd8 | ||
|
|
0b19259e8b | ||
|
|
cdc90255e8 | ||
|
|
3df91f31e5 | ||
|
|
358a64f5a6 | ||
|
|
1c2228543d | ||
|
|
89372a60e2 | ||
|
|
88dcc2bbb4 | ||
|
|
3a18b59c59 | ||
|
|
8bfeae5c3d | ||
|
|
90e3bb0fca | ||
|
|
db82a9b77a | ||
|
|
a027215d70 | ||
|
|
1dc083f748 | ||
|
|
3f0ea01c18 | ||
|
|
eeabfae1c9 | ||
|
|
5b771a4b32 | ||
|
|
2739683f6c | ||
|
|
84ba7a4d46 | ||
|
|
8e693f88f8 | ||
|
|
881f6ea4e6 | ||
|
|
1e1f170231 | ||
|
|
210618e56c | ||
|
|
3b05bca8ec | ||
|
|
1f9279186b | ||
|
|
46eb226a68 | ||
|
|
b41f7c2848 | ||
|
|
4c2158e83a | ||
|
|
c58e965045 | ||
|
|
2d5098ed6e | ||
|
|
edf024988d | ||
|
|
1802d2033d | ||
|
|
e97342f0b1 | ||
|
|
3c4af4773c | ||
|
|
1253206170 | ||
|
|
fe3e334b69 | ||
|
|
b6796b2079 | ||
|
|
63e0678ac4 | ||
|
|
a23db7ba17 | ||
|
|
9960903b24 | ||
|
|
7406d60b3b | ||
|
|
a94f71f8e7 | ||
|
|
c6898fce46 | ||
|
|
6c3e449024 | ||
|
|
5c781df2ff | ||
|
|
770f32eb1b | ||
|
|
27ed552d1c | ||
|
|
8bcd0c22b3 | ||
|
|
ae9de4ed5b | ||
|
|
dd0644fb87 | ||
|
|
2f435143e8 | ||
|
|
d73ddbba36 | ||
|
|
f9369eb29e | ||
|
|
6475803cbd | ||
|
|
6f355c3b62 | ||
|
|
5fab70e271 | ||
|
|
7d6f6c1819 | ||
|
|
9ec6659394 | ||
|
|
2f8441542b | ||
|
|
6a927c0109 | ||
|
|
a90efe993b | ||
|
|
91b1e2ee92 | ||
|
|
7b2ffd1352 | ||
|
|
f54cc9e68b | ||
|
|
831aad1270 |
12 changed files with 397 additions and 3133 deletions
78
.gitignore
vendored
78
.gitignore
vendored
|
|
@ -1,77 +1 @@
|
|||
evolution-2.31.5.tar.bz2
|
||||
/evolution-2.31.91.tar.bz2
|
||||
/evolution-2.31.92.tar.bz2
|
||||
/evolution-2.91.0.tar.bz2
|
||||
/evolution-2.91.1.tar.bz2
|
||||
/evolution-2.91.2.tar.bz2
|
||||
/evolution-2.91.3.tar.bz2
|
||||
/evolution-2.91.4.tar.bz2
|
||||
/evolution-2.91.5.tar.bz2
|
||||
/evolution-2.91.6.tar.bz2
|
||||
/evolution-2.91.6.1.tar.bz2
|
||||
/evolution-2.91.6.2.tar.bz2
|
||||
/evolution-2.91.90.tar.bz2
|
||||
/evolution-2.91.91.tar.bz2
|
||||
/evolution-2.91.92.tar.bz2
|
||||
/evolution-3.0.0.tar.bz2
|
||||
/evolution-3.1.1.tar.bz2
|
||||
/evolution-3.1.2.tar.bz2
|
||||
/evolution-3.1.3.tar.bz2
|
||||
/evolution-3.1.4.tar.bz2
|
||||
/evolution-3.1.5.tar.bz2
|
||||
/evolution-3.1.90.tar.xz
|
||||
/evolution-3.1.91.tar.xz
|
||||
/evolution-3.1.92.tar.xz
|
||||
/evolution-3.2.0.tar.xz
|
||||
/evolution-3.3.1.tar.xz
|
||||
/evolution-3.3.2.tar.xz
|
||||
/evolution-3.3.3.tar.xz
|
||||
/evolution-3.3.4.tar.xz
|
||||
/evolution-3.3.5.tar.xz
|
||||
/evolution-3.3.90.tar.xz
|
||||
/evolution-3.3.91.tar.xz
|
||||
/evolution-3.3.92.tar.xz
|
||||
/evolution-3.4.0.tar.xz
|
||||
/evolution-3.4.0.1.tar.xz
|
||||
/evolution-3.4.1.tar.xz
|
||||
/evolution-3.5.1.tar.xz
|
||||
/evolution-3.5.2.tar.xz
|
||||
/evolution-3.5.3.tar.xz
|
||||
/evolution-3.5.3.1.tar.xz
|
||||
/evolution-3.5.4.tar.xz
|
||||
/evolution-3.5.5.tar.xz
|
||||
/evolution-3.5.90.tar.xz
|
||||
/evolution-3.5.91.tar.xz
|
||||
/evolution-3.5.92.tar.xz
|
||||
/evolution-3.6.0.tar.xz
|
||||
/evolution-3.7.1.tar.xz
|
||||
/evolution-3.7.2.tar.xz
|
||||
/evolution-3.7.3.1.tar.xz
|
||||
/evolution-3.7.3.2.tar.xz
|
||||
/evolution-3.7.4.tar.xz
|
||||
/evolution-3.7.5.tar.xz
|
||||
/evolution-3.7.90.tar.xz
|
||||
/evolution-3.7.91.tar.xz
|
||||
/evolution-3.7.92.tar.xz
|
||||
/evolution-3.8.0.tar.xz
|
||||
/evolution-3.9.1.tar.xz
|
||||
/evolution-3.9.2.tar.xz
|
||||
/evolution-3.9.3.tar.xz
|
||||
/evolution-3.9.4.tar.xz
|
||||
/evolution-3.9.5.tar.xz
|
||||
/evolution-3.9.90.tar.xz
|
||||
/evolution-3.9.91.tar.xz
|
||||
/evolution-3.9.92.tar.xz
|
||||
/evolution-3.10.0.tar.xz
|
||||
/evolution-3.10.1.tar.xz
|
||||
/evolution-3.11.1.tar.xz
|
||||
/evolution-3.11.2.tar.xz
|
||||
/evolution-3.11.4.tar.xz
|
||||
/evolution-3.11.5.tar.xz
|
||||
/evolution-3.11.90.tar.xz
|
||||
/evolution-3.11.91.tar.xz
|
||||
/evolution-3.11.92.tar.xz
|
||||
/evolution-3.12.0.tar.xz
|
||||
/evolution-3.12.1.tar.xz
|
||||
/evolution-3.12.2.tar.xz
|
||||
/evolution-3.12.3.tar.xz
|
||||
/evolution-*.tar.xz
|
||||
|
|
|
|||
42
configurable-dbus-prefix.patch
Normal file
42
configurable-dbus-prefix.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
diff -up evolution-3.48.1 evolution-3.48
|
||||
diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
|
||||
diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
|
||||
--- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 2023-11-27 13:12:25.099463743 -0500
|
||||
+++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c 2023-11-27 13:14:38.640243434 -0500
|
||||
@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
|
||||
g_string_free (tmp, TRUE);
|
||||
tmp = NULL;
|
||||
|
||||
- base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
|
||||
+ base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
|
||||
|
||||
if (!base_filename || !*base_filename) {
|
||||
g_free (base_filename);
|
||||
@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
|
||||
|
||||
while (!tmp) {
|
||||
const gchar *name;
|
||||
+ gchar *name_down;
|
||||
|
||||
name = g_dir_read_name (dir);
|
||||
+ name_down = g_ascii_strdown (name, -1);
|
||||
|
||||
if (!name)
|
||||
break;
|
||||
|
||||
- if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
|
||||
- g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
|
||||
+ if (strstr (name_down, base_filename) != NULL &&
|
||||
+ strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
|
||||
gchar *filename;
|
||||
|
||||
filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
|
||||
@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
|
||||
g_free (str);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ g_free (name_down);
|
||||
}
|
||||
|
||||
g_free (base_filename);
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure
|
||||
--- evolution-2.31.1/configure.ldaphack 2010-05-03 12:43:34.000000000 +0200
|
||||
+++ evolution-2.31.1/configure 2010-05-03 19:22:55.000000000 +0200
|
||||
@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -1,150 +0,0 @@
|
|||
diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c
|
||||
--- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200
|
||||
+++ evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c 2014-04-14 11:15:36.606320997 +0200
|
||||
@@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e
|
||||
g_signal_connect (
|
||||
widget, "clicked",
|
||||
G_CALLBACK (show_help_cb), e_contact_editor);
|
||||
+ if (!e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_widget_set_sensitive (widget, FALSE);
|
||||
+ gtk_widget_hide (widget);
|
||||
+ }
|
||||
+
|
||||
widget = e_builder_get_widget (
|
||||
e_contact_editor->priv->builder, "button-web-expand");
|
||||
g_signal_connect_swapped (
|
||||
diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.12.1/calendar/gui/dialogs/comp-editor.c
|
||||
--- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200
|
||||
+++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200
|
||||
@@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor)
|
||||
G_BINDING_SYNC_CREATE);
|
||||
}
|
||||
|
||||
+ action = gtk_action_group_get_action (action_group, "help");
|
||||
+ if (action && !e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_action_set_visible (action, FALSE);
|
||||
+ gtk_action_set_sensitive (action, FALSE);
|
||||
+ }
|
||||
+
|
||||
action_group = gtk_action_group_new ("individual");
|
||||
gtk_action_group_set_translation_domain (
|
||||
action_group, GETTEXT_PACKAGE);
|
||||
diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e-util/e-misc-utils.c
|
||||
--- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200
|
||||
+++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200
|
||||
@@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind
|
||||
return success;
|
||||
}
|
||||
|
||||
+gboolean
|
||||
+e_misc_utils_is_help_package_installed (void)
|
||||
+{
|
||||
+ gboolean is_installed;
|
||||
+ gchar *path;
|
||||
+
|
||||
+ /* Viewing user documentation requires the evolution-help
|
||||
+ * package. Look for one of the files it installs. */
|
||||
+ path = g_build_filename (EVOLUTION_DATADIR, "help", "C", PACKAGE, "index.page", NULL);
|
||||
+
|
||||
+ is_installed = g_file_test (path, G_FILE_TEST_IS_REGULAR);
|
||||
+
|
||||
+ g_free (path);
|
||||
+
|
||||
+ return is_installed;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* e_binding_transform_text_non_null:
|
||||
* @binding: a #GBinding
|
||||
diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e-util/e-misc-utils.h
|
||||
--- evolution-3.12.1/e-util/e-misc-utils.h.help-contents 2014-04-14 11:15:36.607320997 +0200
|
||||
+++ evolution-3.12.1/e-util/e-misc-utils.h 2014-04-14 11:16:06.930319775 +0200
|
||||
@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour
|
||||
GValue *target_value,
|
||||
ESourceRegistry *registry);
|
||||
|
||||
+gboolean e_misc_utils_is_help_package_installed (void);
|
||||
+
|
||||
gboolean e_binding_transform_text_non_null
|
||||
(GBinding *binding,
|
||||
const GValue *source_value,
|
||||
diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution-3.12.1/e-util/e-preferences-window.c
|
||||
--- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100
|
||||
+++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200
|
||||
@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW
|
||||
GTK_BUTTON_BOX (container), widget, TRUE);
|
||||
gtk_widget_show (widget);
|
||||
|
||||
+ if (!e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_widget_set_sensitive (widget, FALSE);
|
||||
+ gtk_widget_hide (widget);
|
||||
+ }
|
||||
+
|
||||
widget = e_dialog_button_new_with_icon ("window-close", _("_Close"));
|
||||
g_signal_connect_swapped (
|
||||
widget, "clicked",
|
||||
diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1/e-util/e-send-options.c
|
||||
--- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200
|
||||
+++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200
|
||||
@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod)
|
||||
{
|
||||
ESendOptionsDialogPrivate *priv;
|
||||
GtkBuilder *builder;
|
||||
+ GtkWidget *helpbutton;
|
||||
|
||||
priv = sod->priv;
|
||||
builder = sod->priv->builder;
|
||||
@@ -478,6 +479,12 @@ get_widgets (ESendOptionsDialog *sod)
|
||||
priv->accepted_label = e_builder_get_widget (builder, "accepted-label");
|
||||
priv->completed_label = e_builder_get_widget (builder, "completed-label");
|
||||
|
||||
+ helpbutton = e_builder_get_widget (builder, "helpbutton1");
|
||||
+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_widget_set_sensitive (helpbutton, FALSE);
|
||||
+ gtk_widget_hide (helpbutton);
|
||||
+ }
|
||||
+
|
||||
return (priv->priority
|
||||
&& priv->security
|
||||
&& priv->status
|
||||
diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.12.1/plugins/email-custom-header/email-custom-header.c
|
||||
--- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100
|
||||
+++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200
|
||||
@@ -118,6 +118,8 @@ static gboolean
|
||||
epech_get_widgets (CustomHeaderOptionsDialog *mch)
|
||||
{
|
||||
CustomHeaderOptionsDialogPrivate *priv;
|
||||
+ GtkWidget *helpbutton;
|
||||
+
|
||||
priv = mch->priv;
|
||||
|
||||
#define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name)
|
||||
@@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi
|
||||
|
||||
priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
|
||||
priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
|
||||
+
|
||||
+ helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1");
|
||||
+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_widget_set_sensitive (helpbutton, FALSE);
|
||||
+ gtk_widget_hide (helpbutton);
|
||||
+ }
|
||||
+
|
||||
#undef EMAIL_CUSTOM_HEADER
|
||||
|
||||
return (priv->page
|
||||
diff -up evolution-3.12.1/shell/e-shell-window-actions.c.help-contents evolution-3.12.1/shell/e-shell-window-actions.c
|
||||
--- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100
|
||||
+++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200
|
||||
@@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo
|
||||
if (path == NULL)
|
||||
gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
|
||||
g_free (path);
|
||||
+
|
||||
+ if (!e_misc_utils_is_help_package_installed ()) {
|
||||
+ gtk_action_set_visible (ACTION (CONTENTS), FALSE);
|
||||
+ gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
|
||||
+ }
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff -up evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep evolution-3.12.3/configure.ac
|
||||
--- evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep 2014-06-09 11:33:17.814864320 +0200
|
||||
+++ evolution-3.12.3/configure.ac 2014-06-09 11:33:44.925863171 +0200
|
||||
@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4.
|
||||
m4_define([gdk_pixbuf_minimum_version], [2.24.0])
|
||||
m4_define([gcr_minimum_version], [3.4])
|
||||
m4_define([gnome_desktop_minimum_version], [2.91.3])
|
||||
-m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
|
||||
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
|
||||
m4_define([webkitgtk_minimum_version], [2.0.1])
|
||||
m4_define([libgdata_minimum_version], [0.10])
|
||||
@@ -486,11 +485,6 @@ fi
|
||||
AC_CHECK_FUNCS(mkdtemp)
|
||||
|
||||
dnl **************************************************
|
||||
-dnl Gnome Icon Theme
|
||||
-dnl **************************************************
|
||||
-PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
|
||||
-
|
||||
-dnl **************************************************
|
||||
dnl Accessibility support
|
||||
dnl **************************************************
|
||||
PKG_CHECK_MODULES([A11Y], [atk])
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 33dd6d93ca6e4fa3f1d3b846650504d419d88f9b Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Keller <sebastian-keller@gmx.de>
|
||||
Date: Tue, 17 Jun 2014 10:07:48 +0200
|
||||
Subject: Bug 731549 - EMFolderTree: Text column doesn't expand with recent
|
||||
gtk+
|
||||
|
||||
gtk commit 73ff6a8e0ff307b8d14986c64918022364ff10e7 removed the code
|
||||
that made the column expand previously, resulting in only ellipses being
|
||||
shown.
|
||||
|
||||
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
|
||||
index 5b5a3b9..a8967d6 100644
|
||||
--- a/mail/em-folder-tree.c
|
||||
+++ b/mail/em-folder-tree.c
|
||||
@@ -1259,6 +1259,7 @@ folder_tree_constructed (GObject *object)
|
||||
priv->selection_changed_handler_id = handler_id;
|
||||
|
||||
column = gtk_tree_view_column_new ();
|
||||
+ gtk_tree_view_column_set_expand (column, TRUE);
|
||||
gtk_tree_view_column_set_sizing (
|
||||
column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column (tree_view, column);
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
From 5f197603700d0e0cbfc2dab7c4750fd04c41de25 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Keller <sebastian-keller@gmx.de>
|
||||
Date: Mon, 23 Jun 2014 11:39:46 +0200
|
||||
Subject: Bug 731872 - EWebView: Use named colors from themes
|
||||
|
||||
|
||||
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
|
||||
index 8703ee1..7615db4 100644
|
||||
--- a/e-util/e-web-view.c
|
||||
+++ b/e-util/e-web-view.c
|
||||
@@ -574,20 +574,20 @@ style_updated_cb (EWebView *web_view)
|
||||
gchar *style;
|
||||
GtkStateFlags state_flags;
|
||||
GtkStyleContext *style_context;
|
||||
- GtkWidgetPath *widget_path;
|
||||
+ gboolean backdrop;
|
||||
|
||||
state_flags = gtk_widget_get_state_flags (GTK_WIDGET (web_view));
|
||||
- style_context = gtk_style_context_new ();
|
||||
- widget_path = gtk_widget_path_new ();
|
||||
- gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
|
||||
- gtk_style_context_set_path (style_context, widget_path);
|
||||
- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
|
||||
-
|
||||
- gtk_style_context_get_background_color (
|
||||
- style_context,
|
||||
- state_flags | GTK_STATE_FLAG_FOCUSED,
|
||||
- &color);
|
||||
- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
|
||||
+ style_context = gtk_widget_get_style_context (GTK_WIDGET (web_view));
|
||||
+ backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0;
|
||||
+
|
||||
+ if (gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_base_color" : "theme_base_color",
|
||||
+ &color))
|
||||
+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
|
||||
+ else
|
||||
+ color_value = g_strdup("#ffffff");
|
||||
+
|
||||
style = g_strconcat ("background-color: ", color_value, ";", NULL);
|
||||
|
||||
e_web_view_add_css_rule_into_style_sheet (
|
||||
@@ -599,11 +599,14 @@ style_updated_cb (EWebView *web_view)
|
||||
g_free (color_value);
|
||||
g_free (style);
|
||||
|
||||
- gtk_style_context_get_color (
|
||||
- style_context,
|
||||
- state_flags | GTK_STATE_FLAG_FOCUSED,
|
||||
- &color);
|
||||
- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
|
||||
+ if (gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
|
||||
+ &color))
|
||||
+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
|
||||
+ else
|
||||
+ color_value = g_strdup("#000000");
|
||||
+
|
||||
style = g_strconcat ("color: ", color_value, ";", NULL);
|
||||
|
||||
e_web_view_add_css_rule_into_style_sheet (
|
||||
@@ -612,9 +615,6 @@ style_updated_cb (EWebView *web_view)
|
||||
".-e-web-view-text-color",
|
||||
style);
|
||||
|
||||
- gtk_widget_path_free (widget_path);
|
||||
- g_object_unref (style_context);
|
||||
-
|
||||
g_free (color_value);
|
||||
g_free (style);
|
||||
}
|
||||
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
|
||||
index 2efe8eb..a81802b 100644
|
||||
--- a/em-format/e-mail-formatter.c
|
||||
+++ b/em-format/e-mail-formatter.c
|
||||
@@ -489,20 +489,21 @@ mail_formatter_update_style (EMailFormatter *formatter,
|
||||
GtkStyleContext *style_context;
|
||||
GtkWidgetPath *widget_path;
|
||||
GdkRGBA rgba;
|
||||
+ gboolean backdrop;
|
||||
|
||||
g_object_freeze_notify (G_OBJECT (formatter));
|
||||
|
||||
- /* derive colors from top-level window */
|
||||
style_context = gtk_style_context_new ();
|
||||
widget_path = gtk_widget_path_new ();
|
||||
gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
|
||||
gtk_style_context_set_path (style_context, widget_path);
|
||||
- gtk_style_context_invalidate (style_context);
|
||||
+ backdrop = (state & GTK_STATE_FLAG_BACKDROP) != 0;
|
||||
|
||||
- gtk_style_context_save (style_context);
|
||||
- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_TOOLBAR);
|
||||
-
|
||||
- gtk_style_context_get_background_color (style_context, state, &rgba);
|
||||
+ if (!gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_bg_color" : "theme_bg_color",
|
||||
+ &rgba))
|
||||
+ gdk_rgba_parse (&rgba, "#eeeeee");
|
||||
e_mail_formatter_set_color (
|
||||
formatter, E_MAIL_FORMATTER_COLOR_BODY, &rgba);
|
||||
|
||||
@@ -512,20 +513,27 @@ mail_formatter_update_style (EMailFormatter *formatter,
|
||||
e_mail_formatter_set_color (
|
||||
formatter, E_MAIL_FORMATTER_COLOR_FRAME, &rgba);
|
||||
|
||||
- gtk_style_context_restore (style_context);
|
||||
- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
|
||||
-
|
||||
- gtk_style_context_get_color (style_context, state, &rgba);
|
||||
+ if (!gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
|
||||
+ &rgba))
|
||||
+ gdk_rgba_parse (&rgba, "#000000");
|
||||
e_mail_formatter_set_color (
|
||||
formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba);
|
||||
|
||||
- gtk_style_context_get_background_color (
|
||||
- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
|
||||
+ if (!gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_base_color" : "theme_base_color",
|
||||
+ &rgba))
|
||||
+ gdk_rgba_parse (&rgba, "#ffffff");
|
||||
e_mail_formatter_set_color (
|
||||
formatter, E_MAIL_FORMATTER_COLOR_CONTENT, &rgba);
|
||||
|
||||
- gtk_style_context_get_color (
|
||||
- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
|
||||
+ if (!gtk_style_context_lookup_color (
|
||||
+ style_context,
|
||||
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
|
||||
+ &rgba))
|
||||
+ gdk_rgba_parse (&rgba, "#000000");
|
||||
e_mail_formatter_set_color (
|
||||
formatter, E_MAIL_FORMATTER_COLOR_TEXT, &rgba);
|
||||
|
||||
@@ -605,7 +613,7 @@ e_mail_formatter_class_init (EMailFormatterClass *class)
|
||||
gdk_rgba_parse (rgba, "#3f3f3f");
|
||||
|
||||
rgba = &class->colors[E_MAIL_FORMATTER_COLOR_HEADER];
|
||||
- gdk_rgba_parse (rgba, "#eeeeee");
|
||||
+ gdk_rgba_parse (rgba, "#000000");
|
||||
|
||||
rgba = &class->colors[E_MAIL_FORMATTER_COLOR_TEXT];
|
||||
gdk_rgba_parse (rgba, "#000000");
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
2992
evolution.spec
2992
evolution.spec
File diff suppressed because it is too large
Load diff
10
flatpak-evolution-fix-service-names.sh
Executable file
10
flatpak-evolution-fix-service-names.sh
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
# see https://gitlab.gnome.org/GNOME/glib/issues/1737
|
||||
# previous versions used milliseconds instead of seconds as the timeout argument",
|
||||
(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
|
||||
|
||||
sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
|
||||
-e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
|
||||
-e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
|
||||
-e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"
|
||||
29
flatpak-evolution-wrapper.sh.in
Normal file
29
flatpak-evolution-wrapper.sh.in
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
|
||||
/app/bin/evolution.bin "$@"
|
||||
else
|
||||
export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
|
||||
export GIO_USE_NETWORK_MONITOR=base
|
||||
gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
|
||||
|
||||
LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
|
||||
if [ "${LINES}" = "0" ]; then
|
||||
/app/libexec/evolution-source-registry &
|
||||
gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
|
||||
fi
|
||||
|
||||
LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
|
||||
if [ "${LINES}" = "0" ]; then
|
||||
/app/libexec/evolution-addressbook-factory -r &
|
||||
gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
|
||||
fi
|
||||
|
||||
LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
|
||||
if [ "${LINES}" = "0" ]; then
|
||||
/app/libexec/evolution-calendar-factory -r &
|
||||
gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
|
||||
fi
|
||||
|
||||
/app/bin/evolution.bin "$@"
|
||||
fi
|
||||
5
rpminspect.yaml
Normal file
5
rpminspect.yaml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
runpath:
|
||||
allowed_paths:
|
||||
- /usr/lib/evolution
|
||||
- /usr/lib64/evolution
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
7e359b94af6fe5380eb071ec24c486e5 evolution-3.12.3.tar.xz
|
||||
SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue