<!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>[118155] users/devans/GNOME-3/stable/dports</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/118155">118155</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-23 15:58:46 -0700 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: copy/merge unstable ports to stable in preparation for 3.12 stable release.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomealacartePortfile">users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomealacartefilespatchMakefileamdiff">users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomealacartefilespatchacincludem4diff">users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomealacartefilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeanjutaPortfile">users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeanjutafilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfPortfile">users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeempathyPortfile">users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeeogPortfile">users/devans/GNOME-3/stable/dports/gnome/eog/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeeogpluginsPortfile">users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevincePortfile">users/devans/GNOME-3/stable/dports/gnome/evince/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevolutiondataserverPortfile">users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff">users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefilerollerPortfile">users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegcrPortfile">users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmPortfile">users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmfilespatchdaemongdmsessionworkercdiff">users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeditfilespatchgeditgeditappcdiff">users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomebackgroundsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedesktopPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedesktopfilespatchgnomedesktopMakefileamdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedesktopfilespatchlibgnomedestktoplibgsystemdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedeveldocsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeiconthemePortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeiconthemesymbolicPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomekeyringPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomekeyringfilespatcheggeggarmorcdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomekeyringfilespatcheggeggasn1xhdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccountsfilespatchreturnvaliffaildiff">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessionmaincdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesettingsdaemonPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesettingsdaemonfilespatchpluginsdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesystemmonitorPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesystemmonitorfilespatchsrcprocpropertiescppdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalfilesnodupfd_cloexecpatch">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalfilespatchuuiddiff">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeuserdocsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3appsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3appsfilesversionstxt">users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3corePortfile">users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3corefilesversionstxt">users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgdataPortfile">users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgnomekeyringPortfile">users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomenautilusPortfile">users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsePortfile">users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotemPortfile">users/devans/GNOME-3/stable/dports/gnome/totem/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevinoPortfile">users/devans/GNOME-3/stable/dports/gnome/vino/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevtePortfile">users/devans/GNOME-3/stable/dports/gnome/vte/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelptoolsPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpxslPortfile">users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherPortfile">users/devans/GNOME-3/stable/dports/net/libgweather/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygelPortfile">users/devans/GNOME-3/stable/dports/net/rygel/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygelfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/GNOME-3/stable/dports/comms/</li>
<li>users/devans/GNOME-3/stable/dports/comms/telepathy-glib/</li>
<li>users/devans/GNOME-3/stable/dports/devel/atk/</li>
<li>users/devans/GNOME-3/stable/dports/devel/geoclue2/</li>
<li>users/devans/GNOME-3/stable/dports/devel/glib2/</li>
<li>users/devans/GNOME-3/stable/dports/devel/glibmm/</li>
<li>users/devans/GNOME-3/stable/dports/devel/gvfs/</li>
<li>users/devans/GNOME-3/stable/dports/devel/json-glib/</li>
<li>users/devans/GNOME-3/stable/dports/devel/libgee/</li>
<li>users/devans/GNOME-3/stable/dports/devel/upower/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/at-spi2-atk/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/at-spi2-core/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpPortfile31192">users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile-3.11.92</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpfilespatchconfigurediff">users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile31192">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.11.92</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/epiphany/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmPortfile311921">users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmfilespatchdaemondiff">users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeditPortfile31192">users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/geocode-glib/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gjs/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/glib-networking/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile31192">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile-3.11.92</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files-3.11.92/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-font-viewer/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile31192">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile-3.11.92</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-panel/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-themes-standard/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gobject-introspection/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/grilo/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/grilo-plugins/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gsettings-desktop-schemas/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gtk3/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/gtksourceview3/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/libchamplain/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/libpeas/</li>
<li>users/devans/GNOME-3/stable/dports/gnome/libsoup/</li>
<li>users/devans/GNOME-3/stable/dports/graphics/</li>
<li>users/devans/GNOME-3/stable/dports/graphics/clutter-gst/</li>
<li>users/devans/GNOME-3/stable/dports/graphics/clutter-gtk/</li>
<li>users/devans/GNOME-3/stable/dports/lang/</li>
<li>users/devans/GNOME-3/stable/dports/lang/vala/</li>
<li>users/devans/GNOME-3/stable/dports/net/libgweather/files/</li>
<li>users/devans/GNOME-3/stable/dports/python/</li>
<li>users/devans/GNOME-3/stable/dports/python/py-gobject3/</li>
<li>users/devans/GNOME-3/stable/dports/x11/</li>
<li>users/devans/GNOME-3/stable/dports/x11/gtkmm3/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeanjutafilespatchpluginslanguagesupportvalaMakefileamdiff">users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelpPortfile">users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/eog/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchcalendarlibedatacalecalbackendintervaltreecdiff">users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdmfilespatchuseg_credentials_get_unix_piddiff">users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegeditPortfile">users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesystemmonitorfilespatchsrc_openfilescppdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminalfilespatchgetcwddiff">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-getcwd.diff</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/seahorse/files/</li>
<li>users/devans/GNOME-3/stable/dports/net/libgweather/files/</li>
<li><a href="#usersdevansGNOME3stabledportsnetrygelfilespatchreturndiff">users/devans/GNOME-3/stable/dports/net/rygel/files/patch-return.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomealacarte">users/devans/GNOME-3/stable/dports/gnome/alacarte/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeanjuta">users/devans/GNOME-3/stable/dports/gnome/anjuta/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedconf">users/devans/GNOME-3/stable/dports/gnome/dconf/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomedevhelp">users/devans/GNOME-3/stable/dports/gnome/devhelp/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeempathy">users/devans/GNOME-3/stable/dports/gnome/empathy/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeeog">users/devans/GNOME-3/stable/dports/gnome/eog/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeeogplugins">users/devans/GNOME-3/stable/dports/gnome/eog-plugins/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphany">users/devans/GNOME-3/stable/dports/gnome/epiphany/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevince">users/devans/GNOME-3/stable/dports/gnome/evince/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeevolutiondataserver">users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefileroller">users/devans/GNOME-3/stable/dports/gnome/file-roller/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomefolks">users/devans/GNOME-3/stable/dports/gnome/folks/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegcr">users/devans/GNOME-3/stable/dports/gnome/gcr/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegdm">users/devans/GNOME-3/stable/dports/gnome/gdm/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegedit">users/devans/GNOME-3/stable/dports/gnome/gedit/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomebackgrounds">users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecontrolcenter">users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedesktop">users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomedeveldocs">users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeicontheme">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeiconthemesymbolic">users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomekeyring">users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeonlineaccounts">users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesession">users/devans/GNOME-3/stable/dports/gnome/gnome-session/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesettingsdaemon">users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesystemmonitor">users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnometerminal">users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomeuserdocs">users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3apps">users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3core">users/devans/GNOME-3/stable/dports/gnome/gnome3-core/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgdata">users/devans/GNOME-3/stable/dports/gnome/libgdata/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgnomekeyring">users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomenautilus">users/devans/GNOME-3/stable/dports/gnome/nautilus/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorse">users/devans/GNOME-3/stable/dports/gnome/seahorse/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnometotem">users/devans/GNOME-3/stable/dports/gnome/totem/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevino">users/devans/GNOME-3/stable/dports/gnome/vino/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomevte">users/devans/GNOME-3/stable/dports/gnome/vte/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelp">users/devans/GNOME-3/stable/dports/gnome/yelp/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelptools">users/devans/GNOME-3/stable/dports/gnome/yelp-tools/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeyelpxsl">users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweather">users/devans/GNOME-3/stable/dports/net/libgweather/</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetrygel">users/devans/GNOME-3/stable/dports/net/rygel/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomealacarte"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/alacarte</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/alacarte:108271-117721
</span><span class="cx">/users/rmstonecipher/gnome/alacarte:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/alacarte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/alacarte:108271-117721
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/alacarte:117866-118151
</span><span class="cx">/users/rmstonecipher/gnome/alacarte:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomealacartePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name alacarte
</span><del>-version 3.10.0
</del><ins>+version 3.11.91
</ins><span class="cx"> epoch 1
</span><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2ad11884d64d337d36cf222e29e1fe7781ea660b \
- sha256 bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1
</del><ins>+checksums rmd160 234571ead2b7cce827645f75af7b699ff742b8c2 \
+ sha256 d77294f25ac9e4f293530080578d83dc8e014d5b7c6c01d6f9a7f1715719a384
</ins><span class="cx">
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><span class="lines">@@ -85,4 +85,4 @@
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomealacartefilespatchMakefileamdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.am.orig 2014-03-09 09:04:17.000000000 -0700
-+++ Makefile.am 2014-03-09 09:06:24.000000000 -0700
-@@ -4,16 +4,16 @@
</del><ins>+--- Makefile.am.orig 2014-02-07 08:07:17.000000000 -0800
++++ Makefile.am 2014-03-14 19:24:03.000000000 -0700
+@@ -8,16 +8,16 @@
</ins><span class="cx">
</span><span class="cx"> CLEANFILES=
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomealacartefilespatchacincludem4diff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- acinclude.m4.orig 2014-03-09 09:22:23.000000000 -0700
-+++ acinclude.m4 2014-03-09 09:23:17.000000000 -0700
-@@ -79,8 +79,8 @@
</del><ins>+--- acinclude.m4.orig 2014-02-07 08:04:52.000000000 -0800
++++ acinclude.m4 2014-03-14 19:23:00.000000000 -0700
+@@ -77,8 +77,8 @@
</ins><span class="cx"> dnl distinct variables so they can be overridden if need be. However,
</span><span class="cx"> dnl general consensus is that you shouldn't need this ability.
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomealacartefilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- configure.ac.orig 2014-03-09 08:56:46.000000000 -0700
-+++ configure.ac 2014-03-09 09:02:22.000000000 -0700
</del><ins>+--- configure.ac.orig 2014-03-03 05:01:44.000000000 -0800
++++ configure.ac 2014-03-14 19:20:22.000000000 -0700
</ins><span class="cx"> @@ -1,7 +1,7 @@
</span><span class="cx"> dnl -*- Mode: autoconf -*-
</span><span class="cx"> dnl Process this file with autoconf to produce a configure script.
</span><span class="cx"> AC_PREREQ(2.53)
</span><del>--AC_INIT(alacarte, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
-+AC_INIT(alacarte.py, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
</del><ins>+-AC_INIT(alacarte, 3.11.91, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
++AC_INIT(alacarte.py, 3.11.91, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
</ins><span class="cx"> m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
</span><span class="cx"> AC_CONFIG_SRCDIR(alacarte.in)
</span><span class="cx"> AC_CONFIG_HEADERS([config.h])
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeanjuta"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/anjuta</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/anjuta:108265-117820
</span><span class="cx">/users/devans/dports/gnome/anjuta:117797-117811
</span><span class="cx">/users/rmstonecipher/gnome/anjuta:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/anjuta:108265-117820
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/anjuta:116619-118151
</span><span class="cx">/users/devans/dports/gnome/anjuta:117797-117811
</span><span class="cx">/users/rmstonecipher/gnome/anjuta:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeanjutaPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name anjuta
</span><del>-version 3.10.2
-revision 1
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description A GNOME/GTK IDE
</span><span class="lines">@@ -19,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 d51e40a87cfb9157102c2490c3e78f5b701b8196 \
- sha256 ff16c646dbf0234f7056c697b2546125c89d43f8c1f5138a21409053c016d3bc
</del><ins>+checksums rmd160 4021f89b350864ca04416920c81efda6d7afca62 \
+ sha256 2a1bd681b5e8c65e7fa09d84f06edd205748fa923de26536bb30001cb7f41196
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -50,8 +49,7 @@
</span><span class="cx"> port:xdg-utils
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><del>- patch-ltmain.sh.diff \
- patch-plugins-language-support-vala-Makefile.am.diff
</del><ins>+ patch-ltmain.sh.diff
</ins><span class="cx">
</span><span class="cx"> #reconfigure with our intltool.m4 using autogen.sh
</span><span class="cx">
</span><span class="lines">@@ -134,4 +132,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeanjutafilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2014-03-11 14:12:24.000000000 -0700
-+++ configure.ac 2014-03-11 14:12:52.000000000 -0700
-@@ -101,7 +101,7 @@
</del><ins>+--- configure.ac.orig 2014-03-19 14:51:44.000000000 -0700
++++ configure.ac 2014-03-21 06:42:33.000000000 -0700
+@@ -102,7 +102,7 @@
</ins><span class="cx"> AC_SUBST(AM_CXXFLAGS)
</span><span class="cx">
</span><span class="cx"> ANJUTA_LDFLAGS="-no-undefined"
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeanjutafilespatchpluginslanguagesupportvalaMakefileamdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- plugins/language-support-vala/Makefile.am.orig 2014-03-12 22:11:19.000000000 -0700
-+++ plugins/language-support-vala/Makefile.am 2014-03-12 22:11:54.000000000 -0700
-@@ -40,8 +40,7 @@
- $(LIBANJUTA_CFLAGS) \
- $(VALA_CFLAGS) \
- -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
-- -DG_LOG_DOMAIN=\"language-support-vala\" \
-- --no-warn
-+ -DG_LOG_DOMAIN=\"language-support-vala\"
-
- # The plugin
- plugindir = $(anjuta_plugin_dir)
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedconf"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/dconf</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/dconf:113289-117677
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/dconf:116416-118151
</span><a id="usersdevansGNOME3stabledportsgnomedconfPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name dconf
</span><del>-version 0.18.0
-revision 1
</del><ins>+version 0.19.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -24,8 +23,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2d010c1998f093878f4be4ce8b46ee6066c9f9af \
- sha256 109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955
</del><ins>+checksums rmd160 e3ee36b0b82936126860ddadec79c37639d312c6 \
+ sha256 634bd8437fd08d864be4c2f47d18e01778b50ff890633837a2fbd2b2adf6707f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -60,4 +59,4 @@
</span><span class="cx"> system "${prefix}/bin/gio-querymodules ${prefix}/lib/gio/modules"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedevhelp"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/devhelp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/devhelp:108265-117651
</span><span class="cx">/users/rmstonecipher/gnome/devhelp:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/devhelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/devhelp:108265-117651
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/devhelp:116416-118152
</span><span class="cx">/users/rmstonecipher/gnome/devhelp:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomedevhelpPortfile"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name devhelp
-version 3.10.2
-license GPL-2+
-set branch [join [lrange [split ${version} .] 0 1] .]
-description Devhelp is an API documentation browser for GTK+ and GNOME.
-long_description \
- Devhelp is an API documentation browser for GTK+ and GNOME. It works \
- natively with gtk-doc (the API reference framework developed for GTK+ \
- and used throughout GNOME for API documentation). If you use gtk-doc \
- with your project, you can use Devhelp to browse the documentation.
-
-maintainers devans openmaintainer
-categories gnome
-platforms darwin
-homepage https://wiki.gnome.org/Apps/Devhelp
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 8aa043fb87408f5c723a1e4a199e6c77a65f5e25 \
- sha256 498cc367b9cb7924dd4905e9c3e7d9738f572e4735a769fc5de6e2f06bebf793
-
-depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common \
- port:autoconf \
- port:automake \
- port:libtool
-
-depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gtk3 \
- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
- depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- }
-}
-
-# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf
-
-post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-}
-
-configure.cmd ./autogen.sh
-
-configure.args --disable-schemas-compile
-
-variant python26 conflicts python27 description {Build using Python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_build-append port:python26
-}
-
-variant python27 conflicts python26 description {Build using Python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_build-append port:python27
-}
-
-if {![variant_isset python26]} {
- default_variants +python27
-}
-
-post-activate {
- system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
- system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
-}
-
-livecheck.type gnome
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedevhelpPortfile31192fromrev118152usersdevansGNOME3unstabledportsgnomedevhelpPortfile31192"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile-3.11.92 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/devhelp/Portfile-3.11.92) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile-3.11.92 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile-3.11.92 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 116644 2014-02-01 00:32:35Z devans@macports.org $
+
+PortSystem 1.0
+
+name devhelp
+version 3.11.92
+license GPL-2+
+set branch [join [lrange [split ${version} .] 0 1] .]
+description Devhelp is an API documentation browser for GTK+ and GNOME.
+long_description \
+ Devhelp is an API documentation browser for GTK+ and GNOME. It works \
+ natively with gtk-doc (the API reference framework developed for GTK+ \
+ and used throughout GNOME for API documentation). If you use gtk-doc \
+ with your project, you can use Devhelp to browse the documentation.
+
+maintainers devans openmaintainer
+categories gnome
+platforms darwin
+homepage https://wiki.gnome.org/Apps/Devhelp
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 fee18c3f1cb209eb4bc4de0213587eb602ebff1a \
+ sha256 625fb1e2adefef8bbf767977a6cd03ef080597d6bc397e1231bd1514873a8396
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
+
+depends_lib port:desktop-file-utils \
+ port:gnome-icon-theme \
+ port:gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
+# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
+configure.args --disable-schemas-compile
+
+variant python26 conflicts python27 description {Build using Python 2.6} {
+ configure.python ${prefix}/bin/python2.6
+ depends_build-append port:python26
+}
+
+variant python27 conflicts python26 description {Build using Python 2.7} {
+ configure.python ${prefix}/bin/python2.7
+ depends_build-append port:python27
+}
+
+if {![variant_isset python26]} {
+ default_variants +python27
+}
+
+post-activate {
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedevhelpfilespatchconfiguredifffromrev118152usersdevansGNOME3unstabledportsgnomedevhelpfilespatchconfigurediff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/devhelp/files/patch-configure.diff) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/devhelp/files/patch-configure.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- configure.orig 2014-01-15 02:32:30.000000000 -0800
++++ configure 2014-01-23 10:21:38.000000000 -0800
+@@ -13429,9 +13429,9 @@
+
+
+
+- PYTHON_PREFIX='${prefix}'
++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+
+- PYTHON_EXEC_PREFIX='${exec_prefix}'
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+
+
+
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeempathy"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/empathy</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/empathy:108265-117677
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/empathy:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomeempathyPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name empathy
</span><del>-version 3.10.3
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+ LGPL-2.1+ GFDL-1.3+ Attribution-ShareAlike-3.0
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Empathy is an instant-messaging(chat) program for GNOME
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 7b62ac6943013581d9d9e7ba1d19e534def391d4 \
- sha256 49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196
</del><ins>+checksums rmd160 f322523b35b617aefada5e8ed46c70131d28c0c8 \
+ sha256 87651003d5986564540f655182d3058df098b77754170bdae773a8ea2fa98871
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -161,4 +161,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeeog"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/eog</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/eog:108265-117194
</span><span class="cx">/users/rmstonecipher/gnome/eog:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/eog:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/eog:108265-117194
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/eog:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/eog:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeeogPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/eog/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/eog/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/eog/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name eog
</span><del>-version 3.10.2
-revision 3
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description An image viewing and cataloging program.
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 44527bdd11d8dcf87caeb939f131e7410511cfc6 \
- sha256 5ccc98609ca666420719383cc7d9b44335bbc0aacf048e38036d1f946ce54763
</del><ins>+checksums rmd160 ef39dccc772130813644dc0d99fa87412d5a00be \
+ sha256 997e7b192a45f738d44c9f2367c16fb7d8eb75a6588e7b1a7b00da545d71c213
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -51,8 +50,6 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles redefinition-buildfix.patch
-
</del><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -71,4 +68,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeeogplugins"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/eog-plugins</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/eog-plugins:113657-117823
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152
</span><a id="usersdevansGNOME3stabledportsgnomeeogpluginsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name eog-plugins
</span><del>-version 3.10.1
-revision 1
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Extra plugins for the Eye of GNOME image viewer
</span><span class="lines">@@ -19,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 28859d3ade22dc275b452a28930c8155fa89e65f \
- sha256 d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12
</del><ins>+checksums rmd160 ac9cb5b5c77818957839f9d1b6712e76817f3139 \
+ sha256 7d954383659a86971f02f0cef4ce0713dfe404a38697681f0682d1aa60e95662
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -35,8 +34,12 @@
</span><span class="cx"> port:libexif \
</span><span class="cx"> port:gsettings-desktop-schemas
</span><span class="cx">
</span><del>-# reconfigure with our intltool.m4
</del><ins>+# update m4/intltool.m4 and autoreconf
</ins><span class="cx">
</span><ins>+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="lines">@@ -44,21 +47,19 @@
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><del>-# provided python plugins use libpeas python2 loader only
-# libpeas python2 loader supports python27
</del><ins>+# requires python32 or later
</ins><span class="cx">
</span><del>-variant python27 description {Use python 2.7} {
- depends_lib-append port:py27-pygtk
- configure.python ${prefix}/bin/python2.7
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</del><ins>+variant python32 description {Use python 3.2} {
+ configure.python ${prefix}/bin/python3.2
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.2
</ins><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span class="cx"> configure.args-replace --disable-python --enable-python
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +python27
</del><ins>+default_variants +python32
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphany"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/epiphany</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/epiphany:108265-117652
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/epiphany:108265-117652
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name epiphany
-version 3.10.3
-license GPL-2+
-set branch [join [lrange [split ${version} .] 0 1] .]
-description A GNOME Web browser.
-long_description \
- A web browser is more than an application, it is a \
- way of thinking, it is a way of seeing the world. \
- Epiphany's principles are simplicity and standards \
- compliance.
-maintainers devans openmaintainer
-categories gnome www
-platforms darwin
-homepage https://wiki.gnome.org/Apps/Web
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 900d6b1ca9adff11287b6af0f1fafdac22a1c4a4 \
- sha256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7
-
-depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common
-
-depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gnome-icon-theme-symbolic \
- port:gtk3 \
- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
- port:gnome-desktop \
- port:libxslt\
- port:libsoup \
- port:libsecret \
- port:port:libnotify \
- port:libwnck3 \
- port:gsettings-desktop-schemas \
- port:nss \
- port:sqlite3 \
- port:gcr \
- port:avahi \
- port:xorg-libX11 \
- port:iso-codes
-
-depends_run port:gnome-settings-daemon
-
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
- depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- }
-}
-
-# update m4/intltool.m4 and autoreconf
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
- reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
-}
-
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.cflags-append -Wno-format-nonliteral
-
-configure.args --with-distributor-name=MacPorts \
- --disable-schemas-compile \
- --disable-tests
-
-post-activate {
- system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
-}
-
-#
-# nss is not universal
-#
-
-if {[variant_isset universal]} {
- configure.args-append --disable-nss
- depends_lib-delete port:nss
-}
-
-livecheck.type gnome
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfilefromrev118152usersdevansGNOME3unstabledportsgnomeepiphanyPortfile"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 117326 2014-02-22 04:50:33Z devans@macports.org $
+
+PortSystem 1.0
+
+name epiphany
+version 3.8.2
+revision 3
+license GPL-2+
+set branch [join [lrange [split ${version} .] 0 1] .]
+description A GNOME Web browser.
+long_description \
+ A web browser is more than an application, it is a \
+ way of thinking, it is a way of seeing the world. \
+ Epiphany's principles are simplicity and standards \
+ compliance.
+maintainers devans openmaintainer
+categories gnome www
+platforms darwin
+homepage https://wiki.gnome.org/Apps/Web
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 2aacd8b02f456e345b9f23ff6114d341bbf0013a \
+ sha256 ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:gnome-common
+
+depends_lib port:desktop-file-utils \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
+ port:gnome-desktop \
+ port:libxslt\
+ port:libsoup \
+ port:libsecret \
+ port:port:libnotify \
+ port:libwnck3 \
+ port:gsettings-desktop-schemas \
+ port:nss \
+ port:sqlite3 \
+ port:gcr \
+ port:avahi \
+ port:xorg-libX11 \
+ port:iso-codes
+
+depends_run port:gnome-settings-daemon
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
+patchfiles patch-configure.ac.diff
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+ reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.cflags-append -Wno-format-nonliteral
+
+configure.args --with-distributor-name=MacPorts \
+ --disable-schemas-compile \
+ --disable-tests
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
+#
+# nss is not universal
+#
+
+if {[variant_isset universal]} {
+ configure.args-append --disable-nss
+ depends_lib-delete port:nss
+}
+
+livecheck.type gnome
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile31192fromrev118152usersdevansGNOME3unstabledportsgnomeepiphanyPortfile31192"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.11.92 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/epiphany/Portfile-3.11.92) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.11.92 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile-3.11.92 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 116271 2014-01-23 17:32:19Z devans@macports.org $
+
+PortSystem 1.0
+
+name epiphany
+version 3.11.92
+license GPL-2+
+set branch [join [lrange [split ${version} .] 0 1] .]
+description A GNOME Web browser.
+long_description \
+ A web browser is more than an application, it is a \
+ way of thinking, it is a way of seeing the world. \
+ Epiphany's principles are simplicity and standards \
+ compliance.
+maintainers devans openmaintainer
+categories gnome www
+platforms darwin
+homepage https://wiki.gnome.org/Apps/Web
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 3d737cd1317877eebc82387215015d8cc63b997b \
+ sha256 65d40ffbe8db6aff926e19fefe056eefe1facb44cf94e3f8027bad23bc2f79da
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:gnome-common
+
+depends_lib port:desktop-file-utils \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
+ port:gnome-desktop \
+ port:libxslt\
+ port:libsoup \
+ port:libsecret \
+ port:port:libnotify \
+ port:libwnck3 \
+ port:gsettings-desktop-schemas \
+ port:nss \
+ port:sqlite3 \
+ port:gcr \
+ port:avahi \
+ port:xorg-libX11 \
+ port:iso-codes
+
+depends_run port:gnome-settings-daemon
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+ reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure.ac
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.cflags-append -Wno-format-nonliteral
+
+configure.args --with-distributor-name=MacPorts \
+ --disable-schemas-compile \
+ --disable-tests
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
+#
+# nss is not universal
+#
+
+if {[variant_isset universal]} {
+ configure.args-append --disable-nss
+ depends_lib-delete port:nss
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevince"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/evince</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/evince:108265-117324
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/evince:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomeevincePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/evince/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/evince/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name evince
</span><del>-version 3.10.3
-revision 1
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Evince is a document viewer for multiple document formats like pdf, and many others.
</span><span class="lines">@@ -19,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 4f53cfe7df43e4775b9d932b9a35db799a65669d \
- sha256 b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af
</del><ins>+checksums rmd160 7386adfcbf2dd5b7e62708b3905ce7ae1d4d2dab \
+ sha256 0378582f5925664c51dbe0b26b5604c86caab65d6a07bae62a243df8a94a3f00
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -47,6 +46,16 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+# teach glibtool about -stdlib=libc++
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx">
</span><span class="cx"> configure.args --disable-schemas-compile \
</span><span class="lines">@@ -63,16 +72,6 @@
</span><span class="cx"> --enable-comics \
</span><span class="cx"> --enable-t1lib
</span><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
-# teach glibtool about -stdlib=libc++
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
-
-use_autoreconf yes
-autoreconf.args -fvi
-
</del><span class="cx"> variant djvu description {Support for djvu documents using djvulibre} {
</span><span class="cx"> configure.args-replace --disable-djvu --enable-djvu
</span><span class="cx"> depends_lib-append port:djvulibre
</span><span class="lines">@@ -89,4 +88,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevolutiondataserver"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/evolution-data-server</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/evolution-data-server:108265-117052
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomeevolutiondataserverPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name evolution-data-server
</span><del>-version 3.10.4
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Addressbook and calender libs for GNOME.
</span><span class="cx"> long_description Evolution Data Server provides a central location for \
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 9bcb9c1bd882bca58e6d3f26767de86251b53966 \
- sha256 5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d
</del><ins>+checksums rmd160 af6fd198a92b6475551947ce76d553adf8d3bb2e \
+ sha256 95d9520f96711aaeb3a9620af62653bd9560fcaf63aa4a73a08f441030c47a12
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:gnome-common \
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> port:gnome-online-accounts \
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:sqlite3 \
</span><del>- port:vala
</del><ins>+ port:vala \
+ port:db46
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><del>- patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff \
</del><span class="cx"> patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="lines">@@ -55,9 +55,12 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><ins>+configure.env-append \
+ DB_CFLAGS="-I${prefix}/include/db46" \
+ DB_LIBS="-L${prefix}/lib/db46 -ldb"
+
</ins><span class="cx"> configure.args --enable-smime \
</span><span class="cx"> --enable-ipv6 \
</span><del>- --enable-nntp \
</del><span class="cx"> --enable-weather \
</span><span class="cx"> --enable-google \
</span><span class="cx"> --enable-goa \
</span><span class="lines">@@ -92,4 +95,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2013-08-27 02:10:57.000000000 -0700
-+++ addressbook/libebook-contacts/e-phone-number-private.cpp 2013-08-27 02:16:53.000000000 -0700
-@@ -122,9 +122,13 @@
</del><ins>+--- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-01-07 06:48:13.000000000 -0800
++++ addressbook/libebook-contacts/e-phone-number-private.cpp 2014-01-24 13:56:09.000000000 -0800
+@@ -120,9 +120,13 @@
</ins><span class="cx"> /* Extract two-letter country code from current locale id if needed.
</span><span class="cx"> * From outside this is a C library, so we better consult the
</span><span class="cx"> * C infrastructure instead of std::locale, which might divert. */
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchcalendarlibedatacalecalbackendintervaltreecdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2013-08-23 13:52:14.000000000 -0700
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2013-08-23 13:52:33.000000000 -0700
-@@ -26,7 +26,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
-
- #include "e-cal-backend-intervaltree.h"
-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeevolutiondataserverfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2013-12-08 18:41:02.000000000 -0800
-+++ configure.ac 2014-02-10 16:57:44.000000000 -0800
-@@ -322,8 +322,8 @@
</del><ins>+--- configure.ac.orig 2014-01-17 12:19:46.000000000 -0800
++++ configure.ac 2014-02-10 20:05:35.000000000 -0800
+@@ -317,8 +317,8 @@
</ins><span class="cx">
</span><span class="cx"> dnl This must appear after AC_CANONICAL_HOST, which defines $host.
</span><span class="cx"> case "$host" in
</span><span class="lines">@@ -11,14 +11,14 @@
</span><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> LDFLAGS="$LDFLAGS -Wl,--no-undefined"
</span><del>-@@ -546,8 +546,8 @@
</del><ins>+@@ -605,8 +605,8 @@
+ AS_HELP_STRING([--with-libdb=PREFIX],
</ins><span class="cx"> [Prefix where libdb is installed]),
</span><del>- [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
-
--DB_CFLAGS="-I$libdb_prefix/include"
--DB_LIBS="-L$libdb_prefix/lib -ldb"
-+DB_CFLAGS="-I$prefix/include/db46"
-+DB_LIBS="-L$prefix/lib/db46 -ldb"
-
- AC_MSG_CHECKING([Berkeley DB])
- save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
</del><ins>+ [
+- DB_CFLAGS="-I$withval/include"
+- DB_LIBS="-L$withval/lib -ldb"
++ DB_CFLAGS="-I$prefix/include/db46"
++ DB_LIBS="-L$prefix/lib/db46 -ldb"
+ ],
+ [
+ if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomefileroller"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/file-roller</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/file-roller:108265-117439
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/file-roller:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomefilerollerPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/file-roller/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name file-roller
</span><del>-version 3.10.2.1
-revision 1
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description An archive manager for GNOME
</span><span class="lines">@@ -24,8 +23,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 9e5df7f8d6e2bc93bbeefff2908bf43365393cb4 \
- sha256 fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790
</del><ins>+checksums rmd160 b5a41e51abc3e0f5250b218cbbb8a30fdb4c03bc \
+ sha256 c74bc2b3456f7cbfcf76da2277289979314a2b167da5664a7cda3bf7f45cc6db
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -72,4 +71,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomefolks"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/folks</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/folks:108265-117310
</span><span class="cx">/users/rmstonecipher/gnome/folks:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/folks:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/folks:108265-117310
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/folks:117866-118152
</span><span class="cx">/users/rmstonecipher/gnome/folks:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegcr"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gcr</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gcr:113249-117311
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gcr:117866-118152
</span><a id="usersdevansGNOME3stabledportsgnomegcrPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gcr/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gcr
</span><del>-version 3.10.1
-revision 2
</del><ins>+version 3.11.91
</ins><span class="cx"> license LGPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GCR is a library for displaying certificates, and crypto UI, accessing \
</span><span class="lines">@@ -24,8 +23,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 8ed4dbfab04e79d04a95b3ffeffbbc32cb3ec04a \
- sha256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b
</del><ins>+checksums rmd160 a2c9ff541294cdbc381ce56292b4b52fc3a707ab \
+ sha256 25cbee374cf7fbbf67ef7be6afb1ee6f5636a4d0b2cecd6568a872cdab7ff553
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -82,5 +81,4 @@
</span><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
-
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdm"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gdm</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gdm:108265-117875
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gdm:108265-117875
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegdmPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gdm
</span><del>-version 3.10.0.1
-revision 2
</del><ins>+version 3.11.90
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The Gnome Display Manager is a re-implementation of the well known xdm program.
</span><span class="lines">@@ -23,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 3e4839d56165e2f68451374d89d70986f5e247a1 \
- sha256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7
</del><ins>+checksums rmd160 98ccd8bfc99773264d73ef077c424b0518ae1df8 \
+ sha256 51b54d428aeb1c55d91e992edd8c4603d6e528c888321d39cfc9d17039545482
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><ins>+ port:dconf \
</ins><span class="cx"> port:accountsservice \
</span><span class="cx"> port:nss \
</span><span class="cx"> port:libcanberra \
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> depends_run port:gnome-session \
</span><span class="cx"> port:gnome-settings-daemon
</span><span class="cx">
</span><del>-patchfiles patch-daemon-gdm-session-worker.c.diff \
- patch-use-g_credentials_get_unix_pid.diff \
</del><ins>+patchfiles patch-daemon.diff \
+ patch-daemon-gdm-session-worker.c.diff \
</ins><span class="cx"> patch-configure.ac.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -72,6 +72,9 @@
</span><span class="cx">
</span><span class="cx"> configure.args --enable-ipv6 \
</span><span class="cx"> --without-console-kit \
</span><ins>+ --without-plymouth \
+ --disable-systemd-journal \
+ --disable-wayland-support \
</ins><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="lines">@@ -102,4 +105,4 @@
</span><span class="cx"> file attributes ${prefix}/var/gdm -owner gdm -group gdm
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdmPortfile311921fromrev118152usersdevansGNOME3unstabledportsgnomegdmPortfile311921"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile-3.11.92.1) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 117912 2014-03-17 03:26:10Z devans@macports.org $
+
+# TODO: figure out how to make PAM happy without blowing a large hole
+# in the security of the OS or touching PAM
+
+PortSystem 1.0
+
+name gdm
+version 3.11.92.1
+license GPL-2
+set branch [join [lrange [split ${version} .] 0 1] .]
+description The Gnome Display Manager is a re-implementation of the well known xdm program.
+long_description \
+ The Gnome Display Manager is a re-implementation of the well \
+ known xdm program. It displays a X11-based graphical login screen.
+maintainers nomaintainer
+categories gnome
+platforms darwin
+homepage https://wiki.gnome.org/Projects/GDM
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 6403ac087921c79aa7cd5f751b1b7a0c02ceabc3 \
+ sha256 731d72f43b01fc0f36ecfed80d9d04c62e7c537fa5d13078bc56114692213014
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:itstool
+
+depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:dconf \
+ port:accountsservice \
+ port:nss \
+ port:libcanberra \
+ port:upower \
+ port:fontconfig \
+ port:gobject-introspection \
+ port:iso-codes \
+ port:xorg-libX11 \
+ port:xorg-libXau \
+ port:xorg-libXrandr \
+ port:xorg-libXdmcp \
+ port:xorg-libXi \
+ port:xorg-libXinerama \
+ port:xorg-libXevie
+
+depends_run port:gnome-session \
+ port:gnome-settings-daemon
+
+#patchfiles patch-daemon.diff
+patchfiles patch-daemon-gdm-session-worker.c.diff \
+ patch-configure.ac.diff
+
+post-patch {
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
+ file attributes ${worksrcpath}/install-sh -permissions +x
+}
+
+use_parallel_build no
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.args --enable-ipv6 \
+ --without-console-kit \
+ --without-plymouth \
+ --disable-systemd-journal \
+ --disable-wayland-support \
+ --disable-schemas-compile \
+ --disable-silent-rules
+
+startupitem.create yes
+startupitem.name gdm
+startupitem.init XDG_DATA_DIRS=${prefix}/share
+startupitem.start ${prefix}/sbin/gdm
+startupitem.stop ${prefix}/sbin/gdm-stop
+startupitem.restart ${prefix}/sbin/gdm-restart
+
+post-destroot {
+ xinstall -m 644 ${filespath}/pam.sample ${destroot}${prefix}/etc/gdm
+ xinstall ${filespath}/macports-gdm-util ${destroot}${prefix}/bin
+}
+
+universal_variant no
+
+pre-activate {
+ addgroup gdm
+ adduser gdm gid=[existsgroup gdm] realname=GNOME\ Display\ Manager
+}
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+ file mkdir ${prefix}/var/gdm
+ file attributes ${prefix}/var/gdm -owner gdm -group gdm
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdmfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -27,31 +27,3 @@
</span><span class="cx"> X_PATH="/usr/X11/bin"
</span><span class="cx"> X_SERVER_PATH="/usr/X11/bin"
</span><span class="cx"> X_SERVER="/usr/X11/bin/Xserver"
</span><del>-From c14b16af23529afb7371890e3c686457c365e8be Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Mon, 11 Nov 2013 06:36:26 +0000
-Subject: Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
-
-When using IT_PROG_INTLTOOL using the gettext automake macros isn't
-necessary. To make matters worse, when mixing the marcos both try to
-generate po/Makefile.in.in. Recent versions of intltool detect when
-gettext won and bails when building.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711818
----
-diff --git a/configure.ac b/configure.ac
-index fdb0497..6afa49e 100644
---- configure.ac
-+++ configure.ac
-@@ -52,9 +52,6 @@ AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
- # i18n stuff
- IT_PROG_INTLTOOL([0.40.0])
-
--AM_GNU_GETTEXT_VERSION([0.17])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=gdm
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
---
-cgit v0.9.2
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdmfilespatchdaemongdmsessionworkercdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- daemon/gdm-session-worker.c.orig 2013-12-18 13:49:21.000000000 -0800
-+++ daemon/gdm-session-worker.c 2013-12-18 13:52:29.000000000 -0800
-@@ -740,6 +740,33 @@
</del><ins>+--- daemon/gdm-session-worker.c.orig 2014-02-20 12:01:48.000000000 -0800
++++ daemon/gdm-session-worker.c 2014-03-16 20:16:54.000000000 -0700
+@@ -741,6 +741,33 @@
</ins><span class="cx"> return utf8;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdmfilespatchdaemondifffromrev118152usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemondiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon.diff (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,173 @@
</span><ins>+diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
+--- daemon.orig/gdm-server.c 2014-03-19 14:39:09.000000000 -0700
++++ daemon/gdm-server.c 2014-03-19 14:39:56.000000000 -0700
+@@ -94,6 +94,7 @@
+ char *auth_file;
+
+ guint child_watch_id;
++ guint sigusr1_id;
+
+ gboolean is_initial;
+ };
+@@ -179,77 +180,16 @@
+ return g_strdup (server->priv->display_device);
+ }
+
+-static void
+-gdm_server_ready (GdmServer *server)
+-{
+- g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+- g_signal_emit (server, signals[READY], 0);
+-}
+-
+-static GSList *active_servers;
+-static gboolean sigusr1_thread_running;
+-static GCond sigusr1_thread_cond;
+-static GMutex sigusr1_thread_mutex;
+-
+ static gboolean
+-got_sigusr1 (gpointer user_data)
+-{
+- GPid pid = GPOINTER_TO_UINT (user_data);
+- GSList *l;
+-
+- g_debug ("GdmServer: got SIGUSR1 from PID %d", pid);
+-
+- for (l = active_servers; l; l = l->next) {
+- GdmServer *server = l->data;
+-
+- if (server->priv->pid == pid)
+- gdm_server_ready (server);
+- }
+-
+- return G_SOURCE_REMOVE;
+-}
+-
+-static gpointer
+-sigusr1_thread_main (gpointer user_data)
+-{
+- sigset_t sigusr1_mask;
+-
+- /* Handle only SIGUSR1 */
+- sigemptyset (&sigusr1_mask);
+- sigaddset (&sigusr1_mask, SIGUSR1);
+- sigprocmask (SIG_SETMASK, &sigusr1_mask, NULL);
++on_sigusr1 (gpointer user_data)
+
+- g_mutex_lock (&sigusr1_thread_mutex);
+- sigusr1_thread_running = TRUE;
+- g_cond_signal (&sigusr1_thread_cond);
+- g_mutex_unlock (&sigusr1_thread_mutex);
+-
+- /* Spin waiting for a SIGUSR1 */
+- while (TRUE) {
+- siginfo_t info;
+-
+- if (sigwaitinfo (&sigusr1_mask, &info) == -1)
+- continue;
+-
+- g_idle_add (got_sigusr1, GUINT_TO_POINTER (info.si_pid));
+- }
+-
+- return NULL;
+-}
+-
+-static void
+-gdm_server_launch_sigusr1_thread_if_needed (void)
+ {
+- static GThread *sigusr1_thread;
++ GdmServer *server = user_data;
+
+- if (sigusr1_thread == NULL) {
+- sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
++ g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+
+- g_mutex_lock (&sigusr1_thread_mutex);
+- while (!sigusr1_thread_running)
+- g_cond_wait (&sigusr1_thread_cond, &sigusr1_thread_mutex);
+- g_mutex_unlock (&sigusr1_thread_mutex);
+- }
++ g_signal_emit (server, signals[READY], 0);
++ return FALSE;
+ }
+
+ /* We keep a connection (parent_dsp) open with the parent X server
+@@ -736,8 +676,6 @@
+ g_signal_emit (server, signals [DIED], 0, num);
+ }
+
+- active_servers = g_slist_remove (active_servers, server);
+-
+ g_spawn_close_pid (server->priv->pid);
+ server->priv->pid = -1;
+
+@@ -781,10 +719,6 @@
+ g_debug ("GdmServer: Starting X server process: %s", freeme);
+ g_free (freeme);
+
+- active_servers = g_slist_append (active_servers, server);
+-
+- gdm_server_launch_sigusr1_thread_if_needed ();
+-
+ if (!g_spawn_async_with_pipes (NULL,
+ argv,
+ (char **)env->pdata,
+@@ -1129,11 +1063,16 @@
+ static void
+ gdm_server_init (GdmServer *server)
+ {
++
+ server->priv = GDM_SERVER_GET_PRIVATE (server);
+
+ server->priv->pid = -1;
+
+ server->priv->log_dir = g_strdup (LOGDIR);
++
++ server->priv->sigusr1_id = g_unix_signal_add (SIGUSR1,
++ on_sigusr1,
++ server);
+ }
+
+ static void
+@@ -1148,6 +1087,9 @@
+
+ g_return_if_fail (server->priv != NULL);
+
++ if (server->priv->sigusr1_id > 0)
++ g_source_remove (server->priv->sigusr1_id);
++
+ gdm_server_stop (server);
+
+ g_free (server->priv->command);
+diff -ur daemon.orig/main.c daemon/main.c
+--- daemon.orig/main.c 2014-03-19 14:39:09.000000000 -0700
++++ daemon/main.c 2014-03-19 14:40:05.000000000 -0700
+@@ -295,19 +295,6 @@
+ return debug;
+ }
+
+-/* SIGUSR1 is used by the X server to tell us that we're ready, so
+- * block it. We'll unblock it in the worker thread in gdm-server.c
+- */
+-static void
+-block_sigusr1 (void)
+-{
+- sigset_t mask;
+-
+- sigemptyset (&mask);
+- sigaddset (&mask, SIGUSR1);
+- sigprocmask (SIG_BLOCK, &mask, NULL);
+-}
+-
+ int
+ main (int argc,
+ char **argv)
+@@ -328,8 +315,6 @@
+ { NULL }
+ };
+
+- block_sigusr1 ();
+-
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
+ setlocale (LC_ALL, "");
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegdmfilespatchuseg_credentials_get_unix_piddiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-From 87f181489983bb8d640a6a227caa8cbfc0fff853 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Sun, 10 Nov 2013 23:21:37 +0000
-Subject: Use g_credentials_get_unix_pid() instead of home baked function
-
-This function is available in GIO since 2.36
-
-Thanks to Petr Salinger <Petr.Salinger@seznam.cz> for the patch
-Debian Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692739
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687921
----
-diff --git a/configure.ac b/configure.ac
-index bffc88b..0008c62 100644
---- configure.ac
-+++ configure.ac
-@@ -63,7 +63,7 @@ dnl ---------------------------------------------------------------------------
- dnl - Dependencies
- dnl ---------------------------------------------------------------------------
-
--GLIB_REQUIRED_VERSION=2.35.0
-+GLIB_REQUIRED_VERSION=2.36.0
- GTK_REQUIRED_VERSION=2.91.1
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index d74bed6..b2d931d 100644
---- daemon/gdm-session.c
-+++ daemon/gdm-session.c
-@@ -970,28 +970,6 @@ allow_worker_function (GDBusAuthObserver *observer,
- return FALSE;
- }
-
--static GPid
--credentials_get_unix_pid (GCredentials *credentials)
--{
-- GPid pid = 0;
-- gpointer native_credentials = NULL;
--
--#ifdef __linux__
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
-- pid = (GPid) ((struct ucred *) native_credentials)->pid;
--#elif defined (__FreeBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
--#elif defined (__OpenBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
--#else
--#error "platform not supported, need mechanism to detect pid of connected process"
--#endif
--
-- return pid;
--}
--
- static gboolean
- register_worker (GdmDBusWorkerManager *worker_manager_interface,
- GDBusMethodInvocation *invocation,
-@@ -1021,7 +999,7 @@ register_worker (GdmDBusWorkerManager *worker_manager_interface,
- connection_node);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid = credentials_get_unix_pid (credentials);
-+ pid = g_credentials_get_unix_pid (credentials, NULL);
-
- conversation = find_conversation_by_pid (self, (GPid) pid);
-
-@@ -1479,7 +1457,7 @@ on_outside_connection_closed (GDBusConnection *connection,
- connection);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_DISCONNECTED],
-@@ -1531,7 +1509,7 @@ handle_connection_from_outside (GDBusServer *server,
- }
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_CONNECTED],
---
-cgit v0.9.2
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegedit"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gedit</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gedit:108265-116598
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomegeditPortfile"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name gedit
-version 3.10.4
-license GPL-2
-set branch [join [lrange [split ${version} .] 0 1] .]
-description GNOME editor.
-long_description \
- ${description}
-maintainers devans openmaintainer
-categories gnome editors
-platforms darwin
-homepage https://wiki.gnome.org/Apps/Gedit
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 0df244792ed9fa2fbfb10423bdae531fb31aa650 \
- sha256 40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e
-
-depends_build port:pkgconfig \
- port:intltool \
- port:itstool \
- port:yelp-tools \
- port:automake \
- port:autoconf \
- port:libtool \
- port:gnome-common \
- port:gtk-doc
-
-depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gnome-icon-theme-symbolic \
- port:gsettings-desktop-schemas \
- port:gtk3 \
- port:gvfs \
- port:gtksourceview3 \
- port:libpeas \
- port:libsoup \
- port:libxml2 \
- port:enchant \
- port:iso-codes \
- port:zeitgeist
-
-depends_run port:gnome-settings-daemon \
- port:yelp
-
-pre-patch {
- copy ${worksrcpath}/gedit ${worksrcpath}/gedit.orig
-}
-
-patchfiles patch-configure.diff \
- patch-gedit-gedit-app.c.diff
-
-# use autogen.sh from upstream git to update intltool.m4 using intltoolize and autoreconf
-
-post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-}
-
-configure.cmd ./autogen.sh
-
-configure.cflags-append \
- -Wno-format-nonliteral
-
-configure.args --enable-zeitgeist \
- --disable-python \
- --disable-schemas-compile \
- --disable-silent-rules
-
-# minimum python version is 3.2.3
-
-variant python32 description {Use python 3.2} {
- depends_lib-append port:py32-gobject3
- configure.python ${prefix}/bin/python3.2
- set python_framework ${frameworks_dir}/Python.framework/Versions/3.2
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
- configure.args-replace --disable-python --enable-python
-}
-
-variant python33 description {Use python 3.3} {
- depends_lib-append port:py33-gobject3
- configure.python ${prefix}/bin/python3.3
- set python_framework ${frameworks_dir}/Python.framework/Versions/3.3
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
- configure.args-replace --disable-python --enable-python
-}
-
-default_variants +python32
-
-post-activate {
- system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
-}
-
-livecheck.type gnome
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegeditPortfile31192fromrev118152usersdevansGNOME3unstabledportsgnomegeditPortfile31192"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile-3.11.92) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name gedit
+version 3.11.92
+license GPL-2
+set branch [join [lrange [split ${version} .] 0 1] .]
+description GNOME editor.
+long_description \
+ ${description}
+maintainers devans openmaintainer
+categories gnome editors
+platforms darwin
+homepage https://wiki.gnome.org/Apps/Gedit
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 25a173d8a6b1e27f8156bf0e2e0280f361655149 \
+ sha256 6b2c7566a098e3ebef44debb3e06c4dcfe8eef3b3e29f4233d1ee90f6a77a7c8
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:itstool \
+ port:yelp-tools \
+ port:automake \
+ port:autoconf \
+ port:libtool \
+ port:gnome-common \
+ port:gtk-doc
+
+depends_lib port:desktop-file-utils \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gsettings-desktop-schemas \
+ port:gtk3 \
+ port:gvfs \
+ port:gtksourceview3 \
+ port:libpeas \
+ port:libsoup \
+ port:libxml2 \
+ port:enchant \
+ port:iso-codes \
+ port:zeitgeist
+
+depends_run port:gnome-settings-daemon \
+ port:yelp
+
+pre-patch {
+ copy ${worksrcpath}/gedit ${worksrcpath}/gedit.orig
+}
+
+patchfiles patch-configure.diff \
+ patch-gedit-gedit-app.c.diff
+
+# use autogen.sh from upstream git to update intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
+configure.cflags-append \
+ -Wno-format-nonliteral
+
+configure.args --enable-zeitgeist \
+ --disable-python \
+ --disable-schemas-compile \
+ --disable-silent-rules
+
+# minimum python version is 3.2.3
+
+variant python32 description {Use python 3.2} {
+ depends_lib-append port:py32-gobject3
+ configure.python ${prefix}/bin/python3.2
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.2
+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.args-replace --disable-python --enable-python
+}
+
+variant python33 description {Use python 3.3} {
+ depends_lib-append port:py33-gobject3
+ configure.python ${prefix}/bin/python3.3
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.3
+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.args-replace --disable-python --enable-python
+}
+
+default_variants +python32
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegeditfilespatchgeditgeditappcdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>---- gedit/gedit-app.c.orig 2013-09-29 07:56:34.000000000 -0700
-+++ gedit/gedit-app.c 2013-11-03 01:37:41.000000000 -0800
-@@ -95,7 +95,7 @@
</del><ins>+--- gedit/gedit-app.c.orig 2014-01-11 05:54:03.000000000 -0800
++++ gedit/gedit-app.c 2014-01-31 12:12:54.000000000 -0800
+@@ -96,7 +96,7 @@
</ins><span class="cx"> static gboolean new_window = FALSE;
</span><span class="cx"> static gboolean new_document = FALSE;
</span><span class="cx"> static gchar *geometry = NULL;
</span><span class="cx"> -static gboolean wait = FALSE;
</span><span class="cx"> +static gboolean gwait = FALSE;
</span><ins>+ static gboolean gapplication_service = FALSE;
</ins><span class="cx"> static gboolean standalone = FALSE;
</span><span class="cx"> static gchar **remaining_args = NULL;
</span><del>- static const GeditEncoding *encoding = NULL;
-@@ -161,7 +161,7 @@
</del><ins>+@@ -171,7 +171,7 @@
</ins><span class="cx"> /* Wait for closing documents */
</span><span class="cx"> {
</span><span class="cx"> "wait", 'w', 0, G_OPTION_ARG_NONE,
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> N_("Open files and block process until files are closed"),
</span><span class="cx"> NULL
</span><span class="cx"> },
</span><del>-@@ -753,7 +753,7 @@
</del><ins>+@@ -811,7 +811,7 @@
</ins><span class="cx"> new_window = FALSE;
</span><span class="cx"> new_document = FALSE;
</span><span class="cx"> geometry = NULL;
</span><span class="lines">@@ -27,3 +27,12 @@
</span><span class="cx"> standalone = FALSE;
</span><span class="cx"> remaining_args = NULL;
</span><span class="cx"> encoding = NULL;
</span><ins>+@@ -874,7 +874,7 @@
+ }
+ else
+ {
+- if (wait)
++ if (gwait)
+ {
+ command_line = cl;
+ }
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomebackgrounds"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-backgrounds:108265-117320
</span><span class="cx">/users/rmstonecipher/gnome/gnome-backgrounds:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-backgrounds:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-backgrounds:108265-117320
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-backgrounds:117866-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-backgrounds:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomebackgroundsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-backgrounds
</span><del>-version 3.10.1
</del><ins>+version 3.11.5
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e27f5ecb45fca206b7a69ff5cdf0462646cc3419 \
- sha256 cc47e7b21f94464b013e5805baa51c3fa540008df0109717e8d77e48ea003b87
</del><ins>+checksums rmd160 14bd2ff2e5a1daccbf21bbf842c360e73e41d212 \
+ sha256 ff74b154444c5deab2dab03039095f6ac6861a73404796f37cfacae2f316b2cf
</ins><span class="cx">
</span><span class="cx"> depends_build port:intltool \
</span><span class="cx"> port:gettext
</span><span class="lines">@@ -38,4 +38,4 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenter"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-control-center:108265-117321
</span><span class="cx">/users/rmstonecipher/gnome/gnome-control-center:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-control-center:108265-117321
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-control-center:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name gnome-control-center
-version 3.10.3
-set branch [join [lrange [split ${version} .] 0 1] .]
-description GNOME's main interface for configuration of the various \
- aspects of your desktop.
-long_description ${description}
-maintainers devans openmaintainer
-categories gnome
-license GPL-2+
-platforms darwin
-homepage http://www.gnome.org/
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 0393db68319d00d14d4d98ac76b4c3f82ceb165b \
- sha256 059172d5e7f8b6c385bcc1b73f966375b92a8456dd5eba8d7f8b75907c3324a6
-
-depends_build port:pkgconfig \
- port:intltool \
- port:libxslt \
- port:gnome-common \
- port:gtk-doc
-
-depends_lib port:desktop-file-utils \
- port:gtk3 \
- port:gsettings-desktop-schemas \
- port:gnome-desktop \
- port:fontconfig \
- port:policykit \
- port:libxml2 \
- port:upower \
- port:libgtop \
- port:gnome-settings-daemon \
- port:gnome-menus \
- port:gnome-online-accounts \
- port:accountsservice \
- port:libcanberra \
- port:pulseaudio \
- port:libpwquality \
- port:kerberos5 \
- port:libsocialweb \
- port:shared-mime-info \
- port:xorg-libX11 \
- port:xorg-libXxf86misc \
- port:xorg-libXi
-
-depends_run port:yelp
-
-# color panel disabled by patch, dependency colord requires libudev
-
-patchfiles \
- patch-disable-color-panel.diff \
- patch-disable-shell-test-hostname.diff \
- patch-panels-user-accounts.diff
-
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
-
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.args --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --with-libsocialweb \
- --without-cheese \
- --disable-ibus \
- --disable-maintainer-mode \
- --disable-update-mimedb \
- --disable-silent-rules
-
-pre-activate {
- if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
- set _version [lindex $installed 1]
- if {[vercmp $_version 3.0.0] < 0} {
- registry_deactivate_composite gdm "" [list ports_nodepcheck 1]
- }
- }
- if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} {
- set _version [lindex $installed 1]
- if {[vercmp $_version 3.10.0] < 0} {
- registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1]
- }
- }
-}
-
-post-activate {
- system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
-}
-
-livecheck.type gnome
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfilefromrev118152usersdevansGNOME3unstabledportsgnomegnomecontrolcenterPortfile"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 117321 2014-02-22 02:34:30Z devans@macports.org $
+
+PortSystem 1.0
+
+name gnome-control-center
+version 3.8.6
+revision 1
+set branch [join [lrange [split ${version} .] 0 1] .]
+description GNOME's main interface for configuration of the various \
+ aspects of your desktop.
+long_description ${description}
+maintainers devans openmaintainer
+categories gnome
+license GPL-2+
+platforms darwin
+homepage http://www.gnome.org/
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \
+ sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:libxslt \
+ port:gnome-common \
+ port:gtk-doc
+
+depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:gsettings-desktop-schemas \
+ port:gnome-desktop \
+ port:fontconfig \
+ port:policykit \
+ port:libxml2 \
+ port:upower \
+ port:libgtop \
+ port:gnome-settings-daemon \
+ port:gnome-menus \
+ port:gnome-online-accounts \
+ port:accountsservice \
+ port:libcanberra \
+ port:pulseaudio \
+ port:libpwquality \
+ port:kerberos5 \
+ port:libsocialweb \
+ port:shared-mime-info \
+ port:xorg-libX11 \
+ port:xorg-libXxf86misc \
+ port:xorg-libXi
+
+depends_run port:yelp
+
+# color panel disabled by patch, dependency colord requires libudev
+
+patchfiles patch-display-new-config-model.diff \
+ patch-output-is-laptop.diff \
+ patch-background-linker-fix.diff \
+ patch-background-libsocialweb.diff \
+ patch-users-logged-in-check.diff \
+ patch-disable-color-panel.diff \
+ patch-disable-shell-test-hostname.diff \
+ patch-panels-user-accounts.diff
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.args --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --with-libsocialweb \
+ --without-cheese \
+ --disable-ibus \
+ --disable-maintainer-mode \
+ --disable-update-mimedb \
+ --disable-silent-rules
+
+pre-activate {
+ if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.0.0] < 0} {
+ registry_deactivate_composite gdm "" [list ports_nodepcheck 1]
+ }
+ }
+ if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.10.0] < 0} {
+ registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1]
+ }
+ }
+}
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+}
+
+livecheck.type gnome
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecontrolcenterPortfile31192fromrev118152usersdevansGNOME3unstabledportsgnomegnomecontrolcenterPortfile31192"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile-3.11.92 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile-3.11.92) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile-3.11.92 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile-3.11.92 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 116416 2014-01-24 15:09:48Z devans@macports.org $
+
+PortSystem 1.0
+
+name gnome-control-center
+version 3.11.92
+set branch [join [lrange [split ${version} .] 0 1] .]
+description GNOME's main interface for configuration of the various \
+ aspects of your desktop.
+long_description ${description}
+maintainers devans openmaintainer
+categories gnome
+license GPL-2+
+platforms darwin
+homepage http://www.gnome.org/
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 bddeb18bd18461246b5436b896e61ce627e840d1 \
+ sha256 1465c380308d9399ec2888f4996292c5ec7a6226582f8940c4a628b0607ee131
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:libxslt \
+ port:gnome-common \
+ port:gtk-doc
+
+depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:gsettings-desktop-schemas \
+ port:gnome-desktop \
+ port:fontconfig \
+ port:policykit \
+ port:libxml2 \
+ port:upower \
+ port:libgtop \
+ port:gnome-settings-daemon \
+ port:gnome-menus \
+ port:gnome-online-accounts \
+ port:accountsservice \
+ port:libcanberra \
+ port:pulseaudio \
+ port:libpwquality \
+ port:kerberos5 \
+ port:grilo \
+ port:shared-mime-info \
+ port:xorg-libX11 \
+ port:xorg-libXxf86misc \
+ port:xorg-libXi
+
+depends_run port:yelp
+
+# color panel disabled by patch, dependency colord requires libudev
+
+patchfiles \
+ patch-disable-color-panel.diff \
+ patch-disable-shell-test-hostname.diff \
+ patch-panels-user-accounts.diff
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.args --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --without-cheese \
+ --disable-ibus \
+ --disable-maintainer-mode \
+ --disable-update-mimedb \
+ --disable-silent-rules
+
+pre-activate {
+ if {![catch {set installed [lindex [registry_active gdm] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.0.0] < 0} {
+ registry_deactivate_composite gdm "" [list ports_nodepcheck 1]
+ }
+ }
+ if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 3.10.0] < 0} {
+ registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1]
+ }
+ }
+}
+
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomedesktop"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome-desktop:108265-117050
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop:116416-118152
</span><a id="usersdevansGNOME3stabledportsgnomegnomedesktopPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-desktop
</span><del>-version 3.10.2
</del><ins>+version 3.11.91
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 9d59c58c497eafa75a5ae7a38edaa740c8c77726 \
- sha256 d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632
</del><ins>+checksums rmd160 61cf6e72df0ee97cd07c0ca458f950879670bcbd \
+ sha256 61b636ec7ec718c96f3d32a04997adcb1478725bc0dda2e38d63dcb3c1f6368d
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -76,4 +76,4 @@
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomedesktopfilespatchgnomedesktopMakefileamdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- libgnome-desktop/Makefile.am.orig 2013-10-04 15:18:41.000000000 -0700
-+++ libgnome-desktop/Makefile.am 2013-11-26 14:58:19.000000000 -0800
-@@ -79,8 +79,7 @@
</del><ins>+--- libgnome-desktop/Makefile.am.orig 2014-01-15 13:04:02.000000000 -0800
++++ libgnome-desktop/Makefile.am 2014-01-24 16:42:17.000000000 -0800
+@@ -78,8 +78,7 @@
</ins><span class="cx"> $(XLIB_LIBS) \
</span><span class="cx"> $(LIBM) \
</span><span class="cx"> $(GNOME_DESKTOP_LIBS) \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomedesktopfilespatchlibgnomedestktoplibgsystemdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/Makefile-libgsystem.am libgnome-desktop/libgsystem/Makefile-libgsystem.am
</span><del>---- libgnome-desktop/libgsystem.orig/Makefile-libgsystem.am 2013-10-04 15:18:43.000000000 -0700
-+++ libgnome-desktop/libgsystem/Makefile-libgsystem.am 2014-01-11 18:24:46.000000000 -0800
</del><ins>+--- libgnome-desktop/libgsystem.orig/Makefile-libgsystem.am 2014-01-15 13:06:25.000000000 -0800
++++ libgnome-desktop/libgsystem/Makefile-libgsystem.am 2014-01-24 17:02:13.000000000 -0800
</ins><span class="cx"> @@ -35,6 +35,8 @@
</span><span class="cx"> $(libgsystem_srcpath)/gsystem-subprocess.h \
</span><span class="cx"> $(libgsystem_srcpath)/gsystem-subprocess.c \
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx">
</span><span class="cx"> libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-file-utils.c libgnome-desktop/libgsystem/gsystem-file-utils.c
</span><del>---- libgnome-desktop/libgsystem.orig/gsystem-file-utils.c 2013-10-04 15:18:43.000000000 -0700
-+++ libgnome-desktop/libgsystem/gsystem-file-utils.c 2014-01-11 18:24:46.000000000 -0800
-@@ -38,6 +38,10 @@
- #include <limits.h>
- #include <dirent.h>
</del><ins>+--- libgnome-desktop/libgsystem.orig/gsystem-file-utils.c 2014-01-15 13:06:25.000000000 -0800
++++ libgnome-desktop/libgsystem/gsystem-file-utils.c 2014-01-24 17:02:13.000000000 -0800
+@@ -41,6 +41,10 @@
+ #include <attr/xattr.h>
+ #endif
</ins><span class="cx">
</span><span class="cx"> +#ifdef __APPLE__
</span><span class="cx"> +#include "gsystem-osx-compat.h"
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> static int
</span><span class="cx"> close_nointr (int fd)
</span><span class="cx"> {
</span><del>-@@ -444,12 +448,28 @@
</del><ins>+@@ -454,12 +458,28 @@
</ins><span class="cx"> GError **error)
</span><span class="cx"> {
</span><span class="cx"> /* Linux specific probably */
</span><span class="lines">@@ -53,9 +53,1639 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+diff -urN libgnome-desktop/libgsystem.orig/gsystem-file-utils.c.orig libgnome-desktop/libgsystem/gsystem-file-utils.c.orig
+--- libgnome-desktop/libgsystem.orig/gsystem-file-utils.c.orig 1969-12-31 16:00:00.000000000 -0800
++++ libgnome-desktop/libgsystem/gsystem-file-utils.c.orig 2014-01-15 13:06:25.000000000 -0800
+@@ -0,0 +1,1626 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2012 William Jon McCann <mccann@redhat.com>
++ * Copyright (C) 2012 Colin Walters <walters@verbum.org>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include "config.h"
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
++#include <string.h>
++
++#define _GSYSTEM_NO_LOCAL_ALLOC
++#include "libgsystem.h"
++#include "gsystem-glib-compat.h"
++#include <glib/gstdio.h>
++#include <gio/gunixinputstream.h>
++#include <gio/gfiledescriptorbased.h>
++#include <gio/gunixoutputstream.h>
++#include <glib-unix.h>
++#include <limits.h>
++#include <dirent.h>
++#ifdef GSYSTEM_CONFIG_XATTRS
++#include <attr/xattr.h>
++#endif
++
++static int
++close_nointr (int fd)
++{
++ int res;
++ /* Note this is NOT actually a retry loop.
++ * See: https://bugzilla.gnome.org/show_bug.cgi?id=682819
++ */
++ res = close (fd);
++ /* Just ignore EINTR...on Linux, retrying is wrong. */
++ if (res == EINTR)
++ res = 0;
++ return res;
++}
++
++static void
++close_nointr_noerror (int fd)
++{
++ (void) close_nointr (fd);
++}
++
++static int
++open_nointr (const char *path, int flags, mode_t mode)
++{
++ int res;
++ do
++ res = open (path, flags, mode);
++ while (G_UNLIKELY (res == -1 && errno == EINTR));
++ return res;
++}
++
++static inline void
++_set_error_from_errno (GError **error)
++{
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++}
++
++/**
++ * gs_file_openat_noatime:
++ * @dfd: File descriptor for directory
++ * @name: Pathname, relative to @dfd
++ * @ret_fd: (out): Returned file descriptor
++ * @cancellable: Cancellable
++ * @error: Error
++ *
++ * Wrapper for openat() using %O_RDONLY with %O_NOATIME if available.
++ */
++gboolean
++gs_file_openat_noatime (int dfd,
++ const char *name,
++ int *ret_fd,
++ GCancellable *cancellable,
++ GError **error)
++{
++ int fd;
++
++#ifdef O_NOATIME
++ do
++ fd = openat (dfd, name, O_RDONLY | O_NOATIME, 0);
++ while (G_UNLIKELY (fd == -1 && errno == EINTR));
++ /* Only the owner or superuser may use O_NOATIME; so we may get
++ * EPERM. EINVAL may happen if the kernel is really old...
++ */
++ if (fd == -1 && (errno == EPERM || errno == EINVAL))
++#endif
++ do
++ fd = openat (dfd, name, O_RDONLY, 0);
++ while (G_UNLIKELY (fd == -1 && errno == EINTR));
++
++ if (fd == -1)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ else
++ {
++ *ret_fd = fd;
++ return TRUE;
++ }
++}
++
++/**
++ * gs_file_read_noatime:
++ * @file: a #GFile
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Like g_file_read(), but try to avoid updating the file's
++ * access time. This should be used by background scanning
++ * components such as search indexers, antivirus programs, etc.
++ *
++ * Returns: (transfer full): A new input stream, or %NULL on error
++ */
++GInputStream *
++gs_file_read_noatime (GFile *file,
++ GCancellable *cancellable,
++ GError **error)
++{
++ const char *path = NULL;
++ int fd;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return NULL;
++
++ path = gs_file_get_path_cached (file);
++ if (path == NULL)
++ {
++ char *uri;
++ uri = g_file_get_uri (file);
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT,
++ "%s has no associated path", uri);
++ g_free (uri);
++ return NULL;
++ }
++
++ if (!gs_file_openat_noatime (AT_FDCWD, path, &fd, cancellable, error))
++ return NULL;
++
++ return g_unix_input_stream_new (fd, TRUE);
++}
++
++/**
++ * gs_stream_fstat:
++ * @stream: A stream containing a Unix file descriptor
++ * @stbuf: Memory location to write stat buffer
++ * @cancellable:
++ * @error:
++ *
++ * Some streams created via libgsystem are #GUnixInputStream; these do
++ * not support e.g. g_file_input_stream_query_info(). This function
++ * allows dropping to the raw unix fstat() call for these types of
++ * streams, while still conveniently wrapped with the normal GLib
++ * handling of @cancellable and @error.
++ */
++gboolean
++gs_stream_fstat (GFileDescriptorBased *stream,
++ struct stat *stbuf,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int fd;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ goto out;
++
++ fd = g_file_descriptor_based_get_fd (stream);
++
++ if (fstat (fd, stbuf) == -1)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++}
++
++/**
++ * gs_file_map_noatime: (skip)
++ * @file: a #GFile
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Like g_mapped_file_new(), but try to avoid updating the file's
++ * access time. This should be used by background scanning
++ * components such as search indexers, antivirus programs, etc.
++ *
++ * Returns: (transfer full): A new mapped file, or %NULL on error
++ */
++GMappedFile *
++gs_file_map_noatime (GFile *file,
++ GCancellable *cancellable,
++ GError **error)
++{
++ const char *path;
++ int fd;
++ GMappedFile *ret;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return NULL;
++
++ path = gs_file_get_path_cached (file);
++ if (path == NULL)
++ return NULL;
++
++ if (!gs_file_openat_noatime (AT_FDCWD, path, &fd, cancellable, error))
++ return NULL;
++
++ ret = g_mapped_file_new_from_fd (fd, FALSE, error);
++ close_nointr_noerror (fd); /* Ignore errors - we always want to close */
++
++ return ret;
++}
++
++#if GLIB_CHECK_VERSION(2,34,0)
++/**
++ * gs_file_map_readonly:
++ * @file: a #GFile
++ * @cancellable:
++ * @error:
++ *
++ * Return a #GBytes which references a readonly view of the contents of
++ * @file. This function uses #GMappedFile internally.
++ *
++ * Returns: (transfer full): a newly referenced #GBytes
++ */
++GBytes *
++gs_file_map_readonly (GFile *file,
++ GCancellable *cancellable,
++ GError **error)
++{
++ GMappedFile *mfile;
++ GBytes *ret;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return NULL;
++
++ mfile = g_mapped_file_new (gs_file_get_path_cached (file), FALSE, error);
++ if (!mfile)
++ return NULL;
++
++ ret = g_mapped_file_get_bytes (mfile);
++ g_mapped_file_unref (mfile);
++ return ret;
++}
++#endif
++
++/**
++ * gs_file_sync_data:
++ * @file: a #GFile
++ * @cancellable:
++ * @error:
++ *
++ * Wraps the UNIX fsync() function (or fdatasync(), if available), which
++ * ensures that the data in @file is on non-volatile storage.
++ */
++gboolean
++gs_file_sync_data (GFile *file,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int res;
++ int fd = -1;
++
++ if (!gs_file_openat_noatime (AT_FDCWD, gs_file_get_path_cached (file), &fd,
++ cancellable, error))
++ goto out;
++
++ do
++ {
++#ifdef __linux
++ res = fdatasync (fd);
++#else
++ res = fsync (fd);
++#endif
++ }
++ while (G_UNLIKELY (res != 0 && errno == EINTR));
++ if (res != 0)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ res = close_nointr (fd);
++ if (res != 0)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++ fd = -1;
++
++ ret = TRUE;
++ out:
++ if (fd != -1)
++ close_nointr_noerror (fd);
++ return ret;
++}
++
++/**
++ * gs_file_create:
++ * @file: Path to non-existent file
++ * @mode: Unix access permissions
++ * @out_stream: (out) (transfer full) (allow-none): Newly created output, or %NULL
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Like g_file_create(), except this function allows specifying the
++ * access mode. This allows atomically creating private files.
++ */
++gboolean
++gs_file_create (GFile *file,
++ int mode,
++ GOutputStream **out_stream,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int fd;
++ GOutputStream *ret_stream = NULL;
++
++ fd = open_nointr (gs_file_get_path_cached (file), O_WRONLY | O_CREAT | O_EXCL, mode);
++ if (fd < 0)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ if (fchmod (fd, mode) < 0)
++ {
++ close (fd);
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ ret_stream = g_unix_output_stream_new (fd, TRUE);
++
++ ret = TRUE;
++ gs_transfer_out_value (out_stream, &ret_stream);
++ out:
++ g_clear_object (&ret_stream);
++ return ret;
++}
++
++static const char *
++get_default_tmp_prefix (void)
++{
++ static char *tmpprefix = NULL;
++
++ if (g_once_init_enter (&tmpprefix))
++ {
++ const char *prgname = g_get_prgname ();
++ const char *p;
++ char *prefix;
++ char *iter;
++
++ if (prgname)
++ {
++ p = strrchr (prgname, '/');
++ if (p)
++ prgname = p + 1;
++ }
++ else
++ prgname = "";
++
++ prefix = g_strdup_printf ("tmp-%s%u-", prgname, getuid ());
++ for (iter = prefix; *iter; iter++)
++ {
++ char c = *iter;
++ if (c == ' ')
++ *iter = '_';
++ }
++
++ g_once_init_leave (&tmpprefix, prefix);
++ }
++
++ return tmpprefix;
++}
++
++/**
++ * gs_fileutil_gen_tmp_name:
++ * @prefix: (allow-none): String prepended to the result
++ * @suffix: (allow-none): String suffixed to the result
++ *
++ * Generate a name suitable for use as a temporary file. This
++ * function does no I/O; it is not guaranteed that a file with that
++ * name does not exist.
++ */
++char *
++gs_fileutil_gen_tmp_name (const char *prefix,
++ const char *suffix)
++{
++ static const char table[] = "ABCEDEFGHIJKLMNOPQRSTUVWXYZabcedefghijklmnopqrstuvwxyz0123456789";
++ GString *str = g_string_new ("");
++ guint i;
++
++ if (!prefix)
++ prefix = get_default_tmp_prefix ();
++ if (!suffix)
++ suffix = "tmp";
++
++ g_string_append (str, prefix);
++ for (i = 0; i < 8; i++)
++ {
++ int offset = g_random_int_range (0, sizeof (table) - 1);
++ g_string_append_c (str, (guint8)table[offset]);
++ }
++ g_string_append_c (str, '.');
++ g_string_append (str, suffix);
++
++ return g_string_free (str, FALSE);
++}
++
++/**
++ * gs_file_open_dir_fd:
++ * @path: Directory name
++ * @out_fd: (out): File descriptor for directory
++ * @cancellable: Cancellable
++ * @error: Error
++ *
++ * On success, sets @out_fd to a file descriptor for the directory
++ * that can be used with UNIX functions such as openat().
++ */
++gboolean
++gs_file_open_dir_fd (GFile *path,
++ int *out_fd,
++ GCancellable *cancellable,
++ GError **error)
++{
++ /* Linux specific probably */
++ *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC);
++ if (*out_fd == -1)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++/**
++ * gs_file_open_in_tmpdir_at:
++ * @tmpdir_fd: Directory to place temporary file
++ * @mode: Default mode (will be affected by umask)
++ * @out_name: (out) (transfer full): Newly created file name
++ * @out_stream: (out) (transfer full) (allow-none): Newly created output stream
++ * @cancellable:
++ * @error:
++ *
++ * Like g_file_open_tmp(), except the file will be created in the
++ * provided @tmpdir, and allows specification of the Unix @mode, which
++ * means private files may be created. Return values will be stored
++ * in @out_name, and optionally @out_stream.
++ */
++gboolean
++gs_file_open_in_tmpdir_at (int tmpdir_fd,
++ int mode,
++ char **out_name,
++ GOutputStream **out_stream,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ const int max_attempts = 128;
++ int i;
++ char *tmp_name = NULL;
++ int fd;
++
++ /* 128 attempts seems reasonable... */
++ for (i = 0; i < max_attempts; i++)
++ {
++ g_free (tmp_name);
++ tmp_name = gs_fileutil_gen_tmp_name (NULL, NULL);
++
++ do
++ fd = openat (tmpdir_fd, tmp_name, O_WRONLY | O_CREAT | O_EXCL, mode);
++ while (fd == -1 && errno == EINTR);
++ if (fd < 0 && errno != EEXIST)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++ else if (fd != -1)
++ break;
++ }
++ if (i == max_attempts)
++ {
++ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
++ "Exhausted attempts to open temporary file");
++ goto out;
++ }
++
++ ret = TRUE;
++ gs_transfer_out_value (out_name, &tmp_name);
++ if (out_stream)
++ *out_stream = g_unix_output_stream_new (fd, TRUE);
++ else
++ (void) close (fd);
++ out:
++ g_free (tmp_name);
++ return ret;
++}
++
++/**
++ * gs_file_open_in_tmpdir:
++ * @tmpdir: Directory to place temporary file
++ * @mode: Default mode (will be affected by umask)
++ * @out_file: (out) (transfer full): Newly created file path
++ * @out_stream: (out) (transfer full) (allow-none): Newly created output stream
++ * @cancellable:
++ * @error:
++ *
++ * Like g_file_open_tmp(), except the file will be created in the
++ * provided @tmpdir, and allows specification of the Unix @mode, which
++ * means private files may be created. Return values will be stored
++ * in @out_file, and optionally @out_stream.
++ */
++gboolean
++gs_file_open_in_tmpdir (GFile *tmpdir,
++ int mode,
++ GFile **out_file,
++ GOutputStream **out_stream,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ DIR *d = NULL;
++ int dfd = -1;
++ char *tmp_name = NULL;
++ GOutputStream *ret_stream = NULL;
++
++ d = opendir (gs_file_get_path_cached (tmpdir));
++ if (!d)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++ dfd = dirfd (d);
++
++ if (!gs_file_open_in_tmpdir_at (dfd, mode, &tmp_name,
++ out_stream ? &ret_stream : NULL,
++ cancellable, error))
++ goto out;
++
++ ret = TRUE;
++ *out_file = g_file_get_child (tmpdir, tmp_name);
++ gs_transfer_out_value (out_stream, &ret_stream);
++ out:
++ if (d) (void) closedir (d);
++ g_clear_object (&ret_stream);
++ g_free (tmp_name);
++ return ret;
++}
++
++static gboolean
++linkcopy_internal_attempt (GFile *src,
++ GFile *dest,
++ GFile *dest_parent,
++ GFileCopyFlags flags,
++ gboolean sync_data,
++ gboolean enable_guestfs_fuse_workaround,
++ gboolean *out_try_again,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int res;
++ char *tmp_name = NULL;
++ GFile *tmp_dest = NULL;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ goto out;
++
++ tmp_name = gs_fileutil_gen_tmp_name (NULL, NULL);
++ tmp_dest = g_file_get_child (dest_parent, tmp_name);
++
++ res = link (gs_file_get_path_cached (src), gs_file_get_path_cached (tmp_dest));
++ if (res == -1)
++ {
++ if (errno == EEXIST)
++ {
++ /* Nothing, fall through */
++ *out_try_again = TRUE;
++ ret = TRUE;
++ goto out;
++ }
++ else if (errno == EXDEV || errno == EMLINK || errno == EPERM
++ || (enable_guestfs_fuse_workaround && errno == ENOENT))
++ {
++ if (!g_file_copy (src, tmp_dest, flags,
++ cancellable, NULL, NULL, error))
++ goto out;
++ }
++ else
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++ }
++
++ if (sync_data)
++ {
++ /* Now, we need to fsync */
++ if (!gs_file_sync_data (tmp_dest, cancellable, error))
++ goto out;
++ }
++
++ if (!gs_file_rename (tmp_dest, dest, cancellable, error))
++ goto out;
++
++ ret = TRUE;
++ *out_try_again = FALSE;
++ out:
++ g_clear_pointer (&tmp_name, g_free);
++ g_clear_object (&tmp_dest);
++ return ret;
++}
++
++static gboolean
++linkcopy_internal (GFile *src,
++ GFile *dest,
++ GFileCopyFlags flags,
++ gboolean sync_data,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ gboolean dest_exists;
++ int i;
++ gboolean enable_guestfs_fuse_workaround;
++ struct stat src_stat;
++ struct stat dest_stat;
++ GFile *dest_parent = NULL;
++
++ flags |= G_FILE_COPY_NOFOLLOW_SYMLINKS;
++
++ g_return_val_if_fail ((flags & (G_FILE_COPY_BACKUP | G_FILE_COPY_TARGET_DEFAULT_PERMS)) == 0, FALSE);
++
++ dest_parent = g_file_get_parent (dest);
++
++ if (lstat (gs_file_get_path_cached (src), &src_stat) == -1)
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errno),
++ g_strerror (errsv));
++ goto out;
++ }
++
++ if (lstat (gs_file_get_path_cached (dest), &dest_stat) == -1)
++ dest_exists = FALSE;
++ else
++ dest_exists = TRUE;
++
++ if (((flags & G_FILE_COPY_OVERWRITE) == 0) && dest_exists)
++ {
++ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
++ "File exists");
++ goto out;
++ }
++
++ /* Work around the behavior of link() where it's a no-op if src and
++ * dest are the same.
++ */
++ if (dest_exists &&
++ src_stat.st_dev == dest_stat.st_dev &&
++ src_stat.st_ino == dest_stat.st_ino)
++ {
++ ret = TRUE;
++ goto out;
++ }
++
++ enable_guestfs_fuse_workaround = getenv ("LIBGSYSTEM_ENABLE_GUESTFS_FUSE_WORKAROUND") != NULL;
++
++ /* 128 attempts seems reasonable... */
++ for (i = 0; i < 128; i++)
++ {
++ gboolean tryagain = FALSE;
++
++ if (!linkcopy_internal_attempt (src, dest, dest_parent,
++ flags, sync_data,
++ enable_guestfs_fuse_workaround,
++ &tryagain,
++ cancellable, error))
++ goto out;
++
++ if (!tryagain)
++ break;
++ }
++
++ ret = TRUE;
++ out:
++ g_clear_object (&dest_parent);
++ return ret;
++
++}
++
++/**
++ * gs_file_linkcopy:
++ * @src: Source file
++ * @dest: Destination file
++ * @flags: flags
++ * @cancellable:
++ * @error:
++ *
++ * First tries to use the UNIX link() call, but if the files are on
++ * separate devices, fall back to copying via g_file_copy().
++ *
++ * The given @flags have different semantics than those documented
++ * when hardlinking is used. Specifically, both
++ * #G_FILE_COPY_TARGET_DEFAULT_PERMS and #G_FILE_COPY_BACKUP are not
++ * supported. #G_FILE_COPY_NOFOLLOW_SYMLINKS treated as if it was
++ * always given - if you want to follow symbolic links, you will need
++ * to resolve them manually.
++ *
++ * Beware - do not use this function if @src may be modified, and it's
++ * undesirable for the changes to also be reflected in @dest. The
++ * best use of this function is in the case where @src and @dest are
++ * read-only, or where @src is a temporary file, and you want to put
++ * it in the final place.
++ */
++gboolean
++gs_file_linkcopy (GFile *src,
++ GFile *dest,
++ GFileCopyFlags flags,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return linkcopy_internal (src, dest, flags, FALSE, cancellable, error);
++}
++
++/**
++ * gs_file_linkcopy_sync_data:
++ * @src: Source file
++ * @dest: Destination file
++ * @flags: flags
++ * @cancellable:
++ * @error:
++ *
++ * This function is similar to gs_file_linkcopy(), except it also uses
++ * gs_file_sync_data() to ensure that @dest is in stable storage
++ * before it is moved into place.
++ */
++gboolean
++gs_file_linkcopy_sync_data (GFile *src,
++ GFile *dest,
++ GFileCopyFlags flags,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return linkcopy_internal (src, dest, flags, TRUE, cancellable, error);
++}
++
++static char *
++gs_file_get_target_path (GFile *file)
++{
++ GFileInfo *info;
++ const char *target;
++ char *path;
++
++ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL);
++ if (info == NULL)
++ return NULL;
++ target = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
++ path = g_filename_from_uri (target, NULL, NULL);
++ g_object_unref (info);
++
++ return path;
++}
++
++G_LOCK_DEFINE_STATIC (pathname_cache);
++
++/**
++ * gs_file_get_path_cached:
++ *
++ * Like g_file_get_path(), but returns a constant copy so callers
++ * don't need to free the result.
++ */
++const char *
++gs_file_get_path_cached (GFile *file)
++{
++ const char *path;
++ static GQuark _file_path_quark = 0;
++
++ if (G_UNLIKELY (_file_path_quark) == 0)
++ _file_path_quark = g_quark_from_static_string ("gsystem-file-path");
++
++ G_LOCK (pathname_cache);
++
++ path = g_object_get_qdata ((GObject*)file, _file_path_quark);
++ if (!path)
++ {
++ if (g_file_has_uri_scheme (file, "trash") ||
++ g_file_has_uri_scheme (file, "recent"))
++ path = gs_file_get_target_path (file);
++ else
++ path = g_file_get_path (file);
++ if (path == NULL)
++ {
++ G_UNLOCK (pathname_cache);
++ return NULL;
++ }
++ g_object_set_qdata_full ((GObject*)file, _file_path_quark, (char*)path, (GDestroyNotify)g_free);
++ }
++
++ G_UNLOCK (pathname_cache);
++
++ return path;
++}
++
++/**
++ * gs_file_get_basename_cached:
++ *
++ * Like g_file_get_basename(), but returns a constant copy so callers
++ * don't need to free the result.
++ */
++const char *
++gs_file_get_basename_cached (GFile *file)
++{
++ const char *name;
++ static GQuark _file_name_quark = 0;
++
++ if (G_UNLIKELY (_file_name_quark) == 0)
++ _file_name_quark = g_quark_from_static_string ("gsystem-file-name");
++
++ G_LOCK (pathname_cache);
++
++ name = g_object_get_qdata ((GObject*)file, _file_name_quark);
++ if (!name)
++ {
++ name = g_file_get_basename (file);
++ g_object_set_qdata_full ((GObject*)file, _file_name_quark, (char*)name, (GDestroyNotify)g_free);
++ }
++
++ G_UNLOCK (pathname_cache);
++
++ return name;
++}
++
++/**
++ * gs_file_enumerator_iterate:
++ * @direnum: an open #GFileEnumerator
++ * @out_info: (out) (transfer none) (allow-none): Output location for the next #GFileInfo
++ * @out_child: (out) (transfer none) (allow-none): Output location for the next #GFile, or %NULL
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * This is a version of g_file_enumerator_next_file() that's easier to
++ * use correctly from C programs. With g_file_enumerator_next_file(),
++ * the gboolean return value signifies "end of iteration or error", which
++ * requires allocation of a temporary #GError.
++ *
++ * In contrast, with this function, a %FALSE return from
++ * gs_file_enumerator_iterate() <emphasis>always</emphasis> means
++ * "error". End of iteration is signaled by @out_info being %NULL.
++ *
++ * Another crucial difference is that the references for @out_info and
++ * @out_child are owned by @direnum (they are cached as hidden
++ * properties). You must not unref them in your own code. This makes
++ * memory management significantly easier for C code in combination
++ * with loops.
++ *
++ * Finally, this function optionally allows retrieving a #GFile as
++ * well.
++ *
++ * The code pattern for correctly using gs_file_enumerator_iterate() from C
++ * is:
++ *
++ * |[
++ * direnum = g_file_enumerate_children (file, ...);
++ * while (TRUE)
++ * {
++ * GFileInfo *info;
++ * if (!gs_file_enumerator_iterate (direnum, &info, NULL, cancellable, error))
++ * goto out;
++ * if (!info)
++ * break;
++ * ... do stuff with "info"; do not unref it! ...
++ * }
++ *
++ * out:
++ * g_object_unref (direnum); // Note: frees the last @info
++ * ]|
++ */
++gboolean
++gs_file_enumerator_iterate (GFileEnumerator *direnum,
++ GFileInfo **out_info,
++ GFile **out_child,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ GError *temp_error = NULL;
++
++ static GQuark cached_info_quark;
++ static GQuark cached_child_quark;
++ static gsize quarks_initialized;
++
++ g_return_val_if_fail (direnum != NULL, FALSE);
++ g_return_val_if_fail (out_info != NULL, FALSE);
++
++ if (g_once_init_enter (&quarks_initialized))
++ {
++ cached_info_quark = g_quark_from_static_string ("gsystem-cached-info");
++ cached_child_quark = g_quark_from_static_string ("gsystem-cached-child");
++ g_once_init_leave (&quarks_initialized, 1);
++ }
++
++
++ *out_info = g_file_enumerator_next_file (direnum, cancellable, &temp_error);
++ if (out_child)
++ *out_child = NULL;
++ if (temp_error != NULL)
++ {
++ g_propagate_error (error, temp_error);
++ goto out;
++ }
++ else if (*out_info != NULL)
++ {
++ g_object_set_qdata_full ((GObject*)direnum, cached_info_quark, *out_info, (GDestroyNotify)g_object_unref);
++ if (out_child != NULL)
++ {
++ const char *name = g_file_info_get_name (*out_info);
++ *out_child = g_file_get_child (g_file_enumerator_get_container (direnum), name);
++ g_object_set_qdata_full ((GObject*)direnum, cached_child_quark, *out_child, (GDestroyNotify)g_object_unref);
++ }
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++}
++
++/**
++ * gs_file_rename:
++ * @from: Current path
++ * @to: New path
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * This function wraps the raw Unix function rename().
++ *
++ * Returns: %TRUE on success, %FALSE on error
++ */
++gboolean
++gs_file_rename (GFile *from,
++ GFile *to,
++ GCancellable *cancellable,
++ GError **error)
++{
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return FALSE;
++
++ if (rename (gs_file_get_path_cached (from),
++ gs_file_get_path_cached (to)) < 0)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++/**
++ * gs_file_unlink:
++ * @path: Path to file
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Like g_file_delete(), except this function does not follow Unix
++ * symbolic links, and will delete a symbolic link even if it's
++ * pointing to a nonexistent file. In other words, this function
++ * merely wraps the raw Unix function unlink().
++ *
++ * Returns: %TRUE on success, %FALSE on error
++ */
++gboolean
++gs_file_unlink (GFile *path,
++ GCancellable *cancellable,
++ GError **error)
++{
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return FALSE;
++
++ if (unlink (gs_file_get_path_cached (path)) < 0)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++static gboolean
++chown_internal (GFile *path,
++ gboolean dereference_links,
++ guint32 owner,
++ guint32 group,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int res;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return FALSE;
++
++ do
++ if (dereference_links)
++ res = chown (gs_file_get_path_cached (path), owner, group);
++ else
++ res = lchown (gs_file_get_path_cached (path), owner, group);
++ while (G_UNLIKELY (res != 0 && errno == EINTR));
++
++ if (res < 0)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++}
++
++/**
++ * gs_file_chown:
++ * @path: Path to file
++ * @owner: UNIX owner
++ * @group: UNIX group
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Merely wraps UNIX chown().
++ *
++ * Returns: %TRUE on success, %FALSE on error
++ */
++gboolean
++gs_file_chown (GFile *path,
++ guint32 owner,
++ guint32 group,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return chown_internal (path, TRUE, owner, group, cancellable, error);
++}
++
++/**
++ * gs_file_lchown:
++ * @path: Path to file
++ * @owner: UNIX owner
++ * @group: UNIX group
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Merely wraps UNIX lchown().
++ *
++ * Returns: %TRUE on success, %FALSE on error
++ */
++gboolean
++gs_file_lchown (GFile *path,
++ guint32 owner,
++ guint32 group,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return chown_internal (path, FALSE, owner, group, cancellable, error);
++}
++
++/**
++ * gs_file_chmod:
++ * @path: Path to file
++ * @mode: UNIX mode
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Merely wraps UNIX chmod().
++ *
++ * Returns: %TRUE on success, %FALSE on error
++ */
++gboolean
++gs_file_chmod (GFile *path,
++ guint mode,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int res;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return FALSE;
++
++ do
++ res = chmod (gs_file_get_path_cached (path), mode);
++ while (G_UNLIKELY (res != 0 && errno == EINTR));
++
++ if (res < 0)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++}
++
++/**
++ * gs_file_ensure_directory:
++ * @dir: Path to create as directory
++ * @with_parents: Also create parent directories
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Like g_file_make_directory(), except does not throw an error if the
++ * directory already exists.
++ */
++gboolean
++gs_file_ensure_directory (GFile *dir,
++ gboolean with_parents,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ GError *temp_error = NULL;
++ GFile *parent = NULL;
++
++ if (!g_file_make_directory (dir, cancellable, &temp_error))
++ {
++ if (with_parents &&
++ g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
++ {
++ g_clear_error (&temp_error);
++
++ parent = g_file_get_parent (dir);
++ if (parent)
++ {
++ if (!gs_file_ensure_directory (parent, TRUE, cancellable, error))
++ goto out;
++ }
++ if (!gs_file_ensure_directory (dir, FALSE, cancellable, error))
++ goto out;
++ }
++ else if (!g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
++ {
++ g_propagate_error (error, temp_error);
++ goto out;
++ }
++ else
++ g_clear_error (&temp_error);
++ }
++
++ ret = TRUE;
++ out:
++ g_clear_object (&parent);
++ return ret;
++}
++
++/**
++ * gs_file_ensure_directory_mode:
++ * @dir: Path to create as directory
++ * @mode: Create directory with these permissions
++ * @cancellable: a #GCancellable
++ * @error: a #GError
++ *
++ * Wraps UNIX mkdir() function with support for @cancellable, and
++ * uses @error instead of errno.
++ */
++gboolean
++gs_file_ensure_directory_mode (GFile *dir,
++ guint mode,
++ GCancellable *cancellable,
++ GError **error)
++{
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ return FALSE;
++
++ if (mkdir (gs_file_get_path_cached (dir), mode) == -1 && errno != EEXIST)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ return TRUE;
++}
++
++/**
++ * gs_file_load_contents_utf8:
++ * @file: Path to file whose contents must be UTF-8
++ * @cancellable:
++ * @error:
++ *
++ * Like g_file_load_contents(), except validates the contents are
++ * UTF-8.
++ */
++gchar *
++gs_file_load_contents_utf8 (GFile *file,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ gsize len;
++ char *ret_contents = NULL;
++
++ if (!g_file_load_contents (file, cancellable, &ret_contents, &len,
++ NULL, error))
++ goto out;
++ if (!g_utf8_validate (ret_contents, len, NULL))
++ {
++ g_set_error (error,
++ G_IO_ERROR,
++ G_IO_ERROR_INVALID_DATA,
++ "Invalid UTF-8");
++ goto out;
++ }
++
++ ret = TRUE;
++ out:
++ if (!ret)
++ {
++ g_free (ret_contents);
++ return NULL;
++ }
++ return ret_contents;
++}
++
++static int
++path_common_directory (char *one,
++ char *two)
++{
++ int dir_index = 0;
++ int i = 0;
++
++ while (*one && *two)
++ {
++ if (*one != *two)
++ break;
++ if (*one == '/')
++ dir_index = i + 1;
++
++ one++;
++ two++;
++ i++;
++ }
++
++ return dir_index;
++}
++
++/**
++ * gs_file_get_relpath:
++ * @one: The first #GFile
++ * @two: The second #GFile
++ *
++ * Like gs_file_get_relative_path(), but does not mandate that
++ * the two files have any parent in common. This function will
++ * instead insert "../" where appropriate.
++ *
++ * Returns: (transfer full): The relative path between the two.
++ */
++gchar *
++gs_file_get_relpath (GFile *one,
++ GFile *two)
++{
++ gchar *simple_path;
++ gchar *one_path, *one_suffix;
++ gchar *two_path, *two_suffix;
++ GString *path;
++ int i;
++
++ simple_path = g_file_get_relative_path (one, two);
++ if (simple_path)
++ return simple_path;
++
++ one_path = g_file_get_path (one);
++ two_path = g_file_get_path (two);
++
++ i = path_common_directory (one_path, two_path);
++ one_suffix = one_path + i;
++ two_suffix = two_path + i;
++
++ path = g_string_new ("");
++
++ /* For every leftover path segment one has, append "../" so
++ * that we reach the same directory. */
++ while (*one_suffix)
++ {
++ g_string_append (path, "../");
++ one_suffix = strchr (one_suffix, '/');
++ if (one_suffix == NULL)
++ break;
++ one_suffix++;
++ }
++
++ /* And now append the leftover stuff on two's side. */
++ g_string_append (path, two_suffix);
++
++ g_free (one_path);
++ g_free (two_path);
++
++ return g_string_free (path, FALSE);
++}
++
++/**
++ * gs_file_realpath:
++ * @file: A #GFile
++ *
++ * Return a #GFile that contains the same path with symlinks
++ * followed. That is, it's a #GFile whose path is the result
++ * of calling realpath() on @file.
++ *
++ * Returns: (allow-none) (transfer full): A new #GFile or %NULL if @file is invalid
++ */
++GFile *
++gs_file_realpath (GFile *file)
++{
++ gchar *path;
++ gchar path_real[PATH_MAX];
++
++ path = g_file_get_path (file);
++
++ if (realpath ((const char *) path, path_real) == NULL)
++ {
++ g_free (path);
++ return NULL;
++ }
++
++ g_free (path);
++ return g_file_new_for_path (path_real);
++}
++
++#ifdef GSYSTEM_CONFIG_XATTRS
++static char *
++canonicalize_xattrs (char *xattr_string,
++ size_t len)
++{
++ char *p;
++ GSList *xattrs = NULL;
++ GSList *iter;
++ GString *result;
++
++ result = g_string_new (0);
++
++ p = xattr_string;
++ while (p < xattr_string+len)
++ {
++ xattrs = g_slist_prepend (xattrs, p);
++ p += strlen (p) + 1;
++ }
++
++ xattrs = g_slist_sort (xattrs, (GCompareFunc) strcmp);
++ for (iter = xattrs; iter; iter = iter->next) {
++ g_string_append (result, iter->data);
++ g_string_append_c (result, '\0');
++ }
++
++ g_slist_free (xattrs);
++ return g_string_free (result, FALSE);
++}
++
++static GVariant *
++variant_new_ay_bytes (GBytes *bytes)
++{
++ gsize size;
++ gconstpointer data;
++ data = g_bytes_get_data (bytes, &size);
++ g_bytes_ref (bytes);
++ return g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data, size,
++ TRUE, (GDestroyNotify)g_bytes_unref, bytes);
++}
++
++static gboolean
++read_xattr_name_array (const char *path,
++ const char *xattrs,
++ size_t len,
++ GVariantBuilder *builder,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ const char *p;
++
++ p = xattrs;
++ while (p < xattrs+len)
++ {
++ ssize_t bytes_read;
++ char *buf;
++ GBytes *bytes = NULL;
++
++ bytes_read = lgetxattr (path, p, NULL, 0);
++ if (bytes_read < 0)
++ {
++ _set_error_from_errno (error);
++ g_prefix_error (error, "lgetxattr (%s, %s) failed: ", path, p);
++ goto out;
++ }
++ if (bytes_read == 0)
++ continue;
++
++ buf = g_malloc (bytes_read);
++ bytes = g_bytes_new_take (buf, bytes_read);
++ if (lgetxattr (path, p, buf, bytes_read) < 0)
++ {
++ g_bytes_unref (bytes);
++ _set_error_from_errno (error);
++ g_prefix_error (error, "lgetxattr (%s, %s) failed: ", path, p);
++ goto out;
++ }
++
++ g_variant_builder_add (builder, "(@ay@ay)",
++ g_variant_new_bytestring (p),
++ variant_new_ay_bytes (bytes));
++
++ p = p + strlen (p) + 1;
++ g_bytes_unref (bytes);
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++}
++
++#endif
++
++/**
++ * gs_file_get_all_xattrs:
++ * @f: a #GFile
++ * @out_xattrs: (out): A new #GVariant containing the extended attributes
++ * @cancellable: Cancellable
++ * @error: Error
++ *
++ * Read all extended attributes of @f in a canonical sorted order, and
++ * set @out_xattrs with the result.
++ *
++ * If the filesystem does not support extended attributes, @out_xattrs
++ * will have 0 elements, and this function will return successfully.
++ */
++gboolean
++gs_file_get_all_xattrs (GFile *f,
++ GVariant **out_xattrs,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ const char *path;
++ ssize_t bytes_read;
++ GVariant *ret_xattrs = NULL;
++ char *xattr_names = NULL;
++ char *xattr_names_canonical = NULL;
++ GVariantBuilder builder;
++ gboolean builder_initialized = FALSE;
++
++ path = gs_file_get_path_cached (f);
++
++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ayay)"));
++ builder_initialized = TRUE;
++
++#ifdef GSYSTEM_CONFIG_XATTRS
++ bytes_read = llistxattr (path, NULL, 0);
++
++ if (bytes_read < 0)
++ {
++ if (errno != ENOTSUP)
++ {
++ _set_error_from_errno (error);
++ g_prefix_error (error, "llistxattr (%s) failed: ", path);
++ goto out;
++ }
++ }
++ else if (bytes_read > 0)
++ {
++ xattr_names = g_malloc (bytes_read);
++ if (llistxattr (path, xattr_names, bytes_read) < 0)
++ {
++ _set_error_from_errno (error);
++ g_prefix_error (error, "llistxattr (%s) failed: ", path);
++ goto out;
++ }
++ xattr_names_canonical = canonicalize_xattrs (xattr_names, bytes_read);
++
++ if (!read_xattr_name_array (path, xattr_names_canonical, bytes_read, &builder, error))
++ goto out;
++ }
++
++#endif
++
++ ret_xattrs = g_variant_builder_end (&builder);
++ g_variant_ref_sink (ret_xattrs);
++
++ ret = TRUE;
++ gs_transfer_out_value (out_xattrs, &ret_xattrs);
++ out:
++ g_clear_pointer (&ret_xattrs, g_variant_unref);
++ g_clear_pointer (&xattr_names, g_free);
++ g_clear_pointer (&xattr_names_canonical, g_free);
++ if (!builder_initialized)
++ g_variant_builder_clear (&builder);
++ return ret;
++}
++
++/**
++ * gs_fd_set_all_xattrs:
++ * @fd: File descriptor
++ * @xattrs: Extended attributes
++ * @cancellable: Cancellable
++ * @error: Error
++ *
++ * For each attribute in @xattrs, set its value on the file or
++ * directory referred to by @fd. This function does not remove any
++ * attributes not in @xattrs.
++ */
++gboolean
++gs_fd_set_all_xattrs (int fd,
++ GVariant *xattrs,
++ GCancellable *cancellable,
++ GError **error)
++{
++#ifdef GSYSTEM_CONFIG_XATTRS
++ gboolean ret = FALSE;
++ int i, n;
++
++ n = g_variant_n_children (xattrs);
++ for (i = 0; i < n; i++)
++ {
++ const guint8* name;
++ const guint8* value_data;
++ GVariant *value = NULL;
++ gsize value_len;
++ int res;
++
++ g_variant_get_child (xattrs, i, "(^&ay@ay)",
++ &name, &value);
++ value_data = g_variant_get_fixed_array (value, &value_len, 1);
++
++ do
++ res = fsetxattr (fd, (char*)name, (char*)value_data, value_len, 0);
++ while (G_UNLIKELY (res == -1 && errno == EINTR));
++ g_variant_unref (value);
++ if (G_UNLIKELY (res == -1))
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++#else
++ return TRUE;
++#endif
++}
++
++/**
++ * gs_file_set_all_xattrs:
++ * @file: File descriptor
++ * @xattrs: Extended attributes
++ * @cancellable: Cancellable
++ * @error: Error
++ *
++ * For each attribute in @xattrs, set its value on the file or
++ * directory referred to by @file. This function does not remove any
++ * attributes not in @xattrs.
++ */
++gboolean
++gs_file_set_all_xattrs (GFile *file,
++ GVariant *xattrs,
++ GCancellable *cancellable,
++ GError **error)
++{
++#ifdef GSYSTEM_CONFIG_XATTRS
++ gboolean ret = FALSE;
++ const char *path;
++ int i, n;
++
++ path = gs_file_get_path_cached (file);
++
++ n = g_variant_n_children (xattrs);
++ for (i = 0; i < n; i++)
++ {
++ const guint8* name;
++ GVariant *value;
++ const guint8* value_data;
++ gsize value_len;
++ gboolean loop_err;
++
++ g_variant_get_child (xattrs, i, "(^&ay@ay)",
++ &name, &value);
++ value_data = g_variant_get_fixed_array (value, &value_len, 1);
++
++ loop_err = lsetxattr (path, (char*)name, (char*)value_data, value_len, 0) < 0;
++ g_clear_pointer (&value, (GDestroyNotify) g_variant_unref);
++ if (loop_err)
++ {
++ _set_error_from_errno (error);
++ g_prefix_error (error, "lsetxattr (%s, %s) failed: ", path, name);
++ goto out;
++ }
++ }
++
++ ret = TRUE;
++ out:
++ return ret;
++#else
++ return TRUE;
++#endif
++}
</ins><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-osx-compat.c libgnome-desktop/libgsystem/gsystem-osx-compat.c
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-osx-compat.c 1969-12-31 16:00:00.000000000 -0800
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-osx-compat.c 2014-01-11 18:32:40.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-osx-compat.c 2014-01-24 17:02:13.000000000 -0800
</ins><span class="cx"> @@ -0,0 +1,578 @@
</span><span class="cx"> +/*
</span><span class="cx"> + * Mac OS X compatibility functions
</span><span class="lines">@@ -637,7 +2267,7 @@
</span><span class="cx"> +
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-osx-compat.h libgnome-desktop/libgsystem/gsystem-osx-compat.h
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-osx-compat.h 1969-12-31 16:00:00.000000000 -0800
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-osx-compat.h 2014-01-11 18:24:46.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-osx-compat.h 2014-01-24 17:02:13.000000000 -0800
</ins><span class="cx"> @@ -0,0 +1,52 @@
</span><span class="cx"> +/*
</span><span class="cx"> + * Mac OS X Compatibility
</span><span class="lines">@@ -692,8 +2322,8 @@
</span><span class="cx"> +
</span><span class="cx"> +DIR *fdopendir(int fd);
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-shutil.c libgnome-desktop/libgsystem/gsystem-shutil.c
</span><del>---- libgnome-desktop/libgsystem.orig/gsystem-shutil.c 2013-10-04 15:18:43.000000000 -0700
-+++ libgnome-desktop/libgsystem/gsystem-shutil.c 2014-01-11 18:24:46.000000000 -0800
</del><ins>+--- libgnome-desktop/libgsystem.orig/gsystem-shutil.c 2014-01-15 13:06:25.000000000 -0800
++++ libgnome-desktop/libgsystem/gsystem-shutil.c 2014-01-24 17:02:13.000000000 -0800
</ins><span class="cx"> @@ -33,6 +33,11 @@
</span><span class="cx"> #include <dirent.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="lines">@@ -706,7 +2336,7 @@
</span><span class="cx"> /* Taken from systemd/src/shared/util.h */
</span><span class="cx"> union dirent_storage {
</span><span class="cx"> struct dirent dent;
</span><del>-@@ -248,7 +253,11 @@
</del><ins>+@@ -299,7 +304,11 @@
</ins><span class="cx"> if (dent->d_type == DT_UNKNOWN)
</span><span class="cx"> {
</span><span class="cx"> struct stat stbuf;
</span><span class="lines">@@ -718,7 +2348,7 @@
</span><span class="cx"> {
</span><span class="cx"> int errsv = errno;
</span><span class="cx"> if (errsv == ENOENT)
</span><del>-@@ -271,6 +280,7 @@
</del><ins>+@@ -322,6 +331,7 @@
</ins><span class="cx">
</span><span class="cx"> if (dent->d_type == DT_DIR)
</span><span class="cx"> {
</span><span class="lines">@@ -726,13 +2356,13 @@
</span><span class="cx"> int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
</span><span class="cx">
</span><span class="cx"> if (child_dfd == -1)
</span><del>-@@ -285,7 +295,31 @@
</del><ins>+@@ -336,7 +346,31 @@
</ins><span class="cx"> goto out;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> +#else
</span><span class="cx"> + int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_NOFOLLOW);
</span><del>-
</del><ins>++
</ins><span class="cx"> + if (child_dfd == -1)
</span><span class="cx"> + {
</span><span class="cx"> + if (errno == ENOENT)
</span><span class="lines">@@ -745,7 +2375,7 @@
</span><span class="cx"> + goto out;
</span><span class="cx"> + }
</span><span class="cx"> + }
</span><del>-+
</del><ins>+
</ins><span class="cx"> + int fc_error = fcntl(child_dfd, F_SETFD, FD_CLOEXEC);
</span><span class="cx"> +
</span><span class="cx"> + if (fc_error != 0)
</span><span class="lines">@@ -758,7 +2388,7 @@
</span><span class="cx"> child_dir = fdopendir (child_dfd);
</span><span class="cx"> if (!child_dir)
</span><span class="cx"> {
</span><del>-@@ -352,9 +386,9 @@
</del><ins>+@@ -403,9 +437,9 @@
</ins><span class="cx"> DIR *d = NULL;
</span><span class="cx">
</span><span class="cx"> /* With O_NOFOLLOW first */
</span><span class="lines">@@ -769,7 +2399,7 @@
</span><span class="cx"> if (dfd == -1)
</span><span class="cx"> {
</span><span class="cx"> int errsv = errno;
</span><del>-@@ -374,7 +408,40 @@
</del><ins>+@@ -425,7 +459,40 @@
</ins><span class="cx"> goto out;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -811,9 +2441,472 @@
</span><span class="cx"> {
</span><span class="cx"> d = fdopendir (dfd);
</span><span class="cx"> if (!d)
</span><ins>+diff -urN libgnome-desktop/libgsystem.orig/gsystem-shutil.c.orig libgnome-desktop/libgsystem/gsystem-shutil.c.orig
+--- libgnome-desktop/libgsystem.orig/gsystem-shutil.c.orig 1969-12-31 16:00:00.000000000 -0800
++++ libgnome-desktop/libgsystem/gsystem-shutil.c.orig 2014-01-15 13:06:25.000000000 -0800
+@@ -0,0 +1,459 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
++ *
++ * Copyright (C) 2012 William Jon McCann <mccann@redhat.com>
++ * Copyright (C) 2012 Colin Walters <walters@verbum.org>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include "config.h"
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
++#define _GSYSTEM_NO_LOCAL_ALLOC
++#include "libgsystem.h"
++#include <glib-unix.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <dirent.h>
++#include <fcntl.h>
++
++/* Taken from systemd/src/shared/util.h */
++union dirent_storage {
++ struct dirent dent;
++ guint8 storage[offsetof(struct dirent, d_name) +
++ ((NAME_MAX + 1 + sizeof(long)) & ~(sizeof(long) - 1))];
++};
++
++static inline void
++_set_error_from_errno (GError **error)
++{
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++}
++
++static gboolean
++copy_xattrs_from_file_to_fd (GFile *src,
++ int dest_fd,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ GVariant *src_xattrs = NULL;
++
++ if (!gs_file_get_all_xattrs (src, &src_xattrs, cancellable, error))
++ goto out;
++
++ if (src_xattrs)
++ {
++ if (!gs_fd_set_all_xattrs (dest_fd, src_xattrs, cancellable, error))
++ goto out;
++ }
++
++ ret = TRUE;
++ out:
++ g_clear_pointer (&src_xattrs, g_variant_unref);
++ return ret;
++}
++
++typedef enum {
++ GS_CP_MODE_NONE,
++ GS_CP_MODE_HARDLINK,
++ GS_CP_MODE_COPY_ALL
++} GsCpMode;
++
++static gboolean
++cp_internal (GFile *src,
++ GFile *dest,
++ GsCpMode mode,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ GFileEnumerator *enumerator = NULL;
++ GFileInfo *src_info = NULL;
++ GFile *dest_child = NULL;
++ int dest_dfd = -1;
++ int r;
++
++ enumerator = g_file_enumerate_children (src, "standard::type,standard::name,unix::uid,unix::gid,unix::mode",
++ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
++ cancellable, error);
++ if (!enumerator)
++ goto out;
++
++ src_info = g_file_query_info (src, "standard::name,unix::mode,unix::uid,unix::gid," \
++ "time::modified,time::modified-usec,time::access,time::access-usec",
++ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
++ cancellable, error);
++ if (!src_info)
++ goto out;
++
++ do
++ r = mkdir (gs_file_get_path_cached (dest), 0755);
++ while (G_UNLIKELY (r == -1 && errno == EINTR));
++ if (r == -1)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ if (mode != GS_CP_MODE_NONE)
++ {
++ if (!gs_file_open_dir_fd (dest, &dest_dfd,
++ cancellable, error))
++ goto out;
++
++ do
++ r = fchown (dest_dfd,
++ g_file_info_get_attribute_uint32 (src_info, "unix::uid"),
++ g_file_info_get_attribute_uint32 (src_info, "unix::gid"));
++ while (G_UNLIKELY (r == -1 && errno == EINTR));
++ if (r == -1)
++ {
++ _set_error_from_errno (error);
++ goto out;
++ }
++
++ do
++ r = fchmod (dest_dfd, g_file_info_get_attribute_uint32 (src_info, "unix::mode"));
++ while (G_UNLIKELY (r == -1 && errno == EINTR));
++
++ if (!copy_xattrs_from_file_to_fd (src, dest_dfd, cancellable, error))
++ goto out;
++
++ if (dest_dfd != -1)
++ {
++ (void) close (dest_dfd);
++ dest_dfd = -1;
++ }
++ }
++
++ while (TRUE)
++ {
++ GFileInfo *file_info = NULL;
++ GFile *src_child = NULL;
++
++ if (!gs_file_enumerator_iterate (enumerator, &file_info, &src_child,
++ cancellable, error))
++ goto out;
++ if (!file_info)
++ break;
++
++ if (dest_child) g_object_unref (dest_child);
++ dest_child = g_file_get_child (dest, g_file_info_get_name (file_info));
++
++ if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
++ {
++ if (!cp_internal (src_child, dest_child, mode,
++ cancellable, error))
++ goto out;
++ }
++ else
++ {
++ gboolean did_link = FALSE;
++ (void) unlink (gs_file_get_path_cached (dest_child));
++ if (mode == GS_CP_MODE_HARDLINK)
++ {
++ if (link (gs_file_get_path_cached (src_child), gs_file_get_path_cached (dest_child)) == -1)
++ {
++ if (!(errno == EMLINK || errno == EXDEV))
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ /* We failed to hardlink; fall back to copying all; this will
++ * affect subsequent directory copies too.
++ */
++ mode = GS_CP_MODE_COPY_ALL;
++ }
++ else
++ did_link = TRUE;
++ }
++ if (!did_link)
++ {
++ GFileCopyFlags copyflags = G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS;
++ if (mode == GS_CP_MODE_COPY_ALL)
++ copyflags |= G_FILE_COPY_ALL_METADATA;
++ if (!g_file_copy (src_child, dest_child, copyflags,
++ cancellable, NULL, NULL, error))
++ goto out;
++ }
++ }
++ }
++
++ ret = TRUE;
++ out:
++ if (dest_dfd != -1)
++ (void) close (dest_dfd);
++ g_clear_object (&src_info);
++ g_clear_object (&enumerator);
++ g_clear_object (&dest_child);
++ return ret;
++}
++
++/**
++ * gs_shutil_cp_al_or_fallback:
++ * @src: Source path
++ * @dest: Destination path
++ * @cancellable:
++ * @error:
++ *
++ * Recursively copy path @src (which must be a directory) to the
++ * target @dest. If possible, hardlinks are used; if a hardlink is
++ * not possible, a regular copy is created. Any existing files are
++ * overwritten.
++ *
++ * Returns: %TRUE on success
++ */
++gboolean
++gs_shutil_cp_al_or_fallback (GFile *src,
++ GFile *dest,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return cp_internal (src, dest, GS_CP_MODE_HARDLINK,
++ cancellable, error);
++}
++
++/**
++ * gs_shutil_cp_a:
++ * @src: Source path
++ * @dest: Destination path
++ * @cancellable:
++ * @error:
++ *
++ * Recursively copy path @src (which must be a directory) to the
++ * target @dest. Any existing files are overwritten.
++ *
++ * Returns: %TRUE on success
++ */
++gboolean
++gs_shutil_cp_a (GFile *src,
++ GFile *dest,
++ GCancellable *cancellable,
++ GError **error)
++{
++ return cp_internal (src, dest, GS_CP_MODE_COPY_ALL,
++ cancellable, error);
++}
++
++static unsigned char
++struct_stat_to_dt (struct stat *stbuf)
++{
++ if (S_ISDIR (stbuf->st_mode))
++ return DT_DIR;
++ if (S_ISREG (stbuf->st_mode))
++ return DT_REG;
++ if (S_ISCHR (stbuf->st_mode))
++ return DT_CHR;
++ if (S_ISBLK (stbuf->st_mode))
++ return DT_BLK;
++ if (S_ISFIFO (stbuf->st_mode))
++ return DT_FIFO;
++ if (S_ISLNK (stbuf->st_mode))
++ return DT_LNK;
++ if (S_ISSOCK (stbuf->st_mode))
++ return DT_SOCK;
++ return DT_UNKNOWN;
++}
++
++static gboolean
++gs_shutil_rm_rf_children (DIR *dir,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int dfd;
++ DIR *child_dir = NULL;
++ struct dirent *dent;
++ union dirent_storage buf;
++
++ if (g_cancellable_set_error_if_cancelled (cancellable, error))
++ goto out;
++
++ dfd = dirfd (dir);
++
++ while (readdir_r (dir, &buf.dent, &dent) == 0)
++ {
++ if (dent == NULL)
++ break;
++ if (dent->d_type == DT_UNKNOWN)
++ {
++ struct stat stbuf;
++ if (fstatat (dfd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
++ {
++ int errsv = errno;
++ if (errsv == ENOENT)
++ continue;
++ else
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++ dent->d_type = struct_stat_to_dt (&stbuf);
++ /* Assume unknown types are just treated like regular files */
++ if (dent->d_type == DT_UNKNOWN)
++ dent->d_type = DT_REG;
++ }
++
++ if (strcmp (dent->d_name, ".") == 0 || strcmp (dent->d_name, "..") == 0)
++ continue;
++
++ if (dent->d_type == DT_DIR)
++ {
++ int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
++
++ if (child_dfd == -1)
++ {
++ if (errno == ENOENT)
++ continue;
++ else
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++
++ child_dir = fdopendir (child_dfd);
++ if (!child_dir)
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++
++ if (!gs_shutil_rm_rf_children (child_dir, cancellable, error))
++ goto out;
++
++ if (unlinkat (dfd, dent->d_name, AT_REMOVEDIR) == -1)
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++
++ (void) closedir (child_dir);
++ child_dir = NULL;
++ }
++ else
++ {
++ if (unlinkat (dfd, dent->d_name, 0) == -1)
++ {
++ int errsv = errno;
++ if (errno != ENOENT)
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++ }
++ }
++ /* Ignore error result from readdir_r, that's what others
++ * seem to do =(
++ */
++
++ ret = TRUE;
++ out:
++ if (child_dir) (void) closedir (child_dir);
++ return ret;
++}
++
++/**
++ * gs_shutil_rm_rf:
++ * @path: A file or directory
++ * @cancellable:
++ * @error:
++ *
++ * Recursively delete the filename referenced by @path; it may be a
++ * file or directory. No error is thrown if @path does not exist.
++ */
++gboolean
++gs_shutil_rm_rf (GFile *path,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ int dfd = -1;
++ DIR *d = NULL;
++
++ /* With O_NOFOLLOW first */
++ dfd = openat (AT_FDCWD, gs_file_get_path_cached (path),
++ O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
++
++ if (dfd == -1)
++ {
++ int errsv = errno;
++ if (errsv == ENOENT)
++ {
++ ;
++ }
++ else if (errsv == ENOTDIR || errsv == ELOOP)
++ {
++ if (!gs_file_unlink (path, cancellable, error))
++ goto out;
++ }
++ else
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++ else
++ {
++ d = fdopendir (dfd);
++ if (!d)
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++
++ if (!gs_shutil_rm_rf_children (d, cancellable, error))
++ goto out;
++
++ if (rmdir (gs_file_get_path_cached (path)) == -1)
++ {
++ int errsv = errno;
++ if (errsv != ENOENT)
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++ }
++
++ ret = TRUE;
++ out:
++ if (d) (void) closedir (d);
++ return ret;
++}
++
</ins><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-subprocess.c libgnome-desktop/libgsystem/gsystem-subprocess.c
</span><del>---- libgnome-desktop/libgsystem.orig/gsystem-subprocess.c 2013-10-04 15:18:43.000000000 -0700
-+++ libgnome-desktop/libgsystem/gsystem-subprocess.c 2014-01-11 18:24:46.000000000 -0800
</del><ins>+--- libgnome-desktop/libgsystem.orig/gsystem-subprocess.c 2014-01-15 13:06:25.000000000 -0800
++++ libgnome-desktop/libgsystem/gsystem-subprocess.c 2014-01-24 17:02:13.000000000 -0800
</ins><span class="cx"> @@ -259,7 +259,11 @@
</span><span class="cx"> gint my_fd;
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomedeveldocs"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-devel-docs:108265-117303
</span><span class="cx">/users/rmstonecipher/gnome/gnome-devel-docs:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-devel-docs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-devel-docs:108265-118004
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-devel-docs:118054-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-devel-docs:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomedeveldocsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-devel-docs
</span><del>-version 3.10.3
</del><ins>+version 3.11.92
</ins><span class="cx"> license GFDL-1.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The GNOME Developer Documentation Package
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 403eda4d6158556e5859c8eafc81423f599103ad \
- sha256 746839d741538c5b4c0f0f8d3200375b28010d8d9bb1f9513ace69e7cc13b450
</del><ins>+checksums rmd160 04bae1d2d2a2c2c335725e036ee8a90e79b02e75 \
+ sha256 a613a52151fe45711dbc2bfd2326deb70fa9ff9532e5d3d7deaf74591e743f80
</ins><span class="cx">
</span><span class="cx"> depends_build port:itstool \
</span><span class="cx"> port:libxml2
</span><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeicontheme"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-icon-theme:108265-117327
</span><span class="cx">/users/rmstonecipher/gnome/gnome-icon-theme:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-icon-theme:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-icon-theme:108265-117327
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-icon-theme:117866-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-icon-theme:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomeiconthemePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-icon-theme
</span><del>-version 3.10.0
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2d7f1945a40d87b201e868d599e7ddd3b57eb251 \
- sha256 c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6
</del><ins>+checksums rmd160 a3c27c41413b3db1cdd6f3f39752a3759c485181 \
+ sha256 9214fe976429a6542bd952d507ceb54e623e2036e6798dcba87bf9d84eb41878
</ins><span class="cx">
</span><span class="cx"> depends_build port:intltool \
</span><span class="cx"> port:pkgconfig \
</span><span class="lines">@@ -30,8 +30,12 @@
</span><span class="cx">
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><del>-# autoreconf with MacPorts patched intltool.m4
</del><ins>+# update m4/intltool.m4 and autoreconf
</ins><span class="cx">
</span><ins>+post-patch {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fi
</span><span class="cx">
</span><span class="lines">@@ -40,4 +44,4 @@
</span><span class="cx">
</span><span class="cx"> configure.args --enable-icon-mapping
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeiconthemesymbolic"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeiconthemesymbolicPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-icon-theme-symbolic/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-icon-theme-symbolic
</span><del>-version 3.10.1
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -21,11 +21,12 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 331225cb81f3c6201d27b84b96ad7781e06d0084 \
- sha256 344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412
</del><ins>+checksums rmd160 5b2e3f946757b8b432cbd69badb647f880106fed \
+ sha256 10a60c85a559d3413dc14ba71f67200158a70b98c0569144f33788ba0766ba76
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:icon-naming-utils
</del><ins>+ port:icon-naming-utils \
+ port:gtk3
</ins><span class="cx">
</span><span class="cx"> configure.env-append \
</span><span class="cx"> GTK_UPDATE_ICON_CACHE=${prefix}/bin/gtk-update-icon-cache-3.0
</span><span class="lines">@@ -33,4 +34,6 @@
</span><span class="cx"> supported_archs noarch
</span><span class="cx"> installs_libs no
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+patchfiles patch-configure.diff
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomekeyring"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-keyring:108265-117914
</span><span class="cx">/users/rmstonecipher/gnome/gnome-keyring:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-keyring:108265-117914
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118152
</span><span class="cx">/users/rmstonecipher/gnome/gnome-keyring:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomekeyringPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gnome-keyring
</span><span class="cx"> epoch 1
</span><del>-version 3.10.1
-revision 1
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -24,13 +23,14 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 beb643992eed921e82102669399ccf8e1fc423cd \
- sha256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8
</del><ins>+checksums rmd160 eca9535d478587b938a8f9dbd53ca596a79566f5 \
+ sha256 a2943e02e37e76b63239dc7ce37864e5d152201b766bb848ac8851cadbd4e24b
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-egg-egg-asn1x.h.diff \
</span><del>- patch-egg-egg-armor.c.diff \
- patch-disable-pkcs11-tests.diff
</del><ins>+ patch-egg-egg-armor.c.diff
</ins><span class="cx">
</span><ins>+# patch-disable-pkcs11-tests.diff
+
</ins><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:gnome-common \
</span><span class="lines">@@ -41,7 +41,12 @@
</span><span class="cx"> port:gcr \
</span><span class="cx"> port:libgcrypt
</span><span class="cx">
</span><del>-# Don't do intltool's INTLTOOL_PERL dance
</del><ins>+# update build/m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/build/m4
+}
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="lines">@@ -67,4 +72,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomekeyringfilespatcheggeggarmorcdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- egg/egg-armor.c.orig 2013-08-15 13:10:37.000000000 -0700
-+++ egg/egg-armor.c 2013-08-15 13:12:47.000000000 -0700
-@@ -60,6 +60,27 @@
- #define ARMOR_PREF_END "-----END "
- #define ARMOR_PREF_END_L 9
-
-+#ifdef __APPLE__
-+/*
-+ * Reverse memchr()
-+ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
-+ */
-+static void *
-+memrchr(const void *s, int c, size_t n)
-+{
-+ const unsigned char *cp;
-+
-+ if (n != 0) {
-+ cp = (const unsigned char *)s + n;
-+ do {
-+ if (*(--cp) == (unsigned char)c)
-+ return((void *)cp);
-+ } while (--n != 0);
-+ }
-+ return(NULL);
-+}
-+#endif
-+
- static void
- parse_header_lines (const gchar *hbeg,
- const gchar *hend,
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomekeyringfilespatcheggeggasn1xhdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- egg/egg-asn1x.h.orig 2013-08-15 14:58:31.000000000 -0700
-+++ egg/egg-asn1x.h 2013-08-15 14:58:51.000000000 -0700
-@@ -68,7 +68,7 @@
</del><ins>+--- egg/egg-asn1x.h.orig 2014-03-16 00:52:15.000000000 -0700
++++ egg/egg-asn1x.h 2014-03-19 00:41:13.000000000 -0700
+@@ -67,7 +67,7 @@
</ins><span class="cx"> EGG_ASN1X_GENERALIZED_TIME = 37,
</span><span class="cx"> } EggAsn1xType;
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccounts"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome-online-accounts:113257-117452
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts:114069-118152
</span><a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name gnome-online-accounts
-version 3.10.2
-license LGPL-2
-set branch [join [lrange [split ${version} .] 0 1] .]
-description Single sign-on framework for GNOME
-long_description \
- ${description}
-maintainers devans openmaintainer
-categories gnome
-platforms darwin
-homepage https://wiki.gnome.org/Projects/GnomeOnlineAccounts
-master_sites gnome:sources/${name}/${branch}/
-
-use_xz yes
-
-checksums rmd160 73f3124a9d66863d9205ad9e53aa3c386b261215 \
- sha256 0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97
-
-depends_build port:pkgconfig \
- port:intltool \
- port:gtk-doc \
- port:gnome-common
-
-depends_lib port:gtk3 \
- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
- port:libsoup \
- port:json-glib \
- port:rest \
- port:libsecret \
- port:libxml2 \
- port:gobject-introspection \
- port:gcr \
- port:telepathy-glib
-
-patchfiles patch-return-val-if-fail.diff
-
-# use upstream autogen.sh to update m4/intltool.m4 and telepathy-account-widgets/m4/intltool.m4 and reconfigure
-
-post-patch {
- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-}
-
-configure.cmd ./autogen.sh
-
-configure.cflags-append -Wno-format-nonliteral
-configure.args --enable-introspection=yes
-
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
- depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- }
-}
-
-livecheck.type gnome
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccountsPortfile31192fromrev118152usersdevansGNOME3unstabledportsgnomegnomeonlineaccountsPortfile31192"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile-3.11.92 (from rev 118152, users/devans/GNOME-3/unstable/dports/gnome/gnome-online-accounts/Portfile-3.11.92) (0 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile-3.11.92 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile-3.11.92 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 116271 2014-01-23 17:32:19Z devans@macports.org $
+
+PortSystem 1.0
+
+name gnome-online-accounts
+version 3.11.92
+license LGPL-2
+set branch [join [lrange [split ${version} .] 0 1] .]
+description Single sign-on framework for GNOME
+long_description \
+ ${description}
+maintainers devans openmaintainer
+categories gnome
+platforms darwin
+homepage https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+master_sites gnome:sources/${name}/${branch}/
+
+use_xz yes
+
+checksums rmd160 fe9ef1880ba7c3deea963b8fddb1d4d7cc4ec72c \
+ sha256 013a2e6ee2b9896a5e61a9d045245363f165abef52d9301e0c60844e264bb6cc
+
+depends_build port:pkgconfig \
+ port:intltool \
+ port:gtk-doc
+
+depends_lib port:gtk3 \
+ path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
+ port:libsoup \
+ port:json-glib \
+ port:rest \
+ port:libsecret \
+ port:libxml2 \
+ port:gobject-introspection \
+ port:gcr \
+ port:telepathy-glib
+
+#patchfiles patch-return-val-if-fail.diff
+
+# use upstream autogen.sh to update m4/intltool.m4 and telepathy-account-widgets/m4/intltool.m4 and reconfigure
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
+configure.cflags-append -Wno-format-nonliteral
+configure.args --enable-introspection=yes
+
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
+platform darwin {
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} eq "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeonlineaccountsfilespatchreturnvaliffaildiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/files/patch-return-val-if-fail.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/goabackend/goaproviderfactory.c.orig 2013-11-27 07:11:13.000000000 -0800
-+++ src/goabackend/goaproviderfactory.c 2013-11-27 07:13:03.000000000 -0800
-@@ -114,7 +114,7 @@
</del><ins>+--- src/goabackend/goaproviderfactory.c.orig 2014-01-08 07:53:27.000000000 -0800
++++ src/goabackend/goaproviderfactory.c 2014-01-21 15:16:14.000000000 -0800
+@@ -86,7 +86,7 @@
</ins><span class="cx"> {
</span><span class="cx"> GoaProviderFactoryClass *klass;
</span><span class="cx">
</span><span class="lines">@@ -8,15 +8,4 @@
</span><span class="cx"> + g_return_val_if_fail (GOA_IS_PROVIDER_FACTORY (factory), NULL);
</span><span class="cx">
</span><span class="cx"> klass = GOA_PROVIDER_FACTORY_GET_CLASS (factory);
</span><del>- return klass->get_providers_finish (factory, out_providers, result, error);
---- src/goabackend/goatelepathyfactory.c.orig 2013-11-27 07:19:01.000000000 -0800
-+++ src/goabackend/goatelepathyfactory.c 2013-11-27 07:19:36.000000000 -0800
-@@ -50,7 +50,7 @@
- get_provider (GoaProviderFactory *factory,
- const gchar *provider_name)
- {
-- g_return_if_fail (GOA_IS_TELEPATHY_FACTORY (factory));
-+ g_return_val_if_fail (GOA_IS_TELEPATHY_FACTORY (factory), NULL);
-
- return GOA_PROVIDER (goa_telepathy_provider_new_from_protocol_name (provider_name));
- }
</del><ins>+ g_return_if_fail (klass->get_providers != NULL);
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesession"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-session</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-session
</span><del>-version 3.10.1
</del><ins>+version 3.11.92
</ins><span class="cx"> license LGPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Session component for the GNOME 3 desktop.
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 5aa9deb26cdab3cd056a9cb25db651fe24e6a131 \
- sha256 f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc
</del><ins>+checksums rmd160 841764d88fed974f0e7a468a7a2189b749af52b0 \
+ sha256 9b2bb33341d436a105859a5660a3feb6593ff369bd0cf974b4f92a497cc7867f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -79,4 +79,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessionmaincdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- gnome-session/main.c.orig 2013-10-04 19:29:25.000000000 -0700
-+++ gnome-session/main.c 2013-12-13 12:39:51.000000000 -0800
-@@ -33,6 +33,10 @@
</del><ins>+--- gnome-session/main.c.orig 2014-03-18 13:31:47.000000000 -0700
++++ gnome-session/main.c 2014-03-19 23:56:21.000000000 -0700
+@@ -31,6 +31,10 @@
</ins><span class="cx">
</span><span class="cx"> #include <glib-unix.h>
</span><span class="cx">
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> #include <dbus/dbus.h>
</span><span class="cx"> #include <dbus/dbus-glib.h>
</span><span class="cx"> #include <dbus/dbus-glib-bindings.h>
</span><del>-@@ -242,6 +246,14 @@
</del><ins>+@@ -240,6 +244,14 @@
</ins><span class="cx"> if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
</span><span class="cx"> return TRUE;
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> /* Just a sanity check to prevent infinite recursion if
</span><span class="cx"> * dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS
</span><span class="cx"> */
</span><del>-@@ -266,6 +278,7 @@
</del><ins>+@@ -264,6 +276,7 @@
</ins><span class="cx"> g_strerror (errno));
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesettingsdaemon"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome-settings-daemon:108265-117360
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon:116416-118153
</span><a id="usersdevansGNOME3stabledportsgnomegnomesettingsdaemonPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name gnome-settings-daemon
</span><del>-version 3.10.2
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2 LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Gnome 3 settings daemon.
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 759f890c3a322615c94ce5ba8512d98f814f9a40 \
- sha256 808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264
</del><ins>+checksums rmd160 6ae4d36900be454089482053042a708ac5f873fe \
+ sha256 b3baae18549d19c52f3b9a2c219d757ddf188eb3d1580a17bc58a0327995ebb5
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> # xrandr (works but tries to take over control of display causing problems with Mac OS X)
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+pre-patch {
+ copy ${worksrcpath}/plugins/Makefile.am ${worksrcpath}/plugins/Makefile.am.orig
+}
+
</ins><span class="cx"> patchfiles patch-plugins.diff
</span><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="lines">@@ -81,4 +85,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesettingsdaemonfilespatchpluginsdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -18,9 +18,9 @@
</span><span class="cx">
</span><span class="cx"> dnl ---------------------------------------------------------------------------
</span><span class="cx"> dnl - datetime
</span><del>---- plugins/Makefile.am.orig 2013-11-11 09:25:13.000000000 -0800
-+++ plugins/Makefile.am 2013-12-13 09:01:21.000000000 -0800
-@@ -4,11 +4,9 @@
</del><ins>+--- plugins/Makefile.am.orig 2013-12-17 01:29:53.000000000 -0800
++++ plugins/Makefile.am 2014-01-24 12:46:28.000000000 -0800
+@@ -4,22 +4,23 @@
</ins><span class="cx"> a11y-keyboard \
</span><span class="cx"> a11y-settings \
</span><span class="cx"> clipboard \
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> housekeeping \
</span><span class="cx"> keyboard \
</span><span class="cx"> media-keys \
</span><del>-@@ -16,11 +14,13 @@
- remote-display \
</del><ins>+ mouse \
</ins><span class="cx"> screensaver-proxy \
</span><span class="cx"> sound \
</span><span class="cx"> - xrandr \
</span><span class="lines">@@ -41,10 +40,11 @@
</span><span class="cx"> $(NULL)
</span><span class="cx">
</span><span class="cx"> -disabled_plugins = $(NULL)
</span><del>-+disabled_plugins = color \
-+ power \
-+ xrandr \
-+ $(NULL)
</del><ins>++disabled_plugins = \
++ color \
++ power \
++ xrandr \
++ $(NULL)
</ins><span class="cx">
</span><span class="cx"> if HAVE_PACKAGEKIT
</span><span class="cx"> enabled_plugins += updates
</span><span class="lines">@@ -70,3 +70,33 @@
</span><span class="cx">
</span><span class="cx"> libexec_PROGRAMS = gsd-test-screensaver-proxy
</span><span class="cx">
</span><ins>+--- plugins/cursor/Makefile.am.orig 2014-01-24 11:55:28.000000000 -0800
++++ plugins/cursor/Makefile.am 2014-01-24 11:55:52.000000000 -0800
+@@ -26,6 +26,7 @@
+
+ libcursor_la_LIBADD = \
+ $(top_builddir)/plugins/common/libcommon.la \
++ $(top_builddir)/gnome-settings-daemon/libgsd.la \
+ $(CURSOR_LIBS) \
+ $(SETTINGS_PLUGIN_LIBS)
+
+--- plugins/keyboard/Makefile.am.orig 2014-01-24 12:01:28.000000000 -0800
++++ plugins/keyboard/Makefile.am 2014-01-24 12:02:57.000000000 -0800
+@@ -43,6 +43,7 @@
+
+ libkeyboard_la_LIBADD = \
+ $(top_builddir)/plugins/common/libcommon.la \
++ $(top_builddir)/gnome-settings-daemon/libgsd.la \
+ $(SETTINGS_PLUGIN_LIBS) \
+ $(XF86MISC_LIBS) \
+ $(KEYBOARD_LIBS) \
+--- plugins/mouse/Makefile.am.orig 2014-01-24 12:12:34.000000000 -0800
++++ plugins/mouse/Makefile.am 2014-01-24 12:13:16.000000000 -0800
+@@ -28,6 +28,7 @@
+ libmouse_la_LIBADD = \
+ $(MOUSE_LIBS) \
+ $(top_builddir)/plugins/common/libcommon.la \
++ $(top_builddir)/gnome-settings-daemon/libgsd.la \
+ $(SETTINGS_PLUGIN_LIBS)
+
+ plugin_in_files = mouse.gnome-settings-plugin.in
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesystemmonitor"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-system-monitor:108271-118042
</span><span class="cx">/users/rmstonecipher/gnome/gnome-system-monitor:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-system-monitor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-system-monitor:108271-118042
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor:114069-118154
</span><span class="cx">/users/rmstonecipher/gnome/gnome-system-monitor:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomesystemmonitorPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-system-monitor
</span><del>-version 3.10.2
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description A system monitor.
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 767dad0a7f8197bef017568ffe987c0c00c05462 \
- sha256 bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0
</del><ins>+checksums rmd160 3948ca158b804937d71b0fad1ffaf432741dd69c \
+ sha256 22b9525d50d9cf2ad5c6923fb0b275dec897ada0077cbb6f35a7665c8d560131
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:autoconf \
</span><span class="lines">@@ -44,8 +44,7 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-src_openfiles.cpp.diff \
- patch-src-procproperties.cpp.diff
</del><ins>+patchfiles patch-src-procproperties.cpp.diff
</ins><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="lines">@@ -66,4 +65,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesystemmonitorfilespatchsrcprocpropertiescppdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/procproperties.cpp.orig 2013-10-11 19:30:58.000000000 -0700
-+++ src/procproperties.cpp 2013-11-25 16:12:16.000000000 -0800
-@@ -30,6 +30,9 @@
</del><ins>+--- src/procproperties.cpp.orig 2014-02-19 14:01:08.000000000 -0800
++++ src/procproperties.cpp 2014-03-19 15:57:08.000000000 -0700
+@@ -29,6 +29,9 @@
</ins><span class="cx"> #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
</span><span class="cx"> #include <sys/param.h>
</span><span class="cx"> #include <sys/sysctl.h>
</span><span class="lines">@@ -10,12 +10,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include "application.h"
</span><del>-@@ -79,6 +82,8 @@
</del><ins>+@@ -78,6 +81,8 @@
</ins><span class="cx"> HZ = 100;
</span><span class="cx"> else
</span><span class="cx"> HZ = (cinf.stathz ? cinf.stathz : cinf.hz);
</span><span class="cx"> +#elif defined (__APPLE__)
</span><span class="cx"> + int HZ = 100;
</span><span class="cx"> #endif
</span><del>- proc_arg proc_props[] = {
- { N_("Process Name"), g_strdup_printf("%s", info->name)},
</del><ins>+ #ifdef __GNU__
+ int HZ;
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesystemmonitorfilespatchsrc_openfilescppdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- src/openfiles.cpp.orig 2013-10-11 19:30:58.000000000 -0700
-+++ src/openfiles.cpp 2014-03-19 21:27:33.000000000 -0700
-@@ -51,7 +51,9 @@
- }
- }
-
--
-+#ifndef NI_IDN
-+#define NI_IDN (0)
-+#endif
-
- static char *
- friendlier_hostname(const char *addr_str, int port)
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminal"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal</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/rmstonecipher/gnome/gnome-terminal:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/gnome-terminal:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-terminal
</span><del>-version 3.10.2
</del><ins>+version 3.11.3
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Terminal component for the GNOME 2 Desktop
</span><span class="cx"> long_description \
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 b25d2782052cf65f7b8b4dc591762cf69e21f630 \
- sha256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913
</del><ins>+checksums rmd160 59c19a4b4fb81662b631e13e5cb1315744ae4055 \
+ sha256 135d85cf2643c5b523451ff0dd42cc88970d4f34a7ce307fbc9b52055ed78ea8
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -41,9 +41,7 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-getcwd.diff \
- patch-uuid.diff \
- patch-gschema.xml.in.diff \
</del><ins>+patchfiles patch-uuid.diff \
</ins><span class="cx"> no-dupfd_cloexec.patch
</span><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="lines">@@ -56,12 +54,14 @@
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="cx"> configure.args --with-gtk=3.0 \
</span><ins>+ --with-nautilus-extension=no \
</ins><span class="cx"> --disable-migration \
</span><ins>+ --disable-search-provider \
</ins><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-schemas-compile
</span><span class="cx">
</span><span class="cx"> variant nautilus description {Build optional nautilus extension} {
</span><del>- configure.args-append --with-nautilus-extension
</del><ins>+ configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
</ins><span class="cx"> depends_lib-append port:nautilus
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,9 +70,11 @@
</span><span class="cx"> depends_lib-append port:gconf
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+default_variants +nautilus
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminalfilesnodupfd_cloexecpatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,13 +1,22 @@
</span><del>---- src/terminal-screen.c.orig 2013-10-14 12:26:50.000000000 -0700
-+++ src/terminal-screen.c 2013-11-25 18:08:22.000000000 -0800
-@@ -1338,7 +1338,12 @@
</del><ins>+--- src/terminal-screen.c.orig 2014-02-17 13:39:53.000000000 -0800
++++ src/terminal-screen.c 2014-03-14 09:35:53.000000000 -0700
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -1243,7 +1243,12 @@
</ins><span class="cx"> for (j = 0; j < n_fds; j++) {
</span><span class="cx"> if (fds[j] == target_fd) {
</span><span class="cx"> do {
</span><span class="cx"> +#ifdef F_DUPFD_CLOEXEC
</span><del>- fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 10);
</del><ins>+ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
</ins><span class="cx"> +#else
</span><del>-+ fd = fcntl (fds[j], F_DUPFD, 10);
</del><ins>++ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
</ins><span class="cx"> + fcntl(fd, F_SETFD, FD_CLOEXEC);
</span><span class="cx"> +#endif
</span><span class="cx"> } while (fd == -1 && errno == EINTR);
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminalfilespatchgetcwddiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-getcwd.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-diff -ur src.orig/client.c src/client.c
---- src.orig/client.c 2013-07-07 03:54:02.000000000 -0700
-+++ src/client.c 2013-09-14 13:19:28.000000000 -0700
-@@ -33,6 +33,10 @@
- #include <unistd.h>
- #include <sys/wait.h>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-@@ -521,7 +525,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- data->working_directory = g_strdup (cwd);
- free (cwd);
- }
---- src/terminal.c.orig 2013-10-08 13:17:46.000000000 -0700
-+++ src/terminal.c 2013-11-25 18:08:22.000000000 -0800
-@@ -28,6 +28,10 @@
- #include <time.h>
- #include <unistd.h>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <gio/gio.h>
-@@ -233,7 +237,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- working_directory = g_strdup (cwd);
- free (cwd);
-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnometerminalfilespatchuuiddiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -10,11 +10,10 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span><del>-diff -ur src.orig/terminal-profiles-list.c src/terminal-profiles-list.c
---- src.orig/terminal-profiles-list.c 2013-06-21 09:10:02.000000000 -0700
-+++ src/terminal-profiles-list.c 2013-09-14 22:42:51.000000000 -0700
-@@ -25,7 +25,7 @@
- #include "terminal-schemas.h"
</del><ins>+--- src/terminal-profiles-list.c.orig 2013-11-20 14:44:26.000000000 -0800
++++ src/terminal-profiles-list.c 2014-01-24 15:34:04.000000000 -0800
+@@ -26,7 +26,7 @@
+ #include "terminal-libgsystem.h"
</ins><span class="cx">
</span><span class="cx"> #include <string.h>
</span><span class="cx"> -#include <uuid.h>
</span><span class="lines">@@ -34,13 +33,24 @@
</span><span class="cx"> #include <dconf.h>
</span><span class="cx">
</span><span class="cx"> #include "terminal-type-builtins.h"
</span><del>---- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
-+++ configure.ac 2014-02-24 14:08:49.000000000 -0800
-@@ -82,7 +82,6 @@
</del><ins>+--- src/terminal-window.c.orig 2014-03-14 09:31:11.000000000 -0700
++++ src/terminal-window.c 2014-03-14 09:32:14.000000000 -0700
+@@ -29,7 +29,7 @@
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #endif
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #include "terminal-app.h"
+ #include "terminal-debug.h"
+--- configure.ac.orig 2014-02-19 11:59:55.000000000 -0800
++++ configure.ac 2014-03-14 09:33:28.000000000 -0700
+@@ -78,7 +78,6 @@
</ins><span class="cx"> gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
</span><span class="cx"> gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
</span><span class="cx"> dconf >= $DCONF_REQUIRED
</span><span class="cx"> - uuid
</span><span class="cx"> $PLATFORM_DEPS])
</span><span class="cx">
</span><del>- # DConf broke API without changing the pkgconfig name
</del><ins>+ # ****
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomeuserdocs"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gnome-user-docs:108265-117330
</span><span class="cx">/users/rmstonecipher/gnome/gnome-user-docs:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-user-docs:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-user-docs:108265-117330
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-user-docs:117866-118154
</span><span class="cx">/users/rmstonecipher/gnome/gnome-user-docs:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomeuserdocsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-user-docs/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-user-docs
</span><del>-version 3.10.3
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description End-user documentation for GNOME3
</span><span class="cx"> long_description \
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums sha256 960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905 \
- rmd160 b703b4cc3a64666d103cf0133064f1ae676064d6
</del><ins>+checksums sha256 3f9e50294425e567e7a14011292ae403ad71d3c1aa6a54517d37d14617148977 \
+ rmd160 5548eebdf789916efb2368d1e58f2b1f8313a0bb
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:itstool
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3apps"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome3-apps:113335-116735
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps:115850-118154
</span><a id="usersdevansGNOME3stabledportsgnomegnome3appsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome3-apps
</span><del>-version 3.10.2
</del><ins>+version 3.11.92
</ins><span class="cx"> categories gnome
</span><span class="cx"> license Permissive
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> # gnome-nibbles (previously part of gnome-games)
</span><span class="cx"> # gnome-photos
</span><span class="cx"> # gnome-robots (previously part of gnome-games)
</span><ins>+# gnome-software
+# gnome-sound-recorder
</ins><span class="cx"> # gnome-sudoku (previously part of gnome-games)
</span><span class="cx"> # gnome-tetravex (previously part of gnome-games)
</span><span class="cx"> # gnome-weather
</span><span class="lines">@@ -60,6 +62,7 @@
</span><span class="cx"> # nautilus-sendto
</span><span class="cx"> # nemiver
</span><span class="cx"> # orca
</span><ins>+# polari
</ins><span class="cx"> # quadrapassel (previously part of gnome-games)
</span><span class="cx"> # swell-foop
</span><span class="cx"> # tali (previously part of gnome-games)
</span><span class="lines">@@ -77,6 +80,7 @@
</span><span class="cx"> depends_lib port:anjuta \
</span><span class="cx"> port:devhelp \
</span><span class="cx"> port:file-roller \
</span><ins>+ port:gitg \
</ins><span class="cx"> port:glade \
</span><span class="cx"> port:gnome-devel-docs \
</span><span class="cx"> port:rygel \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3appsfilesversionstxt"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,41 +1,50 @@
</span><del>-## APPS
-apps:accerciser:3.8.2:
-apps:aisleriot:3.8.0:
-apps:anjuta:3.8.2:
-apps:brasero:3.8.0:
-apps:cheese:3.8.2:
-apps:devhelp:3.8.2:
-apps:evolution:3.8.2:
-apps:file-roller:3.8.2:
-apps:five-or-more:3.8.1:
-apps:four-in-a-row:3.8.1:
-apps:gedit:3.8.2:
-apps:glade:3.14.2:
-apps:gnome-boxes:3.8.2:
-apps:gnome-chess:3.8.2:
-apps:gnome-clocks:3.8.2:
-apps:gnome-color-manager:3.8.2:
-apps:gnome-devel-docs:3.8.1:
-apps:gnome-documents:3.8.2.1:
-apps:gnome-getting-started-docs:3.8.2:
-apps:gnome-initial-setup:0.10:
-apps:gnome-klotski:3.8.2:
-apps:gnome-mahjongg:3.8.0:
-apps:gnome-mines:3.8.1:
-apps:gnome-nettool:3.8.0:
-apps:gnome-nibbles:3.8.0:
-apps:gnome-robots:3.8.1:
-apps:gnome-sudoku:3.8.1:
-apps:gnome-tetravex:3.8.1:
-apps:iagno:3.8.1:
-apps:lightsoff:3.8.0:
-apps:nautilus-sendto:3.8.0:
-apps:nemiver:0.9.4:
-apps:orca:3.8.1:
-apps:quadrapassel:3.8.1:
-apps:rygel:0.18.2:
-apps:seahorse:3.8.2:
-apps:swell-foop:3.8.1:
-apps:tali:3.8.0:
-apps:vinagre:3.8.2:
-
</del><ins>+apps:accerciser:3.11.92.1:
+apps:aisleriot:3.10.2:
+apps:anjuta:3.11.92:
+apps:bijiben:3.11.92:
+apps:brasero:3.11.3:
+apps:cheese:3.11.92:
+apps:devhelp:3.11.92:
+apps:evolution:3.11.92:
+apps:file-roller:3.11.92:
+apps:five-or-more:3.11.92:
+apps:four-in-a-row:3.11.92:
+apps:gedit:3.11.92:
+apps:gitg:0.3.2:
+apps:glade:3.16.1:
+apps:gnome-boxes:3.11.92:
+apps:gnome-chess:3.11.92:
+apps:gnome-clocks:3.11.92:
+apps:gnome-color-manager:3.11.90:
+apps:gnome-devel-docs:3.11.92:
+apps:gnome-documents:3.11.92:
+apps:gnome-getting-started-docs:3.11.90:
+apps:gnome-initial-setup:3.11.92:
+apps:gnome-klotski:3.11.92:
+apps:gnome-logs:3.11.92:
+apps:gnome-mahjongg:3.11.92:
+apps:gnome-maps:3.11.92:
+apps:gnome-mines:3.11.92:
+apps:gnome-music:3.11.92:
+apps:gnome-nettool:3.8.1:
+apps:gnome-nibbles:3.11.92:
+apps:gnome-photos:3.11.92:
+apps:gnome-robots:3.11.92:
+apps:gnome-software:3.11.92:
+apps:gnome-sound-recorder:3.11.92:
+apps:gnome-sudoku:3.11.92:
+apps:gnome-tetravex:3.11.92:
+apps:gnome-tweak-tool:3.10.1:
+apps:gnome-weather:3.11.92:
+apps:iagno:3.11.92:
+apps:lightsoff:3.11.92:
+apps:nautilus-sendto:3.8.1:
+apps:nemiver:0.9.5:
+apps:orca:3.11.92:
+apps:polari:3.11.2:
+apps:quadrapassel:3.11.92:
+apps:rygel:0.21.6:
+apps:seahorse:3.11.92:
+apps:swell-foop:3.11.92:
+apps:tali:3.11.92:
+apps:vinagre:3.11.92:
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3core"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome3-core</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome3-core:113334-117110
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome3-core:115850-118154
</span><a id="usersdevansGNOME3stabledportsgnomegnome3corePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome3-core
</span><del>-version 3.10.2
-revision 5
</del><ins>+version 3.11.92
</ins><span class="cx"> categories gnome
</span><span class="cx"> license Permissive
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="lines">@@ -29,7 +28,6 @@
</span><span class="cx"> # The following modules are included in the current GNOME core
</span><span class="cx"> # module set but have not yet been ported to MacPorts
</span><span class="cx"> #
</span><del>-# ModemManager
</del><span class="cx"> # NetworkManager
</span><span class="cx"> # cantarell-fonts
</span><span class="cx"> # caribou
</span><span class="lines">@@ -45,7 +43,6 @@
</span><span class="cx"> # gnome-user-share
</span><span class="cx"> # gnome-video-effects
</span><span class="cx"> # libgxps
</span><del>-# libqmi
</del><span class="cx"> # libzapojit
</span><span class="cx"> # mousetweaks
</span><span class="cx"> # mutter
</span><span class="lines">@@ -116,6 +113,7 @@
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> port:gtk2 \
</span><span class="cx"> port:gtk-doc \
</span><ins>+ port:gtk-engines2 \
</ins><span class="cx"> port:gtkmm3 \
</span><span class="cx"> port:gtksourceview3 \
</span><span class="cx"> port:gucharmap \
</span><span class="lines">@@ -127,10 +125,11 @@
</span><span class="cx"> port:libcroco \
</span><span class="cx"> port:libgdata \
</span><span class="cx"> port:libgee \
</span><del>- port:libgnome-keyring \
</del><span class="cx"> port:libgnomekbd \
</span><ins>+ port:libgsf \
</ins><span class="cx"> port:libgtop \
</span><span class="cx"> port:libgweather \
</span><ins>+ port:libmediaart \
</ins><span class="cx"> port:libnotify \
</span><span class="cx"> port:libpeas \
</span><span class="cx"> port:rest \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3corefilesversionstxt"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,118 +1,116 @@
</span><del>-## CORE
-core:ModemManager:0.7.991:
</del><span class="cx"> core:NetworkManager:0.9.8.8:
</span><del>-core:at-spi2-atk:2.10.2:
-core:at-spi2-core:2.10.2:
-core:atk:2.10.0:
</del><ins>+core:at-spi2-atk:2.11.92:
+core:at-spi2-core:2.11.92:
+core:atk:2.11.92:
</ins><span class="cx"> core:atkmm:2.22.7:
</span><del>-core:baobab:3.10.1:
</del><ins>+core:baobab:3.11.90:
</ins><span class="cx"> core:cantarell-fonts:0.0.15:
</span><del>-core:caribou:0.4.12:
-core:clutter:1.16.0:
-core:clutter-gst:2.0.8:
-core:clutter-gtk:1.4.4:
-core:cogl:1.16.0:
-core:dconf:0.18.0:
-core:empathy:3.10.2:
-core:eog:3.10.2:
-core:epiphany:3.10.2:
-core:evince:3.10.3:
-core:evolution-data-server:3.10.2:
</del><ins>+core:caribou:0.4.13:
+core:clutter:1.18.0:
+core:clutter-gst:2.0.10:
+core:clutter-gtk:1.5.2:
+core:cogl:1.17.4:
+core:dconf:0.19.92:
+core:empathy:3.11.92:
+core:eog:3.11.92:
+core:epiphany:3.11.92:
+core:evince:3.11.92:
+core:evolution-data-server:3.11.92:
</ins><span class="cx"> core:folks:0.9.6:
</span><del>-core:gcr:3.10.1:
-core:gdk-pixbuf:2.30.1:
-core:gdm:3.10.0.1:
-core:geocode-glib:3.10.0:
-core:gjs:1.38.1:
-core:glib:2.38.2:
-core:glib-networking:2.38.2:
-core:glibmm:2.38.1:
-core:gmime:2.6.19:
-core:gnome-backgrounds:3.10.1:
-core:gnome-bluetooth:3.10.0:
-core:gnome-calculator:3.10.2:
-core:gnome-contacts:3.10.1:
-core:gnome-control-center:3.10.2:
-core:gnome-desktop:3.10.1:
</del><ins>+core:gcr:3.11.91:
+core:gdk-pixbuf:2.30.6:
+core:gdm:3.11.92.1:
+core:geocode-glib:3.11.92.2:
+core:gjs:1.39.91:
+core:glib:2.39.92:
+core:glib-networking:2.39.90:
+core:glibmm:2.39.92:
+core:gmime:2.6.20:
+core:gnome-backgrounds:3.11.5:
+core:gnome-bluetooth:3.11.91:
+core:gnome-calculator:3.11.92:
+core:gnome-contacts:3.11.92:
+core:gnome-control-center:3.11.92:
+core:gnome-desktop:3.11.91:
</ins><span class="cx"> core:gnome-dictionary:3.10.0:
</span><del>-core:gnome-disk-utility:3.10.0:
</del><ins>+core:gnome-disk-utility:3.11.0:
</ins><span class="cx"> core:gnome-font-viewer:3.10.0:
</span><del>-core:gnome-icon-theme:3.10.0:
-core:gnome-icon-theme-extras:3.6.2:
-core:gnome-icon-theme-symbolic:3.10.1:
</del><ins>+core:gnome-icon-theme:3.11.92:
+core:gnome-icon-theme-extras:3.11.2:
+core:gnome-icon-theme-symbolic:3.11.92:
</ins><span class="cx"> core:gnome-js-common:0.1.2:
</span><del>-core:gnome-keyring:3.10.1:
</del><ins>+core:gnome-keyring:3.11.92:
</ins><span class="cx"> core:gnome-menus:3.10.1:
</span><del>-core:gnome-online-accounts:3.10.2:
-core:gnome-online-miners:3.10.0:
-core:gnome-packagekit:3.10.1:
-core:gnome-screenshot:3.10.0:
-core:gnome-session:3.10.1:
-core:gnome-settings-daemon:3.10.2:
-core:gnome-shell:3.10.2.1:
-core:gnome-shell-extensions:3.10.1:
</del><ins>+core:gnome-online-accounts:3.11.92:
+core:gnome-online-miners:3.11.90:
+core:gnome-packagekit:3.11.90:
+core:gnome-screenshot:3.11.90:
+core:gnome-session:3.11.92:
+core:gnome-settings-daemon:3.11.92:
+core:gnome-shell:3.11.92:
+core:gnome-shell-extensions:3.11.92:
</ins><span class="cx"> core:gnome-system-log:3.9.90:
</span><del>-core:gnome-system-monitor:3.10.2:
-core:gnome-terminal:3.10.2:
-core:gnome-themes-standard:3.10.0:
-core:gnome-user-docs:3.10.2:
-core:gnome-user-share:3.10.1:
-core:gnome-video-effects:0.4.0:
-core:gobject-introspection:1.38.0:
-core:grilo:0.2.7:
-core:grilo-plugins:0.2.9:
-core:gsettings-desktop-schemas:3.10.1:
-core:gssdp:0.14.6:
-core:gst-plugins-base:1.2.0:
-core:gst-plugins-good:1.2.0:
-core:gstreamer:1.2.0:
-core:gtk+:3.10.4:
-core:gtk+:2.24.22:
-core:gtk-doc:1.19:
-core:gtkmm:3.10.1:
-core:gtksourceview:3.10.1:
</del><ins>+core:gnome-system-monitor:3.11.92:
+core:gnome-terminal:3.11.3:
+core:gnome-themes-standard:3.11.92:
+core:gnome-user-docs:3.11.92:
+core:gnome-user-share:3.10.2:
+core:gnome-video-effects:0.4.1:
+core:gobject-introspection:1.39.90:
+core:grilo:0.2.10:
+core:grilo-plugins:0.2.12:
+core:gsettings-desktop-schemas:3.11.91:
+core:gssdp:0.14.7:
+core:gst-plugins-base:1.2.3:
+core:gst-plugins-good:1.2.3:
+core:gstreamer:1.2.3:
+core:gtk+:3.11.9:
+core:gtk+:2.24.23:
+core:gtk-doc:1.20:
+core:gtk-engines:2.20.2:
+core:gtkmm:3.11.9:
+core:gtksourceview:3.11.91:
</ins><span class="cx"> core:gucharmap:3.10.1:
</span><del>-core:gupnp:0.20.8:
-core:gupnp-igd:0.2.2:
-core:gvfs:1.18.3:
-core:json-glib:0.16.2:
-core:libchamplain:0.12.5:
</del><ins>+core:gupnp:0.20.10:
+core:gupnp-igd:0.2.3:
+core:gvfs:1.19.90:
+core:json-glib:0.99.2:
+core:libchamplain:0.12.7:
</ins><span class="cx"> core:libcroco:0.6.8:
</span><del>-core:libgdata:0.14.0:
-core:libgee:0.12.0:
-core:libgnome-keyring:3.10.1:
</del><ins>+core:libgdata:0.15.0:
+core:libgee:0.13.91:
</ins><span class="cx"> core:libgnomekbd:3.6.0:
</span><del>-core:libgsf:1.14.28:
</del><ins>+core:libgsf:1.14.30:
</ins><span class="cx"> core:libgtop:2.28.5:
</span><del>-core:libgweather:3.10.1:
</del><ins>+core:libgweather:3.11.92:
</ins><span class="cx"> core:libgxps:0.2.2:
</span><ins>+core:libmediaart:0.3.0:
</ins><span class="cx"> core:libnotify:0.7.6:
</span><span class="cx"> core:libpeas:1.9.0:
</span><del>-core:libqmi:1.0:
-core:rest:0.7.90:
-core:librsvg:2.40.0:
-core:libsecret:0.16:
</del><ins>+core:rest:0.7.91:
+core:librsvg:2.40.2:
+core:libsecret:0.18:
</ins><span class="cx"> core:libsigc++:2.3.1:
</span><del>-core:libsoup:2.44.2:
</del><ins>+core:libsoup:2.45.92:
</ins><span class="cx"> core:libwnck:3.4.7:
</span><span class="cx"> core:libzapojit:0.0.3:
</span><span class="cx"> core:mm-common:0.9.6:
</span><span class="cx"> core:mousetweaks:3.10.0:
</span><del>-core:mutter:3.10.2:
-core:nautilus:3.10.1:
</del><ins>+core:mutter:3.11.92:
+core:nautilus:3.11.92:
</ins><span class="cx"> core:network-manager-applet:0.9.8.8:
</span><del>-core:pango:1.36.1:
</del><ins>+core:pango:1.36.3:
</ins><span class="cx"> core:pangomm:2.34.0:
</span><del>-core:pygobject:3.10.2:
</del><ins>+core:pygobject:3.11.92:
</ins><span class="cx"> core:seed:3.8.1:
</span><del>-core:sushi:3.10.0:
-core:totem:3.10.1:
-core:totem-pl-parser:3.10.0:
-core:tracker:0.16.3:
-core:vala:0.22.1:
-core:vino:3.10.1:
-core:vte:0.34.9:
-core:yelp:3.10.1:
-core:yelp-tools:3.10.0:
-core:yelp-xsl:3.10.1:
</del><ins>+core:sushi:3.11.90:
+core:totem:3.11.91:
+core:totem-pl-parser:3.10.1:
+core:tracker:0.17.7:
+core:vala:0.23.3:
+core:vino:3.11.92:
+core:vte:0.35.90:
+core:yelp:3.11.91:
+core:yelp-tools:3.11.5:
+core:yelp-xsl:3.11.90:
</ins><span class="cx"> core:zenity:3.8.0:
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomelibgdata"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libgdata</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/libgdata:108265-117658
</span><span class="cx">/users/rmstonecipher/gnome/libgdata:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/libgdata:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/libgdata:108265-117658
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/libgdata:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/libgdata:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibgdataPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libgdata
</span><del>-version 0.14.1
</del><ins>+version 0.15.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description libgdata is a GLib-based library for accessing online service APIs using the \
</span><span class="cx"> GData protocol --- most notably, Google's services.
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 4e2b2cec260763ba05abcc0e66299cb7764c6bc5 \
- sha256 68bbb2cb70028d79edfaec17184389275044fd58bf881e36df2663e7e191ff1a
</del><ins>+checksums rmd160 9455bc88ded1ecf227bef8863ab7c7eaa52750c7 \
+ sha256 4845359248d8623d51e766fdc3eceaffaafa7a8a1fe8bec426b7604b711ae198
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> port:libsoup \
</span><span class="cx"> port:liboauth \
</span><span class="cx"> port:gnome-online-accounts \
</span><del>- port:gcr
</del><ins>+ port:gcr \
+ port:uhttpmock
</ins><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="lines">@@ -51,4 +52,4 @@
</span><span class="cx"> --enable-gnome \
</span><span class="cx"> --enable-goa
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomelibgnomekeyring"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/libgnome-keyring:108271-117914
</span><span class="cx">/users/rmstonecipher/gnome/libgnome-keyring:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/libgnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/libgnome-keyring:108271-117914
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/libgnome-keyring:117930-118154
</span><span class="cx">/users/rmstonecipher/gnome/libgnome-keyring:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibgnomekeyringPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/libgnome-keyring/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libgnome-keyring
</span><del>-version 3.10.1
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e95d1179772a62dfa5338d20b43daf4676726182 \
- sha256 052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772
</del><ins>+checksums rmd160 0033f8259c40027a61ab3f2cfcfcc263639b0379 \
+ sha256 7d2179360d84de771b59d0522739977f5bcc85b8acbe0238142669ab4b32bfd8
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -53,4 +53,4 @@
</span><span class="cx"> build.cmd ${prefix}/bin/gmake
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomenautilus"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/nautilus</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/nautilus:108265-117423
</span><span class="cx">/users/rmstonecipher/gnome/nautilus:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/nautilus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/nautilus:108265-117423
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/nautilus:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/nautilus:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomenautilusPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name nautilus
</span><del>-version 3.10.1
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The GNOME filemanager
</span><span class="cx"> long_description \
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 f569eca48bf18acbdd7afa4bf4f8d3d6b0f1d627 \
- sha256 f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727
</del><ins>+checksums rmd160 58d260474d444fdc0dfcdd377f43443727601d18 \
+ sha256 46cb9451a6e3b93d2de3842a45741eb8ed94c368c22087fcf3fb5da10b94642d
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -64,4 +64,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeseahorse"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/seahorse</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/seahorse:108265-117440
</span><span class="cx">/users/rmstonecipher/gnome/seahorse:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/seahorse:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/seahorse:108265-117440
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/seahorse:117866-118154
</span><span class="cx">/users/rmstonecipher/gnome/seahorse:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeseahorsePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name seahorse
</span><del>-version 3.10.2
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2+ GFDL-1.1+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Seahorse is a graphical interface for managing and using encryption keys.
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 0102c9ff96ffdec8375d597ee2fc9ef3e0f48f5f \
- sha256 89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16
</del><ins>+checksums rmd160 9bdc53b5f3107d4a96897f189947b17b504804bc \
+ sha256 16beb9aae1cd0e64ee2164c039c1e58993f85629b4e3ded796cd0410a6dd7fc4
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -43,26 +43,26 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-gkr-gkr-backend.vala.diff \
- patch-ssh-seahorse-ssh-key-properties.c.diff
</del><ins>+# update build/m4/intltool.m4 and autoreconf
</ins><span class="cx">
</span><del>-configure.args --disable-sharing \
- --disable-schemas-compile \
- --disable-silent-rules
-
-# update m4/intltool.m4 and autoreconf
-
</del><span class="cx"> pre-configure {
</span><del>- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</del><ins>+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/build/m4
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><ins>+configure.cflags-append \
+ -Wno-return-type
+
+configure.args --disable-sharing \
+ --disable-schemas-compile \
+ --disable-silent-rules
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnometotem"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/totem</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/totem:108265-117246
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/totem:117866-118154
</span><a id="usersdevansGNOME3stabledportsgnometotemPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/totem/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/totem/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/totem/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name totem
</span><del>-version 3.10.1
-revision 3
</del><ins>+version 3.11.91
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome
</span><span class="cx"> # also has an exception allowing use of non-GPL-compatible plugins
</span><span class="lines">@@ -27,16 +26,15 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 80dce2fb0f61b442800aaa800a49991cd87c93d9 \
- sha256 b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2
</del><ins>+checksums rmd160 3c24c9f1ce123b20cfe2efc554fbb85760280bd1 \
+ sha256 913ac2d77e0fe6899a795247c6445bdc504dc5263f0c36b7e4fe27c6f3bd62f2
</ins><span class="cx">
</span><del>-patchfiles patch-configure.diff
-
</del><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:itstool \
</span><span class="cx"> port:gnome-common \
</span><del>- port:yelp-tools
</del><ins>+ port:yelp-tools \
+ port:appdata-tools
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-icon-theme \
</span><span class="lines">@@ -73,6 +71,9 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><ins>+configure.cflags-append \
+ -Wno-error=format-nonliteral
+
</ins><span class="cx"> configure.args --with-plugins=apple-trailers,autoload-subtitles,chapters,dbusservice,im-status,grilo,gromit,media-player-keys,ontop,opensubtitles,properties,recent,skipto \
</span><span class="cx"> --enable-easy-codec-installation \
</span><span class="cx"> --enable-browser-plugins=no \
</span><span class="lines">@@ -109,4 +110,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomevino"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/vino</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/vino:108265-117436
</span><span class="cx">/users/rmstonecipher/gnome/vino:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/vino:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/vino:108265-117436
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/vino:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/vino:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomevinoPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/vino/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/vino/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name vino
</span><del>-version 3.10.1
</del><ins>+version 3.11.92
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> homepage https://wiki.gnome.org/Projects/Vino
</span><span class="lines">@@ -17,8 +17,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 24be3b95b02c45d00f1b5dc6a735134f65015c8b \
- sha256 faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46
</del><ins>+checksums rmd160 82e95c64924a7e0593929e9aa7a7de1e5180d16c \
+ sha256 ef2c6e0895f4713878491af6f3e59adf49681b941389a526d7cb160ba9a58c82
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -74,4 +74,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomevte"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/vte</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/rmstonecipher/gnome/vte:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/vte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154
</span><span class="cx">/users/rmstonecipher/gnome/vte:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomevtePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/vte/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/vte/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/vte/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name vte
</span><del>-version 0.34.9
-revision 1
</del><ins>+version 0.35.90
</ins><span class="cx"> set branch [join [lrange [split $version .] 0 1] .]
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -23,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 7582451ff61a1cc7005433fc92942fb1974013c2 \
- sha256 6f38c5edf57d0a5b870c4e5e210731cccfb4899d0856ba7a3dc599f2ba6e23e1
</del><ins>+checksums rmd160 66e2b3d879a9affb7f1a083955bf90eb7d270de0 \
+ sha256 c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -51,4 +50,4 @@
</span><span class="cx"> configure.args-delete --disable-glade
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelp"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/yelp:108265-117591
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/yelp:108265-117591
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeyelpPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yelp
</span><del>-version 3.10.2
</del><ins>+version 3.11.91
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Help browser for GNOME.
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 9245b27ca92ed49064c369bff78734b17e168d51 \
- sha256 31cdff0df058fd42752808b6454b774281505f42695ee8b20891eb1332c34338
</del><ins>+checksums rmd160 41a51eb2de0525c6638fecfce82efc5da32657e5 \
+ sha256 770ae831e2b32f2225d2222e44e3aebbb5ecc550729fad96efb9263a0428d509
</ins><span class="cx">
</span><span class="cx"> depends_skip_archcheck gnome-settings-daemon
</span><span class="cx">
</span><span class="lines">@@ -90,4 +90,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelptools"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp-tools</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/yelp-tools:113273-117432
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/yelp-tools:114069-118154
</span><a id="usersdevansGNOME3stabledportsgnomeyelptoolsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-tools/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yelp-tools
</span><del>-version 3.10.0
</del><ins>+version 3.11.5
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Tools to help create Yelp documentation.
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 a3812a049072fff37bdec453bc86dc186eb59323 \
- sha256 ff5e1102631049b08e3ef0ade2cd10e63a62a812690e3d8558ed1413baef2611
</del><ins>+checksums rmd160 bab02806e91ec6d83cc4453ecaa85cc9b83ecd5b \
+ sha256 822a089e30901bb2632f39cdd3a133ebccc6802277dd18acf6fd88be982ba95f
</ins><span class="cx">
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><span class="lines">@@ -30,4 +30,4 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:yelp-xsl
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeyelpxsl"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/yelp-xsl:108265-117431
</span><span class="cx">/users/rmstonecipher/gnome/yelp-xsl:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/yelp-xsl:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/yelp-xsl:108265-117431
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/yelp-xsl:114069-118154
</span><span class="cx">/users/rmstonecipher/gnome/yelp-xsl:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeyelpxslPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp-xsl/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yelp-xsl
</span><del>-version 3.10.1
</del><ins>+version 3.11.90
</ins><span class="cx"> license GPL-2 LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description A collection of XSLT and other data files required by Yelp.
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 ced70ec74364dd01352b61ca4625e2c7ba996401 \
- sha256 59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887
</del><ins>+checksums rmd160 b603b76db3e79663ae0869e0200cc4962de32b9d \
+ sha256 157baa1eeefbd13136f9016831e75eb14816cff49802c0e10b66aeb6e7bc6a85
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,15 +32,15 @@
</span><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><del>-pre-configure {
</del><ins>+post-patch {
</ins><span class="cx"> copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</span><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+use_autoreconf yes
+autoreconf.args -fvi
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweather"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/net/libgweather</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /branches/mld-qt-481/dports/net/libgweather:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/net/libgweather:116416-118154
</span><a id="usersdevansGNOME3stabledportsnetlibgweatherPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/libgweather/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libgweather
</span><del>-version 3.10.2
</del><ins>+version 3.11.92
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories net gnome
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 d0139d2e198e4ec65b044a6fbea6f75199de2a30 \
- sha256 454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005
</del><ins>+checksums rmd160 92ec797d393d91f7bc903ccdeac57ad3fe9117ac \
+ sha256 601c7ec366018bac9fe296daf91105344043e59f31631e2196924373302d33ee
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -39,9 +39,6 @@
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><del>-patchfiles patch-libgweather-gweather-location.c.diff \
- patch-libgweather-weather.c.diff
-
</del><span class="cx"> # use autogen.sh from upstream git to update m4/intltool.m4 using intltoolize and autoreconf
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -64,4 +61,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygel"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/net/rygel</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/net/rygel:113316-117439
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/net/rygel:116416-118154
</span><a id="usersdevansGNOME3stabledportsnetrygelPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/rygel/Portfile (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name rygel
</span><del>-version 0.20.3
</del><ins>+version 0.21.6
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Rygel DLNA media server, renderer
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 ed387b49a5941dcab43b935d5524cb814711678f \
- sha256 4e7e3105a1d27d126938b7530f60bd7867121188651cee806f36694fbd7dd349
</del><ins>+checksums rmd160 0565d756df8a789da35a043de7477bccb40249c3 \
+ sha256 208bf46b7116bfd06159bf09f6c85f953257874751e3949865587fe5994164b1
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff \
- patch-return.diff
</del><ins>+patchfiles patch-configure.ac.diff
</ins><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span><span class="lines">@@ -58,4 +57,4 @@
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygelfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-configure.ac.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><del>---- configure.ac.orig 2013-12-22 03:32:37.000000000 -0800
-+++ configure.ac 2014-02-26 00:43:42.000000000 -0800
</del><ins>+--- configure.ac.orig 2014-03-06 12:39:24.000000000 -0800
++++ configure.ac 2014-03-14 15:55:49.000000000 -0700
</ins><span class="cx"> @@ -43,7 +43,7 @@
</span><span class="cx"> GSTPBU_REQUIRED=1.0
</span><span class="cx"> GIO_REQUIRED=2.26
</span><span class="cx"> GEE_REQUIRED=0.8.0
</span><span class="cx"> -UUID_REQUIRED=1.41.3
</span><span class="cx"> +UUID_REQUIRED=1.6.2
</span><del>- LIBSOUP_REQUIRED=2.34.0
</del><ins>+ LIBSOUP_REQUIRED=2.42.0
</ins><span class="cx"> GTK_REQUIRED=3.0
</span><span class="cx">
</span><del>-@@ -387,7 +387,7 @@
</del><ins>+@@ -399,7 +399,7 @@
</ins><span class="cx"> AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
</span><span class="cx">
</span><span class="cx"> AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
</span><span class="cx"> - ["-module -avoid-version -Wl,-z,defs"])
</span><span class="cx"> + ["-module -avoid-version"])
</span><span class="cx"> AC_SUBST([RYGEL_PLUGIN_DIR],
</span><del>- [${libdir}/rygel-2.0/plugins])
</del><ins>+ [${libdir}/rygel-2.2/plugins])
</ins><span class="cx"> AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetrygelfilespatchreturndiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/net/rygel/files/patch-return.diff (118154 => 118155)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/rygel/files/patch-return.diff 2014-03-23 22:48:33 UTC (rev 118154)
+++ users/devans/GNOME-3/stable/dports/net/rygel/files/patch-return.diff 2014-03-23 22:58:46 UTC (rev 118155)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- src/librygel-renderer-gst/rygel-playbin-player.c.orig 2013-11-16 12:15:11.000000000 -0800
-+++ src/librygel-renderer-gst/rygel-playbin-player.c 2013-11-16 12:16:52.000000000 -0800
-@@ -192,11 +192,11 @@
- g_return_val_if_fail (playbin != NULL, NULL);
- self = (RygelPlaybinPlayer*) g_object_new (object_type, NULL);
- _tmp0_ = playbin;
-- g_return_if_fail (_tmp0_ != NULL);
-+ g_return_val_if_fail (_tmp0_ != NULL, NULL);
- _tmp1_ = playbin;
- _tmp2_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp1_);
- _tmp3_ = g_type_name (_tmp2_);
-- g_return_if_fail (g_strcmp0 (_tmp3_, "GstPlayBin") == 0);
-+ g_return_val_if_fail (g_strcmp0 (_tmp3_, "GstPlayBin") == 0, NULL);
- _tmp4_ = playbin;
- rygel_playbin_player_set_playbin (self, _tmp4_);
- self->priv->foreign = TRUE;
</del></span></pre>
</div>
</div>
</body>
</html>