Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/nip2/files: nip2-7.14.4-configure.patch
Date: Sat, 25 Oct 2008 12:10:02
Message-Id: E1Kthxw-0003Tl-8A@stork.gentoo.org
1 maekke 08/10/25 12:10:00
2
3 Added: nip2-7.14.4-configure.patch
4 Log:
5 fix file collision for bug #243000
6 (Portage version: 2.2_rc12/cvs/Linux 2.6.27.3 i686)
7
8 Revision Changes Path
9 1.1 media-gfx/nip2/files/nip2-7.14.4-configure.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/nip2/files/nip2-7.14.4-configure.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/nip2/files/nip2-7.14.4-configure.patch?rev=1.1&content-type=text/plain
13
14 Index: nip2-7.14.4-configure.patch
15 ===================================================================
16 diff -u nip2-7.14.4.orig/configure.in nip2-7.14.4/configure.in
17 --- nip2-7.14.4.orig/configure.in 2008-10-25 12:02:23.000000000 +0200
18 +++ nip2-7.14.4/configure.in 2008-10-25 12:06:25.000000000 +0200
19 @@ -222,13 +222,17 @@
20 fi
21
22 # optional ... use these to update desktop after install
23 +AC_ARG_ENABLE([mime-update], AS_HELP_STRING([--disable-mime-update], [ disable mime update (default: test)]))
24 +
25 AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
26 AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
27
28 update=no
29 -if test "x$UPDATE_MIME_DATABASE" != "xno"; then
30 - if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then
31 - update=yes
32 +if test "x$enable_mime_update" != "xno"; then
33 + if test "x$UPDATE_MIME_DATABASE" != "xno"; then
34 + if test "x$UPDATE_DESKTOP_DATABASE" != "xno"; then
35 + update=yes
36 + fi
37 fi
38 fi