- update evolution-data-server to 2.28.0
commiting now to not stall other work, possible breakage will be dealt with thisweek "commit!" aja@
This commit is contained in:
parent
0d2061bdf8
commit
feafd20e82
@ -1,28 +1,28 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2009/08/20 07:51:46 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2009/10/11 12:42:41 jasper Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= data backends for the Evolution mail/PIM suite
|
||||
|
||||
GNOME_PROJECT= evolution-data-server
|
||||
GNOME_VERSION= 2.24.5
|
||||
PKGNAME= ${DISTNAME}p4
|
||||
GNOME_VERSION= 2.28.0
|
||||
|
||||
CATEGORIES= databases
|
||||
|
||||
SHARED_LIBS += edataserver-1.2 10.0 # .11.0
|
||||
SHARED_LIBS += ebackend-1.2 0.0 # .0.0
|
||||
SHARED_LIBS += edataserver-1.2 10.1 # .11.0
|
||||
SHARED_LIBS += ebackend-1.2 0.1 # .0.0
|
||||
SHARED_LIBS += egroupwise-1.2 13.1 # .13.1
|
||||
SHARED_LIBS += exchange-storage-1.2 3.0 # .3.0
|
||||
SHARED_LIBS += gdata-1.2 0.0 # .1.0
|
||||
SHARED_LIBS += gdata-google-1.2 0.0 # .1.0
|
||||
SHARED_LIBS += camel-1.2 14.0 # .14.0
|
||||
SHARED_LIBS += camel-provider-1.2 14.0 # .14.0
|
||||
SHARED_LIBS += ebook-1.2 12.0 # .12.0
|
||||
SHARED_LIBS += gdata-1.2 1.0 # .1.0
|
||||
SHARED_LIBS += gdata-google-1.2 1.0 # .1.0
|
||||
SHARED_LIBS += camel-1.2 14.1 # .14.1
|
||||
SHARED_LIBS += camel-provider-1.2 14.1 # .14.1
|
||||
SHARED_LIBS += ebook-1.2 12.1 # .12.1
|
||||
SHARED_LIBS += edata-book-1.2 6.1 # .6.1
|
||||
SHARED_LIBS += ecal-1.2 9.1 # .9.1
|
||||
SHARED_LIBS += edata-cal-1.2 6.2 # .6.2
|
||||
SHARED_LIBS += edataserverui-1.2 9.0 # .9.0
|
||||
SHARED_LIBS += edataserverui-1.2 9.1 # .9.1
|
||||
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/projects/evolution/
|
||||
|
||||
@ -35,17 +35,15 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
|
||||
Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
|
||||
asn1 atk-1.0 avahi-client avahi-common avahi-glib \
|
||||
bonobo-2 bonobo-activation c \
|
||||
cairo com_err crypto dbus-1 dbus-glib-1 expat fontconfig \
|
||||
freetype gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
|
||||
glib-2.0 glitz gmodule-2.0 gnomevfs-2 gnutls gobject-2.0 gpg-error gssapi \
|
||||
gthread-2.0 gtk-x11-2.0 krb5 m nspr4 pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pcre pixman-1 plc4 plds4 png popt pthread \
|
||||
sasl2 sqlite3 ssl tasn1 util xml2 z \
|
||||
pthread-stubs xcb
|
||||
WANTLIB += ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor
|
||||
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
|
||||
WANTLIB += asn1 atk-1.0 c cairo com_err crypto dbus-1 dbus-glib-1
|
||||
WANTLIB += expat fontconfig freetype gconf-2 gcrypt gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gpg-error
|
||||
WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-x11-2.0 krb5 m nspr4
|
||||
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4
|
||||
WANTLIB += plds4 png pthread pthread-stubs sasl2 sqlite3 ssl tasn1
|
||||
WANTLIB += xcb xml2 z
|
||||
|
||||
MODULES= devel/gettext \
|
||||
lang/python \
|
||||
@ -58,9 +56,13 @@ LIB_DEPENDS= db:db->=4,<5:databases/db/v4 \
|
||||
ldap,lber::databases/openldap \
|
||||
glade-2.0::devel/libglade2 \
|
||||
soup-2.4::devel/libsoup \
|
||||
gpg-error::security/libgpg-error \
|
||||
gnutls::security/gnutls \
|
||||
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
|
||||
gnome-2::x11/gnome/libgnome \
|
||||
gnome-keyring.>=3::x11/gnome/keyring
|
||||
ical,icalss,icalvcal::textproc/libical \
|
||||
gnome-keyring::x11/gnome/keyring \
|
||||
bonobo-2,bonobo-activation::x11/gnome/libbonobo \
|
||||
gweather::x11/gnome/libgweather
|
||||
|
||||
USE_X11= Yes
|
||||
YACC= bison
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (evolution-data-server-2.24.5.tar.bz2) = zxLwK4zAoV4EbBIeanJQyw==
|
||||
RMD160 (evolution-data-server-2.24.5.tar.bz2) = 1fMvNaUeMohfltT5LXoMb64kmpI=
|
||||
SHA1 (evolution-data-server-2.24.5.tar.bz2) = sd8fNYDjVm0I+vLAk6aF7pd9ZIw=
|
||||
SHA256 (evolution-data-server-2.24.5.tar.bz2) = wiQLlkN/NvNlbaU433YxUQeFZkpudyPL917A+Iw9ONE=
|
||||
SIZE (evolution-data-server-2.24.5.tar.bz2) = 7857405
|
||||
MD5 (evolution-data-server-2.28.0.tar.bz2) = AVqWkpBMNJA0mCxp2QsbNw==
|
||||
RMD160 (evolution-data-server-2.28.0.tar.bz2) = oTirIFusCLZWEa0BzVOp+M61XPc=
|
||||
SHA1 (evolution-data-server-2.28.0.tar.bz2) = 3D/9+5l+fP05Ij0E202tUO04wEQ=
|
||||
SHA256 (evolution-data-server-2.28.0.tar.bz2) = Af6tYEgW+xNa61khaH2Zdz6WYBShfByuIwwwc4bhOBQ=
|
||||
SIZE (evolution-data-server-2.28.0.tar.bz2) = 14469718
|
||||
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-acinclude_m4,v 1.1 2008/10/30 16:36:35 jasper Exp $
|
||||
--- acinclude.m4.orig Thu Oct 30 16:31:26 2008
|
||||
+++ acinclude.m4 Thu Oct 30 16:31:46 2008
|
||||
@@ -204,10 +204,10 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
|
||||
# EVO_PTHREAD_CHECK
|
||||
AC_DEFUN([EVO_PTHREAD_CHECK],[
|
||||
PTHREAD_LIB=""
|
||||
- AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
|
||||
- [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
|
||||
+ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-pthread",
|
||||
+ [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-pthreads",
|
||||
[AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
|
||||
- [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
|
||||
+ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-pthread",
|
||||
[AC_CHECK_FUNC(pthread_create)]
|
||||
)]
|
||||
)]
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.3 2009/02/17 10:56:27 ajacoutot Exp $
|
||||
|
||||
Fix time_t==long assumption.
|
||||
|
||||
--- addressbook/backends/file/e-book-backend-file.c.orig Mon Dec 22 10:49:13 2008
|
||||
+++ addressbook/backends/file/e-book-backend-file.c Tue Feb 17 11:11:15 2009
|
||||
@@ -174,10 +174,10 @@ set_revision (EContact *contact)
|
||||
{
|
||||
char time_string[100] = {0};
|
||||
const struct tm *tm = NULL;
|
||||
- GTimeVal tv;
|
||||
+ time_t t;
|
||||
|
||||
- g_get_current_time (&tv);
|
||||
- tm = gmtime (&tv.tv_sec);
|
||||
+ t = time(0);
|
||||
+ tm = gmtime (&t);
|
||||
if (tm)
|
||||
strftime (time_string, 100, "%Y-%m-%dT%H:%M:%SZ", tm);
|
||||
e_contact_set (contact, E_CONTACT_REV, time_string);
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.1 2009/02/17 10:56:27 ajacoutot Exp $
|
||||
|
||||
Fix time_t==long assumption.
|
||||
|
||||
--- addressbook/backends/vcf/e-book-backend-vcf.c.orig Mon Feb 2 16:13:34 2009
|
||||
+++ addressbook/backends/vcf/e-book-backend-vcf.c Tue Feb 17 11:11:18 2009
|
||||
@@ -218,10 +218,10 @@ set_revision (EContact *contact)
|
||||
{
|
||||
char time_string[100] = {0};
|
||||
const struct tm *tm = NULL;
|
||||
- GTimeVal tv;
|
||||
+ time_t t;
|
||||
|
||||
- g_get_current_time (&tv);
|
||||
- tm = gmtime (&tv.tv_sec);
|
||||
+ t = time(0);
|
||||
+ tm = gmtime (&t);
|
||||
if (tm)
|
||||
strftime (time_string, 100, "%Y-%m-%dT%H:%M:%SZ", tm);
|
||||
e_contact_set (contact, E_CONTACT_REV, time_string);
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-calendar_libical_configure,v 1.4 2009/03/04 20:09:43 jasper Exp $
|
||||
--- calendar/libical/configure.orig Wed Feb 25 03:39:19 2009
|
||||
+++ calendar/libical/configure Wed Feb 25 17:59:18 2009
|
||||
@@ -20970,13 +20970,13 @@ _ACEOF
|
||||
PTHREAD_LIBS=-pthread;;
|
||||
|
||||
*)
|
||||
- { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -21045,7 +21045,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_PTHREAD /**/
|
||||
_ACEOF
|
||||
|
||||
- PTHREAD_LIBS=-lpthread
|
||||
+ PTHREAD_LIBS=-pthread
|
||||
fi;;
|
||||
esac
|
||||
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-calendar_libical_src_libical_icalrecur_c,v 1.2 2007/05/17 14:40:53 jasper Exp $
|
||||
--- calendar/libical/src/libical/icalrecur.c.orig Wed Jan 3 16:02:32 2007
|
||||
+++ calendar/libical/src/libical/icalrecur.c Sun Apr 22 21:11:41 2007
|
||||
@@ -148,6 +148,7 @@
|
||||
#include <string.h> /* for strdup and strchr*/
|
||||
#include <assert.h>
|
||||
#include <stddef.h> /* For offsetof() macro */
|
||||
+#include <inttypes.h> /* for intptr_t */
|
||||
|
||||
#include "pvl.h"
|
||||
|
@ -1,51 +0,0 @@
|
||||
$OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.7 2009/03/04 20:09:43 jasper Exp $
|
||||
--- calendar/libical/src/libical/icaltz-util.c.orig Wed Feb 25 03:15:16 2009
|
||||
+++ calendar/libical/src/libical/icaltz-util.c Wed Feb 25 17:59:18 2009
|
||||
@@ -23,6 +23,14 @@
|
||||
#include <string.h>
|
||||
#if defined(sun) && defined(__SVR4)
|
||||
#include <sys/byteorder.h>
|
||||
+#elif defined(__OpenBSD__)
|
||||
+#include <sys/types.h>
|
||||
+#define __BYTE_ORDER _BYTE_ORDER
|
||||
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
|
||||
+#define __BIG_ENDIAN _BIG_ENDIAN
|
||||
+#define bswap_16 swap16
|
||||
+#define bswap_32 swap32
|
||||
+#define bswap_64 swap64
|
||||
#elif defined(_WIN32)
|
||||
#define BIG_ENDIAN 'B'
|
||||
#define LITTLE_ENDIAN 'l'
|
||||
@@ -98,6 +106,8 @@ decode (const void *ptr)
|
||||
else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
|
||||
#ifdef __linux__
|
||||
return bswap_32 (*(const int *) ptr);
|
||||
+#elif __OpenBSD__
|
||||
+ return swap32 (*(const uint32_t *) ptr);
|
||||
#else
|
||||
return bswap32 (*(const uint32_t *) ptr);
|
||||
#endif
|
||||
@@ -381,7 +391,10 @@ icaltzutil_fetch_timezone (const char *location)
|
||||
icalprop = icalproperty_new_tzname (types [zidx].zname);
|
||||
icalcomponent_add_property (std_comp, icalprop);
|
||||
|
||||
- trans = transitions [stdidx] + types [zidx].gmtoff;
|
||||
+ if (num_trans)
|
||||
+ trans = transitions [stdidx] + types [zidx].gmtoff;
|
||||
+ else
|
||||
+ trans = types [zidx].gmtoff;
|
||||
icaltime = icaltime_from_timet (trans, 0);
|
||||
dtstart = icaltime;
|
||||
dtstart.year = 1970;
|
||||
@@ -424,7 +437,10 @@ icaltzutil_fetch_timezone (const char *location)
|
||||
icalprop = icalproperty_new_tzname (types [zidx].zname);
|
||||
icalcomponent_add_property (dst_comp, icalprop);
|
||||
|
||||
- trans = transitions [dstidx] + types [zidx].gmtoff;
|
||||
+ if (num_trans)
|
||||
+ trans = transitions [dstidx] + types [zidx].gmtoff;
|
||||
+ else
|
||||
+ trans = types [zidx].gmtoff;
|
||||
icaltime = icaltime_from_timet (trans, 0);
|
||||
dtstart = icaltime;
|
||||
dtstart.year = 1970;
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-camel_camel-db_c,v 1.1 2009/02/17 10:56:27 ajacoutot Exp $
|
||||
|
||||
Fix 64-bit time_t problem which can lead to mail database corruption.
|
||||
|
||||
--- camel/camel-db.c.orig Mon Feb 2 04:19:08 2009
|
||||
+++ camel/camel-db.c Tue Feb 17 11:11:12 2009
|
||||
@@ -1213,11 +1213,11 @@ write_mir (CamelDB *cdb, const char *folder_name, Came
|
||||
|
||||
/* NB: UGLIEST Hack. We can't modify the schema now. We are using msg_security (an unsed one to notify of FLAGGED/Dirty infos */
|
||||
|
||||
- ins_query = sqlite3_mprintf ("INSERT OR REPLACE INTO %Q VALUES (%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %ld, %ld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q )",
|
||||
+ ins_query = sqlite3_mprintf ("INSERT OR REPLACE INTO %Q VALUES (%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q )",
|
||||
folder_name, record->uid, record->flags,
|
||||
record->msg_type, record->read, record->deleted, record->replied,
|
||||
record->important, record->junk, record->attachment, record->dirty,
|
||||
- record->size, record->dsent, record->dreceived,
|
||||
+ record->size, (long long)record->dsent, (long long)record->dreceived,
|
||||
record->subject, record->from, record->to,
|
||||
record->cc, record->mlist, record->followup_flag,
|
||||
record->followup_completed_on, record->followup_due_by,
|
12
databases/evolution-data-server/patches/patch-configure_ac
Normal file
12
databases/evolution-data-server/patches/patch-configure_ac
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2009/10/11 12:42:41 jasper Exp $
|
||||
--- configure.ac.orig Sat Oct 10 18:40:55 2009
|
||||
+++ configure.ac Sat Oct 10 18:41:04 2009
|
||||
@@ -1125,7 +1125,7 @@ if test "x${with_krb5}" != "xno"; then
|
||||
LIBS_save="$LIBS"
|
||||
|
||||
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
|
||||
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
|
||||
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
|
||||
sunlibs="-lkrb5 -lgss"
|
||||
AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5],
|
||||
[
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.2 2008/11/24 18:14:29 jasper Exp $
|
||||
--- configure.in.orig Wed Nov 12 07:27:34 2008
|
||||
+++ configure.in Mon Nov 24 17:41:37 2008
|
||||
@@ -1154,7 +1154,7 @@ if test "x${with_krb5}" != "xno"; then
|
||||
LDFLAGS_save="$LDFLAGS"
|
||||
|
||||
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
|
||||
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
|
||||
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
|
||||
sunlibs="-lkrb5 -lgss"
|
||||
AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
|
||||
[
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-docs_reference_camel_Makefile_in,v 1.6 2009/03/04 20:09:43 jasper Exp $
|
||||
--- docs/reference/camel/Makefile.in.orig Wed Feb 25 14:30:28 2009
|
||||
+++ docs/reference/camel/Makefile.in Wed Feb 25 17:59:22 2009
|
||||
@@ -705,8 +705,9 @@ install-data-local:
|
||||
done; \
|
||||
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
|
||||
- which gtkdoc-rebase >/dev/null && \
|
||||
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
|
||||
+ if test "`whereis gtkdoc-rebase`" != ""; then \
|
||||
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
|
||||
+ fi \
|
||||
fi
|
||||
|
||||
uninstall-local:
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libdb_dist_configure,v 1.3 2007/05/17 14:40:53 jasper Exp $
|
||||
--- libdb/dist/configure.orig Wed Jan 3 11:10:02 2007
|
||||
+++ libdb/dist/configure Sun Apr 22 21:11:41 2007
|
||||
@@ -7768,7 +7768,7 @@ _ACEOF
|
||||
$OpenBSD: patch-libdb_dist_configure,v 1.4 2009/10/11 12:42:41 jasper Exp $
|
||||
--- libdb/dist/configure.orig Sat Oct 10 18:42:53 2009
|
||||
+++ libdb/dist/configure Sat Oct 10 19:10:35 2009
|
||||
@@ -7768,17 +7768,17 @@ _ACEOF
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
@ -10,7 +10,10 @@ $OpenBSD: patch-libdb_dist_configure,v 1.3 2007/05/17 14:40:53 jasper Exp $
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
@@ -7778,7 +7778,7 @@ _ACEOF
|
||||
case "$host_os" in
|
||||
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-libedataserver_e-url_c,v 1.1 2009/08/20 07:51:46 ajacoutot Exp $
|
||||
|
||||
Allow '@' in username in CalDav.
|
||||
See http://bugzilla.gnome.org/show_bug.cgi?id=503662
|
||||
|
||||
--- libedataserver/e-url.c.orig Mon Sep 22 12:54:02 2008
|
||||
+++ libedataserver/e-url.c Thu Aug 20 09:46:31 2009
|
||||
@@ -180,6 +180,16 @@ e_uri_new (const char *uri_string)
|
||||
slash = uri_string + strcspn (uri_string, "/#");
|
||||
at = strchr (uri_string, '@');
|
||||
if (at && at < slash) {
|
||||
+ const char *at2;
|
||||
+ /* this is for cases where username contains '@' at it, like:
|
||||
+ http://user@domain.com@server.addr.com/path
|
||||
+ We skip all at-s before the slash here. */
|
||||
+
|
||||
+ while (at2 = strchr (at + 1, '@'), at2 && at2 < slash) {
|
||||
+ at = at2;
|
||||
+ }
|
||||
+ }
|
||||
+ if (at && at < slash) {
|
||||
colon = strchr (uri_string, ':');
|
||||
if (colon && colon < at) {
|
||||
uri->passwd = g_strndup (colon + 1, at - colon - 1);
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-libedataserverui_e-source-selector_c,v 1.1 2009/08/18 13:29:40 ajacoutot Exp $
|
||||
$OpenBSD: patch-libedataserverui_e-source-selector_c,v 1.2 2009/10/11 12:42:41 jasper Exp $
|
||||
|
||||
From upstream git:
|
||||
Remove an assertion in ESourceSelector.
|
||||
@ -6,10 +6,10 @@ Related to bug #541192. Something accessibility-related is causing the
|
||||
assertion to fail. The problem is still unknown, but the logic is more
|
||||
forgiving now.
|
||||
|
||||
--- libedataserverui/e-source-selector.c.orig Tue Aug 18 14:19:19 2009
|
||||
+++ libedataserverui/e-source-selector.c Tue Aug 18 14:21:24 2009
|
||||
@@ -525,18 +525,17 @@ pixbuf_cell_data_func (GtkTreeViewColumn *column,
|
||||
void *data;
|
||||
--- libedataserverui/e-source-selector.c.orig Fri Aug 7 15:20:30 2009
|
||||
+++ libedataserverui/e-source-selector.c Sat Oct 10 19:13:13 2009
|
||||
@@ -523,18 +523,17 @@ pixbuf_cell_data_func (GtkTreeViewColumn *column,
|
||||
gpointer data;
|
||||
|
||||
gtk_tree_model_get (model, iter, 0, &data, -1);
|
||||
+ g_return_if_fail (G_IS_OBJECT (data));
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.16 2009/03/04 20:09:43 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.17 2009/10/11 12:42:41 jasper Exp $
|
||||
include/evolution-data-server-${R}/
|
||||
include/evolution-data-server-${R}/camel/
|
||||
include/evolution-data-server-${R}/camel/camel-address.h
|
||||
@ -194,6 +194,7 @@ include/evolution-data-server-${R}/libecal/
|
||||
include/evolution-data-server-${R}/libecal/e-cal-check-timezones.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-component.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-recur.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-system-timezone.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-time-util.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-types.h
|
||||
include/evolution-data-server-${R}/libecal/e-cal-util.h
|
||||
@ -216,8 +217,10 @@ include/evolution-data-server-${R}/libedata-cal/
|
||||
include/evolution-data-server-${R}/libedata-cal/Evolution-DataServer-Calendar.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-cache.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-factory.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-file-store.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-loader-factory.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-sexp.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-store.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-sync.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend-util.h
|
||||
include/evolution-data-server-${R}/libedata-cal/e-cal-backend.h
|
||||
@ -254,6 +257,7 @@ include/evolution-data-server-${R}/libedataserver/md5-utils.h
|
||||
include/evolution-data-server-${R}/libedataserverui/
|
||||
include/evolution-data-server-${R}/libedataserverui/e-book-auth-util.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-categories-dialog.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-category-completion.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-cell-renderer-color.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-contact-store.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-destination-store.h
|
||||
@ -268,52 +272,6 @@ include/evolution-data-server-${R}/libedataserverui/e-source-option-menu.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-source-selector-dialog.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-source-selector.h
|
||||
include/evolution-data-server-${R}/libedataserverui/e-tree-model-generator.h
|
||||
include/evolution-data-server-${R}/libical/
|
||||
include/evolution-data-server-${R}/libical/ical.h
|
||||
include/evolution-data-server-${R}/libical/icalarray.h
|
||||
include/evolution-data-server-${R}/libical/icalattach.h
|
||||
include/evolution-data-server-${R}/libical/icalcalendar.h
|
||||
include/evolution-data-server-${R}/libical/icalclassify.h
|
||||
include/evolution-data-server-${R}/libical/icalcluster.h
|
||||
include/evolution-data-server-${R}/libical/icalcomponent.h
|
||||
include/evolution-data-server-${R}/libical/icalderivedparameter.h
|
||||
include/evolution-data-server-${R}/libical/icalderivedproperty.h
|
||||
include/evolution-data-server-${R}/libical/icalderivedvalue.h
|
||||
include/evolution-data-server-${R}/libical/icaldirset.h
|
||||
include/evolution-data-server-${R}/libical/icaldirsetimpl.h
|
||||
include/evolution-data-server-${R}/libical/icalduration.h
|
||||
include/evolution-data-server-${R}/libical/icalenums.h
|
||||
include/evolution-data-server-${R}/libical/icalerror.h
|
||||
include/evolution-data-server-${R}/libical/icalfileset.h
|
||||
include/evolution-data-server-${R}/libical/icalfilesetimpl.h
|
||||
include/evolution-data-server-${R}/libical/icalgauge.h
|
||||
include/evolution-data-server-${R}/libical/icalgaugeimpl.h
|
||||
include/evolution-data-server-${R}/libical/icallangbind.h
|
||||
include/evolution-data-server-${R}/libical/icalmemory.h
|
||||
include/evolution-data-server-${R}/libical/icalmessage.h
|
||||
include/evolution-data-server-${R}/libical/icalmime.h
|
||||
include/evolution-data-server-${R}/libical/icalparameter.h
|
||||
include/evolution-data-server-${R}/libical/icalparser.h
|
||||
include/evolution-data-server-${R}/libical/icalperiod.h
|
||||
include/evolution-data-server-${R}/libical/icalproperty.h
|
||||
include/evolution-data-server-${R}/libical/icalrecur.h
|
||||
include/evolution-data-server-${R}/libical/icalrestriction.h
|
||||
include/evolution-data-server-${R}/libical/icalset.h
|
||||
include/evolution-data-server-${R}/libical/icalspanlist.h
|
||||
include/evolution-data-server-${R}/libical/icalss.h
|
||||
include/evolution-data-server-${R}/libical/icalssyacc.h
|
||||
include/evolution-data-server-${R}/libical/icaltime.h
|
||||
include/evolution-data-server-${R}/libical/icaltimezone.h
|
||||
include/evolution-data-server-${R}/libical/icaltypes.h
|
||||
include/evolution-data-server-${R}/libical/icaltz-util.h
|
||||
include/evolution-data-server-${R}/libical/icalvalue.h
|
||||
include/evolution-data-server-${R}/libical/icalvcal.h
|
||||
include/evolution-data-server-${R}/libical/port.h
|
||||
include/evolution-data-server-${R}/libical/pvl.h
|
||||
include/evolution-data-server-${R}/libical/sspm.h
|
||||
include/evolution-data-server-${R}/libical/vcaltmp.h
|
||||
include/evolution-data-server-${R}/libical/vcc.h
|
||||
include/evolution-data-server-${R}/libical/vobject.h
|
||||
lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
|
||||
lib/evolution-data-server-1.2/
|
||||
lib/evolution-data-server-1.2/camel-providers/
|
||||
@ -440,7 +398,7 @@ lib/pkgconfig/libgdata-1.2.pc
|
||||
lib/pkgconfig/libgdata-google-1.2.pc
|
||||
@bin libexec/camel-index-control-1.2
|
||||
@mode 4555
|
||||
libexec/camel-lock-helper-1.2
|
||||
@bin libexec/camel-lock-helper-1.2
|
||||
@mode
|
||||
@bin libexec/evolution-data-server-${R}
|
||||
share/evolution-data-server-${R}/
|
||||
@ -638,6 +596,7 @@ share/gtk-doc/html/libecal/ix01.html
|
||||
share/gtk-doc/html/libecal/left.png
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-check-timezones.html
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-recur.html
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-system-timezone.html
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-types.html
|
||||
share/gtk-doc/html/libecal/libecal-e-cal-util.html
|
||||
@ -661,9 +620,6 @@ share/gtk-doc/html/libedata-book/index.html
|
||||
share/gtk-doc/html/libedata-book/index.sgml
|
||||
share/gtk-doc/html/libedata-book/ix01.html
|
||||
share/gtk-doc/html/libedata-book/left.png
|
||||
share/gtk-doc/html/libedata-book/libedata-book-EDataBookFactory.html
|
||||
share/gtk-doc/html/libedata-book/libedata-book-e-book-backend-db-cache.html
|
||||
share/gtk-doc/html/libedata-book/libedata-book-ximian-vcard.html
|
||||
share/gtk-doc/html/libedata-book/libedata-book.devhelp
|
||||
share/gtk-doc/html/libedata-book/libedata-book.devhelp2
|
||||
share/gtk-doc/html/libedata-book/right.png
|
||||
@ -684,7 +640,6 @@ share/gtk-doc/html/libedata-cal/index.html
|
||||
share/gtk-doc/html/libedata-cal/index.sgml
|
||||
share/gtk-doc/html/libedata-cal/ix01.html
|
||||
share/gtk-doc/html/libedata-cal/left.png
|
||||
share/gtk-doc/html/libedata-cal/libedata-cal-e-cal-backend-util.html
|
||||
share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
|
||||
share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
|
||||
share/gtk-doc/html/libedata-cal/right.png
|
||||
@ -709,7 +664,6 @@ share/gtk-doc/html/libedataserver/left.png
|
||||
share/gtk-doc/html/libedataserver/libedataserver-EFlag.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-EProxy.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-Version-Information.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-e-iconv.html
|
||||
share/gtk-doc/html/libedataserver/libedataserver-e-memory.html
|
||||
@ -746,9 +700,6 @@ share/gtk-doc/html/libedataserverui/index.html
|
||||
share/gtk-doc/html/libedataserverui/index.sgml
|
||||
share/gtk-doc/html/libedataserverui/ix01.html
|
||||
share/gtk-doc/html/libedataserverui/left.png
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui-ECellRendererColor.html
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui-e-book-auth-util.html
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui-e-passwords.html
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui.devhelp
|
||||
share/gtk-doc/html/libedataserverui/libedataserverui.devhelp2
|
||||
@ -762,6 +713,7 @@ share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
|
||||
share/locale/am/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ar/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/as/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ast/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/az/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/be/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/bg/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
@ -769,6 +721,7 @@ share/locale/bn/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/bs/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ca/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/cs/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/cy/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/da/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
@ -801,11 +754,9 @@ share/locale/ka/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/kn/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ko/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ku/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/la/
|
||||
share/locale/la/LC_MESSAGES/
|
||||
share/locale/la/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/lt/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/lv/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/mai/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/mk/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/ml/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/mn/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
@ -842,6 +793,7 @@ share/locale/xh/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/evolution-data-server-${R}.mo
|
||||
share/pixmaps/
|
||||
share/pixmaps/evolution-data-server/
|
||||
share/pixmaps/evolution-data-server/category_birthday_16.png
|
||||
share/pixmaps/evolution-data-server/category_business_16.png
|
||||
|
Loading…
Reference in New Issue
Block a user