Fix gtimer build on Gentoo/FreeBSD, bug #150557

Package-Manager: portage-2.1.2_pre2-r6

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 15108a10ad45efc6feb6cee53b71080182dde565..ae2bf755f356c7a4f90232291249055104399147 100644 (file)
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.215 2006/10/06 23:44:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.216 2006/10/09 12:23:29 leio Exp $
+
+  09 Oct 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/glib-2.12.4-gtimer-fix.patch, glib-2.12.4.ebuild:
+  Fix gtimer build on Gentoo/FreeBSD, bug #150557
 
 *glib-2.12.4 (06 Oct 2006)
 

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 06c83e1b9f89afd26d615c6703c12acf97396d7c..aca694829377e172221397c04c8d6608611d06a3 100644 (file)
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -21,6 +21,10 @@ AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f7731183
 MD5 e6b77b46d340163d9b2efa6a8cb38dde files/glib-2.10.3-ia64-atomic-ops.patch 1058
 RMD160 066e63a99739dc412fbed7f773118323f53ea774 files/glib-2.10.3-ia64-atomic-ops.patch 1058
 SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8 files/glib-2.10.3-ia64-atomic-ops.patch 1058
+AUX glib-2.12.4-gtimer-fix.patch 591 RMD160 06e59e200a8522975d3ad84dad6e6ac8322a093b SHA1 16a213ffaaf0e410124b12f1648584320c329aa3 SHA256 8415f384e702068f0d40513bc6251b709d6bbee188ad286510dd331d33db9382
+MD5 fbeb0e6db8c939085835fd6c8ee71429 files/glib-2.12.4-gtimer-fix.patch 591
+RMD160 06e59e200a8522975d3ad84dad6e6ac8322a093b files/glib-2.12.4-gtimer-fix.patch 591
+SHA256 8415f384e702068f0d40513bc6251b709d6bbee188ad286510dd331d33db9382 files/glib-2.12.4-gtimer-fix.patch 591
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 files/glib-2.6.3-testglib-ssp.patch 344
@@ -64,10 +68,10 @@ EBUILD glib-2.12.3.ebuild 2089 RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc S
 MD5 7e5d9e706b908d5afe99be4cfc6279f2 glib-2.12.3.ebuild 2089
 RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc glib-2.12.3.ebuild 2089
 SHA256 437f6d828286598bfe1153f983037fe11eceb6303b5839d5d7507e3536f1e156 glib-2.12.3.ebuild 2089
-EBUILD glib-2.12.4.ebuild 2085 RMD160 111b5e09870df1bbc2815374b6ea12eef1dd3cc2 SHA1 ba5c5cc8301a3d1769bc91f13833e0adab8f8ffc SHA256 1398ff79e40a5c4e8477dc2c6559ff7eae167952cf4c79b300fed2a1424eb5ee
-MD5 fc290a55610702d714a714a8dbf684d8 glib-2.12.4.ebuild 2085
-RMD160 111b5e09870df1bbc2815374b6ea12eef1dd3cc2 glib-2.12.4.ebuild 2085
-SHA256 1398ff79e40a5c4e8477dc2c6559ff7eae167952cf4c79b300fed2a1424eb5ee glib-2.12.4.ebuild 2085
+EBUILD glib-2.12.4.ebuild 2194 RMD160 ee13ade1554e48dde53c29b37802529edbbe5b8a SHA1 948c18c984c0c33b136cb7bd6c9cc168b4dbdb28 SHA256 6854eb9fdccb934342e950a569b7e50b42fe5d6846bdbabef1353448dc4c6343
+MD5 8e449dea677aed2c780a7fc6d955bf0f glib-2.12.4.ebuild 2194
+RMD160 ee13ade1554e48dde53c29b37802529edbbe5b8a glib-2.12.4.ebuild 2194
+SHA256 6854eb9fdccb934342e950a569b7e50b42fe5d6846bdbabef1353448dc4c6343 glib-2.12.4.ebuild 2194
 EBUILD glib-2.6.5.ebuild 1647 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a SHA1 5647d0bedffb146a0a4e0b01753f1b87c151e7c6 SHA256 c70b2e000d7eb252871462db4beb717e16f031208f8980dece27a0c38c7c83e9
 MD5 3c669304d71f54e783024332877d71d0 glib-2.6.5.ebuild 1647
 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a glib-2.6.5.ebuild 1647
