Compare commits

..

11 commits

Author SHA1 Message Date
Milan Crha
ec06b55c01 Update to 3.12.11 2015-02-09 09:58:04 +01:00
Milan Crha
6b853581f6 Update to 3.12.10 2015-01-12 13:09:37 +01:00
Milan Crha
6b81aedb4c Update to 3.12.9 2014-12-08 09:25:11 +01:00
Milan Crha
c63b4ad1ba Update to 3.12.8 2014-11-10 08:50:44 +01:00
Milan Crha
270ec7d342 Update to 3.12.7 2014-10-13 11:14:31 +02:00
Milan Crha
5020c22f37 Update to 3.12.6 2014-09-08 09:54:45 +02:00
Peter Robinson
13dd56a76f - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 11:40:59 +00:00
Milan Crha
39140eaeb3 Add patch to drop icon theme dependency 2014-08-11 13:26:41 +02:00
Milan Crha
bc15113715 Add BuildRequires for adwaita-icon-theme 2014-08-11 12:49:30 +02:00
Milan Crha
9f8dfb1e5d Update to 3.12.5 2014-08-11 11:24:02 +02:00
Milan Crha
105582a2a9 Update to 3.12.4 2014-07-14 09:16:17 +02:00
10 changed files with 2999 additions and 393 deletions

86
.gitignore vendored
View file

@ -1 +1,85 @@
/evolution-*.tar.xz
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-3.12.4.tar.xz
/evolution-3.12.5.tar.xz
/evolution-3.12.6.tar.xz
/evolution-3.12.7.tar.xz
/evolution-3.12.8.tar.xz
/evolution-3.12.9.tar.xz
/evolution-3.12.10.tar.xz
/evolution-3.12.11.tar.xz

View file

@ -1,42 +0,0 @@
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);

View file

@ -0,0 +1,21 @@
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. */

View file

@ -0,0 +1,150 @@
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 *

View file

@ -0,0 +1,37 @@
diff -up evolution-3.12.5/configure.ac.drop-icon-theme-dep evolution-3.12.5/configure.ac
--- evolution-3.12.5/configure.ac.drop-icon-theme-dep 2014-08-11 13:24:33.451075847 +0200
+++ evolution-3.12.5/configure.ac 2014-08-11 13:25:05.785074477 +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])
@@ -505,25 +504,6 @@ AC_CHECK_HEADERS(sys/wait.h, AC_DEFINE(H
AC_CHECK_FUNCS(mkdtemp)
dnl **************************************************
-dnl Gnome Icon Theme
-dnl **************************************************
-AC_MSG_CHECKING(for icon theme)
-PKG_CHECK_EXISTS([gnome-icon-theme >= gnome_icon_theme_minimum_version],
- have_icon_theme=yes, have_icon_theme=no)
-if test "x$have_icon_theme" != "xyes"; then
- PKG_CHECK_EXISTS([adwaita-icon-theme],
- have_icon_theme=yes, have_icon_theme=no)
-fi
-
-if test "x$have_icon_theme" != "xyes"; then
- AC_MSG_RESULT(no)
- AC_MSG_FAILURE([You need to have gnome-icon-theme or adwaita-icon-theme installed.])
-else
- AC_MSG_RESULT(yes)
-fi
-
-
-dnl **************************************************
dnl Accessibility support
dnl **************************************************
PKG_CHECK_MODULES([A11Y], [atk])

File diff suppressed because it is too large Load diff

View file

@ -1,10 +0,0 @@
#!/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}|"

View file

@ -1,29 +0,0 @@
#!/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

View file

@ -1,5 +0,0 @@
---
runpath:
allowed_paths:
- /usr/lib/evolution
- /usr/lib64/evolution

View file

@ -1 +1 @@
SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
22ceaebe4add813e15253a76939af7f0 evolution-3.12.11.tar.xz