diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 9 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch | 20 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff | 75 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch | 11 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib2-CVE-2008-4316.patch | 62 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.18.4-r1.ebuild | 92 |
8 files changed, 9 insertions, 307 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index e3ff2d74..bb69af69 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> + -files/glib-2.10.3-ia64-atomic-ops.patch, + -files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch, + -files/glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff, + -files/glib-2.6.3-testglib-ssp.patch, -files/glib2-CVE-2008-4316.patch, + -glib-2.18.4-r1.ebuild: + dev-libs/glib: remove old release, patch applied upstream, #268647 + *glib-2.34.3 (03 Jun 2013) 03 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index f96358ea..ab920e93 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,18 +1,11 @@ -AUX glib-2.10.3-ia64-atomic-ops.patch 1058 SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8 WHIRLPOOL 85a63bdc7876e1fb3988f72487cfb1033007541b8a2eba153069db6649d1323d227de9ce697cb7a265aa2afbf02b3a9e02541cac85bf996ebd653463b559fccd AUX glib-2.12.12-fbsd.patch 668 SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d WHIRLPOOL 1a90159aa6ac5f5f5dcb4f7225343af88d43540b802f2588279c60d5f27f51e5411ad29441ad10ad5adb947cf7d73016e93fb02d64203375f851758e680690ab -AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb WHIRLPOOL 1707097837ccf374654bf40f7142adbfbbd27330cbf4405cbb5250a197da09641c2a5f1c5e468480a869cf8c6bc2162e09700b1e68d87e63710d20dcc2d3c5b6 -AUX glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff 4101 SHA256 360e5fa05eabb6c74b2f671f3a079a41d25dfc3e158252ae57c3356bef8ab504 WHIRLPOOL 4f5e0ea1dc10c703d68d72e49dd9e9884fa26b6c78d1ab1954de4c6824fc1736b95878b00f2f8761a27e61d5f738686d9217dcae3183e88ec06764ff7ce6b225 AUX glib-2.31.x-external-gdbus-codegen.patch 3504 SHA256 47a0f2f2a99a50042063952994c8538097dee14ea5b2ca39f1c168092c645c6e WHIRLPOOL c64cdb643d36df9b20f386aee75f285f3cf17366f2ec3a93370e365a54d72454085cbd3b043ca4fd919115575d46c07a5bf972dee4981aab736bc9da0ca41203 AUX glib-2.32.4-bashcomp.patch 843 SHA256 262a3689dc030712eea1349ee96cbf21123b0329c78629e2e80cd9917ac415fb WHIRLPOOL 87d57428ef8626ab9f207e6a7df896748912c717fdc8aef3ebf1de73b72899fd5adfd97800ec4ce2fd38528f16267778a26492f79a85dd42f99734e1fa299ffb AUX glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch 1784 SHA256 00ff3dd00872158eaf5a9e622d0877b8003c16880af07ceb9fed4d4bdfba69a1 WHIRLPOOL 211ad59497093b34c313f22884b0a29a7a9973167e6a56f4737962d590b30ae7fd2dd9b1d9843c6d247cba8ee0d866cb1981a30c363aa19c711d32145a15e345 AUX glib-2.34.0-testsuite-skip-thread4.patch 1312 SHA256 65ed09251a66b096df38431fde13335038e26c4fa973534af68948757801a3a5 WHIRLPOOL 8da1696ce6fd7fac83bef9563baf71e2b67b3e194ab3e631d238dc6e0a2d5493dc7a7f3af61bfa64a2023b0554ecaf3c523e7d9edea30e22f3615186e63f14cc AUX glib-2.34.3-automake-1.13.patch 645 SHA256 a8f4bd4bfa03e2d4014af5e3ce899188bd935bfb4917444c2b09f1a493ebfacb WHIRLPOOL 585cd5ee5cb1a52f62a4db7056f7fe3d6c3886e77870637f25ef52386330e544cf8590a05a72d095cca9ed0bf1bae86e1fae99c886039736b4ba7b06dff15429 -AUX glib-2.6.3-testglib-ssp.patch 344 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8 WHIRLPOOL f0bfe963ff947a1764a6f9837301d5ef0278a75682ed2b8a5e79e89781c4965b2b50b9749150b8e123bf6ad3afcee7a6695a48674c35bc06a5502973b7e620fb -AUX glib2-CVE-2008-4316.patch 2692 SHA256 c249ef6513c2490e9efe836e9d41a4a5f1056979748e2535b8ec7d13a71b1bf0 WHIRLPOOL 1f2749c086ae408d193d4d99ffcfd23cba1a043a5271e29f5b519fe9e1b210a8e8ec57229ce66f58a55130561762395b7a0095c15bb6d963e04beef050044ab0 -DIST glib-2.18.4.tar.bz2 4809051 SHA256 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7 -EBUILD glib-2.18.4-r1.ebuild 2608 SHA256 9bd91324b9c343233e87a95b338b08afc50093a061a96e458dc2ce605f69d235 WHIRLPOOL 5d367f6923df123a2fea7caa6945d589011fd9b7c9ee610cfbe8875b16b038e1dc6eff512f42d616b57aaf5b89c14f2bb253689422cc03509cb216d9ae9e8f44 EBUILD glib-2.34.3.ebuild 8666 SHA256 80c19f11dc7f2a0d3f6d1148dd332d70f6a4ffa70d529ca89ad7040c40dbab0f WHIRLPOOL dbefea7e43dca7a69599108ce2a731c6b409eb00b45756d3a51a67415cc89435d1f9617277725d3a2391b4a3dd8d3762ac3cf27f7c18c274bb6f58fb944d73f1 -MISC ChangeLog 1440 SHA256 cf733fa0cc5c98d838e5ad43c8072b14e28a03a8f353568346dd13b6bd605d66 WHIRLPOOL 3b5b202f050449447bf109b4f9e1777f031dcff7e29e832d32f750c0fe353f81fa152c0cb407d8de6b8fd9900af63025eeb9d015cb78130b22ea7b61a21f8cdf +MISC ChangeLog 1838 SHA256 aad9b8fd17df781db671ffd9ef09fcee7fff6ef57a21ff370caa3adb7d65ec0f WHIRLPOOL 12ee92a7401be17f664e2c96a4d2abc2550c0f436740e0d5324880a582de1c1f38bf01e7a9056abbccf9d9920cc8f71b105a19d6a0e2399e0586576f134a46c9 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4 diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch deleted file mode 100644 index 0859e331..00000000 --- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch +++ /dev/null @@ -1,39 +0,0 @@ -From Debian, this one is needed for gcc < 4.1... - ---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000 -+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000 -@@ -414,14 +414,14 @@ - g_atomic_int_exchange_and_add (volatile gint *atomic, - gint val) - { -- return __sync_fetch_and_add (atomic, val); -+ return __sync_fetch_and_add_si (atomic, val); - } - - void - g_atomic_int_add (volatile gint *atomic, - gint val) - { -- __sync_fetch_and_add (atomic, val); -+ __sync_fetch_and_add_si (atomic, val); - } - - gboolean -@@ -429,7 +429,7 @@ - gint oldval, - gint newval) - { -- return __sync_bool_compare_and_swap (atomic, oldval, newval); -+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); - } - - gboolean -@@ -437,7 +437,7 @@ - gpointer oldval, - gpointer newval) - { -- return __sync_bool_compare_and_swap ((long *)atomic, -+ return __sync_bool_compare_and_swap_di ((long *)atomic, - (long)oldval, (long)newval); - } - diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch deleted file mode 100644 index cabe56f5..00000000 --- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch +++ /dev/null @@ -1,20 +0,0 @@ -Temporary workaround for gio tests failure when ran without FEATURES=userpriv -until upstream bug #552912 is fixed - ---- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300 -+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300 -@@ -769,11 +769,14 @@ - if (posix_compat) - { - /* target directory is not accessible (no execute flag) */ -+#if 0 -+/* Fails when ran as root */ - do_copy_move (root, item, TEST_DIR_NO_ACCESS, - TEST_NO_ACCESS); - /* target directory is readonly */ - do_copy_move (root, item, TEST_DIR_NO_WRITE, - TEST_NO_ACCESS); -+#endif - } - } - } diff --git a/dev-libs/glib/files/glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff b/dev-libs/glib/files/glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff deleted file mode 100644 index 5ec741af..00000000 --- a/dev-libs/glib/files/glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff +++ /dev/null @@ -1,75 +0,0 @@ ---- glib/tests/Makefile.in.ori 2009-05-04 17:30:55.000000000 +0200 -+++ glib/tests/Makefile.in 2009-05-04 17:34:23.000000000 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10.2 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -76,7 +76,7 @@ - am_rand_OBJECTS = rand.$(OBJEXT) - rand_OBJECTS = $(am_rand_OBJECTS) - rand_DEPENDENCIES = $(progs_ldadd) --am_strfuncs_OBJECTS = strfuncs.$(OBJEXT) -+am_strfuncs_OBJECTS = strfuncs-strfuncs.$(OBJEXT) - strfuncs_OBJECTS = $(am_strfuncs_OBJECTS) - strfuncs_DEPENDENCIES = $(progs_ldadd) - am_string_OBJECTS = string.$(OBJEXT) -@@ -336,6 +336,7 @@ - rand_SOURCES = rand.c - rand_LDADD = $(progs_ldadd) -lm - strfuncs_SOURCES = strfuncs.c -+strfuncs_CPPFLAGS = -D_ISOC99_SOURCE - strfuncs_LDADD = $(progs_ldadd) -lm - string_SOURCES = string.c - string_LDADD = $(progs_ldadd) -lm -@@ -355,8 +356,8 @@ - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ -@@ -431,7 +432,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-context.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strfuncs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strfuncs-strfuncs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing.Po@am__quote@ - -@@ -456,6 +457,20 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+strfuncs-strfuncs.o: strfuncs.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strfuncs-strfuncs.o -MD -MP -MF $(DEPDIR)/strfuncs-strfuncs.Tpo -c -o strfuncs-strfuncs.o `test -f 'strfuncs.c' || echo '$(srcdir)/'`strfuncs.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strfuncs-strfuncs.Tpo $(DEPDIR)/strfuncs-strfuncs.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strfuncs.c' object='strfuncs-strfuncs.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strfuncs-strfuncs.o `test -f 'strfuncs.c' || echo '$(srcdir)/'`strfuncs.c -+ -+strfuncs-strfuncs.obj: strfuncs.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strfuncs-strfuncs.obj -MD -MP -MF $(DEPDIR)/strfuncs-strfuncs.Tpo -c -o strfuncs-strfuncs.obj `if test -f 'strfuncs.c'; then $(CYGPATH_W) 'strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/strfuncs.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strfuncs-strfuncs.Tpo $(DEPDIR)/strfuncs-strfuncs.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strfuncs.c' object='strfuncs-strfuncs.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strfuncs-strfuncs.obj `if test -f 'strfuncs.c'; then $(CYGPATH_W) 'strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/strfuncs.c'; fi` -+ - mostlyclean-libtool: - -rm -f *.lo - -@@ -467,7 +482,7 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS diff --git a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch deleted file mode 100644 index 9b104dd5..00000000 --- a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000 -+++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000 -@@ -50,7 +50,7 @@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fno-stack-protector - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ diff --git a/dev-libs/glib/files/glib2-CVE-2008-4316.patch b/dev-libs/glib/files/glib2-CVE-2008-4316.patch deleted file mode 100644 index 758a01b2..00000000 --- a/dev-libs/glib/files/glib2-CVE-2008-4316.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- glib/gbase64.c.orig 2008-12-04 12:07:21.000000000 +0100 -+++ glib/gbase64.c 2009-01-12 14:08:31.000000000 +0100 -@@ -54,8 +54,9 @@ static const char base64_alphabet[] = - * - * The output buffer must be large enough to fit all the data that will - * be written to it. Due to the way base64 encodes you will need -- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will -- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes. -+ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of -+ * non-zero state). If you enable line-breaking you will need at least: -+ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space. - * - * @break_lines is typically used when putting base64-encoded data in emails. - * It breaks the lines at 72 columns instead of putting all of the text on -@@ -233,8 +234,14 @@ g_base64_encode (const guchar *data, - g_return_val_if_fail (data != NULL, NULL); - g_return_val_if_fail (len > 0, NULL); - -- /* We can use a smaller limit here, since we know the saved state is 0 */ -- out = g_malloc (len * 4 / 3 + 4); -+ /* We can use a smaller limit here, since we know the saved state is 0, -+ +1 is needed for trailing \0, also check for unlikely integer overflow */ -+ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3) -+ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)", -+ G_STRLOC, len); -+ -+ out = g_malloc ((len / 3 + 1) * 4 + 1); -+ - outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save); - outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save); - out[outlen] = '\0'; -@@ -275,7 +282,8 @@ static const unsigned char mime_base64_r - * - * The output buffer must be large enough to fit all the data that will - * be written to it. Since base64 encodes 3 bytes in 4 chars you need -- * at least: @len * 3 / 4 bytes. -+ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero -+ * state). - * - * Return value: The number of bytes of output that was written - * -@@ -358,7 +366,8 @@ g_base64_decode (const gchar *text, - gsize *out_len) - { - guchar *ret; -- gint input_length, state = 0; -+ gsize input_length; -+ gint state = 0; - guint save = 0; - - g_return_val_if_fail (text != NULL, NULL); -@@ -368,7 +377,9 @@ g_base64_decode (const gchar *text, - - g_return_val_if_fail (input_length > 1, NULL); - -- ret = g_malloc0 (input_length * 3 / 4); -+ /* We can use a smaller limit here, since we know the saved state is 0, -+ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */ -+ ret = g_malloc0 ((input_length / 4) * 3 + 1); - - *out_len = g_base64_decode_step (text, input_length, ret, &state, &save); - diff --git a/dev-libs/glib/glib-2.18.4-r1.ebuild b/dev-libs/glib/glib-2.18.4-r1.ebuild deleted file mode 100644 index f92c74d7..00000000 --- a/dev-libs/glib/glib-2.18.4-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.4-r1.ebuild,v 1.9 2009/04/27 13:07:11 jer Exp $ - -inherit gnome.org libtool eutils flag-o-matic - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="debug doc fam hardened selinux xattr" - -RDEPEND="virtual/libc - virtual/libiconv - xattr? ( sys-apps/attr ) - fam? ( virtual/fam )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.11 - doc? ( - >=dev-libs/libxslt-1.0 - >=dev-util/gtk-doc-1.8 - ~app-text/docbook-xml-dtd-4.1.2 - )" - -src_unpack() { - unpack ${A} - cd "${S}" - - if use ppc64 && use hardened ; then - replace-flags -O[2-3] -O1 - epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" - fi - - if use ia64 ; then - # Only apply for < 4.1 - local major=$(gcc-major-version) - local minor=$(gcc-minor-version) - if (( major < 4 || ( major == 4 && minor == 0 ) )); then - epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" - fi - fi - - # Don't fail gio tests when ran without userpriv, upstream bug 552912 - # This is only a temporary workaround, remove as soon as possible - epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" - - # Fix gmodule issues on fbsd; bug #184301 - epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch - - # Fix g_base64 overruns. bug #249214 - epatch "${FILESDIR}"/glib2-CVE-2008-4316.patch - - epatch "${FILESDIR}"/${P}-BJA-strfuncs-std99-Makefile.in.diff - - [[ ${CHOST} == *-freebsd* ]] && elibtoolize -} - -src_compile() { - local myconf - - epunt_cxx - - # Building with --disable-debug highly unrecommended. It will build glib in - # an unusable form as it disables some commonly used API. Please do not - # convert this to the use_enable form, as it results in a broken build. - # -- compnerd (3/27/06) - use debug && myconf="--enable-debug" - - # always build static libs, see #153807 - econf ${myconf} \ - $(use_enable xattr) \ - $(use_enable doc man) \ - $(use_enable doc gtk-doc) \ - $(use_enable fam) \ - $(use_enable selinux) \ - --enable-static \ - --with-threads=posix || die "configure failed" - - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${D}/usr/lib/charset.alias" - - dodoc AUTHORS ChangeLog* NEWS* README -} |