From ea6f54d724ad289ccefef5a1f56850530c1d0add Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 10 Oct 2008 15:05:10 +0200 Subject: [PATCH] pthread_attr_getschedparam() has been fixed on -current. Remove glib's patch now that it's not needed. --HG-- extra : convert_revision : ca3d40730eb576d7027826c7287a3ac3b4c61985 --- templates/glib-fix-gthread-posix.diff | 17 ----------------- templates/glib.tmpl | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 templates/glib-fix-gthread-posix.diff diff --git a/templates/glib-fix-gthread-posix.diff b/templates/glib-fix-gthread-posix.diff deleted file mode 100644 index 68cdcbd2576..00000000000 --- a/templates/glib-fix-gthread-posix.diff +++ /dev/null @@ -1,17 +0,0 @@ -xtraeme: calling pthread_attr_getschedparam() before _setschedparam() will -always return ENOMEM because at least on NetBSD, _setschedparam needs -to be called first. - ---- gthread/gthread-posix.c.orig 2008-10-10 07:22:09.000000000 +0200 -+++ gthread/gthread-posix.c 2008-10-10 07:22:29.000000000 +0200 -@@ -343,9 +343,9 @@ g_thread_create_posix_impl (GThreadFunc - # ifdef G_THREADS_IMPL_POSIX - { - struct sched_param sched; -- posix_check_cmd (pthread_attr_getschedparam (&attr, &sched)); - sched.sched_priority = g_thread_priority_map [priority]; - posix_check_cmd_prio (pthread_attr_setschedparam (&attr, &sched)); -+ posix_check_cmd (pthread_attr_getschedparam (&attr, &sched)); - } - # else /* G_THREADS_IMPL_DCE */ - posix_check_cmd_prio diff --git a/templates/glib.tmpl b/templates/glib.tmpl index a95c0cdbf9c..87735dc5b16 100755 --- a/templates/glib.tmpl +++ b/templates/glib.tmpl @@ -2,7 +2,7 @@ pkgname=glib version=2.18.1 extract_sufx=".tar.bz2" -patch_files="$pkgname-fix-statfs-netbsd.diff $pkgname-fix-gthread-posix.diff" +patch_files="$pkgname-fix-statfs-netbsd.diff" url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18 make_cmd="$PKGFS_MASTERDIR/bin/gmake" # Disable FAM for now and use the installed pcre package instead