diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e31a5ed --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xulrunner-1.9.0.11-source.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 3f37036..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package is no longer supported by upstream diff --git a/mozilla-about-firefox-version.patch b/mozilla-about-firefox-version.patch new file mode 100644 index 0000000..e89ba29 --- /dev/null +++ b/mozilla-about-firefox-version.patch @@ -0,0 +1,12 @@ +diff -up mozilla/toolkit/content/Makefile.in.fix mozilla/toolkit/content/Makefile.in +--- mozilla/toolkit/content/Makefile.in.fix 2008-03-13 20:25:52.000000000 +0100 ++++ mozilla/toolkit/content/Makefile.in 2008-10-24 16:17:43.000000000 +0200 +@@ -45,7 +45,7 @@ CHROME_DEPS = buildconfig.html + + include $(DEPTH)/config/autoconf.mk + +-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) ++DEFINES += -DMOZ_APP_VERSION=$(FIREFOX_VERSION) + + ifdef ENABLE_TESTS + DIRS += tests diff --git a/mozilla-build.patch b/mozilla-build.patch new file mode 100644 index 0000000..08f40a7 --- /dev/null +++ b/mozilla-build.patch @@ -0,0 +1,23 @@ +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 +@@ -150,7 +150,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 + ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) + ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT)) + DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT) +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-mochitest.patch b/mozilla-mochitest.patch new file mode 100644 index 0000000..5cc7f40 --- /dev/null +++ b/mozilla-mochitest.patch @@ -0,0 +1,21 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=429178 + +Index: mozilla/testing/mochitest/ssltunnel/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/testing/mochitest/ssltunnel/Makefile.in,v +retrieving revision 1.2 +diff -u -u -r1.2 Makefile.in +--- mozilla/testing/mochitest/ssltunnel/Makefile.in 11 Apr 2008 05:58:04 -0000 1.2 ++++ mozilla/testing/mochitest/ssltunnel/Makefile.in 3 Jun 2008 19:25:55 -0000 +@@ -55,6 +55,10 @@ + nss \ + $(NULL) + ++# Use local includes because they are inserted before INCLUDES ++# so that Mozilla's nss.h is used, not glibc's ++LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) ++ + LIBS = \ + $(NSPR_LIBS) \ + $(NSS_LIBS) \ + diff --git a/mozilla-pkgconfig.patch b/mozilla-pkgconfig.patch new file mode 100644 index 0000000..57b57e8 --- /dev/null +++ b/mozilla-pkgconfig.patch @@ -0,0 +1,143 @@ +diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in +--- mozilla/config/autoconf.mk.in.pk 2008-05-05 23:08:14.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2008-06-26 13:38:41.000000000 +0200 +@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ + 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 -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in +--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 ++++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-06-26 13:41:12.000000000 +0200 +@@ -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 @@ includetype=stable + 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} -fshort-wchar +diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in +--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100 ++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-06-26 13:41:25.000000000 +0200 +@@ -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} -fshort-wchar +diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in +--- mozilla/xulrunner/installer/libxul.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 ++++ mozilla/xulrunner/installer/libxul.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -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 @@ Name: libxul + 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} -fshort-wchar +\ No newline at end of file +diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in +--- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100 ++++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -1,7 +1,8 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% +-idldir=%idldir% ++idldir=%idldir%/unstable + includetype=unstable + + Name: libxul +diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in +--- mozilla/xulrunner/installer/Makefile.in.pk 2008-04-10 16:50:48.000000000 +0200 ++++ mozilla/xulrunner/installer/Makefile.in 2008-06-26 13:38:41.000000000 +0200 +@@ -116,6 +116,7 @@ endif + -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|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ +diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in +--- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + + Name: mozilla-gtkembedmoz +diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in +--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + + Name: mozilla-gtkembedmoz +diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in +--- mozilla/xulrunner/installer/mozilla-js.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 ++++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -6,5 +6,5 @@ Name: JavaScript + 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 -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in +--- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 ++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -6,4 +6,4 @@ Name: Mozilla Plug-In API + 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-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch new file mode 100644 index 0000000..cab1341 --- /dev/null +++ b/mozilla-ps-pdf-simplify-operators.patch @@ -0,0 +1,42 @@ +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/mozilla-sqlite.patch b/mozilla-sqlite.patch new file mode 100644 index 0000000..6c40971 --- /dev/null +++ b/mozilla-sqlite.patch @@ -0,0 +1,32 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=424063 + +Index: mozilla/configure.in +=================================================================== +RCS file: /cvsroot/mozilla/configure.in,v +retrieving revision 1.1992 +diff -d -u -p -r1.1992 configure.in +--- mozilla/configure.in 5 May 2008 21:08:14 -0000 1.1992 ++++ mozilla/configure.in 17 May 2008 02:26:32 -0000 +@@ -5958,7 +5958,21 @@ then + SQLITE_CFLAGS= + SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)' + else +- PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION) ++ SQLITE_VERSION_NUMBER=3005004 ++ AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION) ++ AC_TRY_COMPILE([#include ], [ ++# if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER ++# error "sqlite version < $SQLITE_VERSION_NUMBER ++# endif ++ ] , [res=yes], [res=no]) ++ AC_MSG_RESULT([$res]) ++ if test "$res" != "yes"; then ++ AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required]) ++ fi ++ SQLITE_CFLAGS=`$PKG_CONFIG --cflags sqlite3` ++ SQLITE_LIBS=`$PKG_CONFIG --libs sqlite3` ++ AC_SUBST(SQLITE_CFLAGS) ++ AC_SUBST(SQLITE_LIBS) + fi + + AC_SUBST(MOZ_NATIVE_SQLITE) diff --git a/mozilla-ssl-exception.patch b/mozilla-ssl-exception.patch new file mode 100644 index 0000000..f4640b3 --- /dev/null +++ b/mozilla-ssl-exception.patch @@ -0,0 +1,14 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=436870 + +diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/src/nsCertOverrideService.h +--- a/security/manager/ssl/src/nsCertOverrideService.h ++++ b/security/manager/ssl/src/nsCertOverrideService.h +@@ -109,6 +109,7 @@ + nsCertOverrideEntry(const nsCertOverrideEntry& toCopy) + { + mSettings = toCopy.mSettings; ++ mHostWithPort = toCopy.mHostWithPort; + } + + ~nsCertOverrideEntry() + diff --git a/sources b/sources new file mode 100644 index 0000000..9cdd238 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +b509f7c05e9566ed290e2c098316c7c3 xulrunner-1.9.0.11-source.tar.bz2 diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig new file mode 100644 index 0000000..09327b4 --- /dev/null +++ b/xulrunner-mozconfig @@ -0,0 +1,35 @@ +. $topsrcdir/xulrunner/config/mozconfig + +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 --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 +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 --enable-startup-notification +ac_add_options --disable-crashreporter +ac_add_options --enable-safe-browsing + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + diff --git a/xulrunner-path.patch b/xulrunner-path.patch new file mode 100644 index 0000000..716945b --- /dev/null +++ b/xulrunner-path.patch @@ -0,0 +1,175 @@ +--- 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/js/src/jsfile.c.old mozilla/js/src/jsfile.c +--- mozilla/js/src/jsfile.c.old 2006-07-26 20:55:08.000000000 +0200 ++++ mozilla/js/src/jsfile.c 2007-09-25 18:22:52.000000000 +0200 +@@ -105,7 +105,8 @@ + #define utfstring "binary" + #define unicodestring "unicode" + +-#define MAX_PATH_LENGTH 1024 ++#include ++#define MAX_PATH_LENGTH PATH_MAX + #define MODE_SIZE 256 + #define NUMBER_SIZE 32 + #define MAX_LINE_LENGTH 256 +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/xulrunner-redhat-default-prefs.js b/xulrunner-redhat-default-prefs.js new file mode 100644 index 0000000..b25ecc3 --- /dev/null +++ b/xulrunner-redhat-default-prefs.js @@ -0,0 +1,9 @@ +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.storage.synchronous", 0); diff --git a/xulrunner-version.patch b/xulrunner-version.patch new file mode 100644 index 0000000..c2ec610 --- /dev/null +++ b/xulrunner-version.patch @@ -0,0 +1,13 @@ +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="1.9" ++ + NO_PKG_FILES = \ + xulrunner-config \ + regchrome* \ diff --git a/xulrunner.1 b/xulrunner.1 new file mode 100644 index 0000000..2086325 --- /dev/null +++ b/xulrunner.1 @@ -0,0 +1,125 @@ +.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 new file mode 100644 index 0000000..b776138 --- /dev/null +++ b/xulrunner.sh.in @@ -0,0 +1,62 @@ +#!/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 new file mode 100644 index 0000000..e61ba1e --- /dev/null +++ b/xulrunner.spec @@ -0,0 +1,676 @@ +%define nspr_version 4.7.1 +%define nss_version 3.12.1.1 +%define cairo_version 0.5 + +%define version_internal 1.9 +%define mozappdir %{_libdir}/%{name}-%{version_internal} + +Summary: XUL Runtime for Gecko Applications +Name: xulrunner +Version: 1.9.0.11 +Release: 1%{?dist} +URL: http://developer.mozilla.org/En/XULRunner +License: MPLv1.1 or GPLv2+ or LGPLv2+ +Group: Applications/Internet +Source0: xulrunner-%{version}-source.tar.bz2 +Source10: %{name}-mozconfig +Source12: %{name}-redhat-default-prefs.js +Source21: %{name}.sh.in +Source23: %{name}.1 + +# build patches +Patch1: mozilla-build.patch +Patch2: xulrunner-path.patch +Patch3: xulrunner-version.patch +Patch4: mozilla-sqlite.patch +Patch5: mozilla-mochitest.patch +Patch6: mozilla-about-firefox-version.patch + +# Fedora specific patches +Patch10: mozilla-pkgconfig.patch + +# Upstream patches +Patch26: mozilla-ps-pdf-simplify-operators.patch +Patch27: mozilla-ssl-exception.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: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: lcms-devel +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 >= 2.1.9 +BuildRequires: libXt-devel +BuildRequires: libXrender-devel +BuildRequires: hunspell-devel +BuildRequires: sqlite-devel >= 3.5 +BuildRequires: startup-notification-devel +# For -sqlite.patch +BuildRequires: autoconf213 + +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 +Requires: xulrunner = %{version}-%{release} +Requires: nspr-devel >= %{nspr_version} +Requires: nss-devel >= %{nss_version} +Provides: gecko-devel = %{version} + +%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. + +#--------------------------------------------------------------------- + +%prep +%setup -q -c +cd mozilla +%patch1 -p1 -b .build +%patch2 -p1 -b .path +%patch3 -p1 -b .version +%patch4 -p1 -b .sqlite +autoconf-2.13 +%patch5 -p1 -b .mochitest +%patch6 -p1 -b .about-firefox-version + +%patch10 -p1 -b .pk + +%patch26 -p1 -b .ps-pdf-simplify-operators +#%patch27 -p1 -b .ssl-exception + +%{__rm} -f .mozconfig +%{__cp} %{SOURCE10} .mozconfig + +#--------------------------------------------------------------------- + +%build +cd mozilla + +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 mozilla +%{__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} + +# Fix multilib devel conflicts... +%ifarch x86_64 ia64 s390x ppc64 sparc64 +%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__) ||defined(__sparc__) && defined(__arch64__) +#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}/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 sparc64 +%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 sparc64 +%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 +%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 +%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}/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 + +#--------------------------------------------------------------------- + +%changelog +* Thu Jun 11 2009 Christopher Aillon - 1.9.0.11-1 +- Update to 1.9.0.11 + +* Mon Apr 27 2009 Jan Horak - 1.9.0.10-1 +- Update to 1.9.0.10 + +* Tue Apr 21 2009 Christopher Aillon - 1.9.0.9-1 +- Update to 1.9.0.9 + +* Fri Mar 27 2009 Christopher Aillon - 1.9.0.8-1 +- Update to 1.9.0.8 + +* Tue Mar 3 2009 Jan Horak - 1.9.0.7-1 +- Update to 1.9.0.7 + +* Thu Feb 26 2009 Jan Horak - 1.9.0.6-2 +- Fixed wrong version of Firefox when loading 'about:' as location + (#453980). + +* Wed Feb 4 2009 Christopher Aillon 1.9.0.6-1 +- Update to 1.9.0.6 + +* Tue Dec 16 2008 Christopher Aillon 1.9.0.5-1 +- Update to 1.9.0.5 + +* Wed Nov 12 2008 Christopher Aillon 1.9.0.4-1 +- Update to 1.9.0.4 + +* Tue Sep 23 2008 Christopher Aillon 1.9.0.2-1 +- Update to 1.9.0.2 + +* Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 +- Update to 1.9.0.1 + +* Mon Jun 30 2008 Dennis Gilmore 1.9-1.1 +- handle sparc arches + +* 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