Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (efc59d2a47cdee3a9bda7f71f9d6e1b6bfca475f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (efc59d2a47cdee3a9bda7f71f9d6e1b6bfca475f)
  • Date: Wed, 14 May 2008 16:27:11 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

libs/pykde/DETAILS | 16 ++++++----------
libs/pykde/HISTORY | 5 +++++
libs/pykde/PREPARE | 5 -----
libs/pykde/PRE_BUILD | 5 -----
libs/pyqt/CONFLICTS | 2 ++
libs/pyqt/DETAILS | 5 +++--
libs/pyqt/HISTORY | 4 ++++
libs/sip/DETAILS | 17 +++++------------
libs/sip/HISTORY | 4 ++++
libs/sip/PREPARE | 1 -
10 files changed, 29 insertions(+), 35 deletions(-)

New commits:
commit 86fb1a9bd0895966fc86277a088c63d723f38b65
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

sip: updated version to 4.7.5, fixed SOURCE_URL and WEB_SITE,
removed PREPARE as there's no longer snapshot version available

commit f6132f08e85f50c30e5e540612a64ac3f25a07b8
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

pyqt: fixed SOURCE_URL and WEB_SITE, added CONFLICTS so pyqt conflicts
with pyqt4

commit 3189de3dff54f66b69567eaf2bc8541d37457d6a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

pykde: updated version to 3.16.1, fixed SOURCE_URL and WEB_SITE,
removed PREPARE and PRE_BUILD as patch for compiling with sip > 4.6 is no
longer needed

diff --git a/libs/pykde/DETAILS b/libs/pykde/DETAILS
index 4cca268..1385116 100755
--- a/libs/pykde/DETAILS
+++ b/libs/pykde/DETAILS
@@ -1,17 +1,13 @@
SPELL=pykde
SPELLX=PyKDE
- VERSION=3.16.0
- SOURCE=$SPELLX-$VERSION.tar.gz
+ URI=${SPELLX}3
+ VERSION=3.16.1
+ SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/PyKDE3/$SOURCE
-
SOURCE_HASH=sha512:03647a3ca9fc92a5a1b0f1a97463ac7ae0af324c6a8f6458b132f53238cd6f809678eade05677e3e3864c8cc54a756bc6bc4ea254240a281731cdfbabca63e3c
-if [[ $SIP_PATCH = y ]]; then
- SOURCE2=$SPELLX-$VERSION-sip-4.7.patch
- SOURCE2_URL[0]=http://www.riverbankcomputing.com/Downloads/PyKDE3/$SOURCE2
-
SOURCE2_HASH=sha512:3d0ab0bebac286f787b387cbad60ad6741f58dfffa232ce41754be8fbc352ca9d8a09c324d42f0a8af10cfebc0f80322b8f1f6fb9ec2edcfd527cbac648c5c9c
-fi
+
SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/${URI}/$SOURCE
+
SOURCE_HASH=sha512:3f6821b3f3c803579bd976b48a9032e030eb25f8d5786857d6ea1fe6ea48414b00ead9f3cb51a7e19921138ed980d8a0c806543f474ba6ec2b35798c8910dc7e
LICENSE[0]=GPL
- WEB_SITE=http://www.riverbankcomputing.co.uk/$SPELL/
+ WEB_SITE=http://www.riverbankcomputing.co.uk/software/$SPELL/
ENTERED=20070826
KEYWORDS="python kde libs"
SHORT="a set of Python bindings for the KDE desktop environment"
diff --git a/libs/pykde/HISTORY b/libs/pykde/HISTORY
index 058c502..2508b0b 100644
--- a/libs/pykde/HISTORY
+++ b/libs/pykde/HISTORY
@@ -1,3 +1,8 @@
+2008-05-14 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.16.1, fixed SOURCE_URL and WEB_SITE
+ * PREPARE, PRE_BUILD: removed, patch for compiling with sip > 4.6 is
no
+ longer needed
+
2008-01-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: fixed the include and lib path, so this finally works

diff --git a/libs/pykde/PREPARE b/libs/pykde/PREPARE
deleted file mode 100755
index 5840b11..0000000
--- a/libs/pykde/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-local SIP_VERSION=`installed_version sip` &&
-if [[ "$SIP_VERSION" > "4.6" ]]; then
- SIP_PATCH="y" &&
- persistent_add SIP_PATCH;
-fi;
diff --git a/libs/pykde/PRE_BUILD b/libs/pykde/PRE_BUILD
deleted file mode 100755
index 3f454f3..0000000
--- a/libs/pykde/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-if [[ $SIP_PATCH == y ]]; then
- cd $SOURCE_DIRECTORY &&
- patch -p1 < $SOURCE_CACHE/$SOURCE2
-fi
diff --git a/libs/pyqt/CONFLICTS b/libs/pyqt/CONFLICTS
new file mode 100755
index 0000000..c5d269a
--- /dev/null
+++ b/libs/pyqt/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts pyqt4
+
diff --git a/libs/pyqt/DETAILS b/libs/pyqt/DETAILS
index a7e341a..822f0df 100755
--- a/libs/pyqt/DETAILS
+++ b/libs/pyqt/DETAILS
@@ -2,10 +2,11 @@
SPELLX=PyQt-x11-gpl
VERSION=3.17.4

SOURCE_HASH=sha512:d726a4329cad50b2415ec92e63770f08c089d6b0385c091018ddd47ec886fba06e352f61e7424b180b2f8bb8b69b64571df7a41b45bc1afc38fa735c3f3eb60f
+ URI=PyQt3
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/$SOURCE
- WEB_SITE=http://www.riverbankcomputing.co.uk/pyqt/index.php
+
SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
+ WEB_SITE=http://www.riverbankcomputing.co.uk/software/${SPELL}/
ENTERED=20020721
LICENSE[0]=GPL
KEYWORDS="qt python libs"
diff --git a/libs/pyqt/HISTORY b/libs/pyqt/HISTORY
index 52ec0b4..d074a62 100644
--- a/libs/pyqt/HISTORY
+++ b/libs/pyqt/HISTORY
@@ -1,3 +1,7 @@
+2008-05-13 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: fixed SOURCE_URL and WEB_SITE
+ * CONFLICTS: added, conflicts with pyqt4
+
2007-12-30 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 3.17.4

diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 881b092..190a179 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,19 +1,12 @@
SPELL=sip
-if [ ${SIP_SNAP}x = yx ];then
- VERSION=snapshot-20070714
-
SOURCE_HASH=sha512:9553b48af080241573ff20571602368bfdfe7f2d7c6184b8bc3fa6722db6daccf3a87e4b0f073c7d02d87406ae5e03daa2b7d1af9016dfbbf2b25c293b1622ae
- URI=Snapshots/sip4
-else
- VERSION=4.7.4
-
SOURCE_HASH=sha512:896776c6ba0f0470098ba703b9ce028e8ca5043987fc43f87414ed16a5b8374ae3a9cdd3c8f5480b64197c5037ed216af151ebda49eaaf79381acbe531c084e4
- URI=sip4
-fi
+ VERSION=4.7.5
+
SOURCE_HASH=sha512:2b840d68e22e9abfe5933f28f32c649b91296c7d06a48795103d404ac435af286a54974358a191d55a16fb322937da9e1a0b679c12da98a2f272dd1d08ba9826
+ URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/$URI/$SOURCE
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+
SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
LICENSE[0]=GPL
- WEB_SITE=http://www.riverbankcomputing.co.uk/$SPELL/index.php
+ WEB_SITE=http://www.riverbankcomputing.co.uk/software/$SPELL
ENTERED=20020721
KEYWORDS="python libs"
SHORT="SIP is a Python module used to create Python bindings."
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index f60bf64..27780c5 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,7 @@
+2008-05-13 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.7.5, fixed SOURCE_URL and WEB_SITE
+ * PREPARE: removed, there's no longer snapshot version available
+
2008-02-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.7.4

diff --git a/libs/sip/PREPARE b/libs/sip/PREPARE
deleted file mode 100755
index cc77d49..0000000
--- a/libs/sip/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SIP_SNAP "do you want to use a snapshot version?" n



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (efc59d2a47cdee3a9bda7f71f9d6e1b6bfca475f), Julien ROZO, 05/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page