From 8200eed4d37092f4215eefa67fb24744cbb3c537 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Sat, 28 Sep 2013 01:20:35 +0200 Subject: [PATCH] Update to 2.2.0 - removed obsolete patches (bison3 and gtk-webkit-pl.po) --- bison3.patch | 10 ---------- gtk-webkit-pl.po.patch | 20 -------------------- gtk-webkit3.spec | 19 +++++++------------ 3 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 bison3.patch delete mode 100644 gtk-webkit-pl.po.patch diff --git a/bison3.patch b/bison3.patch deleted file mode 100644 index 25bda4a..0000000 --- a/bison3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- webkitgtk-2.0.4/Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2013-07-19 09:03:53.000000000 +0200 -+++ webkitgtk-2.0.4/Source/ThirdParty/ANGLE/src/compiler/glslang.y 2013-08-18 22:23:32.345011972 +0200 -@@ -47,6 +47,7 @@ - %expect 1 /* One shift reduce conflict because of if | else */ - %pure-parser - %parse-param {TParseContext* context} -+%lex-param {YYLEX_PARAM} - - %union { - struct { diff --git a/gtk-webkit-pl.po.patch b/gtk-webkit-pl.po.patch deleted file mode 100644 index 2a0ce58..0000000 --- a/gtk-webkit-pl.po.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- webkitgtk-2.0.1/Source/WebCore/platform/gtk/po/pl.po.old 2013-04-23 20:30:46.073880780 +0200 -+++ webkitgtk-2.0.1/Source/WebCore/platform/gtk/po/pl.po 2013-04-23 20:31:24.117802467 +0200 -@@ -1011,7 +1011,7 @@ msgstr "Współczynnik powiększania pik - - #: ../../../../WebKit/gtk/webkit/webkitviewportattributes.cpp:386 - msgid "user-scalable" --msgstr "skalowalne-przez-użytkownika" -+msgstr "user-scalable" - - #: ../../../../WebKit/gtk/webkit/webkitviewportattributes.cpp:387 - msgid "User Scalable" -@@ -1023,7 +1023,7 @@ msgstr "Określa, czy użytkownik może - - #: ../../../../WebKit/gtk/webkit/webkitviewportattributes.cpp:405 - msgid "valid" --msgstr "prawidłowe" -+msgstr "valid" - - #: ../../../../WebKit/gtk/webkit/webkitviewportattributes.cpp:406 - msgid "Valid" diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec index 80fc282..01b6ca5 100644 --- a/gtk-webkit3.spec +++ b/gtk-webkit3.spec @@ -7,15 +7,13 @@ Summary: Port of WebKit embeddable web component to GTK+ 3 Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3 Name: gtk-webkit3 -Version: 2.0.4 +Version: 2.2.0 Release: 1 License: BSD-like Group: X11/Libraries Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -# Source0-md5: 413be319ba171feed9348d1bede6b0a7 +# Source0-md5: 9c337812667c4885ebe29a54084dcd4c Patch0: sync-builtins.patch -Patch1: gtk-webkit-pl.po.patch -Patch2: bison3.patch URL: http://webkitgtk.org/ BuildRequires: EGL-devel BuildRequires: OpenGL-GLX-devel @@ -39,7 +37,7 @@ BuildRequires: gstreamer-devel >= 1.0.3 BuildRequires: gstreamer-plugins-base-devel >= 1.0.3 # GTK+ 2.x for webkit2 plugin process; GTK+ 3 for base GUI BuildRequires: gtk+2-devel >= 2:2.24.10 -BuildRequires: gtk+3-devel >= 3.6.0 +BuildRequires: gtk+3-devel >= 3.10.0 BuildRequires: gtk-doc >= 1.10 BuildRequires: harfbuzz-devel >= 0.9.7 BuildRequires: harfbuzz-icu-devel >= 0.9.7 @@ -78,7 +76,7 @@ Requires: glib2 >= 1:2.36.0 Requires: gstreamer >= 1.0.3 Requires: gstreamer-plugins-base >= 1.0.3 Requires: gtk+2 >= 2:2.24.10 -Requires: gtk+3 >= 3.6.0 +Requires: gtk+3 >= 3.10.0 Requires: harfbuzz >= 0.9.7 Requires: libsoup >= 2.42.0 Requires: libxml2 >= 1:2.6.30 @@ -99,7 +97,7 @@ Summary(pl.UTF-8): Pliki programistyczne komponentu WebKit dla GTK+ 3 Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= 1:2.36.0 -Requires: gtk+3-devel >= 3.6.0 +Requires: gtk+3-devel >= 3.10.0 Requires: libsoup-devel >= 2.42.0 Requires: libstdc++-devel @@ -124,8 +122,6 @@ Dokumentacja API WebKita. %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__libtoolize} @@ -176,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libjavascriptcoregtk-3.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-3.0.so.0 %if %{with introspection} -%{_libdir}/girepository-1.0/JSCore-3.0.typelib +%{_libdir}/girepository-1.0/JavaScriptCore-3.0.typelib %{_libdir}/girepository-1.0/WebKit-3.0.typelib %{_libdir}/girepository-1.0/WebKit2-3.0.typelib %endif @@ -186,7 +182,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/webkitgtk-3.0 %{_datadir}/webkitgtk-3.0/images %{_datadir}/webkitgtk-3.0/resources -%{_datadir}/webkitgtk-3.0/webinspector %files devel %defattr(644,root,root,755) @@ -194,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libwebkit2gtk-3.0.so %attr(755,root,root) %{_libdir}/libjavascriptcoregtk-3.0.so %if %{with introspection} -%{_datadir}/gir-1.0/JSCore-3.0.gir +%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir %{_datadir}/gir-1.0/WebKit-3.0.gir %{_datadir}/gir-1.0/WebKit2-3.0.gir %endif -- 2.44.0