[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-filebrowser/files: vdr-filebrowser-0.2.0-glibc-2.10.diff

[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-filebrowser/files: vdr-filebrowser-0.2.0-glibc-2.10.diff

[Matthias Schwarzott (zzam)]

zzam        09/08/10 10:26:53

  Added:                vdr-filebrowser-0.2.0-glibc-2.10.diff
  Log:
  Version bumped. Fixed homepage URI. Added a glibc-2.10 patch, Bug #280305.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.1                  media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff?rev=1.1&content-type=text/plain

Index: vdr-filebrowser-0.2.0-glibc-2.10.diff
===================================================================
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

[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-filebrowser/files: vdr-filebrowser-0.2.0-glibc-2.10.diff

[Joerg Bornkessel (hd_brummy)]

hd_brummy    11/01/29 00:14:48

  Removed:              vdr-filebrowser-0.2.0-glibc-2.10.diff
  Log:
  eapi=3; cleanup
  
  (Portage version: 2.1.9.25/cvs/Linux i686)