@@ -84,10 +88,10 @@ EBUILD glib-2.8.6.ebuild 1608 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 SH
 MD5 bf003c8a49124eb8f907181ee83ccf4e glib-2.8.6.ebuild 1608
 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 glib-2.8.6.ebuild 1608
 SHA256 f9c35f88a5eb9cb668edf620f234ef87dc55c080733122975068679fac7b6bed glib-2.8.6.ebuild 1608
-MISC ChangeLog 25175 RMD160 a89340d697bab8984a578115b70b7e3123605331 SHA1 0803d9f809ddeda9490115f603581bb14ba140a6 SHA256 feebe87ac6ede99f130cfcc9bf4ee3376baa89f3fcb7899c46a1939c02696772
-MD5 a897a35485e786a7f17bae782636d656 ChangeLog 25175
-RMD160 a89340d697bab8984a578115b70b7e3123605331 ChangeLog 25175
-SHA256 feebe87ac6ede99f130cfcc9bf4ee3376baa89f3fcb7899c46a1939c02696772 ChangeLog 25175
+MISC ChangeLog 25332 RMD160 ca9df88c70c09f07b3aa9f35f08ef7098283f5a6 SHA1 3760423d792d6bf3539b31cbfb7263e47a89bf48 SHA256 d1ee7e1b8a3b24782027fd1d5969b641fc2ffd4890c7ee5aab17ed85e678109d
+MD5 bca8daeb7b26921f23d2185814b29787 ChangeLog 25332
+RMD160 ca9df88c70c09f07b3aa9f35f08ef7098283f5a6 ChangeLog 25332
+SHA256 d1ee7e1b8a3b24782027fd1d5969b641fc2ffd4890c7ee5aab17ed85e678109d ChangeLog 25332
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -128,7 +132,7 @@ SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJupbkeYb6olFHJcRAl2DAKDnuNjXk0UB1kfESUqef+y91gY61ACeMr51
-aCjfwZqkds0Zn6sJEfxHeLk=
-=k4KY
+iD8DBQFFKj9QkeYb6olFHJcRArEqAKDpmp2rgnYh+/ExMpJse96MzAxzLQCdHmhR
+dA9fV62xL0+rLlczNhwNdWo=
+=XAY3
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch b/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch
new file mode 100644 (file)
index 0000000..8655598
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch
@@ -0,0 +1,18 @@
+http://cvs.gnome.org/viewcvs/glib/glib/gtimer.c?r1=1.29.2.3&r2=1.29.2.4
+Fix a typo (read: build on G/FBSD)
+===================================================================
+RCS file: /cvs/gnome/glib/glib/gtimer.c,v
+retrieving revision 1.29.2.3
+retrieving revision 1.29.2.4
+diff -u -r1.29.2.3 -r1.29.2.4
+--- glib/gtimer.c      2006/10/01 05:51:15     1.29.2.3
++++ glib/gtimer.c      2006/10/06 18:44:33     1.29.2.4
+@@ -257,7 +257,7 @@
+ 
+   if (microseconds)
+     *microseconds = (elapsed / 10) % 1000000;
+-#elif HAVE_CLOCK_GETTIME
++#elif USE_CLOCK_GETTIME
+   if (timer->active)
+     GETTIME (timer->end);
+ 

diff --git a/dev-libs/glib/glib-2.12.4.ebuild b/dev-libs/glib/glib-2.12.4.ebuild
index c046486ca749c689deaa76443f4156245e223449..9781db88845535747b7e179daccbffa555fca2ad 100644 (file)
--- a/dev-libs/glib/glib-2.12.4.ebuild
+++ b/dev-libs/glib/glib-2.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4.ebuild,v 1.1 2006/10/06 23:44:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4.ebuild,v 1.2 2006/10/09 12:23:29 leio Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -42,7 +42,10 @@ src_unpack() {
                fi
        fi
 
-       epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
+       epatch "${FILESDIR}/${PN}-2.8.3-macos.patch"
+
+       # Fix build for FreeBSD. This fix will be included in 2.12.5
+       epatch "${FILESDIR}/${P}-gtimer-fix.patch"
 }
 
 src_compile() {