Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (06891dd4d536749bd988a3d0a5e634422460b214)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (06891dd4d536749bd988a3d0a5e634422460b214)
  • Date: Sun, 6 Jan 2008 14:56:20 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

libs/soprano/HISTORY | 3 +++
libs/soprano/PRE_BUILD | 5 ++++-
libs/soprano/jniwrapper-qatomic.patch | 11 +++++++++++
x11-toolkits/qt4/CONFIGURE | 8 +++++++-
x11-toolkits/qt4/HISTORY | 3 +++
5 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 06891dd4d536749bd988a3d0a5e634422460b214
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

qt4: added a complement to the bugfix of 2007-11-16 - option change

commit 25a3e82c85a3e7edb8dcf174529c7d452a2afc68
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

soprano: apply patch for a bad/missing qt include
could be just a qt snapshot bug though, input is welcome

diff --git a/libs/soprano/HISTORY b/libs/soprano/HISTORY
index 4c04fa3..c58f6f7 100644
--- a/libs/soprano/HISTORY
+++ b/libs/soprano/HISTORY
@@ -1,3 +1,6 @@
+2008-01-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, jniwrapper-qatomic.patch: apply patch for a bad/missing
include
+
2007-12-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.99-rc2
* PREPARE: disable devel/stable test
diff --git a/libs/soprano/PRE_BUILD b/libs/soprano/PRE_BUILD
index cfd70df..793f4e5 100755
--- a/libs/soprano/PRE_BUILD
+++ b/libs/soprano/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# disable build of tests
- sed -i "/(test)/D" CMakeLists.txt
+ sed -i "/(test)/D" CMakeLists.txt &&
+
+# at least qt 4.4-tp1 fails without this
+patch -p4 < $SPELL_DIRECTORY/jniwrapper-qatomic.patch
diff --git a/libs/soprano/jniwrapper-qatomic.patch
b/libs/soprano/jniwrapper-qatomic.patch
new file mode 100644
index 0000000..bf7f2f2
--- /dev/null
+++ b/libs/soprano/jniwrapper-qatomic.patch
@@ -0,0 +1,11 @@
+--- /usr/src/soprano-1.99-rc2/backends/sesame2/jniwrapper.cpp.orig
2008-01-06 20:22:25.000000000 +0100
++++ /usr/src/soprano-1.99-rc2/backends/sesame2/jniwrapper.cpp 2008-01-06
21:33:55.000000000 +0100
+@@ -28,7 +28,7 @@
+
+ #include <stdarg.h>
+
+-#include <QtCore/QAtomic>
++#include <QtCore/qatomic.h>
+ #include <QtCore/QGlobalStatic>
+ #include <QtCore/QDebug>
+ #include <QtCore/QThread>
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index f2a0915..aa601da 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -43,4 +43,10 @@ config_query_option QT_EXCEPT 'Disable exception
checking' n \

config_query_option QT_PCH 'Enable precompiled header support?' y \
'-pch' \
- '-no-pch'
+ '-no-pch' &&
+
+# change the old options to the new, can be removed after a year --20080105
+QT_DEMO="${QT_DEMO//demos/}" &&
+QT_EXAMPLE="${QT_EXAMPLE//examples/}" &&
+QT_TOOLS="${QT_TOOLS//tools/}" &&
+QT_TRANS="${QT_TRANS//translations/}"
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 6628a5b..8efc2df 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2008-01-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: added a complement to the bugfix of 2007-11-16 - option
change
+
2007-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update snapshot to 4.4.4
fix typo



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (06891dd4d536749bd988a3d0a5e634422460b214), Jaka Kranjc, 01/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page