Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/unetbootin/files: unetbootin-gentoo.patch unetbootin-304-syslinux-gentoo.patch
Date: Mon, 02 Feb 2009 07:33:00
Message-Id: E1LTtIg-0006X1-73@stork.gentoo.org
1 jer 09/02/02 07:32:58
2
3 Added: unetbootin-gentoo.patch
4 Removed: unetbootin-304-syslinux-gentoo.patch
5 Log:
6 Rename patch. Version bump (and use qt4.eclass instead of INSTALL).
7 (Portage version: 2.2_rc23/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 sys-boot/unetbootin/files/unetbootin-gentoo.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/unetbootin/files/unetbootin-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/unetbootin/files/unetbootin-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: unetbootin-gentoo.patch
16 ===================================================================
17 --- unetbootin.cpp.orig 2009-01-10 14:30:50.000000000 +0100
18 +++ unetbootin.cpp 2009-01-10 14:39:43.000000000 +0100
19 @@ -2219,11 +2219,11 @@
20 QFile srcF(QString(":/%1").arg(srcfName));
21 #ifdef NOSTATIC
22 if (srcfName == "memdisk")
23 - srcF.setFileName("/usr/lib/syslinux/memdisk");
24 + srcF.setFileName(QFile::exists("/usr/share/syslinux/memdisk") ? "/usr/share/syslinux/memdisk" : "/usr/lib/syslinux/memdisk");
25 else if (srcfName == "vesamenu.c32")
26 - srcF.setFileName("/usr/lib/syslinux/vesamenu.c32");
27 + srcF.setFileName(QFile::exists("/usr/share/syslinux/vesamenu.c32") ? "/usr/share/syslinux/vesamenu.c32" : "/usr/lib/syslinux/vesamenu.c32");
28 else if (srcfName == "mbr.bin")
29 - srcF.setFileName("/usr/lib/syslinux/mbr.bin");
30 + srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
31 else if (srcfName == "ubnsylnx")
32 srcF.setFileName("/usr/bin/syslinux");
33 // else
Report Message
Find on MARC Find on Google Groups