<!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>[137687] users/devans/GNOME-3/unstable/dports/x11/pango</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/137687">137687</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-06-17 07:36:58 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: pango, sync with pango-devel in trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsx11pangoPortfile">users/devans/GNOME-3/unstable/dports/x11/pango/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsx11pangofilespatchpangopangolanguagecdiff">users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsx11pangofilespatchpangopangocoretextfontmapcdiff">users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsx11pangoPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/x11/pango/Portfile (137686 => 137687)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/x11/pango/Portfile 2015-06-17 14:21:56 UTC (rev 137686)
+++ users/devans/GNOME-3/unstable/dports/x11/pango/Portfile 2015-06-17 14:36:58 UTC (rev 137687)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> name pango
</span><span class="cx"> conflicts pango-devel
</span><span class="cx"> set my_name pango
</span><del>-epoch 1
</del><span class="cx"> version 1.37.0
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> port:harfbuzz
</span><span class="cx">
</span><span class="cx"> patchfiles patch-ltmain.sh.diff
</span><ins>+patchfiles-append patch-pango-pangocoretext-fontmap.c.diff \
+ patch-pango-pango-language.c.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-static \
</span><span class="cx"> --disable-silent-rules \
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsx11pangofilespatchpangopangolanguagecdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff (0 => 137687)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff 2015-06-17 14:36:58 UTC (rev 137687)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+Fix regression caught by test "test-layout"
+https://bugzilla.gnome.org/show_bug.cgi?id=750017
+https://git.gnome.org/browse/pango/commit/?id=5ff42dc22274177321ccc698d9388460a2628d2a
+--- pango/pango-language.c.orig
++++ pango/pango-language.c
+@@ -205,7 +205,26 @@ _pango_get_lc_ctype (void)
+ CFArrayRef languages;
+ CFStringRef language;
+ gchar ret[16];
++ gchar *p;
++
++ /* Take the same approach as done for Windows above. First we check
++ * if somebody tried to set the locale through environment variables.
++ */
++ p = getenv ("LC_ALL");
++ if (p != NULL)
++ return g_strdup (p);
+
++ p = getenv ("LC_CTYPE");
++ if (p != NULL)
++ return g_strdup (p);
++
++ p = getenv ("LANG");
++ if (p != NULL)
++ return g_strdup (p);
++
++ /* If the environment variables are not set, determine the locale
++ * through the platform-native API.
++ */
+ languages = CFLocaleCopyPreferredLanguages ();
+ language = CFArrayGetValueAtIndex (languages, 0);
+
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsx11pangofilespatchpangopangocoretextfontmapcdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff (0 => 137687)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff 2015-06-17 14:36:58 UTC (rev 137687)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+Fix regression caught by test "testiter"
+https://bugzilla.gnome.org/show_bug.cgi?id=750017
+https://git.gnome.org/browse/pango/commit/?id=ea326fdf0d2c12ef0d4c58882b795caa3f0050bc
+--- pango/pangocoretext-fontmap.c
++++ pango/pangocoretext-fontmap.c
+@@ -1593,19 +1593,27 @@ pango_core_text_fontset_new (PangoCoreTextFontsetKey *key,
+ /* Add the cascade list for this language */
+ #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
+ {
+- CFArrayRef language_pref_list;
++ CFArrayRef language_pref_list = NULL;
+ CFStringRef languages[1];
+
+- languages[0] = CFStringCreateWithCString (NULL,
+- pango_language_to_string (key->language),
+- kCFStringEncodingASCII);
+- language_pref_list = CFArrayCreate (kCFAllocatorDefault,
+- (const void **) languages,
+- 1,
+- &kCFTypeArrayCallBacks);
++ if (key->language)
++ {
++ languages[0] = CFStringCreateWithCString (NULL,
++ pango_language_to_string (key->language),
++ kCFStringEncodingASCII);
++ language_pref_list = CFArrayCreate (kCFAllocatorDefault,
++ (const void **) languages,
++ 1,
++ &kCFTypeArrayCallBacks);
++ }
++
+ fontset->cascade_list = CTFontCopyDefaultCascadeListForLanguages (pango_core_text_font_get_ctfont (best_font), language_pref_list);
+- CFRelease (languages[0]);
+- CFRelease (language_pref_list);
++
++ if (language_pref_list)
++ {
++ CFRelease (languages[0]);
++ CFRelease (language_pref_list);
++ }
+ }
+ #else
+ /* There is unfortunately no public API to retrieve the cascade list
</ins></span></pre>
</div>
</div>
</body>
</html>