[SVN-Commit] r163 - in branches/experimental/www/libxul-devel: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Mon Nov 16 15:20:57 UTC 2009 

Author: beat
Date: Mon Nov 16 15:20:50 2009
New Revision: 163

Log:
- Add libxul 1.9.2 Beta1 to www/libxul-devel. Port already compiles but
  installation is still broken.  Also some platform specific patches for
  sparc64, ia64 and powerpc from www/firefox3-devel aren't merged yet.

Added:
   branches/experimental/www/libxul-devel/
      - copied from r156, branches/experimental/www/libxul/
   branches/experimental/www/libxul-devel/files/patch-js_src_jsnum.cpp
      - copied, changed from r156, branches/experimental/www/libxul/files/patch-js_src_jsnum.c
   branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
Deleted:
   branches/experimental/www/libxul-devel/files/patch-js_src_jsnum.c
   branches/experimental/www/libxul-devel/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
   branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_installer_packager.mk
Modified:
   branches/experimental/www/libxul-devel/Makefile
   branches/experimental/www/libxul-devel/distinfo
   branches/experimental/www/libxul-devel/files/patch-layout_generic_Makefile.in

Modified: branches/experimental/www/libxul-devel/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Sun Nov  8 16:06:26 2009	(r156)
+++ branches/experimental/www/libxul-devel/Makefile	Mon Nov 16 15:20:50 2009	(r163)
@@ -5,21 +5,23 @@
 # $FreeBSD: ports/www/libxul/Makefile,v 1.10 2009/07/31 18:30:30 miwi Exp $
 #
 
-PORTNAME=	libxul
-PORTVERSION=	1.9.1.4
+PORTNAME=	libxul-devel
+DISTVERSION=	1.9.2b1
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	xulrunner/releases/${PORTVERSION}/source
-DISTNAME=	xulrunner-${PORTVERSION}.source
-WRKSRC=		${WRKDIR}/mozilla-1.9.1
+MASTER_SITE_SUBDIR=	xulrunner/releases/${DISTVERSION}/source
+DISTNAME=	xulrunner-${DISTVERSION}.source
+WRKSRC=		${WRKDIR}/mozilla-1.9.2
 
 MAINTAINER?=	gecko at FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
-LIB_DEPENDS?=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS?=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 
+LATEST_LINK=	libxul-devel
 USE_AUTOTOOLS=	autoconf:213
-CONFLICTS=	mozilla-[0-9]* xulrunner-[0-9]*
+CONFLICTS=	mozilla-[0-9]* xulrunner-[0-9]* libxul-1.9.1.[0-9]*
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib \
 			lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include

Modified: branches/experimental/www/libxul-devel/distinfo
==============================================================================
--- branches/experimental/www/libxul/distinfo	Sun Nov  8 16:06:26 2009	(r156)
+++ branches/experimental/www/libxul-devel/distinfo	Mon Nov 16 15:20:50 2009	(r163)
@@ -1,3 +1,3 @@
-MD5 (xulrunner-1.9.1.4.source.tar.bz2) = 0b6ccb1e50d96b7127a18a69399fcf05
-SHA256 (xulrunner-1.9.1.4.source.tar.bz2) = b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
-SIZE (xulrunner-1.9.1.4.source.tar.bz2) = 46905557
+MD5 (xulrunner-1.9.2b1.source.tar.bz2) = e585eab46f14ba1d770be9d9c1d1b78e
+SHA256 (xulrunner-1.9.2b1.source.tar.bz2) = a7d22afe872fc9d4c732a34860bdd762114753d501bb3143eb2d83368f89b03d
+SIZE (xulrunner-1.9.2b1.source.tar.bz2) = 47715653

Deleted: branches/experimental/www/libxul/files/patch-js_src_jsnum.c
==============================================================================
--- branches/experimental/www/libxul/files/patch-js_src_jsnum.c	Mon Nov 16 15:20:50 2009	(r156)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,29 +0,0 @@
---- js/src/jsnum.cpp.orig	2009-08-14 19:00:22.000000000 +0200
-+++ js/src/jsnum.cpp	2009-08-14 19:01:44.000000000 +0200
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53  PC_53
- #define _MCW_EM MCW_EM
-@@ -659,8 +662,16 @@
- 
- #else
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
-+#else
-+
- #define FIX_FPU() ((void)0)
- 
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
-+
- #endif
- 
- JSBool

