packages: iceape/iceape-glueload-fix.patch (NEW), iceape/makefile.patch (NE...

baggins baggins at pld-linux.org
Mon Jun 4 19:24:43 CEST 2012 

Author: baggins                      Date: Mon Jun  4 17:24:43 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patches copied from seamonkey package

---- Files affected:
packages/iceape:
   iceape-glueload-fix.patch (NONE -> 1.1)  (NEW), makefile.patch (NONE -> 1.1)  (NEW), system-cairo.patch (NONE -> 1.1)  (NEW), system-mozldap.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/iceape/iceape-glueload-fix.patch
diff -u /dev/null packages/iceape/iceape-glueload-fix.patch:1.1
--- /dev/null	Mon Jun  4 19:24:43 2012
+++ packages/iceape/iceape-glueload-fix.patch	Mon Jun  4 19:24:38 2012
@@ -0,0 +1,21 @@
+--- seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp	2006-02-22 22:57:09.000000000 +0100
++++ seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp.fixed	2008-09-23 21:15:21.000000000 +0200
+@@ -86,8 +86,8 @@
+ GetFrozenFunctionsFunc
+ XPCOMGlueLoad(const char *xpcomFile)
+ {
+-    char xpcomDir[MAXPATHLEN];
+-    if (realpath(xpcomFile, xpcomDir)) {
++    char * xpcomDir;
++    if (xpcomDir = realpath(xpcomFile, NULL)) {
+         char *lastSlash = strrchr(xpcomDir, '/');
+         if (lastSlash) {
+             *lastSlash = '\0';
+@@ -98,6 +98,7 @@
+ 
+             sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY);
+         }
++	free( xpcomDir );
+     }
+ 
+     // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is

================================================================
Index: packages/iceape/makefile.patch
diff -u /dev/null packages/iceape/makefile.patch:1.1
--- /dev/null	Mon Jun  4 19:24:43 2012
+++ packages/iceape/makefile.patch	Mon Jun  4 19:24:38 2012
@@ -0,0 +1,45 @@
+--- mozilla/Makefile.in~	2011-08-12 16:52:03.000000000 +0300
++++ mozilla/Makefile.in	2011-08-26 13:00:59.373870016 +0300
+@@ -58,8 +58,6 @@
+ 
+ include $(topsrcdir)/config/config.mk
+ 
+-default alldep all:: $(topsrcdir)/configure config.status
+-
+ ifndef INCLUDED_BRIDGE_MK
+ include $(topsrcdir)/bridge/bridge.mk
+ endif
+@@ -67,19 +65,7 @@
+ # workaround Bug 599809 by making these makefiles be generated here
+ SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS))
+ 
+-$(topsrcdir)/configure: $(topsrcdir)/configure.in
+-	@echo "STOP!  configure.in has changed, and your configure is out of date."
+-	@echo "Please rerun autoconf and configure."
+-	@echo "To ignore this message, touch 'configure' in the source directory."
+-	@exit 1
+-
+-config.status: $(topsrcdir)/configure
+-	@echo "STOP!  configure has changed and needs to be run in this build directory."
+-	@echo "Please rerun configure."
+-	@echo "To ignore this message, touch 'config.status' in the build directory."
+-	@exit 1
+-
+-default export libs clean realclean distclean alldep \
++default export libs clean realclean distclean \
+ maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES)
+ 	$(MAKE) -C mozilla $@
+ 
+--- mozilla/client.mk~	2011-08-26 13:10:08.000000000 +0300
++++ mozilla/client.mk	2011-08-26 13:10:11.365956960 +0300
+@@ -278,8 +278,8 @@
+ 	$(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \
+ 	$(NULL)
+ 
+-$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
+-	@echo Generating $@ using autoconf
++$(CONFIGURES): 
++	echo Generating $@ using autoconf
+ 	cd $(@D); $(AUTOCONF)
+ 
+ CONFIG_STATUS_DEPS := \

================================================================
Index: packages/iceape/system-cairo.patch
diff -u /dev/null packages/iceape/system-cairo.patch:1.1
--- /dev/null	Mon Jun  4 19:24:43 2012
+++ packages/iceape/system-cairo.patch	Mon Jun  4 19:24:38 2012
@@ -0,0 +1,54 @@
+diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
+--- a/mozilla/gfx/thebes/gfxPlatform.cpp	Sun Mar 04 00:38:41 2012 +0000
++++ b/mozilla/gfx/thebes/gfxPlatform.cpp	Wed May 16 17:37:10 2012 +0200
+@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface(
+ 
+ cairo_user_data_key_t kSourceSurface;
+ 
+ void SourceBufferDestroy(void *srcBuffer)
+ {
+   static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+ 
+-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
++void SourceSnapshotDetached(void *nullSurf)
+ {
+-  gfxImageSurface* origSurf =
+-    static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
+-
++  gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
+ 
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+ {
+   void *userData = aSurface->GetData(&kSourceSurface);
+ 
+@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
+         NS_RUNTIMEABORT("Invalid surface format!");
+     }
+ 
+     srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
+                                                      IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
+                                                      imgSurface->Stride(),
+                                                      format);
+ 
+-    cairo_surface_t *nullSurf =
+-	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+-    cairo_surface_set_user_data(nullSurf,
+-				&kSourceSurface,
+-				imgSurface,
+-				NULL);
+-    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+-    cairo_surface_destroy(nullSurf);
++    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
++		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
+   }
+ 
+   srcBuffer->AddRef();
+   aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
+ 
+   return srcBuffer;
+ }
+ 

================================================================
Index: packages/iceape/system-mozldap.patch
diff -u /dev/null packages/iceape/system-mozldap.patch:1.1
--- /dev/null	Mon Jun  4 19:24:43 2012
+++ packages/iceape/system-mozldap.patch	Mon Jun  4 19:24:38 2012
@@ -0,0 +1,25 @@
+--- mozilla/configure.in.orig	2010-06-23 19:43:07.000000000 +0200
++++ mozilla/configure.in	2010-07-06 11:14:54.350499449 +0200
+@@ -5032,6 +5032,13 @@
+     MOZ_LDAP_XPCOM=,
+     MOZ_LDAP_XPCOM=1)
+ 
++dnl system LDAP Support
++dnl ========================================================
++MOZ_ARG_WITH_STRING(system-ldap,
++[  --with-system-ldap[=PFX]
++                          Use system mozldap [installed at prefix PFX]],
++    MOZ_LDAP_DIR=$withval)
++
+ dnl ========================================================
+ dnl = Trademarked Branding 
+ dnl ========================================================
+@@ -7612,7 +7619,7 @@
+ 
+ # if we're building the LDAP XPCOM component, we need to build 
+ # the c-sdk first.  
+-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
++if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
+     # these subdirs may not yet have been created in the build tree.
+     # don't use the "-p" switch to mkdir, since not all platforms have it
+     if test ! -d "directory/c-sdk/ldap"; then
================================================================

More information about the pld-cvs-commit mailing list