Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13537

Modified Files:
      Tag: pangocairo-branch
        evolution-data-server.info evolution-data-server.patch 
Log Message:
dep cleanup; fix some build messes; rename -dev to match -shlibs naming scheme


Index: evolution-data-server.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution-data-server.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- evolution-data-server.patch 25 Apr 2008 03:30:18 -0000      1.1.2.3
+++ evolution-data-server.patch 1 Jul 2008 23:27:03 -0000       1.1.2.4
@@ -1,3 +1,22 @@
+diff -Nurd -x'*~' 
evolution-data-server-1.12.3.orig/calendar/backends/caldav/Makefile.in 
evolution-data-server-1.12.3/calendar/backends/caldav/Makefile.in
+--- evolution-data-server-1.12.3.orig/calendar/backends/caldav/Makefile.in     
2008-01-06 06:46:34.000000000 -0500
++++ evolution-data-server-1.12.3/calendar/backends/caldav/Makefile.in  
2008-07-01 16:37:46.000000000 -0400
+@@ -347,7 +347,6 @@
+ top_srcdir = @top_srcdir@
+ weatherdatadir = @weatherdatadir@
+ INCLUDES = \
+-      $(EVOLUTION_CALENDAR_CFLAGS)                            \
+       -I$(top_srcdir)                                         \
+       -I$(top_srcdir)/calendar                                \
+       -I$(top_builddir)/calendar                              \
+@@ -355,6 +354,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 
evolution-data-server-1.12.3/calendar/libical/src/libical/icaltz-util.c 
evolution-data-server-1.12.3-new/calendar/libical/src/libical/icaltz-util.c
 --- evolution-data-server-1.12.3/calendar/libical/src/libical/icaltz-util.c    
2007-11-25 21:29:25.000000000 -0500
 +++ 
evolution-data-server-1.12.3-new/calendar/libical/src/libical/icaltz-util.c     
   2008-04-24 23:07:26.000000000 -0400
