Hello community,
here is the log from the commit of package dx
checked in at Mon Nov 26 20:30:21 CET 2007.
--------
--- dx/dx.changes 2007-10-29 14:06:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/dx/dx.changes 2007-11-26 17:10:13.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 26 17:09:43 CET 2007 - lmichnovic@suse.cz
+
+- fixed third argument of open (*open.patch)
+
+-------------------------------------------------------------------
Old:
----
dx-4.4.4_gcc-43.patch
dx.linux-sys.patch
New:
----
dx-4.4.4-gcc_43.patch
dx-4.4.4-linux-sys.patch
dx-4.4.4-open.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dx.spec ++++++
--- /var/tmp/diff_new_pack.A22153/_old 2007-11-26 20:28:37.000000000 +0100
+++ /var/tmp/diff_new_pack.A22153/_new 2007-11-26 20:28:37.000000000 +0100
@@ -18,7 +18,7 @@
%endif
BuildRequires: fdupes
Version: 4.4.4
-Release: 110
+Release: 120
Summary: IBM Open Visualization Data Explorer
License: IBM Public License
Group: Productivity/Graphics/Visualization/Other
@@ -37,9 +37,10 @@
Patch6: dx-%{version}-increment.patch
Patch7: dx-%{version}-undefined_code.patch
Patch8: dx-%{version}-manpage.patch
-Patch9: dx.linux-sys.patch
+Patch9: dx-%{version}-linux-sys.patch
Patch10: dx-%{version}-array-overflow.patch
-Patch11: %{name}-%{version}_gcc-43.patch
+Patch11: %{name}-%{version}-gcc_43.patch
+Patch12: %{name}-%{version}-open.patch
Patch20: dxsamples-%{samplesversion}-java.patch
Patch21: dxsamples-%{samplesversion}-DESTDIR.patch
Patch22: dxsamples-%{samplesversion}-rights.patch
@@ -97,7 +98,7 @@
%package devel
Summary: Headers, static libs and source code files for the IBM Open Visualization Data Explorer
-Group: Productivity/Graphics/Visualization/Other
+Group: Development/Tools/Other
Requires: %{name} = %{version}
AutoReqProv: on
Requires: glibc-devel libtiff-devel libjpeg-devel fontconfig-devel openmotif-devel
@@ -130,6 +131,7 @@
%patch9 -p1
%patch10
%patch11
+%patch12
# samples
cd ../dxsamples-%{samplesversion}
%patch20
@@ -247,7 +249,10 @@
/opt/dx/samples/*/*/*.c
/opt/dx/samples/*/*/*.h
/opt/dx/samples/*/*/*/*.c
+
%changelog
+* Mon Nov 26 2007 - lmichnovic@suse.cz
+- fixed third argument of open (*open.patch)
* Mon Oct 29 2007 - pgajdos@suse.cz
- fixed build with gcc 4.3 (gcc-43.patch)
* Sat Aug 11 2007 - meissner@suse.de
++++++ dx-4.4.4-gcc_43.patch ++++++
--- src/uipp/base/Application.C
+++ src/uipp/base/Application.C
@@ -136,7 +136,7 @@
//this->setDefaultResources(baseWidget, Application::DefaultResources);
}
-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean Application::initializeWindowSystem(int *argcp, char **argv)
{
//
@@ -149,9 +149,9 @@
NULL, // command line options table
0, // number of entries in options table
#if XtSpecificationRelease > 4
- (int*)argcp,
-#else
argcp,
+#else
+ (unsigned int *)argcp,
#endif
argv, // "argv" command line arguments
#if XtSpecificationRelease > 4
@@ -235,7 +235,7 @@
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];
@@ -251,7 +251,7 @@
//
char *appname = GetFileBaseName(argv[0],NULL);
XrmParseCommand(&resourceDatabase, optlist, optlistsize,
- appname, (int *)argcp, argv);
+ appname, argcp, argv);
delete[] appname;
//
@@ -280,7 +280,7 @@
//
}
-boolean Application::initialize(unsigned int* argcp, char** argv)
+boolean Application::initialize(int* argcp, char** argv)
{
//
// Initialize the window system if not done already.
--- src/uipp/base/Application.h
+++ src/uipp/base/Application.h
@@ -49,7 +49,7 @@
//
// The main program needs to access protected member functions.
//
- friend int main(unsigned int argc,
+ friend int main(int argc,
char** argv);
@@ -71,9 +71,9 @@
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
- virtual void parseCommand(unsigned int* argcp, char** argv,
+ virtual void parseCommand(int* argcp, char** argv,
XrmOptionDescList optlist, int optlistsize);
//
@@ -145,7 +145,7 @@
// Initializes any Application specfic state. This routine should
// be called by main() or subclasses only.
//
- virtual boolean initialize(unsigned int* argcp, char** argv);
+ virtual boolean initialize(int* argcp, char** argv);
//
// Allow others to access our event processing mechanism
--- src/uipp/base/IBMApplication.C
+++ src/uipp/base/IBMApplication.C
@@ -349,7 +349,7 @@
}
-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
{
if (!this->Application::initializeWindowSystem(argcp, argv))
@@ -375,7 +375,7 @@
return TRUE;
}
-boolean IBMApplication::initialize(unsigned int* argcp,
+boolean IBMApplication::initialize(int* argcp,
char** argv)
{
if (!this->Application::initialize(argcp,argv))
--- src/uipp/base/IBMApplication.h
+++ src/uipp/base/IBMApplication.h
@@ -77,7 +77,7 @@
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
//
// Protected member data:
@@ -88,7 +88,7 @@
HelpWin *helpWindow;
- boolean initialize(unsigned int* argcp, char** argv);
+ boolean initialize(int* argcp, char** argv);
//
// Load application specific action routines
--- src/uipp/dxui/Main.C
+++ src/uipp/dxui/Main.C
@@ -48,7 +48,7 @@
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/dxuilib/DXApplication.C
+++ src/uipp/dxuilib/DXApplication.C
@@ -2248,7 +2248,7 @@
this->setDefaultResources(baseWidget, _defaultDXResources);
this->IBMApplication::installDefaultResources(baseWidget);
}
-boolean DXApplication::initialize(unsigned int* argcp,
+boolean DXApplication::initialize(int* argcp,
char** argv)
{
boolean wasSetBusy = FALSE;
--- src/uipp/dxuilib/DXApplication.h
+++ src/uipp/dxuilib/DXApplication.h
@@ -372,7 +372,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
--- src/uipp/mb/MBApplication.C
+++ src/uipp/mb/MBApplication.C
@@ -117,7 +117,7 @@
#endif
}
-boolean MBApplication::initialize(unsigned int* argcp,
+boolean MBApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/mb/MBApplication.h
+++ src/uipp/mb/MBApplication.h
@@ -51,7 +51,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
static MBResource resource;
--- src/uipp/mb/Main.C
+++ src/uipp/mb/Main.C
@@ -22,7 +22,7 @@
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/prompter/GARApplication.C
+++ src/uipp/prompter/GARApplication.C
@@ -198,7 +198,7 @@
}
}
-boolean GARApplication::initialize(unsigned int* argcp,
+boolean GARApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/prompter/GARApplication.h
+++ src/uipp/prompter/GARApplication.h
@@ -129,7 +129,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
CommandScope *commandScope; // command scope
--- src/uipp/prompter/Main.C
+++ src/uipp/prompter/Main.C
@@ -17,7 +17,7 @@
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/startup/Main.C
+++ src/uipp/startup/Main.C
@@ -14,7 +14,7 @@
extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/tutor/Main.C
+++ src/uipp/tutor/Main.C
@@ -31,7 +31,7 @@
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main(int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
--- src/uipp/tutor/TutorApplication.C
+++ src/uipp/tutor/TutorApplication.C
@@ -196,7 +196,7 @@
#endif
}
-boolean TutorApplication::initialize(unsigned int* argcp,
+boolean TutorApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/tutor/TutorApplication.h
+++ src/uipp/tutor/TutorApplication.h
@@ -69,7 +69,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
--- src/uipp/startup/StartupApplication.C
+++ src/uipp/startup/StartupApplication.C
@@ -117,7 +117,7 @@
#endif
}
-boolean StartupApplication::initialize(unsigned int* argcp,
+boolean StartupApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
--- src/uipp/startup/StartupApplication.h
+++ src/uipp/startup/StartupApplication.h
@@ -84,7 +84,7 @@
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp, char**argv);
+ virtual boolean initialize(int* argcp, char**argv);
CommandScope *commandScope; // command scope
++++++ dx-4.4.4-linux-sys.patch ++++++
---
src/exec/libdx/memory.c | 1 -
1 file changed, 1 deletion(-)
--- a/src/exec/libdx/memory.c
+++ b/src/exec/libdx/memory.c
@@ -66,7 +66,6 @@
#if linux
#include