[packages/midori] - added bcond gtk3. gtk2 version segfaults while adding a page to the dial, gtk3 does not.

witekfl witekfl at pld-linux.org
Sat Apr 6 20:03:20 CEST 2013


commit 93fe9da3d492f629f6082e57ad66fa0c3c33e078
Author: witekfl <witekfl at poczta.onet.pl>
Date:   Sat Apr 6 20:00:11 2013 +0200

    - added bcond gtk3. gtk2 version segfaults while adding a page to the dial, gtk3 does not.

 midori.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/midori.spec b/midori.spec
index b8d6023..25d080f 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,5 +1,6 @@
 # TODO
 # - there's work in progress --enable-webkit2 option enabling WebKit2/ GTK+3
+%bcond_with	gtk3
 Summary:	Web browser based on GTK+ WebCore
 Summary(hu.UTF-8):	GTK+ WebCore alapú web-böngésző
 Summary(pl.UTF-8):	Przeglądarka WWW oparta na GTK+ WebCore
@@ -15,13 +16,16 @@ URL:		http://twotoasts.de/index.php/midori/
 BuildRequires:	gcr-devel
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.16.0
+%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.16.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel}
 BuildRequires:	gtk-doc
-BuildRequires:	gtk-webkit-devel >= 1.5.1
+%{!?with_gtk3:BuildRequires:	gtk-webkit-devel >= 1.5.1}
+%{?with_gtk3:BuildRequires:	gtk-webkit3-devel}
 BuildRequires:	intltool
 BuildRequires:	libnotify-devel
 BuildRequires:	libsoup-devel >= 2.30.0
-BuildRequires:	libunique-devel >= 0.9
+%{!?with_gtk3:BuildRequires:	libunique-devel >= 0.9}
+%{?with_gtk3:BuildRequires:	libunique3-devel}
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	libzeitgeist-devel >= 0.3.14
 BuildRequires:	pkgconfig
@@ -80,7 +84,8 @@ Dokumentacja API midori.
 	--libdir=%{_libdir} \
 	--docdir=%{_docdir} \
 	--disable-granite \
-	--disable-gtk3 \
+	%{?with_gtk3:--enable-gtk3} \
+	%{!?with_gtk3:--disable-gtk3} \
 	--disable-tests \
 	--enable-addons \
 	--enable-apidocs \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/midori.git/commitdiff/93fe9da3d492f629f6082e57ad66fa0c3c33e078



More information about the pld-cvs-commit mailing list