[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (7c195ddd97d1823fc4d5717557b7f047d273814e)

Sukneet Basuta scm at sourcemage.org
Tue Nov 8 01:06:26 EST 2011


GIT changes to master grimoire by Sukneet Basuta <sukneet at sourcemage.org>:

 http/firefox/DETAILS           |   18 +++-----
 http/firefox/HISTORY           |   12 +++++
 http/firefox/INSTALL           |    2 
 http/firefox/PRE_BUILD         |    8 +--
 http/firefox/curl.patch        |   84 -----------------------------------------
 http/firefox/glyph.patch       |    2 
 http/firefox/install_dir.patch |   28 +++++++++++++
 7 files changed, 53 insertions(+), 101 deletions(-)

New commits:
commit 7c195ddd97d1823fc4d5717557b7f047d273814e
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    firefox: => 8.0
    switched back to gpg verification (not sure why it was removed in the first place)
    removed curl.patch, no longer needed fixed in upstream
    added install_dir.patch to install to /usr/lib/firefox so you don't need to keep reinstalling plugins on upgrades

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index cb478c1..1b33e96 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,22 +1,18 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=7.0.1
+         VERSION=8.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:ddfb9deb8cdc6fd325119db2a829e698c05f3fccd8d5764455a87c795ea5921bac4d64435d40d007075b306fdcac99e65ad8ca1e6e94a8025c42de91b2142d4e
-#         SOURCE2=$SOURCE.asc
-#      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=7.0.1
+         VERSION=8.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:ddfb9deb8cdc6fd325119db2a829e698c05f3fccd8d5764455a87c795ea5921bac4d64435d40d007075b306fdcac99e65ad8ca1e6e94a8025c42de91b2142d4e
-#         SOURCE2=$SOURCE.asc
-#      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.access.ch/mirror/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
-   SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
-   SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
+   SOURCE_URL[1]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
   SECURITY_PATCH=41
 fi
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index defed9d..fbb145a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,15 @@
+2011-11-07 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 8.0
+	  removed SOURCE_URL[1], dead
+	  removed SOURCE_URL[3], no longer updated
+	  switched back to gpg verification
+	* PRE_BUILD: removed curl.patch, no longer needed
+	  added install_dir.patch to install to /usr/lib/firefox
+	  so you don't need to keep reinstalling plugins on upgrades 
+	* curl.patch: removed, fixed in upstream
+	* glyph.patch: updated
+	* install_dir.patch: added, drops release number from install path
+
 2011-09-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 7.0.1
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 17466d9..dc4a4ec 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -9,7 +9,7 @@ fi  &&
 make -f client.mk install &&
 
 
-ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
+#ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
 
 
 #
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 635e323..f62a6d3 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,14 +3,14 @@ cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
 cd  mozilla*                       &&
 
-#Fix compilation with curl-7.21.7
-# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
-patch -p0 < $SPELL_DIRECTORY/curl.patch &&
-
 #Fedora  patch to remove glyph in title bar
 # http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
 patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
 
+# Archlinux patch to drop release point from install path
+# http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
+patch -p1 < $SPELL_DIRECTORY/install_dir.patch && 
+
 cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
 
 if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/curl.patch b/http/firefox/curl.patch
deleted file mode 100644
index 66b90cc..0000000
--- a/http/firefox/curl.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -r 15b32ce27a28 config/system-headers
---- config/system-headers	Thu Jul 21 20:50:16 2011 +1200
-+++ config/system-headers	Thu Jul 21 21:28:49 2011 +1200
-@@ -199,17 +199,16 @@ crypt.h
- cstddef
- cstdio
- cstdlib
- cstring
- ctime
- ctype.h
- curl/curl.h
- curl/easy.h
--curl/types.h
- curses.h
- cxxabi.h
- DateTimeUtils.h
- dbus/dbus.h
- dbus/dbus-glib.h
- dbus/dbus-glib-lowlevel.h
- ddeml.h
- Debug.h
-diff -r 15b32ce27a28 js/src/config/system-headers
---- js/src/config/system-headers	Thu Jul 21 20:50:16 2011 +1200
-+++ js/src/config/system-headers	Thu Jul 21 21:28:49 2011 +1200
-@@ -199,17 +199,16 @@ crypt.h
- cstddef
- cstdio
- cstdlib
- cstring
- ctime
- ctype.h
- curl/curl.h
- curl/easy.h
--curl/types.h
- curses.h
- cxxabi.h
- DateTimeUtils.h
- dbus/dbus.h
- dbus/dbus-glib.h
- dbus/dbus-glib-lowlevel.h
- ddeml.h
- Debug.h
-diff -r 15b32ce27a28 toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
---- toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc	Thu Jul 21 20:50:16 2011 +1200
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc	Thu Jul 21 21:28:49 2011 +1200
-@@ -28,17 +28,16 @@
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- #include "common/linux/http_upload.h"
- 
- #include <assert.h>
- #include <dlfcn.h>
- #include <curl/curl.h>
- #include <curl/easy.h>
--#include <curl/types.h>
- 
- namespace {
- 
- // Callback to get the response data from server.
- static size_t WriteCallback(void *ptr, size_t size,
-                             size_t nmemb, void *userp) {
-   if (!userp)
-     return 0;
-diff -r 15b32ce27a28 toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
---- toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc	Thu Jul 21 20:50:16 2011 +1200
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc	Thu Jul 21 21:28:49 2011 +1200
-@@ -24,17 +24,16 @@
- // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- #include <curl/curl.h>
- #include <curl/easy.h>
--#include <curl/types.h>
- #include <dlfcn.h>
- 
- #include <iostream>
- #include <string>
- 
- #include "common/linux/libcurl_wrapper.h"
- 
- using std::string;
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
index 420205c..58b2e97 100644
--- a/http/firefox/glyph.patch
+++ b/http/firefox/glyph.patch
@@ -1,7 +1,7 @@
 diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
 --- browser/base/Makefile.in.fu	2011-07-01 22:40:52.048773336 -0300
 +++ browser/base/Makefile.in	2011-07-01 22:42:30.866213879 -0300
-@@ -62,10 +62,9 @@ EXTRA_JS_MODULES = \
+@@ -61,10 +61,9 @@
  
  include $(topsrcdir)/config/rules.mk
  
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
new file mode 100644
index 0000000..b6f9700
--- /dev/null
+++ b/http/firefox/install_dir.patch
@@ -0,0 +1,28 @@
+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@
+ ifneq (,$(filter /%,$(TOP_DIST)))


More information about the SM-Commit mailing list