diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2009-03-24 23:04:25 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2009-03-24 23:04:25 +0000 |
| commit | 2bd47c943ea6a68f549b15aeb23a4b86a49853cb (patch) | |
| tree | 30b840f61d26f99b5331d410cc0a1021aea400a6 /media-plugins/vdr-graphtft | |
| parent | Marked ppc/ppc64 stable for bug #263618. (diff) | |
| download | gentoo-2-2bd47c943ea6a68f549b15aeb23a4b86a49853cb.tar.gz gentoo-2-2bd47c943ea6a68f549b15aeb23a4b86a49853cb.tar.bz2 gentoo-2-2bd47c943ea6a68f549b15aeb23a4b86a49853cb.zip | |
fixed not fullfilled patch
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-graphtft')
| -rw-r--r-- | media-plugins/vdr-graphtft/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff | 28 |
2 files changed, 20 insertions, 14 deletions
diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog index 0f10aae38054..585a82f7ceb5 100644 --- a/media-plugins/vdr-graphtft/ChangeLog +++ b/media-plugins/vdr-graphtft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-graphtft # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.13 2009/03/24 18:02:58 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.14 2009/03/24 23:04:25 hd_brummy Exp $ + + 24 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org> + files/vdr-graphtft-0.2.2_gentoo.diff: + fixed not fullfilled patch *vdr-graphtft-0.2.2 (24 Mar 2009) diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff index b747b70b01ca..ccadb2f007b1 100644 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff +++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff @@ -2,8 +2,8 @@ # Joerg Bornkessel <hd_brummy@g.o> 24 Mar 2009 diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrenderer/dfbrenderer.c ---- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c 2009-03-24 18:15:02.000000000 +0100 -+++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c 2009-03-24 18:17:04.000000000 +0100 +--- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c 2009-03-24 23:27:27.000000000 +0100 ++++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c 2009-03-24 23:35:19.000000000 +0100 @@ -231,7 +231,7 @@ { // make path relative to the themes directory @@ -41,8 +41,8 @@ diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrende tell(4,"creating imageprovider for %s\n", fpath); diff -Naur graphtft-0.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c ---- graphtft-0.2.2.orig/dspitems.c 2009-03-24 18:15:02.000000000 +0100 -+++ graphtft-0.2.2/dspitems.c 2009-03-24 18:18:06.000000000 +0100 +--- graphtft-0.2.2.orig/dspitems.c 2009-03-24 23:27:27.000000000 +0100 ++++ graphtft-0.2.2/dspitems.c 2009-03-24 23:31:38.000000000 +0100 @@ -108,7 +108,7 @@ if (p[0] != '/') { @@ -53,8 +53,8 @@ diff -Naur graphtft-0.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c + "/" + p; } diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c ---- graphtft-0.2.2.orig/graphtft.c 2009-03-24 18:15:02.000000000 +0100 -+++ graphtft-0.2.2/graphtft.c 2009-03-24 18:20:06.000000000 +0100 +--- graphtft-0.2.2.orig/graphtft.c 2009-03-24 23:27:27.000000000 +0100 ++++ graphtft-0.2.2/graphtft.c 2009-03-24 23:40:20.000000000 +0100 @@ -21,6 +21,8 @@ #include <graphtft.h> #include <span.h> @@ -64,7 +64,7 @@ diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c //*************************************************************************** // cGraphTFTMenu //*************************************************************************** -@@ -261,14 +263,7 @@ +@@ -261,14 +263,8 @@ #endif @@ -74,13 +74,13 @@ diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c - return false; - - // init -- + - GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory()); + GraphTFTSetup.PluginConfPath = strdup(DATA_DIR); #if APIVERSNUM < 10507 RegisterI18n(Phrases); -@@ -284,7 +279,7 @@ +@@ -284,7 +280,7 @@ if (loadThemes() != 0) return false; @@ -89,18 +89,20 @@ diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c { tell(0, "Error: Initializing graphTFT device faild, aborting!"); -@@ -308,7 +303,7 @@ +@@ -307,8 +303,8 @@ + // look for the themes in the config directory - asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", +- asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", - ConfigDirectory()); ++ asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", + DATA_DIR); p = popen(buffer, "r"); diff -Naur graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c graphtft-0.2.2/imlibrenderer/imlibrenderer.c ---- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c 2009-03-24 18:15:02.000000000 +0100 -+++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c 2009-03-24 18:21:03.000000000 +0100 +--- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c 2009-03-24 23:27:27.000000000 +0100 ++++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c 2009-03-24 23:36:06.000000000 +0100 @@ -107,7 +107,7 @@ { // make path relative to the themes directory |