[csw-devel] SF.net SVN: gar:[5068] csw/mgar/pkg/thunderbird/trunk

[wbonnet at users.sourceforge.net]

Revision: 5068
          http://gar.svn.sourceforge.net/gar/?rev=5068&view=rev
Author:   wbonnet
Date:     2009-05-27 15:40:34 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Add patches for GAR build

Modified Paths:
--------------
    csw/mgar/pkg/thunderbird/trunk/Makefile
    csw/mgar/pkg/thunderbird/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff

Modified: csw/mgar/pkg/thunderbird/trunk/Makefile
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 15:40:34 UTC (rev 5068)
@@ -51,7 +51,10 @@
 REQUIRED_PKGS_CSWthunderbird += CSWpango 
 REQUIRED_PKGS_CSWthunderbird += CSWzlib
 
-PATCHFILES = autoconf.mk.in.diff
+PATCHFILES  = autoconf.mk.in.diff 
+PATCHFILES += lber-int.h.diff 
+PATCHFILES += ldappr-int.h.diff
+PATCHFILES += ldap-int.h.diff
 
 TEST_SCRIPTS = 
 
@@ -70,7 +73,7 @@
 
 pre-install:
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
-	( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L $(GARNAME) ] ; then rm $(GARNAME) ; fi  && ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
+	( cd $(WORK_INSTALL)/opt/csw/bin ; rm $(GARNAME) ; ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
 	( cp $(WORK_BUILD)/other-licenses/branding/thunderbird/content/icon64.png $(WORK_INSTALL)/opt/csw/share/pixmaps/thunderbird.png )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )

Modified: csw/mgar/pkg/thunderbird/trunk/checksums
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 15:40:34 UTC (rev 5068)
@@ -1,2 +1,5 @@
-73a73d79047dea6be2d222d5b9eeb5f7  download/autoconf.mk.in.diff
+7c53a5e8edb2b492d33f4f405b70c1a1  download/autoconf.mk.in.diff
+46527aded9c373b6095fea546d4d74f0  download/lber-int.h.diff
+46ef334e67dab2301b53b661494f9d58  download/ldap-int.h.diff
+e7054c1d1d6dc708805a6110ccfa7f70  download/ldappr-int.h.diff
 55e24753a7ccf2fbf0272987dd4bb086  download/thunderbird-2.0.0.21-source.tar.bz2

Added: csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:02.216472168 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:25.484409572 +0200
+@@ -107,7 +107,7 @@
+ #define stderr NULL
+ #endif
+ 
+-#include "lber.h"
++#include "../../include/lber.h"
+ 
+ #ifdef macintosh
+ #define NSLDAPI_LBER_SOCKET_IS_PTR

Added: csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,18 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 09:59:24.939222864 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 10:00:08.738847653 +0200
+@@ -82,10 +82,10 @@
+ #include "../liblber/lber-int.h"
+ #endif /* macintosh */
+ 
+-#include "ldap.h"
+-#include "ldaprot.h"
+-#include "ldaplog.h"
+-#include "portable.h"
++#include "../../include/ldap.h"
++#include "../../include/ldaprot.h"
++#include "../../include/ldaplog.h"
++#include "../../include/portable.h"
+ 
+ #ifdef LDAP_ASYNC_IO
+ #ifdef NEED_FILIO

Added: csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,15 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:01:14.924882377 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:02:26.014267148 +0200
+@@ -41,9 +41,9 @@
+  *
+  */
+ 
+-#include "ldap.h"
++#include "../../include/ldap.h"
+ #include "nspr.h"
+-#include "ldappr.h"
++#include "../../include/ldappr.h"
+ 
+ #include <errno.h>
+ #include <string.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.