public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas HAttel (dilfridge)" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-text/poppler/files: poppler-0.22.2-findgio.patch
Date: Wed, 20 Mar 2013 23:02:34 +0000 (UTC)	[thread overview]
Message-ID: <20130320230234.04FC420081@flycatcher.gentoo.org> (raw)

dilfridge    13/03/20 23:02:34

  Added:                poppler-0.22.2-findgio.patch
  Log:
  Revision bump to fix broken glib backend, bug 462524. Thanks to leio for analysis and help.
  
  (Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

Revision  Changes    Path
1.1                  app-text/poppler/files/poppler-0.22.2-findgio.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.22.2-findgio.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.22.2-findgio.patch?rev=1.1&content-type=text/plain

Index: poppler-0.22.2-findgio.patch
===================================================================
From 47e869e60fb147caca825380eeaa2a0851d502b9 Mon Sep 17 00:00:00 2001
From: Michael Weiser <michael@weiser.dinsnail.net>
Date: Mon, 18 Mar 2013 18:15:14 +0100
Subject: [PATCH] cmake: search also for gio-2.0 as GLIB library

---
 cmake/modules/FindGLIB.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
index 15fb0c7..35a9f9e 100644
--- a/cmake/modules/FindGLIB.cmake
+++ b/cmake/modules/FindGLIB.cmake
@@ -6,6 +6,7 @@
 #  GLIB2_LIBRARIES - Link these to use GLib
 #
 # Copyright 2008-2010 Pino Toscano, <pino@kde.org>
+# Copyright 2013 Michael Weiser, <michael@weiser.dinsnail.net>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -15,7 +16,7 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}")
+  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
 
   find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)
 
-- 
1.8.1.5






                 reply	other threads:[~2013-03-20 23:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130320230234.04FC420081@flycatcher.gentoo.org \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox