cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major upgrade to glib 2.18.2.

Browse Source 
It's the perfect timing to slap it in now during p2k8, and it paves the way
for the incoming gtk 2.14.4 upgrade.
Tested by bernd@ in a mulk muild.

ok ajacoutot@ bernd@ 'go ahead' jasper@
This commit is contained in:
landry 2008-10-27 21:28:01 +00:00
parent d46f1aa688
commit 786222a047
11 changed files with 83 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/glib2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.51 2008/09/27 17:58:25 brad Exp $
# $OpenBSD: Makefile,v 1.52 2008/10/27 21:28:01 landry Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.16.6
VERSION= 2.18.2
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@ -11,11 +11,11 @@ CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/
SHARED_LIBS+= glib-2.0 1600.2
SHARED_LIBS+= gobject-2.0 1600.2
SHARED_LIBS+= gmodule-2.0 1600.2
SHARED_LIBS+= gthread-2.0 1600.2
SHARED_LIBS+= gio-2.0 1600.2
SHARED_LIBS+= glib-2.0 1800.0 #.1800.2
SHARED_LIBS+= gobject-2.0 1800.0
SHARED_LIBS+= gmodule-2.0 1800.0
SHARED_LIBS+= gthread-2.0 1800.0
SHARED_LIBS+= gio-2.0 1800.0
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -23,7 +23,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.16/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.18/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.16.6.tar.bz2) = Zk5ZCTwxiWo6RrfNk/3T3Q==
RMD160 (glib-2.16.6.tar.bz2) = OrCgNTpNiQhBzBteZA6kHFjlem4=
SHA1 (glib-2.16.6.tar.bz2) = 1IHJqZ1f6J/4E32n/X1pD1pHl5U=
SHA256 (glib-2.16.6.tar.bz2) = w9j4MbjRJ5Bfjn8Gb/U5hmj6JvahgJRbMqVkHAPEKSU=
SIZE (glib-2.16.6.tar.bz2) = 4575345
MD5 (glib-2.18.2.tar.bz2) = 0RpcxeCM/1M0mjSBgW/a/w==
RMD160 (glib-2.18.2.tar.bz2) = Ut9WN13ZfAeDeuCF3ARc8p1vWaE=
SHA1 (glib-2.18.2.tar.bz2) = Tq9z/tpC6OzwBlT1bjj3/t1qkmY=
SHA256 (glib-2.18.2.tar.bz2) = lematPHMyavUhjauKu76EC2XSaX8jqY4bkRoOUL9czM=
SIZE (glib-2.18.2.tar.bz2) = 4760532

13
devel/glib2/patches/patch-docs_reference_glib_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.1 2008/10/27 21:28:01 landry Exp $
--- docs/reference/glib/Makefile.in.orig Sat Oct 18 17:32:18 2008
+++ docs/reference/glib/Makefile.in Sat Oct 18 17:33:31 2008
@@ -378,8 +378,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
########################################################################
man_MANS = \
glib-gettextize.1 \
- gtester.1 \
- gtester-report.1
+ gtester.1
BUILT_EXTRA_DIST = $(man_MANS)
all: all-am

12
devel/glib2/patches/patch-glib_Makefile_in
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-glib_Makefile_in,v 1.10 2008/07/08 08:38:26 brad Exp $
$OpenBSD: patch-glib_Makefile_in,v 1.11 2008/10/27 21:28:01 landry Exp $
Don't install gtester-report, it'll only pull in python.
--- glib/Makefile.in.orig Tue Jul 1 21:31:19 2008
+++ glib/Makefile.in Wed Jul 2 05:03:56 2008
@@ -596,7 +596,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2)
@OS_WIN32_TRUE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
--- glib/Makefile.in.orig Thu Oct 16 16:41:09 2008
+++ glib/Makefile.in Sat Oct 18 16:47:49 2008
@@ -616,7 +616,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
@OS_UNIX_TRUE@gtester_LDADD = libglib-2.0.la
-@OS_UNIX_TRUE@auto_config_binscripts = gtester-report
+@OS_UNIX_TRUE@auto_config_binscripts =
@OS_UNIX_TRUE@bin_SCRIPTS = ${auto_config_binscripts}

10
devel/glib2/patches/patch-glib_gmacros_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gmacros_h,v 1.8 2008/04/09 13:10:17 jasper Exp $
--- glib/gmacros.h.orig Mon Feb 11 18:14:22 2008
+++ glib/gmacros.h Fri Feb 22 11:40:05 2008
@@ -34,6 +34,7 @@
$OpenBSD: patch-glib_gmacros_h,v 1.9 2008/10/27 21:28:01 landry Exp $
--- glib/gmacros.h.orig Thu Oct 16 16:31:58 2008
+++ glib/gmacros.h Sat Oct 18 16:46:26 2008
@@ -38,6 +38,7 @@
/* We include stddef.h to get the system's definition of NULL
*/
#include <stddef.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-glib_gmacros_h,v 1.8 2008/04/09 13:10:17 jasper Exp $
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
@@ -171,11 +172,13 @@
@@ -183,11 +184,13 @@
#define TRUE (!FALSE)
#endif

