[152602] trunk/dports/x11

[ryandesign at macports.org]

Revision: 152602
          https://trac.macports.org/changeset/152602
Author:   ryandesign at macports.org
Date:     2016-09-12 20:57:38 -0700 (Mon, 12 Sep 2016)
Log Message:
-----------
pango, pango-devel: use upstream fix

Use upstream fix for "error: initializer element is not constant" on Snow
Leopard and earlier.

Modified Paths:
--------------
    trunk/dports/x11/pango/files/patch-initializer-element-not-constant.diff
    trunk/dports/x11/pango-devel/files/patch-initializer-element-not-constant.diff

Modified: trunk/dports/x11/pango/files/patch-initializer-element-not-constant.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-initializer-element-not-constant.diff	2016-09-13 00:16:01 UTC (rev 152601)
+++ trunk/dports/x11/pango/files/patch-initializer-element-not-constant.diff	2016-09-13 03:57:38 UTC (rev 152602)
@@ -1,20 +1,15 @@
---- pango/pangocoretext-fontmap.c.orig	2016-09-01 18:23:39.000000000 -0700
-+++ pango/pangocoretext-fontmap.c	2016-09-01 18:28:09.000000000 -0700
-@@ -119,7 +119,7 @@
-  */
+https://bugzilla.gnome.org/show_bug.cgi?id=770729
+https://git.gnome.org/browse/pango/commit/?id=9cb49a3e224bbd5a3e6630aa053e516ecbc46083
+--- pango/pangocoretext-fontmap.c
++++ pango/pangocoretext-fontmap.c
+@@ -110,8 +110,8 @@ typedef struct
+     PangoWeight pango_weight;
+ } PangoCTWeight;
  
- static const PangoCTWeight ct_weight_map[] = {
--    { ct_weight_min, PANGO_WEIGHT_THIN },
-+    { -0.7, PANGO_WEIGHT_THIN },
-     { -0.5, PANGO_WEIGHT_ULTRALIGHT },
-     { -0.23, PANGO_WEIGHT_LIGHT },
-     { -0.115, PANGO_WEIGHT_SEMILIGHT },
-@@ -128,7 +128,7 @@
-     {  0.3, PANGO_WEIGHT_SEMIBOLD },
-     {  0.4, PANGO_WEIGHT_BOLD },
-     {  0.6, PANGO_WEIGHT_ULTRABOLD },
--    {  ct_weight_max, PANGO_WEIGHT_HEAVY }
-+    {  0.8, PANGO_WEIGHT_HEAVY }
- };
+-const float ct_weight_min = -0.7f;
+-const float ct_weight_max = 0.8f;
++#define ct_weight_min -0.7f
++#define ct_weight_max  0.8f
  
- static const char *
+ /* This map is based on empirical data from analyzing a large collection of
+  * fonts and comparing the opentype value with the value that OSX returns.

Modified: trunk/dports/x11/pango-devel/files/patch-initializer-element-not-constant.diff
===================================================================
--- trunk/dports/x11/pango-devel/files/patch-initializer-element-not-constant.diff	2016-09-13 00:16:01 UTC (rev 152601)
+++ trunk/dports/x11/pango-devel/files/patch-initializer-element-not-constant.diff	2016-09-13 03:57:38 UTC (rev 152602)
@@ -1,20 +1,15 @@
---- pango/pangocoretext-fontmap.c.orig	2016-09-01 18:23:39.000000000 -0700
-+++ pango/pangocoretext-fontmap.c	2016-09-01 18:28:09.000000000 -0700
-@@ -119,7 +119,7 @@
-  */
+https://bugzilla.gnome.org/show_bug.cgi?id=770729
+https://git.gnome.org/browse/pango/commit/?id=9cb49a3e224bbd5a3e6630aa053e516ecbc46083
+--- pango/pangocoretext-fontmap.c
++++ pango/pangocoretext-fontmap.c
+@@ -110,8 +110,8 @@ typedef struct
+     PangoWeight pango_weight;
+ } PangoCTWeight;
  
- static const PangoCTWeight ct_weight_map[] = {
--    { ct_weight_min, PANGO_WEIGHT_THIN },
-+    { -0.7, PANGO_WEIGHT_THIN },
-     { -0.5, PANGO_WEIGHT_ULTRALIGHT },
-     { -0.23, PANGO_WEIGHT_LIGHT },
-     { -0.115, PANGO_WEIGHT_SEMILIGHT },
-@@ -128,7 +128,7 @@
-     {  0.3, PANGO_WEIGHT_SEMIBOLD },
-     {  0.4, PANGO_WEIGHT_BOLD },
-     {  0.6, PANGO_WEIGHT_ULTRABOLD },
--    {  ct_weight_max, PANGO_WEIGHT_HEAVY }
-+    {  0.8, PANGO_WEIGHT_HEAVY }
- };
+-const float ct_weight_min = -0.7f;
+-const float ct_weight_max = 0.8f;
++#define ct_weight_min -0.7f
++#define ct_weight_max  0.8f
  
- static const char *
+ /* This map is based on empirical data from analyzing a large collection of
+  * fonts and comparing the opentype value with the value that OSX returns.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160912/670db4c5/attachment-0001.html>