commit 5006703c2577eb72f2380c616ea1607b1bfa85cf
Merge: b19bf66 8f69f01
Author: Jakub Bogusz <[email protected]>
Date: Fri Apr 4 20:41:50 2014 +0200
Merge branch 'master' of git://git.pld-linux.org/packages/gtk-webkit3
Conflicts:
gtk-webkit3.spec
gtk-webkit3.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --cc gtk-webkit3.spec
index 3048b93,9355235..bbce94c
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@@ -14,8 -13,10 +14,9 @@@ Release:
License: BSD-like
Group: X11/Libraries
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: d2af0d2d75f18cac33bd82ee63e22571
-Patch0: sync-builtins.patch
+# Source0-md5: c759bf11fe4cadd1268630f16a97f7b9
URL: http://webkitgtk.org/
+ BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
BuildRequires: OpenGL-GLX-devel
BuildRequires: at-spi2-core-devel >= 2.6.0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit3.git/commitdiff/5006703c2577eb72f2380c616ea1607b1bfa85cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
