Author: patrys Date: Sat Sep 25 13:44:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - build with new gir format - rel 2
---- Files affected: packages/gtk-webkit: gtk-webkit.spec (1.97 -> 1.98) , gobject-introspection.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gtk-webkit/gtk-webkit.spec diff -u packages/gtk-webkit/gtk-webkit.spec:1.97 packages/gtk-webkit/gtk-webkit.spec:1.98 --- packages/gtk-webkit/gtk-webkit.spec:1.97 Mon Sep 6 15:29:17 2010 +++ packages/gtk-webkit/gtk-webkit.spec Sat Sep 25 15:44:32 2010 @@ -8,11 +8,12 @@ Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ Name: gtk-webkit Version: 1.2.4 -Release: 1 +Release: 2 License: BSD-like Group: X11/Libraries Source0: http://webkitgtk.org/webkit-%{version}.tar.gz # Source0-md5: dc3a92dd0e8c2e70263fbfdf809b51a5 +Patch0: gobject-introspection.patch URL: http://webkitgtk.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -22,10 +23,9 @@ BuildRequires: fontconfig-devel >= 2.4.0 BuildRequires: geoclue-devel BuildRequires: gettext-devel -%{?with_introspection:BuildRequires: gir-repository-devel} BuildRequires: glib2-devel >= 1:2.22.0 BuildRequires: glibc-misc -%{?with_introspection:BuildRequires: gobject-introspection-devel >= 0.6.2} +%{?with_introspection:BuildRequires: gobject-introspection-devel >= 0.9.5} BuildRequires: gperf BuildRequires: gstreamer-devel >= 0.10 BuildRequires: gstreamer-plugins-base-devel >= 0.10.25 @@ -34,7 +34,7 @@ BuildRequires: libicu-devel >= 4.2.1 BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libsoup-devel >= 2.30.0 +BuildRequires: libsoup-devel >= 2.30.2-4 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 BuildRequires: libxml2-devel >= 1:2.6.30 @@ -75,9 +75,7 @@ %prep %setup -q -n webkit-%{version} - -# http://trac.webkit.org/browser/trunk/WebKit/gtk/JSCore.gir.in -%{__sed} -i -e 's,repository version="1.0",repository version="1.1",' WebKit/gtk/JSCore-1.0.gir +%patch0 -p1 %build %{__gtkdocize} @@ -142,6 +140,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.98 2010/09/25 13:44:32 patrys +- build with new gir format +- rel 2 + Revision 1.97 2010/09/06 13:29:17 pawelz - up to 1.2.4 ================================================================ Index: packages/gtk-webkit/gobject-introspection.patch diff -u /dev/null packages/gtk-webkit/gobject-introspection.patch:1.1 --- /dev/null Sat Sep 25 15:44:37 2010 +++ packages/gtk-webkit/gobject-introspection.patch Sat Sep 25 15:44:32 2010 @@ -0,0 +1,21 @@ +--- a/WebKit/gtk/JSCore-1.0.gir ++++ b/WebKit/gtk/JSCore-1.0.gir +@@ -1,11 +1,13 @@ + <?xml version="1.0"?> +-<repository version="1.0" ++<repository version="1.2" + xmlns="http://www.gtk.org/introspection/core/1.0"; + xmlns:c="http://www.gtk.org/introspection/c/1.0";> + <namespace name="JSCore" version="1.0" shared-library="webkit-1.0"> +- <alias name="GlobalContextRef" +- target="none" +- c:type="JSGlobalContextRef"/> +- <alias name="ObjectRef" target="none" c:type="JSObjectRef"/> ++ <alias name="GlobalContextRef" target="none"> ++ <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/> ++ </alias> ++ <alias name="ObjectRef" target="none"> ++ <type name="JSObjectRef" c:type="JSObjectRef"/> ++ </alias> + <function name="EvaluateScript" c:identifier="JSEvaluateScript"> + <return-value transfer-ownership="none"> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk-webkit/gtk-webkit.spec?r1=1.97&r2=1.98&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
