Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24905

Modified Files:
        claws-mail.info 
Added Files:
        claws-mail.patch 
Log Message:
Fix python plugin, misc dep upgrades


--- NEW FILE: claws-mail.patch ---
diff -Nurd -x'*~' claws-mail-3.9.2.orig/src/plugins/python/clawsmailmodule.c 
claws-mail-3.9.2/src/plugins/python/clawsmailmodule.c
--- claws-mail-3.9.2.orig/src/plugins/python/clawsmailmodule.c  2013-03-19 
02:31:04.000000000 -0400
+++ claws-mail-3.9.2/src/plugins/python/clawsmailmodule.c       2013-09-06 
02:43:46.000000000 -0400
@@ -30,7 +30,9 @@
 #include "foldertype.h"
 #include "messageinfotype.h"
 
+#define NO_IMPORT_PYGOBJECT
 #include <pygobject.h>
+#define NO_IMPORT_PYGTK
 #include <pygtk/pygtk.h>
 
 #include "main.h"

Index: claws-mail.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/claws-mail.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- claws-mail.info     26 Jun 2013 01:03:40 -0000      1.1
+++ claws-mail.info     6 Sep 2013 07:20:45 -0000       1.2
@@ -1,6 +1,6 @@
 Package: claws-mail
 Version: 3.9.2
-Revision: 1
+Revision: 2
 Description: GTK+ based lightweight and fast e-mail client
 License: GPL
 ### Feel free to modify and take it over
@@ -21,7 +21,7 @@
        gpgme11-shlibs,
        gtk+2,
        gtk+2-shlibs,
-       libarchive-shlibs,
+       libarchive31-shlibs,
        libcanberra-gtk0-shlibs,
        libcanberra0-shlibs,
        libcurl4-shlibs,
@@ -36,6 +36,9 @@
        openldap24-shlibs,
        pango1-xft2-ft219-shlibs,
        poppler8-glib-shlibs,
+       pygobject2-py27,
+       pygtk2-gtk-py27,
+       python27,
        startup-notification-shlibs,
        webkit-1.0.2-shlibs,
        x11-shlibs
@@ -47,11 +50,12 @@
        dbus-glib1.2-dev,
        dbus1.3-dev,
        enchant1-dev,
+       fink-package-precedence,
        glib2-dev,
        gnutls28,
        gpgme11,
        gtk+2-dev,
-       libarchive,
+       libarchive31,
        libcanberra-gtk0,
        libcanberra0,
        libcurl4,
@@ -66,7 +70,10 @@
        libxml2,
        openldap24-dev,
        pango1-xft2-ft219-dev,
+       pkgconfig,
        poppler8-glib,
+       pygobject2-py27-dev,
+       pygtk2-gtk-py27-dev,
        startup-notification-dev,
        system-openssl-dev,
        webkit-1.0.2,
@@ -79,13 +86,19 @@
 Source2-MD5: 8a0a9704925a7d1940f93b9b5bbd8351
 Source2-Checksum: SHA1(d2fd04ef31f6d162c45443e7dd96207d26dea321)
 SourceDirectory: %n-%v
+PatchFile: %n.patch
+PatchFile-MD5: 9535ec67e286ec0c16770a4e8a9567ac
 PatchScript: <<
-       patch -p1 < %b/../debian/patches/10desktop_file_categories.patch
-       patch -p1 < %b/../debian/patches/11mark_trashed_as_read.patch
-       patch -p1 < %b/../debian/patches/12fix_manpage_header.patch
-       patch -p1 < %b/../debian/patches/99_fix_vcalendar_711864.patch  
+       %{default_script}
+       patch -p1 < ../debian/patches/10desktop_file_categories.patch
+       patch -p1 < ../debian/patches/11mark_trashed_as_read.patch
+       patch -p1 < ../debian/patches/12fix_manpage_header.patch
+       patch -p1 < ../debian/patches/99_fix_vcalendar_711864.patch     
        ### Looks for python2.7.so
-       perl -pi -e 
's|libpython\$\{PYTHON_VERSION\}.so|libpython${PYTHON_VERSION}.dylib|g' 
configure
+       perl -pi -e 
's|libpython\$\{PYTHON_VERSION\}.so|%p/lib/python\${PYTHON_VERSION}/config/libpython\${PYTHON_VERSION}.dylib|g'
 configure
+
+       # not yet in fink
+       perl -pi -e 's/(LIBINDICATE_REQUIRED\s*=).*/${1}99999.FORCE.NONDETECT/' 
configure
 <<
 NoSetLDFLAGS: true
 SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib
@@ -93,7 +106,6 @@
        --disable-static \
        --enable-dependency-tracking \
        --disable-jpilot \
-       --disable-python-plugin \
        --disable-gdata-plugin \
        --disable-geolocation-plugin \
        --disable-perl-plugin


------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to