Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (88959b1dcf7814b510b9ce2c9cfbfdae2364eaf8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (88959b1dcf7814b510b9ce2c9cfbfdae2364eaf8)
  • Date: Mon, 11 Aug 2008 15:09:21 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

http/arora/HISTORY | 4 ++++
http/arora/paths_fix.patch | 16 +++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 88959b1dcf7814b510b9ce2c9cfbfdae2364eaf8
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

arora: Updated paths fix patch.

diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index e83e0fb..8c4f21b 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,7 @@
+2008-08-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * paths_fix.patch, PRE_BUILD: Updated patch... again. Need to
+ figure out another way to handle this.
+
2008-08-03 Juuso Alasuutari <iuso AT sourcemage.org>
* paths_fix.patch, PRE_BUILD: Updated patch.

diff --git a/http/arora/paths_fix.patch b/http/arora/paths_fix.patch
index 94b3d6e..dd08f0c 100644
--- a/http/arora/paths_fix.patch
+++ b/http/arora/paths_fix.patch
@@ -1,23 +1,25 @@
diff --git a/src/webkittrunk.pri b/src/webkittrunk.pri
-index 322c22f..cb2a0ed 100644
+index 46c8e8f..7e3eb70 100644
--- a/src/webkittrunk.pri
+++ b/src/webkittrunk.pri
-@@ -1,16 +1,14 @@
+@@ -1,19 +1,13 @@
#
# export QT_WEBKIT=webkit_trunk
--# export WEBKITBUILD=$HOME/dev/webkit/WebKitBuild/Release
+-# export WEBKITDIR=$HOME/dev/webkit
#
CONFIG += $$(QT_WEBKIT)
webkit_trunk {
-- message(Using WebKit Trunk at $$(WEBKITBUILD))
-- WEBKITBUILD = $$(WEBKITBUILD)/lib
-+ message(Using WebKit Trunk)
+- WEBKITDIR = $$(WEBKITDIR)
+- CONFIG(release):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Release/lib
+- CONFIG(debug):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Debug/lib
+- message(Using WebKit Trunk at $$WEBKITDIR)
+- message(Using WebKit Build at $$WEBKITBUILD)
QT -= webkit
DEFINES += WEBKIT_TRUNK
- QMAKE_LIBDIR_FLAGS = -L$$WEBKITBUILD
+ QMAKE_LIBDIR_FLAGS = -L/usr/lib
LIBS = -lQtWebKit
-- INCLUDEPATH = $$WEBKITBUILD/../../../WebKit/qt/Api $$INCLUDEPATH
+- INCLUDEPATH = $$WEBKITDIR/WebKit/qt/Api $$INCLUDEPATH
- QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
+ INCLUDEPATH = /usr/include $$INCLUDEPATH
+ QMAKE_RPATHDIR = /usr/lib $$QMAKE_RPATHDIR



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (88959b1dcf7814b510b9ce2c9cfbfdae2364eaf8), Juuso Alasuutari, 08/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page