User:Robin Cornelius/standalone qtwebkit - Revision history

PJ Abbot: /* Part 1 qtwebkit in shared form */

2009-12-30T04:54:36Z

Part 1 qtwebkit in shared form

← Older revision		Revision as of 21:54, 29 December 2009
Line 96:		Line 96:
	ln -s /usr/local/lib/llqtwebkit.so /usr/local/lib/llqtwebkit.so.1		ln -s /usr/local/lib/llqtwebkit.so /usr/local/lib/llqtwebkit.so.1

	and ~~then when running~~ snowglobe:		...and add the following line to snowglobe:

	LD_LIBRARY_PATH=/usr/local/lib ~~./snowglobe~~		export LD_LIBRARY_PATH=/usr/local/lib

	== Part 2 Patching the viewer to use a shared libqtwebkit ==		== Part 2 Patching the viewer to use a shared libqtwebkit ==

PJ Abbot: /* Part 1 qtwebkit in shared form */

2009-12-30T04:51:46Z

Part 1 qtwebkit in shared form

← Older revision		Revision as of 21:51, 29 December 2009
Line 91:		Line 91:

	Note that installation is necessary; using an CXXFLAGS that includes the header directly from the source tree will fail because the project contains a header (llstyle.h) with the same name as an already existing header file of the viewer, and compilation of the viewer will break.		Note that installation is necessary; using an CXXFLAGS that includes the header directly from the source tree will fail because the project contains a header (llstyle.h) with the same name as an already existing header file of the viewer, and compilation of the viewer will break.

			I had to also perform these additional steps to get it work with the latest snowglobe svn:

			ln -s /usr/local/lib/llqtwebkit.so /usr/local/lib/llqtwebkit.so.1

			and then when running snowglobe:

			LD_LIBRARY_PATH=/usr/local/lib ./snowglobe

	== Part 2 Patching the viewer to use a shared libqtwebkit ==		== Part 2 Patching the viewer to use a shared libqtwebkit ==

Merov Linden: typos

2009-12-10T17:46:19Z

typos

← Older revision		Revision as of 10:46, 10 December 2009
Line 3:		Line 3:
	== Part 1 qtwebkit in shared form ==		== Part 1 qtwebkit in shared form ==

	First of all you need to grab the latest code for qt/webkit this is in a ~~mecurial~~ (hg) repository and if you install the ~~mecurial~~ tools for your distribution you can then fetch the code with		First of all you need to grab the latest code for qt/webkit this is in a mercurial (hg) repository and if you install the mercurial tools for your distribution you can then fetch the code with
	hg clone http://hg.secondlife.com/llqtwebkit/		hg clone http://hg.secondlife.com/llqtwebkit/

Line 74:		Line 74:
	}		}

	This disables some features that are not ~~avaiable~~ in current qt4/ and in the case of the prepend patch will never be ~~avaiable~~ and also changes the build to use a shared qt4		This disables some features that are not available in current qt4/ and in the case of the prepend patch will never be available and also changes the build to use a shared qt4

	To apply the above as a patch copy it to a local file, eg shared_qt.patch then from the llqtwebkit folder run :-		To apply the above as a patch copy it to a local file, eg shared_qt.patch then from the llqtwebkit folder run :-
Line 80:		Line 80:
	patch -p1 < shared_qt.patch		patch -p1 < shared_qt.patch

	After ~~sucessfully~~ patching the code you can build with		After successfully patching the code you can build with

	qmake-qt4		qmake-qt4

Aleric Inglewood: Update shared_qt.patch for revision 264 (needed also LINKTARGETPATCH to be commented)

2009-12-10T16:49:47Z

Update shared_qt.patch for revision 264 (needed also LINKTARGETPATCH to be commented)

