Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6871
Added Files:
evolution-data-server.info evolution-data-server.patch
Removed Files:
evolution-data-server1.2.info evolution-data-server1.2.patch
Log Message:
needs newer sqlite3 than we have now...maintainer emailed a few weeks ago
--- evolution-data-server1.2.info DELETED ---
--- NEW FILE: evolution-data-server.info ---
Package: evolution-data-server
Version: 2.24.2
Revision: 6
Depends: <<
%N-1.12-shlibs (= %v-%r),
libbonobo2 (>= 2.24.0-1)
<<
# all dylib Depends of %N are included in %N-shlibs, so =%v-%r gets them for us
BuildDepends: <<
atk1 (>= 1.24.0-1),
audiofile,
avahi-dev,
cairo (>= 1.8-1),
cyrus-sasl2-dev (>= 2.1.22-1003),
db47-aes,
dbus-dev (>= 1.2.1-1),
esound (>= 0.2.38-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
gconf2-dev (>= 2.24.0-1),
gnome-keyring-dev,
gettext-bin,
glib2-dev (>= 2.18.0-1),
glitz,
gnome-vfs2-unified-dev (>= 1:2.24.0-1),
gnutls26 (>= 2.6.0-1),
gtk-doc,
gtk+2-dev (>= 2.14.0-1),
intltool40,
libart2 (>= 2.3.16-2),
libavahi-glib1-dev,
libbonobo2-dev (>= 2.24.0-1),
libgcrypt (>= 1.4.3-2),
libgettext3-dev,
libglade2 (>= 2.6.3-1),
libgnome2-dev (>= 2.24.0-1),
libgpg-error (>= 1.6-1),
libiconv-dev,
libjpeg,
libpng3,
libsoup2.4.1-ssl,
libtasn1-3 (>= 0.3.9-2),
libxml2 (>= 2.6.30-1),
openldap24-dev,
openssl098-dev,
orbit2-dev (>= 2.14.16-1),
pango1-xft2-ft219-dev (>= 1.22.0-4),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.23),
popt,
rarian-compat,
seamonkey-dev,
sed,
sqlite3-dev (>= 3.5-1),
x11-dev,
xft2-dev
<<
Replaces: %N-shlibs, %N-1.8-shlibs
Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
Source-MD5: ee08e677d30fadd58e53e6e064d4ae6e
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/include/db4
SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/seamonkey
SetCFLAGS: -Os -undefined dynamic_lookup
PatchFile: %n.patch
PatchFile-MD5: 00a0bf6beed233b93baac2a7fbe70408
PatchScript: <<
#!/bin/sh -ev
%{default_script}
#perl -pi -e 's,<db.h>,$&\n#include <stdlib.h>,' configure
### Next fixes major trouble with libtool (2d fixes the cause of the problem in
typical configure scripts,
# this line may still prevent the trouble for irregular or old configure
scripts , that escape the next fix.)
for f in `find . -name ltmain.sh` ; do sed -ri.bak -e
's,(s%%/)(\[\^/\]\*\$%%%%),\1\\+\2,' $f ; done
# This should cover all configure scripts generated by relatively recent
versions of libtool and autoconf,
# taking care to affect only the crucial instructions. The latter aspect is
just for aesthetic reasons;
# if there was a need, there should be no problem with fixing this way all
assignments to sys_lib_search_path_spec
# in the configure scripts.
for f in `find . -name configure` ; do sed -ri.bak -e '/(host_os
ld.so|Apple)/,+3{
/sys_lib_search_path_spec.*\/usr\/local\/lib/c\
sys_lib_search_path_spec=$(echo $(for f in `$CC -print-search-dirs|egrep
"^libraries:"|sed -e "s,.*=,," \
-e "s,$PATH_SEPARATOR, ,g" -e "s,$, /lib /usr/lib /usr/local/lib,"`; do cd $f
2>/dev/null && pwd || : ; done|uniq))
}' $f ; done
<<
ConfigureParams: <<
--disable-dependency-tracking --disable-gtk-doc --enable-compile-warnings=yes \
--disable-static --libexecdir=%p/sbin \
--disable-schemas-install \
--with-nspr-includes=%p/include/seamonkey/nspr
--with-nspr-libs=%p/lib/seamonkey \
--enable-nss=yes --with-nss-includes=%p/include/seamonkey/nss
--with-nss-libs=%p/lib/seamonkey \
--enable-smime=yes \
--enable-gnome-keyring=yes \
--enable-calendar \
--enable-nntp=yes \
--with-libdb=%p \
--with-openldap=yes \
--with-krb4=/usr --with-krb5=/usr \
--enable-reentrant \
--enable-java --enable-python \
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
# trouble with --enable-cxx; also with "--with-bdb4=yes --with-bdb4-dir=%p"
(for calendar/libical), even with db4.0
CompileScript: <<
#!/bin/sh -ev
export CPATH=%p/include
./configure %c
perl -pi.bak -e 's,\-L(/usr|%p)/lib([^/]),\2,g;
s,\-I(/usr|%p)/include([^/]),\2,g' {,calendar/libical/,libdb/dist/}config.status
make
<<
InstallScript: <<
### #!/bin/sh -ev
#export CPATH=%p/include
make -j1 install DESTDIR="%d"
perl -pi.bak -e "s, \-R *[^ ']*,,g; s,
\-L%p(|/lib/system-openssl)/lib([^/]),\2,g" `find %i/lib -name '*.la'`
perl -pi.bak -e 's, \-L\$\{libdir\},,' %i/lib/pkgconfig/*.pc
<<
SplitOff: <<
Package: %N-1.12-shlibs
Depends: <<
audiofile-shlibs (>= 0.2.3-1),
cyrus-sasl2-shlibs (>= 2.1.22-1003),
db47-aes-shlibs,
esound-shlibs (>= 0.2.38-1),
gconf2-shlibs (>= 2.24.0-1),
glib2-shlibs (>= 2.18.0-1),
gnome-keyring,
gnome-spell (>= 1.0.8-4),
gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
gnutls26-shlibs (>= 2.6.0-1),
gtk+2-shlibs (>= 2.14.0-1),
libart2-shlibs (>= 2.3.16-2),
libbonobo2-shlibs (>= 2.24.0-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.3-1),
libgnome2-shlibs (>= 2.24.0-1),
libiconv,
libsoup2.4.1-ssl-shlibs,
libtasn1-3-shlibs (>= 0.3.9-2),
libxml2-shlibs (>= 2.6.30-1),
openldap24-shlibs,
openssl098-shlibs,
orbit2-shlibs (>= 2.14.16-1),
pango1-xft2-ft219 (>= 1.22.0-4),
popt-shlibs,
seamonkey-shlibs
<<
Files: <<
share/locale
lib/libebook-1.2.9*.dylib
lib/libecal-1.2.7*.dylib
lib/libedata-book-1.2.2*.dylib
lib/libedata-cal-1.2.6*.dylib
lib/libedataserver-1.2.9*.dylib
lib/libedataserverui-1.2.8*.dylib
lib/libegroupwise-1.2.13*.dylib
lib/libcamel-1.2.10*.dylib
lib/libcamel-provider-1.2.10*.dylib
lib/libexchange-storage-1.2.3*.dylib
lib/evolution-data-server-1.2/camel-providers/*.so
lib/evolution-data-server-1.2/camel-providers/*.urls
lib/evolution-data-server-1.2/extensions/*.so
<<
Shlibs: <<
%p/lib/libebook-1.2.9.dylib 11.0.0 %n (>= 1.12.0-1)
%p/lib/libecal-1.2.7.dylib 8.0.0 %n (>= 1.12.0-1)
%p/lib/libedata-book-1.2.2.dylib 7.0.0 %n (>= 1.12.0-1)
%p/lib/libedata-cal-1.2.6.dylib 7.0.0 %n (>= 1.12.0-1)
%p/lib/libedataserver-1.2.9.dylib 11.0.0 %n (>= 1.12.0-1)
%p/lib/libedataserverui-1.2.8.dylib 9.0.0 %n (>= 1.12.0-1)
%p/lib/libegroupwise-1.2.13.dylib 14.0.0 %n (>= 1.12.0-1)
%p/lib/libcamel-1.2.10.dylib 11.0.0 %n (>= 1.12.0-1)
%p/lib/libcamel-provider-1.2.10.dylib 11.0.0 %n (>= 1.12.0-1)
%p/lib/libexchange-storage-1.2.3.dylib 4.0.0 %n (>= 1.12.0-1)
<<
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff2: <<
Package: %N-1.12-dev
Depends: %N-1.12-shlibs (= %v-%r), %N (>= %v-%r)
Conflicts: %N-dev
Replaces: %N-dev
BuildDependsOnly: true
Files: include lib/*.* lib/pkgconfig share/gtk-doc share/idl
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
<<
DocFiles: AUTHORS COPYING NEWS README
Description: Evolution Data Server
DescPackaging: <<
Remove -R flags and and -L%p/lib -L%p/lib/system-openssl from
installed .la files and -L%p/lib from installed .pc files,
to get less trouble with flag-ordering in dependent pkgs
like evolution or ekiga.
Deep hacks in config.status, to get correct precedence
of paths (/sw/lib/foo before /sw/lib or /usr/lib, etc)
Fix some makefiles to put local -I before global.
Eliminate use of gnome_segv2 (dropped as of GNOME2.20). See:
http://bugzilla.gnome.org/show_bug.cgi?id=541111
#libdb test needs addition of stdlib.h to define NULL
^--seems to be cured now, or is platform-dependent?
<<
DescPort: <<
libexchange-storage uses e_passwords_* symbols from
libedataserverui but doesn't link that lib. Not bothering to
fix until/unless we see runtime symptoms. See:
http://bugzilla.gnome.org/show_bug.cgi?id=342830
<<
Homepage: http://www.novell.com/products/evolution/
License: GPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
--- evolution-data-server1.2.patch DELETED ---
--- NEW FILE: evolution-data-server.patch ---
diff -Nurd -x'*~'
evolution-data-server-2.24.2.orig/calendar/backends/caldav/Makefile.in
evolution-data-server-2.24.2/calendar/backends/caldav/Makefile.in
--- evolution-data-server-2.24.2.orig/calendar/backends/caldav/Makefile.in
2008-11-20 00:07:26.000000000 -0500
+++ evolution-data-server-2.24.2/calendar/backends/caldav/Makefile.in
2008-12-04 23:31:29.000000000 -0500
@@ -365,7 +365,6 @@
top_srcdir = @top_srcdir@
weatherdatadir = @weatherdatadir@
INCLUDES = \
- $(EVOLUTION_CALENDAR_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
@@ -373,6 +372,7 @@
-I$(top_builddir)/calendar/libical/src \
-I$(top_srcdir)/calendar/libical/src/libical \
-I$(top_builddir)/calendar/libical/src/libical \
+ $(EVOLUTION_CALENDAR_CFLAGS) \
$(SOUP_CFLAGS) \
-DG_LOG_DOMAIN=\"e-cal-backend-caldav\"
diff -Nurd -x'*~'
evolution-data-server-2.24.2.orig/calendar/libical/src/libical/icaltz-util.c
evolution-data-server-2.24.2/calendar/libical/src/libical/icaltz-util.c
---
evolution-data-server-2.24.2.orig/calendar/libical/src/libical/icaltz-util.c
2008-10-13 04:11:30.000000000 -0400
+++ evolution-data-server-2.24.2/calendar/libical/src/libical/icaltz-util.c
2008-12-04 23:31:29.000000000 -0500
@@ -23,6 +23,8 @@
#include <string.h>
#if defined(sun) && defined(__SVR4)
#include <sys/byteorder.h>
+#elif defined(__APPLE__)
+#include <architecture/byte_order.h>
#else
#ifdef _WIN32
#define BIG_ENDIAN 'B'
@@ -96,8 +98,12 @@
if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
return *(const int *) ptr;
else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
+#ifdef __APPLE__
+ return OSSwapBigToHostInt32(*(const int *) ptr);
+#else
return bswap_32 (*(const int *) ptr);
#endif
+#endif
else
{
const unsigned char *p = ptr;
@@ -112,6 +118,9 @@
}
}
+#define ntohl(x) OSSwapBigToHostInt32(x)
+#define htonl(x) OSSwapHostToBigInt32(x)
+
static char *
zname_from_stridx (char *str, long int idx)
{
diff -Nurd -x'*~' evolution-data-server-2.24.2.orig/configure
evolution-data-server-2.24.2/configure
--- evolution-data-server-2.24.2.orig/configure 2008-11-20 00:07:22.000000000
-0500
+++ evolution-data-server-2.24.2/configure 2008-12-04 23:37:02.000000000
-0500
@@ -25962,7 +25963,7 @@
#include <iconv.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_GNU_GET_LIBC_VERSION
+#if 0
#include <gnu/libc-version.h>
#endif
@@ -25975,7 +25976,7 @@
size_t from_len = strlen (from), utf8_len = 20;
size_t utf8_real_len = strlen (utf8);
-#ifdef HAVE_GNU_GET_LIBC_VERSION
+#if 0
/* glibc 2.1.2's iconv is broken in hard to test ways. */
if (!strcmp (gnu_get_libc_version (), "2.1.2"))
exit (1);
@@ -32277,15 +32278,7 @@
$as_echo "$IDL_INCLUDES" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for libgnomeui server directory" >&5
-$as_echo_n "checking for libgnomeui server directory... " >&6; }
-GNOMEUI_SERVERDIR="`$PKG_CONFIG --variable=libgnomeui_serverdir
libgnomeui-2.0`"
-{ $as_echo "$as_me:$LINENO: result: $GNOMEUI_SERVERDIR" >&5
-$as_echo "$GNOMEUI_SERVERDIR" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define GNOMEUI_SERVERDIR "$GNOMEUI_SERVERDIR"
-_ACEOF
+echo "Disabling check for libgnomeui-2.0: gnome_segv2 removed as of GNOME2.20"
diff -Nurd -x'*~' evolution-data-server-2.24.2.orig/libdb/dist/configure
evolution-data-server-2.24.2/libdb/dist/configure
--- evolution-data-server-2.24.2.orig/libdb/dist/configure 2008-10-13
04:09:36.000000000 -0400
+++ evolution-data-server-2.24.2/libdb/dist/configure 2008-12-04
23:31:30.000000000 -0500
@@ -18815,7 +18815,7 @@
-for ac_func in _fstati64 clock_gettime directio gettimeofday getuid
+for ac_func in _fstati64 clock_gettime gettimeofday getuid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -18904,7 +18904,7 @@
-for ac_func in pstat_getdynamic sched_yield select strtoul sysconf yield
+for ac_func in sched_yield select strtoul sysconf yield
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff -Nurd -x'*~'
evolution-data-server-2.24.2.orig/servers/exchange/lib/Makefile.in
evolution-data-server-2.24.2/servers/exchange/lib/Makefile.in
--- evolution-data-server-2.24.2.orig/servers/exchange/lib/Makefile.in
2008-11-20 00:07:34.000000000 -0500
+++ evolution-data-server-2.24.2/servers/exchange/lib/Makefile.in
2008-12-04 23:31:30.000000000 -0500
@@ -382,13 +382,13 @@
weatherdatadir = @weatherdatadir@
INCLUDES = \
-DCONNECTOR_PREFIX=\""$(prefix)"\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/servers/exchange/xntlm \
$(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \
$(SOUP_CFLAGS) \
$(E_DATA_SERVER_CFLAGS) \
- $(E_DATA_SERVER_UI_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/servers/exchange/xntlm
+ $(E_DATA_SERVER_UI_CFLAGS)
noinst_LTLIBRARIES = \
libexchange.la
diff -Nurd -x'*~'
evolution-data-server-2.24.2.orig/servers/exchange/lib/e2k-autoconfig.c
evolution-data-server-2.24.2/servers/exchange/lib/e2k-autoconfig.c
--- evolution-data-server-2.24.2.orig/servers/exchange/lib/e2k-autoconfig.c
2008-10-13 04:08:12.000000000 -0400
+++ evolution-data-server-2.24.2/servers/exchange/lib/e2k-autoconfig.c
2008-12-04 23:36:00.000000000 -0500
@@ -43,6 +43,7 @@
#ifndef G_OS_WIN32
#include <netinet/in.h>
#include <arpa/nameser.h>
+#include <arpa/nameser_compat.h>
#include <resolv.h>
#else
#include <winsock2.h>
diff -Nurd -x'*~'
evolution-data-server-2.24.2.orig/servers/exchange/storage/Makefile.in
evolution-data-server-2.24.2/servers/exchange/storage/Makefile.in
--- evolution-data-server-2.24.2.orig/servers/exchange/storage/Makefile.in
2008-11-20 00:07:34.000000000 -0500
+++ evolution-data-server-2.24.2/servers/exchange/storage/Makefile.in
2008-12-04 23:33:31.000000000 -0500
@@ -395,15 +395,15 @@
-DLIBDIR=\""$(datadir)"\" \
-DCONNECTOR_LOCALEDIR=\""$(localedir)\"" \
-DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
+ -I$(top_builddir)/servers/exchange/lib \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/servers/exchange/lib \
+ -I$(top_srcdir)/servers/exchange/xntlm \
$(KRB5_CFLAGS) \
$(LDAP_CFLAGS) \
$(SOUP_CFLAGS) \
$(E_DATA_SERVER_CFLAGS) \
- $(E_DATA_SERVER_UI_CFLAGS) \
- -I$(top_builddir)/servers/exchange/lib \
- -I$(top_srcdir) \
- -I$(top_srcdir)/servers/exchange/lib \
- -I$(top_srcdir)/servers/exchange/xntlm
+ $(E_DATA_SERVER_UI_CFLAGS)
lib_LTLIBRARIES = \
libexchange-storage-1.2.la
diff -Nurd -x'*~' evolution-data-server-2.24.2.orig/src/server.c
evolution-data-server-2.24.2/src/server.c
--- evolution-data-server-2.24.2.orig/src/server.c 2008-10-13
04:07:57.000000000 -0400
+++ evolution-data-server-2.24.2/src/server.c 2008-12-04 23:34:33.000000000
-0500
@@ -90,9 +90,7 @@
static void
gnome_segv_handler (int signo)
{
- const char *gnome_segv_path;
static int in_segv = 0;
- char *exec;
if (pthread_self() != main_thread) {
/* deadlock intentionally in the sub-threads */
@@ -110,12 +108,7 @@
_exit (1);
}
- gnome_segv_path = GNOMEUI_SERVERDIR "/gnome_segv2";
-
- exec = g_strdup_printf ("%s \"" PACKAGE "-" BASE_VERSION "\" %d \""
VERSION "\"",
- gnome_segv_path, signo);
- system (exec);
- g_free (exec);
+ frintf (stderr, "Going down on segv (signo=%d)\n", signo);
_exit(1);
}
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
