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

update glib2 to 2.12.11

Browse Source 
based on diffs by alek@

ok'd by several, "go ahead" steven@
tested by many, thanks!
This commit is contained in:
jasper 2007-04-23 16:22:07 +00:00
parent 83535ac9f0
commit 78a5b821bf
12 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/glib2/Makefile
View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.29 2006/12/16 12:22:33 espie Exp $
# $OpenBSD: Makefile,v 1.30 2007/04/23 16:22:07 jasper Exp $
COMMENT-main= "general-purpose utility library"
COMMENT-docs= "glib2 documentation"
VERSION= 2.10.3
VERSION= 2.12.11
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}p0
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org
SHARED_LIBS += glib-2.0 1000.3 # .1000.3
SHARED_LIBS += gobject-2.0 1000.3 # .1000.3
SHARED_LIBS += gmodule-2.0 1000.3 # .1000.3
SHARED_LIBS += gthread-2.0 1000.3 # .1000.3
SHARED_LIBS += glib-2.0 1200.11 # .1200.11
SHARED_LIBS += gobject-2.0 1200.11 # .1200.11
SHARED_LIBS += gmodule-2.0 1200.11 # .1200.11
SHARED_LIBS += gthread-2.0 1200.11 # .1200.11
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.10/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.12/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs
@ -43,7 +43,6 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.10.3.tar.bz2) = hyBuchwS0YXRfdns1+MDaQ==
RMD160 (glib-2.10.3.tar.bz2) = 2lbiOPT26cbnwI1OU/dRKLUXgEc=
SHA1 (glib-2.10.3.tar.bz2) = u6HepzxEJvahMMguC3oHt438c84=
SHA256 (glib-2.10.3.tar.bz2) = HTcA41ynJAqc4ozyIkKWSOpQJx1iUk4AgZHM0Eo/j28=
SIZE (glib-2.10.3.tar.bz2) = 2774011
MD5 (glib-2.12.11.tar.bz2) = B3qZF7ZzqaC8Y/NReG3eJA==
RMD160 (glib-2.12.11.tar.bz2) = hoDSfmMGQ+ZlPYhTeQfQbjum6Ro=
SHA1 (glib-2.12.11.tar.bz2) = AtNEKV3a6v7sa8aCS3HhK78bA5Q=
SHA256 (glib-2.12.11.tar.bz2) = cGqp2hwJavjSez3bXaTjId1rEPiBiHY54oDk4QuBxLM=
SIZE (glib-2.12.11.tar.bz2) = 2925342

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

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gbacktrace_c,v 1.3 2005/11/13 06:22:03 marcm Exp $
--- glib/gbacktrace.c.orig Thu Aug 18 06:08:18 2005
+++ glib/gbacktrace.c Tue Aug 23 21:22:07 2005
@@ -169,7 +169,7 @@ g_on_error_stack_trace (const gchar *prg
$OpenBSD: patch-glib_gbacktrace_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
--- glib/gbacktrace.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gbacktrace.c Fri Apr 20 19:02:41 2007
@@ -169,7 +169,7 @@ g_on_error_stack_trace (const gchar *prg_name)
if (!prg_name)
return;

18
devel/glib2/patches/patch-glib_gconvert_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-glib_gconvert_c,v 1.3 2005/11/13 06:22:03 marcm Exp $
--- glib/gconvert.c.orig Mon Aug 8 12:50:38 2005
+++ glib/gconvert.c Tue Aug 23 21:22:07 2005
@@ -341,10 +341,12 @@ open_converter (const gchar *to_codeset,
struct _iconv_cache_bucket *bucket;
gchar *key;
GIConv cd;
+ size_t l;
+ l = strlen (from_codeset) + strlen (to_codeset) + 2;
/* create our key */
- key = g_alloca (strlen (from_codeset) + strlen (to_codeset) + 2);
- _g_sprintf (key, "%s:%s", from_codeset, to_codeset);
+ key = g_alloca (l);
+ _g_snprintf (key, l, "%s:%s", from_codeset, to_codeset);
G_LOCK (iconv_cache_lock);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gprintf_c,v 1.2 2005/05/24 21:26:17 marcm Exp $
--- glib/gprintf.c.orig Sun Mar 13 20:02:07 2005
+++ glib/gprintf.c Sat Apr 16 19:13:32 2005
@@ -89,6 +89,8 @@ g_fprintf (FILE *file,
$OpenBSD: patch-glib_gprintf_c,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- glib/gprintf.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gprintf.c Fri Apr 20 19:02:41 2007
@@ -87,6 +87,8 @@ g_fprintf (FILE *file,
return retval;
}
@ -10,7 +10,7 @@ $OpenBSD: patch-glib_gprintf_c,v 1.2 2005/05/24 21:26:17 marcm Exp $
/**
* g_sprintf:
* @string: the buffer to hold the output.
@@ -210,6 +212,8 @@ g_vfprintf (FILE *file,
@@ -208,6 +210,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.3 2005/11/13 06:22:03 marcm Exp $
--- glib/gstrfuncs.c.orig Mon Sep 26 07:47:16 2005
+++ glib/gstrfuncs.c Sun Oct 2 07:38:59 2005
@@ -1209,7 +1209,7 @@ g_strerror (gint errnum)
$OpenBSD: patch-glib_gstrfuncs_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
--- glib/gstrfuncs.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gstrfuncs.c Fri Apr 20 19:02:41 2007
@@ -1280,7 +1280,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.3 2005/11/13 06:22:03 marcm Exp $
errno = saved_errno;
return msg;
@@ -1359,7 +1359,7 @@ extern const char *strsignal(int);
@@ -1430,7 +1430,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.2 2006/05/22 01:39:36 brad Exp $
--- tests/Makefile.in.orig Fri Apr 7 08:35:32 2006
+++ tests/Makefile.in Fri Apr 28 23:41:43 2006
@@ -329,7 +329,6 @@ test_programs = \
$OpenBSD: patch-tests_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- tests/Makefile.in.orig Fri Mar 9 05:04:20 2007
+++ tests/Makefile.in Fri Apr 20 19:02:41 2007
@@ -335,7 +335,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.2 2006/05/22 01:39:36 brad Exp $
--- tests/refcount/Makefile.in.orig Fri Apr 7 08:35:32 2006
+++ tests/refcount/Makefile.in Fri Apr 28 23:41:43 2006
@@ -250,7 +250,6 @@ libgobject = $(top_builddir)/gobject/lib
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- tests/refcount/Makefile.in.orig Fri Mar 9 05:04:20 2007
+++ tests/refcount/Makefile.in Fri Apr 20 19:02:41 2007
@@ -251,7 +251,6 @@ libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \

10
devel/glib2/patches/patch-tests_strtod-test_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_strtod-test_c,v 1.1 2005/11/13 06:22:03 marcm Exp $
--- tests/strtod-test.c.orig Mon Oct 31 21:27:53 2005
+++ tests/strtod-test.c Mon Oct 31 21:28:22 2005
@@ -71,14 +71,12 @@ main ()
$OpenBSD: patch-tests_strtod-test_c,v 1.2 2007/04/23 16:22:07 jasper Exp $
--- tests/strtod-test.c.orig Fri Mar 9 05:01:32 2007
+++ tests/strtod-test.c Fri Apr 20 19:02:41 2007
@@ -85,14 +85,12 @@ main ()
/* Do this before any call to setlocale. */
our_nan = atof ("NaN");
#endif
@ -16,7 +16,7 @@ $OpenBSD: patch-tests_strtod-test_c,v 1.1 2005/11/13 06:22:03 marcm Exp $
test_string ("123.123", 123.123, FALSE, 0);
test_string ("123.123e2", 123.123e2, FALSE, 0);
@@ -91,10 +89,6 @@ main ()
@@ -105,10 +103,6 @@ main ()
test_string ("5,4", 5.0, TRUE, 1);
/* the following are for #156421 */
test_string ("1e1", 1e1, FALSE, 0);

2
devel/glib2/pkg/DESCR-docs
View File

@ -1 +1 @@
Documentation for the glib2 library in HTML format.
Documentation for the glib2 library in HTML format.

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

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-docs,v 1.11 2006/05/22 01:39:36 brad Exp $
@comment $OpenBSD: PLIST-docs,v 1.12 2007/04/23 16:22:07 jasper Exp $
@conflict glib2-<2.4.6
share/aclocal/
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/glib/
@ -9,7 +10,9 @@ share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
share/gtk-doc/html/glib/glib-Atomic-Operations.html
share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
share/gtk-doc/html/glib/glib-Base64-Encoding.html
share/gtk-doc/html/glib/glib-Basic-Types.html
share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
share/gtk-doc/html/glib/glib-Byte-Arrays.html
share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
share/gtk-doc/html/glib/glib-Caches.html
@ -86,6 +89,7 @@ share/gtk-doc/html/glib/ix04.html
share/gtk-doc/html/glib/ix05.html
share/gtk-doc/html/glib/ix06.html
share/gtk-doc/html/glib/ix07.html
share/gtk-doc/html/glib/ix08.html
share/gtk-doc/html/glib/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@ -146,6 +150,7 @@ share/gtk-doc/html/gobject/ix04.html
share/gtk-doc/html/gobject/ix05.html
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/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 16:50:10 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/04/23 16:22:07 jasper Exp $
@pkgpath devel/glib2
bin/glib-genmarshal
bin/glib-gettextize
@ -13,6 +13,8 @@ include/glib-2.0/glib/garray.h
include/glib-2.0/glib/gasyncqueue.h
include/glib-2.0/glib/gatomic.h
include/glib-2.0/glib/gbacktrace.h
include/glib-2.0/glib/gbase64.h
include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
@ -119,10 +121,16 @@ share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/glib20.mo
share/locale/bg/LC_MESSAGES/glib20.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/glib20.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/glib20.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/glib20.mo
@ -165,6 +173,9 @@ share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/glib20.mo
share/locale/hr/LC_MESSAGES/glib20.mo
share/locale/hu/LC_MESSAGES/glib20.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/glib20.mo
share/locale/id/LC_MESSAGES/glib20.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
@ -200,7 +211,6 @@ share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
share/locale/no/LC_MESSAGES/glib20.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/glib20.mo