pool/evolution-data-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=38

Browse Source
This commit is contained in:
OBS User unknown 2008-09-13 03:26:19 +00:00 committed by Git OBS Bridge
parent ddd6a8a87c
commit d050163cbc
4 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
evolution-data-server-show-sexp.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index d511b37..b0d409b 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -483,7 +483,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
/* Sync the db, so that we search the db for changes */
camel_folder_summary_save_to_db (search->folder->summary, ex);
- d(printf ("sexp is : [%s]\n", expr));
+ printf ("sexp is : [%s]\n", expr);
if (g_getenv("SQL_SEARCH_OLD"))
sql_query = camel_sexp_to_sql (expr);
else
@@ -492,7 +492,7 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:"");
camel_db_free_sqlized_string (tmp1);
g_free (sql_query);
- d(printf("Equivalent sql %s\n", tmp));
+ printf("Equivalent sql %s\n", tmp);
matches = g_ptr_array_new();
cdb = (CamelDB *) (search->folder->cdb);
@@ -671,7 +671,6 @@ search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFold
camel_folder_summary_reload_from_db (search->folder->summary, search->priv->ex);
}
- e_sexp_term_eval (f, argv [0]);
for (i=0;i<v->len;i++) {
const char *uid;

15
evolution-data-server-sql-percents.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index b1f2c27..d3e561d 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -363,7 +363,9 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data
value = get_db_safe_string (tstr);
g_free (tstr);
} else if (how == CAMEL_SEARCH_MATCH_EXACT) {
- value = get_db_safe_string(argv[i]->value.string);
+ tstr = g_strdup_printf ("%c%s%c", '%', argv[i]->value.string, '%');
+ value = get_db_safe_string (tstr);
+ g_free (tstr);
}
str = g_strdup_printf("(%s LIKE %s)", headername, value);
g_free(value);

11
evolution-data-server.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Sep 9 15:44:13 CDT 2008 - maw@suse.de
- Add evolution-data-server-sql-percents.patch (even more work on
bnc#418080).
-------------------------------------------------------------------
Tue Sep 9 12:21:34 CDT 2008 - maw@suse.de
- Build with evolution-data-server-show-sexp.patch.
-------------------------------------------------------------------
Mon Sep 8 14:14:19 CDT 2008 - maw@suse.de

20
evolution-data-server.spec
View File

@ -44,7 +44,7 @@ Group: Development/Libraries/GNOME
AutoReqProv: on
Summary: Evolution Data Server
Version: 2.23.92
Release: 1
Release: 3
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.22/%{name}-%{version}.tar.bz2
Patch0: evolution-data-server-configure.patch
# PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable
@ -53,10 +53,14 @@ Patch1: bnc-164367-gw-attachments-appts-throw-error.patch
Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch
# PATCH-FIX-UPSTREAM bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo.
Patch4: bnc-304835-ex-crash-after-restart.patch
# PATCH-FIX-UPSTREAM: bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo.
# PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo.
Patch5: bnc-307861-calendar-auth.diff
# PATCH-FIX-UPSTREAM: bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2
# PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2
Patch9: bgo-530514-check-to-handle-specific-server-response.diff
# PATCH-FIX-UPSTREAM evolution-data-server-show-sexp.patch sragavan@novell.com bnc418080 -- hopefully will be obsolete in the next release; only useful for debugging
Patch10: evolution-data-server-show-sexp.patch
# PATCH-FIX-UPSTREAM evolution-data-server-sql-percents.patch sragavan@novell.com -- should go away in the next release
Patch11: evolution-data-server-sql-percents.patch
# Change patch below if we move away from /opt/gnome
# PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
@ -107,7 +111,10 @@ documentation.
%if 0%{opensuse_bs}
%endif
%lang_package
%prep
%setup -q
%patch0
@ -116,6 +123,8 @@ documentation.
###%patch4
###%patch5
%patch9
%patch10 -p1
%patch11 -p1
%patch99
%build
@ -177,6 +186,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/*
%changelog
* Tue Sep 09 2008 maw@suse.de
- Add evolution-data-server-sql-percents.patch (even more work on
bnc#418080).
* Tue Sep 09 2008 maw@suse.de
- Build with evolution-data-server-show-sexp.patch.
* Mon Sep 08 2008 maw@suse.de
- Update to version 2.23.92:
+ More work on bnc#418080, improvements in the sexp/sql machinery