[pkgsrc/trunk]: pkgsrc/devel/xulrunner192 Apply attachment 543716 from

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdc14d3194a2
branches:  trunk
changeset: 603530:bdc14d3194a2
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Mon May 07 03:22:35 2012 +0000

description:
Apply attachment 543716 from
https://bugzilla.mozilla.org/show_bug.cgi?id=661609
to fix building on Linux 3.0 and up.

diffstat:

 devel/xulrunner192/distinfo                                 |   5 +-
 devel/xulrunner192/patches/patch-mf                         |  10 +++-
 devel/xulrunner192/patches/patch-security_coreconf_Linux.mk |  27 +++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diffs (84 lines):

diff -r 7837bf89299f -r bdc14d3194a2 devel/xulrunner192/distinfo
--- a/devel/xulrunner192/distinfo       Mon May 07 02:45:47 2012 +0000
+++ b/devel/xulrunner192/distinfo       Mon May 07 03:22:35 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/03/13 14:18:32 martin Exp $
+$NetBSD: distinfo,v 1.9 2012/05/07 03:22:35 sbd Exp $
 
 SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577
 RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc
@@ -38,7 +38,7 @@
 SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
 SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
-SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
+SHA1 (patch-mf) = 5a5b77b6de6edcf9225a0c257492b92db33fc76e
 SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
 SHA1 (patch-mh) = a514caf6f6324aa82c4497713547c5e9088d16b9
 SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
@@ -56,6 +56,7 @@
 SHA1 (patch-pg) = fb8e8bcf43e00ce6246be3758a1471e08990cd68
 SHA1 (patch-ra) = 7dc1ead2756ac8eb9e900dab60f785468df013be
 SHA1 (patch-rc) = 9f2e63689123ecbc1767e58e6f5608046dceab1a
+SHA1 (patch-security_coreconf_Linux.mk) = 66a04834ebc9d72aa5ac740eac6ceea95d3ffdea
 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
diff -r 7837bf89299f -r bdc14d3194a2 devel/xulrunner192/patches/patch-mf
--- a/devel/xulrunner192/patches/patch-mf       Mon May 07 02:45:47 2012 +0000
+++ b/devel/xulrunner192/patches/patch-mf       Mon May 07 03:22:35 2012 +0000
@@ -1,16 +1,20 @@
-$NetBSD: patch-mf,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-mf,v 1.2 2012/05/07 03:22:36 sbd Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- security/coreconf/config.mk.orig   2010-03-15 14:56:04.000000000 +0000
+Apply attachment 543716 from
+https://bugzilla.mozilla.org/show_bug.cgi?id=661609
+to fix building on Linux 3.0 and up.
+
+--- security/coreconf/config.mk.orig   2012-03-06 14:45:43.000000000 +0000
 +++ security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
 -              AIX RISCOS WINNT WIN95 WINCE
-+              AIX RISCOS WINNT WIN95 WINCE DragonFly
++              AIX RISCOS WINNT WIN95 WINCE DragonFly Linux
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff -r 7837bf89299f -r bdc14d3194a2 devel/xulrunner192/patches/patch-security_coreconf_Linux.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner192/patches/patch-security_coreconf_Linux.mk       Mon May 07 03:22:35 2012 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-security_coreconf_Linux.mk,v 1.1 2012/05/07 03:22:36 sbd Exp $
+
+Apply attachment 543716 from 
+https://bugzilla.mozilla.org/show_bug.cgi?id=661609
+to fix building on Linux 3.0 and up.
+
+--- security/coreconf/Linux.mk.orig    2012-05-07 02:03:05.764485874 +0000
++++ security/coreconf/Linux.mk
+@@ -192,3 +192,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr
+ endif
+ endif
+ 
++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,;.*,;,' > $@
++
++ifeq ($(OS_RELEASE),2.4)
++# Softoken 3.13 uses NO_FORK_CHECK only.
++# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
++# Don't use NO_CHECK_FORK in new code.
++DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
++endif