Re: XFCE Update proposal to 4.12

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

On Mon, 06 Apr 2015 11:22:42 +0200, youri <youri.mout%gmail.com@localhost> wrote:

> Linked here is also a big patch https://paste.xinu.at/xnA.

I've applied the jumbo patch ('patch -p1 < xfce412.diff', btw) to a
pkgsrc-2015Q1 tree.  I'm building on netbsd-7/i386.

"meta-pkgs/xfce4" built OK.  I was a bit concerned by all the fuzz due
to complaints about superseded patches (no checksum).

"meta-pkgs/xfce4-extras" had problems with "sysutils/xfce4-battery-plugin":

=> Applying pkgsrc patches for xfce4-battery-plugin-1.0.5
**************************************
Ignoring patch file /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa: no checksum found
**************************************
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa.orig
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa.rej
**************************************
Ignoring patch file /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c: invalid checksum
**************************************
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c.orig
ERROR: Patching failed due to modified or broken patch file(s):
ERROR: 	/d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c
*** Error code 1


Thinking I'd somehow botched applying the jumbo patch, I removed and
re-fetched the "sysutils/xfce4-battery-plugin" directory and trimmed a
copy of the jumbo patch to just those elements related to this package
and reapplied.  There was one patch failure, but I'm sure it's irrelevant:


Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sysutils/xfce4-battery-plugin/patches/patch-aa b/sysutils/xfce4-battery-plugin/patches/patch-aa
|deleted file mode 100644
|index 53c3d34..0000000
|--- a/sysutils/xfce4-battery-plugin/patches/patch-aa
|+++ /dev/null
--------------------------
Patching file sysutils/xfce4-battery-plugin/patches/patch-aa using Plan A...
Empty context always matches.
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to sysutils/xfce4-battery-plugin/patches/patch-aa.rej


Attempting to build anyway fails as noted above.

The post-patch "distinfo" file contains:

SHA1 (patch-panel-plugin_battery.c) = 2aa4abb3b24bea30f266ee203271d27021110a4f

Running 'make makepatchsum' produces:

SHA1 (patch-panel-plugin_battery.c) = 98101b3503d570081f8102989ad6af4a70469572

Afterwards, attempting to build fails, claiming the patch is broken:

=> Applying pkgsrc patches for xfce4-battery-plugin-1.0.5
**************************************
Ignoring patch file /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa: no checksum found
**************************************
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa.orig
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa.rej
1 out of 5 hunks failed--saving rejects to panel-plugin/battery.c.rej
Patch /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c failed
=> Ignoring patchfile /d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c.orig
ERROR: Patching failed due to modified or broken patch file(s):
ERROR: 	/d0/nbsd/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c


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);
 
---

In the interrim, I commented out the corresponding DEPENDS+= line in the
meta-pkgs/xfce4-extras/Makefile and proceeded.  The remaining extras built
successfully, albeit with some fuzz from superseded patches.

I'll try running it as soon as the other stuff I have going reaches a
convenient stopping point.


-- 
|/"\ 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