[packages/ewebkit] - updated to svn r164189 (available on enlightenment site) - updated include patch, removed obsolete
qboosh
qboosh at pld-linux.org
Sat Mar 22 19:01:56 CET 2014
commit 436c5983643eedd0f7f4062b3de52cfea72c9003
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 22 19:05:19 2014 +0100
- updated to svn r164189 (available on enlightenment site)
- updated include patch, removed obsolete bounds patch, added werror patch
ewebkit-bounds.patch | 15 ----------
ewebkit-include.patch | 26 +++++++++++-----
ewebkit-werror.patch | 13 ++++++++
ewebkit.spec | 82 +++++++++++++++++++++++++++++----------------------
4 files changed, 77 insertions(+), 59 deletions(-)
---
diff --git a/ewebkit.spec b/ewebkit.spec
index 19b36fa..0412c14 100644
--- a/ewebkit.spec
+++ b/ewebkit.spec
@@ -1,21 +1,26 @@
+#
+# Conditional build:
+%bcond_without elementary # MiniBrowser build (needs Elementary)
+#
+%define efl_ver 1.8
Summary: WebKit-EFL - Web content engine for EFL applications
Summary(pl.UTF-8): WebKit-EFL - silnik WWW dla aplikacji EFL
Name: ewebkit
+# cmake-generated .pc files say 0.1.0, autotools Version.m4 says 2.3.4 ???
Version: 0.1.0
-%define subver r160591
+%define svnrev 164189
+%define subver r%{svnrev}
Release: 0.%{subver}.1
License: BSD
Group: Libraries
-# older snapshots:
-#Source0: http://packages.profusion.mobi/webkit-efl/webkit-efl-svn-%{subver}.tar.bz2
-# official releases, check for more recent sources:
-#Source0: http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-159807.tar.xz
# svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit
# tar cJf webkit-r160591.tar.xz --exclude=.svn --exclude=LayoutTests --exclude=ManualTests --exclude=PerformanceTests --exclude=WebKitLibraries --exclude=Websites WebKit
-Source0: webkit-%{subver}.tar.xz
-# Source0-md5: b450c3c4030062571c3c05eea3cf4f30
+#Source0: webkit-%{subver}.tar.xz
+# official snapshots
+Source0: http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-%{svnrev}.tar.xz
+# Source0-md5: 731513fc042ec8e03840bc1ab6a66771
Patch0: %{name}-lib.patch
-Patch1: %{name}-bounds.patch
+Patch1: %{name}-werror.patch
Patch2: %{name}-include.patch
Patch3: %{name}-build.patch
URL: http://trac.enlightenment.org/e/wiki/EWebKit
@@ -26,21 +31,22 @@ BuildRequires: cairo-devel >= 1.10.2
BuildRequires: cmake >= 2.8.3
BuildRequires: dbus-devel
BuildRequires: e_dbus-devel >= 1.7
-BuildRequires: ecore-devel >= 1.8
-BuildRequires: ecore-evas-devel >= 1.8
-BuildRequires: ecore-file-devel >= 1.8
-BuildRequires: ecore-imf-devel >= 1.8
-BuildRequires: ecore-imf-evas-devel >= 1.8
-BuildRequires: ecore-input-devel >= 1.8
-BuildRequires: ecore-x-devel >= 1.8
-BuildRequires: edje >= 1.8
-BuildRequires: edje-devel >= 1.8
-BuildRequires: eet-devel >= 1.8
-BuildRequires: eeze-devel >= 1.8
-BuildRequires: efreet-devel >= 1.8
-BuildRequires: eina-devel >= 1.8
-BuildRequires: eo-devel >= 1.8
-BuildRequires: evas-devel >= 1.8
+BuildRequires: ecore-devel >= %{efl_ver}
+BuildRequires: ecore-evas-devel >= %{efl_ver}
+BuildRequires: ecore-file-devel >= %{efl_ver}
+BuildRequires: ecore-imf-devel >= %{efl_ver}
+BuildRequires: ecore-imf-evas-devel >= %{efl_ver}
+BuildRequires: ecore-input-devel >= %{efl_ver}
+BuildRequires: ecore-x-devel >= %{efl_ver}
+BuildRequires: edje >= %{efl_ver}
+BuildRequires: edje-devel >= %{efl_ver}
+BuildRequires: eet-devel >= %{efl_ver}
+BuildRequires: eeze-devel >= %{efl_ver}
+BuildRequires: efreet-devel >= %{efl_ver}
+BuildRequires: eina-devel >= %{efl_ver}
+%{?with_elementary:BuildRequires: elementary-devel >= %{efl_ver}}
+BuildRequires: eo-devel >= %{efl_ver}
+BuildRequires: evas-devel >= %{efl_ver}
BuildRequires: flex >= 2.5.34
BuildRequires: fontconfig-devel >= 2.8.0
BuildRequires: freetype-devel >= 1:2.4.2
@@ -65,21 +71,22 @@ BuildRequires: ruby >= 1.8.7
BuildRequires: sqlite3-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: zlib-devel
+%{!?with_elementary:BuildConflicts: elementary-devel}
Requires: atk >= 1:2.10.0
Requires: cairo >= 1.10.2
Requires: e_dbus >= 1.7
-Requires: ecore >= 1.8
-Requires: ecore-evas >= 1.8
-Requires: ecore-file >= 1.8
-Requires: ecore-imf >= 1.8
-Requires: ecore-imf-evas >= 1.8
-Requires: ecore-input >= 1.8
-Requires: ecore-x >= 1.8
-Requires: edje-libs >= 1.8
-Requires: efreet >= 1.8
-Requires: eeze >= 1.8
-Requires: eina >= 1.8
-Requires: evas >= 1.8
+Requires: ecore >= %{efl_ver}
+Requires: ecore-evas >= %{efl_ver}
+Requires: ecore-file >= %{efl_ver}
+Requires: ecore-imf >= %{efl_ver}
+Requires: ecore-imf-evas >= %{efl_ver}
+Requires: ecore-input >= %{efl_ver}
+Requires: ecore-x >= %{efl_ver}
+Requires: edje-libs >= %{efl_ver}
+Requires: efreet >= %{efl_ver}
+Requires: eeze >= %{efl_ver}
+Requires: eina >= %{efl_ver}
+Requires: evas >= %{efl_ver}
Requires: fontconfig-libs >= 2.8.0
Requires: freetype >= 2.1.0
Requires: glib2 >= 1:2.36.0
@@ -91,6 +98,9 @@ Requires: libxml2 >= 1:2.8.0
Requires: libxslt >= 1.1.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# __once_call, __once_called non-function symbols from libstdc++
+%define skip_post_check_so libewebkit.*
+
%description
WebKit-EFL - Web content engine for EFL applications.
@@ -117,7 +127,7 @@ Header files for WebKit-EFL library.
Pliki nagłówkowe biblioteki WebKit-EFL.
%prep
-%setup -q -n WebKit
+%setup -q -n efl-webkit
%patch0 -p1
%patch1 -p1
%patch2 -p1
diff --git a/ewebkit-bounds.patch b/ewebkit-bounds.patch
deleted file mode 100644
index 88be81f..0000000
--- a/ewebkit-bounds.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix "array subscript is above array bounds [-Werror=array-bounds]"
---- WebKit/Source/WTF/wtf/dtoa/double-conversion.cc.orig 2013-12-08 18:29:09.000000000 +0100
-+++ WebKit/Source/WTF/wtf/dtoa/double-conversion.cc 2013-12-11 16:47:53.187599375 +0100
-@@ -444,9 +444,9 @@
- if (current == end) return 0.0;
-
- // The longest form of simplified number is: "-<significant digits>.1eXXX\0".
-- const int kBufferSize = kMaxSignificantDigits + 10;
-+ const size_t kBufferSize = kMaxSignificantDigits + 10;
- char buffer[kBufferSize]; // NOLINT: size is known at compile time.
-- int buffer_pos = 0;
-+ size_t buffer_pos = 0;
-
- // Exponent will be adjusted if insignificant digits of the integer part
- // or insignificant leading zeros of the fractional part are dropped.
diff --git a/ewebkit-include.patch b/ewebkit-include.patch
index fcdc25e..a096bc8 100644
--- a/ewebkit-include.patch
+++ b/ewebkit-include.patch
@@ -1,10 +1,20 @@
---- WebKit/Source/JavaScriptCore/runtime/ButterflyInlines.h.orig 2013-12-08 18:21:26.000000000 +0100
-+++ WebKit/Source/JavaScriptCore/runtime/ButterflyInlines.h 2013-12-13 15:27:08.577217622 +0100
+--- efl-webkit/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp.orig 2014-02-02 05:21:06.000000000 +0100
++++ efl-webkit/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp 2014-03-20 19:38:55.531344185 +0100
@@ -30,6 +30,7 @@
- #include "Butterfly.h"
- #include "CopiedSpaceInlines.h"
- #include "CopyVisitor.h"
-+#include "IndexingHeaderInlines.h"
- #include "VM.h"
- #include "Structure.h"
+
+ #include "CodeBlock.h"
+ #include "JITCode.h"
++#include "JSCellInlines.h"
+ #include "JSObject.h"
+ #include "LLIntThunks.h"
+ #include "LowLevelInterpreter.h"
+--- efl-webkit/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp.orig 2013-09-04 10:53:58.000000000 +0200
++++ efl-webkit/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp 2014-03-20 19:38:38.831344886 +0100
+@@ -25,6 +25,7 @@
+
+ #include "config.h"
+ #include "FunctionExecutableDump.h"
++#include "JSCellInlines.h"
+
+ #include "CodeBlock.h"
diff --git a/ewebkit-werror.patch b/ewebkit-werror.patch
new file mode 100644
index 0000000..8d5a27e
--- /dev/null
+++ b/ewebkit-werror.patch
@@ -0,0 +1,13 @@
+--- efl-webkit/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp.orig 2014-02-14 12:38:19.000000000 +0100
++++ efl-webkit/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-03-19 20:23:11.401525259 +0100
+@@ -307,8 +307,8 @@
+ dataLogF("UnlinkedCodeBlock %p expressionRangeInfo[%zu] {\n", this, size);
+ for (size_t i = 0; i < size; i++) {
+ ExpressionRangeInfo& info = expressionInfo[i];
+- unsigned line;
+- unsigned column;
++ unsigned line = 0;
++ unsigned column = 0;
+ getLineAndColumn(info, line, column);
+ dumpLineColumnEntry(i, instructions(), info.instructionOffset, line, column);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ewebkit.git/commitdiff/436c5983643eedd0f7f4062b3de52cfea72c9003
More information about the pld-cvs-commit
mailing list