Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.2.4-unittests-build.patch
Date: Mon, 03 Feb 2014 23:05:08
Message-Id: 20140203230503.860462004E@flycatcher.gentoo.org
1 eva 14/02/03 23:05:03
2
3 Added: webkit-gtk-2.2.4-unittests-build.patch
4 Log:
5 Fix build with USE=-gstreamer, bug #500162. Fix configure with USE=gles2 opengl, it is a forbidden configuration not only under the scope of the webgl flag unfortunately, bug #500150. Raise dependency on gst-plugins-base, bug #499964. Add dependency on rubygems[ruby21], bug #499896. Update path to disable building of unittests unless requested. Update sed paths due to upstream re-arranging sources.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C6085806)
8
9 Revision Changes Path
10 1.1 net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch?rev=1.1&content-type=text/plain
14
15 Index: webkit-gtk-2.2.4-unittests-build.patch
16 ===================================================================
17 From: Gilles Dartiguelongue <eva@g.o>
18 Date: Wed, 03 Feb 2014 23:47:39 +0100
19 Subject: [PATCH] Build unittests on demand
20
21 --- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100
22 +++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100
23 @@ -51,6 +51,9 @@
24 # Libraries and support components
25 bin_PROGRAMS :=
26 noinst_PROGRAMS :=
27 +check_PROGRAMS :=
28 +check_LTLIBRARIES :=
29 +check_DATA :=
30 libexec_PROGRAMS :=
31 noinst_DATA :=
32 noinst_HEADERS :=
33 --- a/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:44:52.534272572 +0100
34 +++ b/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:45:41.711783299 +0100
35 @@ -1,8 +1,8 @@
36 -noinst_LTLIBRARIES += \
37 +check_LTLIBRARIES += \
38 Libraries/libTestWebKitAPIMain.la
39
40 if ENABLE_WEBKIT2
41 -noinst_LTLIBRARIES += \
42 +check_LTLIBRARIES += \
43 Libraries/libTestWebKit2GtkAPI.la
44 endif
45
46 @@ -111,14 +111,14 @@
47 Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
48
49
50 -noinst_PROGRAMS += \
51 +check_PROGRAMS += \
52 Programs/TestWebKitAPI/WTF/TestWTF \
53 Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
54 Programs/TestWebKitAPI/WebCore/TestWebCore \
55 Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
56
57 if ENABLE_WEBKIT1
58 -noinst_PROGRAMS += \
59 +check_PROGRAMS += \
60 Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
61 Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
62 Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
63 @@ -150,7 +150,7 @@
64 endif
65
66 if ENABLE_WEBKIT2
67 -noinst_PROGRAMS += \
68 +check_PROGRAMS += \
69 Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
70 Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
71 Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
72 @@ -179,7 +179,7 @@
73 Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
74
75 if HAVE_ATSPI2
76 -noinst_PROGRAMS += \
77 +check_PROGRAMS += \
78 Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
79 Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
80 endif
81 @@ -627,7 +627,7 @@
82 Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp
83
84 if ENABLE_WEBKIT2
85 -noinst_LTLIBRARIES += \
86 +check_LTLIBRARIES += \
87 Libraries/libTestWebKitAPIInjectedBundle.la
88 endif # ENABLE_WEBKIT2
89
90 @@ -684,7 +684,7 @@
91
92
93 if ENABLE_WEBKIT2
94 -noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
95 +check_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
96 endif
97
98 Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
99 @@ -711,7 +711,7 @@
100
101
102 if ENABLE_WEBKIT2
103 -noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
104 +check_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
105 endif
106
107 Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
108 @@ -747,7 +747,7 @@
109 DISTCLEANFILES += \
110 Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
111
112 -noinst_DATA += \
113 +check_DATA += \
114 Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
115
116
117 --
118 1.8.3.2