diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-08-10 10:26:53 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-08-10 10:26:53 +0000 |
| commit | b3d0103c4280a009e906d2f9705fade43cd9b213 (patch) | |
| tree | 6a04396a539ee697df298a46db0b3e6b659470f3 /media-plugins/vdr-filebrowser/files | |
| parent | Mask =dev-libs/dietlibc-0.32 (acked by hollow). (diff) | |
| download | historical-b3d0103c4280a009e906d2f9705fade43cd9b213.tar.gz historical-b3d0103c4280a009e906d2f9705fade43cd9b213.tar.bz2 historical-b3d0103c4280a009e906d2f9705fade43cd9b213.zip | |
Version bumped. Fixed homepage URI. Added a glibc-2.10 patch, Bug #280305.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-plugins/vdr-filebrowser/files')
| -rw-r--r-- | media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff new file mode 100644 index 000000000000..6a701e6a4f20 --- /dev/null +++ b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff @@ -0,0 +1,61 @@ +diff -ru -ru filebrowser-0.2.0-orig/commands.c filebrowser-0.2.0/commands.c +--- filebrowser-0.2.0-orig/commands.c 2009-08-10 11:59:00.640660524 +0200 ++++ filebrowser-0.2.0/commands.c 2009-08-10 12:00:32.033982498 +0200 +@@ -96,7 +96,7 @@ + { + if(Pattern[0]!='/') + { +- char* filename_tmp=NULL; ++ const char* filename_tmp=NULL; + Filename=(Filename && (filename_tmp=strrchr(Filename, '/'))) ? filename_tmp + 1 : NULL; + } + if(Filename==NULL) +diff -ru -ru filebrowser-0.2.0-orig/menu-filebrowser.c filebrowser-0.2.0/menu-filebrowser.c +--- filebrowser-0.2.0-orig/menu-filebrowser.c 2009-08-10 11:59:00.643994410 +0200 ++++ filebrowser-0.2.0/menu-filebrowser.c 2009-08-10 12:15:39.727224494 +0200 +@@ -141,12 +141,12 @@ + if ( BaseDirectory ) delete BaseDirectory; + } + +-int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 ) ++int cOsdMenuFilebrowser::DirectorySort ( const struct dirent64** File1, const struct dirent64** File2 ) + { + +- struct dirent64* ent1=* ( struct dirent64** ) File1; ++ const struct dirent64* ent1= *File1; + +- struct dirent64* ent2=* ( struct dirent64** ) File2; ++ const struct dirent64* ent2= *File2; + + if ( strcmp ( ent1->d_name, ".." ) == 0 ) + { +@@ -202,7 +202,7 @@ + { + if ( * ( Statebag->CurrentDirectory ) ) + { +- char* slash=strrchr ( * ( Statebag->CurrentDirectory ), '/' ); ++ char* slash=const_cast<char*>(strrchr ( * ( Statebag->CurrentDirectory ), '/' )); + + if ( slash ) + { +@@ -239,7 +239,7 @@ + if ( Task==taskBrowse ) + { + char* Title= ( char* ) malloc ( strlen ( tr ( "Filebrowser" ) ) + strlen ( Statebag->CurrentDirectory ) + 3 ); +- char* Title_tmp=NULL; ++ const char* Title_tmp=NULL; + sprintf ( Title, "%s: %s", tr ( "Filebrowser" ), ( ( Title_tmp=strrchr ( Statebag->CurrentDirectory, '/' ) ) && ! ( Statebag->ShowFullPath ) ) ? Title_tmp + 1 : * ( Statebag->CurrentDirectory ) ); + SetTitle ( Title ); + free ( Title ); +diff -ru -ru filebrowser-0.2.0-orig/menu-filebrowser.h filebrowser-0.2.0/menu-filebrowser.h +--- filebrowser-0.2.0-orig/menu-filebrowser.h 2009-08-10 11:59:00.643994410 +0200 ++++ filebrowser-0.2.0/menu-filebrowser.h 2009-08-10 12:13:14.360572298 +0200 +@@ -72,7 +72,7 @@ + + eMenuFilebrowserTask Task; + +- static int DirectorySort(const void* File1, const void* File2); ++ static int DirectorySort(const struct dirent64** File1, const struct dirent64** File2); + /* + * This filters entries shown in Filebrowser + * The function uses Statebag->ShowHiddenFiles and Statebag->Filter |