Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b4526a31fc6b7c333d88b08d6c54438909945daf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b4526a31fc6b7c333d88b08d6c54438909945daf)
  • Date: Wed, 10 Oct 2012 05:55:53 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/firefox/DETAILS | 6 +-
http/firefox/HISTORY | 5 +
http/firefox/PRE_BUILD | 3 -
http/firefox/install_dir.patch | 56 ++++++++++----------
http/firefox/installer.patch | 112
-----------------------------------------
5 files changed, 37 insertions(+), 145 deletions(-)

New commits:
commit b4526a31fc6b7c333d88b08d6c54438909945daf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 16.0, SECURITY_PATCH=54

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 4670547..53f2367 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=15.0.1
+ VERSION=16.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=15.0.1
+ VERSION=16.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=53
+ SECURITY_PATCH=54
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 5f3c8be..edcbb7a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 16.0, SECURITY_PATCH=54
+ * install_dir.patch: updated, from Arch
+ * PRE_BUILD, installer.patch: patch removed
+
2012-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 15.0.1, SECURITY_PATCH=53

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index c993d21..1ed86c5 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,9 +11,6 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
-patch -p1 < $SPELL_DIRECTORY/installer.patch &&
-
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index b6f9700..9c115f0 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,28 +1,30 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST = @TOP_DIST@
+diff -Nur mozilla-release.orig/config/baseconfig.mk
mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280
+0000
++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576
+0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk
mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09
07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09
07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
deleted file mode 100644
index d3232b5..0000000
--- a/http/firefox/installer.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# HG changeset patch
-# User Andrew Benton <b3nton AT gmail.com>
-# Date 1339485009 -7200
-# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
-# Parent 253d5996845e9fd994dc9ee542d293fbc412ec56
-Bug 752895 - Don't try to install nspr, nss and sqlite when using system
libraries.
-r=glandium
-
-diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
---- a/browser/installer/Makefile.in
-+++ b/browser/installer/Makefile.in
-@@ -39,16 +39,24 @@ endif
- ifdef MOZ_ENABLE_GNOME_COMPONENT
- DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
- endif
-
- ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
-
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
-
- ifdef _MSC_VER
- DEFINES += -D_MSC_VER=$(_MSC_VER)
- endif
-
-diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -53,19 +53,21 @@
- #endif
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- #ifdef MOZ_SHARED_MOZGLUE
- @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
- #endif
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
- @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
- #endif
- #ifdef XP_MACOSX
- @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@@ -104,17 +106,19 @@
- @BINPATH@/@MOZ_APP_NAME@
- #endif
- @BINPATH@/application.ini
- #ifdef MOZ_UPDATER
- @BINPATH@/update-settings.ini
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
- @BINPATH@/blocklist.xml
- #ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
- #ifndef XP_MACOSX
- @BINPATH@/mozilla-xremote-client
-@@ -578,26 +582,28 @@
- @BINPATH@/components/dom_svg.xpt
- @BINPATH@/components/dom_smil.xpt
-
- ; [Personal Security Manager]
- ;
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
- @BINPATH@/components/pipnss.xpt
- @BINPATH@/components/pippki.xpt
-
- ; for Solaris SPARC
- #ifdef SOLARIS
-
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b4526a31fc6b7c333d88b08d6c54438909945daf), Ladislav Hagara, 10/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page