@@ -33,9 +52,9 @@
  static char *
  zname_from_stridx (char *str, long int idx) 
  {
-diff -Nurd evolution-data-server-1.12.3/configure 
evolution-data-server-1.12.3-new/configure
---- evolution-data-server-1.12.3/configure     2008-01-06 06:46:30.000000000 
-0500
-+++ evolution-data-server-1.12.3-new/configure 2008-04-24 23:05:41.000000000 
-0400
+diff -Nurd -x'*~' evolution-data-server-1.12.3.orig/configure 
evolution-data-server-1.12.3/configure
+--- evolution-data-server-1.12.3.orig/configure        2008-01-06 
06:46:30.000000000 -0500
++++ evolution-data-server-1.12.3/configure     2008-07-01 16:38:03.000000000 
-0400
 @@ -24618,7 +24618,7 @@
  #include <iconv.h>
  #include <stdlib.h>
@@ -54,6 +73,23 @@
        /* glibc 2.1.2's iconv is broken in hard to test ways. */
        if (!strcmp (gnu_get_libc_version (), "2.1.2"))
                exit (1);
+@@ -30648,15 +30648,7 @@
+ echo "${ECHO_T}$IDL_INCLUDES" >&6; }
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for libgnomeui server directory" >&5
+-echo $ECHO_N "checking for libgnomeui server directory... $ECHO_C" >&6; }
+-GNOMEUI_SERVERDIR="`$PKG_CONFIG --variable=libgnomeui_serverdir 
libgnomeui-2.0`"
+-{ echo "$as_me:$LINENO: result: $GNOMEUI_SERVERDIR" >&5
+-echo "${ECHO_T}$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 evolution-data-server-1.12.3/libdb/dist/configure 
evolution-data-server-1.12.3-new/libdb/dist/configure
 --- evolution-data-server-1.12.3/libdb/dist/configure  2007-10-12 
02:30:21.000000000 -0400
 +++ evolution-data-server-1.12.3-new/libdb/dist/configure      2008-04-24 
23:05:41.000000000 -0400
@@ -86,3 +122,73 @@
  #include <gtk/gtk.h>
  #include <camel/camel.h>
  
+diff -Nurd -x'*~' 
evolution-data-server-1.12.3.orig/servers/exchange/lib/Makefile.in 
evolution-data-server-1.12.3/servers/exchange/lib/Makefile.in
+--- evolution-data-server-1.12.3.orig/servers/exchange/lib/Makefile.in 
2008-01-06 06:46:41.000000000 -0500
++++ evolution-data-server-1.12.3/servers/exchange/lib/Makefile.in      
2008-07-01 16:37:46.000000000 -0400
+@@ -365,13 +365,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-1.12.3.orig/servers/exchange/storage/Makefile.in 
evolution-data-server-1.12.3/servers/exchange/storage/Makefile.in
+--- evolution-data-server-1.12.3.orig/servers/exchange/storage/Makefile.in     
2008-01-06 06:46:41.000000000 -0500
++++ evolution-data-server-1.12.3/servers/exchange/storage/Makefile.in  
2008-07-01 16:37:46.000000000 -0400
+@@ -377,14 +377,14 @@
+       -DLIBDIR=\""$(datadir)"\"                               \
+       -DCONNECTOR_LOCALEDIR=\""$(localedir)\""                \
+       -DCONNECTOR_GLADEDIR=\""$(gladedir)"\"                  \
++      -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_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-1.12.3.orig/src/server.c 
evolution-data-server-1.12.3/src/server.c
+--- evolution-data-server-1.12.3.orig/src/server.c     2007-10-12 
02:29:33.000000000 -0400
++++ evolution-data-server-1.12.3/src/server.c  2008-07-01 16:38:44.000000000 
-0400
+@@ -91,9 +91,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 */
+@@ -111,13 +109,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);
+-
++      fprintf (stderr, "Going down on segv (signo=%d)\n", signo);
+       _exit(1);
+ }
+ 

Index: evolution-data-server.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution-data-server.info,v
retrieving revision 1.4.2.63
retrieving revision 1.4.2.64
diff -u -d -r1.4.2.63 -r1.4.2.64
--- evolution-data-server.info  22 Jun 2008 22:53:03 -0000      1.4.2.63
+++ evolution-data-server.info  1 Jul 2008 23:27:03 -0000       1.4.2.64
@@ -1,33 +1,11 @@
 Package: evolution-data-server
 Version: 1.12.3
-Revision: 4
+Revision: 5
 Depends: <<
        %N-1.12-shlibs (= %v-%r),
-       audiofile-shlibs (>= 0.2.3-1),
-       esound-shlibs (>= 0.2.38-1),
-       gail18-shlibs (>= 1.20.0-1),
-       gconf2 (>= 2.20.0-1),
-       glib2-shlibs (>= 2.14.0-1),
-       gnome-spell (>= 1.0.7-1),
-       gnome-vfs2-unified (>= 1:2.20.0-1),
-       gtk+2 (>= 2.12.0-1),
-       gtkhtml3.14-shlibs (>= 3.16.0-1),
-       libart2-shlibs (>= 2.3.16-2),
-       libbonobo2 (>= 2.20.0-1),
-       libbonoboui2 (>= 2.20.0-1),
-       libgettext3-shlibs,
-       libglade2-shlibs (>= 2.6.2-1),
-       libgnome2 (>= 2.20.0-1),
-       libgnomecanvas2 (>= 2.20.0-1),
-       libgnomeui2 (>= 2.20.0-1),
-       libiconv,
-       libsoup2.2.8-ssl-shlibs,
-       libxml2-shlibs (>= 2.6.30-1),
-       orbit2 (>= 2.14.9-1),
-       pango1-xft2-ft219 (>= 1.18.4-4),
-       popt-shlibs,
-       pth2-shlibs
+       libbonobo2 (>= 2.20.0-1)
 <<
+# all dylib Depends of %N are included in %N-shlibs, so =%v-%r gets them for us
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
        audiofile,
@@ -41,28 +19,22 @@
        fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
-       gail18-dev (>= 1.20.0-1),
        gconf2-dev (>= 2.20.0-1),
        gnome-keyring-dev,
        gettext-bin,
        glib2-dev (>= 2.14.0-1),
        glitz,
-       gnome-spell-dev (>= 1.0.7-1),
        gnome-vfs2-unified-dev (>= 1:2.20.0-1),
        gnutls26,
        gtk+2-dev (>= 2.12.0-1),
-       gtkhtml3.14-dev (>= 3.16.0-1),
        intltool (>= 0.36.0-1),
        libart2 (>= 2.3.16-2),
        libavahi-glib1-dev,
        libbonobo2-dev (>= 2.20.0-1),
-       libbonoboui2-dev (>= 2.20.0-1),
        libgcrypt,
        libgettext3-dev,
        libglade2 (>= 2.6.2-1),
        libgnome2-dev (>= 2.20.0-1),
-       libgnomecanvas2-dev (>= 2.20.0-1),
-       libgnomeui2-dev (>= 2.20.0-1),
        libgpg-error,
        libiconv-dev,
        libjpeg,
@@ -81,6 +53,7 @@
        rarian-compat,
        seamonkey-dev,
        sed,
+       x11-dev,
        xft2-dev
 <<
 Replaces: %N-shlibs, %N-1.8-shlibs
@@ -95,7 +68,7 @@
 SetLIBRARY_PATH: %p/lib
 SetCFLAGS: -Os -undefined dynamic_lookup
 PatchFile: %n.patch
-PatchFile-MD5: 102ffca712630950e57eea0c6123b1dc
+PatchFile-MD5: 0bc56d087cc2f35737e857447d040fc5
 PatchScript: <<
 #!/bin/sh -ev
  %{default_script}
@@ -147,23 +120,18 @@
                cyrus-sasl2-shlibs,
                db44-aes-shlibs,
                esound-shlibs (>= 0.2.38-1),
-               gail18-shlibs (>= 1.20.0-1),
                gconf2-shlibs (>= 2.20.0-1),
                glib2-shlibs (>= 2.14.0-1),
                gnome-keyring,
-               gnome-spell-shlibs (>= 1.0.7-1),
+               gnome-spell (>= 1.0.8-3),
                gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
                gnutls26-shlibs,
                gtk+2-shlibs (>= 2.12.0-1),
-               gtkhtml3.14-shlibs (>= 3.16.0-1),
                libart2-shlibs (>= 2.3.16-2),
                libbonobo2-shlibs (>= 2.20.0-1),
-               libbonoboui2-shlibs (>= 2.20.0-1),
                libgettext3-shlibs,
                libglade2-shlibs (>= 2.6.2-1),
                libgnome2-shlibs (>= 2.20.0-1),
-               libgnomecanvas2-shlibs (>= 2.20.0-1),
-               libgnomeui2-shlibs (>= 2.20.0-1),
                libiconv,
                libsoup2.2.8-ssl-shlibs,
                libtasn1-3-shlibs,
@@ -206,14 +174,35 @@
        DocFiles: AUTHORS COPYING NEWS README
 <<
 SplitOff2: <<
-       Package: %N-dev
-       Depends: %N (= %v-%r)
+       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. Not
+       sure why.
+
+       Deep hacks in config.status, I think 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
+<<
+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]>


-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to