<!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>[153690] trunk/dports/graphics</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/153690">153690</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-10-07 21:19:18 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2, gimp2-devel, gimp3-devel: remove dependency on deprecated webkit-gtk, webkit-gtk3 (#52400).
* remove +help_browser variant which depends on webkit-gtk, webkit-gkt3
* patch default preferences file etc/gimprc to access online help docs via
an external web-browser using 'en' locale.
* add runtime dependency on epiphany to provide such a browser
* increment revision to rebuild with new webkit-gtk free configuration</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2filespatchetcgimprcdiff">trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp2develPortfile">trunk/dports/graphics/gimp2-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2develfilespatchetcgimprcdiff">trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff</a></li>
<li><a href="#trunkdportsgraphicsgimp3develPortfile">trunk/dports/graphics/gimp3-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp3develfilespatchetcgimprcdiff">trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2/Portfile 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> conflicts gimp2-devel gimp3-devel
</span><span class="cx"> # please remember to update the gimp metapackage to match
</span><span class="cx"> version 2.8.18
</span><ins>+revision 1
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -69,6 +70,8 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><ins>+depends_run port:epiphany
+
</ins><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span class="cx"> # redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
</span><span class="cx">
</span><span class="lines">@@ -156,25 +159,14 @@
</span><span class="cx"> configure.args-append --without-x
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant help_browser description {Enable Gimp help browser} {
- depends_run path:share/gimp/2.0/help:gimp-help-en
- configure.args-delete --without-webkit
-
- if {${configure.cxx_stdlib} eq "libstdc++"} {
- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
- } else {
- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
- }
-}
-
</del><span class="cx"> #
</span><span class="cx"> # set default variants
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> if {[variant_isset quartz]} {
</span><del>- default_variants -gvfs +help_browser +python27
</del><ins>+ default_variants -gvfs +python27
</ins><span class="cx"> } else {
</span><del>- default_variants +help_browser +python27
</del><ins>+ default_variants +python27
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filespatchetcgimprcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -1,11 +1,31 @@
</span><del>---- etc/gimprc.orig 2014-08-25 12:49:30.000000000 -0700
-+++ etc/gimprc 2014-08-25 19:08:51.000000000 -0700
-@@ -684,6 +684,8 @@
</del><ins>+--- etc/gimprc.orig 2016-07-12 18:01:30.000000000 -0700
++++ etc/gimprc 2016-10-07 15:35:54.000000000 -0700
+@@ -661,17 +661,20 @@
+ # string value.
</ins><span class="cx"> #
</span><ins>+ # (help-locales "")
++(help-locales "en")
+
+ # Sets the browser used by the help system. Possible values are gimp and
+ # web-browser.
+ #
+ # (help-browser gimp)
++(help-browser web-browser)
+
+ # When enabled, the online user manual will be used by the help system.
+ # Otherwise the locally installed copy is used. Possible values are yes and
+ # no.
+ #
+ # (user-manual-online no)
++(user-manual-online yes)
+
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled. This is a string value.
+@@ -683,6 +686,7 @@
+ # windows. Possible values are normal, utility and keep-above.
+ #
</ins><span class="cx"> # (dock-window-hint utility)
</span><ins>++(dock-window-hint normal)
</ins><span class="cx">
</span><del>-+(dock-window-hint normal)
-+
</del><span class="cx"> # Sets the pixel format to use for mouse pointers. Possible values are
</span><span class="cx"> # bitmap and pixbuf.
</span><del>- #
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2-devel/Portfile (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/Portfile 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> set git_commit 8370fb13a7458e04ed86fe6bff61912d720dbda5
</span><span class="cx"> set git_date 20160517
</span><span class="cx"> version 2.9.3-${git_date}
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><ins>+depends_run port:epiphany
+
</ins><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span class="cx"> # redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
</span><span class="cx">
</span><span class="lines">@@ -139,22 +141,11 @@
</span><span class="cx"> configure.args-append --without-x
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant help_browser description {Enable Gimp help browser} {
- depends_run path:share/gimp/2.0/help:gimp-help-en
- configure.args-delete --without-webkit
-
- if {${configure.cxx_stdlib} eq "libstdc++"} {
- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
- } else {
- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
- }
-}
-
</del><span class="cx"> #
</span><span class="cx"> # set default variants
</span><span class="cx"> #
</span><span class="cx">
</span><del>-default_variants +help_browser +python27
</del><ins>+default_variants +python27
</ins><span class="cx">
</span><span class="cx"> # create unversioned symbolic link to versioned executable for compatibility with gimp-app
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2develfilespatchetcgimprcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -1,11 +1,32 @@
</span><del>---- etc/gimprc.orig 2015-06-30 10:42:07.000000000 -0700
-+++ etc/gimprc 2015-07-01 06:15:27.000000000 -0700
-@@ -727,6 +727,8 @@
</del><ins>+--- etc/gimprc.orig 2016-05-17 11:07:38.000000000 -0700
++++ etc/gimprc 2016-10-07 18:24:54.000000000 -0700
+@@ -695,11 +695,13 @@
+ # string value.
</ins><span class="cx"> #
</span><ins>+ # (help-locales "")
++(help-locales "en")
+
+ # Sets the browser used by the help system. Possible values are gimp and
+ # web-browser.
+ #
+ # (help-browser gimp)
++(help-browser web-browser)
+
+ # When enabled, a search of actions will also return inactive actions.
+ # Possible values are yes and no.
+@@ -715,6 +717,7 @@
+ # no.
+ #
+ # (user-manual-online no)
++(user-manual-online yes)
+
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled. This is a string value.
+@@ -726,6 +729,7 @@
+ # windows. Possible values are normal, utility and keep-above.
+ #
</ins><span class="cx"> # (dock-window-hint utility)
</span><ins>++(dock-window-hint normal)
</ins><span class="cx">
</span><del>-+(dock-window-hint normal)
-+
</del><span class="cx"> # Sets the handedness for cursor positioning. Possible values are left and
</span><span class="cx"> # right.
</span><del>- #
</del></span></pre></div>
<a id="trunkdportsgraphicsgimp3develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/Portfile (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/Portfile 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp3-devel/Portfile 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> set git_commit fc73b3249d8b223bfa0a0434ea18d2c5b3bc57b8
</span><span class="cx"> set git_date 20160330
</span><span class="cx"> version 2.99.0-${git_date}
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories graphics
</span><span class="cx"> maintainers devans
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><ins>+depends_run port:epiphany
+
</ins><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span class="cx"> # redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
</span><span class="cx">
</span><span class="lines">@@ -148,22 +150,11 @@
</span><span class="cx"> configure.args-append --without-x
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant help_browser description {Enable Gimp help browser} {
- depends_run path:share/gimp/2.0/help:gimp-help-en
- configure.args-delete --without-webkit
-
- if {${configure.cxx_stdlib} eq "libstdc++"} {
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- } else {
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- }
-}
-
</del><span class="cx"> #
</span><span class="cx"> # set default variants
</span><span class="cx"> #
</span><span class="cx">
</span><del>-default_variants +help_browser +python27
</del><ins>+default_variants +python27
</ins><span class="cx">
</span><span class="cx"> # create unversioned symbolic link to versioned executable for compatibility with gimp-app
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp3develfilespatchetcgimprcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff (153689 => 153690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2016-10-08 04:19:18 UTC (rev 153690)
</span><span class="lines">@@ -1,11 +1,32 @@
</span><del>---- etc/gimprc.orig 2015-06-09 14:59:40.000000000 -0700
-+++ etc/gimprc 2015-07-01 12:08:41.000000000 -0700
-@@ -727,6 +727,8 @@
</del><ins>+--- etc/gimprc.orig 2016-05-17 11:07:38.000000000 -0700
++++ etc/gimprc 2016-10-07 18:24:54.000000000 -0700
+@@ -695,11 +695,13 @@
+ # string value.
</ins><span class="cx"> #
</span><ins>+ # (help-locales "")
++(help-locales "en")
+
+ # Sets the browser used by the help system. Possible values are gimp and
+ # web-browser.
+ #
+ # (help-browser gimp)
++(help-browser web-browser)
+
+ # When enabled, a search of actions will also return inactive actions.
+ # Possible values are yes and no.
+@@ -715,6 +717,7 @@
+ # no.
+ #
+ # (user-manual-online no)
++(user-manual-online yes)
+
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled. This is a string value.
+@@ -726,6 +729,7 @@
+ # windows. Possible values are normal, utility and keep-above.
+ #
</ins><span class="cx"> # (dock-window-hint utility)
</span><ins>++(dock-window-hint normal)
</ins><span class="cx">
</span><del>-+(dock-window-hint normal)
-+
</del><span class="cx"> # Sets the handedness for cursor positioning. Possible values are left and
</span><span class="cx"> # right.
</span><del>- #
</del></span></pre>
</div>
</div>
</body>
</html>