summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2007-01-09 21:30:43 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2007-01-09 21:30:43 +0000
commitbfcb96125202c897f477f2a8aa2ee7cbc0602533 (patch)
tree15a948f048e1566e5fc5d634778c9311adbf80ba
parent2.17.0 + sessionsaver (diff)
downloaduser-bfcb96125202c897f477f2a8aa2ee7cbc0602533.tar.gz
user-bfcb96125202c897f477f2a8aa2ee7cbc0602533.tar.bz2
user-bfcb96125202c897f477f2a8aa2ee7cbc0602533.zip
make glib not assert
svn path=/user/; revision=25
-rw-r--r--dev-libs/glib/Manifest12
-rw-r--r--dev-libs/glib/files/digest-glib-2.12.73
-rw-r--r--dev-libs/glib/files/glib-2.12.7-dont-crash.patch16
-rw-r--r--dev-libs/glib/glib-2.12.7.ebuild82
4 files changed, 113 insertions, 0 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
new file mode 100644
index 0000000..e7bdf7b
--- /dev/null
+++ b/dev-libs/glib/Manifest
@@ -0,0 +1,12 @@
+AUX glib-2.12.7-dont-crash.patch 704 RMD160 a81ee8744c81a257bae043f3779cb7c48499ce6f SHA1 22598ba2ba8fdd62fdacf52187020790cc7beece SHA256 916c6c811018dc87f2b651c368d42c2cbc90f96d7693c9b92d1677cb1750811d
+MD5 57f29f25bb090a3c707d25cca654ec4b files/glib-2.12.7-dont-crash.patch 704
+RMD160 a81ee8744c81a257bae043f3779cb7c48499ce6f files/glib-2.12.7-dont-crash.patch 704
+SHA256 916c6c811018dc87f2b651c368d42c2cbc90f96d7693c9b92d1677cb1750811d files/glib-2.12.7-dont-crash.patch 704
+DIST glib-2.12.7.tar.bz2 2900849 RMD160 0c95bd3a5970263b72be9cacfc64c0e7f4bbe254 SHA1 42024d775f5b1550c0f86091609cd1c7d1440413 SHA256 e25321ab635eb6e4ec42135600a5ac9a1327e910d3aed0edf97fff30500747b2
+EBUILD glib-2.12.7.ebuild 2150 RMD160 6b59b21c6d551f0e1db68e0e69752ba160241fc5 SHA1 fdcbca4a74224777150677b7e2618f2cd4f90a64 SHA256 39b8e515b2e6aef48326234aa715a81ca7883d81d3129326404b50b365c220be
+MD5 be888df11ab0ef66a90d2b61c619ac11 glib-2.12.7.ebuild 2150
+RMD160 6b59b21c6d551f0e1db68e0e69752ba160241fc5 glib-2.12.7.ebuild 2150
+SHA256 39b8e515b2e6aef48326234aa715a81ca7883d81d3129326404b50b365c220be glib-2.12.7.ebuild 2150
+MD5 2f8c15e69f4be83b0c4aff7509db829b files/digest-glib-2.12.7 241
+RMD160 0c4d7b9ebdb259372a3b5693cdfb1383cc91a04c files/digest-glib-2.12.7 241
+SHA256 dc66058bb962ef89b495ee948360aafea19b222208eabb77fd0b365c429ad77b files/digest-glib-2.12.7 241
diff --git a/dev-libs/glib/files/digest-glib-2.12.7 b/dev-libs/glib/files/digest-glib-2.12.7
new file mode 100644
index 0000000..489ee9c
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.12.7
@@ -0,0 +1,3 @@
+MD5 7a9e949627cf55c844c3570ab83a2caf glib-2.12.7.tar.bz2 2900849
+RMD160 0c95bd3a5970263b72be9cacfc64c0e7f4bbe254 glib-2.12.7.tar.bz2 2900849
+SHA256 e25321ab635eb6e4ec42135600a5ac9a1327e910d3aed0edf97fff30500747b2 glib-2.12.7.tar.bz2 2900849
diff --git a/dev-libs/glib/files/glib-2.12.7-dont-crash.patch b/dev-libs/glib/files/glib-2.12.7-dont-crash.patch
new file mode 100644
index 0000000..1f50c7f
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.7-dont-crash.patch
@@ -0,0 +1,16 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN glib-2.12.7.orig/glib/gmessages.c glib-2.12.7/glib/gmessages.c
+--- glib-2.12.7.orig/glib/gmessages.c 2007-01-04 16:40:16.000000000 -0500
++++ glib-2.12.7/glib/gmessages.c 2007-01-07 22:32:59.000000000 -0500
+@@ -425,9 +425,11 @@ g_logv (const gchar *log_domain,
+ if (depth)
+ test_level |= G_LOG_FLAG_RECURSION;
+ depth++;
+- domain_fatal_mask = domain ? domain->fatal_mask : G_LOG_FATAL_MASK;
++ domain_fatal_mask = G_LOG_FATAL_MASK;
++#if 0
+ if ((domain_fatal_mask | g_log_always_fatal) & test_level)
+ test_level |= G_LOG_FLAG_FATAL;
++#endif
+ if (test_level & G_LOG_FLAG_RECURSION)
+ log_func = _g_log_fallback_handler;
+ else
diff --git a/dev-libs/glib/glib-2.12.7.ebuild b/dev-libs/glib/glib-2.12.7.ebuild
new file mode 100644
index 0000000..c51515f
--- /dev/null
+++ b/dev-libs/glib/glib-2.12.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.7.ebuild,v 1.1 2007/01/05 03:54:18 leio 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 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc hardened"
+
+RDEPEND="virtual/libc
+ virtual/libiconv"
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.14
+ >=sys-devel/gettext-0.11
+ doc? (
+ >=dev-util/gtk-doc-1.4
+ ~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
+ epatch "${FILESDIR}"/${P}-dont-crash.patch
+}
+
+src_compile() {
+ epunt_cxx
+ elibtoolize
+
+ local myconf
+
+ # 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 \
+ $(use_enable doc gtk-doc) \
+ ${myconf} \
+ --with-threads=posix \
+ --enable-static || die "configure failed"
+
+ emake || die "make failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "Installation failed"
+
+ # Do not install charset.alias even if generated, leave it tol libiconv
+ rm -f ${D}/usr/lib/charset.alias
+
+ # Consider invalid UTF-8 filenames as locale-specific.
+ # TODO :: Eventually get rid of G_BROKEN_FILENAMES
+ dodir /etc/env.d
+ echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
+ echo "G_FILENAME_ENCODING=UTF-8" >> ${D}/etc/env.d/50glib2
+
+ dodoc AUTHORS ChangeLog* NEWS* README
+}