10
devel/glib2/patches/patch-glib_gprintf_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gprintf_c,v 1.4 2007/10/24 22:29:03 jasper Exp $
--- glib/gprintf.c.orig Sun Sep 16 18:28:33 2007
+++ glib/gprintf.c Tue Oct 2 20:47:04 2007
@@ -87,6 +87,8 @@ g_fprintf (FILE *file,
$OpenBSD: patch-glib_gprintf_c,v 1.5 2008/10/27 21:28:01 landry Exp $
--- glib/gprintf.c.orig Thu Oct 16 16:31:58 2008
+++ glib/gprintf.c Sat Oct 18 16:46:26 2008
@@ -89,6 +89,8 @@ g_fprintf (FILE *file,
return retval;
}
@ -10,7 +10,7 @@ $OpenBSD: patch-glib_gprintf_c,v 1.4 2007/10/24 22:29:03 jasper Exp $
/**
* g_sprintf:
* @string: A pointer to a memory buffer to contain the resulting string. It
@@ -210,6 +212,8 @@ g_vfprintf (FILE *file,
@@ -212,6 +214,8 @@ g_vfprintf (FILE *file,
return _g_vfprintf (file, format, args);
}

10
devel/glib2/patches/patch-glib_gstrfuncs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gstrfuncs_c,v 1.7 2008/04/09 13:10:17 jasper Exp $
--- glib/gstrfuncs.c.orig Mon Feb 11 18:14:22 2008
+++ glib/gstrfuncs.c Fri Feb 22 11:40:05 2008
@@ -1311,7 +1311,7 @@ g_strerror (gint errnum)
$OpenBSD: patch-glib_gstrfuncs_c,v 1.8 2008/10/27 21:28:01 landry Exp $
--- glib/gstrfuncs.c.orig Thu Oct 16 16:31:58 2008
+++ glib/gstrfuncs.c Sat Oct 18 16:46:26 2008
@@ -1313,7 +1313,7 @@ g_strerror (gint errnum)
g_static_private_set (&msg_private, msg, g_free);
}
@ -10,7 +10,7 @@ $OpenBSD: patch-glib_gstrfuncs_c,v 1.7 2008/04/09 13:10:17 jasper Exp $
errno = saved_errno;
return msg;
@@ -1461,7 +1461,7 @@ extern const char *strsignal(int);
@@ -1463,7 +1463,7 @@ extern const char *strsignal(int);
g_static_private_set (&msg_private, msg, g_free);
}

8
devel/glib2/patches/patch-tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.8 2008/07/08 08:38:26 brad Exp $
--- tests/Makefile.in.orig Tue Jul 1 21:31:21 2008
+++ tests/Makefile.in Wed Jul 2 05:03:57 2008
@@ -718,7 +718,6 @@ test_programs = \
$OpenBSD: patch-tests_Makefile_in,v 1.9 2008/10/27 21:28:01 landry Exp $
--- tests/Makefile.in.orig Thu Oct 16 16:41:11 2008
+++ tests/Makefile.in Sat Oct 18 16:46:27 2008
@@ -672,7 +672,6 @@ test_programs = \
tree-test \
type-test \
unicode-caseconv \

8
devel/glib2/patches/patch-tests_refcount_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.8 2008/07/08 08:38:26 brad Exp $
--- tests/refcount/Makefile.in.orig Tue Jul 1 21:31:21 2008
+++ tests/refcount/Makefile.in Wed Jul 2 05:03:57 2008
@@ -345,7 +345,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.9 2008/10/27 21:28:01 landry Exp $
--- tests/refcount/Makefile.in.orig Thu Oct 16 16:41:11 2008
+++ tests/refcount/Makefile.in Sat Oct 18 16:46:27 2008
@@ -343,7 +343,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 = \

14
devel/glib2/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.14 2008/04/09 13:10:18 jasper Exp $
@comment $OpenBSD: PLIST-docs,v 1.15 2008/10/27 21:28:01 landry Exp $
@conflict glib2-<2.4.6
share/gtk-doc/
share/gtk-doc/html/
@ -11,6 +11,8 @@ share/gtk-doc/html/gio/GCancellable.html
share/gtk-doc/html/gio/GDataInputStream.html
share/gtk-doc/html/gio/GDataOutputStream.html
share/gtk-doc/html/gio/GDrive.html
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/GFileIcon.html
@ -47,6 +49,7 @@ 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/extending.html
share/gtk-doc/html/gio/extending-gio.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
@ -56,7 +59,6 @@ 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-Unix-Mounts.html
share/gtk-doc/html/gio/gio-extension-points.html
share/gtk-doc/html/gio/gio-hierarchy.html
share/gtk-doc/html/gio/gio.devhelp
share/gtk-doc/html/gio/gio.devhelp2
@ -66,6 +68,7 @@ share/gtk-doc/html/gio/icons.html
share/gtk-doc/html/gio/index.html
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/left.png
share/gtk-doc/html/gio/migrating.html
share/gtk-doc/html/gio/pt01.html
@ -159,6 +162,8 @@ share/gtk-doc/html/glib/glib-utilities.html
share/gtk-doc/html/glib/glib.devhelp
share/gtk-doc/html/glib/glib.devhelp2
share/gtk-doc/html/glib/glib.html
share/gtk-doc/html/glib/gtester-report.html
share/gtk-doc/html/glib/gtester.html
share/gtk-doc/html/glib/home.png
share/gtk-doc/html/glib/index.html
share/gtk-doc/html/glib/index.sgml
@ -172,6 +177,7 @@ share/gtk-doc/html/glib/ix07.html
share/gtk-doc/html/glib/ix08.html
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/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@ -183,8 +189,6 @@ share/gtk-doc/html/gobject/GTypeModule.html
share/gtk-doc/html/gobject/GTypePlugin.html
share/gtk-doc/html/gobject/ch01s02.html
share/gtk-doc/html/gobject/ch06s03.html
share/gtk-doc/html/gobject/ch07s02.html
share/gtk-doc/html/gobject/ch07s03.html
share/gtk-doc/html/gobject/chapter-gobject.html
share/gtk-doc/html/gobject/chapter-gtype.html
share/gtk-doc/html/gobject/chapter-intro.html
@ -234,6 +238,7 @@ share/gtk-doc/html/gobject/ix06.html
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/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html
@ -248,4 +253,5 @@ share/gtk-doc/html/gobject/tools-ginspector.html
share/gtk-doc/html/gobject/tools-gob.html
share/gtk-doc/html/gobject/tools-gtkdoc.html
share/gtk-doc/html/gobject/tools-refdb.html
share/gtk-doc/html/gobject/tools-vala.html
share/gtk-doc/html/gobject/up.png

24
devel/glib2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2008/07/08 08:38:26 brad Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2008/10/27 21:28:01 landry Exp $
@pkgpath devel/glib2
%%SHARED%%
@bin bin/glib-genmarshal
@ -23,6 +23,8 @@ include/glib-2.0/gio/gcontenttype.h
include/glib-2.0/gio/gdatainputstream.h
include/glib-2.0/gio/gdataoutputstream.h
include/glib-2.0/gio/gdrive.h
include/glib-2.0/gio/gemblem.h
include/glib-2.0/gio/gemblemedicon.h
include/glib-2.0/gio/gfile.h
include/glib-2.0/gio/gfileattribute.h
include/glib-2.0/gio/gfileenumerator.h
@ -37,10 +39,12 @@ include/glib-2.0/gio/gfilteroutputstream.h
include/glib-2.0/gio/gicon.h
include/glib-2.0/gio/ginputstream.h
include/glib-2.0/gio/gio.h
include/glib-2.0/gio/gioenums.h
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/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
include/glib-2.0/gio/gmemoryoutputstream.h
@ -136,6 +140,8 @@ 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/gio/
lib/gio/modules/
lib/glib-2.0/
lib/glib-2.0/include/
lib/glib-2.0/include/glibconfig.h
@ -149,6 +155,7 @@ lib/libgobject-2.0.a
lib/libgobject-2.0.la
lib/libgthread-2.0.a
lib/libgthread-2.0.la
lib/pkgconfig/
lib/pkgconfig/gio-2.0.pc
lib/pkgconfig/gio-unix-2.0.pc
lib/pkgconfig/glib-2.0.pc
@ -161,6 +168,7 @@ lib/pkgconfig/gthread-2.0.pc
@man man/man1/glib-gettextize.1
@man man/man1/glib-mkenums.1
@man man/man1/gobject-query.1
@man man/man1/gtester.1
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/glib-2.0/
@ -214,8 +222,6 @@ share/locale/en_GB/LC_MESSAGES/glib20.mo
share/locale/eo/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/et/LC_MESSAGES/glib20.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/glib20.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
@ -256,6 +262,9 @@ share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
share/locale/mai/
share/locale/mai/LC_MESSAGES/
share/locale/mai/LC_MESSAGES/glib20.mo
share/locale/mg/
share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/glib20.mo
@ -290,6 +299,9 @@ share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/glib20.mo
share/locale/pl/LC_MESSAGES/glib20.mo
share/locale/ps/
share/locale/ps/LC_MESSAGES/
share/locale/ps/LC_MESSAGES/glib20.mo
share/locale/pt/LC_MESSAGES/glib20.mo
share/locale/pt_BR/LC_MESSAGES/glib20.mo
share/locale/ro/LC_MESSAGES/glib20.mo
@ -306,12 +318,12 @@ share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/glib20.mo
share/locale/sr/LC_MESSAGES/glib20.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/glib20.mo
share/locale/sr@ije/
share/locale/sr@ije/LC_MESSAGES/
share/locale/sr@ije/LC_MESSAGES/glib20.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/glib20.mo
share/locale/sv/LC_MESSAGES/glib20.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/