Re: XFCE Update proposal to 4.12

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

On Fri, 10 Apr 2015, Youri Mouton wrote:

> The pastebin service I used to upload my patch actually broke the
> xfce4-battery-patch. I can confirm that it works fine on i386 laptops.

OK, I managed to fix it.  The format metacharacter (%) and zero-fill/width
(02) were stripped from the trailing context in the last patch section:

> > The reject file contains:
> > 
> > ---
> > @@ -519,6 +532,10 @@
> >     if (battmon->options.display_time && time_remaining > 0 && !(battmon->options.hide_when_full && acline && charge >= 99 )){
> >         gtk_widget_show(GTK_WIDGET(battmon->rtime));
> >         gtk_widget_show(GTK_WIDGET(battmon->timechargealignment));
> > +#if defined(__NetBSD__)
> > +    if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN)
> > +        g_snprintf(buffer, sizeof(buffer), "--:--");
> > +#endif
> >         g_snprintf(buffer, sizeof(buffer),"d:d ",time_remaining/60,time_remaining%60);
> >         gtk_label_set_text(battmon->rtime,buffer);
> > 
> > ---

Should be:

	g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60);

Carefully editing the patch to put those characters back causes the file
checksum (SHA1) to match distinfo.

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645