From 96efa0984c748bd7184b5a0a759f79c043a8721e Mon Sep 17 00:00:00 2001 From: rh Date: Thu, 4 Oct 2001 19:20:05 +0000 Subject: Update libglade to 0.17 and while at it, buildlinkify. Changes include: - use gtk_clist_set_column_title to set clist column titles when possible so that they get the alignment of the column. - Backport code that cleans up widget hash table in the GladeXML object on widget destruction. This means that glade_xml_get_widget() should always return a valid widget or NULL. - Move headers to a a libglade-1.0/ subdirectory. This is to allow parallel installation of stable and development versions of libglade. Libraries depending on libglade will probably need to be rebuilt so that their *-config scripts --- devel/libglade/Makefile | 36 +++++++++++++-------------- devel/libglade/buildlink.mk | 60 +++++++++++++++++++++++++++++++++++++++++++++ devel/libglade/distinfo | 6 ++--- devel/libglade/pkg/PLIST | 13 +++++----- 4 files changed, 88 insertions(+), 27 deletions(-) create mode 100644 devel/libglade/buildlink.mk (limited to 'devel') diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index fabb4d67726..60514b72d69 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,31 +1,31 @@ -# $NetBSD: Makefile,v 1.31 2001/06/11 06:34:28 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2001/10/04 19:20:05 rh Exp $ # -DISTNAME= libglade-0.16 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libglade/} +DISTNAME= libglade-0.17 +CATEGORIES= devel gnome +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libglade/} -MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.daa.com.au/~james/gnome/ -COMMENT= Runtime interpreter for GLADE gui files +MAINTAINER= rh@netbsd.org +HOMEPAGE= http://www.daa.com.au/~james/gnome/ +COMMENT= Runtime interpreter for GLADE gui files BUILD_USES_MSGFMT= yes -# do not remove esound pre-requisite -DEPENDS+= esound>=0.2.18:../../audio/esound -DEPENDS+= gnome-libs>=1.2.1:../../x11/gnome-libs -DEPENDS+= libxml>=1.8.5:../../textproc/libxml -USE_LIBINTL= YES -USE_LIBTOOL= YES -USE_X11BASE= YES +USE_LIBTOOL= YES +USE_X11BASE= YES -GNU_CONFIGURE= YES -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib +GNU_CONFIGURE= YES +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Wl,-R${LOCALBASE}/lib -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig pre-configure: ${RM} ${WRKSRC}/libgladeConf.sh +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../textproc/libxml/buildlink.mk" +.include "../../x11/gnome-libs/buildlink.mk" +.include "../../audio/esound/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglade/buildlink.mk b/devel/libglade/buildlink.mk new file mode 100644 index 00000000000..11aad8c6e68 --- /dev/null +++ b/devel/libglade/buildlink.mk @@ -0,0 +1,60 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/10/04 19:20:05 rh Exp $ +# +# This Makefile fragment is included by packages that use libglade. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.libglade to the dependency pattern +# for the version of libglade desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(LIBGLADE_BUILDLINK_MK) +LIBGLADE_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.libglade?= libglade>=0.17 +DEPENDS+= ${BUILDLINK_DEPENDS.libglade}:../../devel/libglade + +EVAL_PREFIX+= BUILDLINK_PREFIX.libglade=libglade +BUILDLINK_PREFIX.libglade_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.libglade= include/libglade-1.0/glade/* +BUILDLINK_FILES.libglade+= lib/libglade.* +BUILDLINK_FILES.libglade+= lib/libglade-gnome.* +BUILDLINK_FILES.libglade+= lib/libgladeConf.sh + +BUILDLINK_CPPFLAGS+= -I${BUILDLINK_DIR}/include/libglade-1.0 + +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-I${BUILDLINK_PREFIX.libglade}\(/include/libglade-1.0\)|-I${BUILDLINK_DIR}\1|g" + +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../textproc/libxml/buildlink.mk" +.include "../../x11/gnome-libs/buildlink.mk" +.include "../../audio/esound/buildlink.mk" + + +BUILDLINK_TARGETS.libglade= libglade-buildlink +BUILDLINK_TARGETS.libglade+= libglade-buildlink-config-wrapper +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libglade} + +BUILDLINK_CONFIG.libglade= \ + ${BUILDLINK_PREFIX.libglade}/bin/libglade-config +BUILDLINK_CONFIG_WRAPPER.libglade= \ + ${BUILDLINK_DIR}/bin/libglade-config + +.if defined(USE_CONFIG_WRAPPER) +LIBGLADE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libglade} +CONFIGURE_ENV+= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" +MAKE_ENV+= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" +.endif + +pre-configure: ${BUILDLINK_TARGETS.libglade} +libglade-buildlink: _BUILDLINK_USE +libglade-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +.endif # LIBGLADE_BUILDLINK_MK diff --git a/devel/libglade/distinfo b/devel/libglade/distinfo index 554a436a464..1180abd2400 100644 --- a/devel/libglade/distinfo +++ b/devel/libglade/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:27 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/04 19:20:06 rh Exp $ -SHA1 (libglade-0.16.tar.gz) = adf05907866c81e436d5e5c57d62a61bd501efb3 -Size (libglade-0.16.tar.gz) = 345147 bytes +SHA1 (libglade-0.17.tar.gz) = 66dbb90ffcfe80c551d2f3a296729ceab527cbc0 +Size (libglade-0.17.tar.gz) = 418921 bytes SHA1 (patch-aa) = 0144305b76987773b49234091a7da6708da27d3c SHA1 (patch-ab) = b7832173e36810c9e5e29aace918c8169de6f5ad diff --git a/devel/libglade/pkg/PLIST b/devel/libglade/pkg/PLIST index 897a7f0790b..232b190e251 100644 --- a/devel/libglade/pkg/PLIST +++ b/devel/libglade/pkg/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.12 2001/03/18 00:40:50 mjl Exp $ +@comment $NetBSD: PLIST,v 1.13 2001/10/04 19:20:06 rh Exp $ bin/libglade-config bin/libglade-xgettext -include/glade/glade.h -include/glade/glade-xml.h -include/glade/glade-build.h -include/glade/glade-widget-tree.h +include/libglade-1.0/glade/glade-build.h +include/libglade-1.0/glade/glade-widget-tree.h +include/libglade-1.0/glade/glade-xml.h +include/libglade-1.0/glade/glade.h lib/libglade.so lib/libglade.so.4 lib/libglade.so.4.2 @@ -31,4 +31,5 @@ share/gnome/html/libglade/libglade-libglade-sax-parser.html share/gnome/html/libglade/libglade-notes.html share/gnome/html/libglade/libglade.html @dirrm share/gnome/html/libglade -@dirrm include/glade +@dirrm include/libglade-1.0/glade +@dirrm include/libglade-1.0 -- cgit v1.2.3