| 1 |
tetromino 13/01/30 05:18:24 |
| 2 |
|
| 3 |
Added: libmirage-2.0.0-gtk-doc.patch |
| 4 |
Log: |
| 5 |
Ensure gtk-doc and gobject-introspection really are optional at build time (bug #454550, thanks to Cesko Voeten). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libmirage-2.0.0-gtk-doc.patch |
| 16 |
=================================================================== |
| 17 |
From 79c9b60502449b330f155c082b198dfb509c0874 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Wed, 30 Jan 2013 00:02:12 -0500 |
| 20 |
Subject: [PATCH] libMirage: CMake: don't include GtkDoc and |
| 21 |
GObjectIntrospection unconditionally |
| 22 |
|
| 23 |
Including GtkDoc.cmake and GObjectIntrospection.cmake unconditionally |
| 24 |
checks for gtk-doc.pc and gobject-introspection-1.0.pc respectively, |
| 25 |
defeating the point of the conditional pkg_check_modules() calls in the |
| 26 |
make CMakeLists.txt script. |
| 27 |
--- |
| 28 |
libmirage/CMakeLists.txt | 4 ++-- |
| 29 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 30 |
|
| 31 |
diff --git a/libmirage/CMakeLists.txt b/libmirage/CMakeLists.txt |
| 32 |
index ff72aab..8049a80 100644 |
| 33 |
--- a/libmirage/CMakeLists.txt |
| 34 |
+++ b/libmirage/CMakeLists.txt |
| 35 |
@@ -27,8 +27,6 @@ include (CheckCSourceCompiles) |
| 36 |
include (CheckCCompilerFlag) |
| 37 |
include (GNUInstallDirs) |
| 38 |
|
| 39 |
-include (GObjectIntrospection) |
| 40 |
-include (GtkDoc) |
| 41 |
include (Utilities) |
| 42 |
include (FileList) |
| 43 |
|
| 44 |
@@ -50,10 +48,12 @@ pkg_check_modules (LIBLZMA REQUIRED liblzma>=5.0.0) |
| 45 |
pkg_check_modules (SNDFILE REQUIRED sndfile>=1.0.0) |
| 46 |
|
| 47 |
if (INTROSPECTION_ENABLED) |
| 48 |
+ include (GObjectIntrospection) |
| 49 |
pkg_check_modules (INTROSPECTION REQUIRED gobject-introspection-1.0>=1.30.0) |
| 50 |
endif () |
| 51 |
|
| 52 |
if (GTKDOC_ENABLED) |
| 53 |
+ include (GtkDoc) |
| 54 |
pkg_check_modules (GTKDOC REQUIRED gtk-doc>=1.4) |
| 55 |
endif () |
| 56 |
|
| 57 |
-- |
| 58 |
1.8.1.1 |
Archives