diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ac9bdc3..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xulrunner-1.9.1b3-source.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index e25ce9e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xulrunner -# $Id$ -NAME := xulrunner -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3f37036 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package is no longer supported by upstream diff --git a/mfsa-2009-12.patch b/mfsa-2009-12.patch deleted file mode 100644 index 85d7e7f..0000000 --- a/mfsa-2009-12.patch +++ /dev/null @@ -1,57 +0,0 @@ -# HG changeset patch -# User Blake Kaplan -# Date 1238011664 25200 -# Node ID 167d03699cdb98daa726b9024dd80ac3d9e80e06 -# Parent c8c6ed1b96a72df7d47fb0ce014b18ec3f71abc7 -Bug 485217 - Pop the eval context before returning. r+sr=peterv - ---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 22:10:03 2009 +0200 -+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 13:07:44 2009 -0700 -@@ -395,9 +395,9 @@ nsresult txXSLKey::testNode(const txXPat - nsRefPtr exprResult; - rv = mKeys[currKey].useExpr->evaluate(&evalContext, - getter_AddRefs(exprResult)); -- NS_ENSURE_SUCCESS(rv, rv); - - aEs.popEvalContext(); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = static_cast - -# HG changeset patch -# User Blake Kaplan -# Date 1238052189 25200 -# Node ID 4552d789ad8ff607e2596ad3107d33a3d0e92654 -# Parent f087a48da189d0d6404040bc90a97f2624ab544f -Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking (a=ss for checkin into a CLOSED TREE). - ---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp Wed Mar 25 16:59:14 2009 -0500 -+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp Thu Mar 26 00:23:09 2009 -0700 -@@ -388,16 +388,19 @@ nsresult txXSLKey::testNode(const txXPat - PRUint32 currKey, numKeys = mKeys.Length(); - for (currKey = 0; currKey < numKeys; ++currKey) { - if (mKeys[currKey].matchPattern->matches(aNode, &aEs)) { -- txSingleNodeContext evalContext(aNode, &aEs); -- nsresult rv = aEs.pushEvalContext(&evalContext); -+ txSingleNodeContext *evalContext = -+ new txSingleNodeContext(aNode, &aEs); -+ NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY); -+ -+ nsresult rv = aEs.pushEvalContext(evalContext); - NS_ENSURE_SUCCESS(rv, rv); - - nsRefPtr exprResult; -- rv = mKeys[currKey].useExpr->evaluate(&evalContext, -+ rv = mKeys[currKey].useExpr->evaluate(evalContext, - getter_AddRefs(exprResult)); -+ NS_ENSURE_SUCCESS(rv, rv); - -- aEs.popEvalContext(); -- NS_ENSURE_SUCCESS(rv, rv); -+ delete aEs.popEvalContext(); - - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = static_cast - - diff --git a/mfsa-2009-13.patch b/mfsa-2009-13.patch deleted file mode 100644 index 7c6fa4a..0000000 --- a/mfsa-2009-13.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Olli Pettay -# Date 1237909358 -7200 -# Node ID 60caf43ff9c21e7b4d6b07e3d2d8413196a86b25 -# Parent 726d6e0d61def97cd6f9d72949ab283b83902d53 -Bug 484320, r=dveditz, sr=mrbkap, a=blocking1.9.1 - ---- a/layout/xul/base/src/tree/src/nsTreeSelection.cpp Wed Mar 18 11:00:20 2009 +0000 -+++ b/layout/xul/base/src/tree/src/nsTreeSelection.cpp Tue Mar 24 17:42:38 2009 +0200 -@@ -268,6 +268,8 @@ nsTreeSelection::~nsTreeSelection() - nsTreeSelection::~nsTreeSelection() - { - delete mFirstRange; -+ if (mSelectTimer) -+ mSelectTimer->Cancel(); - } - - // QueryInterface implementation for nsBoxObject - - diff --git a/mozilla-191-path.patch b/mozilla-191-path.patch deleted file mode 100644 index a49ffd6..0000000 --- a/mozilla-191-path.patch +++ /dev/null @@ -1,162 +0,0 @@ ---- 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 -+#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 -+# 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 -+#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 -+#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 -+#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 -+#define MAXPATHLEN PATH_MAX - #endif - - #include -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 - #include -+#include - - #ifdef XP_WIN - #include -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 -+#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 -+#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 - - #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 - # 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 - - /* diff --git a/mozilla-191-pkgconfig.patch b/mozilla-191-pkgconfig.patch deleted file mode 100644 index 62dfddf..0000000 --- a/mozilla-191-pkgconfig.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -r f1af606531f5 config/autoconf.mk.in ---- a/config/autoconf.mk.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/config/autoconf.mk.in Mon Dec 01 22:30:12 2008 -0500 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -r f1af606531f5 xulrunner/installer/Makefile.in ---- a/xulrunner/installer/Makefile.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/Makefile.in Mon Dec 01 22:30:12 2008 -0500 -@@ -116,6 +118,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -r f1af606531f5 xulrunner/installer/libxul-embedding-unstable.pc.in ---- a/xulrunner/installer/libxul-embedding-unstable.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/libxul-embedding-unstable.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,11 +1,12 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/unstable - includetype=unstable - - Name: libxul-embedding-unstable - Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -diff -r f1af606531f5 xulrunner/installer/libxul-embedding.pc.in ---- a/xulrunner/installer/libxul-embedding.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/libxul-embedding.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,7 +1,7 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/stable - includetype=stable - - # Note: the default pkg-config cflags will only list include directories -@@ -11,5 +11,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue -+Requires: %NSPR_NAME% >= %NSPR_VERSION% -+Libs: -L${sdkdir}/sdk/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -diff -r f1af606531f5 xulrunner/installer/libxul-unstable.pc.in ---- a/xulrunner/installer/libxul-unstable.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/libxul-unstable.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,7 +1,8 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/unstable - includetype=unstable - - Name: libxul -diff -r f1af606531f5 xulrunner/installer/libxul.pc.in ---- a/xulrunner/installer/libxul.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/libxul.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,7 +1,8 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/stable - includetype=stable - - # Note: the default pkg-config includes will only list include directories -@@ -12,5 +13,5 @@ - Description: The Mozilla Runtime and Embedding Engine - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -+Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom - Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS% -diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -r f1af606531f5 xulrunner/installer/mozilla-js.pc.in ---- a/xulrunner/installer/mozilla-js.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/mozilla-js.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -6,5 +6,5 @@ - Description: The Mozilla JavaScript Library - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lmozjs --Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE -+Libs: -L${sdkdir}/sdk/lib -lmozjs -+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in ---- a/xulrunner/installer/mozilla-plugin.pc.in Sat Nov 22 20:22:22 2008 +0100 -+++ b/xulrunner/installer/mozilla-plugin.pc.in Mon Dec 01 22:30:12 2008 -0500 -@@ -6,4 +6,4 @@ - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Cflags: -I${includedir}/stable -+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin diff --git a/mozilla-build.patch b/mozilla-build.patch deleted file mode 100644 index a956e5f..0000000 --- a/mozilla-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in ---- mozilla/security/manager/Makefile.in.old 2007-10-25 00:25:30.000000000 +0200 -+++ mozilla/security/manager/Makefile.in 2007-11-06 10:57:39.000000000 +0100 -@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= - DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 --DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 - ifdef NSS_DISABLE_DBM - DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 - endif -diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in ---- mozilla/security/manager/ssl/src/Makefile.in.old 2007-10-19 21:16:36.000000000 +0200 -+++ mozilla/security/manager/ssl/src/Makefile.in 2007-11-06 10:57:52.000000000 +0100 -@@ -134,8 +134,6 @@ REQUIRES = nspr \ - - EXTRA_DEPS = $(NSS_DEP_LIBS) - --DEFINES += -DNSS_ENABLE_ECC -- - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's - LOCAL_INCLUDES += $(NSS_CFLAGS) diff --git a/mozilla-jemalloc.patch b/mozilla-jemalloc.patch deleted file mode 100644 index aabd690..0000000 --- a/mozilla-jemalloc.patch +++ /dev/null @@ -1,24 +0,0 @@ -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); diff --git a/mozilla-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab1341..0000000 --- a/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; diff --git a/sources b/sources deleted file mode 100644 index f50f6ea..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -61cd1a7fc587f6d2a33c564033198e2c xulrunner-1.9.1b3-source.tar.bz2 diff --git a/xulrunner-elif.patch b/xulrunner-elif.patch deleted file mode 100644 index 702d4f1..0000000 --- a/xulrunner-elif.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp.old xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp ---- mozilla-central/toolkit/xre/nsAppRunner.cpp.old 2008-12-10 20:07:01.000000000 +0100 -+++ mozilla-central/toolkit/xre/nsAppRunner.cpp 2009-02-27 17:17:59.000000000 +0100 -@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI - if (NS_FAILED(rv)) - return rv; - --#elif -+#else - #error Oops, you need platform-specific code here - #endif - diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig deleted file mode 100644 index 52f78cf..0000000 --- a/xulrunner-mozconfig +++ /dev/null @@ -1,39 +0,0 @@ -. $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 -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -#ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads -ac_add_options --disable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --enable-safe-browsing -ac_add_options --enable-extensions=default,python/xpcom - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - diff --git a/xulrunner-pango.patch b/xulrunner-pango.patch deleted file mode 100644 index c832cf7..0000000 --- a/xulrunner-pango.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp ---- mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old 2009-02-27 16:19:07.000000000 +0100 -+++ mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp 2009-02-27 16:37:30.000000000 +0100 -@@ -1299,12 +1299,11 @@ gfx_pango_font_map_context_substitute(Pa - - static PangoFcFont * - gfx_pango_font_map_create_font(PangoFcFontMap *fontmap, -- PangoContext *context, -- const PangoFontDescription *desc, -- FcPattern *pattern) -+ PangoFcFontKey *fontkey) - { -+ const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey); - return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT, -- "pattern", pattern, NULL)); -+ "pattern", p_pattern, NULL)); - } - - static void -@@ -1324,9 +1323,8 @@ gfx_pango_font_map_class_init(gfxPangoFo - // context_key_* virtual functions are only necessary if we want to - // dynamically respond to changes in the screen cairo_font_options_t. - -- // context_substitute and get_font are not likely to be used but -+ // get_font is not likely to be used but - // implemented because the class makes them available. -- fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute; - fcfontmap_class->create_font = gfx_pango_font_map_create_font; - } - diff --git a/xulrunner-redhat-default-prefs.js b/xulrunner-redhat-default-prefs.js deleted file mode 100644 index 425be0a..0000000 --- a/xulrunner-redhat-default-prefs.js +++ /dev/null @@ -1,10 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("browser.link.open_external", 3); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "Fedora"); -pref("general.useragent.vendorSub", "RPM_VERREL"); -pref("intl.locale.matchOS", true); -pref("toolkit.networkmanager.disable", false); -pref("toolkit.storage.synchronous", 0); diff --git a/xulrunner-version.patch b/xulrunner-version.patch deleted file mode 100644 index d08bde9..0000000 --- a/xulrunner-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module -diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in ---- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100 -+++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100 -@@ -44,6 +44,8 @@ VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__" -+ - NO_PKG_FILES = \ - xulrunner-config \ - regchrome* \ diff --git a/xulrunner.1 b/xulrunner.1 deleted file mode 100644 index 2086325..0000000 --- a/xulrunner.1 +++ /dev/null @@ -1,125 +0,0 @@ -.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual" -.SH NAME -firefox \- a Web browser for X11 derived from the Mozilla browser - -.SH SYNOPSIS -.B firefox -[\fIOPTIONS\fR] [\fIURL\fR] - -.B firefox-bin -[\fIOPTIONS\fR] [\fIURL\fR] - -.SH DESCRIPTION -\fBMozilla Firefox\fR is an open-source web browser, designed for -standards compliance, performance and portability. - -.SH USAGE -\fBfirefox\fR is a simple shell script that will set up the -environment for the actual executable, \fBfirefox-bin\fR. - -.SH OPTIONS -A summary of the options supported by \fBfirefox\fR is included below. - -.SS "GTK options" -\fB\-\-gdk-debug=\fR\fIFLAGS\fR -Gdk debugging flags to set -.TP -\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR -Gdk debugging flags to unset -.TP -\fB\-\-gtk-debug=\fR\fIFLAGS\fR -Gtk+ debugging flags to set -.TP -\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR -Gtk+ debugging flags to unset -.TP -\fB\-\-gtk-module=\fR\fIMODULE\fR -Load an additional Gtk module - -.SS "X11 options" -.TP -.BI \-\-display= DISPLAY -X display to use -.TP -.B \--sync -Make X calls synchronous -.TP -.B \-\-no-xshm -Don't use X shared memory extension -.TP -.BI \-\-xim-preedit= STYLE -.TP -.BI \-\-xim-status= STYLE -.TP -.B \-\-g-fatal-warnings -Make all warnings fatal - -.SS "Firefox options" -.TP -\fB\-height\fR \fIvalue\fR -Set height of startup window to \fIvalue\fR. -.TP -.B \-h, \-help -Show summary of options. -.TP -.B \-installer -Start with 4.x migration window. -.TP -\fB\-width\fR \fIvalue\fR -Set width of startup window to \fIvalue\fR. -.TP -.B \-v, \-version -Print \fB/usr/bin/firefox-bin\fR version. -.TP -\fB\-CreateProfile\fR \fIprofile\fR -Create \fIprofile\fR. -.TP -\fB\-P\fR \fIprofile\fR -Start with \fIprofile\fR. -.TP -.B \-ProfileWizard -Start with profile wizard. -.TP -.B \-ProfileManager -Start with profile manager. -.TP -.B \-SelectProfile -Start with profile selection dialog. -.TP -\fB\-lang\fR \fIlang-region\fR -Start with \fIlang-region\fR resources. -.TP -\fB\-remote\fR \fIcommand\fR -Execute \fIcommand\fR in an already running Firefox process. For more info, -see: \fIhttp://www.mozilla.org/unix/remote.html\fR -.TP -.B \-splash -Enable splash screen. -.TP -.B \-jsconsole -Start with Javascript Console -.TP -\fB\-chrome\fR \fIurl\fR -Load the specified chrome. -.TP - -.SH FILES -\fI/usr/bin/firefox\fR - shell script wrapping -\fBfirefox\fR -.br -\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR -executable - -.SH VERSION -1.0 - -.SH BUGS -To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR - -.SH "SEE ALSO" -.BR mozilla(1) - -.SH AUTHORS -.TP -.B The Mozilla Organization -.I http://www.mozilla.org/about.html diff --git a/xulrunner.sh.in b/xulrunner.sh.in deleted file mode 100644 index b776138..0000000 --- a/xulrunner.sh.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -## -## Usage: -## -## $ xulrunner -## -## This script is meant to run a xulrunner program from the xulrunner -## rpm installation. -## - -cmdname=`basename $0` - -## -## Variables -## -XUL_ARCH=$(uname -m) -case $XUL_ARCH in - x86_64 | ia64 | s390 ) - XUL_LIB_DIR="/usr/lib64" - SECONDARY_LIB_DIR="/usr/lib" - ;; - * ) - XUL_LIB_DIR="/usr/lib" - SECONDARY_LIB_DIR="/usr/lib64" - ;; -esac - -if [ ! -x $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then - if [ ! -x $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then - echo "Error: $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found" - if [ -d $SECONDARY_LIB_DIR ]; then - echo " $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found" - fi - exit 1 - fi - XUL_LIB_DIR="$SECONDARY_LIB_DIR" -fi -XUL_DIST_BIN="$XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION" -XUL_PROGRAM="$XUL_DIST_BIN/xulrunner" - -exec $XUL_PROGRAM "$@" diff --git a/xulrunner.spec b/xulrunner.spec deleted file mode 100644 index 374e9f1..0000000 --- a/xulrunner.spec +++ /dev/null @@ -1,768 +0,0 @@ -%define nspr_version 4.7.1 -%define nss_version 3.12.1.1 -%define cairo_version 1.6.0 -%define lcms_version 1.17 -%define freetype_version 2.1.9 -%define sqlite_version 3.6.7 -%define tarballdir mozilla-1.9.1 - -%define version_internal 1.9.1 -%define mozappdir %{_libdir}/%{name}-%{version_internal} - -Summary: XUL Runtime for Gecko Applications -Name: xulrunner -Version: 1.9.1 -Release: 0.11.beta3%{?dist} -URL: http://developer.mozilla.org/En/XULRunner -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Applications/Internet -Source0: xulrunner-%{version}b3-source.tar.bz2 -Source10: %{name}-mozconfig -Source12: %{name}-redhat-default-prefs.js -Source21: %{name}.sh.in -Source23: %{name}.1 - -# build patches -Patch0: xulrunner-version.patch -Patch1: mozilla-build.patch -Patch2: mozilla-191-path.patch -Patch3: mozilla-jemalloc.patch -Patch4: xulrunner-pango.patch -Patch5: xulrunner-elif.patch - -# Fedora specific patches -Patch10: mozilla-191-pkgconfig.patch - -# Upstream patches -Patch100: mozilla-ps-pdf-simplify-operators.patch -Patch101: mfsa-2009-12.patch -Patch102: mfsa-2009-13.patch - -# --------------------------------------------------- - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: nspr-devel >= %{nspr_version} -BuildRequires: nss-devel >= %{nss_version} -BuildRequires: cairo-devel >= %{cairo_version} -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel -BuildRequires: zip -BuildRequires: bzip2-devel -BuildRequires: zlib-devel -BuildRequires: lcms-devel >= %{lcms_version} -BuildRequires: libIDL-devel -BuildRequires: gtk2-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: libgnome-devel -BuildRequires: libgnomeui-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: hunspell-devel -BuildRequires: sqlite-devel >= %{sqlite_version} -BuildRequires: startup-notification-devel -BuildRequires: alsa-lib-devel - -Requires: mozilla-filesystem -Requires: nspr >= %{nspr_version} -Requires: nss >= %{nss_version} -Provides: gecko-libs = %{version} - -%description -XULRunner provides the XUL Runtime environment for Gecko applications. - -%package devel -Summary: Development files for Gecko -Group: Development/Libraries -Obsoletes: mozilla-devel < 1.9 -Obsoletes: firefox-devel < 2.1 -Provides: gecko-devel = %{version} - -Requires: xulrunner = %{version}-%{release} -Requires: nspr-devel >= %{nspr_version} -Requires: nss-devel >= %{nss_version} -Requires: cairo-devel >= %{cairo_version} -Requires: libjpeg-devel -Requires: zip -Requires: bzip2-devel -Requires: zlib-devel -Requires: lcms-devel >= %{lcms_version} -Requires: libIDL-devel -Requires: gtk2-devel -Requires: gnome-vfs2-devel -Requires: libgnome-devel -Requires: libgnomeui-devel -Requires: krb5-devel -Requires: pango-devel -Requires: freetype-devel >= %{freetype_version} -Requires: libXt-devel -Requires: libXrender-devel -Requires: hunspell-devel -Requires: sqlite-devel >= ${sqlite_version} -Requires: startup-notification-devel -Requires: alsa-lib-devel - -%description devel -Gecko development files. - -%package devel-unstable -Summary: Development files for Gecko, which are not considered stable -Group: Development/Libraries -Requires: xulrunner-devel = %{version}-%{release} -Provides: gecko-devel-unstable = %{version} - -%description devel-unstable -Unstable files for use with development of Gecko applications. These headers -are not frozen and APIs can change at any time, so should not be relied on. - -%package python -Summary: Files needed to run Gecko applications written in python. -Group: Applications/Internet -BuildRequires: python-devel -Requires: gecko-libs = %{version}-%{release} -Provides: pyxpcom = %{version}-%{release} -Provides: gecko-python = %{version}-%{release} - -%description python -Files needed to run Gecko applications written in python. - -%package python-devel -Summary: Development files for building Gecko applications written in python. -Group: Development/Libraries -Requires: gecko-devel = %{version}-%{release} -Provides: pyxpcom-devel = %{version}-%{release} -Provides: gecko-python-devel = %{version}-%{release} - -%description python-devel -Development files for building Gecko applications written in python. - -#--------------------------------------------------------------------- - -%prep -%setup -q -c -cd %{tarballdir} - -sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ - > version.patch -%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch - -%patch1 -p1 -b .build -%patch2 -p1 -b .path -%patch3 -p1 -b .jemalloc -%patch4 -p1 -b .pango -%patch5 -p1 -b .elif - -%patch10 -p1 -b .pk - -%patch100 -p1 -b .ps-pdf-simplify-operators - -%patch101 -p1 -b .mfsa-2009-12 -%patch102 -p1 -b .mfsa-2009-13 - -%{__rm} -f .mozconfig -%{__cp} %{SOURCE10} .mozconfig - -#--------------------------------------------------------------------- - -%build -cd %{tarballdir} - -INTERNAL_GECKO=%{version_internal} -MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO} - -# Mozilla builds with -Wall with exception of a few warnings which show up -# everywhere in the code; so, don't override that. -MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//') -export CFLAGS=$MOZ_OPT_FLAGS -export CXXFLAGS=$MOZ_OPT_FLAGS - -export PREFIX='%{_prefix}' -export LIBDIR='%{_libdir}' - -MOZ_SMP_FLAGS=-j1 -%ifnarch ppc ppc64 s390 s390x -[ -z "$RPM_BUILD_NCPUS" ] && \ - RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2 -%endif - -export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}" -make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" - -#--------------------------------------------------------------------- - -%install -cd %{tarballdir} -%{__rm} -rf $RPM_BUILD_ROOT - -INTERNAL_GECKO=%{version_internal} - -INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO} -MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME} - -INTERNAL_APP_SDK_NAME=%{name}-sdk-${INTERNAL_GECKO} -MOZ_APP_SDK_DIR=%{_libdir}/${INTERNAL_APP_SDK_NAME} - -DESTDIR=$RPM_BUILD_ROOT make install - -%{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \ - $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \ - $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME} -%{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR - -%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} - -# set up our default preferences -%{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs -%{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js -%{__rm} rh-default-prefs - -# Start script install -%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__cat} %{SOURCE21} | %{__sed} -e 's,XULRUNNER_VERSION,%{version_internal},g' > \ - $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} - -%{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config - -cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome -find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; -cd - - -# Prepare our devel package -%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} -%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} -%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig - -%{__cp} -rL dist/include/* \ - $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} - -# Copy mozilla-config to stable include dir -%{__cp} dist/include/mozilla-config.h \ - $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable - -# Fix multilib devel conflicts... -%ifarch x86_64 ia64 s390x ppc64 -%define mozbits 64 -%else -%define mozbits 32 -%endif - -function install_file() { -genheader=$* -mv ${genheader}.h ${genheader}%{mozbits}.h -cat > ${genheader}.h << EOF -// This file exists to fix multilib conflicts -#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) -#include "${genheader}64.h" -#else -#include "${genheader}32.h" -#endif -EOF -} - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} -install_file "mozilla-config" -popd - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable -install_file "mozilla-config" -popd - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable -install_file "mozilla-config" -popd - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js -install_file "jsautocfg" -popd - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable -install_file "jsautocfg" -popd - -%{__install} -p -c -m 755 dist/bin/xpcshell \ - dist/bin/xpidl \ - dist/bin/xpt_dump \ - dist/bin/xpt_link \ - $RPM_BUILD_ROOT/${MOZ_APP_DIR} - -%{__rm} -rf $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME} -%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME} - -%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/include -ln -s %{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable \ - $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/include -%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/idl -ln -s %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/unstable \ - $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/idl - -%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/include -ln -s %{_includedir}/${INTERNAL_APP_SDK_NAME}/stable \ - $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/include -%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl -ln -s %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/stable \ - $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl - -find $RPM_BUILD_ROOT/%{_includedir} -type f -name "*.h" | xargs chmod 644 -find $RPM_BUILD_ROOT/%{_datadir}/idl -type f -name "*.idl" | xargs chmod 644 - -%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/*.so -pushd $RPM_BUILD_ROOT${MOZ_APP_DIR} -for i in *.so; do - ln -s ${MOZ_APP_DIR}/$i $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/$i -done -popd - -# GRE stuff -%ifarch x86_64 ia64 ppc64 s390x -%define gre_conf_file gre64.conf -%else -%define gre_conf_file gre.conf -%endif - -MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` -%{__mv} $RPM_BUILD_ROOT/etc/gre.d/$MOZILLA_GECKO_VERSION".system.conf" \ - $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} -chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} - -# Library path -%ifarch x86_64 ia64 ppc64 s390x -%define ld_conf_file xulrunner-64.conf -%else -%define ld_conf_file xulrunner-32.conf -%endif - -%{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d -%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF -${MOZ_APP_DIR} -EOF - -# Copy over the LICENSE -%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR} - -# Use the system hunspell dictionaries -%{__rm} -rf ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries -ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries - -# ghost files -%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/components -touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat -touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat - -#--------------------------------------------------------------------- - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -#--------------------------------------------------------------------- - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%preun -# is it a final removal? -if [ $1 -eq 0 ]; then - %{__rm} -rf ${MOZ_APP_DIR}/components -fi - -%files -%defattr(-,root,root,-) -%{_bindir}/xulrunner -%dir /etc/gre.d -/etc/gre.d/%{gre_conf_file} -%dir %{mozappdir} -%doc %attr(644, root, root) %{mozappdir}/LICENSE -%doc %attr(644, root, root) %{mozappdir}/README.txt -%{mozappdir}/chrome -%{mozappdir}/dictionaries -%dir %{mozappdir}/components -%ghost %{mozappdir}/components/compreg.dat -%ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/components/*.so -%{mozappdir}/components/*.xpt -%exclude %{mozappdir}/components/libpyloader.so -%attr(644, root, root) %{mozappdir}/components/*.js -%{mozappdir}/defaults -%{mozappdir}/greprefs -%dir %{mozappdir}/icons -%attr(644, root, root) %{mozappdir}/icons/* -%{mozappdir}/modules -%{mozappdir}/plugins -%{mozappdir}/res -%{mozappdir}/*.so -%{mozappdir}/mozilla-xremote-client -%{mozappdir}/run-mozilla.sh -%{mozappdir}/regxpcom -%{mozappdir}/xulrunner -%{mozappdir}/xulrunner-bin -%{mozappdir}/xulrunner-stub -%{mozappdir}/platform.ini -%{mozappdir}/dependentlibs.list -%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf - -# XXX See if these are needed still -%{mozappdir}/updater* - -%files devel -%defattr(-,root,root,-) -%dir %{_datadir}/idl/%{name}*%{version_internal} -%{_datadir}/idl/%{name}*%{version_internal}/stable -%{_includedir}/%{name}*%{version_internal} -%exclude %{_includedir}/%{name}*%{version_internal}/unstable -%exclude %{_includedir}/%{name}*%{version_internal}/pyxpcom -%dir %{_libdir}/%{name}-sdk-* -%dir %{_libdir}/%{name}-sdk-*/sdk -%{mozappdir}/xpcshell -%{mozappdir}/xpidl -%{mozappdir}/xpt_dump -%{mozappdir}/xpt_link -%{_libdir}/%{name}-sdk-*/*.h -%{_libdir}/%{name}-sdk-*/sdk/* -%exclude %{_libdir}/%{name}-sdk-%{version_internal}/sdk/lib/libpyxpcom.so -%exclude %{_libdir}/pkgconfig/*unstable*.pc -%exclude %{_libdir}/pkgconfig/*gtkmozembed*.pc -%{_libdir}/pkgconfig/*.pc - -%files devel-unstable -%defattr(-,root,root,-) -%{_datadir}/idl/%{name}*%{version_internal}/unstable -%{_includedir}/%{name}*%{version_internal}/unstable -%dir %{_libdir}/%{name}-sdk-* -%{_libdir}/%{name}-sdk-*/* -%exclude %{_libdir}/%{name}-sdk-*/*.h -%exclude %{_libdir}/%{name}-sdk-*/sdk -%{_libdir}/pkgconfig/*unstable*.pc -%{_libdir}/pkgconfig/*gtkmozembed*.pc - -%files python -%{mozappdir}/components/pyabout.py* -%{mozappdir}/components/libpyloader.so -%{mozappdir}/python - -%files python-devel -%{_includedir}/%{name}*%{version_internal}/pyxpcom -%{_libdir}/%{name}-sdk-%{version_internal}/sdk/lib/libpyxpcom.so - -#--------------------------------------------------------------------- - -%changelog -* Fri Mar 27 2009 Christopher Aillon 1.9.1-0.11 -- Add patches for MFSA-2009-12, MFSA-2009-13 - -* Fri Mar 13 2009 Christopher Aillon 1.9.1-0.10 -- 1.9.1 beta 3 - -* Fri Feb 27 2009 Martin Stransky 1.9.1-0.9 -- Build fix for pango 1.23 -- Misc. build fixes - -* Thu Feb 26 2009 Fedora Release Engineering - 1.9.1-0.8.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jan 28 2009 Christopher Aillon 1.9.1-0.7 -- Re-enable NM by default - -* Wed Jan 7 2009 Martin Stransky 1.9.1-0.6 -- Copied mozilla-config.h to stable include dir (#478445) - -* Mon Dec 22 2008 Christopher Aillon 1.9.1-0.5 -- Typo fix - -* Sat Dec 20 2008 Christopher Aillon 1.9.1-0.4 -- 1.9.1 beta 2 - -* Tue Dec 9 2008 Christopher Aillon 1.9.1-0.3 -- Mark this as a pre-release - -* Tue Dec 9 2008 Christopher Aillon 1.9.1-0.2 -- Add needed -devel requires to the -devel package - -* Thu Dec 4 2008 Christopher Aillon 1.9.1-0.1 -- 1.9.1 beta 1 - -* Wed Nov 12 2008 Christopher Aillon 1.9.0.4-1 -- Update to 1.9.0.4 - -* Mon Oct 27 2008 Christopher Aillon 1.9.0.2-5 -- Password manager fixes from upstream - -* Tue Oct 7 2008 Marco Pesenti Gritti 1.9.0.2-4 -- Add missing dependency on python-devel - -* Sun Oct 5 2008 Christopher Aillon 1.9.0.2-3 -- Enable PyXPCOM - -* Thu Sep 25 2008 Martin Stransky 1.9.0.2-2 -- Build with system cairo (#463341) - -* Tue Sep 23 2008 Christopher Aillon 1.9.0.2-1 -- Update to 1.9.0.2 - -* Wed Jul 23 2008 Christopher Aillon 1.9.0.1-2 -- Disable system hunspell for now as it's causing some crashes (447444) - -* Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 -- Update to 1.9.0.1 - -* Tue Jun 17 2008 Christopher Aillon 1.9-1 -- Update to 1.9 final - -* Thu May 29 2008 Christopher Aillon 1.9-0.63 -- Simplify PS/PDF operators - -* Thu May 22 2008 Christopher Aillon 1.9-0.62 -- Upstream patch to fsync() less - -* Thu May 08 2008 Colin Walters 1.9-0.61 -- Ensure we enable startup notification; add BR and modify config - (bug #445543) - -* Wed Apr 30 2008 Christopher Aillon 1.9-0.60 -- Some files moved to mozilla-filesystem; kill them and add the Req - -* Mon Apr 28 2008 Christopher Aillon 1.9-0.59 -- Clean up the %%files list and get rid of the executable bit on some files - -* Sat Apr 26 2008 Christopher Aillon 1.9-0.58 -- Fix font scaling - -* Fri Apr 25 2008 Martin Stransky 1.9-0.57 -- Enabled phishing protection (#443403) - -* Wed Apr 23 2008 Martin Stransky 1.9-0.56 -- Changed "__ppc64__" to "__powerpc64__", - "__ppc64__" doesn't work anymore -- Added fix for #443725 - Critical hanging bug with fix - available upstream (mozbz#429903) - -* Fri Apr 18 2008 Martin Stransky 1.9-0.55 -- Fixed multilib issues, added starting script instead of a symlink - to binary (#436393) - -* Sat Apr 12 2008 Christopher Aillon 1.9-0.54 -- Add upstream patches for dpi, toolbar buttons, and invalid keys -- Re-enable system cairo - -* Mon Apr 7 2008 Christopher Aillon 1.9-0.53 -- Spec cleanups - -* Wed Apr 2 2008 Christopher Aillon 1.9-0.52 -- Beta 5 - -* Mon Mar 31 2008 Christopher Aillon 1.9-0.51 -- Beta 5 RC2 - -* Thu Mar 27 2008 Christopher Aillon 1.9-0.50 -- Update to latest trunk (2008-03-27) - -* Wed Mar 26 2008 Christopher Aillon 1.9-0.49 -- Update to latest trunk (2008-03-26) - -* Tue Mar 25 2008 Christopher Aillon 1.9-0.48 -- Update to latest trunk (2008-03-25) - -* Mon Mar 24 2008 Christopher Aillon 1.9-0.47 -- Update to latest trunk (2008-03-24) - -* Thu Mar 20 2008 Christopher Aillon 1.9-0.46 -- Update to latest trunk (2008-03-20) - -* Mon Mar 17 2008 Christopher Aillon 1.9-0.45 -- Update to latest trunk (2008-03-17) - -* Mon Mar 17 2008 Christopher Aillon 1.9-0.44 -- Revert to trunk from the 15th to fix crashes on HTTPS sites - -* Sun Mar 16 2008 Christopher Aillon 1.9-0.43 -- Update to latest trunk (2008-03-16) -- Add patch to negate a11y slowdown on some pages (#431162) - -* Sat Mar 15 2008 Christopher Aillon 1.9-0.42 -- Update to latest trunk (2008-03-15) - -* Sat Mar 15 2008 Christopher Aillon 1.9-0.41 -- Avoid conflicts between gecko debuginfo packages - -* Wed Mar 12 2008 Christopher Aillon 1.9-0.40 -- Update to latest trunk (2008-03-12) - -* Tue Mar 11 2008 Christopher Aillon 1.9-0.39 -- Update to latest trunk (2008-03-11) - -* Mon Mar 10 2008 Christopher Aillon 1.9-0.38 -- Update to latest trunk (2008-03-10) - -* Sun Mar 9 2008 Christopher Aillon 1.9-0.37 -- Update to latest trunk (2008-03-09) - -* Fri Mar 7 2008 Christopher Aillon 1.9-0.beta4.36 -- Update to latest trunk (2008-03-07) - -* Thu Mar 6 2008 Christopher Aillon 1.9-0.beta4.35 -- Update to latest trunk (2008-03-06) - -* Tue Mar 4 2008 Christopher Aillon 1.9-0.beta4.34 -- Update to latest trunk (2008-03-04) - -* Sun Mar 2 2008 Christopher Aillon 1.9-0.beta3.33 -- Update to latest trunk (2008-03-02) - -* Sat Mar 1 2008 Christopher Aillon 1.9-0.beta3.32 -- Update to latest trunk (2008-03-01) - -* Fri Feb 29 2008 Christopher Aillon 1.9-0.beta3.31 -- Update to latest trunk (2008-02-29) - -* Thu Feb 28 2008 Christopher Aillon 1.9-0.beta3.30 -- Update to latest trunk (2008-02-28) - -* Wed Feb 27 2008 Christopher Aillon 1.9-0.beta3.29 -- Update to latest trunk (2008-02-27) - -* Tue Feb 26 2008 Christopher Aillon 1.9-0.beta3.28 -- Update to latest trunk (2008-02-26) - -* Sat Feb 23 2008 Christopher Aillon 1.9-0.beta3.27 -- Update to latest trunk (2008-02-23) - -* Fri Feb 22 2008 Christopher Aillon 1.9-0.beta3.26 -- Update to latest trunk (2008-02-22) - -* Thu Feb 21 2008 Christopher Aillon 1.9-0.beta3.25 -- Update to latest trunk (2008-02-21) - -* Wed Feb 20 2008 Christopher Aillon 1.9-0.beta3.24 -- Update to latest trunk (2008-02-20) - -* Sun Feb 17 2008 Christopher Aillon 1.9-0.beta3.23 -- Update to latest trunk (2008-02-17) - -* Fri Feb 15 2008 Christopher Aillon 1.9-0.beta3.22 -- Update to latest trunk (2008-02-15) - -* Thu Feb 14 2008 Christopher Aillon 1.9-0.beta3.21 -- Update to latest trunk (2008-02-14) -- Use system hunspell - -* Mon Feb 11 2008 Christopher Aillon 1.9-0.beta2.19 -- Update to latest trunk (2008-02-11) - -* Mon Feb 11 2008 Adam Jackson 1.9-0.beta2.19 -- STRIP="/bin/true" on the %%make line so xulrunner-debuginfo contains, - you know, debuginfo. - -* Sun Feb 10 2008 Christopher Aillon 1.9-0.beta2.18 -- Update to latest trunk (2008-02-10) - -* Sat Feb 9 2008 Christopher Aillon 1.9-0.beta2.17 -- Update to latest trunk (2008-02-09) - -* Wed Feb 6 2008 Christopher Aillon 1.9-0.beta2.16 -- Update to latest trunk (2008-02-06) - -* Tue Jan 29 2008 Christopher Aillon 1.9-0.beta2.15 -- Update to latest trunk (2008-01-30) - -* Wed Jan 25 2008 Martin Stransky 1.9-0.beta2.14 -- rebuild agains new nss -- enabled gnome vfs - -* Wed Jan 23 2008 Martin Stransky 1.9-0.beta2.13 -- fixed stable pkg-config files (#429654) -- removed sqlite patch - -* Mon Jan 21 2008 Christopher Aillon 1.9-0.beta2.12 -- Update to latest trunk (2008-01-21) - -* Tue Jan 15 2008 Christopher Aillon 1.9-0.beta2.11 -- Update to latest trunk (2008-01-15) -- Now with system extensions directory support - -* Sat Jan 13 2008 Christopher Aillon 1.9-0.beta2.10 -- Update to latest trunk (2008-01-13) -- Use CFLAGS instead of configure arguments -- Random cleanups: BuildRequires, scriptlets, prefs, etc. - -* Sat Jan 12 2008 Christopher Aillon 1.9-0.beta2.9 -- Provide gecko-devel-unstable as well - -* Wed Jan 9 2008 Martin Stransky 1.9-0.beta2.8 -- divided devel package to devel and devel-unstable - -* Mon Jan 7 2008 Martin Stransky 1.9-0.beta2.7 -- removed fedora specific pkg-config files -- updated to the latest trunk (2008-01-07) -- removed unnecessary patches -- fixed idl dir (#427965) - -* Thu Jan 3 2008 Christopher Aillon 1.9-0.beta2.6 -- Re-enable camellia256 support now that NSS supports it - -* Thu Jan 3 2008 Martin Stransky 1.9-0.beta2.5 -- updated to the latest trunk (2008-01-03) - -* Mon Dec 24 2007 Christopher Aillon 1.9-0.beta2.4 -- Don't Provide webclient (xulrunner is not itself a webclient) -- Don't Obsolete old firefox, only firefox-devel -- Kill legacy obsoletes (phoenix, etc) that were never in rawhide - -* Thu Dec 21 2007 Martin Stransky 1.9-0.beta2.3 -- added java and plugin subdirs to plugin includes - -* Thu Dec 20 2007 Martin Stransky 1.9-0.beta2.2 -- dependency fixes, obsoletes firefox < 3 and firefox-devel now - -* Wed Dec 12 2007 Martin Stransky 1.9-0.beta2.1 -- updated to Beta 2. -- moved SDK to xulrunner-sdk - -* Thu Dec 06 2007 Martin Stransky 1.9-0.beta1.4 -- fixed mozilla-plugin.pc (#412971) - -* Tue Nov 27 2007 Martin Stransky 1.9-0.beta1.3 -- export /etc/gre.d/gre.conf (it's used by python gecko applications) - -* Mon Nov 26 2007 Martin Stransky 1.9-0.beta1.2 -- added xulrunner/js include dir to xulrunner-js - -* Tue Nov 20 2007 Martin Stransky 1.9-0.beta1.1 -- update to beta 1 - -* Mon Nov 19 2007 Martin Stransky 1.9-0.alpha9.6 -- packed all gecko libraries (#389391) - -* Thu Nov 15 2007 Martin Stransky 1.9-0.alpha9.5 -- registered xulrunner libs system-wide -- added xulrunner-gtkmozembed.pc - -* Wed Nov 14 2007 Martin Stransky 1.9-0.alpha9.4 -- added proper nss/nspr dependencies - -* Wed Nov 14 2007 Martin Stransky 1.9-0.alpha9.3 -- more build fixes, use system nss libraries - -* Tue Nov 6 2007 Martin Stransky 1.9-0.alpha9.2 -- build fixes - -* Tue Oct 30 2007 Martin Stransky 1.9-0.alpha9.1 -- updated to the latest trunk - -* Thu Sep 20 2007 David Woodhouse 1.9-0.alpha7.4 -- build fixes for ppc/ppc64 - -* Tue Sep 20 2007 Martin Stransky 1.9-0.alpha7.3 -- removed conflicts with the current gecko-based apps -- added updated ppc64 patch - -* Tue Sep 18 2007 Martin Stransky 1.9-0.alpha7.2 -- build fixes - -* Wed Sep 5 2007 Christopher Aillon 1.9-0.alpha7.1 -- Initial cut at XULRunner 1.9 Alpha 7 -- Temporarily revert camellia 256 support since our nss doesn't support it yet