pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

glib2-introspection: finish package



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu May 14 23:28:05 2026 +0200
Changeset:	50ed634b5790f90a05f6c7bb564cda01c1ef0cfc

Modified Files:
	glib2-introspection/Makefile
	glib2-introspection/PLIST
Removed Files:
	glib2-introspection/TODO

Log Message:
glib2-introspection: finish package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=50ed634b5790f90a05f6c7bb564cda01c1ef0cfc

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

diffstat:
 glib2-introspection/Makefile | 47 +++++++++++++++++++++++---------------------
 glib2-introspection/PLIST    | 10 ----------
 glib2-introspection/TODO     |  1 -
 3 files changed, 25 insertions(+), 33 deletions(-)

diffs:
diff --git a/glib2-introspection/Makefile b/glib2-introspection/Makefile
index e375e14968..0834308006 100644
--- a/glib2-introspection/Makefile
+++ b/glib2-introspection/Makefile
@@ -42,34 +42,37 @@ SUBST_STAGE.libdirs=	pre-configure
 SUBST_FILES.libdirs+=	girepository/gitypelib.c
 SUBST_VARS.libdirs+=	PREFIX
 
-NTARGETS+=	girepository/introspection/GIRepository-3.0.gir
-NTARGETS+=	girepository/introspection/GIRepository-3.0.typelib
-NTARGETS+=	girepository/introspection/GLib-2.0.gir
-NTARGETS+=	girepository/introspection/GLib-2.0.typelib
-NTARGETS+=	girepository/introspection/GLibUnix-2.0.gir
-NTARGETS+=	girepository/introspection/GLibUnix-2.0.typelib
-NTARGETS+=	girepository/introspection/GModule-2.0.gir
-NTARGETS+=	girepository/introspection/GModule-2.0.typelib
-NTARGETS+=	girepository/introspection/GObject-2.0.gir
-NTARGETS+=	girepository/introspection/GObject-2.0.typelib
-NTARGETS+=	girepository/introspection/Gio-2.0.gir
-NTARGETS+=	girepository/introspection/Gio-2.0.typelib
-NTARGETS+=	girepository/introspection/GioUnix-2.0.gir
-NTARGETS+=	girepository/introspection/GioUnix-2.0.typelib
-
-MESON_BUILD_TARGET=	${NTARGETS}
-
-MESON_INSTALL=	no
+GIR_TARGETS+=		girepository/introspection/GIRepository-3.0.gir
+GIR_TARGETS+=		girepository/introspection/GLibUnix-2.0.gir
+TYPELIB_TARGETS+=	girepository/introspection/GIRepository-3.0.typelib
+TYPELIB_TARGETS+=	girepository/introspection/GLibUnix-2.0.typelib
+# part of gobject-introspection package:
+#GIR_TARGETS+=		girepository/introspection/GLib-2.0.gir
+#GIR_TARGETS+=		girepository/introspection/GModule-2.0.gir
+#GIR_TARGETS+=		girepository/introspection/GObject-2.0.gir
+#GIR_TARGETS+=		girepository/introspection/Gio-2.0.gir
+#GIR_TARGETS+=		girepository/introspection/GioUnix-2.0.gir
+#TYPELIB_TARGETS+=	girepository/introspection/GLib-2.0.typelib
+#TYPELIB_TARGETS+=	girepository/introspection/GModule-2.0.typelib
+#TYPELIB_TARGETS+=	girepository/introspection/GObject-2.0.typelib
+#TYPELIB_TARGETS+=	girepository/introspection/Gio-2.0.typelib
+#TYPELIB_TARGETS+=	girepository/introspection/GioUnix-2.0.typelib
+
+MESON_BUILD_TARGET=	${GIR_ARGETS} ${TYPELIB_TARGETS}
+MESON_INSTALL=		no
 
 INSTALLATION_DIRS=	lib/girepository-1.0 share/gir-1.0
 
+# avoid mixture of headers from ${PREFIX} and the source code itself
+pre-configure:
+	${RM} -rf ${BUILDLINK_DIR}/include/glib-2.0
+
 do-install:
-.for f in ${NTARGETS}
-.  if ${f:Mgir}
+.for f in ${GIR_TARGETS}
 	${INSTALL_DATA} ${WRKSRC}/output/${f} ${DESTDIR}${PREFIX}/share/gir-1.0/
-.  else
+.endfor
+.for f in ${TYPELIB_TARGETS}
 	${INSTALL_DATA} ${WRKSRC}/output/${f} ${DESTDIR}${PREFIX}/lib/girepository-1.0/
-.  endif
 .endfor
 
 .include "../../devel/meson/build.mk"
diff --git a/glib2-introspection/PLIST b/glib2-introspection/PLIST
index 5decf6e732..b040da7093 100644
--- a/glib2-introspection/PLIST
+++ b/glib2-introspection/PLIST
@@ -1,15 +1,5 @@
 @comment $NetBSD$
 lib/girepository-1.0/GIRepository-3.0.typelib
-lib/girepository-1.0/GLib-2.0.typelib
 lib/girepository-1.0/GLibUnix-2.0.typelib
-lib/girepository-1.0/GModule-2.0.typelib
-lib/girepository-1.0/GObject-2.0.typelib
-lib/girepository-1.0/Gio-2.0.typelib
-lib/girepository-1.0/GioUnix-2.0.typelib
 share/gir-1.0/GIRepository-3.0.gir
-share/gir-1.0/GLib-2.0.gir
 share/gir-1.0/GLibUnix-2.0.gir
-share/gir-1.0/GModule-2.0.gir
-share/gir-1.0/GObject-2.0.gir
-share/gir-1.0/Gio-2.0.gir
-share/gir-1.0/GioUnix-2.0.gir
diff --git a/glib2-introspection/TODO b/glib2-introspection/TODO
deleted file mode 100644
index af3aced4e0..0000000000
--- a/glib2-introspection/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Build fails, works outside of pkgsrc.


Home | Main Index | Thread Index | Old Index