rpms/xulrunner/devel mozilla-191-path.patch, NONE, 1.1 mozilla-jemalloc.patch, NONE, 1.1 .cvsignore, 1.63, 1.64 sources, 1.66, 1.67 xulrunner-mozconfig, 1.24, 1.25 xulrunner-version.patch, 1.3, 1.4 xulrunner.spec, 1.138, 1.139 mozilla-mochitest.patch, 1.1, NONE xulrunner-path.patch, 1.1, NONE
Christopher Aillon
caillon at fedoraproject.org
Fri Dec 5 04:46:05 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10263
Modified Files:
.cvsignore sources xulrunner-mozconfig xulrunner-version.patch
xulrunner.spec
Added Files:
mozilla-191-path.patch mozilla-jemalloc.patch
Removed Files:
mozilla-mochitest.patch xulrunner-path.patch
Log Message:
* Thu Dec 4 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.1
- 1.9.1 beta 1
mozilla-191-path.patch:
--- NEW FILE mozilla-191-path.patch ---
--- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200
@@ -48,7 +48,8 @@
#elif defined(CCHMAXPATH)
#define MAXPATHLEN CCHMAXPATH
#else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
#endif
#endif
diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old 2007-09-25 18:00:26.000000000 +0200
+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2007-09-25 18:00:53.000000000 +0200
@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv);
# elif defined(CCHMAXPATH)
# define MAXPATHLEN CCHMAXPATH
# else
-# define MAXPATHLEN 1024
+# include <limits.h>
+# define MAXPATHLEN PATH_MAX
# endif
#endif
diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old 2007-09-25 18:04:25.000000000 +0200
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp 2007-09-25 18:04:48.000000000 +0200
@@ -109,7 +109,8 @@
#elif defined(CCHMAXPATH)
#define MAXPATHLEN CCHMAXPATH
#else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
#endif
#endif
diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old 2006-11-28 01:18:37.000000000 +0100
+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp 2007-09-25 18:05:49.000000000 +0200
@@ -79,7 +79,8 @@
#endif
#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024 /* Guessing this is okay. Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX /* Guessing this is okay. Works for SCO. */
#endif
#if defined(__QNX__)
diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h
--- mozilla/xpcom/build/nsXPCOMPrivate.h.old 2007-09-25 18:02:58.000000000 +0200
+++ mozilla/xpcom/build/nsXPCOMPrivate.h 2007-09-25 18:03:15.000000000 +0200
@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
#elif defined(CCHMAXPATH)
#define MAXPATHLEN CCHMAXPATH
#else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
#endif
#endif
diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h
--- mozilla/dbm/include/mcom_db.h.old 2007-09-25 17:57:09.000000000 +0200
+++ mozilla/dbm/include/mcom_db.h 2007-09-25 17:57:49.000000000 +0200
@@ -214,7 +214,8 @@
#endif /* __DBINTERFACE_PRIVATE */
#ifdef SCO
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
#endif
#include <fcntl.h>
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old 2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c 2007-09-25 18:39:17.000000000 +0200
@@ -44,6 +44,7 @@
#include "xpidl.h"
#include <ctype.h>
#include <glib.h>
+#include <limits.h>
#ifdef XP_WIN
#include <windef.h>
diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old 2007-09-25 18:14:08.000000000 +0200
+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2007-09-25 18:36:55.000000000 +0200
@@ -76,7 +76,8 @@
#endif
#ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
#endif
#define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c
--- mozilla/modules/libreg/src/reg.c.old 2007-09-25 18:25:02.000000000 +0200
+++ mozilla/modules/libreg/src/reg.c 2007-09-25 18:27:46.000000000 +0200
@@ -96,7 +96,8 @@
#define MAX_PATH PATH_MAX
#elif defined(XP_UNIX)
#ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
#endif
#elif defined(XP_OS2)
#ifndef MAX_PATH
diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h
--- mozilla/config/pathsub.h.old 2004-04-18 16:17:25.000000000 +0200
+++ mozilla/config/pathsub.h 2007-09-25 18:48:13.000000000 +0200
@@ -46,7 +46,7 @@
#include <sys/types.h>
#ifndef PATH_MAX
-#define PATH_MAX 1024
+#error "PATH_MAX is not defined!"
#endif
/*
diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp
--- mozilla/modules/libjar/nsZipArchive.cpp.old 2006-09-13 20:32:37.000000000 +0200
+++ mozilla/modules/libjar/nsZipArchive.cpp 2007-09-25 18:51:00.000000000 +0200
@@ -121,7 +121,7 @@ char * strdup(const char *src)
# define S_IFLNK 0120000
# endif
# ifndef PATH_MAX
-# define PATH_MAX 1024
+# include <limits.h>
# endif
#endif /* XP_UNIX */
diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h
--- mozilla/nsprpub/config/pathsub.h.old 2004-04-25 17:00:34.000000000 +0200
+++ mozilla/nsprpub/config/pathsub.h 2007-09-25 18:57:51.000000000 +0200
@@ -50,7 +50,7 @@
#endif
#ifndef PATH_MAX
-#define PATH_MAX 1024
+#error "PATH_MAX is not defined!"
#endif
/*
diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h
--- mozilla/security/coreconf/nsinstall/pathsub.h.old 2004-04-25 17:02:18.000000000 +0200
+++ mozilla/security/coreconf/nsinstall/pathsub.h 2007-09-25 19:00:35.000000000 +0200
@@ -49,7 +49,7 @@
#endif
#ifndef PATH_MAX
-#define PATH_MAX 1024
+#error "PATH_MAX is not defined!"
#endif
/*
mozilla-jemalloc.patch:
--- NEW FILE mozilla-jemalloc.patch ---
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100
+++ b/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
} jemalloc_stats_t;
#ifndef MOZ_MEMORY_DARWIN
-void *malloc(size_t size);
-void *valloc(size_t size);
-void *calloc(size_t num, size_t size);
-void *realloc(void *ptr, size_t size);
-void free(void *ptr);
+void *malloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *valloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur;
+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur;
+void free(void *ptr) __THROW __attribute_malloc__ __wur;
#endif
-int posix_memalign(void **memptr, size_t alignment, size_t size);
+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur;
void *memalign(size_t alignment, size_t size);
size_t malloc_usable_size(const void *ptr);
void jemalloc_stats(jemalloc_stats_t *stats);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore 3 Dec 2008 21:04:45 -0000 1.63
+++ .cvsignore 5 Dec 2008 04:45:34 -0000 1.64
@@ -1 +1 @@
-xulrunner-1.9.0.4-source.tar.bz2
+xulrunner-1.9.1b1-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources 3 Dec 2008 21:04:45 -0000 1.66
+++ sources 5 Dec 2008 04:45:34 -0000 1.67
@@ -1 +1 @@
-ffbd03ef7a123db250c1775b22685447 xulrunner-1.9.0.4-source.tar.bz2
+d101c02c8ad670eeb2095e449c79c085 xulrunner-1.9.1b1-source.tar.bz2
Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xulrunner-mozconfig 7 Oct 2008 04:26:37 -0000 1.24
+++ xulrunner-mozconfig 5 Dec 2008 04:45:34 -0000 1.25
@@ -1,5 +1,11 @@
. $topsrcdir/xulrunner/config/mozconfig
+# --with-system-png is disabled because Mozilla requires APNG support in libpng
+#ac_add_options --with-system-png
+# --enable-system-lcms is disabled because Mozilla patched lcms.h to have INTENT_{MIN,MAX}
+# See https://bugzilla.mozilla.org/show_bug.cgi?id=444014
+#ac_add_options --enable-system-lcms
+
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-nspr
@@ -7,8 +13,6 @@
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
-#ac_add_options --with-system-png
-ac_add_options --enable-system-lcms
#ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-cairo
xulrunner-version.patch:
Index: xulrunner-version.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-version.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xulrunner-version.patch 18 Jul 2008 18:39:06 -0000 1.3
+++ xulrunner-version.patch 5 Dec 2008 04:45:34 -0000 1.4
@@ -6,7 +6,7 @@
include $(DEPTH)/config/autoconf.mk
-+MOZ_APP_VERSION="1.9"
++MOZ_APP_VERSION="1.9.1"
+
NO_PKG_FILES = \
xulrunner-config \
Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- xulrunner.spec 3 Dec 2008 21:04:45 -0000 1.138
+++ xulrunner.spec 5 Dec 2008 04:45:34 -0000 1.139
@@ -2,17 +2,17 @@
%define nss_version 3.12.1.1
%define cairo_version 0.6
-%define version_internal 1.9
+%define version_internal 1.9.1
%define mozappdir %{_libdir}/%{name}-%{version_internal}
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 1.9.0.4
-Release: 1%{?dist}
+Version: 1.9.1
+Release: 0.1.beta1%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-Source0: xulrunner-%{version}-source.tar.bz2
+Source0: xulrunner-%{version}b1-source.tar.bz2
Source10: %{name}-mozconfig
Source12: %{name}-redhat-default-prefs.js
Source21: %{name}.sh.in
@@ -20,10 +20,10 @@
# build patches
Patch1: mozilla-build.patch
-Patch2: xulrunner-path.patch
+Patch2: mozilla-191-path.patch
Patch3: xulrunner-version.patch
Patch4: mozilla-sqlite.patch
-Patch5: mozilla-mochitest.patch
+Patch5: mozilla-jemalloc.patch
# Fedora specific patches
Patch10: mozilla-pkgconfig.patch
@@ -117,13 +117,13 @@
%prep
%setup -q -c
-cd mozilla
+cd mozilla-central
%patch1 -p1 -b .build
%patch2 -p1 -b .path
%patch3 -p1 -b .version
%patch4 -p1 -b .sqlite
autoconf-2.13
-%patch5 -p1 -b .mochitest
+%patch5 -p1 -b .jemalloc
%patch10 -p1 -b .pk
@@ -136,7 +136,7 @@
#---------------------------------------------------------------------
%build
-cd mozilla
+cd mozilla-central
INTERNAL_GECKO=%{version_internal}
MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
@@ -163,7 +163,7 @@
#---------------------------------------------------------------------
%install
-cd mozilla
+cd mozilla-central
%{__rm} -rf $RPM_BUILD_ROOT
INTERNAL_GECKO=%{version_internal}
@@ -413,6 +413,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Dec 4 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.1
+- 1.9.1 beta 1
+
* Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.4-1
- Update to 1.9.0.4
--- mozilla-mochitest.patch DELETED ---
--- xulrunner-path.patch DELETED ---
More information about the fedora-extras-commits
mailing list