rpms/tuxcmd/devel tuxcmd-0.6.50-gcc44.patch, NONE, 1.1 tuxcmd.spec, 1.12, 1.13

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2306

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.50-gcc44.patch 
Log Message:
fix compile with gcc44, use optflags

tuxcmd-0.6.50-gcc44.patch:

--- NEW FILE tuxcmd-0.6.50-gcc44.patch ---
diff -up tuxcmd-modules-0.6.50/zip/strutils.c.gcc44 tuxcmd-modules-0.6.50/zip/strutils.c
--- tuxcmd-modules-0.6.50/zip/strutils.c.gcc44	2008-08-21 15:23:07.000000000 -0400
+++ tuxcmd-modules-0.6.50/zip/strutils.c	2009-02-28 09:35:41.000000000 -0500
@@ -74,7 +74,7 @@ char* extract_file_name(const char *APat
 {
   if (APath == NULL) return NULL;
 //  log("xxx = %s\n", (APath + strlen(APath) - 1));
-  char *file_part = rindex(APath, 0x2f);   //  returns NULL if not found or if the file is in the root ( / )
+  char *file_part = (char*) rindex(APath, 0x2f);   //  returns NULL if not found or if the file is in the root ( / )
   if (file_part == NULL) return NULL;
   return strdup(file_part + 1);
 }
@@ -84,7 +84,7 @@ char* extract_file_path(const char *APat
 {
   if (APath == NULL) return NULL;
 //  log("xxx = %s\n", (APath + strlen(APath) - 1));
-  char *file_part = rindex(APath, 0x2f);   //  returns NULL if not found or if the file is in the root ( / )
+  char *file_part = (char*) rindex(APath, 0x2f);   //  returns NULL if not found or if the file is in the root ( / )
   if (file_part == NULL) return NULL;
   char *ANewPath = (char*)malloc(file_part - APath + 2);
   snprintf(ANewPath, file_part - APath + 2, "%s", APath);
diff -up tuxcmd-modules-0.6.50/zip/treepathutils.c.gcc44 tuxcmd-modules-0.6.50/zip/treepathutils.c
--- tuxcmd-modules-0.6.50/zip/treepathutils.c.gcc44	2009-02-28 09:36:37.000000000 -0500
+++ tuxcmd-modules-0.6.50/zip/treepathutils.c	2009-02-28 09:37:10.000000000 -0500
@@ -182,7 +182,7 @@ unsigned long int filelist_find_index_by
 
 void filelist_tree_add_item_recurr(struct PathTree *tree, const char *path, struct TVFSItem *item, unsigned long index)
 {
-  char *pos = strstr(path, "/");
+  char *pos = (char *) strstr(path, "/");
   char *first_part;
   char *last_part;
   if (pos) {


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tuxcmd.spec	27 Feb 2009 20:09:17 -0000	1.12
+++ tuxcmd.spec	28 Feb 2009 14:45:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.50
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -28,6 +28,9 @@
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# Fix compile with gcc44
+Patch5: tuxcmd-0.6.50-gcc44.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -64,14 +67,14 @@
 
 
 %prep
-%setup -b 1 -q
+%setup -q -b 1
 
 %patch1 -p1 -b .null-mounts
 %patch3 -p1 -b .connmgr-save
 %patch4 -p1 -b .disable-smartlinking
 cd ../%{name}-modules-%{version}
 %patch2 -p1 -b .anon-ftp
-
+%patch5 -p1 -b .gcc44
 
 %build
 
@@ -79,7 +82,7 @@
 
 # build modules
 cd ../%{name}-modules-%{version}
-make shared
+make CC="gcc %{optflags}" CPP="g++ %{optflags}" shared
 
 
 %install
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Sat Feb 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.50-7
+- fix compile with gcc44, use optflags
+
 * Fri Feb 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.50-6
 - fix ExclusiveArch