Skip to Content.
Sympa Menu

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

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 (ea8193b003d1fb678954b1570b6c462cf5dd3013)
  • Date: Sat, 2 Aug 2008 21:32:12 -0500

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

http/arora/HISTORY | 3 +++
http/arora/PRE_BUILD | 2 +-
http/arora/paths_fix.patch | 26 +++++++++++---------------
3 files changed, 15 insertions(+), 16 deletions(-)

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

arora: Updated install path fix to fit upstream changes.

diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index 719031d..e83e0fb 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,6 @@
+2008-08-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * paths_fix.patch, PRE_BUILD: Updated patch.
+
2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL, paths_fix.patch:
Created spell.
diff --git a/http/arora/PRE_BUILD b/http/arora/PRE_BUILD
index 301d389..e7a8a47 100755
--- a/http/arora/PRE_BUILD
+++ b/http/arora/PRE_BUILD
@@ -2,5 +2,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p1 < "$SCRIPT_DIRECTORY/paths_fix.patch" &&
-sed -i "s|/usr/lib|\"$INSTALL_ROOT/usr/lib\"|g" \
+sed -i "s|/usr|\"$INSTALL_ROOT/usr\"|g" \
src/webkittrunk.pri
diff --git a/http/arora/paths_fix.patch b/http/arora/paths_fix.patch
index 95546f0..94b3d6e 100644
--- a/http/arora/paths_fix.patch
+++ b/http/arora/paths_fix.patch
@@ -1,29 +1,25 @@
diff --git a/src/webkittrunk.pri b/src/webkittrunk.pri
-index 3a5f417..d7e2256 100644
+index 322c22f..cb2a0ed 100644
--- a/src/webkittrunk.pri
+++ b/src/webkittrunk.pri
-@@ -1,18 +1,17 @@
+@@ -1,16 +1,14 @@
#
# export QT_WEBKIT=webkit_trunk
--# export WEBKITHOME=$HOME/dev/webkit/
-+# and set WEBKITHOME to the correct location
+-# export WEBKITBUILD=$HOME/dev/webkit/WebKitBuild/Release
#
CONFIG += $$(QT_WEBKIT)
webkit_trunk {
- message(Using WebKit Trunk)
-- WEBKITHOME = $$(WEBKITHOME)
+- message(Using WebKit Trunk at $$(WEBKITBUILD))
+- WEBKITBUILD = $$(WEBKITBUILD)/lib
++ message(Using WebKit Trunk)
QT -= webkit
DEFINES += WEBKIT_TRUNK
-- debug: QMAKE_LIBDIR_FLAGS = -L$$WEBKITHOME/WebKitBuild/Debug/lib
-- release: QMAKE_LIBDIR_FLAGS = -L$$WEBKITHOME/WebKitBuild/Release/lib
-+ debug: QMAKE_LIBDIR_FLAGS = -L/usr/lib
-+ release: QMAKE_LIBDIR_FLAGS = -L/usr/lib
+- QMAKE_LIBDIR_FLAGS = -L$$WEBKITBUILD
++ QMAKE_LIBDIR_FLAGS = -L/usr/lib
LIBS = -lQtWebKit
-- INCLUDEPATH = $$WEBKITHOME/WebKit/qt/Api $$INCLUDEPATH
-- release: QMAKE_RPATHDIR = $$WEBKITHOME/WebKitBuild/Release/lib
$$QMAKE_RPATHDIR
-- debug: QMAKE_RPATHDIR = $$WEBKITHOME/WebKitBuild/Debug/lib
$$QMAKE_RPATHDIR
+- INCLUDEPATH = $$WEBKITBUILD/../../../WebKit/qt/Api $$INCLUDEPATH
+- QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
+ INCLUDEPATH = /usr/include $$INCLUDEPATH
-+ release: QMAKE_RPATHDIR = /usr/lib $$QMAKE_RPATHDIR
-+ debug: QMAKE_RPATHDIR = /usr/lib $$QMAKE_RPATHDIR
++ QMAKE_RPATHDIR = /usr/lib $$QMAKE_RPATHDIR
}




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

Archive powered by MHonArc 2.6.24.

Top of Page