Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-graphtft/files: vdr-graphtft-0.2.2_gentoo.diff
Date: Tue, 24 Mar 2009 23:04:27
Message-Id: E1LmFfV-00059y-6f@stork.gentoo.org
1 hd_brummy 09/03/24 23:04:25
2
3 Modified: vdr-graphtft-0.2.2_gentoo.diff
4 Log:
5 fixed not fullfilled patch
6 (Portage version: 2.1.6.7/cvs/Linux i686)
7
8 Revision Changes Path
9 1.2 media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff?r1=1.1&r2=1.2
14
15 Index: vdr-graphtft-0.2.2_gentoo.diff
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- vdr-graphtft-0.2.2_gentoo.diff 24 Mar 2009 18:02:58 -0000 1.1
22 +++ vdr-graphtft-0.2.2_gentoo.diff 24 Mar 2009 23:04:25 -0000 1.2
23 @@ -2,8 +2,8 @@
24 # Joerg Bornkessel <hd_brummy@g.o> 24 Mar 2009
25
26 diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrenderer/dfbrenderer.c
27 ---- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c 2009-03-24 18:15:02.000000000 +0100
28 -+++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c 2009-03-24 18:17:04.000000000 +0100
29 +--- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c 2009-03-24 23:27:27.000000000 +0100
30 ++++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c 2009-03-24 23:35:19.000000000 +0100
31 @@ -231,7 +231,7 @@
32 {
33 // make path relative to the themes directory
34 @@ -41,8 +41,8 @@
35
36 tell(4,"creating imageprovider for %s\n", fpath);
37 diff -Naur graphtft-0.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c
38 ---- graphtft-0.2.2.orig/dspitems.c 2009-03-24 18:15:02.000000000 +0100
39 -+++ graphtft-0.2.2/dspitems.c 2009-03-24 18:18:06.000000000 +0100
40 +--- graphtft-0.2.2.orig/dspitems.c 2009-03-24 23:27:27.000000000 +0100
41 ++++ graphtft-0.2.2/dspitems.c 2009-03-24 23:31:38.000000000 +0100
42 @@ -108,7 +108,7 @@
43 if (p[0] != '/')
44 {
45 @@ -53,8 +53,8 @@
46 + "/" + p;
47 }
48 diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c
49 ---- graphtft-0.2.2.orig/graphtft.c 2009-03-24 18:15:02.000000000 +0100
50 -+++ graphtft-0.2.2/graphtft.c 2009-03-24 18:20:06.000000000 +0100
51 +--- graphtft-0.2.2.orig/graphtft.c 2009-03-24 23:27:27.000000000 +0100
52 ++++ graphtft-0.2.2/graphtft.c 2009-03-24 23:40:20.000000000 +0100
53 @@ -21,6 +21,8 @@
54 #include <graphtft.h>
55 #include <span.h>
56 @@ -64,7 +64,7 @@
57 //***************************************************************************
58 // cGraphTFTMenu
59 //***************************************************************************
60 -@@ -261,14 +263,7 @@
61 +@@ -261,14 +263,8 @@
62
63 #endif
64
65 @@ -74,13 +74,13 @@
66 - return false;
67 -
68 - // init
69 --
70 +
71 - GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
72 + GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
73
74 #if APIVERSNUM < 10507
75 RegisterI18n(Phrases);
76 -@@ -284,7 +279,7 @@
77 +@@ -284,7 +280,7 @@
78 if (loadThemes() != 0)
79 return false;
80
81 @@ -89,18 +89,20 @@
82 {
83 tell(0, "Error: Initializing graphTFT device faild, aborting!");
84
85 -@@ -308,7 +303,7 @@
86 +@@ -307,8 +303,8 @@
87 +
88 // look for the themes in the config directory
89
90 - asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort",
91 +- asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort",
92 - ConfigDirectory());
93 ++ asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort",
94 + DATA_DIR);
95
96 p = popen(buffer, "r");
97
98 diff -Naur graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c graphtft-0.2.2/imlibrenderer/imlibrenderer.c
99 ---- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c 2009-03-24 18:15:02.000000000 +0100
100 -+++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c 2009-03-24 18:21:03.000000000 +0100
101 +--- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c 2009-03-24 23:27:27.000000000 +0100
102 ++++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c 2009-03-24 23:36:06.000000000 +0100
103 @@ -107,7 +107,7 @@
104 {
105 // make path relative to the themes directory