[packages/gtk-webkit] - updated to 2.2.0 - removed obsolete pl.po,bison3 patches
qboosh
qboosh at pld-linux.org
Sun Sep 29 08:30:19 CEST 2013
commit 737f2f59d30f0a0d8232fa8e77e3f0c1dca4c746
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 29 08:30:58 2013 +0200
- updated to 2.2.0
- removed obsolete pl.po,bison3 patches
bison3.patch | 10 ----------
gtk-webkit-pl.po.patch | 20 --------------------
gtk-webkit.spec | 15 +++++----------
3 files changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index 7e50cd4..0ab1d3f 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -5,15 +5,13 @@
Summary: Port of WebKit embeddable web component to GTK+
Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+
Name: gtk-webkit
-Version: 2.0.4
-Release: 2
+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: %{name}-sync-builtins.patch
-Patch1: %{name}-pl.po.patch
-Patch2: bison3.patch
URL: http://webkitgtk.org/
BuildRequires: EGL-devel
BuildRequires: OpenGL-GLX-devel
@@ -107,8 +105,6 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
%prep
%setup -q -n webkitgtk-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -158,20 +154,19 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-1.0.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-1.0.so.0
%if %{with introspection}
-%{_libdir}/girepository-1.0/JSCore-1.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-1.0.typelib
%{_libdir}/girepository-1.0/WebKit-1.0.typelib
%endif
%dir %{_datadir}/webkitgtk-1.0
%{_datadir}/webkitgtk-1.0/images
%{_datadir}/webkitgtk-1.0/resources
-%{_datadir}/webkitgtk-1.0/webinspector
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-1.0.so
%attr(755,root,root) %{_libdir}/libwebkitgtk-1.0.so
%if %{with introspection}
-%{_datadir}/gir-1.0/JSCore-1.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
%{_datadir}/gir-1.0/WebKit-1.0.gir
%endif
%{_includedir}/webkitgtk-1.0
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"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/737f2f59d30f0a0d8232fa8e77e3f0c1dca4c746
More information about the pld-cvs-commit
mailing list