Index: head/x11-wm/ede/Makefile =================================================================== --- head/x11-wm/ede/Makefile (revision 391392) +++ head/x11-wm/ede/Makefile (revision 391393) @@ -1,120 +1,125 @@ # Created by: Sergey Matveychuk # $FreeBSD$ PORTNAME= ede PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${EDELIB_DISTFILE}:edelib MAINTAINER= ports@FreeBSD.org 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 \ libcurl.so:${PORTSDIR}/ftp/curl \ libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk USES= fam gettext iconv:translit pathfix pkgconfig python:2 \ shared-mime-info shebangfix 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 LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL= pekwm-[0-9]* OPTIONS_DEFINE= HAL HAL_LIB_DEPENDS= libhal.so.1:${PORTSDIR}/sysutils/hal HAL_CONFIGURE_ENABLE= hal EDELIB_NAME= edelib EDELIB_VERSION= ${PORTVERSION} 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|| ; \ /OPTIM_FLAGS=/s|-O2|-fPIC| ; \ s|_daylight=yes|_daylight=no| ; \ s|/usr/local/share|${LOCALBASE}/share|' \ ${EDELIB_WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|$$(CC)|@CXX@| ; \ /-lstdc++/s|^|#|' ${EDELIB_WRKSRC}/Jamconfig.in @${REINPLACE_CMD} -e \ 's| -liconv| ${ICONV_LIB}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|$$(CC)|@CXX@| ; \ /panel-applets/s|EDE_DATA_DIR|libdir| ; \ /-lstdc++/s|^|#|' ${WRKSRC}/Jamconfig.in @${REINPLACE_CMD} -e \ '/desktop-links/s|^|#|' ${WRKSRC}/data/Jamfile @${REINPLACE_CMD} -e \ '/-ldl/s|^|#|' ${WRKSRC}/ede-panel/Jamfile @${REINPLACE_CMD} -e \ 's|"\(panel-applets\)"|"../../lib/ede/\1"|' \ ${WRKSRC}/ede-panel/Panel.cpp pre-configure: @(cd ${EDELIB_WRKSRC} \ && ${SETENV} ${CONFIGURE_ENV} ./configure \ --prefix=${WRKDIR}/fakeroot \ --with-fltk-path=${LOCALBASE} \ --build=${CONFIGURE_TARGET} \ CC="${CC}" CXX="${CXX}" \ 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} \ && ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) do-build: @(cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER}) do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" \ ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ede-2.1.0/manual/images @(cd ${WRKSRC}/doc/manual/images && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/share/doc/ede-2.1.0/manual/images) .for i in ede-about ede-autostart ede-bell-conf ede-bug-report ede-crasher \ ede-calc ede-conf ede-desktop ede-desktop-conf ede-dialog \ ede-keyboard-conf ede-notify-daemon ede-screensaver-conf \ ede-image-view ede-launch ede-timedate ede-tip ede-tip-compiler \ ede-preferred-applications evoke ede-shutdown ede-panel pekwm @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .for i in battery_monitor.so clock.so cpu_monitor.so keyboard_layout.so \ mem_monitor.so pager.so quick_launch.so start_menu.so \ system_tray.so taskbar.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ede/panel-applets/${i} .endfor .include Index: head/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp =================================================================== --- head/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp (nonexistent) +++ head/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp (revision 391393) @@ -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()) { Property changes on: head/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/ede/files/patch-pekwm__Observable.cc =================================================================== --- head/x11-wm/ede/files/patch-pekwm__Observable.cc (revision 391392) +++ head/x11-wm/ede/files/patch-pekwm__Observable.cc (revision 391393) @@ -1,50 +1,50 @@ ---- ./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 +#include + #include "Observable.hh" #include "Observer.hh" -using SLIST_NAMESPACE::slist; +using std::vector; /** * Notify all observers. -@@ -21,11 +23,10 @@ +@@ -21,11 +23,10 @@ using SLIST_NAMESPACE::slist; void Observable::notifyObservers(Observation *observation) { - if (_observers.size()) { - slist::iterator it(_observers.begin()); - for (; it != _observers.end(); ++it) { - (*it)->notify(this, observation); - } + vector::const_iterator it(_observers.begin()); + vector::const_iterator end(_observers.end()); + for (; it != end; ++it) { + (*it)->notify(this, observation); } } -@@ -35,7 +36,7 @@ +@@ -35,7 +36,7 @@ Observable::notifyObservers(Observation void Observable::addObserver(Observer *observer) { - _observers.push_front(observer); + _observers.push_back(observer); } /** -@@ -44,7 +45,5 @@ +@@ -44,7 +45,5 @@ Observable::addObserver(Observer *observ void Observable::removeObserver(Observer *observer) { - if (_observers.size()) { - _observers.remove(observer); - } + _observers.erase(std::remove(_observers.begin(), _observers.end(), observer), _observers.end()); } Index: head/x11-wm/ede/files/patch-pekwm__Observable.hh =================================================================== --- head/x11-wm/ede/files/patch-pekwm__Observable.hh (revision 391392) +++ head/x11-wm/ede/files/patch-pekwm__Observable.hh (revision 391393) @@ -1,24 +1,24 @@ ---- ./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_ -#ifdef HAVE_SLIST -#include -#else // HAVE_EXT_SLIST -#include -#endif // HAVE_SLIST +#include class Observer; -@@ -36,7 +32,7 @@ +@@ -36,7 +32,7 @@ public: void removeObserver(Observer *observer); private: - SLIST_NAMESPACE::slist _observers; /**< List of observers. */ + std::vector _observers; /**< List of observers. */ }; #endif // _OBSERVABLE_HH_