diff options
Diffstat (limited to 'dev-libs/libmirage')
| -rw-r--r-- | dev-libs/libmirage/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch | 43 |
2 files changed, 5 insertions, 44 deletions
diff --git a/dev-libs/libmirage/ChangeLog b/dev-libs/libmirage/ChangeLog index 1c3cd4c8e4c5..fe5438f7d5b6 100644 --- a/dev-libs/libmirage/ChangeLog +++ b/dev-libs/libmirage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libmirage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.34 2013/10/08 16:51:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.35 2013/10/08 16:53:38 tetromino Exp $ + + 08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + -files/libmirage-2.0.0-gtk-doc.patch: + Remove old patch. *libmirage-2.1.1 (08 Oct 2013) diff --git a/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch b/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch deleted file mode 100644 index 8b6403177858..000000000000 --- a/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 79c9b60502449b330f155c082b198dfb509c0874 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Wed, 30 Jan 2013 00:02:12 -0500 -Subject: [PATCH] libMirage: CMake: don't include GtkDoc and - GObjectIntrospection unconditionally - -Including GtkDoc.cmake and GObjectIntrospection.cmake unconditionally -checks for gtk-doc.pc and gobject-introspection-1.0.pc respectively, -defeating the point of the conditional pkg_check_modules() calls in the -make CMakeLists.txt script. ---- - libmirage/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmirage/CMakeLists.txt b/libmirage/CMakeLists.txt -index ff72aab..8049a80 100644 ---- a/libmirage/CMakeLists.txt -+++ b/libmirage/CMakeLists.txt -@@ -27,8 +27,6 @@ include (CheckCSourceCompiles) - include (CheckCCompilerFlag) - include (GNUInstallDirs) - --include (GObjectIntrospection) --include (GtkDoc) - include (Utilities) - include (FileList) - -@@ -50,10 +48,12 @@ pkg_check_modules (LIBLZMA REQUIRED liblzma>=5.0.0) - pkg_check_modules (SNDFILE REQUIRED sndfile>=1.0.0) - - if (INTROSPECTION_ENABLED) -+ include (GObjectIntrospection) - pkg_check_modules (INTROSPECTION REQUIRED gobject-introspection-1.0>=1.30.0) - endif () - - if (GTKDOC_ENABLED) -+ include (GtkDoc) - pkg_check_modules (GTKDOC REQUIRED gtk-doc>=1.4) - endif () - --- -1.8.1.1 - |