Date: Sun, 31 May 2015 06:11:53 +0200 From: Michael Reim <kraileth@elderlinux.org> To: ports@FreeBSD.org Subject: Patch for currently broken x11-wm/ede Message-ID: <20150531061153.501a525427c456c28011a416@elderlinux.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Sun__31_May_2015_06_11_53_+0200_t40e_s8c1JQSRiJT Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello! Coming from a Linux background and just slowly getting used to the FreeBSD world, I hope that I'm doing things right here. If not - please bear with me since this is my first attempt to get involved with FreeBSD... I've noticed that the port x11-wm/ede is currently marked broken. It doesn't build anymore since with the latest version of FLTK some internal symbols that were visible before have been hidden. Edelib may have used them in the past but it does not need them anymore. So any reference to them can be removed from it. This issue has been fixed upstream with commit 3592 (http://sourceforge.net/p/ede/code/3592/) in December. Until a new version is released, it would make sense to simply patch edelib 2.1 to play together with FLTK nicely again. Could anybody please add the patch to the port and remove the broken/ignore tags? See attachment for the patch file that I got from the EDE developer. I've used it to package edelib for Arch Linux and have been using the patched version in a production environment since last December without any issues. Regards, Michael -- --Multipart=_Sun__31_May_2015_06_11_53_+0200_t40e_s8c1JQSRiJT Content-Type: text/x-diff; name="edelib.diff" Content-Disposition: attachment; filename="edelib.diff" Content-Transfer-Encoding: 7bit Index: src/WindowUtils.cpp =================================================================== --- src/WindowUtils.cpp (revision 3564) +++ src/WindowUtils.cpp (working copy) @@ -33,8 +33,10 @@ * These are defined in FLTK as hidden variables for some internal hacks, but are used here. * XXX: possible changes in future FLTK versions */ +#if 0 extern char fl_show_iconic; extern int fl_disable_transient_for; +#endif EDELIB_NS_BEGIN @@ -165,7 +167,7 @@ XChangeProperty(fl_display, xp->xid, XA_WM_CLASS, XA_STRING, 8, 0, (unsigned char *)buffer, p-buffer-1); } - if(win->non_modal() && xp->next && !fl_disable_transient_for) { + if(win->non_modal() && xp->next /* && !fl_disable_transient_for */) { // find some other window to be "transient for": Fl_Window* wp = xp->next->w; while(wp->parent()) @@ -193,13 +195,14 @@ XWMHints *hints = XAllocWMHints(); hints->input = True; hints->flags = InputHint; - +#if 0 if(fl_show_iconic) { hints->flags |= StateHint; hints->initial_state = IconicState; fl_show_iconic = 0; showit = 0; } +#endif // This is not removed so it can be used with windows inherited from Fl_Window if(win->icon()) { --Multipart=_Sun__31_May_2015_06_11_53_+0200_t40e_s8c1JQSRiJT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150531061153.501a525427c456c28011a416>