← Older revision		Revision as of 09:49, 10 December 2009
Line 5:		Line 5:
	First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with		First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with
	hg clone http://hg.secondlife.com/llqtwebkit/		hg clone http://hg.secondlife.com/llqtwebkit/
	~~{{KBnote\|please see {{jira\|MOZ-39}}.~~
	~~To get an unaffected revision,~~
	~~cd llqtwebkit~~
	~~hg checkout 240~~
	}}

	To get this to build some minor changes are required :-		To get this to build some minor changes are required :-

	diff -r ~~d3b5f3a6f6c1~~ llembeddedbrowserwindow.cpp		diff -r 808d018bf497 llembeddedbrowserwindow.cpp
	--- a/llembeddedbrowserwindow.cpp ~~Mon Sep 21 14~~:26:31 2009 -~~0700~~		--- a/llembeddedbrowserwindow.cpp Tue Dec 01 16:01:02 2009 -0800
	+++ b/llembeddedbrowserwindow.cpp ~~Tue Nov 03 20~~:50:14 2009 +~~0000~~		+++ b/llembeddedbrowserwindow.cpp Thu Dec 10 17:43:04 2009 +0100
	@@ -68,7 +68,7 @@		@@ -68,7 +68,7 @@
	#include <qdebug.h>		#include <qdebug.h>
Line 25:		Line 20:
	LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow()		LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow()
	{		{
	diff -r ~~d3b5f3a6f6c1~~ llnetworkaccessmanager.cpp		diff -r 808d018bf497 llnetworkaccessmanager.cpp
	--- a/llnetworkaccessmanager.cpp ~~Mon Sep 21 14~~:26:31 2009 -~~0700~~		--- a/llnetworkaccessmanager.cpp Tue Dec 01 16:01:02 2009 -0800
	+++ b/llnetworkaccessmanager.cpp ~~Tue Nov 03 20~~:50:14 2009 +~~0000~~		+++ b/llnetworkaccessmanager.cpp Thu Dec 10 17:43:04 2009 +0100
	@@ -75,7 +75,7 @@		@@ -75,7 +75,7 @@

Line 46:		Line 41:
	}		}

	diff -r ~~d3b5f3a6f6c1~~ llqtwebkit.pro		diff -r 808d018bf497 llqtwebkit.pro
	--- a/llqtwebkit.pro ~~Mon Sep 21 14~~:26:31 2009 -~~0700~~		--- a/llqtwebkit.pro Tue Dec 01 16:01:02 2009 -0800
	+++ b/llqtwebkit.pro ~~Tue Nov 03 20~~:50:14 2009 +~~0000~~		+++ b/llqtwebkit.pro Thu Dec 10 17:43:04 2009 +0100
	@@ -1,4 +1,4 @@		@@ -1,4 +1,4 @@
	-CONFIG += static		-CONFIG += static
