Skip to Content.
Sympa Menu

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

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 (5443cd4189f7e5b29b0d3dff8f2d8e9fdd85e500)
  • Date: Thu, 13 Feb 2014 07:23:55 -0600

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

ChangeLog | 6 ++++++
http/qtwebkit/BUILD | 8 --------
http/qtwebkit/DEPENDS | 6 ------
http/qtwebkit/DETAILS | 24 ------------------------
http/qtwebkit/HISTORY | 3 ---
libs/pyqt5/BUILD | 9 +++++++++
libs/pyqt5/CONFIGURE | 2 ++
libs/pyqt5/DEPENDS | 6 ++++++
libs/pyqt5/DETAILS | 19 +++++++++++++++++++
libs/pyqt5/HISTORY | 5 +++++
libs/pyqt5/PROVIDES | 1 +
libs/sip/BUILD | 8 +++-----
libs/sip/DEPENDS | 2 +-
libs/sip/DETAILS | 4 ++--
libs/sip/HISTORY | 4 ++++
libs/sip/INSTALL | 5 ++---
16 files changed, 60 insertions(+), 52 deletions(-)

New commits:
commit 5443cd4189f7e5b29b0d3dff8f2d8e9fdd85e500
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sip: => 4.15.4

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

pyqt5-5.2

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

deprecate http/qtwebkit [replaced by qt5/qtwebkit]
1. this spell is obsolete - upstrame now uses git
2. the checkout is enormous
3. the qt4 version is part of qt4
4. there is a separate qtwebkit available for qt5

