CVS commit: pkgsrc/devel/gconfmm

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Mar 22 14:41:41 UTC 2021

Modified Files:
        pkgsrc/devel/gconfmm: Makefile distinfo
Added Files:
        pkgsrc/devel/gconfmm/patches: patch-gconf_gconfmm_callback.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/gconfmm/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/gconfmm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h

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

Modified files:

Index: pkgsrc/devel/gconfmm/Makefile
diff -u pkgsrc/devel/gconfmm/Makefile:1.73 pkgsrc/devel/gconfmm/Makefile:1.74
--- pkgsrc/devel/gconfmm/Makefile:1.73  Thu Nov  5 09:06:46 2020
+++ pkgsrc/devel/gconfmm/Makefile       Mon Mar 22 14:41:41 2021
@@ -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@localhost
-#HOMEPAGE=     http://gtkmm.sourceforge.net/
+#HOMEPAGE=     http://www.gtkmm.org/
 COMMENT=       C++ bindings for gconf
 
 USE_LANGUAGES=         c c++11

Index: pkgsrc/devel/gconfmm/distinfo
diff -u pkgsrc/devel/gconfmm/distinfo:1.16 pkgsrc/devel/gconfmm/distinfo:1.17
--- pkgsrc/devel/gconfmm/distinfo:1.16  Tue Nov  3 03:27:27 2015
+++ pkgsrc/devel/gconfmm/distinfo       Mon Mar 22 14:41:41 2021
@@ -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

Added files:

Index: pkgsrc/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h
diff -u /dev/null pkgsrc/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h:1.1
--- /dev/null   Mon Mar 22 14:41:41 2021
+++ pkgsrc/devel/gconfmm/patches/patch-gconf_gconfmm_callback.h Mon Mar 22 14:41:41 2021
@@ -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>