Line 55:		Line 50:
	TARGET =		TARGET =
	DEPENDPATH += .		DEPENDPATH += .
	diff -r ~~d3b5f3a6f6c1~~ static.pri		diff -r 808d018bf497 llwebpage.cpp
	--- a/static.pri ~~Mon Sep 21 14~~:26:31 2009 -~~0700~~		--- a/llwebpage.cpp Tue Dec 01 16:01:02 2009 -0800
	+++ b/static.pri ~~Tue Nov 03 20~~:50:14 2009 +~~0000~~		+++ b/llwebpage.cpp Thu Dec 10 17:43:04 2009 +0100
			@@ -42,7 +42,7 @@
			#include "llembeddedbrowserwindow.h"
			#include "llembeddedbrowserwindow_p.h"

			-#define LINKTARGETPATCH
			+//#define LINKTARGETPATCH

			LLWebPage::LLWebPage(QObject *parent)
			: QWebPage(parent)
			diff -r 808d018bf497 static.pri
			--- a/static.pri Tue Dec 01 16:01:02 2009 -0800
			+++ b/static.pri Thu Dec 10 17:43:04 2009 +0100
	@@ -1,4 +1,5 @@		@@ -1,4 +1,5 @@
	unix {		unix {

Boroondas Gupte: /* Part 1 qtwebkit in shared form */ "workaround" for MOZ-39 (use unaffected revision)

2009-12-02T22:43:34Z

Part 1 qtwebkit in shared form: "workaround" for MOZ-39 (use unaffected revision)

← Older revision		Revision as of 15:43, 2 December 2009
Line 5:		Line 5:
	First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with		First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with
	hg clone http://hg.secondlife.com/llqtwebkit/		hg clone http://hg.secondlife.com/llqtwebkit/
			{{KBnote\|please see {{jira\|MOZ-39}}.
	* Note please see {{jira\|MOZ-39}}		To get an unaffected revision,
			cd llqtwebkit
			hg checkout 240
			}}

	To get this to build some minor changes are required :-		To get this to build some minor changes are required :-

Robin Cornelius: /* Part 1 qtwebkit in shared form */

2009-12-02T22:01:25Z

Part 1 qtwebkit in shared form

← Older revision		Revision as of 15:01, 2 December 2009
Line 5:		Line 5:
	First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with		First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with
	hg clone http://hg.secondlife.com/llqtwebkit/		hg clone http://hg.secondlife.com/llqtwebkit/

			* Note please see {{jira\|MOZ-39}}


	To get this to build some minor changes are required :-		To get this to build some minor changes are required :-

Aleric Inglewood: Add wisdom regarding the llstyle.h header.

2009-11-07T12:32:18Z

Add wisdom regarding the llstyle.h header.

← Older revision		Revision as of 05:32, 7 November 2009
Line 77:		Line 77:
	cp *.so /usr/local/lib/		cp *.so /usr/local/lib/
	cp llqtwebkit.h /usr/local/include/		cp llqtwebkit.h /usr/local/include/

			Note that installation is necessary; using an CXXFLAGS that includes the header directly from the source tree will fail because the project contains a header (llstyle.h) with the same name as an already existing header file of the viewer, and compilation of the viewer will break.

	== Part 2 Patching the viewer to use a shared libqtwebkit ==		== Part 2 Patching the viewer to use a shared libqtwebkit ==

Aleric Inglewood at 12:29, 7 November 2009

2009-11-07T12:29:01Z

← Older revision		Revision as of 05:29, 7 November 2009
Line 83:		Line 83:
	It is already included in snowglobe 1.2 (revision 2976 and higher).		It is already included in snowglobe 1.2 (revision 2976 and higher).

	~~<nowiki>~~		Index: indra/cmake/WebKitLibPlugin.cmake
	Index: indra/cmake/WebKitLibPlugin.cmake		===================================================================
	===================================================================		--- indra/cmake/WebKitLibPlugin.cmake (revision 2973)
	--- indra/cmake/WebKitLibPlugin.cmake (revision 2973)		+++ indra/cmake/WebKitLibPlugin.cmake (working copy)
	+++ indra/cmake/WebKitLibPlugin.cmake (working copy)		@@ -34,30 +34,34 @@
	@@ -34,30 +34,34 @@		debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
	debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib		)
	)		elseif (LINUX)
	elseif (LINUX)		- set(WEBKIT_PLUGIN_LIBRARIES
	- set(WEBKIT_PLUGIN_LIBRARIES		- llqtwebkit
	- llqtwebkit		+ if (STANDALONE)
	+ if (STANDALONE)		+ set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
	+ set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)		+ else (STANDALONE)
	+ else (STANDALONE)		+ set(WEBKIT_PLUGIN_LIBRARIES
	+ set(WEBKIT_PLUGIN_LIBRARIES		+ llqtwebkit
	+ llqtwebkit
			- qgif
	- qgif		-# qico
	-# qico		- qjpeg
	- qjpeg		-# qpng
	-# qpng		-# qtiff
	-# qtiff		-# qsvg
	-# qsvg		+ qgif
	+ qgif		+# qico
	+# qico		+ qjpeg
	+ qjpeg		+# qpng
	+# qpng		+# qtiff
	+# qtiff		+# qsvg
	+# qsvg
			-# QtSvg
	-# QtSvg		- QtWebKit
	- QtWebKit		- QtOpenGL
	- QtOpenGL		- QtNetwork
	- QtNetwork		- QtGui
	- QtGui		- QtCore
	- QtCore		+# QtSvg
	+# QtSvg		+ QtWebKit
	+ QtWebKit		+ QtOpenGL
	+ QtOpenGL		+ QtNetwork
	+ QtNetwork		+ QtGui
	+ QtGui		+ QtCore
	+ QtCore
			- fontconfig
	- fontconfig		- X11
	- X11		- Xrender
	- Xrender		- GL
	- GL		+ fontconfig
	+ fontconfig		+ X11
	+ X11		+ Xrender
	+ Xrender		+ GL
	+ GL
			-# sqlite3
	-# sqlite3		-# Xi
	-# Xi		-# SM
	-# SM		- )
	- )		+# sqlite3
	+# sqlite3		+# Xi
	+# Xi		+# SM
	+# SM		+ )
	+ )		+ endif (STANDALONE)
	+ endif (STANDALONE)		endif (WINDOWS)
	endif (WINDOWS)
	~~</nowiki>~~

Aleric Inglewood: /* Part 2 Patching the viewer to use a shared libqtwebkit */

2009-11-07T12:25:15Z

Part 2 Patching the viewer to use a shared libqtwebkit

← Older revision		Revision as of 05:25, 7 November 2009
Line 83:		Line 83:
	It is already included in snowglobe 1.2 (revision 2976 and higher).		It is already included in snowglobe 1.2 (revision 2976 and higher).

			<nowiki>
	Index: indra/cmake/WebKitLibPlugin.cmake		Index: indra/cmake/WebKitLibPlugin.cmake
	===================================================================		===================================================================
Line 144:		Line 145:
	+ endif (STANDALONE)		+ endif (STANDALONE)
	endif (WINDOWS)		endif (WINDOWS)
			</nowiki>

Aleric Inglewood: Refresh patch and mention it was already applied

2009-11-07T12:20:21Z

Refresh patch and mention it was already applied

← Older revision		Revision as of 05:20, 7 November 2009
Line 80:		Line 80:
	== Part 2 Patching the viewer to use a shared libqtwebkit ==		== Part 2 Patching the viewer to use a shared libqtwebkit ==

	~~Apply the~~ following patch to ~~the~~ viewer code to only link against libqtwebkit		The following patch needs to be applied to viewer code older than SVN revision 2976, to only link against libqtwebkit.
			It is already included in snowglobe 1.2 (revision 2976 and higher).

	Index: indra/cmake/WebKitLibPlugin.cmake		Index: indra/cmake/WebKitLibPlugin.cmake
	===================================================================		===================================================================
	--- indra/cmake/WebKitLibPlugin.cmake (revision ~~2882~~)		--- indra/cmake/WebKitLibPlugin.cmake (revision 2973)
	+++ indra/cmake/WebKitLibPlugin.cmake (working copy)		+++ indra/cmake/WebKitLibPlugin.cmake (working copy)
	@@ -36,28 +36,5 @@		@@ -34,30 +34,34 @@
	elseif (LINUX)		debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
	set(WEBKIT_PLUGIN_LIBRARIES		)
	llqtwebkit		elseif (LINUX)
	-		- set(WEBKIT_PLUGIN_LIBRARIES
	- qgif		- llqtwebkit
	-# qico		+ if (STANDALONE)
	- qjpeg		+ set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
	-# qpng		+ else (STANDALONE)
	-# qtiff		+ set(WEBKIT_PLUGIN_LIBRARIES
	-# qsvg		+ llqtwebkit
	-
	-# QtSvg		- qgif
	- QtWebKit		-# qico
	- QtOpenGL		- qjpeg
	- QtNetwork		-# qpng
	- QtGui		-# qtiff
	- QtCore		-# qsvg
	-		+ qgif
	- fontconfig		+# qico
	- X11		+ qjpeg
	- Xrender		+# qpng
	- GL		+# qtiff
	-		+# qsvg
	-# sqlite3
	-# Xi		-# QtSvg
	-# SM		- QtWebKit
	)		- QtOpenGL
	endif (WINDOWS)		- QtNetwork
			- QtGui
			- QtCore
			+# QtSvg
			+ QtWebKit
			+ QtOpenGL
			+ QtNetwork
			+ QtGui
			+ QtCore

			- fontconfig
			- X11
			- Xrender
			- GL
			+ fontconfig
			+ X11
			+ Xrender
			+ GL

			-# sqlite3
			-# Xi
			-# SM
			- )
			+# sqlite3
			+# Xi
			+# SM
			+ )
			+ endif (STANDALONE)
			endif (WINDOWS)