Hello community, here is the log from the commit of package dx for openSUSE:Factory:NonFree checked in at 2012-06-13 13:31:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/dx (Old) and /work/SRC/openSUSE:Factory:NonFree/.dx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dx", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2012-06-11 00:29:42.179570069 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.dx.new/dx.changes 2012-06-13 13:31:26.000000000 +0200 @@ -0,0 +1,395 @@ +------------------------------------------------------------------- +Fri Sep 30 20:07:56 UTC 2011 - [email protected] + +- add libtool as buildrequire to make the spec file more reliable + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) +- Comment out unapplied patch 23 to please source-validator + +------------------------------------------------------------------- +Wed Nov 24 01:45:53 CET 2010 - [email protected] + +- xft-config is gone + +------------------------------------------------------------------- +Mon Mar 22 17:35:29 CET 2010 - [email protected] + +- fixed build with new ImageMagick + +------------------------------------------------------------------- +Tue Feb 9 13:26:51 UTC 2010 - [email protected] + +- enable noarch subpackages + +------------------------------------------------------------------- +Fri Oct 16 10:23:51 CEST 2009 - [email protected] + +- fix memory leak (bnc#546115) + +------------------------------------------------------------------- +Thu Sep 17 10:30:58 CEST 2009 - [email protected] + +- added leak-fix.patch [bnc#538399] + +------------------------------------------------------------------- +Mon Aug 10 15:37:26 CEST 2009 - [email protected] + +- added imagemagick.patch from Gottfried Necker : link with + ImageMagick libraries (bnc#525987) + +------------------------------------------------------------------- +Thu Feb 26 16:42:49 CET 2009 - [email protected] + +- added errno-init.patch to fix unitialized errno (bnc#479845) +- added missing-sentinel.patch to fix missing sentinel in execlp + call (rpmlint check error) + +------------------------------------------------------------------- +Mon Apr 14 15:56:23 CEST 2008 - [email protected] + +- Fix configure script. + +------------------------------------------------------------------- +Fri Feb 15 13:29:43 CET 2008 - [email protected] + +- removed version in jre requirement +- excluding useless files Makefile_os2 +- fixed missing Requires in devel subpackage + +------------------------------------------------------------------- +Mon Nov 26 17:09:43 CET 2007 - [email protected] + +- fixed third argument of open (*open.patch) + +------------------------------------------------------------------- +Mon Oct 29 14:08:11 CET 2007 - [email protected] + +- fixed build with gcc 4.3 (gcc-43.patch) + +------------------------------------------------------------------- +Sat Aug 11 00:20:48 CEST 2007 - [email protected] + +- fixed 3 array overflows (index 3 instead of 2), + and one misplaced ) causing undefined behaviour. +- build with ImageMagick too + +------------------------------------------------------------------- +Mon Aug 6 18:33:32 CEST 2007 - [email protected] + +- remove inclusion of linux/sys.h + fix prep section for quilt setup -v *.spec + +------------------------------------------------------------------- +Tue Jun 12 17:51:44 CEST 2007 - [email protected] + +- removing externalfilter* which caused Requirement on historic + libc.so.1 [#282833] + +------------------------------------------------------------------- +Mon Jun 11 17:45:45 CEST 2007 - [email protected] + +- fixed broken Requires %{name} = %{version}; [#282833] + +------------------------------------------------------------------- +Tue May 29 19:18:32 CEST 2007 - [email protected] + +- splitted off devel sub package +- fixed strange name of man page and installing to %_mandir + (manpage.patch) +- using Recommends tag for subpackages +- using fdupes +- defining includedir and libdir of X due to change of prefix in + X.org 7.x + +------------------------------------------------------------------- +Wed May 23 17:01:55 CEST 2007 - [email protected] + +- installing to /opt (it is O.K. with FHS) + +------------------------------------------------------------------- +Fri Apr 27 16:57:17 CEST 2007 - [email protected] + +- added renamed package libexpat0 into BuildRequires + +------------------------------------------------------------------- +Thu Mar 29 16:28:49 CEST 2007 - [email protected] + +- added bison and flex into BuildRequires + +------------------------------------------------------------------- +Tue Feb 20 10:56:33 CET 2007 - [email protected] + +- removed bindir.patch, making symbolic link instead + +------------------------------------------------------------------- +Thu Feb 15 17:37:44 CET 2007 - [email protected] + +- fixed bindir to /usr/bin (bindir.patch) + +------------------------------------------------------------------- +Tue Feb 13 18:10:28 CET 2007 - [email protected] + +- moved from /opt to /usr/share + +------------------------------------------------------------------- +Tue Jan 23 12:07:19 CET 2007 - [email protected] + +- fixed uninitialized matrix (added to uninitialized_var.patch) +- fixed undefined evaluation of code (undefined_code.patch) + +------------------------------------------------------------------- +Mon Dec 11 16:51:00 CET 2006 - [email protected] + +- fixed non deterministic evaluation of code (increment.patch) + +------------------------------------------------------------------- +Mon Sep 25 16:10:26 CEST 2006 - [email protected] + +- update dx to version 4.4.4 + * Many bug fixes, few features. + - obsoletes matrix.patch + +------------------------------------------------------------------- +Mon Jun 26 22:43:22 CEST 2006 - [email protected] + +- fixed wrong computation of a matrix (matrix.patch) [#188294] + +------------------------------------------------------------------- +Fri May 19 19:12:13 CEST 2006 - [email protected] + +- repacked tarball; problematic files has now correct licence [#170130] + +------------------------------------------------------------------- +Wed Apr 19 16:15:45 CEST 2006 - [email protected] + +- Added freetype2-devel into BuildRequires + +------------------------------------------------------------------- +Mon Mar 13 15:20:15 CET 2006 - [email protected] + +- use -fsigned-char for build + +------------------------------------------------------------------- +Wed Jan 25 21:35:38 CET 2006 - [email protected] + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 11 15:54:23 CET 2006 - [email protected] + +- update to version 4.4.0 +- remade build section +- removed flex-old and add flex again from NFB + +------------------------------------------------------------------- +Mon Jan 9 15:25:02 CET 2006 - [email protected] + +- comment out stray malloc call + +------------------------------------------------------------------- +Fri Dec 2 17:01:12 CET 2005 - [email protected] + +- changed needforbuild to build package with flex-old + ++++ 198 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory:NonFree/.dx.new/dx.changes New: ---- dx-4.4.4-ac.patch dx-4.4.4-array-overflow.patch dx-4.4.4-errno-init.patch dx-4.4.4-gcc_43.patch dx-4.4.4-imagemagick.patch dx-4.4.4-implicit_decl.patch dx-4.4.4-increment.patch dx-4.4.4-leak-fix.patch dx-4.4.4-linux-sys.patch dx-4.4.4-manpage.patch dx-4.4.4-mem-leak-fix.patch dx-4.4.4-missing-sentinel.patch dx-4.4.4-open.patch dx-4.4.4-return_value.patch dx-4.4.4-rights.patch dx-4.4.4-string.patch dx-4.4.4-undefined_code.patch dx-4.4.4-uninitialized_var.patch dx-4.4.4-xkiso.patch dx-4.4.4.tar.bz2 dx.changes dx.desktop dx.spec dxsamples-4.4.0-DESTDIR.patch dxsamples-4.4.0-java.patch dxsamples-4.4.0-rights.patch dxsamples-4.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ # # spec file for package dx # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: dx %define samplesversion 4.4.0 BuildRequires: ImageMagick-devel bison flex freeglut-devel freetype2-devel gcc-c++ BuildRequires: libexpat0 libpng-devel libtiff-devel openmotif openmotif-devel tcsh update-desktop-files BuildRequires: libtool %if %suse_version > 1000 BuildRequires: libdrm-devel %endif BuildRequires: fdupes Version: 4.4.4 Release: 237 Summary: IBM Open Visualization Data Explorer License: IPL-1.0 Group: Productivity/Graphics/Visualization/Other Requires: tcsh jre Url: http://opendx.org/ Source0: dx-%{version}.tar.bz2 Source1: dxsamples-%{samplesversion}.tar.bz2 Source2: dx.desktop Patch0: dx-%{version}-string.patch Patch1: dx-%{version}-rights.patch Patch2: dx-%{version}-xkiso.patch Patch3: dx-%{version}-uninitialized_var.patch Patch4: dx-%{version}-implicit_decl.patch Patch5: dx-%{version}-return_value.patch Patch6: dx-%{version}-increment.patch Patch7: dx-%{version}-undefined_code.patch Patch8: dx-%{version}-manpage.patch Patch9: dx-%{version}-linux-sys.patch Patch10: dx-%{version}-array-overflow.patch Patch11: %{name}-%{version}-gcc_43.patch Patch12: %{name}-%{version}-open.patch Patch13: %{name}-%{version}-ac.patch # PATCH-FIX-UPSTREAM errno-init.patch fix errno init (bnc#479845) Patch14: %{name}-%{version}-errno-init.patch # PATCH-FIX-UPSTREAM missing-sentinel.patch fix missing sentinel (rpmlint check error) Patch15: %{name}-%{version}-missing-sentinel.patch # PATCH-FIX-UPSTREAM link against ImageMagick libraries (bnc#525987) Patch16: %{name}-%{version}-imagemagick.patch # PATCH-FIX-UPSTREAM fix mem leak (bnc#538399) Patch17: %{name}-%{version}-leak-fix.patch Patch20: dxsamples-%{samplesversion}-java.patch Patch21: dxsamples-%{samplesversion}-DESTDIR.patch Patch22: dxsamples-%{samplesversion}-rights.patch # PATCH-FIX-UPSTREAM dx-4.4.4-mem-leak-fix.patch (bnc#546115) #Patch23: %{name}-%{version}-mem-leak-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: dx-data=%{version}, dx-doc=%{version}, dx-devel=%{version} %description The Open Visualization Data Explorer is a visualization framework that gives users the ability to apply advanced visualization and analysis techniques to their data. These techniques can be applied to help users gain new insights into data from applications in a wide variety of fields including science, engineering, medicine, and business. %package doc License: IPL-1.0 Summary: Additional Package Documentation for dx Group: Productivity/Graphics/Visualization/Other Provides: dxdoc Requires: %{name} = %{version} Obsoletes: dxdoc %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %description doc This package contains the documentation for the IBM Open Visualization Data Explorer in HTML format. %package data License: IPL-1.0 Summary: Sample data for the IBM Open Visualization Data Explorer Group: Productivity/Graphics/Visualization/Other Provides: dxdata Requires: %{name} = %{version} Obsoletes: dxdata %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %description data This package contains some sample data for the IBM Open Visualization Data Explorer. %package devel License: IPL-1.0 Summary: Headers, static libs and source code files for the IBM Open Visualization Data Explorer Group: Development/Tools/Other Requires: %{name} = %{version} Requires: glibc-devel libtiff-devel libjpeg-devel fontconfig-devel openmotif-devel Requires: libpng-devel zlib-devel libexpat-devel freetype2-devel Requires: xorg-x11-libXp-devel Mesa-devel xorg-x11-libXmu-devel xorg-x11-libXext-devel Requires: xorg-x11-libXt-devel xorg-x11-libX11-devel xorg-x11-libxcb-devel xorg-x11-libXau-devel xorg-x11-libSM-devel Requires: xorg-x11-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel %if 0%{?suse_version} > 1030 Requires: liblcms-devel libbz2-devel ImageMagick-devel %endif %description devel This package contains header C files, static libraries and source code files for the IBM Open Visualization Data Explorer. %prep %setup -q -b 1 %patch0 %patch1 %patch2 %patch3 %patch4 %patch5 %patch6 %patch7 %patch8 %patch9 -p1 %patch10 %patch11 %patch12 %patch13 %patch14 %patch15 %patch16 %patch17 # samples cd ../dxsamples-%{samplesversion} %patch20 %patch21 %patch22 %build %{?suse_update_config:%{suse_update_config -f}} autoreconf -fi %if "%(pkg-config --variable=prefix xft)" == "/usr" CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ ./configure --prefix=/opt --mandir=%{_mandir} --x-includes=/usr/include --x-libraries=%{_libdir} %else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fsigned-char" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-exceptions -fno-strict-aliasing -fsigned-char" \ ./configure --prefix=/opt --mandir=%{_mandir} %endif # parallel build fails make -j1 # # dx-samples cd ../dxsamples-%{samplesversion} autoreconf -fi CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=/opt # parallel build fails make -j1 %install make DESTDIR=$RPM_BUILD_ROOT \ prefix=/opt \ install # # dx samples cd $RPM_BUILD_DIR/dxsamples-%{samplesversion} make DESTDIR=$RPM_BUILD_ROOT \ prefix=/opt \ install # install -d $RPM_BUILD_ROOT/usr/bin ln -sf /opt/dx/bin/dx $RPM_BUILD_ROOT/usr/bin/dx rm -f $RPM_BUILD_ROOT/opt/bin/dx %suse_update_desktop_file -i dx Education Science Math %fdupes -s $RPM_BUILD_ROOT %files %defattr(-,root,root,755) %doc AUTHORS COPYING ChangeLog LICENSE NEWS README* %doc /usr/share/man/man1/dx.1.gz /usr/bin/dx /usr/share/applications/dx.desktop /opt/dx/bin/ /opt/dx/bin_linux/ /opt/dx/fonts/ /opt/dx/help/ /opt/dx/java/ /opt/dx/lib/ /opt/dx/lib_linux/ # .la files go into devel %exclude /opt/dx/lib_linux/*.la # header files goes into devel %exclude /opt/dx/include # .la files go into devel %exclude /opt/dx/lib_linux # source code goes into devel %exclude /opt/dx/lib/outboard.c /opt/dx/man/ /opt/dx/ui/ %dir /opt/dx/ %files doc %defattr(-,root,root,755) /opt/dx/doc/ /opt/dx/html/ %files data %defattr(-,root,root,755) /opt/dx/samples/ # Removing these precompiled executables which will cause a requirement on historic libc.so.1 # so they will not work anyway %exclude /opt/dx/samples/data/externalfilter_* %exclude /opt/dx/samples/data/externalfilter # source code files goes into devel %exclude /opt/dx/samples/*/*.c %exclude /opt/dx/samples/*/*/*.c %exclude /opt/dx/samples/*/*/*.h %exclude /opt/dx/samples/*/*/*/*.c # useless file %exclude /opt/dx/samples/user/Makefile_os2 %exclude /opt/dx/samples/outboard/Makefile_os2 %files devel %defattr(-,root,root,755) /opt/dx/include /opt/dx/lib_linux /opt/dx/lib/outboard.c /opt/dx/samples/*/*.c /opt/dx/samples/*/*/*.c /opt/dx/samples/*/*/*.h /opt/dx/samples/*/*/*/*.c %changelog ++++++ dx-4.4.4-ac.patch ++++++ --- configure.ac +++ configure.ac @@ -218,10 +218,6 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Pa dnl End of command line options configuration dnl Start DX configuration -AC_LANG([C++]) -AC_CHECK_HEADERS(stdlib.h) -AC_LANG([C]) - # # Check for large file support # @@ -299,6 +295,10 @@ else ac_cv_header_windows_h="no" fi +AC_LANG([C++]) +AC_CHECK_HEADERS(stdlib.h) +AC_LANG([C]) + # On SGI, detect the ABI we're compiling for (handles all methods that # can be used to set the ABI target). if test "$ARCH" = "sgi" ; then ++++++ dx-4.4.4-array-overflow.patch ++++++ --- src/exec/dxmods/genimp_io.c +++ src/exec/dxmods/genimp_io.c @@ -1624,7 +1624,7 @@ if (_dxd_gi_header.type==SKIP_MARKER && strstr(str,_dxd_gi_header.marker)){ if (sets_read == num_sets && - _dxd_gi_header.marker[strlen(_dxd_gi_header.marker-1)]=='\n') + _dxd_gi_header.marker[strlen(_dxd_gi_header.marker)-1]=='\n') _dxd_gi_header.type = SKIP_NOTHING; else *read_header=1; --- src/exec/libdx/lbcamera.c +++ src/exec/libdx/lbcamera.c @@ -28,9 +28,9 @@ { Matrix t; - t.A[0][0] = p[ 0]; t.A[0][1] = p[ 1]; t.A[0][3] = p[ 2]; - t.A[1][0] = p[ 4]; t.A[1][1] = p[ 5]; t.A[1][3] = p[ 6]; - t.A[2][0] = p[ 8]; t.A[2][1] = p[ 9]; t.A[2][3] = p[10]; + t.A[0][0] = p[ 0]; t.A[0][1] = p[ 1]; t.A[0][2] = p[ 2]; + t.A[1][0] = p[ 4]; t.A[1][1] = p[ 5]; t.A[1][2] = p[ 6]; + t.A[2][0] = p[ 8]; t.A[2][1] = p[ 9]; t.A[2][2] = p[10]; t.b[0] = p[12]; t.b[1] = p[13]; t.b[2] = p[14]; c->m = c->rot = t; ++++++ dx-4.4.4-errno-init.patch ++++++ --- src/exec/dpexec/lex.c +++ src/exec/dpexec/lex.c @@ -504,6 +504,7 @@ for (;;) { yyleng = 0; + errno = 0; c = input(); ++++++ 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-imagemagick.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -801,8 +801,8 @@ then failed=0; passed=0; - AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) if test "$ARCH" = "intelnt" ; then + AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 @@ -835,8 +835,13 @@ dnl routine. This allows us to simplify dnl format configuration libraries. if test "$HAVE_MC" = "yes" ; then + INC_MAGICK="`Magick-config --cflags`" + SAVECPPFLAGS="$CPPFLAGS" + CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" + AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) + CPPFLAGS="$SAVECPPFLAGS" LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) + AC_CHECK_LIB( c,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 then Index: src/exec/dxmods/_im_image.c =================================================================== --- src/exec/dxmods/_im_image.c.orig +++ src/exec/dxmods/_im_image.c @@ -329,7 +329,7 @@ static Error write_im(RWImageArgs *iargs DestroyImageInfo(new_frame_info); DestroyImageInfo(image_info); #if MagickLibVersion > 0x0537 - DestroyConstitute(); + ConstituteComponentTerminus(); #endif DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", image->exception.reason, @@ -346,7 +346,7 @@ static Error write_im(RWImageArgs *iargs DestroyImageInfo(new_frame_info); DestroyImageInfo(image_info); #if MagickLibVersion > 0x0537 - DestroyConstitute(); + ConstituteComponentTerminus(); #endif DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); } @@ -375,7 +375,7 @@ static Error write_im(RWImageArgs *iargs DestroyImageInfo(image_info); DestroyImageInfo(new_frame_info); #if MagickLibVersion > 0x0537 - DestroyConstitute(); + ConstituteComponentTerminus(); #endif DEBUGMESSAGE("back from DestroyImage"); @@ -491,7 +491,7 @@ static Error write_im(RWImageArgs *iargs DestroyImage(image); DestroyImageInfo(image_info); #if MagickLibVersion > 0x0537 - DestroyConstitute(); + ConstituteComponentTerminus(); #endif } return (OK); ++++++ dx-4.4.4-implicit_decl.patch ++++++ --- src/exec/hwrender/hwRender.c +++ src/exec/hwrender/hwRender.c @@ -7,7 +7,7 @@ /***********************************************************************/ #include <dxconfig.h> - +#include <unistd.h> #define tdmRender_c ++++++ dx-4.4.4-increment.patch ++++++ --- src/uipp/prompter/GARMainWindow.C +++ src/uipp/prompter/GARMainWindow.C @@ -4910,8 +4910,10 @@ text_str = XmTextGetString(w); ASSERT(STRLEN(text_str) + cbs->text->length < 4096); ptr = 0; - for(i = 0; i < cbs->startPos; i++) - tmp[ptr] = text_str[ptr++]; + for(i = 0; i < cbs->startPos; i++){ + tmp[ptr] = text_str[ptr]; + ptr++; + } for(i = 0; i < cbs->text->length; i++) tmp[ptr++] = cbs->text->ptr[i]; for(i = (int)cbs->startPos; i < STRLEN(text_str); i++) ++++++ dx-4.4.4-leak-fix.patch ++++++ --- src/uipp/dxuilib/DXLinkHandler.C 2003-07-12 02:12:20.000000000 +0200 +++ src/uipp/dxuilib/DXLinkHandler.C 2009-09-17 10:27:00.000000000 +0200 @@ -402,13 +402,15 @@ */ boolean DXLinkHandler::OpenNetwork(const char *c, int id, void *va) { - char *buf = new char[strlen(c)+1]; + char *buf; char *d, *e, *cfg, *net; int len=0; if( !c ) return TRUE; + buf = new char[strlen(c)+1]; + e = buf; strcpy(buf, c); /* remove leading spaces */ ++++++ 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 <linux/kernel.h> -#include <linux/sys.h> #include <sys/sysinfo.h> #endif ++++++ dx-4.4.4-manpage.patch ++++++ --- man/manl/Makefile.am +++ man/manl/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man - -man_MANS = dx.l -EXTRA_DIST = $(man_MANS) +man1_MANS = dx.l +EXTRA_DIST = $(man1_MANS) ++++++ dx-4.4.4-mem-leak-fix.patch ++++++ Index: src/uipp/dxl/send.c =================================================================== --- src/uipp/dxl/send.c.orig +++ src/uipp/dxl/send.c @@ -202,13 +202,14 @@ int /* packet id that was sent, -1 o DXLSendPacket(DXLConnection *conn, DXLPacketTypeEnum ptype, const char *string) { int l = STRLEN(string); - char *buffer = malloc(l + 50); - int packetId, sts = 0; + int packetId, sts = 0; int written = 0; if (!conn || conn->fd < 0 || (ptype > _DXLNumPackets) || (ptype <= 0)) return ERROR; + char *buffer = malloc(l + 50); + packetId = conn->id++; ++++++ dx-4.4.4-missing-sentinel.patch ++++++ --- src/uipp/base/StartWebBrowser.C +++ src/uipp/base/StartWebBrowser.C @@ -147,7 +147,7 @@ if (child == 0) { int grandchild = fork(); if (grandchild == 0) { - int ret = execlp(webApp, webApp, URL, NULL); + int ret = execlp(webApp, webApp, URL, (char *)NULL); if (!ret) fprintf(stderr, "Unable to start web browser.\n"); exit (0); } ++++++ dx-4.4.4-open.patch ++++++ --- src/exec/libdx/fileio.c +++ src/exec/libdx/fileio.c @@ -263,7 +263,7 @@ case 2:/* read/write */ fd = open(name, O_RDWR); if (fd < 0) { - fd = open(name, O_WRONLY | O_CREAT); + fd = open(name, O_WRONLY | O_CREAT, 0660); if (fd < 0) { DXSetError(ERROR_DATA_INVALID, "can't open/create file '%s'", name); ++++++ dx-4.4.4-return_value.patch ++++++ --- src/uipp/dxuilib/UndoMove.C +++ src/uipp/dxuilib/UndoMove.C @@ -154,6 +154,7 @@ return dec; } } + return NULL; /* Added to avoid gcc warning. Suggesting while will ends succesfully. */ } boolean UndoDecoratorMove::canUndo() ++++++ dx-4.4.4-rights.patch ++++++ --- src/uipp/java/server/Makefile.am +++ src/uipp/java/server/Makefile.am @@ -30,5 +30,5 @@ install-exec-local: $(mkinstalldirs) $(DESTDIR)$(srvoutputdir) $(mkinstalldirs) $(DESTDIR)$(userhtmldir) - chmod 777 $(DESTDIR)$(srvoutputdir) - chmod 777 $(DESTDIR)$(userhtmldir) + chmod 755 $(DESTDIR)$(srvoutputdir) + chmod 755 $(DESTDIR)$(userhtmldir) ++++++ dx-4.4.4-string.patch ++++++ ++++ 1170 lines (skipped) ++++++ dx-4.4.4-undefined_code.patch ++++++ --- src/uipp/dxuilib/ImageFormatDialog.C +++ src/uipp/dxuilib/ImageFormatDialog.C @@ -226,7 +226,7 @@ XmNdValueStep, DoubleVal(inc, dx_l2), XmNdValue, DoubleVal(value, dx_l1), XmNdMinimum, DoubleVal(min, dx_l3), - XmNdMaximum, DoubleVal(max, dx_l3), + XmNdMaximum, DoubleVal(max, dx_l4), XmNdecimalPlaces, 2, XmNfixedNotation, False, XmNeditable, True, ++++++ dx-4.4.4-uninitialized_var.patch ++++++ --- src/exec/dpexec/command.c +++ src/exec/dpexec/command.c @@ -425,6 +425,7 @@ int optlen = 0; int opterr = FALSE; + dpentry.SwapMsg = 0; if(add) { if(options && *options != '-') { /* print error but add to table anyway */ --- src/exec/dpexec/remote.c +++ src/exec/dpexec/remote.c @@ -754,6 +754,15 @@ return _dxfExRemote(in, out); } +void +_dxfExRemoteDXqmessage(char *who, char *message, ...) +{ + va_list arg; + va_start(arg,message); + DXqmessage(who, message, arg); + va_end(arg); +} + Error _dxfExRemote (Object *in, Object *out) { @@ -991,7 +1000,7 @@ if (!msgObj || !DXExtractString(msgObj, &msg)) goto message_cleanup; - DXqmessage (who, msg, nolist); + _dxfExRemoteDXqmessage (who, msg); } /* async request */ if (isMsg == 2) --- src/exec/dxmods/_regstream.c +++ src/exec/dxmods/_regstream.c @@ -1063,6 +1063,13 @@ mOut.b[0] = -(mIn.b[0]*mOut.A[0][0] + mIn.b[1]*mOut.A[0][1]); mOut.b[1] = -(mIn.b[0]*mOut.A[1][0] + mIn.b[1]*mOut.A[1][1]); +/* initialize third component of matrix to zero */ + mOut.A[0][2] = 0; + mOut.A[1][2] = 0; + mOut.A[2][0] = 0; + mOut.A[2][1] = 0; + mOut.A[2][2] = 0; + mOut.b[2] = 0; return mOut; } } --- src/exec/hwrender/hwDraw.c +++ src/exec/hwrender/hwDraw.c @@ -63,7 +63,7 @@ DEFGLOBALDATA(globals); DEFPORT(PORT_HANDLE); gatherO gather = NULL; - int r; + int r = 0; #if defined(DX_NATIVE_WINDOWS) --- src/exec/libdx/axes.c +++ src/exec/libdx/axes.c @@ -291,7 +291,7 @@ static Matrix zero; /* zero matrix */ Matrix t; /* matrix */ float z; /* z distance above face for marks */ - Object font=NULL; /* font for labels */ + Object font = NULL; /* font for labels */ static float ascent; /* baseline to top of label */ float xwidth; /* max width of x axis tick labels */ float ywidth; /* max width of y axis tick labels */ --- src/uipp/dxuilib/GraphLayout.C +++ src/uipp/dxuilib/GraphLayout.C @@ -1405,7 +1405,7 @@ // void GraphLayout::repositionNewPlacements (Node* root, boolean disjoint, List& placed) { - Node* n; + Node* n = NULL; NodeInfo* ninfo = (NodeInfo*)root->getLayoutInformation(); LayoutGroup* group = ninfo->getLayoutGroup(); placed.appendElement(root); --- src/uipp/widgets/findcolor.c +++ src/uipp/widgets/findcolor.c @@ -138,6 +138,8 @@ tmp.green = cell_def[i].green; tmp.blue = cell_def[i].blue; tmp.pixel = cell_def[i].pixel; + tmp.flags = DoRed | DoGreen | DoBlue; + tmp.pad = 0; } break; default: ++++++ dx-4.4.4-xkiso.patch ++++++ --- src/uipp/widgets/Number.c +++ src/uipp/widgets/Number.c @@ -50,6 +50,8 @@ #include <Xm/Xm.h> #include <Xm/DrawP.h> #include <Xm/GadgetP.h> +#define XK_XKB_KEYS +#include <X11/keysymdef.h> #include <math.h> /* Define pow */ #include "FFloat.h" #include "NumberP.h" ++++++ dx.desktop ++++++ [Desktop Entry] Type=Application Exec=dx Name=Data Explorer ++++++ dxsamples-4.4.0-DESTDIR.patch ++++++ --- acinclude.m4 +++ acinclude.m4 @@ -18,7 +18,7 @@ AC_CACHE_CHECK([for dx install path], ac_cv_dx_install_path, [ AC_MSG_RESULT(locating) -DX_DEFAULT_INST=/usr/local/dx +DX_DEFAULT_INST=/opt/dx AC_CHECK_PROGS( DX, dx ) DXINST="" @@ -55,7 +55,12 @@ [ AC_MSG_CHECKING(for platform architecture via dx -whicharch) AC_CHECK_PROGS( DX, dx ) - DXARCH=`$DX -whicharch` + if test -e $DX ; then + DXARCH=`$DX -whicharch` + else + chmod 755 $RPM_BUILD_DIR/dx-$VERSION/bin/dxworker + DXARCH=`$RPM_BUILD_DIR/dx-$VERSION/bin/dxworker -whicharch` + fi AC_MSG_RESULT(found $DXARCH) ]) --- programs/2D_DATA/Makefile.am +++ programs/2D_DATA/Makefile.am @@ -35,9 +35,9 @@ UsingOverlay.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/3D_DATA/Makefile.am +++ programs/3D_DATA/Makefile.am @@ -75,9 +75,9 @@ WindVorticity.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/ANNOTATION/Makefile.am +++ programs/ANNOTATION/Makefile.am @@ -59,9 +59,9 @@ UsingTextAndTextGlyphs.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/CATEGORICAL/Makefile.am +++ programs/CATEGORICAL/Makefile.am @@ -19,9 +19,9 @@ ZipCodes.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/COLORMAP_EDITOR/Makefile.am +++ programs/COLORMAP_EDITOR/Makefile.am @@ -15,9 +15,9 @@ VolumeRendering.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/COMPUTE/Makefile.am +++ programs/COMPUTE/Makefile.am @@ -15,9 +15,9 @@ WarpingPositions.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/DATA_DRIVEN_INTERACTORS/Makefile.am +++ programs/DATA_DRIVEN_INTERACTORS/Makefile.am @@ -11,9 +11,9 @@ Imide_potential.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/DEBUGGING/Makefile.am +++ programs/DEBUGGING/Makefile.am @@ -9,9 +9,9 @@ VisualObject.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/DISTRIBUTED_PROCESSING/Makefile.am +++ programs/DISTRIBUTED_PROCESSING/Makefile.am @@ -7,9 +7,9 @@ Distributed.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/IMAGE_PROCESSING/Makefile.am +++ programs/IMAGE_PROCESSING/Makefile.am @@ -19,9 +19,9 @@ UsingOverlay.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/IMPORTING/Makefile.am +++ programs/IMPORTING/Makefile.am @@ -17,9 +17,9 @@ ZipCodes.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/INTERFACE_CONTROL/Makefile.am +++ programs/INTERFACE_CONTROL/Makefile.am @@ -13,9 +13,9 @@ InterfaceControl3.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/LOOPING/Makefile.am +++ programs/LOOPING/Makefile.am @@ -11,9 +11,9 @@ SimpleGetSetLoop.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/MISC/Makefile.am +++ programs/MISC/Makefile.am @@ -57,9 +57,9 @@ UsingSwitchAndRoute.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/PLOTTING/Makefile.am +++ programs/PLOTTING/Makefile.am @@ -31,9 +31,9 @@ UsingEqualize.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/PROBES/Makefile.am +++ programs/PROBES/Makefile.am @@ -13,9 +13,9 @@ UsingStreakline.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/RENDERING/Makefile.am +++ programs/RENDERING/Makefile.am @@ -25,9 +25,9 @@ VolumeRenderingSimple.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/SCATTERED/Makefile.am +++ programs/SCATTERED/Makefile.am @@ -11,9 +11,9 @@ ScatterData.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/SEQUENCER/Makefile.am +++ programs/SEQUENCER/Makefile.am @@ -25,9 +25,9 @@ Streamline.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/SIMPLE/Makefile.am +++ programs/SIMPLE/Makefile.am @@ -89,9 +89,9 @@ VisualObject.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' --- programs/SUPERVISE/Makefile.am +++ programs/SUPERVISE/Makefile.am @@ -17,9 +17,9 @@ SupervisePicking.net myinstall: - $(mkinstalldirs) $(sampleprogdir) - @-sh -c '( echo "cd $(sampleprogdir)" ; \ - cd $(sampleprogdir) && for s in $(LINKLIST) ; do \ + $(mkinstalldirs) $(DESTDIR)$(sampleprogdir) + @-sh -c '( echo "cd $(DESTDIR)$(sampleprogdir)" ; \ + cd $(DESTDIR)$(sampleprogdir) && for s in $(LINKLIST) ; do \ $(LN_S) ../$$s $$s ; \ echo "$(LN_S) ../$$s $$s" ; \ done )' ++++++ dxsamples-4.4.0-java.patch ++++++ --- acinclude.m4 +++ acinclude.m4 @@ -167,8 +167,8 @@ if test -r "$DXINST/lib_$DXARCH/arch.mak" ; then DX_JAVA_CLASSPATH=`grep DX_JAVA_CLASSPATH $DXINST/lib_$DXARCH/arch.mak | sed -e "s/DX_JAVA_CLASSPATH =//" -e "s/ //"` fi -if test -r "$DXINST/java/htmlpages/dx.jar" ; then - DX_JAR="$DXINST/java/htmlpages/dx.jar" +if test -r "$RPM_BUILD_DIR/dx-$VERSION/src/uipp/java/dx.jar" ; then + DX_JAR="$RPM_BUILD_DIR/dx-$VERSION/src/uipp/java/dx.jar" AC_MSG_RESULT([$DX_JAR]) ifelse([$1], , , [$1]) else ++++++ dxsamples-4.4.0-rights.patch ++++++ --- java/nets/Makefile.am +++ java/nets/Makefile.am @@ -22,4 +22,4 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(javanetsdir) - chmod 777 $(DESTDIR)$(javanetsdir) + chmod 755 $(DESTDIR)$(javanetsdir) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
