sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b2dab42f010b326aef2344ff0e5c4c50345d8f0)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b2dab42f010b326aef2344ff0e5c4c50345d8f0)
Date: Thu, 11 Jun 2020 11:10:36 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/nss/DETAILS | 4
crypto/nss/HISTORY | 10 -
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 6
crypto/nss/nss-3.53-standalone-1.patch | 266
+++++++++++++++++++++++++++++++++
graphics-libs/mesa/DETAILS | 4
graphics-libs/mesa/HISTORY | 3
libs/jsoncpp/DETAILS | 8
libs/jsoncpp/HISTORY | 3
plasma/ksysguard/DETAILS | 4
plasma/ksysguard/HISTORY | 3
plasma/libksysguard/DETAILS | 4
plasma/libksysguard/HISTORY | 3
13 files changed, 303 insertions(+), 17 deletions(-)

New commits:
commit 1b2dab42f010b326aef2344ff0e5c4c50345d8f0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesa: => 20.1.1

commit 23e3da2cd992157f646da4e2095f2d0022b78d4b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ksysguard: => 5.19.0.1

commit 2cda9efb74fccfb33a9137a8acc0c90fa4ae72c9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libksysguard: => 5.19.0.1

commit 716d03c16d699a36ac48f157bc65755a1241ee0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nss: => 3.53

commit d3d6f5fae6201969f5b5ffec289cd1a275e0f2d3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

jsoncpp: => 1.9.3

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index aee3973..46ab941 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -33,6 +33,10 @@ case $NSS_BRANCH in
VERSION=3.51.1

SOURCE_HASH=sha512:1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
;;
+ 3.53)
+ VERSION=3.53
+
SOURCE_HASH=sha512:280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index ceefb37..f07b28c 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2020-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.53
+ * PRE_BUILD, PREPARE: added 3.53 branch
+ * nss-3.53-standalone-1.patch: added
+
2020-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.51.1

@@ -69,10 +74,7 @@
2018-12-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.40.1

-2018-10-24 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.40
- * PRE_BUILD, PREPARE: added 3.40 branch
-
+
2018-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.39
* PRE_BUILD, PREPARE: added 3.39 branch
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 6c252fe..d685dcd 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 3.51 &&
+prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 3.51 3.53 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.51
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index cfb8f6d..d821401 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -3,14 +3,16 @@ cd "$SOURCE_DIRECTORY" &&

case "${NSS_BRANCH}" in
3.1[7-9] | 3.20) patch -p1 <
"${SPELL_DIRECTORY}/nss-3.17.2-standalone-2.patch" ;;
-3.3[2-9] | 3.4[0-9] | 3.5[0-9] ) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.32-standalone-1.patch" ;;
+3.3[2-9] | 3.4[0-9] | 3.5[0-1] ) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.32-standalone-1.patch" ;;
+ 3.5[3-9] ) patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.53-standalone-1.patch" ;;
esac &&

