Bug 255548

This should of course read "revert the change to bsd-daemon.xpm".

Thanks for the report!
I'll have a look tomorrow morning and provide
a proper fix along with a diff(1) to update this port.

Thanks again!

--Chris

Created attachment 224636 [details]
x11-wm/icewm: fixes corrupted header in bsd-daemon.xpm

This patch (diff (1)) removes a comma that resulted in
corrupt header in the files/bsd-daemon.xpm icon.

Changes
files/bsd-daemon.xpm

That's it.

Thanks!

--Chris

Unfortunately that patch is not sufficient. icewm still does not load the image after the patch, also the "file" command does not recognize the file as "X pixmap image"

(In reply to wolfgang from comment #4)
> also the "file" command does not recognize the file
> as "X pixmap image"
How did you use file(1)?

root@portsdev:/usr/ports/x11-wm/icewm/files # file bsd-daemon.xpm
bsd-daemon.xpm: ASCII text

The bsd-daemon.xpm is valid per the xpm spec in every way.

Perhaps you didn't use file(1) correctly?
-h, --no-dereference
  option causes symlinks not to be followed (on systems that
  support symbolic links).  This is the default if the
  environment variable POSIXLY_CORRECT is not defined.

HTH and thanks for the report! :-)

--Chris

Created attachment 224644 [details]
x1-wm/icewm: fixes beastified xpm header && pets portlint

OK I'm dogfooding it this time.
I performed a deinstall. Followed by a fresh install
after my changes. The bsd-daemon.xpm IS identified
correctly by every image viewer available in the ports
tree. But NOT by the underlying icewm image decoder.
So until I get a bit more time to discover *where*
in the supporting icewm libs the decoding is wrong;
Simply strip all but the XPM in the comment tag.

While here; pet portlint.

Changes in this version of the patch/diff(1):

Makefile
files/bsd-daemon.xpm

That's it, and Thank you! :-)

--Chris

@wolfgang
Do you still have the output from the error produced
by icewm immediately after closing the session?
I could really use those lines. As I lost mine out
of my buffer.

Thanks!

--Chris

Created attachment 224648 [details]
x11-wm/icewm: fix beastie xpm && pet portlint

OK everything is the same as the last version.
EXCEPT I was able to kill 2 birds with one stone on
the original problem.

Changes
Mahefile (pet portlint)
files/bsd-daemon.xpm

I was able to keep the author attribution in the
file SO LONG AS it was followed by XPM.

See attached patch / diff(1) for finer details.

That's all I'm going to do here. As everything has
been addressed and fixed.

Thanks for the adventure! :-)

--Chris

Sorry, still doesn't work for me. I patched /usr/local/share/icewm/taskbar/bsd-daemon.xpm as in your newest patch and copied it to start.xpm in the same directory. On getting icewm to reload the files, it emits this message on console:

IceWM: Warnung: Bild nicht lesbar: /usr/local/share/icewm/taskbar/start.xpm

and it falls back to using linux.xpm from the same directory instead. If I call "file" for these two files, it shows this:

bsd-daemon.xpm: ASCII text
linux.xpm:      X pixmap image, ASCII text

(In reply to wolfgang from comment #9)
> IceWM: Warnung: Bild nicht lesbar: /usr/local/share/icewm/taskbar/start.xpm
BIZARRE
That's what I got BEFORE my latest patch. Well, it was
IceWM: Warning: Image Not Readable: /usr/local/share/icewm/taskbar/start.xpm
But AFTER hanging XPM after the attribution. I got the "beastie" icon.

Hmm... OK I'll post the previous patch, replacing this one.

Thanks for the feedback Wolfgang! :-)

--Chris

Created attachment 224650 [details]
x11-wm/icewm: fixes bsd-daemon.xpm && pets portlint -- FINAL

OK This patch won't miss. While I'm still a bit
puzzled by the differences in outcome between
Wolfgang & my experiences. Best to "play it safe".
This patch strips the attribution from bsd-daemon.xpm
and pets portlint.

Changes
Makefile (pet portlint)
files/bsd-daemon.xpm (as noted above)

I dogfooded this. Unless I hear otherwise.
Please commit. :-)

Thanks!

--Chris

Sorry, I just checked and I actually made a mistake in patching the file, mea culpa. If I perform the patch correctly having the XPM at the end of the attribution, icewm does indeed read and display the file correctly. Sorry for misleading you here.
However, "file" still doesn't recognize it as a "X pixmap image"

> Sorry, I just checked and I actually made a mistake in patching the file, mea culpa.
You owe me a pint! ;-)

OK I still have the previous patch. Thank you VERY much for
being honest about it. REALLY sets my mind at ease. :-)

Thanks Wolfgang! :-)

--Chris

Created attachment 224651 [details]
x11-wm/icewm: fixes bsd-daemon.xpm && pets portlint

Fixes header of the files/bsd-daemon.xpm file
makes portlint happy

Changes
Makefile (pet portlint)
files/bsd-daemon.xpm (fix header)

Works as tested by myself && Wolfgang (reporter)

I'm done here. :-)

Please commit.

--Chris

Comment 15 commit-hook 2021-05-05 08:27:11 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf6ea18e37b0d4ab91f1d4da5509a2f166758899

commit cf6ea18e37b0d4ab91f1d4da5509a2f166758899
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2021-05-04 06:21:52 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2021-05-05 08:22:36 +0000

    x11-wm/icewm: Fix bsd-daemon.xpm

    There was a problem with the initial comment in the xpm file that
    prevented the image to be loaded properly.

    PR:     255548
    Reported by:    wolfgang@lyxys.ka.sub.org
    Approved by:    portmaster@bsdforge.com (maintainer)

 x11-wm/icewm/Makefile             | 5 +++--
 x11-wm/icewm/files/bsd-daemon.xpm | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

Comment 16 Fernando Apesteguía 2021-05-05 08:27:36 UTC

Committed,

Thanks!