CVS commit: pkgsrc/devel/lua-gi

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun  7 13:01:30 UTC 2026

Modified Files:
        pkgsrc/devel/lua-gi: Makefile distinfo
        pkgsrc/devel/lua-gi/patches: patch-lgi_ffi.lua
Added Files:
        pkgsrc/devel/lua-gi/patches: patch-lgi_class.lua

Log Message:
lua-gi: apply upstream patch to improve error messages

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/lua-gi/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/lua-gi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lua-gi/patches/patch-lgi_class.lua
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/lua-gi/Makefile
diff -u pkgsrc/devel/lua-gi/Makefile:1.17 pkgsrc/devel/lua-gi/Makefile:1.18
--- pkgsrc/devel/lua-gi/Makefile:1.17   Mon Apr 20 06:24:40 2026
+++ pkgsrc/devel/lua-gi/Makefile        Sun Jun  7 13:01:29 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2026/04/20 06:24:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/06/07 13:01:29 wiz Exp $
 
 DISTNAME=      lgi-${VERSION}
 PKGNAME=       ${LUA_PKGPREFIX}-gi-${VERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 VERSION=       0.9.2
 CATEGORIES=    devel lua
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pavouk/}

Index: pkgsrc/devel/lua-gi/distinfo
diff -u pkgsrc/devel/lua-gi/distinfo:1.11 pkgsrc/devel/lua-gi/distinfo:1.12
--- pkgsrc/devel/lua-gi/distinfo:1.11   Mon Apr 20 06:24:40 2026
+++ pkgsrc/devel/lua-gi/distinfo        Sun Jun  7 13:01:29 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2026/04/20 06:24:40 wiz Exp $
+$NetBSD: distinfo,v 1.12 2026/06/07 13:01:29 wiz Exp $
 
 BLAKE2s (lgi-0.9.2.tar.gz) = e4a718c21a0855fb97f407de8f55e20a74384d163192f4e66f8c92868eb607e0
 SHA512 (lgi-0.9.2.tar.gz) = 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
 Size (lgi-0.9.2.tar.gz) = 291463 bytes
 SHA1 (patch-lgi_Makefile) = b74dd92555ab30aadf61cb2a5799ddce54339b8b
-SHA1 (patch-lgi_ffi.lua) = d935ea6e74a868888e3cd5bd684ffc874d3d852c
+SHA1 (patch-lgi_class.lua) = 68634671892ba308daf8c012d1174a3e9818f113
+SHA1 (patch-lgi_ffi.lua) = af67763392e70b4032a05b0f28e8718520078502

Index: pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua
diff -u pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua:1.1 pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua:1.2
--- pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua:1.1   Mon Apr 20 06:24:41 2026
+++ pkgsrc/devel/lua-gi/patches/patch-lgi_ffi.lua       Sun Jun  7 13:01:30 2026
@@ -1,10 +1,24 @@
-$NetBSD: patch-lgi_ffi.lua,v 1.1 2026/04/20 06:24:41 wiz Exp $
+$NetBSD: patch-lgi_ffi.lua,v 1.2 2026/06/07 13:01:30 wiz Exp $
+
+Wrap gi.require with assert in class.lua and ffi.lua
+https://github.com/lgi-devs/lgi/commit/5233d837046988296b1b442ecb269b4be91e0b7f
 
 ffi: Adapt load_enum to glib 2.87 changes
 https://github.com/lgi-devs/lgi/pull/352
 
---- lgi/ffi.lua.orig   2017-10-09 18:55:55.000000000 +0000
+--- lgi/ffi.lua.orig   2026-06-07 12:58:57.471269587 +0000
 +++ lgi/ffi.lua
+@@ -21,8 +21,8 @@ local ffi = {}
+ 
+ local ffi = {}
+ 
+-local gobject = gi.require('GObject')
+-local glib = gi.require('GLib')
++local gobject = assert(gi.require('GObject'))
++local glib = assert(gi.require('GLib'))
+ 
+ -- Gather all basic types.  We have to 'steal' them from well-known
+ -- declarations, because girepository API does not allow synthesizing
 @@ -76,16 +76,22 @@ function ffi.load_enum(gtype, name)
  
  -- Creates new enum/flags table with all values from specified gtype.

Added files:

Index: pkgsrc/devel/lua-gi/patches/patch-lgi_class.lua
diff -u /dev/null pkgsrc/devel/lua-gi/patches/patch-lgi_class.lua:1.1
--- /dev/null   Sun Jun  7 13:01:30 2026
+++ pkgsrc/devel/lua-gi/patches/patch-lgi_class.lua     Sun Jun  7 13:01:30 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-lgi_class.lua,v 1.1 2026/06/07 13:01:30 wiz Exp $
+
+Wrap gi.require with assert in class.lua and ffi.lua
+https://github.com/lgi-devs/lgi/commit/5233d837046988296b1b442ecb269b4be91e0b7f
+
+--- lgi/class.lua.orig 2017-10-09 18:55:55.000000000 +0000
++++ lgi/class.lua
+@@ -20,7 +20,7 @@ local ti = ffi.types
+ local record = require 'lgi.record'
+ local ffi = require 'lgi.ffi'
+ local ti = ffi.types
+-local GObject = gi.require 'GObject'
++local GObject = assert(gi.require('GObject'))
+ 
+ -- Implementation of class and interface component loading.
+ local class = {