Update to version 2.22.1.

committing early so that we can work with the latest at upcoming p2k9.
any fallout, please let me know directly.
ok landry@
This commit is contained in:
ajacoutot 2009-10-04 18:17:13 +00:00
parent 7381c0fa69
commit 394379e18e
9 changed files with 120 additions and 40 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.63 2009/08/29 10:20:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.64 2009/10/04 18:17:13 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
COMMENT-fam= fam(3) gio module
VERSION= 2.20.5
VERSION= 2.22.1
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@ -14,11 +14,13 @@ CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/
SHARED_LIBS+= glib-2.0 1801.0 # .2000.2
SHARED_LIBS+= gobject-2.0 1801.0 # .2000.2
SHARED_LIBS+= gmodule-2.0 1801.0 # .2000.2
SHARED_LIBS+= gthread-2.0 1801.0 # .2000.2
SHARED_LIBS+= gio-2.0 1801.0 # .2000.2
# glib-2.0 and gobject-2.0 need to be in sync as glib-2.0 version is
# used to install *-gdb.py files
SHARED_LIBS+= glib-2.0 1802.0 # .2200.1
SHARED_LIBS+= gobject-2.0 1802.0 # .2200.1
SHARED_LIBS+= gmodule-2.0 1802.0 # .2200.1
SHARED_LIBS+= gthread-2.0 1802.0 # .2200.1
SHARED_LIBS+= gio-2.0 1802.0 # .2200.1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -73,5 +75,8 @@ pre-configure:
-e "s,/usr/share,${LOCALBASE}/share,g;" \
-e "s,/etc/xdg,${SYSCONFDIR}/xdg,g" \
${WRKSRC}/glib/gutils.c ${WRKSRC}/gio/xdgmime/xdgmime.c
perl -pi -e 's,!!LIBglib-2.0_VERSION_R!!,${LIBglib-2.0_VERSION:R},g;' \
-e 's,!!LIBglib-2.0_VERSION_E!!,${LIBglib-2.0_VERSION:E},g' \
${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (glib-2.20.5.tar.bz2) = TBeLkdgu+Aoto8JrdyVpwA==
RMD160 (glib-2.20.5.tar.bz2) = xxzKrwoZbiHhRAQewyhtsYoDqWA=
SHA1 (glib-2.20.5.tar.bz2) = GeKyaE17w1pz/5Trf9FfxwzG8pI=
SHA256 (glib-2.20.5.tar.bz2) = iPCSdp31zp94TBBoowVe3gCtpQMxdlOYQQHVOT3mNlU=
SIZE (glib-2.20.5.tar.bz2) = 5037738
MD5 (glib-2.22.1.tar.bz2) = Eil6faV3MhZHs4reBZPLPA==
RMD160 (glib-2.22.1.tar.bz2) = yElasFJFYOIW2ZXxzMiHxUlNmUs=
SHA1 (glib-2.22.1.tar.bz2) = LNSH8+u/qzOoFvOCwdDp3t0cAt8=
SHA256 (glib-2.22.1.tar.bz2) = SJjTQMgwpZAxFUEuxblesDtBDv37HFMW028S+L6FV30=
SIZE (glib-2.22.1.tar.bz2) = 5476114

View File

@ -1,7 +1,20 @@
$OpenBSD: patch-configure,v 1.14 2009/07/12 20:38:09 ajacoutot Exp $
--- configure.orig Sat Jun 27 06:21:02 2009
+++ configure Wed Jul 1 12:54:41 2009
@@ -35637,7 +35637,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
$OpenBSD: patch-configure,v 1.15 2009/10/04 18:17:13 ajacoutot Exp $
--- configure.orig Wed Sep 30 03:19:04 2009
+++ configure Fri Oct 2 09:09:31 2009
@@ -2822,9 +2822,9 @@ _ACEOF
# libtool versioning
LT_RELEASE=2.22
-LT_CURRENT=2200
-LT_REVISION=1
-LT_AGE=2200
+LT_CURRENT=!!LIBglib-2.0_VERSION_R!!
+LT_REVISION=!!LIBglib-2.0_VERSION_E!!
+LT_AGE=!!LIBglib-2.0_VERSION_R!!
LT_CURRENT_MINUS_AGE=0
@@ -38669,7 +38669,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -10,7 +23,7 @@ $OpenBSD: patch-configure,v 1.14 2009/07/12 20:38:09 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -35854,7 +35854,7 @@ if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then
@@ -38886,7 +38886,7 @@ if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,7 +32,7 @@ $OpenBSD: patch-configure,v 1.14 2009/07/12 20:38:09 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -35921,7 +35921,7 @@ _ACEOF
@@ -38953,7 +38953,7 @@ _ACEOF
fi

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.3 2009/07/12 20:38:09 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Sat Jun 27 06:20:57 2009
+++ docs/reference/glib/Makefile.in Wed Jul 1 12:54:00 2009
@@ -408,8 +408,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.4 2009/10/04 18:17:13 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Wed Sep 30 03:18:59 2009
+++ docs/reference/glib/Makefile.in Thu Oct 1 14:41:23 2009
@@ -418,8 +418,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
########################################################################
man_MANS = \
glib-gettextize.1 \

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-glib_Makefile_in,v 1.13 2009/07/12 20:38:09 ajacoutot Exp $
$OpenBSD: patch-glib_Makefile_in,v 1.14 2009/10/04 18:17:13 ajacoutot Exp $
Don't install gtester-report, it'll only pull in python.
--- glib/Makefile.in.orig Sat Jun 27 06:20:58 2009
+++ glib/Makefile.in Wed Jul 1 12:54:00 2009
@@ -666,7 +666,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
--- glib/Makefile.in.orig Wed Sep 30 03:19:01 2009
+++ glib/Makefile.in Thu Oct 1 14:41:23 2009
@@ -691,7 +691,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
@OS_WIN32_TRUE@@OS_WIN32_X64_FALSE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
@OS_UNIX_TRUE@gtester_SOURCES = gtester.c
@OS_UNIX_TRUE@gtester_LDADD = libglib-2.0.la

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.11 2009/07/12 20:38:09 ajacoutot Exp $
--- tests/Makefile.in.orig Sat Jun 27 06:20:59 2009
+++ tests/Makefile.in Wed Jul 1 12:54:00 2009
@@ -702,7 +702,6 @@ test_programs = \
$OpenBSD: patch-tests_Makefile_in,v 1.12 2009/10/04 18:17:13 ajacoutot Exp $
--- tests/Makefile.in.orig Wed Sep 30 03:19:02 2009
+++ tests/Makefile.in Thu Oct 1 14:41:23 2009
@@ -729,7 +729,6 @@ test_programs = \
tree-test \
type-test \
unicode-caseconv \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.11 2009/07/12 20:38:09 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Sat Jun 27 06:21:00 2009
+++ tests/refcount/Makefile.in Wed Jul 1 12:54:00 2009
@@ -353,7 +353,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.12 2009/10/04 18:17:13 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Wed Sep 30 03:19:02 2009
+++ tests/refcount/Makefile.in Thu Oct 1 14:41:24 2009
@@ -373,7 +373,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \

View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST-docs,v 1.17 2009/07/12 20:38:09 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.18 2009/10/04 18:17:13 ajacoutot Exp $
@conflict glib2-<2.4.6
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gio/
share/gtk-doc/html/gio/GAppInfo.html
share/gtk-doc/html/gio/GAsyncInitable.html
share/gtk-doc/html/gio/GAsyncResult.html
share/gtk-doc/html/gio/GBufferedInputStream.html
share/gtk-doc/html/gio/GBufferedOutputStream.html
@ -15,6 +16,7 @@ share/gtk-doc/html/gio/GEmblem.html
share/gtk-doc/html/gio/GEmblemedIcon.html
share/gtk-doc/html/gio/GFile.html
share/gtk-doc/html/gio/GFileEnumerator.html
share/gtk-doc/html/gio/GFileIOStream.html
share/gtk-doc/html/gio/GFileIcon.html
share/gtk-doc/html/gio/GFileInfo.html
share/gtk-doc/html/gio/GFileInputStream.html
@ -24,19 +26,37 @@ share/gtk-doc/html/gio/GFilenameCompleter.html
share/gtk-doc/html/gio/GFilterInputStream.html
share/gtk-doc/html/gio/GFilterOutputStream.html
share/gtk-doc/html/gio/GIOModule.html
share/gtk-doc/html/gio/GIOStream.html
share/gtk-doc/html/gio/GIcon.html
share/gtk-doc/html/gio/GInetAddress.html
share/gtk-doc/html/gio/GInetSocketAddress.html
share/gtk-doc/html/gio/GInitable.html
share/gtk-doc/html/gio/GInputStream.html
share/gtk-doc/html/gio/GLoadableIcon.html
share/gtk-doc/html/gio/GMemoryInputStream.html
share/gtk-doc/html/gio/GMemoryOutputStream.html
share/gtk-doc/html/gio/GMount.html
share/gtk-doc/html/gio/GMountOperation.html
share/gtk-doc/html/gio/GNetworkAddress.html
share/gtk-doc/html/gio/GNetworkService.html
share/gtk-doc/html/gio/GOutputStream.html
share/gtk-doc/html/gio/GResolver.html
share/gtk-doc/html/gio/GSeekable.html
share/gtk-doc/html/gio/GSimpleAsyncResult.html
share/gtk-doc/html/gio/GSocket.html
share/gtk-doc/html/gio/GSocketAddress.html
share/gtk-doc/html/gio/GSocketClient.html
share/gtk-doc/html/gio/GSocketConnectable.html
share/gtk-doc/html/gio/GSocketConnection.html
share/gtk-doc/html/gio/GSocketControlMessage.html
share/gtk-doc/html/gio/GSocketListener.html
share/gtk-doc/html/gio/GSocketService.html
share/gtk-doc/html/gio/GThemedIcon.html
share/gtk-doc/html/gio/GThreadedSocketService.html
share/gtk-doc/html/gio/GUnixFDMessage.html
share/gtk-doc/html/gio/GUnixInputStream.html
share/gtk-doc/html/gio/GUnixOutputStream.html
share/gtk-doc/html/gio/GUnixSocketAddress.html
share/gtk-doc/html/gio/GVfs.html
share/gtk-doc/html/gio/GVolume.html
share/gtk-doc/html/gio/GVolumeMonitor.html
@ -44,12 +64,13 @@ share/gtk-doc/html/gio/async.html
share/gtk-doc/html/gio/ch01.html
share/gtk-doc/html/gio/ch02.html
share/gtk-doc/html/gio/ch03.html
share/gtk-doc/html/gio/ch14.html
share/gtk-doc/html/gio/ch15.html
share/gtk-doc/html/gio/ch15s02.html
share/gtk-doc/html/gio/ch15s03.html
share/gtk-doc/html/gio/ch18.html
share/gtk-doc/html/gio/ch19.html
share/gtk-doc/html/gio/ch19s02.html
share/gtk-doc/html/gio/ch19s03.html
share/gtk-doc/html/gio/extending-gio.html
share/gtk-doc/html/gio/extending.html
share/gtk-doc/html/gio/failable_initialization.html
share/gtk-doc/html/gio/file_mon.html
share/gtk-doc/html/gio/file_ops.html
share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
@ -58,11 +79,13 @@ share/gtk-doc/html/gio/gio-GContentType.html
share/gtk-doc/html/gio/gio-GFileAttribute.html
share/gtk-doc/html/gio/gio-GIOError.html
share/gtk-doc/html/gio/gio-GIOScheduler.html
share/gtk-doc/html/gio/gio-GSrvTarget.html
share/gtk-doc/html/gio/gio-Unix-Mounts.html
share/gtk-doc/html/gio/gio-hierarchy.html
share/gtk-doc/html/gio/gio.devhelp
share/gtk-doc/html/gio/gio.devhelp2
share/gtk-doc/html/gio/gvfs-overview.png
share/gtk-doc/html/gio/highlevel-socket.html
share/gtk-doc/html/gio/home.png
share/gtk-doc/html/gio/icons.html
share/gtk-doc/html/gio/index.html
@ -70,10 +93,14 @@ share/gtk-doc/html/gio/index.sgml
share/gtk-doc/html/gio/ix01.html
share/gtk-doc/html/gio/ix02.html
share/gtk-doc/html/gio/ix03.html
share/gtk-doc/html/gio/ix04.html
share/gtk-doc/html/gio/ix05.html
share/gtk-doc/html/gio/left.png
share/gtk-doc/html/gio/migrating.html
share/gtk-doc/html/gio/networking.html
share/gtk-doc/html/gio/pt01.html
share/gtk-doc/html/gio/pt02.html
share/gtk-doc/html/gio/resolver.html
share/gtk-doc/html/gio/right.png
share/gtk-doc/html/gio/streaming.html
share/gtk-doc/html/gio/style.css
@ -107,6 +134,7 @@ share/gtk-doc/html/glib/glib-File-Utilities.html
share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
share/gtk-doc/html/glib/glib-Hash-Tables.html
share/gtk-doc/html/glib/glib-Hook-Functions.html
share/gtk-doc/html/glib/glib-Hostname-Utilities.html
share/gtk-doc/html/glib/glib-I18N.html
share/gtk-doc/html/glib/glib-IO-Channels.html
share/gtk-doc/html/glib/glib-Key-value-file-parser.html
@ -180,6 +208,7 @@ share/gtk-doc/html/glib/ix09.html
share/gtk-doc/html/glib/ix10.html
share/gtk-doc/html/glib/ix11.html
share/gtk-doc/html/glib/ix12.html
share/gtk-doc/html/glib/ix13.html
share/gtk-doc/html/glib/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@ -241,6 +270,7 @@ share/gtk-doc/html/gobject/ix07.html
share/gtk-doc/html/gobject/ix08.html
share/gtk-doc/html/gobject/ix09.html
share/gtk-doc/html/gobject/ix10.html
share/gtk-doc/html/gobject/ix11.html
share/gtk-doc/html/gobject/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2009/07/12 20:38:09 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2009/10/04 18:17:13 ajacoutot Exp $
@pkgpath devel/glib2
%%SHARED%%
@bin bin/glib-genmarshal
@ -9,12 +9,16 @@ bin/glib-mkenums
include/gio-unix-2.0/
include/gio-unix-2.0/gio/
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gunixconnection.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
include/gio-unix-2.0/gio/gunixoutputstream.h
include/gio-unix-2.0/gio/gunixsocketaddress.h
include/glib-2.0/
include/glib-2.0/gio/
include/glib-2.0/gio/gappinfo.h
include/glib-2.0/gio/gasyncinitable.h
include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
@ -31,12 +35,16 @@ include/glib-2.0/gio/gfileenumerator.h
include/glib-2.0/gio/gfileicon.h
include/glib-2.0/gio/gfileinfo.h
include/glib-2.0/gio/gfileinputstream.h
include/glib-2.0/gio/gfileiostream.h
include/glib-2.0/gio/gfilemonitor.h
include/glib-2.0/gio/gfilenamecompleter.h
include/glib-2.0/gio/gfileoutputstream.h
include/glib-2.0/gio/gfilterinputstream.h
include/glib-2.0/gio/gfilteroutputstream.h
include/glib-2.0/gio/gicon.h
include/glib-2.0/gio/ginetaddress.h
include/glib-2.0/gio/ginetsocketaddress.h
include/glib-2.0/gio/ginitable.h
include/glib-2.0/gio/ginputstream.h
include/glib-2.0/gio/gio.h
include/glib-2.0/gio/gioenums.h
@ -44,6 +52,7 @@ include/glib-2.0/gio/gioenumtypes.h
include/glib-2.0/gio/gioerror.h
include/glib-2.0/gio/giomodule.h
include/glib-2.0/gio/gioscheduler.h
include/glib-2.0/gio/giostream.h
include/glib-2.0/gio/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
@ -51,10 +60,25 @@ include/glib-2.0/gio/gmemoryoutputstream.h
include/glib-2.0/gio/gmount.h
include/glib-2.0/gio/gmountoperation.h
include/glib-2.0/gio/gnativevolumemonitor.h
include/glib-2.0/gio/gnetworkaddress.h
include/glib-2.0/gio/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
include/glib-2.0/gio/gresolver.h
include/glib-2.0/gio/gseekable.h
include/glib-2.0/gio/gsimpleasyncresult.h
include/glib-2.0/gio/gsocket.h
include/glib-2.0/gio/gsocketaddress.h
include/glib-2.0/gio/gsocketaddressenumerator.h
include/glib-2.0/gio/gsocketclient.h
include/glib-2.0/gio/gsocketconnectable.h
include/glib-2.0/gio/gsocketconnection.h
include/glib-2.0/gio/gsocketcontrolmessage.h
include/glib-2.0/gio/gsocketlistener.h
include/glib-2.0/gio/gsocketservice.h
include/glib-2.0/gio/gsrvtarget.h
include/glib-2.0/gio/gtcpconnection.h
include/glib-2.0/gio/gthemedicon.h
include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
@ -79,6 +103,7 @@ include/glib-2.0/glib/gerror.h
include/glib-2.0/glib/gfileutils.h
include/glib-2.0/glib/ghash.h
include/glib-2.0/glib/ghook.h
include/glib-2.0/glib/ghostutils.h
include/glib-2.0/glib/gi18n-lib.h
include/glib-2.0/glib/gi18n.h
include/glib-2.0/glib/giochannel.h
@ -172,7 +197,14 @@ lib/pkgconfig/gthread-2.0.pc
@man man/man1/gtester.1
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.1802.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.1802.0-gdb.py
share/glib-2.0/
share/glib-2.0/gdb/
share/glib-2.0/gdb/glib.py
share/glib-2.0/gdb/gobject.py
share/glib-2.0/gettext/
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/