rpms/dx/devel dx-gcc43.patch,1.6,1.7

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Mon Jan 7 21:40:14 UTC 2008


Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14015

Modified Files:
	dx-gcc43.patch 
Log Message:
- fix compilation with gcc-4.3, take 7

dx-gcc43.patch:

Index: dx-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx-gcc43.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dx-gcc43.patch	7 Jan 2008 20:58:57 -0000	1.6
+++ dx-gcc43.patch	7 Jan 2008 21:40:05 -0000	1.7
@@ -36,7 +36,7 @@
  #if defined(HAVE_HCLXMINIT)
 diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
 --- dx-4.4.4/src/uipp/base/Application.C.gcc43	2005-11-09 19:56:17.000000000 +0100
-+++ dx-4.4.4/src/uipp/base/Application.C	2008-01-07 21:52:36.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.C	2008-01-07 22:39:15.000000000 +0100
 @@ -136,7 +136,7 @@ void Application::installDefaultResource
      //this->setDefaultResources(baseWidget, Application::DefaultResources);
  }
@@ -55,6 +55,24 @@
  #else
  	     argcp,
  #endif
+@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
+     return TRUE;
+ }
+ 
+-void Application::parseCommand(unsigned int* argcp, char** argv,
++void Application::parseCommand(int* argcp, char** argv,
+                                XrmOptionDescList optlist, int optlistsize)
+ {
+     char res_file[256];
+@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned 
+     //
+ }
+ 
+-boolean Application::initialize(unsigned int* argcp, char** argv)
++boolean Application::initialize(int* argcp, char** argv)
+ {
+     //
+     // Initialize the window system if not done already.
 diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
 --- dx-4.4.4/src/uipp/base/Application.h.gcc43	2005-11-09 19:26:29.000000000 +0100
 +++ dx-4.4.4/src/uipp/base/Application.h	2008-01-07 21:49:49.000000000 +0100




More information about the fedora-extras-commits mailing list