Hi Pascal and ports --
This patch is necessary for EDE to build with FLTK 1.3.3. It was
obtained from upstream.
I haven't run tested it, so that would be appreciated. It does, however,
build successfully on amd64.
Naturally, this requires the fltk-1.3.3 patch previously sent to ports@.
OK?
~Brian
Index: desktop/Makefile
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- desktop/Makefile 4 Apr 2015 09:21:05 -0000 1.7
+++ desktop/Makefile 27 Jun 2015 23:28:29 -0000
@@ -3,7 +3,7 @@
COMMENT = Equinox desktop environment
DISTNAME = ede-${V}
-REVISION = 1
+REVISION = 2
WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama Xpm c crypto
WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
Index: lib/Makefile
===================================================================
RCS file: /cvs/ports/x11/ede/lib/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- lib/Makefile 4 Apr 2015 09:21:05 -0000 1.3
+++ lib/Makefile 27 Jun 2015 23:28:29 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY = Yes
COMMENT = equinox desktop library
DISTNAME = edelib-${V}
-REVISION = 0
+REVISION = 1
API_VER = 1.0
.for l in edelib edelib_dbus edelib_gui
Index: lib/patches/patch-src_WindowUtils_cpp
===================================================================
RCS file: lib/patches/patch-src_WindowUtils_cpp
diff -N lib/patches/patch-src_WindowUtils_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/patches/patch-src_WindowUtils_cpp 27 Jun 2015 23:28:29 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+http://sourceforge.net/p/ede/code/3592/
+
+--- src/WindowUtils.cpp.orig Sat Jun 27 18:54:25 2015
++++ src/WindowUtils.cpp Sat Jun 27 18:55:47 2015
+@@ -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 @@ void window_xid_create(Fl_Window* win, void (*before_m
+ 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())
+@@ -194,12 +196,14 @@ void window_xid_create(Fl_Window* win, void (*before_m
+ 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()) {
