svn commit: r564892 - in head/x11-toolkits/pangox-compat: . files

[Tobias C. Berner]

Author: tcberner
Date: Wed Feb 10 18:15:12 2021
New Revision: 564892
URL: https://svnweb.freebsd.org/changeset/ports/564892

Log:
  x11-toolkits/pangox-compat: prepare for pango >= 1.46.2
  
  PR:		252748
  Submitted by:	daniel.engberg.lists at pyret.net
  Obtained from:	https://aur.archlinux.org/cgit/aur.git/tree/?h=pangox-compat

Added:
  head/x11-toolkits/pangox-compat/files/
  head/x11-toolkits/pangox-compat/files/patch-pangox.c   (contents, props changed)
Modified:
  head/x11-toolkits/pangox-compat/Makefile
  head/x11-toolkits/pangox-compat/distinfo

Modified: head/x11-toolkits/pangox-compat/Makefile
==============================================================================
--- head/x11-toolkits/pangox-compat/Makefile	Wed Feb 10 17:57:54 2021	(r564891)
+++ head/x11-toolkits/pangox-compat/Makefile	Wed Feb 10 18:15:12 2021	(r564892)
@@ -3,8 +3,8 @@
 #   $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	pangox-compat
-PORTVERSION=	0.0.2
-PORTREVISION=	2
+DISTVERSION=	0.0.2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,15 +12,19 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Deprecated pangoX support
 
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	pango>=1.34.0:x11-toolkits/pango
 
-USES=		gmake gnome libtool pathfix pkgconfig tar:xz xorg
+USES=		gmake gnome libtool localbase:ldflags pathfix pkgconfig \
+		tar:xz xorg
 USE_XORG=	x11 ice
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 pango
+
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/pangox-compat/distinfo
==============================================================================
--- head/x11-toolkits/pangox-compat/distinfo	Wed Feb 10 17:57:54 2021	(r564891)
+++ head/x11-toolkits/pangox-compat/distinfo	Wed Feb 10 18:15:12 2021	(r564892)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1610797704
 SHA256 (gnome2/pangox-compat-0.0.2.tar.xz) = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046
 SIZE (gnome2/pangox-compat-0.0.2.tar.xz) = 267396

Added: head/x11-toolkits/pangox-compat/files/patch-pangox.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/pangox-compat/files/patch-pangox.c	Wed Feb 10 18:15:12 2021	(r564892)
@@ -0,0 +1,29 @@
+--- pangox.c.orig	2021-01-16 11:31:26 UTC
++++ pangox.c
+@@ -279,7 +279,7 @@ pango_x_font_class_init (PangoXFontClass *class)
+ 
+   font_class->describe = pango_x_font_describe;
+   font_class->get_coverage = pango_x_font_get_coverage;
+-  font_class->find_shaper = pango_x_font_find_shaper;
++  /* font_class->find_shaper = pango_x_font_find_shaper; */
+   font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
+   font_class->get_metrics = pango_x_font_get_metrics;
+   font_class->get_font_map = pango_x_font_get_font_map;
+@@ -1373,12 +1373,11 @@ pango_x_font_find_shaper (PangoFont     *font G_GNUC_U
+ 			  PangoLanguage *language,
+ 			  guint32        ch)
+ {
+-  PangoMap *shape_map = NULL;
+-  PangoScript script;
+-
+-  shape_map = pango_x_get_shaper_map (language);
+-  script = pango_script_for_unichar (ch);
+-  return (PangoEngineShape *)pango_map_get_engine (shape_map, script);
++  static PangoEngineShape *shaper;
++  if (g_once_init_enter (&shaper))
++    g_once_init_leave (&shaper,
++		       _pango_basic_x_script_engine_create("BasicScriptEngineXCompat"));
++  return shaper;
+ }
+ 
+ /* Utility functions */