<!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>[142843] trunk/dports/gnome/gtk3</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/142843">142843</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-11-24 11:02:50 -0800 (Tue, 24 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtk3: reformat/reorganize, no functional change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3Portfile">trunk/dports/gnome/gtk3/Portfile</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3">trunk/dports/gnome/gtk3/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegtk3"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gtk3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142604
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
</span><span class="cx">/users/rmstonecipher/gnome/gtk3:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142842
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
</span><span class="cx">/users/rmstonecipher/gnome/gtk3:102363-103172
</span><a id="trunkdportsgnomegtk3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gtk3/Portfile (142842 => 142843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtk3/Portfile 2015-11-24 19:01:40 UTC (rev 142842)
+++ trunk/dports/gnome/gtk3/Portfile 2015-11-24 19:02:50 UTC (rev 142843)
</span><span class="lines">@@ -19,11 +19,10 @@
</span><span class="cx">
</span><span class="cx"> description GTK+ widget toolkit
</span><span class="cx">
</span><del>-long_description \
- GTK+ is a highly usable, feature-rich toolkit for creating graphical user \
- interfaces, which boasts cross-platform compatibility and an easy-to-use \
- API. GTK+ is written in C, but has bindings to many other popular \
- programming languages, such as C++, Python and C#, among others.
</del><ins>+long_description GTK+ is a highly usable, feature-rich toolkit for creating graphical user \
+ interfaces, which boasts cross-platform compatibility and an easy-to-use \
+ API. GTK+ is written in C, but has bindings to many other popular \
+ programming languages, such as C++, Python and C#, among others.
</ins><span class="cx">
</span><span class="cx"> homepage http://www.gtk.org/
</span><span class="cx"> distname ${real_name}-${version}
</span><span class="lines">@@ -35,12 +34,9 @@
</span><span class="cx"> sha256 107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852
</span><span class="cx">
</span><span class="cx"> minimum_xcodeversions {9 3.1}
</span><ins>+
</ins><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-# cloudprint backend requires rest, json-glib
-# but this causes a circular dependency on libsoup
-# explicitly disable cloudprint for now
-
</del><span class="cx"> depends_lib port:atk \
</span><span class="cx"> path:lib/pkgconfig/pango.pc:pango \
</span><span class="cx"> port:gdk-pixbuf2 \
</span><span class="lines">@@ -51,25 +47,17 @@
</span><span class="cx"> depends_run port:shared-mime-info \
</span><span class="cx"> port:hicolor-icon-theme
</span><span class="cx">
</span><del>-archcheck.files \
- lib/libatk-1.0.dylib \
- lib/libintl.dylib \
- lib/libjasper.dylib \
- lib/libpango-1.0.dylib \
- lib/libtiff.dylib
</del><ins>+archcheck.files lib/libatk-1.0.dylib \
+ lib/libintl.dylib \
+ lib/libjasper.dylib \
+ lib/libpango-1.0.dylib \
+ lib/libtiff.dylib
</ins><span class="cx">
</span><span class="cx"> patchfiles nawk.patch
</span><span class="cx">
</span><del>-configure.args --enable-static \
- --disable-glibtest \
- --enable-introspection \
- --disable-cloudprint \
- --disable-mir-backend \
- --disable-wayland-backend \
- --disable-schemas-compile \
- gio_can_sniff=yes
</del><span class="cx">
</span><span class="cx"> # gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><ins>+
</ins><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> foreach arch ${configure.universal_archs} {
</span><span class="cx"> lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span class="lines">@@ -84,19 +72,36 @@
</span><span class="cx"> CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.args-append V=1 \
- CPP_FOR_BUILD="${configure.cpp}"
-
-configure.ccache no
-configure.cppflags-append -DX_LOCALE
-configure.cflags-append -fstrict-aliasing
-
</del><span class="cx"> pre-configure {
</span><span class="cx"> if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span class="cx"> error "Either +x11 or +quartz is required"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.ccache no
+
+configure.cppflags-append \
+ -DX_LOCALE
+
+configure.cflags-append \
+ -fstrict-aliasing
+
+# cloudprint backend requires rest, json-glib
+# but this causes a circular dependency on libsoup
+# explicitly disable cloudprint for now
+
+configure.args --enable-static \
+ --disable-glibtest \
+ --enable-introspection \
+ --disable-cloudprint \
+ --disable-mir-backend \
+ --disable-wayland-backend \
+ --disable-schemas-compile \
+ gio_can_sniff=yes
+
+build.args-append V=1 \
+ CPP_FOR_BUILD="${configure.cpp}"
+
</ins><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span><span class="lines">@@ -118,15 +123,6 @@
</span><span class="cx"> reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-3.0/gtk.immodules
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-activate {
- ui_debug "Updating gdk-pixbuf.loaders..."
- system "${prefix}/bin/gdk-pixbuf-query-loaders \
- >${prefix}/etc/gtk-3.0/gdk-pixbuf.loaders"
- ui_debug "Updating GLib schemas..."
- system "${prefix}/bin/glib-compile-schemas \
- ${prefix}/share/glib-2.0/schemas"
-}
-
</del><span class="cx"> platform darwin 8 {
</span><span class="cx"> # The rules enabled by gobject-introspection require GNU make 3.81+
</span><span class="cx"> depends_build-append port:gmake
</span><span class="lines">@@ -141,10 +137,6 @@
</span><span class="cx"> configure.args-append --disable-cups
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset quartz]} {
- default_variants +x11
-}
-
</del><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> set cups /usr/bin/cups-config
</span><span class="cx"> if {[info exists universal_sysroot]} {
</span><span class="lines">@@ -231,20 +223,31 @@
</span><span class="cx"> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span><span class="cx"> require_active_variants path:lib/pkgconfig/pango.pc:pango x11
</span><span class="cx">
</span><del>- depends_lib-append \
- port:xorg-libXi \
- port:xorg-libXrandr \
- port:xorg-libXcursor \
- port:xorg-libXinerama \
- port:xorg-libXdamage \
- port:xorg-libXcomposite \
- port:xorg-libXfixes \
- port:at-spi2-atk
</del><ins>+ depends_lib-append port:xorg-libXi \
+ port:xorg-libXrandr \
+ port:xorg-libXcursor \
+ port:xorg-libXinerama \
+ port:xorg-libXdamage \
+ port:xorg-libXcomposite \
+ port:xorg-libXfixes \
+ port:at-spi2-atk
</ins><span class="cx">
</span><del>- configure.args-append --enable-xinerama \
- --x-include=${prefix}/include --x-lib=${prefix}/lib \
- --enable-x11-backend
</del><ins>+ configure.args-append --enable-xinerama \
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib \
+ --enable-x11-backend
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+if {![variant_isset quartz]} {
+ default_variants +x11
+}
+
+post-activate {
+ ui_debug "Updating gdk-pixbuf.loaders..."
+ system "${prefix}/bin/gdk-pixbuf-query-loaders >${prefix}/etc/gtk-3.0/gdk-pixbuf.loaders"
+ ui_debug "Updating GLib schemas..."
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
</ins><span class="cx"> livecheck.type gnome
</span><span class="cx"> livecheck.name gtk+
</span></span></pre>
</div>
</div>
</body>
</html>