Skip to Content.
Sympa Menu

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

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 (46fab9b1290b8e8df755953c8bee6c31d07c5cca)
  • Date: Tue, 6 Oct 2009 05:18:34 -0500

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

ChangeLog | 3 +++
devel/apiextractor/DETAILS | 4 ++--
devel/apiextractor/HISTORY | 3 +++
devel/boostpythongenerator/BUILD | 2 +-
devel/boostpythongenerator/DEPENDS | 9 +--------
devel/boostpythongenerator/DETAILS | 25 +++++--------------------
devel/boostpythongenerator/DOWNLOAD | 1 +
devel/boostpythongenerator/HISTORY | 18 ++++--------------
devel/boostpythongenerator/INSTALL | 1 +
devel/boostpythongenerator/PREPARE | 1 -
devel/boostpythongenerator/PRE_BUILD | 1 +
devel/boostpythongenerator/TRIGGERS | 2 +-
devel/generatorrunner/BUILD | 1 +
devel/generatorrunner/CONFLICTS | 1 +
devel/generatorrunner/DEPENDS | 8 ++++++++
devel/generatorrunner/DETAILS | 22 ++++++++++++++++++++++
devel/generatorrunner/HISTORY | 3 +++
devel/generatorrunner/PREPARE | 1 +
devel/generatorrunner/TRIGGERS | 1 +
devel/pyside-tools/DEPENDS | 2 ++
devel/pyside-tools/DETAILS | 6 +++---
devel/pyside-tools/HISTORY | 5 +++++
devel/pyside-tools/PRE_BUILD | 3 +++
devel/pyside-tools/cmake.diff | 11 +++++++++++
devel/pyside/DEPENDS | 2 +-
devel/pyside/DETAILS | 4 ++--
devel/pyside/HISTORY | 4 ++++
devel/qt-creator/DETAILS | 4 ++--
devel/qt-creator/HISTORY | 3 +++
29 files changed, 96 insertions(+), 55 deletions(-)

New commits:
commit 46fab9b1290b8e8df755953c8bee6c31d07c5cca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyside-tools: => 0.1.2

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

deprecate devel/boostpythongenerator [replaced by generatorrunner]

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

pyside: => qt4.5+0.2.1

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

generatorrunner-0.3.1

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

apiextractor: => 0.3.1

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

qt-creator: => 1.2.90

diff --git a/ChangeLog b/ChangeLog
index db34dd4..5afcafe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * devel/generatorrunner: new spell, supercedes boostpythongenerator
+
2009-10-04 Bor Kraljič <pyrobor AT ver.si>
* libs/podofo: new spell: dependency for calibre

diff --git a/devel/apiextractor/DETAILS b/devel/apiextractor/DETAILS
index fe0b19c..909c9da 100755
--- a/devel/apiextractor/DETAILS
+++ b/devel/apiextractor/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=0.3
-
SOURCE_HASH=sha512:e72b650d85df18e3b00df905a680c04c58d34c4a8a85e3967d8cb3c916b7ba31ac84491f40db7270537ee93565688bd2d8ffe7005c6805aed44200199eb5a836
+ VERSION=0.3.1
+
SOURCE_HASH=sha512:a0644e517d22e634d7fa9dc711926165c15b06c81a82a1ac02dd9e3d75f020d20dff50f5f29a18cdc75dd559d4e50a0c1a02e9b80d9dafd79d2ca5bd799cba6e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
fi
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index d8cebbc..4ffa5d0 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,6 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.1
+
2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3