if [[ "$NSS_PEM" == "y" ]]; then
# New or old source trees are easy to tell apart.
if test -e nss; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 &&
- sed "/DIRS/s;builtins;& pem;" -i nss/lib/ckfw/manifest.mn
+ sed "/DIRS/s;builtins;& pem;" -i nss/lib/ckfw/manifest.mn &&
+ sed -i 's/NETSCAPE/NSS/' nss/lib/ckfw/pem/*.c ;
else
# Playing safe with old stuff, no new PEM source there.
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
diff --git a/crypto/nss/nss-3.53-standalone-1.patch
b/crypto/nss/nss-3.53-standalone-1.patch
new file mode 100644
index 0000000..a417939
--- /dev/null
+++ b/crypto/nss/nss-3.53-standalone-1.patch
@@ -0,0 +1,266 @@
+Submitted By: Xi Ruoyao <xry111_AT_mengyan1223_DOT_wang>
+Date: 2020-05-31
+Initial Package Version: 3.12.4
+Upstream Status: Not applicable
+Origin: Self, rediffed for nss-3.53.
+Description: Adds auto-generated nss.pc and nss-config script,
and
+ allows building without nspr in the source tree.
+ For 3.40.1, Requires: updated to nspr >= 4.20.
+ For 3.46.1, Requires: updated to nspr >= 4.21.
+ For 3.48, Requires: updated to nspr >= 4.24.
+ For 3.51.1, Requires: updated to nspr >= 4.25.
+
+diff -Nuar nss-3.53.orig/nss/config/Makefile nss-3.53/nss/config/Makefile
+--- nss-3.53.orig/nss/config/Makefile 1970-01-01 08:00:00.000000000 +0800
++++ nss-3.53/nss/config/Makefile 2020-05-31 13:48:14.423566855 +0800
+@@ -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
++
+diff -Nuar nss-3.53.orig/nss/config/nss-config.in
nss-3.53/nss/config/nss-config.in
+--- nss-3.53.orig/nss/config/nss-config.in 1970-01-01 08:00:00.000000000
+0800
++++ nss-3.53/nss/config/nss-config.in 2020-05-31 13:48:14.424566860 +0800
+@@ -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
++
+diff -Nuar nss-3.53.orig/nss/config/nss.pc.in nss-3.53/nss/config/nss.pc.in
+--- nss-3.53.orig/nss/config/nss.pc.in 1970-01-01 08:00:00.000000000 +0800
++++ nss-3.53/nss/config/nss.pc.in 2020-05-31 13:48:14.424566860 +0800
+@@ -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.25
++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}
++
+diff -Nuar nss-3.53.orig/nss/Makefile nss-3.53/nss/Makefile
+--- nss-3.53.orig/nss/Makefile 2020-05-30 04:34:42.000000000 +0800
++++ nss-3.53/nss/Makefile 2020-05-31 13:48:51.500733022 +0800
+@@ -4,6 +4,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
++default: nss_build_all
++
+ #######################################################################
+ # (1) Include initial platform-independent assignments (MANDATORY). #
+ #######################################################################
+@@ -48,12 +50,10 @@
+ #######################################################################
+
+ nss_build_all:
+- $(MAKE) build_nspr
+ $(MAKE) all
+ $(MAKE) latest
+
+ nss_clean_all:
+- $(MAKE) clobber_nspr
+ $(MAKE) clobber
+
+ NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+diff -Nuar nss-3.53.orig/nss/manifest.mn nss-3.53/nss/manifest.mn
+--- nss-3.53.orig/nss/manifest.mn 2020-05-30 04:34:42.000000000 +0800
++++ nss-3.53/nss/manifest.mn 2020-05-31 13:48:30.652640413 +0800
+@@ -10,7 +10,7 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil gtests config
+
+ lib: coreconf
+ cmd: lib
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index 7bc0664..762467f 100755
--- a/graphics-libs/mesa/DETAILS
+++ b/graphics-libs/mesa/DETAILS
@@ -9,8 +9,8 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=20.1.0
-
SOURCE_HASH=sha512:f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be
+ VERSION=20.1.1
+
SOURCE_HASH=sha512:a8ae02915305488e5e0d8c104da73df1cdd61ab0b5c5d27a6851c418d25a2c9beeea9cddf93a341afa63cec52d356fe68b194c8c36e78c26f66fa884fc27f147
SOURCE=mesa-$VERSION.tar.xz
SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesa-${VERSION}
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 8118c0c..1fb5372 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2020-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20.1.1
+
2020-05-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20.1.0

diff --git a/libs/jsoncpp/DETAILS b/libs/jsoncpp/DETAILS
index 3f91464..6e4d588 100755
--- a/libs/jsoncpp/DETAILS
+++ b/libs/jsoncpp/DETAILS
@@ -1,11 +1,11 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=jsoncpp
if [[ $JSONCPP_BRANCH == "stable" ]]; then
- VERSION=1.8.4
-
SOURCE_HASH=sha512:f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
+ VERSION=1.9.3
+
SOURCE_HASH=sha512:f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
else
- VERSION=1.8.4
-
SOURCE_HASH=sha512:f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
+ VERSION=1.9.3
+
SOURCE_HASH=sha512:f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
fi
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/open-source-parsers/$SPELL/archive/$VERSION.tar.gz
diff --git a/libs/jsoncpp/HISTORY b/libs/jsoncpp/HISTORY
index dee67d1..03c9b19 100644
--- a/libs/jsoncpp/HISTORY
+++ b/libs/jsoncpp/HISTORY
@@ -1,3 +1,6 @@
+2020-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.3
+
2018-05-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.4
* *: convert to meson build, otherwise cmake is broken
diff --git a/plasma/ksysguard/DETAILS b/plasma/ksysguard/DETAILS
index 267e926..78a89f8 100755
--- a/plasma/ksysguard/DETAILS
+++ b/plasma/ksysguard/DETAILS
@@ -1,7 +1,7 @@
SPELL=ksysguard
- VERSION=5.19.0
+ VERSION=5.19.0.1
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL=https://download.kde.org/stable/plasma/$VERSION/$SOURCE
+ SOURCE_URL=https://download.kde.org/stable/plasma/${VERSION%.?}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/plasma/ksysguard/HISTORY b/plasma/ksysguard/HISTORY
index 2624e00..5467783 100644
--- a/plasma/ksysguard/HISTORY
+++ b/plasma/ksysguard/HISTORY
@@ -1,3 +1,6 @@
+2020-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.19.0.1
+
2020-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.19.0

diff --git a/plasma/libksysguard/DETAILS b/plasma/libksysguard/DETAILS
index ec69010..04f9edf 100755
--- a/plasma/libksysguard/DETAILS
+++ b/plasma/libksysguard/DETAILS
@@ -1,7 +1,7 @@
SPELL=libksysguard
- VERSION=5.19.0
+ VERSION=5.19.0.1
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL=https://download.kde.org/stable/plasma/$VERSION/$SOURCE
+ SOURCE_URL=https://download.kde.org/stable/plasma/${VERSION%.?}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/plasma/libksysguard/HISTORY b/plasma/libksysguard/HISTORY
index e460bbc..c2b18fb 100644
--- a/plasma/libksysguard/HISTORY
+++ b/plasma/libksysguard/HISTORY
@@ -1,3 +1,6 @@
+2020-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.19.0.1
+
2020-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.19.0

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b2dab42f010b326aef2344ff0e5c4c50345d8f0), Treeve Jelbert, 06/11/2020