Copied and modified: branches/experimental/www/libxul-devel/files/patch-js_src_jsnum.cpp (from r156, branches/experimental/www/libxul/files/patch-js_src_jsnum.c)
==============================================================================
--- branches/experimental/www/libxul/files/patch-js_src_jsnum.c	Sun Nov  8 16:06:26 2009	(r156, copy source)
+++ branches/experimental/www/libxul-devel/files/patch-js_src_jsnum.cpp	Mon Nov 16 15:20:50 2009	(r163)
@@ -1,16 +1,16 @@
---- js/src/jsnum.cpp.orig	2009-08-14 19:00:22.000000000 +0200
-+++ js/src/jsnum.cpp	2009-08-14 19:01:44.000000000 +0200
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
+--- js/src/jsnum.cpp.orig	2009-10-14 18:03:30.000000000 +0200
++++ js/src/jsnum.cpp	2009-10-15 21:49:44.000000000 +0200
+@@ -43,6 +43,9 @@
+ /*
+  * JS number type and wrapper class.
+  */
 +#if defined(__FreeBSD__)
 +#include <sys/param.h>
 +#endif
  #ifdef XP_OS2
  #define _PC_53  PC_53
  #define _MCW_EM MCW_EM
-@@ -659,8 +662,16 @@
+@@ -691,8 +694,16 @@
  
  #else
  

Modified: branches/experimental/www/libxul-devel/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-layout_generic_Makefile.in	Sun Nov  8 16:06:26 2009	(r156)
+++ branches/experimental/www/libxul-devel/files/patch-layout_generic_Makefile.in	Mon Nov 16 15:20:50 2009	(r163)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
-@@ -188,9 +188,10 @@
+--- layout/generic/Makefile.in.orig	2009-08-07 00:49:41.000000000 +0200
++++ layout/generic/Makefile.in	2009-08-09 20:54:53.000000000 +0200
+@@ -187,9 +187,10 @@
  		-I$(srcdir)/../../content/base/src \
  		-I$(srcdir)/../../content/html/content/src \
- 		-I$(srcdir)/../../dom/src/base \
+ 		-I$(srcdir)/../../dom/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  

Deleted: branches/experimental/www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp	Mon Nov 16 15:20:50 2009	(r156)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,17 +0,0 @@
---- toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig	2008-03-19 20:30:49.000000000 +0100
-+++ toolkit/components/places/src/nsMorkHistoryImporter.cpp	2008-12-17 09:38:05.000000000 +0100
-@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
-     }
- 
-     PRTime date;
--    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
-+    long long ld;
-+    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
-       date = -1;
--    }
-+    } else {
-+      date = ld;
-+   }
- 
-     PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
-     PRInt32 transition = isTyped ?

Deleted: branches/experimental/www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit_mozapps_installer_packager.mk	Mon Nov 16 15:20:50 2009	(r156)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
-+++ toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable

Added: branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp	Mon Nov 16 15:20:50 2009	(r163)
@@ -0,0 +1,20 @@
+--- toolkit/mozapps/update/src/updater/updater.cpp.orig	2009-09-16 04:41:19.000000000 +0200
++++ toolkit/mozapps/update/src/updater/updater.cpp	2009-09-18 01:49:47.000000000 +0200
+@@ -511,7 +511,7 @@
+   struct stat ss;
+ 
+   AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
+-  if (sfile == NULL || fstat(fileno(sfile), &ss)) {
++  if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
+     LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(), spath, errno));
+     return READ_ERROR;
+   }
+@@ -1660,7 +1660,7 @@
+     return READ_ERROR;
+ 
+   struct stat ms;
+-  rv = fstat(fileno(mfile), &ms);
++  rv = fstat(fileno((FILE*)mfile), &ms);
+   if (rv)
+     return READ_ERROR;
+

More information about the freebsd-gecko mailing list