Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (803cac3106a71200ef75ea2f96b8a377cb45c338)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (803cac3106a71200ef75ea2f96b8a377cb45c338)
  • Date: Thu, 23 Oct 2014 15:04:40 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/nss/BUILD | 6
crypto/nss/DEPENDS | 5
crypto/nss/DETAILS | 14 -
crypto/nss/HISTORY | 7
crypto/nss/INSTALL | 16 --
crypto/nss/PREPARE | 6
crypto/nss/PRE_BUILD | 11 -
crypto/nss/PRE_SUB_DEPENDS | 1
crypto/nss/SUB_DEPENDS | 4
crypto/nss/nss-3.17.2-standalone-2.patch | 244
+++++++++++++++++++++++++++++++
http/seamonkey/BUILD | 1
http/seamonkey/CONFIGURE | 9 +
http/seamonkey/DEPENDS | 33 +++-
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 11 +
http/seamonkey/PRE_BUILD | 1
http/seamonkey/mailnews.patch | 18 +-
http/seamonkey/strip.patch | 11 +
libs/nspr/BUILD | 3
libs/nspr/DEPENDS | 2
libs/nspr/DETAILS | 6
libs/nspr/HISTORY | 8 +
libs/nspr/INSTALL | 6
libs/nspr/PRE_BUILD | 6
libs/nspr/nspr.pc | 10 -
25 files changed, 377 insertions(+), 68 deletions(-)

New commits:
commit 803cac3106a71200ef75ea2f96b8a377cb45c338
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.30 [security]

commit 55f09f40bef129c7a5a33cf4ceb9412671f58079
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nss: => 3.17.2

commit 83fb0360113026fcf257ec71823e969d255cdba9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nspr: => 4.10.7

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 6cd185d..25b0660 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,7 +1,3 @@
-if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.16
-fi &&
-
MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&

persistent_add MAKE_OPTS &&
@@ -9,7 +5,7 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
MAKE_OPTS="$MAKE_OPTS USE_64=1"
fi &&

-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
+if is_version_less 3.14 "$NSS_BRANCH"; then
cd $SOURCE_DIRECTORY/nss &&
MAKE_OPTS="$MAKE_OPTS NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1
ZLIB_LIBS=-lz"
make_single &&
diff --git a/crypto/nss/DEPENDS b/crypto/nss/DEPENDS
index 9a93434..42d9991 100755
--- a/crypto/nss/DEPENDS
+++ b/crypto/nss/DEPENDS
@@ -1,6 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends nspr &&
depends perl &&
depends sqlite &&
-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
+
+if is_version_less 3.14 "$NSS_BRANCH"; then
depends zlib
fi
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 9ae7db4..8462326 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,28 +1,26 @@
SPELL=nss
-
-if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.16
-fi
-
case $NSS_BRANCH in
3.14)
VERSION=3.14.5
- SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:ef35939d6b4627df0e562da7b0f1bb599c8f7cf09f7baa9fc059ddd725a91a4d34204a22e05e3aa9b2a609c085834f611f9e6ff2dde69e16e9cd7e7c74a86ddf
;;
3.15)
VERSION=3.15.5

SOURCE_HASH=sha512:4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca
SECURITY_PATCH=4
- SOURCE=$SPELL-$VERSION.tar.gz
;;
3.16)
VERSION=3.16.5

SOURCE_HASH=sha512:687513e2e4ac8139d045a9f4af3440db0dbcd1e8b1834da1a1a3c9f948929c00464b2a6e857bc9f83125df52f30d1ed91786f22fcdf24f148a7ed5cc474f0c75
SECURITY_PATCH=5
- SOURCE=$SPELL-$VERSION.tar.gz
+ ;;
+ 3.17)
+ VERSION=3.17.2
+
SOURCE_HASH=sha512:a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f
+ SECURITY_PATCH=1
;;
esac
+ SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 1bb2522..7dadf9e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,10 @@
+2014-10-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.17.2; moved DEFAULT branch setting to
+ PREPARE
+ * PREPARE, {PRE_,}SUB_DEPENDS: added 3.17 branch
+ * BUILD, DEPENDS, INSTALL, PRE_BUILD: use is_version_less() function
+ for branch versions comparison
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: sqlite

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index f216bde..e3041a3 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,8 +1,4 @@
-if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.16
-fi &&
-
-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
+if is_version_less 3.14 "$NSS_BRANCH"; then
cd $SOURCE_DIRECTORY/dist
else
cd $SOURCE_DIRECTORY/mozilla/dist
@@ -19,7 +15,9 @@ install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib &&

install -v -d -m755 $INSTALL_ROOT/usr/lib/pkgconfig &&
-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
+
+if is_version_less 3.14 "$NSS_BRANCH"; then
+ install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin &&
install -v -m644 */lib/pkgconfig/nss.pc $INSTALL_ROOT/usr/lib/pkgconfig
else
install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
@@ -28,12 +26,6 @@ fi &&
install -v -d -m755 $INSTALL_ROOT/usr/bin &&
install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&

