Update to 2.2.2, a bugfix release. This also fixes regression tests.

This commit is contained in:
marcm 2003-06-30 03:55:29 +00:00
parent f6c7377e68
commit 3c9efb47b5
10 changed files with 103 additions and 115 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2003/05/27 23:00:52 miod Exp $
# $OpenBSD: Makefile,v 1.9 2003/06/30 03:55:29 marcm Exp $
COMMENT= "general-purpose utility library"
COMMENT-docs= "glib2 documentation"
VERSION= 2.2.1
VERSION= 2.2.2
DISTNAME= glib-${VERSION}
PKGNAME= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@ -30,10 +30,7 @@ BUILD_DEPENDS= :pkgconfig->=0.14:devel/pkgconfig
.endif
# library versions (major:minor)
LIBGLIB_VERSION= 0:9
LIBGOBJECT_VERSION= 0:9
LIBGTHREAD_VERSION= 0:9
LIBGMODULE_VERSION= 0:9
OBSD_LIB_VERSION= 0:10
USE_GMAKE= Yes
SEPARATE_BUILD= simple
@ -42,11 +39,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
MAKE_ENV= LIBGLIB_VERSION="${LIBGLIB_VERSION}" \
LIBGOBJECT_VERSION="${LIBGOBJECT_VERSION}" \
LIBGTHREAD_VERSION="${LIBGTHREAD_VERSION}" \
LIBGMODULE_VERSION="${LIBGMODULE_VERSION}"
NO_REGRESS= Yes
MAKE_ENV= OBSD_LIB_VERSION="${OBSD_LIB_VERSION}"
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (glib-2.2.1.tar.bz2) = 42406a17819080326e105f8333963b97
RMD160 (glib-2.2.1.tar.bz2) = 6e6063fbf332740276f4a3d1090109903604bbc4
SHA1 (glib-2.2.1.tar.bz2) = b5f9e79d233eab2e83100abd6cc7d7aea642cd94
MD5 (glib-2.2.2.tar.bz2) = 3e9a9512943c81a78cafa0536dcc8b41
RMD160 (glib-2.2.2.tar.bz2) = bd621202b1b1d0edababdca1bc86a0b9d0af4ec2
SHA1 (glib-2.2.2.tar.bz2) = c1bdb94432caf858a99d2805f8e1f3b140b1acbe

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2003/04/17 05:55:42 marcm Exp $
--- configure.orig Tue Jan 28 14:00:25 2003
+++ configure Tue Feb 25 14:49:45 2003
@@ -5836,7 +5836,7 @@ _ACEOF
glib_save_prefix="$prefix"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
+ localedir=`eval echo "${datadir}/locale"`
else
localedir=`eval echo "${datadir}/locale"`
fi
@@ -8217,7 +8217,7 @@ else
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -8227,7 +8227,7 @@ else
;;
*)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi
@@ -8784,6 +8784,8 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case "$host_os" in
openbsd2.[89] | openbsd2.[89].*)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-glib_Makefile_in,v 1.2 2003/04/17 05:55:42 marcm Exp $
--- glib/Makefile.in.orig Tue Jan 28 14:20:30 2003
+++ glib/Makefile.in Tue Feb 25 07:46:00 2003
@@ -291,7 +291,7 @@ libglib_2_0_la_LIBADD = libcharset/libch
$OpenBSD: patch-glib_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- glib/Makefile.in.orig Sun Jun 8 09:42:56 2003
+++ glib/Makefile.in Thu Jun 19 08:15:48 2003
@@ -298,7 +298,7 @@ libglib_2_0_la_LIBADD = libcharset/libch
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(trio_libtrio_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
libglib_2_0_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGLIB_VERSION) \
+ -version-info $(OBSD_LIB_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gmodule_Makefile_in,v 1.2 2003/04/17 05:55:42 marcm Exp $
--- gmodule/Makefile.in.orig Tue Jan 28 14:20:34 2003
+++ gmodule/Makefile.in Tue Feb 25 07:46:00 2003
@@ -183,7 +183,7 @@ lib_LTLIBRARIES = libgmodule-2.0.la
$OpenBSD: patch-gmodule_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gmodule/Makefile.in.orig Sun Jun 8 09:42:59 2003
+++ gmodule/Makefile.in Thu Jun 19 08:15:48 2003
@@ -190,7 +190,7 @@ lib_LTLIBRARIES = libgmodule-2.0.la
libgmodule_2_0_la_SOURCES = gmodule.c
libgmodule_2_0_la_LDFLAGS = \
@G_MODULE_LDFLAGS@ \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGMODULE_VERSION) \
+ -version-info $(OBSD_LIB_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gobject_Makefile_in,v 1.2 2003/04/17 05:55:42 marcm Exp $
--- gobject/Makefile.in.orig Tue Jan 28 14:20:33 2003
+++ gobject/Makefile.in Tue Feb 25 07:46:00 2003
@@ -166,7 +166,7 @@ lib_LTLIBRARIES = libgobject-2.0.la
$OpenBSD: patch-gobject_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gobject/Makefile.in.orig Sun Jun 8 09:42:58 2003
+++ gobject/Makefile.in Thu Jun 19 08:15:48 2003
@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libgobject-2.0.la
# libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGOBJECT_VERSION) \
+ -version-info $(OBSD_LIB_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gthread_Makefile_in,v 1.2 2003/04/17 05:55:42 marcm Exp $
--- gthread/Makefile.in.orig Tue Jan 28 14:20:35 2003
+++ gthread/Makefile.in Tue Feb 25 07:46:00 2003
@@ -172,7 +172,7 @@ lib_LTLIBRARIES = libgthread-2.0.la
$OpenBSD: patch-gthread_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gthread/Makefile.in.orig Sun Jun 8 09:42:59 2003
+++ gthread/Makefile.in Thu Jun 19 08:15:48 2003
@@ -179,7 +179,7 @@ lib_LTLIBRARIES = libgthread-2.0.la
libgthread_2_0_la_SOURCES = gthread-impl.c
libgthread_2_0_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGTHREAD_VERSION) \
+ -version-info $(OBSD_LIB_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2003/04/17 05:55:42 marcm Exp $
--- ltmain.sh.orig Mon Feb 24 23:34:28 2003
+++ ltmain.sh Mon Feb 24 23:36:15 2003
@@ -1082,6 +1082,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.4 2003/06/30 03:55:29 marcm Exp $
--- ltmain.sh.orig Thu Apr 24 16:44:23 2003
+++ ltmain.sh Thu Jun 19 08:40:05 2003
@@ -1290,6 +1290,17 @@ EOF
continue
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/04/17 05:55:42 marcm Exp $
-module)
module=yes
continue
@@ -1522,6 +1533,20 @@ compiler."
@@ -1961,6 +1972,20 @@ EOF
fi
continue
;;
@ -40,56 +40,55 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/04/17 05:55:42 marcm Exp $
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1767,11 +1792,6 @@ compiler."
continue
fi
@@ -2209,10 +2234,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4575,40 +4595,6 @@ relink_command=\"$relink_command\""
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -5705,40 +5726,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- $echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2003/04/17 05:55:42 marcm Exp $
lib/libglib-2.0.so.0.9
lib/libgmodule-2.0.so.0.9
lib/libgobject-2.0.so.0.9
lib/libgthread-2.0.so.0.9
@comment $OpenBSD: PFRAG.shared,v 1.4 2003/06/30 03:55:29 marcm Exp $
lib/libglib-2.0.so.0.10
lib/libgmodule-2.0.so.0.10
lib/libgobject-2.0.so.0.10
lib/libgthread-2.0.so.0.10
DYNLIBDIR(%D/lib)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2003/04/17 05:55:42 marcm Exp $
@comment $OpenBSD: PLIST,v 1.5 2003/06/30 03:55:29 marcm Exp $
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@ -67,7 +67,7 @@ include/glib-2.0/gobject/gvalue.h
include/glib-2.0/gobject/gvaluearray.h
include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
@comment lib/charset.alias
lib/charset.alias
lib/glib-2.0/include/glibconfig.h
lib/libglib-2.0.a
lib/libglib-2.0.la
@ -93,18 +93,27 @@ share/locale/bg/LC_MESSAGES/glib20.mo
share/locale/bn/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/cs/LC_MESSAGES/glib20.mo
share/locale/cy/LC_MESSAGES/glib20.mo
share/locale/da/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/et/LC_MESSAGES/glib20.mo
share/locale/eu/LC_MESSAGES/glib20.mo
share/locale/fa/LC_MESSAGES/glib20.mo
share/locale/fi/LC_MESSAGES/glib20.mo
share/locale/fr/LC_MESSAGES/glib20.mo
share/locale/gl/LC_MESSAGES/glib20.mo
share/locale/he/LC_MESSAGES/glib20.mo
share/locale/hi/LC_MESSAGES/glib20.mo
share/locale/id/LC_MESSAGES/glib20.mo
share/locale/it/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/li/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
share/locale/mk/LC_MESSAGES/glib20.mo
share/locale/ml/LC_MESSAGES/glib20.mo
share/locale/mn/LC_MESSAGES/glib20.mo
share/locale/ms/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
@ -118,11 +127,14 @@ share/locale/ru/LC_MESSAGES/glib20.mo
share/locale/sk/LC_MESSAGES/glib20.mo
share/locale/sl/LC_MESSAGES/glib20.mo
share/locale/sq/LC_MESSAGES/glib20.mo
share/locale/sr/LC_MESSAGES/glib20.mo
share/locale/sr@Latn/LC_MESSAGES/glib20.mo
share/locale/sv/LC_MESSAGES/glib20.mo
share/locale/ta/LC_MESSAGES/glib20.mo
share/locale/tr/LC_MESSAGES/glib20.mo
share/locale/uk/LC_MESSAGES/glib20.mo
share/locale/vi/LC_MESSAGES/glib20.mo
share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
%%SHARED%%
@ -130,6 +142,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@comment @dirrm share/locale/zh_TW
@comment @dirrm share/locale/zh_CN/LC_MESSAGES
@comment @dirrm share/locale/zh_CN
@comment @dirrm share/locale/yi/LC_MESSAGES
@comment @dirrm share/locale/yi
@comment @dirrm share/locale/vi/LC_MESSAGES
@comment @dirrm share/locale/vi
@comment @dirrm share/locale/uk/LC_MESSAGES
@ -140,6 +154,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@comment @dirrm share/locale/ta
@comment @dirrm share/locale/sv/LC_MESSAGES
@comment @dirrm share/locale/sv
@comment @dirrm share/locale/sr@Latn/LC_MESSAGES
@comment @dirrm share/locale/sr@Latn
@comment @dirrm share/locale/sr/LC_MESSAGES
@comment @dirrm share/locale/sr
@comment @dirrm share/locale/sq/LC_MESSAGES
@comment @dirrm share/locale/sq
@comment @dirrm share/locale/sl/LC_MESSAGES
@ -166,18 +184,34 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@comment @dirrm share/locale/ms
@comment @dirrm share/locale/mn/LC_MESSAGES
@comment @dirrm share/locale/mn
@comment @dirrm share/locale/ml/LC_MESSAGES
@comment @dirrm share/locale/ml
@comment @dirrm share/locale/mk/LC_MESSAGES
@comment @dirrm share/locale/mk
@comment @dirrm share/locale/lv/LC_MESSAGES
@comment @dirrm share/locale/lv
@comment @dirrm share/locale/li/LC_MESSAGES
@comment @dirrm share/locale/li
@comment @dirrm share/locale/ko/LC_MESSAGES
@comment @dirrm share/locale/ko
@comment @dirrm share/locale/ja/LC_MESSAGES
@comment @dirrm share/locale/ja
@comment @dirrm share/locale/it/LC_MESSAGES
@comment @dirrm share/locale/it
@comment @dirrm share/locale/id/LC_MESSAGES
@comment @dirrm share/locale/id
@comment @dirrm share/locale/hi/LC_MESSAGES
@comment @dirrm share/locale/hi
@comment @dirrm share/locale/he/LC_MESSAGES
@comment @dirrm share/locale/he
@comment @dirrm share/locale/gl/LC_MESSAGES
@comment @dirrm share/locale/gl
@comment @dirrm share/locale/fr/LC_MESSAGES
@comment @dirrm share/locale/fr
@comment @dirrm share/locale/fi/LC_MESSAGES
@comment @dirrm share/locale/fi
@comment @dirrm share/locale/fa/LC_MESSAGES
@comment @dirrm share/locale/fa
@comment @dirrm share/locale/eu/LC_MESSAGES
@comment @dirrm share/locale/eu
@comment @dirrm share/locale/et/LC_MESSAGES
@ -190,6 +224,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@comment @dirrm share/locale/de
@comment @dirrm share/locale/da/LC_MESSAGES
@comment @dirrm share/locale/da
@comment @dirrm share/locale/cy/LC_MESSAGES
@comment @dirrm share/locale/cy
@comment @dirrm share/locale/cs/LC_MESSAGES
@comment @dirrm share/locale/cs
@comment @dirrm share/locale/ca/LC_MESSAGES