<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146839] trunk/dports/science/pymol/files</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146839">146839</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-03-18 11:00:46 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>science/pymol:
Remove unused patch files</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencepymolfilespymolclangdiff">trunk/dports/science/pymol/files/pymol-clang.diff</a></li>
<li><a href="#trunkdportssciencepymolfilessetup_pydiff">trunk/dports/science/pymol/files/setup_py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencepymolfilespymolclangdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/pymol/files/pymol-clang.diff (146838 => 146839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/pymol/files/pymol-clang.diff 2016-03-18 17:39:45 UTC (rev 146838)
+++ trunk/dports/science/pymol/files/pymol-clang.diff 2016-03-18 18:00:46 UTC (rev 146839)
</span><span class="lines">@@ -1,113 +0,0 @@
</span><del>-Index: layer0/ShaderMgr.cpp
-===================================================================
---- layer0/ShaderMgr.cpp (revision 4107)
-+++ layer0/ShaderMgr.cpp (working copy)
-@@ -665,7 +665,7 @@ void CShaderPrg_Update_Shaders_For_Backg
- }
-
- int CShaderPrg_Reload(PyMOLGlobals * G, char *name, char *v, char *f){
-- int status, howLong, needAttach = 0;
-+ int status, howLong;
- CShaderPrg * I = CShaderMgr_GetShaderPrg_NoSet(G->ShaderMgr, name);
- if (!I){
- CShaderMgr *SM = G->ShaderMgr;
-Index: layer0/Sphere.cpp
-===================================================================
---- layer0/Sphere.cpp (revision 4107)
-+++ layer0/Sphere.cpp (working copy)
-@@ -32,6 +32,9 @@ Z* -------------------------------------
- #define tau 0.8506508084F /* t=(1+sqrt(5))/2, tau=t/sqrt(1+t^2) */
- #define one 0.5257311121F /* one=1/sqrt(1+t^2) , unit sphere */
-
-+#define FAST_SPHERE_INIT
-+
-+#ifndef FAST_SPHERE_INIT
- static const float start_points[13][3] = {
- {tau, one, 0},
- {-tau, one, 0},
-@@ -69,6 +72,7 @@ static const int icosahedron[21][3] = {
- {7, 2, 9},
- {6, 10, 2}
- };
-+#endif
-
- static const int mesh[30][2] = {
- {0, 3},
-@@ -103,8 +107,6 @@ static const int mesh[30][2] = {
- {9, 10}
- };
-
--#define FAST_SPHERE_INIT
--
- #ifdef FAST_SPHERE_INIT
- #include"SphereData.h"
-
-Index: layer2/RepNonbonded.cpp
-===================================================================
---- layer2/RepNonbonded.cpp (revision 4107)
-+++ layer2/RepNonbonded.cpp (working copy)
-@@ -199,7 +199,7 @@ static void RepNonbondedRender(RepNonbon
- int ok = true;
- // 0.018f is found by trial and error
- // TODO: this is not sufficient to solve the problem of disappearing cylinders
-- float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view) * cPI / 180.0f * 0.018f;
-+ // float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view) * cPI / 180.0f * 0.018f;
-
- alpha =
- SettingGet_f(G, I->R.cs->Setting, I->R.obj->Setting, cSetting_nonbonded_transparency);
-@@ -208,7 +208,6 @@ static void RepNonbondedRender(RepNonbon
- alpha = 1.0F;
- if(ray) {
- float radius;
-- float pixel_radius = ray->PixelRadius;
- ray->transparentf(1.0F - alpha);
-
- if(I->Radius == 0.0F) {
-@@ -360,7 +359,6 @@ static void RepNonbondedRender(RepNonbon
- CShaderPrg *shaderPrg;
- if (nonbonded_as_cylinders){
- // vertex scale is bound so that cylinders cannot disappear when it gets too low
-- float vertex_scale = info->vertex_scale;
- float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
- if(pixel_scale_value < 0)
- pixel_scale_value = 1.0F;
-@@ -596,7 +594,6 @@ static void RepNonbondedRender(RepNonbon
- CShaderPrg *shaderPrg;
- if (nonbonded_as_cylinders){
- // vertex scale is bound so that cylinders cannot disappear when it gets too low
-- float vertex_scale = info->vertex_scale;
- float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
- if(pixel_scale_value < 0)
- pixel_scale_value = 1.0F;
-Index: layer2/RepWireBond.cpp
-===================================================================
---- layer2/RepWireBond.cpp (revision 4107)
-+++ layer2/RepWireBond.cpp (working copy)
-@@ -779,7 +779,6 @@ static void RepWireBondRender(RepWireBon
- CShaderPrg *shaderPrg;
- if (line_as_cylinders){
- // vertex scale is bound so that cylinders cannot disappear when it gets too low
-- float vertex_scale = info->vertex_scale;
- float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
- if(pixel_scale_value < 0)
- pixel_scale_value = 1.0F;
-@@ -973,7 +972,6 @@ static void RepWireBondRender(RepWireBon
- CShaderPrg *shaderPrg;
- if (line_as_cylinders){
- // vertex scale is bound so that cylinders cannot disappear when it gets too low
-- float vertex_scale = info->vertex_scale;
- float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
- if(pixel_scale_value < 0)
- pixel_scale_value = 1.0F;
-Index: layer3/Executive.cpp
-===================================================================
---- layer3/Executive.cpp (revision 4107)
-+++ layer3/Executive.cpp (working copy)
-@@ -13978,7 +13978,6 @@ void ExecutiveFullScreen(PyMOLGlobals *
-
- #ifndef _PYMOL_NO_GLUT
- if(G->HaveGUI && G->ValidContext) {
-- CExecutive *I = G->Executive;
- if (flag) {
- #ifndef GLUT_FULL_SCREEN
- if(wm_flag < 1) {
</del></span></pre></div>
<a id="trunkdportssciencepymolfilessetup_pydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/pymol/files/setup_py.diff (146838 => 146839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/pymol/files/setup_py.diff 2016-03-18 17:39:45 UTC (rev 146838)
+++ trunk/dports/science/pymol/files/setup_py.diff 2016-03-18 18:00:46 UTC (rev 146839)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-Index: setup.py
-===================================================================
---- setup.py (revision 4106)
-+++ setup.py (working copy)
-@@ -264,7 +264,7 @@ else: # unix style (linux, mac, ...)
- try:
- prefix_path = os.environ['PREFIX_PATH'].split(os.pathsep)
- except KeyError:
-- prefix_path = ["/usr", "/usr/X11", "/opt/local", "/sw"]
-+ prefix_path = ["@PREFIX@", "/usr", "/usr/X11"]
-
- for prefix in prefix_path:
- inc_dirs += filter(os.path.isdir, [prefix + s for s in ["/include", "/include/freetype2", "/include/libxml2"]])
</del></span></pre>
</div>
</div>
</body>
</html>