4 files changed, 63 insertions, 13 deletions

diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 9e67cac5cf56..e13fcad383dc 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ede
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib
@@ -16,8 +16,6 @@ COMMENT=	Equinox Desktop Environment
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-BROKEN=		Fails to link, tries to use internal fltk symbols
-
 BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
 		jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
@@ -30,14 +28,14 @@ USES=		fam gettext iconv:translit pathfix pkgconfig python:2 \
 SHEBANG_FILES=	doc/asciidoc/asciidoc.py
 python_OLD_CMD=	${SETENV} python
 python_CMD=	${PYTHON_CMD}
-USE_XORG=	xcomposite xft xinerama xpm xrandr
+USE_XORG=	xcomposite xft xinerama xkbfile xpm xrandr
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PEKWM_CXXFLAGS="${CXXFLAGS}" \
 		PKG_CONFIG_PATH="${EDELIB_WRKSRC}/pc"
 CONFIGURE_ARGS=	--with-edelib-path=${EDELIB_WRKSRC} \
 		--with-fltk-path=${LOCALBASE}
-INSTALL_ICONS=	yes
+INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -56,6 +54,9 @@ EDELIB_DISTNAME=${EDELIB_NAME}-${EDELIB_VERSION}
 EDELIB_DISTFILE=${EDELIB_DISTNAME}${EXTRACT_SUFX}
 EDELIB_WRKSRC=	${WRKDIR}/${EDELIB_DISTNAME}
 
+post-extract:
+	@${LN} -sf ${EDELIB_WRKSRC} ${WRKDIR}/${EDELIB_NAME}
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/DEVELOPER_FLAGS=/s|-pedantic|| ; \
@@ -90,6 +91,10 @@ pre-configure:
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}")
 
+post-configure:
+	@${REINPLACE_CMD} -e \
+		's|#define ICONV_CONST 1|#undef ICONV_CONST|' ${WRKSRC}/config.h
+
 pre-build:
 	@(cd ${EDELIB_WRKSRC} \
 		&& ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER} \
diff --git a/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp b/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp
new file mode 100644
index 000000000000..39a2464b043b
--- /dev/null
+++ b/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp
@@ -0,0 +1,45 @@
+--- ../edelib/src/WindowUtils.cpp.orig	2014-06-21 23:24:07.000000000 +0200
++++ ../edelib/src/WindowUtils.cpp	2015-07-06 08:22:40.598815934 +0200
+@@ -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 @@ void window_xid_create(Fl_Window* win, v
+ 			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 @@ void window_xid_create(Fl_Window* win, v
+ 		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()) {
diff --git a/x11-wm/ede/files/patch-pekwm__Observable.cc b/x11-wm/ede/files/patch-pekwm__Observable.cc
index 57a91fc8419f..cfea9a029298 100644
--- a/x11-wm/ede/files/patch-pekwm__Observable.cc
+++ b/x11-wm/ede/files/patch-pekwm__Observable.cc
@@ -1,5 +1,5 @@
---- ./pekwm/Observable.cc.orig	2012-05-18 12:51:49.000000000 +0000
-+++ ./pekwm/Observable.cc	2014-01-05 16:56:43.000000000 +0000
+--- pekwm/Observable.cc.orig	2014-06-21 21:24:41 UTC
++++ pekwm/Observable.cc
 @@ -10,10 +10,12 @@
  #include "config.h"
  #endif // HAVE_CONFIG_H
@@ -14,7 +14,7 @@
  
  /**
   * Notify all observers.
-@@ -21,11 +23,10 @@
+@@ -21,11 +23,10 @@ using SLIST_NAMESPACE::slist;
  void
  Observable::notifyObservers(Observation *observation)
  {
@@ -30,7 +30,7 @@
      }
  }
  
-@@ -35,7 +36,7 @@
+@@ -35,7 +36,7 @@ Observable::notifyObservers(Observation 
  void
  Observable::addObserver(Observer *observer)
  {
@@ -39,7 +39,7 @@
  }
  
  /**
-@@ -44,7 +45,5 @@
+@@ -44,7 +45,5 @@ Observable::addObserver(Observer *observ
  void
  Observable::removeObserver(Observer *observer)
  {
diff --git a/x11-wm/ede/files/patch-pekwm__Observable.hh b/x11-wm/ede/files/patch-pekwm__Observable.hh
index 5299453f93c9..b42727d0059b 100644
--- a/x11-wm/ede/files/patch-pekwm__Observable.hh
+++ b/x11-wm/ede/files/patch-pekwm__Observable.hh
@@ -1,5 +1,5 @@
---- ./pekwm/Observable.hh.orig	2012-05-18 12:51:49.000000000 +0000
-+++ ./pekwm/Observable.hh	2014-01-05 16:56:43.000000000 +0000
+--- pekwm/Observable.hh.orig	2014-06-21 21:24:41 UTC
++++ pekwm/Observable.hh
 @@ -9,11 +9,7 @@
  #ifndef _OBSERVABLE_HH_
  #define _OBSERVABLE_HH_
@@ -13,7 +13,7 @@
  
  class Observer;
  
-@@ -36,7 +32,7 @@
+@@ -36,7 +32,7 @@ public:
      void removeObserver(Observer *observer); 
  
  private: