On Tue, Apr 28, 2020 at 12:26:40AM +0200, Christopher Zimmermann wrote:
>
> Update lablgtk3. This will be nice to have when updating OCaml to 4.10.
> OK?
Baring objections relative to the ports slowdown for release, ok krw@.
.... Ken
>
> Christopher
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/lablgtk3/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 26 Sep 2019 09:46:10 -0000 1.4
> +++ Makefile 27 Apr 2020 22:24:24 -0000
> @@ -5,8 +5,7 @@ CATEGORIES = x11 devel
> GH_ACCOUNT = garrigue
> GH_PROJECT = lablgtk
> -GH_TAGNAME = 3.0.beta6
> -REVISION = 1
> +GH_TAGNAME = 3.1.0
> PKGNAME = lablgtk3-${GH_TAGNAME}
> # LGPL
> @@ -14,13 +13,11 @@ PERMIT_PACKAGE = Yes
> WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
> WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
> gtksourceview-3.0
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread z
> +WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pthread z
> LIB_DEPENDS = x11/gtk+3 \
> devel/gettext,-runtime \
> - x11/gtksourceview3 \
> - x11/gnome/librsvg \
> - x11/gnome/libgnomecanvas
> + x11/gtksourceview3
> RUN_DEPENDS = graphics/ocaml-cairo
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/lablgtk3/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 4 Aug 2019 19:13:19 -0000 1.1.1.1
> +++ distinfo 27 Apr 2020 22:24:24 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (lablgtk-3.0.beta6.tar.gz) =
> uikDKAPkKqmzjAaZqw2ixQGUAyaH0hJBsuG0QbLvlnU=
> -SIZE (lablgtk-3.0.beta6.tar.gz) = 1099271
> +SHA256 (lablgtk-3.1.0.tar.gz) = +aZiihTg3O3aX6v5Scvy3++xrywnF0hTtjr/hNF9XbA=
> +SIZE (lablgtk-3.1.0.tar.gz) = 1031045
> Index: patches/patch-src_Makefile
> ===================================================================
> RCS file: patches/patch-src_Makefile
> diff -N patches/patch-src_Makefile
> --- patches/patch-src_Makefile 4 Aug 2019 19:13:19 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-src_Makefile,v 1.1.1.1 2019/08/04 19:13:19 chrisz Exp $
> -
> -Index: src/Makefile
> ---- src/Makefile.orig
> -+++ src/Makefile
> -@@ -48,12 +48,12 @@ endif
> - GTKCFLAGS += -I`ocamlfind query cairo2`
> - - ifdef DEBUG
> --CFLAGS = -g $(GTKCFLAGS)
> -+CFLAGS += -g $(GTKCFLAGS)
> - CUSTOM = -custom
> - #MLLINK += -cclib -lcamlrund
> - MLBYTEFLAGS = -g -dtypes
> - else
> --CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
> -+CFLAGS += -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
> - ifneq ($(TOOLCHAIN),msvc)
> - CFLAGS += -O
> - endif
> -@@ -131,7 +131,7 @@ GTKSPELLCOBJS = ml_gtkspell$(XO)
> - endif
> - - ifdef USE_GTKSOURCEVIEW3
> --ml_gtksourceview3.o: CFLAGS=$(GTKSOURCEVIEW3CFLAGS)
> -+ml_gtksourceview3.o: CFLAGS+=$(GTKSOURCEVIEW3CFLAGS)
> - MLLIBS += lablgtksourceview3.cma
> - CLIBS += liblablgtksourceview3$(XA)
> - GTKSOURCEVIEW3MLOBJS = gtkSourceView3.cmo gSourceView3.cmo
> Index: pkg/PFRAG.native
> ===================================================================
> RCS file: /cvs/ports/x11/lablgtk3/pkg/PFRAG.native,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PFRAG.native
> --- pkg/PFRAG.native 4 Aug 2019 19:13:19 -0000 1.1.1.1
> +++ pkg/PFRAG.native 27 Apr 2020 22:24:24 -0000
> @@ -7,6 +7,7 @@ lib/ocaml/lablgtk3-sourceview3/lablgtk3_
> lib/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
> lib/ocaml/lablgtk3-sourceview3/ogtkSourceView3Props.cmx
> lib/ocaml/lablgtk3-sourceview3/sourceView3Enums.cmx
> +lib/ocaml/lablgtk3/cairo_pango.cmx
> lib/ocaml/lablgtk3/gAction.cmx
> lib/ocaml/lablgtk3/gAssistant.cmx
> lib/ocaml/lablgtk3/gBin.cmx
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/lablgtk3/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 4 Aug 2019 19:13:19 -0000 1.1.1.1
> +++ pkg/PLIST 27 Apr 2020 22:24:24 -0000
> @@ -7,14 +7,14 @@ doc/lablgtk3/
> doc/lablgtk3-sourceview3/
> doc/lablgtk3-sourceview3/CHANGELOG.API
> doc/lablgtk3-sourceview3/CHANGES.md
> +doc/lablgtk3-sourceview3/LICENSE
> doc/lablgtk3-sourceview3/README.dune.md
> doc/lablgtk3-sourceview3/README.md
> -doc/lablgtk3-sourceview3/README.win32
> doc/lablgtk3/CHANGELOG.API
> doc/lablgtk3/CHANGES.md
> +doc/lablgtk3/LICENSE
> doc/lablgtk3/README.dune.md
> doc/lablgtk3/README.md
> -doc/lablgtk3/README.win32
> lib/ocaml/lablgtk3/
> lib/ocaml/lablgtk3-sourceview3/
> lib/ocaml/lablgtk3-sourceview3/META
> @@ -34,7 +34,7 @@ lib/ocaml/lablgtk3-sourceview3/gtkSource
> lib/ocaml/lablgtk3-sourceview3/gtkSourceView3_types.cmti
> lib/ocaml/lablgtk3-sourceview3/gtkSourceView3_types.mli
> lib/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
> -lib/ocaml/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
> +@static-lib lib/ocaml/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
> lib/ocaml/lablgtk3-sourceview3/ogtkSourceView3Props.cmi
> lib/ocaml/lablgtk3-sourceview3/ogtkSourceView3Props.cmt
> lib/ocaml/lablgtk3-sourceview3/ogtkSourceView3Props.ml
> @@ -43,6 +43,11 @@ lib/ocaml/lablgtk3-sourceview3/sourceVie
> lib/ocaml/lablgtk3-sourceview3/sourceView3Enums.cmt
> lib/ocaml/lablgtk3-sourceview3/sourceView3Enums.ml
> lib/ocaml/lablgtk3/META
> +lib/ocaml/lablgtk3/cairo_pango.cmi
> +lib/ocaml/lablgtk3/cairo_pango.cmt
> +lib/ocaml/lablgtk3/cairo_pango.cmti
> +lib/ocaml/lablgtk3/cairo_pango.ml
> +lib/ocaml/lablgtk3/cairo_pango.mli
> lib/ocaml/lablgtk3/dune-package
> lib/ocaml/lablgtk3/gAction.cmi
> lib/ocaml/lablgtk3/gAction.cmt
> @@ -176,6 +181,7 @@ lib/ocaml/lablgtk3/gdkPixbuf.cmt
> lib/ocaml/lablgtk3/gdkPixbuf.cmti
> lib/ocaml/lablgtk3/gdkPixbuf.ml
> lib/ocaml/lablgtk3/gdkPixbuf.mli
> +lib/ocaml/lablgtk3/gdk_tags.h
> lib/ocaml/lablgtk3/glib.cmi
> lib/ocaml/lablgtk3/glib.cmt
> lib/ocaml/lablgtk3/glib.cmti
> @@ -309,13 +315,21 @@ lib/ocaml/lablgtk3/gtkTreeProps.ml
> lib/ocaml/lablgtk3/gtkWindow.cmi
> lib/ocaml/lablgtk3/gtkWindow.cmt
> lib/ocaml/lablgtk3/gtkWindow.ml
> +lib/ocaml/lablgtk3/gtk_tags.h
> lib/ocaml/lablgtk3/gutf8.cmi
> lib/ocaml/lablgtk3/gutf8.cmt
> lib/ocaml/lablgtk3/gutf8.cmti
> lib/ocaml/lablgtk3/gutf8.ml
> lib/ocaml/lablgtk3/gutf8.mli
> lib/ocaml/lablgtk3/lablgtk3.cma
> -lib/ocaml/lablgtk3/liblablgtk3_stubs.a
> +@static-lib lib/ocaml/lablgtk3/liblablgtk3_stubs.a
> +lib/ocaml/lablgtk3/ml_gdk.h
> +lib/ocaml/lablgtk3/ml_gdkpixbuf.h
> +lib/ocaml/lablgtk3/ml_glib.h
> +lib/ocaml/lablgtk3/ml_gobject.h
> +lib/ocaml/lablgtk3/ml_gtk.h
> +lib/ocaml/lablgtk3/ml_gtktext.h
> +lib/ocaml/lablgtk3/ml_pango.h
> lib/ocaml/lablgtk3/ogtkActionProps.cmi
> lib/ocaml/lablgtk3/ogtkActionProps.cmt
> lib/ocaml/lablgtk3/ogtkActionProps.ml
> @@ -369,7 +383,9 @@ lib/ocaml/lablgtk3/pangoEnums.cmi
> lib/ocaml/lablgtk3/pangoEnums.cmt
> lib/ocaml/lablgtk3/pangoEnums.ml
> @comment lib/ocaml/ld.conf
> -lib/ocaml/stublibs/dlllablgtk3_sourceview3_stubs.so
> -lib/ocaml/stublibs/dlllablgtk3_stubs.so
> +lib/ocaml/lablgtk3/pango_tags.h
> +lib/ocaml/lablgtk3/wrappers.h
> +@so lib/ocaml/stublibs/dlllablgtk3_sourceview3_stubs.so
> +@so lib/ocaml/stublibs/dlllablgtk3_stubs.so
> share/doc/lablgtk3/
> share/doc/lablgtk3/README.md
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
