packages: gtk-webkit/gtk-webkit.spec, gtk-webkit/gobject-introspection.patc...
qboosh
qboosh at pld-linux.org
Sun Jul 1 14:44:40 CEST 2012
Author: qboosh Date: Sun Jul 1 12:44:40 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.8.1 built for gtk+2 (note: new sonames);
webkit 1.2.x for gtk+2 left on WEBKIT_1_2 branch, new webkit for gtk+3 already in gtk-webkit3.spec)
- removed obsolete gobject-introspection,libpng patches
- added am patch (automake 1.12 compatibility patch from gentoo)
---- Files affected:
packages/gtk-webkit:
gtk-webkit.spec (1.113 -> 1.114) , gobject-introspection.patch (1.1 -> NONE) (REMOVED), webkit-gtk-1.2.7-libpng15.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gtk-webkit/gtk-webkit.spec
diff -u packages/gtk-webkit/gtk-webkit.spec:1.113 packages/gtk-webkit/gtk-webkit.spec:1.114
--- packages/gtk-webkit/gtk-webkit.spec:1.113 Fri Feb 10 12:36:46 2012
+++ packages/gtk-webkit/gtk-webkit.spec Sun Jul 1 14:44:35 2012
@@ -3,58 +3,63 @@
#
# Conditional build:
%bcond_without introspection # disable introspection
-
+#
Summary: Port of WebKit embeddable web component to GTK+
Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+
Name: gtk-webkit
-Version: 1.2.7
-Release: 10
+Version: 1.8.1
+Release: 1
License: BSD-like
Group: X11/Libraries
-Source0: http://webkitgtk.org/webkit-%{version}.tar.gz
-# Source0-md5: 25c7e548b65aeb6d83c0182c32ef0927
-Patch0: gobject-introspection.patch
-Patch1: webkit-gtk-1.2.7-libpng15.patch
+Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz
+# Source0-md5: f2f01b1fdc7262a2eede81ebed0970b2
+Patch0: %{name}-am.patch
URL: http://webkitgtk.org/
+BuildRequires: OpenGL-devel
+BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bison
-BuildRequires: cairo-devel >= 1.6
-BuildRequires: cairo-gobject-devel >= 1.6
+BuildRequires: cairo-devel >= 1.10
+BuildRequires: cairo-gobject-devel >= 1.10
BuildRequires: enchant-devel >= 0.22
BuildRequires: flex >= 2.5.33
BuildRequires: fontconfig-devel >= 2.4.0
BuildRequires: freetype-devel >= 1:2.1.8
BuildRequires: geoclue-devel
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: glib2-devel >= 1:2.32.0
BuildRequires: glibc-misc
%{?with_introspection:BuildRequires: gobject-introspection-devel >= 0.9.5}
BuildRequires: gperf
BuildRequires: gstreamer-devel >= 0.10
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.25
+BuildRequires: gstreamer-plugins-base-devel >= 0.10.30
BuildRequires: gtk+2-devel >= 2:2.20.0
BuildRequires: gtk-doc >= 1.10
BuildRequires: libicu-devel >= 4.2.1
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: libsoup-devel >= 2.30.2-4
+BuildRequires: libsoup-devel >= 2.38
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.5
BuildRequires: libxml2-devel >= 1:2.6.30
BuildRequires: libxslt-devel >= 1.1.7
-BuildRequires: pango-devel >= 1:1.12
+BuildRequires: pango-devel >= 1:1.21
BuildRequires: pkgconfig
-BuildRequires: sqlite3-devel
+BuildRequires: sqlite3-devel >= 3
+BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libXrender-devel
BuildRequires: xorg-lib-libXt-devel
-Requires: cairo >= 1.6
+BuildRequires: xz
+BuildRequires: zlib-devel
+Requires: cairo >= 1.10
Requires: enchant >= 0.22
-Requires: gstreamer-plugins-base >= 0.10.25
+Requires: gstreamer-plugins-base >= 0.10.30
Requires: gtk+2 >= 2:2.20.0
-Requires: libsoup >= 2.30.0
+Requires: libsoup >= 2.38
Requires: libxml2 >= 1:2.6.30
Requires: libxslt >= 1.1.7
-Requires: pango >= 1:1.12
+Requires: pango >= 1:1.21
%{?with_introspection:Conflicts: gir-repository < 0.6.5-7}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,24 +74,24 @@
Summary(pl.UTF-8): Pliki programistyczne WebKit
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: cairo-devel >= 1.6
+Requires: cairo-devel >= 1.10
Requires: enchant-devel >= 0.22
Requires: fontconfig-devel >= 2.4.0
Requires: freetype-devel >= 1:2.1.8
Requires: geoclue-devel
-Requires: glib2-devel >= 1:2.22.0
+Requires: glib2-devel >= 1:2.32.0
Requires: gstreamer-devel >= 0.10
-Requires: gstreamer-plugins-base-devel >= 0.10.25
+Requires: gstreamer-plugins-base-devel >= 0.10.30
Requires: gtk+2-devel >= 2:2.20.0
Requires: libicu-devel >= 4.2.1
Requires: libjpeg-devel
Requires: libpng-devel
-Requires: libsoup-devel >= 2.30.0
+Requires: libsoup-devel >= 2.38
Requires: libstdc++-devel
Requires: libxml2-devel >= 1:2.6.30
Requires: libxslt-devel >= 1.1.7
-Requires: pango-devel >= 1:1.12
-Requires: sqlite3-devel
+Requires: pango-devel >= 1:1.21
+Requires: sqlite3-devel >= 3
Requires: xorg-lib-libXt-devel
%description devel
@@ -98,24 +103,24 @@
%prep
%setup -q -n webkit-%{version}
%patch0 -p1
-%patch1 -p0
%build
%{__gtkdocize}
%{__libtoolize}
-%{__aclocal} -I autotools
+%{__aclocal} -I Source/autotools
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
--disable-silent-rules \
- --enable-3D-transforms \
- --enable-dom-storage \
--enable-geolocation \
+ --enable-gtk-doc \
--enable-icon-database \
- --%{!?with_introspection:dis}%{?with_introspection:en}able-introspection \
+ --enable-introspection%{!?with_introspection:=no} \
--enable-video \
- --with-font-backend=freetype
+ --with-font-backend=freetype \
+ --with-gtk=2.0 \
+ --with-html-dir=%{_gtkdocdir}
%{__make} -j1
@@ -125,9 +130,12 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwebkit-1.0.la
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-1.0.la
+# packaged in gtk-webkit3
+%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/webkitgtk
-%find_lang webkit
+%find_lang webkit-2.0
%clean
rm -rf $RPM_BUILD_ROOT
@@ -135,29 +143,33 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files -f webkit.lang
+%files -f webkit-2.0.lang
%defattr(644,root,root,755)
-%doc ChangeLog
-%attr(755,root,root) %{_bindir}/jsc
-%attr(755,root,root) %{_libdir}/libwebkit-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwebkit-1.0.so.2
+%doc ChangeLog NEWS
+%attr(755,root,root) %{_bindir}/jsc-1
+%attr(755,root,root) %{_libdir}/libwebkitgtk-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebkitgtk-1.0.so.0
+%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/WebKit-1.0.typelib
%endif
-%dir %{_datadir}/webkit-1.0
-%{_datadir}/webkit-1.0/images
-%{_datadir}/webkit-1.0/resources
-%{_datadir}/webkit-1.0/webinspector
+%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}/libwebkit-1.0.so
+%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/WebKit-1.0.gir
%endif
-%{_includedir}/webkit-1.0
+%{_includedir}/webkitgtk-1.0
+%{_pkgconfigdir}/javascriptcoregtk-1.0.pc
%{_pkgconfigdir}/webkit-1.0.pc
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -166,6 +178,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.114 2012/07/01 12:44:35 qboosh
+- updated to 1.8.1 built for gtk+2 (note: new sonames);
+ webkit 1.2.x for gtk+2 left on WEBKIT_1_2 branch, new webkit for gtk+3 already in gtk-webkit3.spec)
+- removed obsolete gobject-introspection,libpng patches
+- added am patch (automake 1.12 compatibility patch from gentoo)
+
Revision 1.113 2012/02/10 11:36:46 arekm
- rel 10; png fix
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gtk-webkit/gtk-webkit.spec?r1=1.113&r2=1.114
More information about the pld-cvs-commit
mailing list