pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: Use the tools framework for gdbus-codegen
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a9afc74ac9d
branches: trunk
changeset: 451835:6a9afc74ac9d
user: nia <nia%pkgsrc.org@localhost>
date: Sun May 02 11:06:12 2021 +0000
description:
*: Use the tools framework for gdbus-codegen
diffstat:
audio/audacious-plugins/Makefile | 4 ++--
audio/audacious/options.mk | 4 ++--
devel/dconf/Makefile | 5 ++---
devel/xfce4-conf/Makefile | 6 +++---
geography/geoclue/Makefile | 5 ++---
graphics/gimp/Makefile | 4 ++--
mail/evolution-data-server/Makefile | 5 ++---
mail/evolution/Makefile | 5 ++---
mk/tools/bsd.tools.mk | 3 ++-
mk/tools/gdbus-codegen.mk | 17 +++++++++++++++++
net/gnome-online-accounts/Makefile | 5 ++---
net/grilo-plugins/Makefile | 5 ++---
print/atril/Makefile | 4 ++--
print/cups-filters/Makefile | 5 ++---
print/evince3/Makefile.common | 5 ++---
security/gcr/Makefile | 4 ++--
security/libsecret/Makefile | 4 ++--
sysutils/accountsservice/Makefile | 5 ++---
sysutils/caja/Makefile | 4 ++--
sysutils/consolekit/Makefile | 5 ++---
sysutils/gnome-control-center/Makefile | 5 ++---
sysutils/gnome-settings-daemon/Makefile | 4 ++--
sysutils/gnome-tracker-miners/Makefile | 5 ++---
sysutils/nautilus/Makefile | 5 ++---
time/gnome-calendar/Makefile | 5 ++---
wm/mutter/Makefile | 4 ++--
www/epiphany/Makefile | 5 ++---
x11/gnome-desktop3/Makefile | 5 ++---
x11/gnome-session/Makefile | 4 ++--
x11/gnome-shell/Makefile | 5 ++---
x11/gnome-terminal/Makefile | 4 ++--
x11/gtk3/Makefile | 5 +++--
x11/gtk4/Makefile | 6 ++----
x11/libgdm/Makefile | 6 ++----
x11/xfce4-notifyd/Makefile | 4 ++--
x11/xfce4-panel/Makefile | 4 ++--
x11/xfce4-tumbler/Makefile | 6 ++----
37 files changed, 91 insertions(+), 95 deletions(-)
diffs (truncated from 805 to 300 lines):
diff -r cf54192814dd -r 6a9afc74ac9d audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/audio/audacious-plugins/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2021/04/21 13:24:20 adam Exp $
+# $NetBSD: Makefile,v 1.123 2021/05/02 11:06:12 nia Exp $
DISTNAME= audacious-plugins-4.1
PKGREVISION= 4
@@ -48,7 +48,7 @@
.include "options.mk"
.include "../../audio/audacious/buildlink3.mk"
.if ${PKG_BUILD_OPTIONS.audacious:Mdbus}
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+USE_TOOLS+= gdbus-codegen
PLIST.dbus= yes
.else
CONFIGURE_ARGS+= --disable-mpris2
diff -r cf54192814dd -r 6a9afc74ac9d audio/audacious/options.mk
--- a/audio/audacious/options.mk Sun May 02 10:58:47 2021 +0000
+++ b/audio/audacious/options.mk Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/03/22 08:39:48 nia Exp $
+# $NetBSD: options.mk,v 1.3 2021/05/02 11:06:12 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.audacious
PKG_SUPPORTED_OPTIONS+= dbus
@@ -10,7 +10,7 @@
.if !empty(PKG_OPTIONS:Mdbus)
PLIST.dbus= yes
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+USE_TOOLS+= gdbus-codegen
.include "../../sysutils/dbus/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-dbus
diff -r cf54192814dd -r 6a9afc74ac9d devel/dconf/Makefile
--- a/devel/dconf/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/devel/dconf/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2021/04/14 07:28:17 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2021/05/02 11:06:12 nia Exp $
DISTNAME= dconf-0.36.0
PKGREVISION= 5
@@ -11,12 +11,11 @@
COMMENT= Backend for gsettings
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
USE_LANGUAGES= c99
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config gdbus-codegen
PYTHON_FOR_BUILD_ONLY= tool
REPLACE_PYTHON+= *.py
diff -r cf54192814dd -r 6a9afc74ac9d devel/xfce4-conf/Makefile
--- a/devel/xfce4-conf/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/devel/xfce4-conf/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/08/31 18:09:22 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2021/05/02 11:06:12 nia Exp $
PKGREVISION= 2
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -12,6 +12,8 @@
HOMEPAGE= https://docs.xfce.org/xfce/xfconf/start
COMMENT= Xfce client-server configuration storage and query system
+USE_TOOLS+= gdbus-codegen
+
PKGCONFIG_OVERRIDE= xfconf/libxfconf-0.pc.in
CONFIGURE_ARGS+= --disable-perl-bindings
@@ -23,8 +25,6 @@
BUILDLINK_API_DEPENDS.dbus+= dbus>=1.0.0
BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.72
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
diff -r cf54192814dd -r 6a9afc74ac9d geography/geoclue/Makefile
--- a/geography/geoclue/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/geography/geoclue/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/04/21 11:41:48 adam Exp $
+# $NetBSD: Makefile,v 1.34 2021/05/02 11:06:13 nia Exp $
DISTNAME= geoclue-2.5.6
PKGREVISION= 3
@@ -10,11 +10,10 @@
COMMENT= Geoinformation service API and base providers
LICENSE= gnu-lgpl-v2
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= pkg-config msgfmt gdbus-codegen
MESON_ARGS+= -D3g-source=false
MESON_ARGS+= -Dcdma-source=false
diff -r cf54192814dd -r 6a9afc74ac9d graphics/gimp/Makefile
--- a/graphics/gimp/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/graphics/gimp/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.342 2021/04/21 11:40:24 adam Exp $
+# $NetBSD: Makefile,v 1.343 2021/05/02 11:06:13 nia Exp $
DISTNAME= gimp-2.10.24
PKGREVISION= 5
@@ -11,7 +11,6 @@
COMMENT= The GNU image manipulation program
LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3
-BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
BUILD_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools
DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking
CONFLICTS+= gimp<=1.2.3
@@ -22,6 +21,7 @@
USE_TOOLS+= gmake pkg-config perl
USE_TOOLS+= intltool msgfmt msgmerge xgettext
+USE_TOOLS+= gdbus-codegen
GNU_CONFIGURE= yes
diff -r cf54192814dd -r 6a9afc74ac9d mail/evolution-data-server/Makefile
--- a/mail/evolution-data-server/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/mail/evolution-data-server/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202 2021/04/28 12:21:50 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.203 2021/05/02 11:06:13 nia Exp $
DISTNAME= evolution-data-server-3.35.1
PKGREVISION= 15
@@ -14,13 +14,12 @@
USE_CMAKE= yes
USE_TOOLS+= pkg-config perl:run
USE_TOOLS+= intltool msgfmt msgmerge xgettext
+USE_TOOLS+= gdbus-codegen
USE_LANGUAGES= c c++14
# C++14
GCC_REQD+= 5
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
CMAKE_ARGS+= -DWITH_LIBDB=OFF
CMAKE_ARGS+= -DENABLE_GOA=OFF
CMAKE_ARGS+= -DENABLE_WEATHER=OFF
diff -r cf54192814dd -r 6a9afc74ac9d mail/evolution/Makefile
--- a/mail/evolution/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/mail/evolution/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.255 2021/05/02 10:24:49 nia Exp $
+# $NetBSD: Makefile,v 1.256 2021/05/02 11:06:13 nia Exp $
DISTNAME= evolution-3.34.1
PKGREVISION= 10
@@ -14,11 +14,10 @@
USE_CMAKE= yes
USE_TOOLS+= pkg-config itstool
USE_TOOLS+= intltool msgfmt msgmerge xgettext
+USE_TOOLS+= gdbus-codegen
DEPENDS+= highlight-[0-9]*:../../textproc/highlight
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/evolution
CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
diff -r cf54192814dd -r 6a9afc74ac9d mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk Sun May 02 10:58:47 2021 +0000
+++ b/mk/tools/bsd.tools.mk Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.63 2021/05/02 10:24:50 nia Exp $
+# $NetBSD: bsd.tools.mk,v 1.64 2021/05/02 11:06:13 nia Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -154,6 +154,7 @@
.include "cmake.mk"
.include "imake.mk"
.include "itstool.mk"
+.include "gdbus-codegen.mk"
.include "zip.mk"
.include "replace.mk"
.include "perl.mk"
diff -r cf54192814dd -r 6a9afc74ac9d mk/tools/gdbus-codegen.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/tools/gdbus-codegen.mk Sun May 02 11:06:12 2021 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: gdbus-codegen.mk,v 1.1 2021/05/02 11:06:13 nia Exp $
+
+.if !empty(USE_TOOLS:Mgdbus-codegen)
+TOOLS_CREATE+= gdbus-codegen
+TOOLS_DEPENDS.gdbus-codegen?= gdbus-codegen-[0-9]*:../../textproc/gdbus-codegen
+TOOLS_PATH.gdbus-codegen= ${PREFIX}/bin/gdbus-codegen
+.else
+#
+# If a package doesn't explicitly say it uses gdbus-codegen, then create a "broken"
+# gdbus-codegen in the tools directory.
+#
+TOOLS_FAIL+= gdbus-codegen
+TOOLS_PATH.gdbus-codegen= ${TOOLS_CMD.gdbus-codegen}
+.endif
+
+CONFIGURE_ENV+= GDBUS_CODEGEN=${TOOLS_CMD.gdbus-codegen:Q}
+MAKE_ENV+= GDBUS_CODEGEN=${TOOLS_CMD.gdbus-codegen:Q}
diff -r cf54192814dd -r 6a9afc74ac9d net/gnome-online-accounts/Makefile
--- a/net/gnome-online-accounts/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/net/gnome-online-accounts/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/04/21 11:42:24 adam Exp $
+# $NetBSD: Makefile,v 1.41 2021/05/02 11:06:13 nia Exp $
DISTNAME= gnome-online-accounts-3.36.0
PKGREVISION= 3
@@ -11,12 +11,11 @@
COMMENT= Service that allows online accounts to be used with GNOME
LICENSE= gnu-lgpl-v2
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
USE_TOOLS+= msgfmt msgmerge xgettext
+USE_TOOLS+= gdbus-codegen
CONFIGURE_ENV+= GLIB_COMPILE_SCHEMAS=glib-compile-schemas
diff -r cf54192814dd -r 6a9afc74ac9d net/grilo-plugins/Makefile
--- a/net/grilo-plugins/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/net/grilo-plugins/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2021/05/02 10:24:51 nia Exp $
+# $NetBSD: Makefile,v 1.43 2021/05/02 11:06:13 nia Exp $
DISTNAME= grilo-plugins-0.3.10
PKGREVISION= 8
@@ -11,9 +11,8 @@
COMMENT= Plugins for grilo media browser
LICENSE= gnu-lgpl-v2
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
USE_TOOLS+= pkg-config xgettext itstool
+USE_TOOLS+= gdbus-codegen
PYTHON_FOR_BUILD_ONLY= tool
diff -r cf54192814dd -r 6a9afc74ac9d print/atril/Makefile
--- a/print/atril/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/print/atril/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2021/04/21 11:42:32 adam Exp $
+# $NetBSD: Makefile,v 1.68 2021/05/02 11:06:13 nia Exp $
PKGREVISION= 9
.include "../../meta-pkgs/mate/Makefile.common"
@@ -10,7 +10,7 @@
USE_LANGUAGES= c c++
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+USE_TOOLS+= gdbus-codegen
PKGCONFIG_OVERRIDE+= atril-document.pc.in
PKGCONFIG_OVERRIDE+= atril-view.pc.in
diff -r cf54192814dd -r 6a9afc74ac9d print/cups-filters/Makefile
--- a/print/cups-filters/Makefile Sun May 02 10:58:47 2021 +0000
+++ b/print/cups-filters/Makefile Sun May 02 11:06:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2021/04/21 13:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.153 2021/05/02 11:06:14 nia Exp $
DISTNAME= cups-filters-1.28.8
PKGREVISION= 1
@@ -11,13 +11,12 @@
COMMENT= Backends, filters, and other software for cups
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND mit
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
USE_LANGUAGES= c c++11
USE_LIBTOOL= yes
-USE_TOOLS+= bash:run pkg-config gmake
+USE_TOOLS+= bash:run pkg-config gmake gdbus-codegen
GNU_CONFIGURE= yes
Home |
Main Index |
Thread Index |
Old Index