Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0c6181c26f6fa125e8344e77b208a75379d52d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0c6181c26f6fa125e8344e77b208a75379d52d3)
  • Date: Thu, 23 Apr 2015 03:28:17 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/nettle/HISTORY | 4 ++++
crypto/nettle/UP_TRIGGERS | 13 +++++++++++++
devel/python/DETAILS | 1 +
devel/python/HISTORY | 4 ++++
devel/python/INSTALL | 7 +++++++
devel/python3/DETAILS | 1 +
devel/python3/HISTORY | 6 ++++--
devel/python3/INSTALL | 11 +++++++++--
libs/pyqt4/DEPENDS | 6 +++++-
libs/pyqt4/HISTORY | 3 +++
10 files changed, 51 insertions(+), 5 deletions(-)

New commits:
commit c0c6181c26f6fa125e8344e77b208a75379d52d3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

python3: ensure existens of python3 command (as per PEP 394)

commit 54b9638e12e784ea9b0ff60ea20beabc8ff42d51
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

python: ensure existens of python2 command (as per PEP 394)

commit 49b66acfd302cdb27e48ef8517c139403759c92f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pyqt4: needs dbus-python

commit 6f3938355d4252cf9e8fe7b9ef97e67b9cfb53f7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nettle: needs UP_TRIGGERS for incompatible upgrades

diff --git a/crypto/nettle/HISTORY b/crypto/nettle/HISTORY
index b8229e7..a2f4769 100644
--- a/crypto/nettle/HISTORY
+++ b/crypto/nettle/HISTORY
@@ -1,3 +1,7 @@
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: Check dependent spells since the update
+ changes library version.
+
2015-04-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.1
fixed WEB_SITE
diff --git a/crypto/nettle/UP_TRIGGERS b/crypto/nettle/UP_TRIGGERS
new file mode 100755
index 0000000..1f59e0f
--- /dev/null
+++ b/crypto/nettle/UP_TRIGGERS
@@ -0,0 +1,13 @@
+if spell_ok $SPELL; then
+ local NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1)" &&
+ local OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done
+ fi
+fi
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index f5af121..17cffec 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,7 @@
SPELL=python
VERSION=2.7.9
SECURITY_PATCH=4
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 1f58bcf..7afbb83 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2015-04-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: ensure python2 and python2-config symlinks
+ * DETAILS: PATCHLEVEL++
+
2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply a patch; quoting paths
* libressl.patch: added, backported official patch from OpenBSD
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 5a47b20..8a1a8b5 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -10,6 +10,13 @@ install -vm 755
"$SOURCE_DIRECTORY"/Tools/i18n/{pygettext.py,msgfmt.py} \

local PYVER=`echo ${VERSION}|cut -d . -f 1,2` &&

+# Ensure existence of /usr/bin/python2 and /usr/bin/python2-config
+# symlinks, as they are not created with altinstall.
+# See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
+# and the surrounding thread for fun.
+ln -sf python$PYVER "$INSTALL_ROOT/usr/bin/python2" &&
+ln -sf python$PYVER-config "$INSTALL_ROOT/usr/bin/python2-config" &&
+
if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
"${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 6db6302..aa815cb 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,6 +1,7 @@
SPELL=python3
VERSION=3.4.3
SECURITY_PATCH=3
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 7422241..ccb45e5 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,5 +1,7 @@
-2015-03-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.4.3
+2015-04-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: ensure python3 and python3-config symlinks,
+ also better version extraction using cut -d .
+ * DETAILS: PATCHLEVEL++

2015-03-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de
* INSTALL: install python3 symlink
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 0a4e44a..852c1f0 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -4,9 +4,16 @@ cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr"
"$INSTALL_ROOT/" &&
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
# help some stupid installer scripts
-local PV=`echo ${VERSION}|cut -c-3` &&
+local PV=`echo ${VERSION}|cut -d . -f 1,2` &&
+
+# Ensure existence of /usr/bin/python3 and /usr/bin/python3-config
+# symlinks, as they are not created with altinstall.
+# See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
+# and the surrounding thread for fun.
+ln -sf python$PV "$INSTALL_ROOT/usr/bin/python3" &&
+ln -sf python$PV-config "$INSTALL_ROOT/usr/bin/python3-config" &&
+
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
-ln -sf ${TRACK_ROOT}/usr/bin/python${PV} ${INSTALL_ROOT}/usr/bin/python3 &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
if [[ $SYMLINK == y ]];then
diff --git a/libs/pyqt4/DEPENDS b/libs/pyqt4/DEPENDS
index 2ab9874..3e2f518 100755
--- a/libs/pyqt4/DEPENDS
+++ b/libs/pyqt4/DEPENDS
@@ -4,4 +4,8 @@ depends sip &&
optional_depends qscintilla '' '' "editting component"
if is_depends_enabled pyqt4 qscintilla; then
sub_depends qscintilla QT4
-fi
+fi &&
+# This needs to use the same PYTHON ... this is a rather
+# generic problem. We need to ensure consistency of providers along
+# one branch of the dependency tree.
+optional_depends dbus-python '' '' 'QtDBus API'
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index eceed90..a4469cc 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2015-04-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: dbus-python
+
2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: missing &&




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0c6181c26f6fa125e8344e77b208a75379d52d3), Thomas Orgis, 04/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page