[SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (bc541978c724207c63fa4f5a49ac72ba5a1f853c)

Ladislav Hagara ladislav.hagara at unob.cz
Wed Feb 18 19:12:20 EST 2009


> GIT changes to master grimoire by Ethan Grammatikidis <eekee57 at fastmail.fm>:
>
>  http/arora/PRE_BUILD       |    6 ------
>  http/arora/paths_fix.patch |   27 ---------------------------
>  2 files changed, 33 deletions(-)
>
> New commits:
> commit f1903c0d49d0855d73f855d1f6895810e948f1df
> Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
> Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>
>
>     arora: forgot to remove paths_fix.patch
>
> commit c060d2fc00ee8b92382a06bda196fe845499eac8
> Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
> Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>
>
>     arora: PRE_BUILD deleted. patches no longer work or seem needed
>
> diff --git a/http/arora/PRE_BUILD b/http/arora/PRE_BUILD
> deleted file mode 100755
> index e7a8a47..0000000
> --- a/http/arora/PRE_BUILD
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -default_pre_build        &&
> -cd  "$SOURCE_DIRECTORY"  &&
> -
> -patch -p1 < "$SCRIPT_DIRECTORY/paths_fix.patch"   &&
> -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
> deleted file mode 100644
> index dd08f0c..0000000
> --- a/http/arora/paths_fix.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -diff --git a/src/webkittrunk.pri b/src/webkittrunk.pri
> -index 46c8e8f..7e3eb70 100644
> ---- a/src/webkittrunk.pri
> -+++ b/src/webkittrunk.pri
> -@@ -1,19 +1,13 @@
> - #
> - # export QT_WEBKIT=webkit_trunk
> --# export WEBKITDIR=$HOME/dev/webkit
> - #
> - CONFIG += $$(QT_WEBKIT)
> - 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 = $$WEBKITDIR/WebKit/qt/Api $$INCLUDEPATH
> --    QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
> -+    INCLUDEPATH = /usr/include $$INCLUDEPATH
> -+    QMAKE_RPATHDIR = /usr/lib $$QMAKE_RPATHDIR
> - }


http/arora/HISTORY entry is missing.
-- 
Ladislav Hagara



More information about the SM-Commit mailing list