Gentoo Archives: gentoo-commits

From: "Romain Perier (mrpouet)" <mrpouet@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/gnash/files: gnash-0.8.5-xpidl-sdkdir.patch
Date: Sat, 05 Sep 2009 17:51:15
Message-Id: E1MjzPr-0005FS-IZ@stork.gentoo.org
1 mrpouet 09/09/05 17:51:11
2
3 Added: gnash-0.8.5-xpidl-sdkdir.patch
4 Log:
5 Version bump, Assign myself to maintainer, Fix QA errors.
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch?rev=1.1&content-type=text/plain
13
14 Index: gnash-0.8.5-xpidl-sdkdir.patch
15 ===================================================================
16 From e462e38c02b4b1a7d5fe76df3f9bcb1c5a9e8940 Mon Sep 17 00:00:00 2001
17 From: Romain Perier <mrpouet@g.o>
18 Date: Sat, 5 Sep 2009 12:46:21 +0200
19 Subject: [PATCH] Fix xpidl binary path in XPIDL
20
21 Which didn't lookup into sdkdir variable from libxul.pc
22
23 ---
24 macros/xpcom.m4 | 4 ++--
25 1 files changed, 2 insertions(+), 2 deletions(-)
26
27 diff --git a/macros/xpcom.m4 b/macros/xpcom.m4
28 index 8a5be6b..37e32a9 100644
29 --- a/macros/xpcom.m4
30 +++ b/macros/xpcom.m4
31 @@ -103,8 +103,8 @@ AC_DEFUN([GNASH_PATH_XPCOM],
32 if test x"${ac_cv_path_xpcom_incl}" != x; then
33 XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
34 XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
35 - XPIDL=`echo ${ac_cv_path_xpidl} | sed -e 's:-L::' -e 's:sdk-::' -e 's:sdk/lib::' -e 's:-devel::' -e 's:lib$::'`
36 - XPIDL="${XPIDL}xpidl"
37 + XPIDL=$(pkg-config libxul --variable=sdkdir)
38 + XPIDL="${XPIDL}/bin/xpidl"
39 AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
40 else
41 XPCOM_CFLAGS=""
42 --
43 1.6.4.2