-if [[ $NSS_BRANCH == "3.16" ]]; then
- install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
-elif [[ $NSS_BRANCH == "3.15" ]]; then
- install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
-fi &&
-
install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
install -v -m644 private/nss/*.h $INSTALL_ROOT/usr/include/nss &&
install -v -m644 public/nss/*.h $INSTALL_ROOT/usr/include/nss &&
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 47f9fef..2c11df7 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1,5 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 &&
+
+if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
+ NSS_BRANCH=3.17
+fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 127e978..3c7394d 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,10 +1,9 @@
-default_pre_build &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

-cd $SOURCE_DIRECTORY &&
-
-if [[ $NSS_BRANCH == "3.16" || $NSS_BRANCH == "DEFAULT" ]]; then
- patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
-elif [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.17" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
+elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 74b4152..1354df844 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
+ 3.17.x) if [ $NSS_BRANCH == "3.17" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index 620f12a..2cb3903 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -5,7 +5,9 @@ case $THIS_SUB_DEPENDS in
NSS_BRANCH="3.15" ;;
3.16.x) echo "3.16.x release needed, forcing it." &&
NSS_BRANCH="3.16" ;;
- PEM) if [[ $NSS_BRANCH == "3.16" ]]; then
+ 3.17.x) echo "3.17.x release needed, forcing it." &&
+ NSS_BRANCH="3.17" ;;
+ PEM) if [[ $NSS_BRANCH == "3.16" ]] || [[ $NSS_BRANCH == "3.17" ]]; then
echo "pem is not supported yet for branch $NSS_BRANCH" &&
return 1
else
diff --git a/crypto/nss/nss-3.17.2-standalone-2.patch
b/crypto/nss/nss-3.17.2-standalone-2.patch
new file mode 100644
index 0000000..13b474f
--- /dev/null
+++ b/crypto/nss/nss-3.17.2-standalone-2.patch
@@ -0,0 +1,244 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2013-07-02
+Initial Package Version: 3.15
+Upstream Status: Not applicable
+Origin: Based on dj's original patch, rediffed and modified
for 3.15
+Description: Adds auto-generated nss.pc and nss-config script,
and allows
+ building without nspr in the source tree.
+
+--- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/Makefile 2013-07-02 14:53:56.684750636 +0200
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss-config.in 2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ nssutil
++ smime
++ ssl
++ softokn
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ softokn)
++ lib_softokn=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-L$libdir"
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+--- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss.pc.in 2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+--- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all
++nss_build_all: all
+
+ nss_clean_all: clobber_nspr clobber
+
+--- a/nss/manifest.mn 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/manifest.mn 2013-07-02 14:52:58.331417666 +0200
+@@ -10,7 +10,7 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
+
+ ifdef NSS_BUILD_GTESTS
+ DIRS += external_tests
diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index b679e5a..9fe92da 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -27,6 +27,7 @@ MOZCONFIG="--prefix=$INSTALL_ROOT/usr \
--with-system-nspr \
--with-system-nss \
--with-system-zlib \
+ --with-system-bz2 \
--with-system-jpeg \
--with-system-libevent \
--disable-crashreporter \
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 33c9849..5b40a71 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -50,6 +50,10 @@ config_query_option SEAMONKEY_OPTS "Use system installed
cairo?" n \
"--enable-system-cairo" \
"--disable-system-cairo" &&

+config_query_option SEAMONKEY_OPTS "Use system installed hunspell?" n \
+ "--enable-system-hunspell" \
+ "--disable-system-hunspell" &&
+
config_query_option SEAMONKEY_OPTS "Enable Pango support for complex font
rendering?" y \
"--enable-pango" \
"--disable-pango" &&
@@ -83,6 +87,11 @@ config_query_option SEAMONKEY_OPTS "Enable dbus support?"
y \
"--enable-dbus" \
"--disable-dbus" &&

+config_query_list SEAMONKEY_GST "Enable gstreamer support?" \
+ none \
+ gstreamer \
+ gstreamer-1.0 &&
+
if list_find "$SEAMONKEY_OPTS" "--enable-dbus"; then
list_add "SEAMONKEY_OPTS" "--enable-libnotify"
else
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 4b141a9..9988714 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -7,25 +7,26 @@ depends libidl &&
depends libxft &&
depends nspr &&

-if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.3; then
+if spell_ok nspr && is_version_less $(installed_version nspr) 4.10.3; then
force_depends nspr
fi &&

-depends -sub 3.16.x nss &&
+depends -sub 3.17.x nss &&

-if spell_ok nss && is_version_less $(installed_version nss) 3.15.1; then
+if spell_ok nss && is_version_less $(installed_version nss) 3.17.1; then
force_depends nss
fi &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&

-if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.17;
then
+if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.8.5; then
force_depends sqlite
fi &&

depends perl &&
depends zip &&
depends zlib &&
+depends bzip2 &&
depends libxt &&
depends libffi &&
depends libevent &&
@@ -37,6 +38,10 @@ if list_find "$SEAMONKEY_OPTS" "--enable-system-cairo";
then
depends cairo
fi &&

+if list_find "$SEAMONKEY_OPTS" "--enable-system-hunspell"; then
+ depends hunspell
+fi &&
+
if list_find "$SEAMONKEY_OPTS" "--enable-pango"; then
depends pango
fi &&
@@ -63,6 +68,26 @@ else
optional_depends alsa-lib "" "" "for audio support"
fi &&

+optional_depends pulseaudio "" "" "for PulseAudio support" &&
+
+if is_depends_enabled $SPELL pulseaudio; then
+ list_add "SEAMONKEY_OPTS" "--enable-pulseaudio" &&
+ list_remove "SEAMONKEY_OPTS" "--disable-pulseaudio"
+else
+ list_add "SEAMONKEY_OPTS" "--disable-pulseaudio" &&
+ list_remove "SEAMONKEY_OPTS" "--enable-pulseaudio"
+fi &&
+
+if [[ $SEAMONKEY_GST != "none" ]]; then
+ depends $SEAMONKEY_GST &&
+
+ list_add "SEAMONKEY_OPTS" "--enable-gstreamer" &&
+ list_remove "SEAMONKEY_OPTS" "--disable-gstreamer"
+else
+ list_add "SEAMONKEY_OPTS" "--disable-gstreamer" &&
+ list_remove "SEAMONKEY_OPTS" "--enable-gstreamer"
+fi &&
+
if is_depends_enabled $SPELL libvpx; then
list_add "SEAMONKEY_OPTS" "--with-system-libvpx"
fi &&
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 0efab1e..9f883ec 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,8 +1,8 @@
SPELL=seamonkey
- VERSION=2.29
- SECURITY_PATCH=57
+ VERSION=2.30
+ SECURITY_PATCH=58
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:5cba0c75f70489c6ef9a349e005dd99b60a9f72a43efdecdbf5d4a3d8ecd2b2c72159c104957801db9f5394eef247859735e6cf281deb4e2d9aaca66d5ddcae3
+
SOURCE_HASH=sha512:e5ae37b5f6668fe4a064e2e0afd90f168b1074164eb832705641e90837b286ea0e0a32f336fd3813cbc706735ca98ec459a6c33915879c3c3c63760ec910b6df
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 2a50619..e995f5b 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,14 @@
+2014-10-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.30; SECURITY_PATCH++
+ * BUILD: use system libbz2
+ * DEPENDS: updated requirements -- nspr (>=4.10.3), nss (>=3.17.1),
+ sqlite (>=3.8.5); added dependencies -- bzip2 (req), hunspell (opt),
+ pulseaudio (opt), gstreamer/gstreamer-1.0 (opt)
+ * CONFIGURE: added options for hunspell and gstreamer
+ * PRE_BUILD: apply strip.patch
+ * mailnews.patch: updated for new version
+ * strip.patch: added, to fix compilation for stripped builds
+
2014-09-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.29, SECURITY_PATCH=57
* DEPENDS: nss >= 3.16.2 is needed
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index eb06c1e..826c237 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -8,4 +8,5 @@ sed -i
's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' mozilla/
# ignore packaging errors for the libs we have in a system
sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&

+patch -p0 < "$SPELL_DIRECTORY/strip.patch" &&
patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
index 112de2d..aa93d5e 100644
--- a/http/seamonkey/mailnews.patch
+++ b/http/seamonkey/mailnews.patch
@@ -1,14 +1,14 @@
---- mozilla/configure.orig 2011-11-21 14:29:14.000000000 +0400
-+++ mozilla/configure 2011-12-10 16:04:46.337188291 +0400
-@@ -14788,6 +14788,7 @@
+--- mozilla/configure.orig 2014-10-23 16:46:01.833461054 +0400
++++ mozilla/configure 2014-10-23 16:50:26.601734897 +0400
+@@ -16258,6 +16258,7 @@
+ MOZ_OFFICIAL_BRANDING=
MOZ_FEEDS=1
- MOZ_INSTALLER=1
- MOZ_JSDEBUGGER=1
+ MOZ_WEBAPP_RUNTIME=
+MOZ_MAIL_NEWS=
MOZ_AUTH_EXTENSION=1
- MOZ_OGG=1
MOZ_RAW=
-@@ -17714,8 +17715,17 @@
+ MOZ_VORBIS=
+@@ -18758,8 +18759,17 @@
fi


@@ -27,8 +27,8 @@
+fi


- # 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

Archive powered by MHonArc 2.6.24.

Top of Page