all: Remove pango-1.44 conditional checks, bump minimum version req.

Author: mtwebster

config.h.meson.in

@@ -17,8 +17,6 @@
 #mesondefine HAVE_EXIF
 // Define if libselinux is available
 #mesondefine HAVE_SELINUX
-// Define to enable pango-1.44 fixes
-#mesondefine HAVE_PANGO_144
 // Define to use gtk-layer-shell
 #mesondefine HAVE_GTK_LAYER_SHELL
 

debian/control

@@ -23,7 +23,7 @@ Build-Depends:
  libgtk-3-doc,
  libgtk-layer-shell-dev,
  libjson-glib-dev (>= 1.6),
- libpango1.0-dev,
+ libpango1.0-dev (>= 1.44.0),
  libx11-dev,
  libxapp-dev (>= 2.0.0),
  libxext-dev,

eel/eel-editable-label.c

@@ -998,9 +998,7 @@ eel_editable_label_ensure_layout (EelEditableLabel *label,
       if (label->font_desc != NULL)
 	pango_layout_set_font_description (label->layout, label->font_desc);
 
-#ifdef HAVE_PANGO_144
       pango_attr_list_insert (tmp_attrs, pango_attr_insert_hyphens_new (FALSE));
-#endif    
       pango_layout_set_attributes (label->layout, tmp_attrs);
 
       if (preedit_string)

libnemo-private/nemo-icon-canvas-item.c

@@ -1410,18 +1410,14 @@ create_label_layout (NemoIconCanvasItem *item,
 	GString *str;
 	char *zeroified_text;
 	const char *p;
-#ifdef HAVE_PANGO_144
  	PangoAttrList *attr_list;
-#endif
 
 	canvas_item = EEL_CANVAS_ITEM (item);
 
 	container = NEMO_ICON_CONTAINER (canvas_item->canvas);
 	context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
 	layout = pango_layout_new (context);
-#ifdef HAVE_PANGO_144
  	attr_list = pango_attr_list_new ();
-#endif
 
 	zeroified_text = NULL;
 
@@ -1457,10 +1453,8 @@ create_label_layout (NemoIconCanvasItem *item,
 	pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
 	pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
 
-#ifdef HAVE_PANGO_144
  	pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
  	pango_layout_set_attributes (layout, attr_list);
-#endif
 
 	/* Create a font description */
 	if (container->details->font && g_strcmp0 (container->details->font, "") != 0) {
@@ -1486,9 +1480,7 @@ create_label_layout (NemoIconCanvasItem *item,
 	pango_layout_set_font_description (layout, desc);
 	pango_font_description_free (desc);
 	g_free (zeroified_text);
-#ifdef HAVE_PANGO_144
  	pango_attr_list_unref (attr_list);
-#endif
 
 	return layout;
 }

meson.build

@@ -147,14 +147,7 @@ if gtk_layer_shell_enabled
 endif
 
 # make sure pango development files are installed
-pango = dependency('pango', version: '>=1.40.0')
-# check for newer pango for necessary workarounds
-new_pango = dependency('pango', version: '>=1.44.0', required: false)
-if new_pango.found()
-  conf.set('HAVE_PANGO_144', true)
-else
-  message('................using pango @0@ instead'.format(new_pango.version()))
-endif
+pango = dependency('pango', version: '>=1.44.0')
 
 enableEmptyView = get_option('empty_view')
 conf.set10('ENABLE_EMPTY_VIEW', enableEmptyView)