Skip to Content.
Sympa Menu

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

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 (be6db0e27eb693d3451fe2d39fb537110ff3c46d)
  • Date: Sat, 23 Oct 2010 06:19:56 -0500

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

libs/pyqt4/DETAILS | 4 ++--
libs/pyqt4/HISTORY | 4 ++++
libs/pyqt4/PRE_BUILD | 3 ---
libs/pyqt4/fix-kdebindings-4.5.2.patch | 17 -----------------
libs/sip/DETAILS | 4 ++--
libs/sip/HISTORY | 3 +++
6 files changed, 11 insertions(+), 24 deletions(-)

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

pyqt4: => 4.8

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

sip: => 4.11.2

diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 380853c..2579e30 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
SPELL=pyqt4
SPELLX=PyQt-x11-gpl
- VERSION=4.7.7
-
SOURCE_HASH=sha512:e839ca7999deea2875e132308190fc84db7454431b78395d9b5b5d0feae90ba9f711679d774fe08ab7c909ba11afef901770312a0cd102732b2a6176aae95431
+ VERSION=4.8
+
SOURCE_HASH=sha512:89c108a8d4e3f5899ba3915ad1bfb2ce15cc6b0415b5803a9bd45a71736e26d84200f50f14179e22946a9290e212674ba6d174bdb17b534b76257a89089d19f3
URI=PyQt4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 10e9a67..570fb6f 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,7 @@
+2010-10-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.8
+ * PRE_BUILD, fix-kdebindings-4.5.2.patch: deleted, now included
upstream
+
2010-10-07 Bor Kraljič <pyrobor AT ver.si>
* fix-kdebindings-4.5.2.patch: added to fix kdebindings4 compile error

diff --git a/libs/pyqt4/PRE_BUILD b/libs/pyqt4/PRE_BUILD
deleted file mode 100755
index 89d70e8..0000000
--- a/libs/pyqt4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-kdebindings-4.5.2.patch
diff --git a/libs/pyqt4/fix-kdebindings-4.5.2.patch
b/libs/pyqt4/fix-kdebindings-4.5.2.patch
deleted file mode 100644
index 49a915f..0000000
--- a/libs/pyqt4/fix-kdebindings-4.5.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sip/QtCore/qglobal.sip~ 2010-09-20 15:10:28.000000000 +0200
-+++ sip/QtCore/qglobal.sip 2010-09-30 15:00:13.804577344 +0200
-@@ -312,12 +312,12 @@ public:
- // Qt.Alignment class.
- QFlags operator|(int f);
- %MethodCode
-- sipRes = new QFlags(*a0 | (ENUM(a1)));
-+ sipRes = new QFlags(*a0 | a1);
- %End
-
- QFlags operator^(int f);
- %MethodCode
-- sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+ sipRes = new QFlags(*a0 ^ a1);
- %End
-
- // These are necessary to prevent Python comparing object IDs.
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 9a88f24..121530d 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.11.1
-
SOURCE_HASH=sha512:f90b5e9ef5adfcf611140fb9c170a6dc627d12cf6b9d9e6bb84bf90f6fcbbda4b54bc8d9a76495f41d53cc3c9ed296fd14e8d3c9a286755106c4feaaeb45cba6
+ VERSION=4.11.2
+
SOURCE_HASH=sha512:2a5c5164b259e731f4ed44b42c3c9d1aa36baa78842d35491dabda29f286ebf86b842a4f7256cc71560bab6fc2e934ac1a8a21caa93bb4ff898a9f8190f96653
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index de4014d..aa76036 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.11.2
+
2010-09-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.11.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (be6db0e27eb693d3451fe2d39fb537110ff3c46d), Treeve Jelbert, 10/23/2010

Archive powered by MHonArc 2.6.24.

Top of Page