From 8b9bda102e2af00ec46416e3621586416dfec898 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Mon, 29 Jun 2015 14:19:13 +0700
Subject: libraries/edelib: Fix compatibility with new fltk13.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/edelib/edelib.SlackBuild |  7 +++---
 libraries/edelib/edelib.patch      | 45 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 libraries/edelib/edelib.patch

diff --git a/libraries/edelib/edelib.SlackBuild b/libraries/edelib/edelib.SlackBuild
index bc0c24fef2303..4fdb6a6bb260d 100644
--- a/libraries/edelib/edelib.SlackBuild
+++ b/libraries/edelib/edelib.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=edelib
 VERSION=${VERSION:-2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/fltk13" \
+patch -p1 < $CWD/edelib.patch
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
 FLTK_CONFIG="/usr/bin/fltk13-config" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-fltk-path=/usr/lib${LIBDIRSUFFIX}/fltk13 \
+  --with-fltk-path=/usr/lib${LIBDIRSUFFIX}/ \
   --enable-profile \
   --enable-shared \
   --enable-largefile \
diff --git a/libraries/edelib/edelib.patch b/libraries/edelib/edelib.patch
new file mode 100644
index 0000000000000..b14d9712035c6
--- /dev/null
+++ b/libraries/edelib/edelib.patch
@@ -0,0 +1,45 @@
+--- edelib/src/WindowUtils.cpp
++++ edelib/src/WindowUtils.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: WindowUtils.cpp 3106 2011-10-21 20:26:08Z karijes $
++ * $Id: WindowUtils.cpp 3592 2014-12-02 12:48:07Z karijes $
+  *
+  * Window utils
+  * Copyright (c) 1998-2006 by Bill Spitzak and others
+@@ -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()) {
-- 
cgit v1.2.3