Attachment #221640 for bug #252748

View | Details | Raw Unified | Return to bug 252748
Collapse All | Expand All




#   $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $

PORTNAME=	pangox-compat
DISTVERSION=	0.0.2
PORTREVISION=	3
CATEGORIES=	x11-toolkits
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome2

MAINTAINER=	gnome@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 localbase:ldflags pathfix pkgconfig \
		tar:xz xorg
USE_XORG=	x11 ice
USE_LDCONFIG=	yes
USE_GNOME=	glib20 pango

GNU_CONFIGURE=	yes

LIBS+=		-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/x11-toolkits/pangox-compat/distinfo (+1 lines)
		1	TIMESTAMP = 1610797704
1	SHA256 (gnome2/pangox-compat-0.0.2.tar.xz) = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046	2	SHA256 (gnome2/pangox-compat-0.0.2.tar.xz) = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046
2	SIZE (gnome2/pangox-compat-0.0.2.tar.xz) = 267396	3	SIZE (gnome2/pangox-compat-0.0.2.tar.xz) = 267396




--- 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 */

Return to bug 252748

Lines 3-10 Link Here

(-)b/x11-toolkits/pangox-compat/Makefile (-5 / +9 lines)
3	# $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $	3	# $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $
4		4
5	PORTNAME= pangox-compat	5	PORTNAME= pangox-compat
6	PORTVERSION= 0.0.2	6	DISTVERSION= 0.0.2
7	PORTREVISION= 2	7	PORTREVISION= 3
8	CATEGORIES= x11-toolkits	8	CATEGORIES= x11-toolkits
9	MASTER_SITES= GNOME	9	MASTER_SITES= GNOME
10	DIST_SUBDIR= gnome2	10	DIST_SUBDIR= gnome2
Lines 12-26 DIST_SUBDIR= gnome2 Link Here
12	MAINTAINER= gnome@FreeBSD.org	12	MAINTAINER= gnome@FreeBSD.org
13	COMMENT= Deprecated pangoX support	13	COMMENT= Deprecated pangoX support
14		14
		15	LICENSE= LGPL20
		16	LICENSE_FILE= ${WRKSRC}/COPYING
		17
15	BUILD_DEPENDS= pango>=1.34.0:x11-toolkits/pango	18	BUILD_DEPENDS= pango>=1.34.0:x11-toolkits/pango
16		19
17	USES= gmake gnome libtool pathfix pkgconfig tar:xz xorg	20	USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig \
		21	tar:xz xorg
18	USE_XORG= x11 ice	22	USE_XORG= x11 ice
19	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
20	USE_GNOME= glib20 pango	24	USE_GNOME= glib20 pango
		25
21	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
22	CPPFLAGS+= -I${LOCALBASE}/include	27
23	LIBS+= -L${LOCALBASE}/lib
24	INSTALL_TARGET= install-strip	28	INSTALL_TARGET= install-strip
25		29
26	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Added Link Here

(-)b/x11-toolkits/pangox-compat/files/patch-pangox.c (-1 / +29 lines)
0	-	1	--- pangox.c.orig 2021-01-16 11:31:26 UTC
		2	+++ pangox.c
		3	@@ -279,7 +279,7 @@ pango_x_font_class_init (PangoXFontClass *class)
		4
		5	font_class->describe = pango_x_font_describe;
		6	font_class->get_coverage = pango_x_font_get_coverage;
		7	- font_class->find_shaper = pango_x_font_find_shaper;
		8	+ /* font_class->find_shaper = pango_x_font_find_shaper; */
		9	font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
		10	font_class->get_metrics = pango_x_font_get_metrics;
		11	font_class->get_font_map = pango_x_font_get_font_map;
		12	@@ -1373,12 +1373,11 @@ pango_x_font_find_shaper (PangoFont *font G_GNUC_U
		13	PangoLanguage *language,
		14	guint32 ch)
		15	{
		16	- PangoMap *shape_map = NULL;
		17	- PangoScript script;
		18	-
		19	- shape_map = pango_x_get_shaper_map (language);
		20	- script = pango_script_for_unichar (ch);
		21	- return (PangoEngineShape *)pango_map_get_engine (shape_map, script);
		22	+ static PangoEngineShape *shaper;
		23	+ if (g_once_init_enter (&shaper))
		24	+ g_once_init_leave (&shaper,
		25	+ _pango_basic_x_script_engine_create("BasicScriptEngineXCompat"));
		26	+ return shaper;
		27	}
		28
		29	/* Utility functions */