diff --git a/gnomeos/3.4/gnomeos-3.4-src.json b/gnomeos/3.4/gnomeos-3.4-src.json index 8f56333b..fcf7e9b1 100644 --- a/gnomeos/3.4/gnomeos-3.4-src.json +++ b/gnomeos/3.4/gnomeos-3.4-src.json @@ -406,7 +406,7 @@ {"src": "cgwalters:sqlite-tarballs-as-git"}, {"src": "cgwalters:nss-tarballs-as-git", - "patches": ["nss-linux-3.1.patch"]}, + "branch": "v3.13.4"}, {"src": "git:git://ozlabs.org/~paulus/ppp.git", "patches": ["ppp-srcdir-builddir.patch", "ppp-destdir.patch"]}, diff --git a/gnomeos/3.4/nss-linux-3.1.patch b/gnomeos/3.4/nss-linux-3.1.patch deleted file mode 100644 index b9ff6edb..00000000 --- a/gnomeos/3.4/nss-linux-3.1.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 16514c37a1ed99383e6c715449b1952d0ad6683d Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Sun, 29 Jan 2012 17:33:39 -0500 -Subject: [PATCH] build: Add Linux3.1.mk - -This build system is totally stupid... ---- - mozilla/security/coreconf/Linux3.1.mk | 48 +++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - create mode 100644 mozilla/security/coreconf/Linux3.1.mk - -diff --git a/mozilla/security/coreconf/Linux3.1.mk b/mozilla/security/coreconf/Linux3.1.mk -new file mode 100644 -index 0000000..4a6cc1e ---- /dev/null -+++ b/mozilla/security/coreconf/Linux3.1.mk -@@ -0,0 +1,48 @@ -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla 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/MPL/ -+# -+# 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 the Netscape security libraries. -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 1994-2000 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+include $(CORE_DEPTH)/coreconf/Linux.mk -+ -+OS_REL_CFLAGS += -DLINUX2_1 -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH) -+ -+ifdef MAPFILE -+ MKSHLIB += -Wl,--version-script,$(MAPFILE) -+endif -+PROCESS_MAP_FILE = grep -v ';-' $< | \ -+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ -+ --- -1.7.7 -