Archives
Archives
| From: | "TomAs Touceda (chiiph)" <chiiph@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-fix-const-char-concatenation.patch |
| Date: | Sun, 08 May 2011 01:51:49 |
| Message-Id: | 20110508015138.9B80420057@flycatcher.gentoo.org |
| 1 | chiiph 11/05/08 01:51:38 |
| 2 | |
| 3 | Modified: 2mandvd-fix-const-char-concatenation.patch |
| 4 | Log: |
| 5 | Fix patch and unpack output wrt bug 364553 |
| 6 | |
| 7 | (Portage version: 2.2.0_alpha29/cvs/Linux i686) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.2 media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch?rev=1.2&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch?rev=1.2&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch?r1=1.1&r2=1.2 |
| 15 | |
| 16 | Index: 2mandvd-fix-const-char-concatenation.patch |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/media-video/2mandvd/files/2mandvd-fix-const-char-concatenation.patch,v |
| 19 | retrieving revision 1.1 |
| 20 | retrieving revision 1.2 |
| 21 | diff -u -r1.1 -r1.2 |
| 22 | --- 2mandvd-fix-const-char-concatenation.patch 14 Jun 2010 00:02:28 -0000 1.1 |
| 23 | +++ 2mandvd-fix-const-char-concatenation.patch 8 May 2011 01:51:38 -0000 1.2 |
| 24 | @@ -1,15 +1,14 @@ |
| 25 | -Index: 2ManDVD/mainfrm.cpp |
| 26 | -=================================================================== |
| 27 | ---- 2ManDVD.orig/mainfrm.cpp |
| 28 | -+++ 2ManDVD/mainfrm.cpp |
| 29 | -@@ -1045,8 +1045,8 @@ mainfrm::mainfrm(QWidget *parent) : QMai |
| 30 | +diff -Naur 2ManDVD.orig/mainfrm.cpp 2ManDVD/mainfrm.cpp |
| 31 | +--- 2ManDVD.orig/mainfrm.cpp 2011-05-07 22:29:20.049000080 -0300 |
| 32 | ++++ 2ManDVD/mainfrm.cpp 2011-05-07 22:30:30.055000081 -0300 |
| 33 | +@@ -1403,8 +1403,8 @@ |
| 34 | outext << "growisofs" << endl; |
| 35 | outext << "mpeg2enc" << endl; |
| 36 | outext << "jpegtopnm /dev/null" << endl; |
| 37 | -- outext << "cat " + "/usr/share/2mandvd//fake.pl" << endl; |
| 38 | +- outext << "cat " + "/usr/share/2mandvd/fake.pl" << endl; |
| 39 | - outext << "rm -f " + homeDir.path() + "/.mdvdep.sh" << endl; |
| 40 | -+ outext << "cat " << "/usr/share/2mandvd//fake.pl" << endl; |
| 41 | -+ outext << "rm -f " << homeDir.path()<<"/.mdvdep.sh" << endl; |
| 42 | ++ outext << "cat " << "/usr/share/2mandvd/fake.pl" << endl; |
| 43 | ++ outext << "rm -f " << homeDir.path() << "/.mdvdep.sh" << endl; |
| 44 | outext << "exit" << endl; |
| 45 | wmyficext.close(); |
| 46 | QString programf = "bash"; |