diff --git a/devel/boostpythongenerator/BUILD
b/devel/boostpythongenerator/BUILD
index 2113434..27ba77d 100755
--- a/devel/boostpythongenerator/BUILD
+++ b/devel/boostpythongenerator/BUILD
@@ -1 +1 @@
-qt4_cmake_build
+true
diff --git a/devel/boostpythongenerator/DEPENDS
b/devel/boostpythongenerator/DEPENDS
index 328aa0e..80d43a8 100755
--- a/devel/boostpythongenerator/DEPENDS
+++ b/devel/boostpythongenerator/DEPENDS
@@ -1,8 +1 @@
-depends qt4 &&
-depends cmake &&
-depends python &&
-depends -sub PYTHON boost &&
-depends apiextractor &&
-if [[ $PYSIDE == git ]];then
- depends git
-fi
+depends generatorrunner
diff --git a/devel/boostpythongenerator/DETAILS
b/devel/boostpythongenerator/DETAILS
index c20733b..c2f88fb 100755
--- a/devel/boostpythongenerator/DETAILS
+++ b/devel/boostpythongenerator/DETAILS
@@ -1,23 +1,8 @@
SPELL=boostpythongenerator
- WEB_SITE=http://www.pyside.org/
-#http://qt.gitorious.org/pyside
-if [[ $PYSIDE == git ]];then
- VERSION=git
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=git://gitorious.org/pyside/$SPELL.git:$SPELL-git
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
-else
- VERSION=0.3
-
SOURCE_HASH=sha512:37c379aa21946938173f8e1014c8acd86b4deb726ed6713a055e7b1b1add0a74d5f4aafed23eac58bc71ed675788a483e4332eebe40883334f8442be972e1ee1
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- ENTERED=20080921
- LICENSE[0]=LGPL
- KEYWORDS="python libs"
- SHORT="Python bindings generator"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-Python binding generator based on Boost.Python
+deprecated spell [replaced by generatorrunner]
EOF
+
diff --git a/devel/boostpythongenerator/DOWNLOAD
b/devel/boostpythongenerator/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/boostpythongenerator/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/HISTORY
b/devel/boostpythongenerator/HISTORY
index d8cebbc..c9c29b3 100644
--- a/devel/boostpythongenerator/HISTORY
+++ b/devel/boostpythongenerator/HISTORY
@@ -1,14 +1,4 @@
-2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3
-
-2009-08-27 Treeve Jelbert <treeve AT sourcemage.org>
- * TRIGGERS: added
-
-2009-08-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.2
- * PREPARE: added
- * DEPENDS: git only for git version
-
-2009-08-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version git
- spell created
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by generatorrunner]
diff --git a/devel/boostpythongenerator/INSTALL
b/devel/boostpythongenerator/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/boostpythongenerator/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/PREPARE
b/devel/boostpythongenerator/PREPARE
deleted file mode 100755
index b5f9bde..0000000
--- a/devel/boostpythongenerator/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list PYSIDE 'which version to build?' stable git
diff --git a/devel/boostpythongenerator/PRE_BUILD
b/devel/boostpythongenerator/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/boostpythongenerator/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/TRIGGERS
b/devel/boostpythongenerator/TRIGGERS
index 1696e74..61ee7bf 100755
--- a/devel/boostpythongenerator/TRIGGERS
+++ b/devel/boostpythongenerator/TRIGGERS
@@ -1 +1 @@
-on_cast boost check_self
+on_cast boostpythongenerator dispel_self
diff --git a/devel/generatorrunner/BUILD b/devel/generatorrunner/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/devel/generatorrunner/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/devel/generatorrunner/CONFLICTS b/devel/generatorrunner/CONFLICTS
new file mode 100755
index 0000000..818c563
--- /dev/null
+++ b/devel/generatorrunner/CONFLICTS
@@ -0,0 +1 @@
+conflicts boostpythongenerator y
diff --git a/devel/generatorrunner/DEPENDS b/devel/generatorrunner/DEPENDS
new file mode 100755
index 0000000..328aa0e
--- /dev/null
+++ b/devel/generatorrunner/DEPENDS
@@ -0,0 +1,8 @@
+depends qt4 &&
+depends cmake &&
+depends python &&
+depends -sub PYTHON boost &&
+depends apiextractor &&
+if [[ $PYSIDE == git ]];then
+ depends git
+fi
diff --git a/devel/generatorrunner/DETAILS b/devel/generatorrunner/DETAILS
new file mode 100755
index 0000000..a871755
--- /dev/null
+++ b/devel/generatorrunner/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=generatorrunner
+ WEB_SITE=http://www.pyside.org/
+if [[ $PYSIDE == git ]];then
+ VERSION=git
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://gitorious.org/pyside/$SPELL.git:$SPELL-git
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+else
+ VERSION=0.3.1
+
SOURCE_HASH=sha512:4883554b95eee2a0300f23017c208b41e8979683313fbf5de52f29940b0457108539d047de763ace874e712362528a2a69fde356fa3d0f3bc443d69e4ba71c3c
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ ENTERED=20091006
+ LICENSE[0]=LGPL
+ KEYWORDS="python libs"
+ SHORT="Python bindings generator"
+cat << EOF
+Python binding generator based on Boost.Python
+EOF
diff --git a/devel/generatorrunner/HISTORY b/devel/generatorrunner/HISTORY
new file mode 100644
index 0000000..087fa90
--- /dev/null
+++ b/devel/generatorrunner/HISTORY
@@ -0,0 +1,3 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.1
+ spell created
diff --git a/devel/generatorrunner/PREPARE b/devel/generatorrunner/PREPARE
new file mode 100755
index 0000000..b5f9bde
--- /dev/null
+++ b/devel/generatorrunner/PREPARE
@@ -0,0 +1 @@
+config_query_list PYSIDE 'which version to build?' stable git
diff --git a/devel/generatorrunner/TRIGGERS b/devel/generatorrunner/TRIGGERS
new file mode 100755
index 0000000..1696e74
--- /dev/null
+++ b/devel/generatorrunner/TRIGGERS
@@ -0,0 +1 @@
+on_cast boost check_self
diff --git a/devel/pyside-tools/DEPENDS b/devel/pyside-tools/DEPENDS
index 95ef36b..b6af8cf 100755
--- a/devel/pyside-tools/DEPENDS
+++ b/devel/pyside-tools/DEPENDS
@@ -2,6 +2,8 @@ depends cmake &&
depends qt4 &&
depends openssl &&
depends python &&
+depends boost &&
+depends pyside &&
if [[ $PYSIDE == git ]];then
depends git
fi
diff --git a/devel/pyside-tools/DETAILS b/devel/pyside-tools/DETAILS
index a2eb033..25b7edd 100755
--- a/devel/pyside-tools/DETAILS
+++ b/devel/pyside-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=pyside-tools
- WEB_SITE=http://www.pyside.org/
+ WEB_SITE=http://www.pyside.org
if [[ $PYSIDE == git ]];then
VERSION=git
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=0.1.1
-
SOURCE_HASH=sha512:85238e0a921e432abfbf3caa2b7fe786ac751504dae39463fa06fcb314dc6810f73cebcbf38c7f2ad18f9df1523492885e4054d1df8edb0047eb1248dd6f692d
+ VERSION=0.1.2
+
SOURCE_HASH=sha512:57033a2593c10177371a9bbf8888bf14a348d927ea944901792e3673efec1f1ac7305a99cb609c613628bd9c0ff80a9875cd1617e1b5bb1a2cf916fd745350e2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
fi
diff --git a/devel/pyside-tools/HISTORY b/devel/pyside-tools/HISTORY
index 93045bc..9ee2c75 100644
--- a/devel/pyside-tools/HISTORY
+++ b/devel/pyside-tools/HISTORY
@@ -1,3 +1,8 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.2
+ * DEPENDS: add boost, pyside
+ * PRE_BUILD, cmake.diff: added, fix bad cmake file
+
2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1
spell created
diff --git a/devel/pyside-tools/PRE_BUILD b/devel/pyside-tools/PRE_BUILD
new file mode 100755
index 0000000..1225451
--- /dev/null
+++ b/devel/pyside-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/cmake.diff
diff --git a/devel/pyside-tools/cmake.diff b/devel/pyside-tools/cmake.diff
new file mode 100644
index 0000000..3575e2f
--- /dev/null
+++ b/devel/pyside-tools/cmake.diff
@@ -0,0 +1,11 @@
+diff -uNr pyside-tools-0.1.2/pylupdate/CMakeLists.txt
pyside-tools-0.1.2.cp/pylupdate/CMakeLists.txt
+--- pyside-tools-0.1.2/pylupdate/CMakeLists.txt 2009-10-05
16:33:52.000000000 +0200
++++ pyside-tools-0.1.2.cp/pylupdate/CMakeLists.txt 2009-10-06
12:10:47.000000000 +0200
+@@ -19,6 +19,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_INCLUDE_DIR}
+ ${QT_QT_INCLUDE_DIR}
++ ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTXML_INCLUDE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR})
+
diff --git a/devel/pyside/DEPENDS b/devel/pyside/DEPENDS
index 8059f24..26b0661 100755
--- a/devel/pyside/DEPENDS
+++ b/devel/pyside/DEPENDS
@@ -3,7 +3,7 @@ depends qt4 &&
depends python &&
depends -sub PYTHON boost &&
#depends $BIND_GEN "-DGENERATOR=$BIND_GEN" &&
-depends boostpythongenerator
"-DGENERATOR=$INSTALL_ROOT/usr/bin/boostpythongenerator" &&
+depends generatorrunner &&
# use this rather than qt's supplied phonon
depends phonon "-DQT_PHONON_INCLUDE_DIR=$INSTALL_ROOT/usr/include/phonon" &&
if [[ $PYSIDE == git ]];then
diff --git a/devel/pyside/DETAILS b/devel/pyside/DETAILS
index 8730c03..337130f 100755
--- a/devel/pyside/DETAILS
+++ b/devel/pyside/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=qt4.5+0.2
-
SOURCE_HASH=sha512:9f210fc30d3165a76879563f7d749793d949abd01cb4da17ee1c2914e8fd05f78ef3ae7eed65f57ce77d960c1723e53a1d8e1c8b12a6403307029e63950a87c8
+ VERSION=qt4.5+0.2.1
+
SOURCE_HASH=sha512:bbd54871f5fc57a01edc027c39950f3b28ed44f471ca61e647a45d8b4232b2120b120389b03bd0731efed279f4942f68482cc7528abb220b2720db4c650a18a0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
fi
diff --git a/devel/pyside/HISTORY b/devel/pyside/HISTORY
index aaf831d..230b747 100644
--- a/devel/pyside/HISTORY
+++ b/devel/pyside/HISTORY
@@ -1,3 +1,7 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version qt4.5+0.2.1
+ * DEPENDS: boostpythongenerator => generatorrunner
+
2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version qt4.5+0.2

diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index fe21028..89c6f76 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,6 +1,6 @@
SPELL=qt-creator
- VERSION=1.2.1
-
SOURCE_HASH=sha512:a2904243b4f75a4b1307ae8321f2799fa425fb95b519ce68b12a2316b3edba62a1c9bc5e5191e3ecb1513de1de3cbbe6131f44929a162e42b8e1d16753fa0faf
+ VERSION=1.2.90
+
SOURCE_HASH=sha512:79c8057fa80fde155e8a9b25e88693ec38ee9b50c64e431b2e0ef9fa62d1cc4b5a03d18ae39dc9ce18968a729f92307b2e50057e8ec6c8facd5f3a6b8c0cce1c
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
WEB_SITE=http://www.qtsoftware.com/downloads
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 2656d0c..37df785 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.90
+
2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46fab9b1290b8e8df755953c8bee6c31d07c5cca), Treeve Jelbert, 10/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page