FreeBSD Bugzilla – Attachment 155842 Details for
Bug 199539
math/plplot: upgrading to 5.11.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch science/gnudatalanguage to fix build with plplot 5.11.0
gnudatalanguage.diff (text/plain), 7.56 KB, created by
Ben Woods
on 2015-04-22 11:27:20 UTC
(
hide
)
Description:
Patch science/gnudatalanguage to fix build with plplot 5.11.0
Filename:
MIME Type:
Creator:
Ben Woods
Created:
2015-04-22 11:27:20 UTC
Size:
7.56 KB
patch
obsolete
>Index: science/gnudatalanguage/Makefile >=================================================================== >--- science/gnudatalanguage/Makefile (revision 384430) >+++ science/gnudatalanguage/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= gnudatalanguage > DISTVERSION= 0.9.5 >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= science lang > MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} > .if defined(BUILD_PYTHON_MODULE) >@@ -16,7 +16,7 @@ > > LICENSE= GPLv2 > >-LIB_DEPENDS+= libplplotd.so:${PORTSDIR}/math/plplot \ >+LIB_DEPENDS+= libplplot.so:${PORTSDIR}/math/plplot \ > libpng.so:${PORTSDIR}/graphics/png \ > libps.so:${PORTSDIR}/print/pslib \ > libgsl.so:${PORTSDIR}/math/gsl >Index: science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake >=================================================================== >--- science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake (revision 0) >+++ science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake (working copy) >@@ -0,0 +1,13 @@ >+--- CMakeModules/FindPlplot.cmake.orig 2015-04-21 22:53:45 UTC >++++ CMakeModules/FindPlplot.cmake >+@@ -9,8 +9,8 @@ >+ # >+ >+ >+-find_library(PLPLOT_LIBRARY NAMES plplotd) >+-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd) >++find_library(PLPLOT_LIBRARY NAMES plplot) >++find_library(PLPLOTCXX_LIBRARY NAMES plplotcxx) >+ set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY}) >+ find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h) >+ include(FindPackageHandleStandardArgs) > >Property changes on: science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: science/gnudatalanguage/files/patch-src_plotting__contour.cpp >=================================================================== >--- science/gnudatalanguage/files/patch-src_plotting__contour.cpp (revision 0) >+++ science/gnudatalanguage/files/patch-src_plotting__contour.cpp (working copy) >@@ -0,0 +1,75 @@ >+--- src/plotting_contour.cpp.orig 2015-04-22 11:10:10 UTC >++++ src/plotting_contour.cpp >+@@ -789,8 +789,8 @@ namespace lib >+ 1, value, >+ static_cast<PLFLT>(( *thick )[i%thick->N_Elements()]), >+ 0,0,0,0, >+- (plstream::fill), (oneDim), >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ (plcallback::fill), (oneDim), >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } >+ actStream->psty(0); >+ // if (docolors) gdlSetGraphicsForegroundColorFromKw( e, actStream ); >+@@ -808,8 +808,8 @@ namespace lib >+ clevel[i], maxmax, >+ 1,value, >+ 0,0,0,0,0, >+- plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } >+ } else { //every other case of fill >+ // note that plshades is not protected against 1 level (color formula is >+@@ -818,8 +818,8 @@ namespace lib >+ if (nlevel>2 && !(docolors)) { //acceleration with shades when no c_colors are given. use continuous table1, decomposed or not. >+ //acceleration is most sensible when a (x,y) transform (rotate, stretch) is in place since plplot does not recompute the map. >+ actStream->shades( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd, >+- clevel, nlevel, 1, 0, 0, plstream::fill, (oneDim), >+- (oneDim)?(plstream::tr1):(plstream::tr2), >++ clevel, nlevel, 1, 0, 0, plcallback::fill, (oneDim), >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), >+ (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } >+ else { //fill with colors defined with c_colors or n<=2 >+@@ -832,8 +832,8 @@ namespace lib >+ clevel[i], maxmax, >+ 1,value, >+ 0,0,0,0,0, >+- plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } else >+ printf(" Problem, sorry! plplot doesn't like to FILL with a single level!"); >+ } >+@@ -854,7 +854,7 @@ namespace lib >+ if (doT3d) { //no label in T3D , bug in plplot... >+ actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 ); >+ actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } else { >+ if (dolabels && i<labels->N_Elements()) >+ { >+@@ -862,16 +862,16 @@ namespace lib >+ //else (lables thicker than contours) impossible with plplot... >+ actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 ); >+ actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label >+ actStream->Thick(label_thick); >+ } >+ actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING*sqrt(label_size),(PLINT)(*labels)[i] ); >+ actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ if (!dothick) gdlSetPenThickness(e, actStream); >+ } else { >+ actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, >+- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); >+ } >+ } >+ } > >Property changes on: science/gnudatalanguage/files/patch-src_plotting__contour.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=155842">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
woodsb02
:
maintainer-approval?
(
thierry
)
Actions:
View
|
Diff
Attachments on
bug 199539
:
155725
|
155771
|
155772
|
155773
|
155822
|
155823
| 155842 |
155843