[Libreoffice-commits] .: Branch 'libreoffice-3-4' - moz/seamonkey-source-1.1.14.patch nss/nss.patch

[Michael Meeks]

 moz/seamonkey-source-1.1.14.patch |   16 ++++++++++++++++
 nss/nss.patch                     |   14 ++++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit fd6f3019188994f2dd6c33a46035b140280f714e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Jul 24 23:01:49 2011 +0200

    nss/moz: Add Linux 3.0 profile
    
    As this is a copy of Linux2.6.mk this has to be
    MPL 1.1/GPL 2.0/LGPL 2.1 I think.
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index 566a044..db62e8b 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -6336,3 +6336,19 @@
  
  clean clobber::
  	rm -rf $(DIST)/$(APP_NAME).app
+--- /dev/null	2011-07-24 19:07:44.290563140 +0200
++++ misc/build/mozilla/security/coreconf/Linux3.0.mk	2011-07-24 22:21:02.710513995 +0200
+@@ -0,0 +1,13 @@
++include $(CORE_DEPTH)/coreconf/Linux.mk
++
++DSO_LDOPTS      += -Wl,-z,defs
++
++OS_REL_CFLAGS   += -DLINUX2_1
++MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
++
++ifdef MAPFILE
++	MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
diff --git a/nss/nss.patch b/nss/nss.patch
index 6930e67..ac24855 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -189,3 +189,17 @@
  endif
  CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
  
+--- /dev/null	2011-07-24 19:07:44.290563140 +0200
++++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux3.0.mk	2011-07-24 22:21:02.710513995 +0200
+@@ -0,0 +1,11 @@
++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,;.*,;,' > $@
++