[137687] users/devans/GNOME-3/unstable/dports/x11/pango

[devans at macports.org]

Revision: 137687
          https://trac.macports.org/changeset/137687
Author:   devans at macports.org
Date:     2015-06-17 07:36:58 -0700 (Wed, 17 Jun 2015)
Log Message:
-----------
GNOME-3/unstable: pango, sync with pango-devel in trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/x11/pango/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff
    users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff

Modified: users/devans/GNOME-3/unstable/dports/x11/pango/Portfile
===================================================================
--- 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)
@@ -10,8 +10,8 @@
 name                    pango
 conflicts               pango-devel
 set my_name             pango
-epoch                   1
 version                 1.37.0
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -44,6 +44,8 @@
     port:harfbuzz
 
 patchfiles              patch-ltmain.sh.diff
+patchfiles-append       patch-pango-pangocoretext-fontmap.c.diff \
+                        patch-pango-pango-language.c.diff
 
 configure.args          --enable-static \
                         --disable-silent-rules \

Added: users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pango-language.c.diff
===================================================================
--- 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)
@@ -0,0 +1,32 @@
+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);
+ 

Added: users/devans/GNOME-3/unstable/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff
===================================================================
--- 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)
@@ -0,0 +1,43 @@
+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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150617/64991e96/attachment.html>