From owner-freebsd-gnome@FreeBSD.ORG Thu Mar 10 12:02:39 2011 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C791065679; Thu, 10 Mar 2011 12:02:39 +0000 (UTC) (envelope-from villa.alberto@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1B69C8FC21; Thu, 10 Mar 2011 12:02:35 +0000 (UTC) Received: by wyf23 with SMTP id 23so1657058wyf.13 for ; Thu, 10 Mar 2011 04:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:organization:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=gfltIkv8ZsXft3EVGqltZLcT3hKd0JPkwHR9hFiikwA=; b=Yws06Ers4WUbCSPNaaj7YkrTmsQqafqQW/vdB8qpLDtbZDHB64xGjNagNAze0lanMo XxlDS/sLbc+1Ifx2wzeUhe98DqwAflN7bmPhVVYajRhG56S1Mqx+Xsm2V4OkfUeItPK2 GNSX/gZId41WYcWg+dntTQT8xi+vJsmH55FG0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:organization:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; b=e+B9AnVbOxlI/8NS3mPeqo7urxKf/la1/nIIqDmFUlDshVOtXxQIQsvA6z0aIXs7j8 xkoQo3v2cAwLY+8mivBcrKVlL6O6NuYLXcwhKJKOWGKKyLtUxNUG7PBpU6OxOsjlNfQ5 GPsDmSp8G+vPhJNbU4TP/5JQ63RE3eUY7qEvs= Received: by 10.227.130.78 with SMTP id r14mr5467083wbs.101.1299758554829; Thu, 10 Mar 2011 04:02:34 -0800 (PST) Received: from echo.hoth (host218-169-dynamic.4-87-r.retail.telecomitalia.it [87.4.169.218]) by mx.google.com with ESMTPS id r57sm1489301wes.25.2011.03.10.04.02.32 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Mar 2011 04:02:33 -0800 (PST) Sender: Alberto Villa From: Alberto Villa Organization: The FreeBSD Project To: kde@freebsd.org Date: Thu, 10 Mar 2011 13:02:30 +0100 User-Agent: KMail/1.13.6 (FreeBSD/9.0-CURRENT; KDE/4.6.0; amd64; ; ) References: <4D692B50.4000807@freebsd.org> <201103101232.05940.avilla@freebsd.org> <201103101301.17735.avilla@freebsd.org> In-Reply-To: <201103101301.17735.avilla@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1521921.juzi4F1udz"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201103101302.31120.avilla@freebsd.org> Cc: gnome@freebsd.org, Andriy Gapon Subject: Re: icon for optical disk X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2011 12:02:40 -0000 --nextPart1521921.juzi4F1udz Content-Type: multipart/mixed; boundary="Boundary-01=_X3LeNrx5ZPzyjTb" Content-Transfer-Encoding: 7bit --Boundary-01=_X3LeNrx5ZPzyjTb Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 10 March 2011 13:01:13 Alberto Villa wrote: > cd /usr/ports/sysutils/hal/files && patch < $attached_patch ehm... patch attached =2D-=20 Alberto Villa, FreeBSD committer http://people.FreeBSD.org/~avilla You are standing on my toes. --Boundary-01=_X3LeNrx5ZPzyjTb Content-Type: text/x-patch; charset="UTF-8"; name="hal.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="hal.diff" Index: files/patch-hald_freebsd_probing_probe-volume.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/sysutils/hal/files/patch-hald_freebsd_probing_pr= obe-volume.c,v retrieving revision 1.3 diff -u -r1.3 patch-hald_freebsd_probing_probe-volume.c =2D-- files/patch-hald_freebsd_probing_probe-volume.c 10 May 2010 21:18:40 = =2D0000 1.3 +++ files/patch-hald_freebsd_probing_probe-volume.c 10 Mar 2011 11:51:08 -0= 000 @@ -1,6 +1,15 @@ =2D--- hald/freebsd/probing/probe-volume.c.orig 2009-12-23 14:06:53.0000000= 00 -0500 =2D+++ hald/freebsd/probing/probe-volume.c 2009-12-23 14:07:01.000000000 -0= 500 =2D@@ -574,6 +574,7 @@ main (int argc, char **argv) +--- hald/freebsd/probing/probe-volume.c.orig 2009-09-17 15:45:09.000000000= +0200 ++++ hald/freebsd/probing/probe-volume.c 2011-03-10 12:45:48.293506507 +0100 +@@ -407,7 +407,7 @@ + int type; + guint64 capacity; +=20 +- libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category"= , "volume.disc", &hfp_error); ++ libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category"= , "volume", &hfp_error); + libhal_device_add_capability(hfp_ctx, hfp_udi, "volume.disc", &hfp_= error); +=20 + libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.disc.has_= audio", has_audio, &hfp_error); +@@ -574,6 +574,7 @@ =20 snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsd= isk.d_fs.fs_id[1]); libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.uf= sid", ufsid, &hfp_error); @@ -8,7 +17,7 @@ ufs_devs =3D libhal_manager_find_device_string_match(hfp_ctx, "volume.freebsd.ufsid", ufsid, =2D@@ -582,16 +583,17 @@ main (int argc, char **argv) +@@ -582,16 +583,17 @@ dbus_error_free(&hfp_error); for (i =3D 0; i < num_udis; i++) { Index: files/patch-hald_hf-storage.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/sysutils/hal/files/patch-hald_hf-storage.c,v retrieving revision 1.8 diff -u -r1.8 patch-hald_hf-storage.c =2D-- files/patch-hald_hf-storage.c 29 Aug 2010 17:51:18 -0000 1.8 +++ files/patch-hald_hf-storage.c 10 Mar 2011 11:51:08 -0000 @@ -1,5 +1,5 @@ =2D--- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 =2D+++ hald/freebsd/hf-storage.c 2010-08-29 12:22:03.000000000 -0400 +--- hald/freebsd/hf-storage.c.orig 2009-08-24 14:42:29.000000000 +0200 ++++ hald/freebsd/hf-storage.c 2011-03-10 12:46:39.123394874 +0100 @@ -30,6 +30,7 @@ #include #include @@ -8,7 +8,7 @@ #include #include #include =2D@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co +@@ -418,10 +419,41 @@ continue; } =20 @@ -50,7 +50,7 @@ geom_obj->type =3D -1; /* We use -1 here to denote a missing type. = */ geom_obj->hash =3D hash; =20 =2D@@ -589,11 +621,18 @@ hf_storage_devd_notify (const char *syst +@@ -589,11 +621,18 @@ char *conftxt; GSList *new_disks; =20 @@ -70,7 +70,7 @@ new_disks =3D hf_storage_parse_conftxt(conftxt); g_free(conftxt); =20 =2D@@ -669,7 +708,7 @@ hf_storage_conftxt_timeout_cb (gpointer=20 +@@ -669,7 +708,7 @@ if (hf_is_waiting) return TRUE; =20 @@ -79,3 +79,12 @@ =20 return TRUE; } +@@ -743,7 +782,7 @@ + g_return_if_fail(HAL_IS_DEVICE(device)); +=20 + hal_device_add_capability(device, "storage.cdrom"); +- hal_device_property_set_string(device, "info.category", "storage.cdrom"= ); ++ hal_device_property_set_string(device, "info.category", "storage"); + hal_device_property_set_string(device, "storage.drive_type", "cdrom"); + hal_device_property_set_bool(device, "storage.removable", TRUE); + /* enable media checks */ --Boundary-01=_X3LeNrx5ZPzyjTb-- --nextPart1521921.juzi4F1udz Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iJwEAAECAAYFAk14vdcACgkQ3xiC6kQ1Cou3GgP+I8BJiXXUiqfSCig4SdNWvOFZ HT5Q4DliGn1xP0xqF9uplMdX6yWGpV9FD+Bg9xbYwBUr6SUeYt9SpwJ5Keh38jb8 czFQaFnTM8gjnVjmoX3kOnoKbZhUQSWCCY58sLeCeTpcuag4P+NzDFjDS4uqOYeg 1Vu0dOMfSsq8Jtohm0U= =oBK9 -----END PGP SIGNATURE----- --nextPart1521921.juzi4F1udz--