Patch for bug 341802[Miscellaneous]
Boby Wang <[email protected]>
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Organization | SCERI |
| Message-ID | <1147854351.20378.6.camel@sweeper> |
Hi,
I have attach tow patchs for bug #341802, and you can
view the detail in URL http://bugzilla.gnome.org/show_bug.cgi?id=341802
Thanks!
--
Boby Wang <[email protected]>
SCERI
_______________________________________________
Evolution-patches mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/evolution-patches
20060516-evo-conf.diff
(text/x-patch, 2 KB)
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v retrieving revision 1.391 diff -u -r1.391 ChangeLog --- ChangeLog 15 May 2006 14:16:06 -0000 1.391 +++ ChangeLog 17 May 2006 07:57:18 -0000 @@ -1,3 +1,9 @@ +2006-05-17 Boby Wang <[email protected]> + + ** Fix For #341802 + * configure.in: + To cope with the coexistence of multiple evolution-data-server's version. + 2006-05-15 Harish Krishnaswamy <[email protected]> * configure.in: Append -DLDAP_DEPRECATED to LDAP_CFLAGS and Index: configure.in =================================================================== RCS file: /cvs/gnome/evolution-data-server/configure.in,v retrieving revision 1.173 diff -u -r1.173 configure.in --- configure.in 15 May 2006 14:16:06 -0000 1.173 +++ configure.in 17 May 2006 07:57:19 -0000 @@ -1298,13 +1322,13 @@ dnl --- need to add it to one or more .pc.in files (for Connector, dnl --- etc) -privdatadir='${datadir}'/evolution-data-server-$BASE_VERSION +privdatadir='${datadir}'/evolution-data-server/$BASE_VERSION AC_SUBST(privdatadir) privincludedir='${includedir}'/evolution-data-server-$BASE_VERSION AC_SUBST(privincludedir) -privlibdir='${libdir}'/evolution-data-server-$BASE_VERSION +privlibdir='${libdir}'/evolution-data-server/$BASE_VERSION AC_SUBST(privlibdir) idldir="$datadir/idl/evolution-data-server-$API_VERSION" @@ -1316,7 +1340,7 @@ serverdir="$libdir/bonobo/servers" AC_SUBST(serverdir) -extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions +extensiondir='${libdir}'/evolution-data-server/$API_VERSION/extensions AC_SUBST(extensiondir) gladedir="$privdatadir/glade" @@ -1326,7 +1350,7 @@ AC_SUBST(weatherdatadir) dnl separate camel from e-d-s? or should it be under the same spot? same for now. -camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers +camel_providerdir='${libdir}'/evolution-data-server/$API_VERSION/camel-providers AC_SUBST(camel_providerdir) dnl ************************
20060516-gtkhtml-conf.diff
(text/x-patch, 2.8 KB)
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/gtkhtml/ChangeLog,v retrieving revision 1.324 diff -u -r1.324 ChangeLog --- ChangeLog 15 May 2006 14:47:50 -0000 1.324 +++ ChangeLog 17 May 2006 07:40:41 -0000 @@ -1,3 +1,14 @@ +2006-05-17 Boby Wang <[email protected]> + + ** Fix For #341802 + * art/Makefile.am: + * components/html-editor/Makefile.am: + * src/Makefile.am: + * src/libgtkhtml.pc.in: + The data dir of different version should be in different + directories. That will be a solution to make coexistence + of multiple versions possible. + 2006-05-15 Harish Krishnaswamy <[email protected]> * configure.in: Release 3.11.2 Index: art/Makefile.am =================================================================== RCS file: /cvs/gnome/gtkhtml/art/Makefile.am,v retrieving revision 1.29 diff -u -r1.29 Makefile.am --- art/Makefile.am 22 Jul 2004 17:58:55 -0000 1.29 +++ art/Makefile.am 17 May 2006 07:40:41 -0000 @@ -1,4 +1,4 @@ -iconsdir = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@/icons +iconsdir = $(datadir)/gtkhtml/@GTKHTML_API_VERSION@/icons icons_DATA = \ 16_cut.png \ 24_cut.png \ Index: components/html-editor/Makefile.am =================================================================== RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v retrieving revision 1.109 diff -u -r1.109 Makefile.am --- components/html-editor/Makefile.am 4 Jan 2006 04:03:39 -0000 1.109 +++ components/html-editor/Makefile.am 17 May 2006 07:40:41 -0000 @@ -1,6 +1,6 @@ # Basic setup -gtkhtml_data = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@ +gtkhtml_data = $(datadir)/gtkhtml/@GTKHTML_API_VERSION@ gladedir = $(gtkhtml_data) glade_DATA = gtkhtml-editor-properties.glade Index: src/Makefile.am =================================================================== RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v retrieving revision 1.159 diff -u -r1.159 Makefile.am --- src/Makefile.am 24 Aug 2005 02:58:40 -0000 1.159 +++ src/Makefile.am 17 May 2006 07:40:41 -0000 @@ -6,7 +6,7 @@ NULL= -gtkhtml_data = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@ +gtkhtml_data = $(datadir)/gtkhtml/@GTKHTML_API_VERSION@ gladedir = $(gtkhtml_data) INCLUDES = \ Index: src/libgtkhtml.pc.in =================================================================== RCS file: /cvs/gnome/gtkhtml/src/libgtkhtml.pc.in,v retrieving revision 1.7 diff -u -r1.7 libgtkhtml.pc.in --- src/libgtkhtml.pc.in 1 Oct 2004 05:28:55 -0000 1.7 +++ src/libgtkhtml.pc.in 17 May 2006 07:40:42 -0000 @@ -2,7 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -gtkhtml_datadir=@datadir@/gtkhtml-@GTKHTML_API_VERSION@ +gtkhtml_datadir=@datadir@/gtkhtml/@GTKHTML_API_VERSION@ gtkhtml_apiversion=@GTKHTML_API_VERSION@ Name: libgtkhtml