Merge branch 'matthiasc/for-master' into 'master'

Handle the new line height pango attribute

See merge request GNOME/gtk!3840

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v32"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v33"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:

.gitlab-ci/fedora.Dockerfile

@@ -48,7 +48,9 @@ RUN dnf -y install \
     libcloudproviders-devel \
     libepoxy-devel \
     libffi-devel \
+    libjpeg-turbo-devel \
     libmount-devel \
+    libpng-devel \
     librsvg2 \
     libselinux-devel \
     libubsan \

demos/gtk-demo/fontify.c

@@ -255,6 +255,12 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
+#if PANGO_VERSION_CHECK(1,49,0)
+        case PANGO_ATTR_LINE_HEIGHT:
+        case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+          break;
+#endif
+
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:
         case PANGO_ATTR_GRAVITY:

gtk/gtkpango.c

@@ -249,6 +249,16 @@ attribute_from_text (GtkBuilder  *builder,
                                                      color->blue * 65535);
         }
       break;
+#if PANGO_VERSION_CHECK(1, 49, 0)
+    case PANGO_ATTR_LINE_HEIGHT:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_DOUBLE, value, &val, error))
+        attribute = pango_attr_line_height_new (g_value_get_double (&val));
+      break;
+    case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
+        attribute = pango_attr_line_height_new_absolute (g_value_get_int (&val) * PANGO_SCALE);
+      break;
+#endif
     case PANGO_ATTR_INVALID:
     default:
       break;

gtk/gtktextbuffer.c

@@ -4689,6 +4689,12 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (letter_spacing);
           break;
 
+#if PANGO_VERSION_CHECK(1, 49, 0)
+        case PANGO_ATTR_LINE_HEIGHT:
+        case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+          break;
+#endif
+
         case PANGO_ATTR_FONT_FEATURES:
           STRING_ATTR (font_features);
           break;

testsuite/gtk/label.c

@@ -41,6 +41,9 @@ print_attribute (PangoAttribute *attr, GString *string)
     case PANGO_ATTR_ALLOW_BREAKS:
     case PANGO_ATTR_INSERT_HYPHENS:
     case PANGO_ATTR_SHOW:
+#if PANGO_VERSION_CHECK(1, 49, 0)
+    case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+#endif
       g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
       break;
     case PANGO_ATTR_FONT_DESC:
@@ -65,6 +68,9 @@ print_attribute (PangoAttribute *attr, GString *string)
       g_string_append_printf (string, "shape");
       break;
     case PANGO_ATTR_SCALE:
+#if PANGO_VERSION_CHECK(1, 49, 0)
+    case PANGO_ATTR_LINE_HEIGHT:
+#endif
       {
         char val[20];