cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with committed patch upstream.

Browse Source
This commit is contained in:
ajacoutot 2015-04-15 17:02:16 +00:00
parent 502c483e68
commit 3783298b44
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.244 2015/04/13 07:56:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.245 2015/04/15 17:02:16 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= integrated email and PIM software for GNOME
GNOME_PROJECT= evolution
GNOME_VERSION= 3.16.1
REVISION= 0
CATEGORIES= mail

14
mail/evolution/patches/patch-e-util_e-spell-checker_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-e-util_e-spell-checker_h,v 1.2 2015/04/14 06:54:54 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=747824
--- e-util/e-spell-checker.h.orig Fri Apr 3 17:47:03 2015
+++ e-util/e-spell-checker.h Fri Apr 3 17:47:09 2015
@@ -47,7 +47,6 @@
G_BEGIN_DECLS
-typedef struct _ESpellChecker ESpellChecker;
typedef struct _ESpellCheckerPrivate ESpellCheckerPrivate;
typedef struct _ESpellCheckerClass ESpellCheckerClass;

40
mail/evolution/patches/patch-e-util_e-spell-dictionary_h Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-e-util_e-spell-dictionary_h,v 1.1 2015/04/15 17:02:16 ajacoutot Exp $
From cc9a67f5c5585f3a171ea7cfb7e47b6f62f58144 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 15 Apr 2015 18:59:59 +0200
Subject: Bug 747824 - Circular type dependency in e-spell-dictionary.h and e-spell-checker.h
--- e-util/e-spell-dictionary.h.orig Mon Mar 23 08:12:18 2015
+++ e-util/e-spell-dictionary.h Wed Apr 15 12:39:49 2015
@@ -50,8 +50,10 @@ G_BEGIN_DECLS
typedef struct _ESpellDictionary ESpellDictionary;
typedef struct _ESpellDictionaryPrivate ESpellDictionaryPrivate;
typedef struct _ESpellDictionaryClass ESpellDictionaryClass;
-typedef struct _ESpellChecker ESpellChecker;
+/* Forward declaration */
+struct _ESpellChecker;
+
struct _ESpellDictionary {
GObject parent;
ESpellDictionaryPrivate *priv;
@@ -63,7 +65,7 @@ struct _ESpellDictionaryClass {
GType e_spell_dictionary_get_type (void) G_GNUC_CONST;
ESpellDictionary *
- e_spell_dictionary_new (ESpellChecker *spell_checker,
+ e_spell_dictionary_new (struct _ESpellChecker *spell_checker,
EnchantDict *enchant_dict);
guint e_spell_dictionary_hash (ESpellDictionary *dictionary);
gboolean e_spell_dictionary_equal (ESpellDictionary *dictionary1,
@@ -72,7 +74,8 @@ gint e_spell_dictionary_compare (ESpellDictionary *di
ESpellDictionary *dictionary2);
const gchar * e_spell_dictionary_get_name (ESpellDictionary *dictionary);
const gchar * e_spell_dictionary_get_code (ESpellDictionary *dictionary);
-ESpellChecker * e_spell_dictionary_ref_spell_checker
+struct _ESpellChecker *
+ e_spell_dictionary_ref_spell_checker
(ESpellDictionary *dictionary);
gboolean e_spell_dictionary_check_word (ESpellDictionary *dictionary,
const gchar *word,