- # Check whether --enable-crypto or --disable-crypto was given.
-@@ -27643,6 +27653,7 @@
+
+@@ -29173,6 +29183,7 @@
(''' RCC ''', r''' $RCC ''')
(''' MOZ_X11 ''', r''' $MOZ_X11 ''')
(''' MOZ_UI_LOCALE ''', r''' $MOZ_UI_LOCALE ''')
diff --git a/http/seamonkey/strip.patch b/http/seamonkey/strip.patch
new file mode 100644
index 0000000..99708b9
--- /dev/null
+++ b/http/seamonkey/strip.patch
@@ -0,0 +1,11 @@
+--- mozilla/toolkit/library/libxul.mk.orig 2014-10-14 10:36:44.000000000
+0400
++++ mozilla/toolkit/library/libxul.mk 2014-10-23 19:14:29.513562248 +0400
+@@ -265,7 +265,7 @@
+ get_first_and_last = $(TOOLCHAIN_PREFIX)nm -g $1 | grep _NSModule$$ | sort
| sed -n 's/^.* _*\([^ ]*\)$$/\1/;1p;$$p'
+ endif
+
+-LOCAL_CHECKS = test "$$($(get_first_and_last) | xargs echo)" !=
"start_kPStaticModules_NSModule end_kPStaticModules_NSModule" && echo
"NSModules are not ordered appropriately" && exit 1 || exit 0
++LOCAL_CHECKS = exit 0
+
+ ifeq (Linux,$(OS_ARCH))
+ LOCAL_CHECKS += ; test "$$($(TOOLCHAIN_PREFIX)readelf -l $1 | awk '$1 ==
"LOAD" { t += 1 } END { print t }')" -le 1 && echo "Only one PT_LOAD segment"
&& exit 1 || exit 0
diff --git a/libs/nspr/BUILD b/libs/nspr/BUILD
index f24de39..d083df7 100755
--- a/libs/nspr/BUILD
+++ b/libs/nspr/BUILD
@@ -3,4 +3,7 @@ if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]; then
OPTS="--enable-64bit $OPTS"
fi &&
OPTS="$OPTS --with-mozilla --enable-optimize" &&
+
+LDFLAGS="-lstdc++ $LDFLAGS" &&
+
default_build
diff --git a/libs/nspr/DEPENDS b/libs/nspr/DEPENDS
index 9cdc825..b978eb8 100755
--- a/libs/nspr/DEPENDS
+++ b/libs/nspr/DEPENDS
@@ -1 +1 @@
-depends -sub CXX gcc '--with-cplus'
+depends -sub CXX gcc '--enable-cplus'
diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 1b1f995..2f1efab 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,9 +1,9 @@
SPELL=nspr
- VERSION=4.10.6
-
SOURCE_HASH=sha512:a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d
+ VERSION=4.10.7
SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/v$VERSION/src/$SOURCE
+
SOURCE_HASH=sha512:bc845b3983ed280dc691e81e08b94b34b8c175e18d455f9e1558a862045df29a3e5c7df291dff7caa0f9d4a9c7e5dd7eb316018f09b9ed444e91502d5a46013e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index 5f25fd1..0308b48 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,11 @@
+2014-10-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.10.7; use spell variable in source url
+ * DEPENDS: corrected c++ flag
+ * INSTALL: install generated nspr.pc file
+ * BUILD: externally link with stdc++
+ * PRE_BUILD: added, to fix build with c++ enabled
+ * nspr.pc: dropped, replaced by upstream version
+
2014-06-10 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 4.10.6
diff --git a/libs/nspr/INSTALL b/libs/nspr/INSTALL
index 6f5e3e4..d6ed4f3 100755
--- a/libs/nspr/INSTALL
+++ b/libs/nspr/INSTALL
@@ -2,10 +2,8 @@
make install &&
# NSS configuration info
-install --mode=755 config/nspr-config $INSTALL_ROOT/usr/bin
&&
-install --mode=644 $SCRIPT_DIRECTORY/nspr.pc
$INSTALL_ROOT/usr/lib/pkgconfig/ &&
-# setup pkg-config file to have the correct version number
-sedit "s/VERSION/$(config/nspr-config --version)/"
$INSTALL_ROOT/usr/lib/pkgconfig/nspr.pc &&
+install --mode=755 config/nspr-config "$INSTALL_ROOT/usr/bin" &&
+install --mode=644 config/nspr.pc "$INSTALL_ROOT/usr/lib/pkgconfig/" &&
# manually do the real install, keeping in mind that most of these files are
symlinks
cd dist &&
diff --git a/libs/nspr/PRE_BUILD b/libs/nspr/PRE_BUILD
new file mode 100755
index 0000000..d499f82
--- /dev/null
+++ b/libs/nspr/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# conform ISO C++
+sedit "/PR_IMPLEMENT(RCThread)/i class RCPrimordialThread;" \
+ nspr/pr/src/cplus/rcthread.h
diff --git a/libs/nspr/nspr.pc b/libs/nspr/nspr.pc
deleted file mode 100644
index 169111f..0000000
--- a/libs/nspr/nspr.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: VERSION
-Libs: -lplds4 -lplc4 -lnspr4 -lpthread -ldl
-Cflags: -I${includedir}/nspr
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (803cac3106a71200ef75ea2f96b8a377cb45c338),
Vlad Glagolev, 10/23/2014