Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9e344e03b790bd34ae59134617d5c29539e62917)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (9e344e03b790bd34ae59134617d5c29539e62917)
  • Date: Thu, 27 Sep 2018 20:39:15 +0000

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

crypto/libressl/DETAILS | 2 +-
crypto/libressl/HISTORY | 3 +++
devel/python/BUILD | 12 +-----------
devel/python/HISTORY | 4 ++++
devel/python/INSTALL | 7 ++++++-
devel/python3/BUILD | 11 +----------
devel/python3/HISTORY | 4 ++++
devel/python3/INSTALL | 7 ++++++-
kde5-apps/krita/DETAILS | 2 +-
kde5-apps/krita/HISTORY | 3 +++
10 files changed, 30 insertions(+), 25 deletions(-)

New commits:
commit 9e344e03b790bd34ae59134617d5c29539e62917
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python - fix install

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

python3 - fix install

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

libressl: => 2.8.1

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

krita: => 4.1.3

diff --git a/crypto/libressl/DETAILS b/crypto/libressl/DETAILS
index 70800d5..bf9a8ac 100755
--- a/crypto/libressl/DETAILS
+++ b/crypto/libressl/DETAILS
@@ -1,6 +1,6 @@
SPELL=libressl
if [[ "$LIBRESSL_BRANCH" == "devel" ]]; then
- VERSION=2.8.0
+ VERSION=2.8.1
SECURITY_PATCH=8
elif [[ "$LIBRESSL_BRANCH" == "stable" ]]; then
VERSION=2.7.4
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index f98e84f..b142457 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,6 @@
+2018-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.1
+
2018-08-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: devel version 2.8.0, reorganized multiversioning:
stable is 2.7.4, old is 2.5.5
diff --git a/devel/python/BUILD b/devel/python/BUILD
index ab8bcd5..a156a3a 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -9,14 +9,4 @@ if [[ -f
$INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then
"$SOURCE_DIRECTORY/spell-tmp"
fi &&

-default_build &&
-
-# python -c 'print "(c)", "lynx"*3'
-# can only have one primary python, the others must be alt
-if [[ $PY2K == y ]]; then
- make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-else
- make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-fi &&
-
-message "${MESSAGE_COLOR}Fake stage complete, installing to real
path...${DEFAULT_COLOR}"
+default_build
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index a1345d6..2e55fb7 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2018-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD INSTALL: remove fake install
+ not needed if staging is disabled, also fixes segfault during
install
+
2018-04-30 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.7.15, SECURITY_PATCH++,
(CVE-2018-1060, CVE-2018-1061, CVE-2017-9233, CVE-2016-9063,
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 71abc31..d5b4166 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,4 +1,9 @@
-cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+# can only have one primary python, the others must be alt
+if [[ $PY2K == y ]]; then
+ make install DESTDIR="$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$INSTALL_ROOT"
+fi &&

if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
diff --git a/devel/python3/BUILD b/devel/python3/BUILD
index 6f5dc67..561ab33 100755
--- a/devel/python3/BUILD
+++ b/devel/python3/BUILD
@@ -2,13 +2,4 @@ OPTS="--enable-shared $PYTHON3_OPTS $OPTS" &&
OPTS="--with-ensurepip=no $OPTS" &&
OPTS="--with-threads $OPTS" &&

-EXTRA_CFLAGS="$CFLAGS" default_build &&
-
-if [[ $PY3K == y ]]; then
- # python3 -c 'print ("(c)", "lynx"*3)'
- make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-else
- make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-fi &&
-
-message "Fake stage complete, installing to real path.."
+EXTRA_CFLAGS="$CFLAGS" default_build
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 0d2e355..2c05695 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2018-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD INSTALL: remove fake install
+ not needed if staging is disabled, also fixes segfault during
install
+
2018-06-27 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PREPARE: versions 3.7.0/3.6.6

diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index a22e30b..2499afb 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,4 +1,9 @@
-cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+if [[ $PY3K == y ]]; then
+ make install DESTDIR="$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$INSTALL_ROOT"
+fi &&
+

# gettext
for script in pygettext msgfmt; do
diff --git a/kde5-apps/krita/DETAILS b/kde5-apps/krita/DETAILS
index a692309..e85ffca 100755
--- a/kde5-apps/krita/DETAILS
+++ b/kde5-apps/krita/DETAILS
@@ -1,5 +1,5 @@
SPELL=krita
- VERSION=4.1.1
+ VERSION=4.1.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=https://download.kde.org/stable/krita/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/krita/HISTORY b/kde5-apps/krita/HISTORY
index bef3a59..646e04b 100644
--- a/kde5-apps/krita/HISTORY
+++ b/kde5-apps/krita/HISTORY
@@ -1,3 +1,6 @@
+2018-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1.3
+
2018-07-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9e344e03b790bd34ae59134617d5c29539e62917), Treeve Jelbert, 09/27/2018

Archive powered by MHonArc 2.6.24.

Top of Page