Skip to Content.
Sympa Menu

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

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 (9736682a524d1962535f8ae108b91bfd037fe2ab)
  • Date: Thu, 6 Feb 2014 02:14:27 -0600

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

crypto/libgcrypt/DETAILS | 4 ++--
crypto/libgcrypt/HISTORY | 5 +++++
crypto/libgcrypt/UP_TRIGGERS | 9 +++++++++
devel/qt-creator/BUILD | 6 +++++-
devel/qt-creator/DEPENDS | 7 ++++++-
devel/qt-creator/HISTORY | 3 +++
http/qupzilla/BUILD | 7 ++++++-
http/qupzilla/DEPENDS | 7 ++++++-
http/qupzilla/HISTORY | 3 +++
9 files changed, 45 insertions(+), 6 deletions(-)

New commits:
commit 9736682a524d1962535f8ae108b91bfd037fe2ab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgcrypt-1.6.1 SECURITY fix

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

qupzilla - add qt5 support

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

qt-creator - add qt5 support

diff --git a/crypto/libgcrypt/DETAILS b/crypto/libgcrypt/DETAILS
index c6732d7..69955e0 100755
--- a/crypto/libgcrypt/DETAILS
+++ b/crypto/libgcrypt/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgcrypt
- VERSION=1.5.3
- SECURITY_PATCH=1
+ VERSION=1.6.1
+ SECURITY_PATCH=2

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index b65df7c..9d8c558 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -1,3 +1,8 @@
+2014-02-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.1
+ SECURITY_PATCH++ fixes CVE-2013-4242
+ * UP_TRIGGERS: added
+
2013-07-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.3, SECURITY_PATCH=1

diff --git a/crypto/libgcrypt/UP_TRIGGERS b/crypto/libgcrypt/UP_TRIGGERS
new file mode 100755
index 0000000..f5ec3f0
--- /dev/null
+++ b/crypto/libgcrypt/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" || return 0
+if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done
+fi
diff --git a/devel/qt-creator/BUILD b/devel/qt-creator/BUILD
index eec3de4..3f1d6c5 100755
--- a/devel/qt-creator/BUILD
+++ b/devel/qt-creator/BUILD
@@ -1 +1,5 @@
-qt4_build
+if is_depends_enabled $SPELL qtbase;then
+ qt5_build
+else
+ qt4_build
+fi
diff --git a/devel/qt-creator/DEPENDS b/devel/qt-creator/DEPENDS
index dbdb2f0..a10832d 100755
--- a/devel/qt-creator/DEPENDS
+++ b/devel/qt-creator/DEPENDS
@@ -1,3 +1,8 @@
depends -sub CXX gcc &&
-depends qt4
+depends QT &&
+if is_depends_enabled $SPELL qtbase;then
+ depends qtx11extras &&
+ depends qtdeclarative &&
+ optional_depends qtquick1 '' '' 'old QtQuick support'
+fi

diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 6f8d7c2..75417d1 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,6 +1,9 @@
2014-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 3.0.1

+2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, BUILD: add qt5 support
+
2013-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 3.0.0

diff --git a/http/qupzilla/BUILD b/http/qupzilla/BUILD
index eec3de4..a839ab4 100755
--- a/http/qupzilla/BUILD
+++ b/http/qupzilla/BUILD
@@ -1 +1,6 @@
-qt4_build
+if is_depends_enabled $SPELL qtbase;then
+ qt5_build
+else
+ qt4_build
+fi
+
diff --git a/http/qupzilla/DEPENDS b/http/qupzilla/DEPENDS
index 6ad1ff9..63dff8f 100755
--- a/http/qupzilla/DEPENDS
+++ b/http/qupzilla/DEPENDS
@@ -1 +1,6 @@
-depends -sub WEBKIT qt4
+depends QT &&
+if is_depends_enabled $SPELL qtbase;then
+ depends qtwebkit5
+else
+ sub_depends qt4 WEBKIT
+fi
diff --git a/http/qupzilla/HISTORY b/http/qupzilla/HISTORY
index 2f08344..44c297b 100644
--- a/http/qupzilla/HISTORY
+++ b/http/qupzilla/HISTORY
@@ -1,3 +1,6 @@
+2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, DEPENDS: add qt5 support
+
2014-02-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9736682a524d1962535f8ae108b91bfd037fe2ab), Treeve Jelbert, 02/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page