From 61f625bd2679cfdf99c2605d251b3e8cccbf3ac0 Mon Sep 17 00:00:00 2001 From: cwen Date: Sun, 18 Aug 2019 19:23:41 +0000 Subject: [PATCH] scim-tables: add missing headers for ports-gcc. Regen WANTLIB and remove base-gcc from COMPILER while here. OK kmos@ --- inputmethods/scim-tables/Makefile | 22 +++++++++---------- .../patches/patch-src_scim_generic_table_h | 15 +++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 inputmethods/scim-tables/patches/patch-src_scim_generic_table_h diff --git a/inputmethods/scim-tables/Makefile b/inputmethods/scim-tables/Makefile index de5af1799d6..724f4cb634e 100644 --- a/inputmethods/scim-tables/Makefile +++ b/inputmethods/scim-tables/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.26 2019/07/12 20:47:14 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2019/08/18 19:23:41 cwen Exp $ COMMENT= input method data tables for scim DISTNAME= scim-tables-0.5.8 -REVISION= 13 +REVISION= 14 CATEGORIES= inputmethods chinese japanese korean @@ -12,16 +12,16 @@ HOMEPAGE= https://github.com/scim-im/scim-tables # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB+= GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi -WANTLIB+= Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat ffi -WANTLIB+= fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 -WANTLIB+= glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 -WANTLIB+= gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0 -WANTLIB+= pangoft2-1.0 pcre pixman-1 png pthread scim-1.0 -WANTLIB+= scim-gtkutils-1.0 scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb xcb-render -WANTLIB+= xcb-shm z fribidi +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat +WANTLIB += ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png scim-1.0 +WANTLIB += scim-gtkutils-1.0 scim-x11utils-1.0 xcb xcb-render +WANTLIB += xcb-shm z -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/} diff --git a/inputmethods/scim-tables/patches/patch-src_scim_generic_table_h b/inputmethods/scim-tables/patches/patch-src_scim_generic_table_h new file mode 100644 index 00000000000..407257e4d59 --- /dev/null +++ b/inputmethods/scim-tables/patches/patch-src_scim_generic_table_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_scim_generic_table_h,v 1.1 2019/08/18 19:23:41 cwen Exp $ + +Add missing header for ports-gcc + +Index: src/scim_generic_table.h +--- src/scim_generic_table.h.orig ++++ src/scim_generic_table.h +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #define SCIM_GT_MAX_KEY_LENGTH 63 +