Received: by mail.netbsd.org (Postfix, from userid 605) id 9ED7384D3A; Sun, 9 Feb 2020 11:34:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 26CF584D36 for ; Sun, 9 Feb 2020 11:34:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nZCDjuJIbJIz for ; Sun, 9 Feb 2020 11:34:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5D13784CE8 for ; Sun, 9 Feb 2020 11:34:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 509E7FBF4; Sun, 9 Feb 2020 11:34:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1581248055261250" MIME-Version: 1.0 Date: Sun, 9 Feb 2020 11:34:15 +0000 From: "Jaromir Dolecek" Subject: CVS commit: pkgsrc/devel/libglade To: pkgsrc-changes@NetBSD.org Reply-To: jdolecek@netbsd.org X-Mailer: log_accum Message-Id: <20200209113415.509E7FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1581248055261250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jdolecek Date: Sun Feb 9 11:34:15 UTC 2020 Modified Files: pkgsrc/devel/libglade: Makefile distinfo pkgsrc/devel/libglade/patches: patch-configure Log Message: add gmodule-2.0 (part of glib2) to the list of required/linked libs, so that libglade link succeds on Darwin/macOS - it uses g_module_build_path()/g_module_open() To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/libglade/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/libglade/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libglade/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1581248055261250 Content-Disposition: inline Content-Length: 6664 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libglade/Makefile diff -u pkgsrc/devel/libglade/Makefile:1.103 pkgsrc/devel/libglade/Makefile:1.104 --- pkgsrc/devel/libglade/Makefile:1.103 Sun Nov 3 10:39:17 2019 +++ pkgsrc/devel/libglade/Makefile Sun Feb 9 11:34:15 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2019/11/03 10:39:17 rillig Exp $ +# $NetBSD: Makefile,v 1.104 2020/02/09 11:34:15 jdolecek Exp $ DISTNAME= libglade-2.6.4 -PKGREVISION= 30 +PKGREVISION= 31 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglade/2.6/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/devel/libglade/distinfo diff -u pkgsrc/devel/libglade/distinfo:1.15 pkgsrc/devel/libglade/distinfo:1.16 --- pkgsrc/devel/libglade/distinfo:1.15 Sun Feb 9 11:28:13 2020 +++ pkgsrc/devel/libglade/distinfo Sun Feb 9 11:34:15 2020 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2020/02/09 11:28:13 jdolecek Exp $ +$NetBSD: distinfo,v 1.16 2020/02/09 11:34:15 jdolecek Exp $ SHA1 (libglade-2.6.4.tar.bz2) = 8465851733b8a0efbe57c43efc0f140d8e2d2edb RMD160 (libglade-2.6.4.tar.bz2) = 516a43543e518a319ca9b35556ca1ac88e2ce8fb SHA512 (libglade-2.6.4.tar.bz2) = b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 Size (libglade-2.6.4.tar.bz2) = 356119 bytes -SHA1 (patch-configure) = 17b79519102422772a63e25158e39ac95f15019e +SHA1 (patch-configure) = b19a3082e8c07e75e8bcade575c72b8695575b40 SHA1 (patch-glade_Makefile) = 722c225cb12042282ebda1af25c158045da5626d Index: pkgsrc/devel/libglade/patches/patch-configure diff -u pkgsrc/devel/libglade/patches/patch-configure:1.1 pkgsrc/devel/libglade/patches/patch-configure:1.2 --- pkgsrc/devel/libglade/patches/patch-configure:1.1 Sun Feb 9 11:28:13 2020 +++ pkgsrc/devel/libglade/patches/patch-configure Sun Feb 9 11:34:15 2020 @@ -1,7 +1,72 @@ -$NetBSD: patch-configure,v 1.1 2020/02/09 11:28:13 jdolecek Exp $ +$NetBSD: patch-configure,v 1.2 2020/02/09 11:34:15 jdolecek Exp $ ---- configure.orig 2009-03-17 15:25:36.000000000 +0100 +Disable Python test to avoid the dependency, disables the libglade-convert +tool. + +Add gmodule-2.0 (part of glib2) to the list of required and linked libraries, +so the link succeeds on Darwin. + +--- configure.orig 2009-03-17 14:25:36.000000000 +0000 +++ configure +@@ -11083,12 +11083,12 @@ if test -n "$LIBGLADE_CFLAGS"; then + pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0" 2>/dev/null` ++ pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11099,12 +11099,12 @@ if test -n "$LIBGLADE_LIBS"; then + pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0" 2>/dev/null` ++ pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11122,14 +11122,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0" 2>&1` ++ LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0" 2>&1` + else +- LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0" 2>&1` ++ LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors " libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGLADE_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ( libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0) were not met: + + $LIBGLADE_PKG_ERRORS + +@@ -11140,7 +11140,7 @@ Alternatively, you may set the environme + and LIBGLADE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements ( libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0) were not met: ++$as_echo "$as_me: error: Package requirements ( libxml-2.0 >= 2.4.10 atk >= 1.9.0 gtk+-2.0 >= 2.5.0 glib-2.0 >= 2.10.0 gmodule-2.0 >= 2.10.0) were not met: + + $LIBGLADE_PKG_ERRORS + @@ -13054,6 +13054,7 @@ $as_echo "$LINGUAS" >&6; } --_----------=_1581248055261250--