[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - moz/makefile.mk moz/patches moz/seamonkey-source-1.1.14.patch nss/makefile.mk nss/nss-linux3.patch nss/nss.patch

[Michael Stahl]

 moz/makefile.mk                   |    4 +++-
 moz/patches/nss-linux3.patch      |   13 +++++++++++++
 moz/seamonkey-source-1.1.14.patch |   16 ----------------
 nss/makefile.mk                   |    2 +-
 nss/nss-linux3.patch              |   13 +++++++++++++
 nss/nss.patch                     |   14 --------------
 6 files changed, 30 insertions(+), 32 deletions(-)

New commits:
commit a7460c931b51f1876ff6b49d0c27300295c7d1f8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 18 21:52:30 2011 +0200

    moz: replace Linux 3.0 workaround with one for 3.x
    
    backport of fa70d98e729c0dba44e1c8e25fe1323bad918945 to 3.4
    
    Signed-off-by Michael Meeks <michael.meeks at suse.com>

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 94d6935..c11cf6a 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -95,7 +95,9 @@ PATCH_FILES = \
     patches/link_fontconfig.patch \
     patches/brokenmakefile.patch \
     patches/aix_build_fix.patch \
-    patches/libpr0n_build_fix.patch
+    patches/libpr0n_build_fix.patch \
+    patches/nss-linux3.patch \
+
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/nss-linux3.patch b/moz/patches/nss-linux3.patch
new file mode 100644
index 0000000..b735669
--- /dev/null
+++ b/moz/patches/nss-linux3.patch
@@ -0,0 +1,13 @@
+--- misc/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:31.808695724 +0200
++++ misc/build/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:00.074648943 +0200
+@@ -152,6 +152,10 @@
+ 
+ ifeq ($(OS_ARCH),Linux)
+     OS_RELEASE := $(subst ., ,$(OS_RELEASE))
++    # force Linux 3.x to 2.6
++    ifeq ($(word 1,$(OS_RELEASE)),3)
++	OS_RELEASE := 2 6
++    endif
+     ifneq ($(words $(OS_RELEASE)),1)
+ 	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+     endif
diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index db62e8b..566a044 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -6336,19 +6336,3 @@
  
  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,;.*,;,' > $@
-+
commit 2a3a9ed405e6c5e1af293187bfc881d6f210093a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 18 21:48:46 2011 +0200

    nss: replace Linux 3.0 workaround with one for 3.x
    
    backport of ab3895465a6cf0a8a41c7432ad9a8f77df7ae572 to 3.4
    
    Signed-off-by Michael Meeks <michael.meeks at suse.com>

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 45f1feb..22ebefb 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -44,7 +44,7 @@ all:
 TARFILE_NAME=nss-3.12.8-with-nspr-4.8.6
 TARFILE_MD5=71474203939fafbe271e1263e61d083e
 TARFILE_ROOTDIR=nss-3.12.8
-PATCH_FILES=nss.patch nss.aix.patch
+PATCH_FILES=nss.patch nss.aix.patch nss-linux3.patch
 
 .IF "$(OS)"=="MACOSX"
 PATCH_FILES+=nss_macosx.patch
diff --git a/nss/nss-linux3.patch b/nss/nss-linux3.patch
new file mode 100644
index 0000000..62c667f
--- /dev/null
+++ b/nss/nss-linux3.patch
@@ -0,0 +1,13 @@
+--- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:31.808695724 +0200
++++ misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:00.074648943 +0200
+@@ -152,6 +152,10 @@
+ 
+ ifeq ($(OS_ARCH),Linux)
+     OS_RELEASE := $(subst ., ,$(OS_RELEASE))
++    # force Linux 3.x to 2.6
++    ifeq ($(word 1,$(OS_RELEASE)),3)
++	OS_RELEASE := 2 6
++    endif
+     ifneq ($(words $(OS_RELEASE)),1)
+ 	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+     endif
diff --git a/nss/nss.patch b/nss/nss.patch
index ac24855..6930e67 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -189,17 +189,3 @@
  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,;.*,;,' > $@
-+