Subject: Re: meta-pkgs/gnome build problem...
To: None <tech-pkg@NetBSD.org>
From: Geert Hendrickx <geert.hendrickx@ua.ac.be>
List: tech-pkg
Date: 09/15/2005 09:03:49
--8P1HSweYDcXXzwPJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Sep 14, 2005 at 03:33:59PM +0000, Leonard Schmidt wrote:
> On Wed, Sep 14, 2005 at 02:54:27PM +0200, Jan Danielsson wrote:
> > Didn't help. :-(
> > 
> >    I applied the patch, cd:d into gnome2-media and typed "make clean".
> > Then  I went back to meta-pkgs/gnome and ran "make", but got the same
> > problem:
> > 
> > btw: Using pkgsrc-current, NetBSD 2.0.2/i386.
> 
> If the patch did not work, then better replace every occurrence of lrint
> with rint in gnome-cd/gst-cdparanoia-cdrom.c and gst-mixer/src/volume.c
> manually.

The SUBST patch didn't work for me either (NetBSD 2.1_RC3/i386), but
manually replacing lrint by rint in both files did.  I created two patches/
files for it for now (another place were optional patches would be
useful!).  

GH

--8P1HSweYDcXXzwPJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-aa

$NetBSD$

--- gnome-cd/gst-cdparanoia-cdrom.c.orig	2005-03-20 15:32:33.000000000 +0100
+++ gnome-cd/gst-cdparanoia-cdrom.c
@@ -1242,7 +1242,7 @@ gst_cdparanoia_cdrom_get_status (GnomeCD
 
 	build_pipeline (lcd);
 	g_object_get (G_OBJECT (priv->vol_element), "volume", &vol, NULL);
-	realstatus->volume = lrint (vol * 255.0);
+	realstatus->volume = rint (vol * 255.0);
 	cur_gst_status =
 	    gst_element_get_state (GST_ELEMENT (priv->play_thread));
 

--8P1HSweYDcXXzwPJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ab

$NetBSD$

--- gst-mixer/src/volume.c.orig	2005-04-03 19:47:09.000000000 +0200
+++ gst-mixer/src/volume.c
@@ -477,9 +477,9 @@ cb_volume_changed (GtkAdjustment *_adj,
     if (gnome_volume_control_button_get_active (
             GNOME_VOLUME_CONTROL_BUTTON (vol->button))) {
       gtk_adjustment_set_value (adj, gtk_adjustment_get_value (_adj));
-      volumes[i++] = lrint (gtk_adjustment_get_value (_adj));
+      volumes[i++] = rint (gtk_adjustment_get_value (_adj));
     } else {
-      volumes[i++] = lrint (gtk_adjustment_get_value (adj));
+      volumes[i++] = rint (gtk_adjustment_get_value (adj));
     }
   }
 
@@ -551,7 +551,7 @@ gnome_volume_control_volume_ask (GnomeVo
        scales != NULL; scales = scales->next, n++) {
     GtkAdjustment *adj = gtk_range_get_adjustment (scales->data);
                                                                                 
-    if (lrint (gtk_adjustment_get_value (adj)) != 0) {
+    if (rint (gtk_adjustment_get_value (adj)) != 0) {
       *slider_zero = FALSE;
       break;
     }

--8P1HSweYDcXXzwPJ--