diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-03-22 14:41:41 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-03-22 14:41:41 +0000 |
| commit | 6c1ecbe91f09519689a359bb0b5e9878f7369710 (patch) | |
| tree | aab10dfab9e4974c169e1daf4be7e402ece757d1 | |
| parent | 9989ac857b181b1de69bc41fb85571551c2cbe35 (diff) | |
| download | pkgsrc-6c1ecbe91f09519689a359bb0b5e9878f7369710.tar.gz | |
gconfmm: FIx build failure with devel/glib2-2.68.0
gconf-client.h includes C++ header file via glib2 header file.
Bump PKGREVISION from header file change.
By the way, gconfmm is not developed any more.
| -rw-r--r-- | devel/gconfmm/Makefile | 6 | ||||
| -rw-r--r-- | devel/gconfmm/distinfo | 3 | ||||
| -rw-r--r-- | devel/gconfmm/patches/patch-gconf_gconfmm_callback.h | 20 |
3 files changed, 25 insertions, 4 deletions
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index bd5824d0565..71520e9b288 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.73 2020/11/05 09:06:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.74 2021/03/22 14:41:41 ryoon Exp $ DISTNAME= gconfmm-2.28.3 -PKGREVISION= 24 +PKGREVISION= 25 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconfmm/2.28/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org -#HOMEPAGE= http://gtkmm.sourceforge.net/ +#HOMEPAGE= http://www.gtkmm.org/ COMMENT= C++ bindings for gconf USE_LANGUAGES= c c++11 diff --git a/devel/gconfmm/distinfo b/devel/gconfmm/distinfo index 37d5a0984ba..aa201ae3813 100644 --- a/devel/gconfmm/distinfo +++ b/devel/gconfmm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2015/11/03 03:27:27 agc Exp $ +$NetBSD: distinfo,v 1.17 2021/03/22 14:41:41 ryoon Exp $ SHA1 (gconfmm-2.28.3.tar.bz2) = 333999fe8e07f3d3d74c6b382559b1ca5278ecc7 RMD160 (gconfmm-2.28.3.tar.bz2) = bad8c34a86c69b79acdb9074d1244b31ca3e3fe4 SHA512 (gconfmm-2.28.3.tar.bz2) = 0fd3a43373dfdf514eca61537c19dafd4ad582d2ec6bb325652766fba90ed723feff6daf93effcdf20f917c573131d58c16f1a826194f653864a701bb8a57097 Size (gconfmm-2.28.3.tar.bz2) = 471125 bytes +SHA1 (patch-gconf_gconfmm_callback.h) = 8ffb5a8eebf47d5da5d4549e5b0503e39011330b diff --git a/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h b/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h new file mode 100644 index 00000000000..6162401fb95 --- /dev/null +++ b/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h @@ -0,0 +1,20 @@ +$NetBSD: patch-gconf_gconfmm_callback.h,v 1.1 2021/03/22 14:41:41 ryoon Exp $ + +* Fix error with devlel/glib2-2.68.0 +../gconfmm/callback.h:25:1: note: 'extern "C"' linkage started here +(snip) +/usr/include/g++/type_traits:2741:3: error: template with C linkage + +--- gconf/gconfmm/callback.h.orig 2011-10-18 15:33:49.000000000 +0000 ++++ gconf/gconfmm/callback.h +@@ -22,10 +22,7 @@ + #ifndef GCONFMM_CALLBACK_H + #define GCONFMM_CALLBACK_H + +-extern "C" +-{ + #include <gconf/gconf-client.h> +-} + + #include <glibmm/object.h> + #include <gconfmm/entry.h> |