- unbreak gucharmap by updating to 13.0.4
- tweak comment in unicode-ucd to be more explicit
This commit is contained in:
jasper
parent
3e44ad6a2f
commit
6fc25e0c1d
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2020/11/07 07:48:55 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2020/11/07 08:59:35 jasper Exp $
|
||||
|
||||
COMMENT = Unicode Character Database (UCD)
|
||||
|
||||
# XXX: bump x11/gnome/gucharmap when updating
|
||||
# XXX: make sure the major version of this port matches
|
||||
# x11/gnome/gucharmap
|
||||
V = 13.0.0
|
||||
DISTNAME = UCD
|
||||
PKGNAME = unicode-ucd-$V
|
||||
|
||||
@ -1,37 +1,33 @@
|
||||
# $OpenBSD: Makefile,v 1.126 2020/11/07 07:49:15 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.127 2020/11/07 08:59:35 jasper Exp $
|
||||
|
||||
COMMENT= Unicode character map for the GNOME project
|
||||
|
||||
GNOME_PROJECT= gucharmap
|
||||
GNOME_VERSION= 12.0.1
|
||||
REVISION= 0
|
||||
GNOME_VERSION= 13.0.4
|
||||
|
||||
SHARED_LIBS += gucharmap_2_90 7.0 # 7.0
|
||||
|
||||
# GPLv3+
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
|
||||
WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
|
||||
WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
|
||||
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
|
||||
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread xcb xcb-render
|
||||
WANTLIB += xcb-shm z
|
||||
WANTLIB += atk-1.0 c cairo gdk-3 gio-2.0 glib-2.0 gobject-2.0
|
||||
WANTLIB += gtk-3 intl pango-1.0 pangocairo-1.0
|
||||
|
||||
MASTER_SITES = https://gitlab.gnome.org/GNOME/gucharmap/-/archive/${GNOME_VERSION}/
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
MODULES= devel/dconf \
|
||||
devel/meson \
|
||||
x11/gnome
|
||||
|
||||
MODGNOME_TOOLS= desktop-file-utils gobject-introspection vala yelp
|
||||
|
||||
BUILD_DEPENDS= archivers/unzip \
|
||||
devel/gsettings-desktop-schemas \
|
||||
textproc/unicode-ucd>=9.0.0
|
||||
RUN_DEPENDS = devel/gsettings-desktop-schemas
|
||||
LIB_DEPENDS= x11/gtk+3,-main
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
CONFIGURE_ARGS += --with-unicode-data=${LOCALBASE}/share/unicode/ucd/
|
||||
# error: -Bsymbolic-functions requested but not supported by ld
|
||||
CONFIGURE_ARGS += --disable-Bsymbolic
|
||||
CONFIGURE_ARGS += -Ducd_path=${LOCALBASE}/share/unicode/ucd/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gnome/gucharmap-12.0.1.tar.xz) = Od6KrZ1/CvM8KdsaifZF522tL84A0aD3yKaJJSosIVU=
|
||||
SIZE (gnome/gucharmap-12.0.1.tar.xz) = 1678524
|
||||
SHA256 (gnome/gucharmap-13.0.4.tar.bz2) = ZQxHgzE1WM7HPTj0M9CG2jRqdR/VbXmDc9BCDH3ghnw=
|
||||
SIZE (gnome/gucharmap-13.0.4.tar.bz2) = 1338047
|
||||
|
||||
13
x11/gnome/gucharmap/patches/patch-gucharmap_meson_build
Normal file
13
x11/gnome/gucharmap/patches/patch-gucharmap_meson_build
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-gucharmap_meson_build,v 1.1 2020/11/07 08:59:35 jasper Exp $
|
||||
|
||||
Index: gucharmap/meson.build
|
||||
--- gucharmap/meson.build.orig
|
||||
+++ gucharmap/meson.build
|
||||
@@ -267,7 +267,6 @@ gucharmap_gtk3_cppflags = disable_deprecated_cppflags
|
||||
gucharmap_gtk3_deps = [
|
||||
freetype2_dep,
|
||||
gtk3_dep,
|
||||
- libdl_dep,
|
||||
libgucharmap_gtk3_dep,
|
||||
]
|
||||
|
||||
26
x11/gnome/gucharmap/patches/patch-meson_build
Normal file
26
x11/gnome/gucharmap/patches/patch-meson_build
Normal file
@ -0,0 +1,26 @@
|
||||
$OpenBSD: patch-meson_build,v 1.1 2020/11/07 08:59:35 jasper Exp $
|
||||
|
||||
ERROR: C shared or static library 'dl' not found
|
||||
|
||||
Index: meson.build
|
||||
--- meson.build.orig
|
||||
+++ meson.build
|
||||
@@ -125,18 +125,6 @@ config_h.set('ENABLE_DEBUG', enable_debug)
|
||||
# FIXME AC_USE_SYSTEM_EXTENSIONS also supported non-gnu systems
|
||||
config_h.set10('_GNU_SOURCE', true)
|
||||
|
||||
-# Check for functions
|
||||
-
|
||||
-libdl_dep = cc.find_library('dl')
|
||||
-
|
||||
-check_dl_functions_required = [
|
||||
- 'dlsym',
|
||||
-]
|
||||
-
|
||||
-foreach func: check_dl_functions_required
|
||||
- assert(cc.has_function(func, dependencies: libdl_dep), func + ' not found')
|
||||
-endforeach
|
||||
-
|
||||
# Compiler flags
|
||||
|
||||
compiler_flags_common = [
|
||||
@ -1,7 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.36 2019/01/06 12:19:09 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.37 2020/11/07 08:59:35 jasper Exp $
|
||||
@pkgpath x11/gnome/gucharmap,gtk2
|
||||
bin/charmap
|
||||
bin/gnome-character-map
|
||||
@bin bin/gucharmap
|
||||
include/gucharmap-2.90/
|
||||
include/gucharmap-2.90/gucharmap/
|
||||
@ -12,20 +10,40 @@ include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-charmap.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-chartable.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-macros.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap-version.h
|
||||
include/gucharmap-2.90/gucharmap/gucharmap.h
|
||||
lib/girepository-1.0/Gucharmap-2.90.typelib
|
||||
lib/libgucharmap_2_90.a
|
||||
lib/libgucharmap_2_90.la
|
||||
@lib lib/libgucharmap_2_90.so.${LIBgucharmap_2_90_VERSION}
|
||||
lib/pkgconfig/gucharmap-2.90.pc
|
||||
share/applications/gucharmap.desktop
|
||||
share/gir-1.0/Gucharmap-2.90.gir
|
||||
share/glib-2.0/schemas/org.gnome.Charmap.enums.xml
|
||||
share/glib-2.0/schemas/org.gnome.Charmap.gschema.xml
|
||||
share/gtk-doc/html/gucharmap-2.90/
|
||||
share/gtk-doc/html/gucharmap-2.90/GucharmapBlockChaptersModel.html
|
||||
share/gtk-doc/html/gucharmap-2.90/GucharmapCodepointList.html
|
||||
share/gtk-doc/html/gucharmap-2.90/GucharmapScriptChaptersModel.html
|
||||
share/gtk-doc/html/gucharmap-2.90/ch01.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-2.90.devhelp2
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-chapters-model.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-chapters-view.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-charmap.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-chartable.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-script-codepoint-list.html
|
||||
share/gtk-doc/html/gucharmap-2.90/gucharmap-gucharmap-unicode-info.html
|
||||
share/gtk-doc/html/gucharmap-2.90/home.png
|
||||
share/gtk-doc/html/gucharmap-2.90/index.html
|
||||
share/gtk-doc/html/gucharmap-2.90/left-insensitive.png
|
||||
share/gtk-doc/html/gucharmap-2.90/left.png
|
||||
share/gtk-doc/html/gucharmap-2.90/right-insensitive.png
|
||||
share/gtk-doc/html/gucharmap-2.90/right.png
|
||||
share/gtk-doc/html/gucharmap-2.90/style.css
|
||||
share/gtk-doc/html/gucharmap-2.90/up-insensitive.png
|
||||
share/gtk-doc/html/gucharmap-2.90/up.png
|
||||
share/help/
|
||||
share/help/C/
|
||||
share/help/C/gucharmap/
|
||||
@ -42,6 +60,7 @@ share/help/bg/gucharmap/legal.xml
|
||||
share/help/ca/
|
||||
share/help/ca/gucharmap/
|
||||
share/help/ca/gucharmap/figures/
|
||||
share/help/ca/gucharmap/figures/gucharmap_window.png
|
||||
share/help/ca/gucharmap/index.docbook
|
||||
share/help/ca/gucharmap/legal.xml
|
||||
share/help/cs/
|
||||
@ -65,6 +84,7 @@ share/help/el/gucharmap/legal.xml
|
||||
share/help/en_GB/
|
||||
share/help/en_GB/gucharmap/
|
||||
share/help/en_GB/gucharmap/figures/
|
||||
share/help/en_GB/gucharmap/figures/gucharmap_window.png
|
||||
share/help/en_GB/gucharmap/index.docbook
|
||||
share/help/en_GB/gucharmap/legal.xml
|
||||
share/help/es/
|
||||
@ -88,6 +108,7 @@ share/help/fr/gucharmap/legal.xml
|
||||
share/help/gl/
|
||||
share/help/gl/gucharmap/
|
||||
share/help/gl/gucharmap/figures/
|
||||
share/help/gl/gucharmap/figures/gucharmap_window.png
|
||||
share/help/gl/gucharmap/index.docbook
|
||||
share/help/gl/gucharmap/legal.xml
|
||||
share/help/hu/
|
||||
@ -105,6 +126,7 @@ share/help/ko/gucharmap/legal.xml
|
||||
share/help/oc/
|
||||
share/help/oc/gucharmap/
|
||||
share/help/oc/gucharmap/figures/
|
||||
share/help/oc/gucharmap/figures/gucharmap_window.png
|
||||
share/help/oc/gucharmap/index.docbook
|
||||
share/help/oc/gucharmap/legal.xml
|
||||
share/help/pl/
|
||||
@ -122,11 +144,13 @@ share/help/pt_BR/gucharmap/legal.xml
|
||||
share/help/ru/
|
||||
share/help/ru/gucharmap/
|
||||
share/help/ru/gucharmap/figures/
|
||||
share/help/ru/gucharmap/figures/gucharmap_window.png
|
||||
share/help/ru/gucharmap/index.docbook
|
||||
share/help/ru/gucharmap/legal.xml
|
||||
share/help/sl/
|
||||
share/help/sl/gucharmap/
|
||||
share/help/sl/gucharmap/figures/
|
||||
share/help/sl/gucharmap/figures/gucharmap_window.png
|
||||
share/help/sl/gucharmap/index.docbook
|
||||
share/help/sl/gucharmap/legal.xml
|
||||
share/help/sv/
|
||||
@ -135,9 +159,16 @@ share/help/sv/gucharmap/figures/
|
||||
share/help/sv/gucharmap/figures/gucharmap_window.png
|
||||
share/help/sv/gucharmap/index.docbook
|
||||
share/help/sv/gucharmap/legal.xml
|
||||
share/help/uk/
|
||||
share/help/uk/gucharmap/
|
||||
share/help/uk/gucharmap/figures/
|
||||
share/help/uk/gucharmap/figures/gucharmap_window.png
|
||||
share/help/uk/gucharmap/index.docbook
|
||||
share/help/uk/gucharmap/legal.xml
|
||||
share/help/vi/
|
||||
share/help/vi/gucharmap/
|
||||
share/help/vi/gucharmap/figures/
|
||||
share/help/vi/gucharmap/figures/gucharmap_window.png
|
||||
share/help/vi/gucharmap/index.docbook
|
||||
share/help/vi/gucharmap/legal.xml
|
||||
share/help/zh_CN/
|
||||
@ -234,7 +265,8 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
|
||||
share/metainfo/gucharmap.appdata.xml
|
||||
share/metainfo/gucharmap.metainfo.xml
|
||||
share/vala/vapi/gucharmap-2.90.deps
|
||||
share/vala/vapi/gucharmap-2.90.vapi
|
||||
@tag glib-compile-schemas
|
||||
@tag update-desktop-database
|
||||
|
||||
Loading…
Reference in New Issue
Block a user