diff --git a/ChangeLog b/ChangeLog
index 202ca6a..8b1da43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * libs/pyqt5: new spell- PyQt for Qt5
+
+2014-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * http/qtwebkit: spell deprecated [replaced by qt5/qtwebkit]
+
2014-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* devel/ninja-build-system: new spell, a small build system with a
focus
on speed
diff --git a/http/qtwebkit/BUILD b/http/qtwebkit/BUILD
deleted file mode 100755
index 88954cd..0000000
--- a/http/qtwebkit/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
-PATH="$QTDIR/bin/qt4:$PATH" &&
-
-cd "$SOURCE_DIRECTORY" &&
-WebKitTools/Scripts/build-webkit --qt &&
-
-cd WebKitBuild/Release &&
-make
diff --git a/http/qtwebkit/DEPENDS b/http/qtwebkit/DEPENDS
deleted file mode 100755
index 629492c..0000000
--- a/http/qtwebkit/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends qt4 &&
-depends gperf &&
-depends sqlite &&
-depends bison &&
-depends flex &&
-depends libxslt
diff --git a/http/qtwebkit/DETAILS b/http/qtwebkit/DETAILS
deleted file mode 100755
index 58b197d..0000000
--- a/http/qtwebkit/DETAILS
+++ /dev/null
@@ -1,24 +0,0 @@
- SPELL=qtwebkit
-if [[ $WEBKITQT_VCS_AUTOUPDATE == y ]]
-then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
- SOURCE_URL[0]=svn_http://svn.webkit.org/repository/webkit/trunk:$SPELL-svn
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
- WEB_SITE=http://trac.webkit.org/wiki/QtWebKit
- ENTERED=20080707
- LICENSE[0]=GPL
- KEYWORDS="engine http"
- SHORT="A Qt backport of the WebKit web browser engine"
-cat << EOF
-WebKit is an open source web browser engine. WebKit's HTML and JavaScript
-code began as a branch of the KHTML and KJS libraries from KDE. As part
-of KDE framework KHTML was based on Qt but during their porting efforts
-Apple's engineers made WebKit toolkit independent. WebKit Qt is a project
-aiming at porting this fabulous engine back to Qt.
-EOF
diff --git a/http/qtwebkit/HISTORY b/http/qtwebkit/HISTORY
deleted file mode 100644
index 67f2b63..0000000
--- a/http/qtwebkit/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS, DEPENDS, BUILD: Created spell.
-
diff --git a/libs/pyqt5/BUILD b/libs/pyqt5/BUILD
new file mode 100755
index 0000000..6f7ac8c
--- /dev/null
+++ b/libs/pyqt5/BUILD
@@ -0,0 +1,9 @@
+if [ $PYQT_BIG == y ];then
+ VBIG=-c
+fi &&
+QMAKEPATH="$QT5DIR/bin" &&
+# in some cases, we set a symlink to python in the source directory
+PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH" &&
+$PYTHON ./configure.py --confirm-license $VBIG
+ &&
+make
diff --git a/libs/pyqt5/CONFIGURE b/libs/pyqt5/CONFIGURE
new file mode 100755
index 0000000..aaa41e8
--- /dev/null
+++ b/libs/pyqt5/CONFIGURE
@@ -0,0 +1,2 @@
+config_query PYQT_BIG "can I use LOTS(>512MB) of memory? " n
+
diff --git a/libs/pyqt5/DEPENDS b/libs/pyqt5/DEPENDS
new file mode 100755
index 0000000..00a5250
--- /dev/null
+++ b/libs/pyqt5/DEPENDS
@@ -0,0 +1,6 @@
+depends PYTHON &&
+depends sip &&
+depends qtbase &&
+optional_depends qttools '' '' 'build designer plugin' &&
+optional_depends qtdeclarative '' '' 'build qmlscene plugin' &&
+optional_depends qtwebkit '' '' 'WebKit support'
diff --git a/libs/pyqt5/DETAILS b/libs/pyqt5/DETAILS
new file mode 100755
index 0000000..247d067
--- /dev/null
+++ b/libs/pyqt5/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=pyqt5
+ SPELLX=PyQt-gpl
+ VERSION=5.2
+
SOURCE_HASH=sha512:fc327b08a471644cd0eb112eb99a610546e3dce3e53e375f8daae60e7992e49b52c8374ce81b732404fbafb470afd19b136980e6598a10d1bc2b21c99e04b6a6
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/PyQt5/PyQt-${VERSION}/${SOURCE}
+ WEB_SITE=http://www.riverbankcomputing.co.uk/software/pyqt/
+ ENTERED=20140213
+ LICENSE[0]=GPL
+ KEYWORDS="qt5 python libs"
+ SHORT="Python bindings for the Qt5 GUI toolkit"
+cat << EOF
+From the website:
+PyQt is a set of Python bindings for the Qt toolkit. The bindings are
+implemented as a set of Python modules: qt, qtcanvas, qtgl, qtnetwork,
+qtsql, qttable and qtxml, and contains 300 classes and over 5,750
+functions and methods.
+EOF
diff --git a/libs/pyqt5/HISTORY b/libs/pyqt5/HISTORY
new file mode 100644
index 0000000..3c29ac9
--- /dev/null
+++ b/libs/pyqt5/HISTORY
@@ -0,0 +1,5 @@
+2014-02-113 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2
+ spell created , based on pyqt4
+
+
diff --git a/libs/pyqt5/PROVIDES b/libs/pyqt5/PROVIDES
new file mode 100644
index 0000000..bea0157
--- /dev/null
+++ b/libs/pyqt5/PROVIDES
@@ -0,0 +1 @@
+PYQT
diff --git a/libs/sip/BUILD b/libs/sip/BUILD
index 67b1763..a1db27a 100755
--- a/libs/sip/BUILD
+++ b/libs/sip/BUILD
@@ -1,5 +1,3 @@
- sed -i "s/-O2//" specs/linux-g++ &&
-
- python ./configure.py \
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fno-exceptions"
&&
- make
+sed -i "s/-O2//" specs/linux-g++ &&
+$PYTHON ./configure.py CFLAGS_EXCEPTIONS_OFF=1 &&
+make
diff --git a/libs/sip/DEPENDS b/libs/sip/DEPENDS
index 867b4d4..b9f5874 100755
--- a/libs/sip/DEPENDS
+++ b/libs/sip/DEPENDS
@@ -1 +1 @@
-depends python
+depends PYTHON
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 6ad97e3..b7b3758 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.14.5
-
SOURCE_HASH=sha512:0100197678bfe1742b35817eeed40f9b38375b146c412679f24c11faa4f0ac02abade79d1567a23d107d28916322f97fc16ddc3600fc1e23c0721385a99a6650
+ VERSION=4.15.4
+
SOURCE_HASH=sha512:887f740853d3ce09946faea2ccababfad505d454cfe2f9d525104d02a05fe6c146a549464901231a76039ea3855223206ef48c122bb51806cfd97a54c23ac143
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index 90f6b10..4f0a8ea 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,7 @@
+2014-02-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.15.4
+ * DEPENDS, BUILD, INSTALL: adapt to python3
+
2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.14.5

diff --git a/libs/sip/INSTALL b/libs/sip/INSTALL
index 46adc48..c0c5b55 100755
--- a/libs/sip/INSTALL
+++ b/libs/sip/INSTALL
@@ -1,3 +1,2 @@
- make &&
- make install &&
- mkdir -p /usr/share/sip
+make install &&
+mkdir -p $INSTALL_ROOT/usr/share/sip



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5443cd4189f7e5b29b0d3dff8f2d8e9fdd85e500), Treeve Jelbert, 02/13/2014

Archive powered by MHonArc 2.6.24.

Top of Page