Attachment #138776 for bug #184859





PORTNAME=	ede
PORTVERSION=	2.0
PORTREVISION=	3
CATEGORIES=	x11-wm
MASTER_SITES=	SF \
		SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib

LICENSE=	GPLv2 LGPL20
LICENSE_COMB=	multi

BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
		doxygen:${PORTSDIR}/devel/doxygen \
		jam:${PORTSDIR}/devel/jam \
		python:${PORTSDIR}/lang/python
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
RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info

OPTIONS_DEFINE=	HAL
HAL_DESC=	Enable HAL support

USES=		iconv gettext pathfix pkgconfig shared-mime-info
USE_XORG=	xcomposite xft xinerama xpm xrandr
USES=	pathfix gettext pkgconfig
USE_PYTHON=	yes
USE_FAM=	yes
GNU_CONFIGURE=	yes

HAL_LIB_DEPENDS=	libhal.so.1:${PORTSDIR}/sysutils/hal
HAL_CONFIGURE_OFF=	--disable-hal

# use multiple make jobs
_make_jobs=	-j${MAKE_JOBS_NUMBER}

NO_STAGE=	yes
post-patch:
	@${REINPLACE_CMD} -e \
		's|/usr/local/share|${LOCALBASE}/share| ; \
		 /OPTIM_FLAGS=/s|-O2|-fPIC| ; \
		 s|_daylight=yes|_daylight=no|' ${EDELIB_WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's| -liconv| ${ICONV_LIB}|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|$$(CC)|@CXX@| ; \
		 s|-lstdc++||' ${WRKSRC}/Jamconfig.in

pre-configure:
	@(cd ${EDELIB_WRKSRC} \


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.0.0/manual/images
	@(cd ${WRKSRC}/doc/manual/images && ${COPYTREE_SHARE} . \
		${STAGEDIR}${PREFIX}/share/doc/ede-2.0.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 emountd ede-timedate ede-tip \
	ede-tip-compiler ede-preferred-applications evoke ede-shutdown \
	ede-panel ede-menu-spec-test pekwm
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
.endfor

.include <bsd.port.mk>




--- pekwm/Observable.cc.orig
+++ pekwm/Observable.cc
@@ -10,10 +10,12 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <algorithm>
+
 #include "Observable.hh"
 #include "Observer.hh"
 
-using SLIST_NAMESPACE::slist;
+using std::vector;
 
 /**
  * Notify all observers.
@@ -21,11 +23,10 @@
 void
 Observable::notifyObservers(Observation *observation)
 {
-    if (_observers.size()) {
-        slist<Observer*>::iterator it(_observers.begin());
-        for (; it != _observers.end(); ++it) {
-            (*it)->notify(this, observation);
-        }
+    vector<Observer*>::const_iterator it(_observers.begin());
+    vector<Observer*>::const_iterator end(_observers.end());
+    for (; it != end; ++it) {
+        (*it)->notify(this, observation);
     }
 }
 
@@ -35,7 +36,7 @@
 void
 Observable::addObserver(Observer *observer)
 {
-    _observers.push_front(observer);
+    _observers.push_back(observer);
 }
 
 /**
@@ -44,7 +45,5 @@
 void
 Observable::removeObserver(Observer *observer)
 {
-    if (_observers.size()) {
-        _observers.remove(observer);
-    }
+    _observers.erase(std::remove(_observers.begin(), _observers.end(), observer), _observers.end());
 }




--- pekwm/Observable.hh.orig
+++ pekwm/Observable.hh
@@ -9,11 +9,7 @@
 #ifndef _OBSERVABLE_HH_
 #define _OBSERVABLE_HH_
 
-#ifdef HAVE_SLIST
-#include <slist>
-#else // HAVE_EXT_SLIST
-#include <ext/slist>
-#endif // HAVE_SLIST
+#include <vector>
 
 class Observer;
 
@@ -36,7 +32,7 @@
     void removeObserver(Observer *observer); 
 
 private:
-    SLIST_NAMESPACE::slist<Observer*> _observers; /**< List of observers. */
+    std::vector<Observer*> _observers; /**< List of observers. */
 };
 
 #endif // _OBSERVABLE_HH_

Lines 1555-1559 Link Here

(-)x11-wm/ede/pkg-plist (-2 lines)
1555	@dirrm etc/xdg/ede	1555	@dirrm etc/xdg/ede
1556	@dirrmtry etc/xdg	1556	@dirrmtry etc/xdg
1557	@dirrm etc/pekwm	1557	@dirrm etc/pekwm
1558	@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
1559	@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime

Return to bug 184859

Lines 3-9 Link Here

(-)x11-wm/ede/Makefile (-18 / +28 lines)
3		3
4	PORTNAME= ede	4	PORTNAME= ede
5	PORTVERSION= 2.0	5	PORTVERSION= 2.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= x11-wm	7	CATEGORIES= x11-wm
8	MASTER_SITES= SF \	8	MASTER_SITES= SF \
9	SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib	9	SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib
Lines 16-36 Link Here
16	LICENSE= GPLv2 LGPL20	16	LICENSE= GPLv2 LGPL20
17	LICENSE_COMB= multi	17	LICENSE_COMB= multi
18		18
19	BUILD_DEPENDS= python:${PORTSDIR}/lang/python \	19	BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
20	doxygen:${PORTSDIR}/devel/doxygen \
21	jam:${PORTSDIR}/devel/jam \	20	jam:${PORTSDIR}/devel/jam \
22	update-mime-database:${PORTSDIR}/misc/shared-mime-info	21	python:${PORTSDIR}/lang/python
23	LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \	22	LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
24	curl:${PORTSDIR}/ftp/curl \	23	libcurl.so:${PORTSDIR}/ftp/curl \
25	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \	24	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
26	fltk.1:${PORTSDIR}/x11-toolkits/fltk	25	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
27	RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
28		26
29	OPTIONS_DEFINE= HAL	27	OPTIONS_DEFINE= HAL
30	HAL_DESC= Enable HAL support	28	HAL_DESC= Enable HAL support
31		29
		30	USES= iconv gettext pathfix pkgconfig shared-mime-info
32	USE_XORG= xcomposite xft xinerama xpm xrandr	31	USE_XORG= xcomposite xft xinerama xpm xrandr
33	USES= pathfix gettext pkgconfig
34	USE_PYTHON= yes	32	USE_PYTHON= yes
35	USE_FAM= yes	33	USE_FAM= yes
36	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
Lines 53-67 Link Here
53	HAL_LIB_DEPENDS= libhal.so.1:${PORTSDIR}/sysutils/hal	51	HAL_LIB_DEPENDS= libhal.so.1:${PORTSDIR}/sysutils/hal
54	HAL_CONFIGURE_OFF= --disable-hal	52	HAL_CONFIGURE_OFF= --disable-hal
55		53
56	# use multiple make jobs
57	_make_jobs= -j${MAKE_JOBS_NUMBER}
58
59	NO_STAGE= yes
60	post-patch:	54	post-patch:
61	@${REINPLACE_CMD} -e \	55	@${REINPLACE_CMD} -e \
62	's\|/usr/local/share\|${LOCALBASE}/share\| ; \	56	's\|/usr/local/share\|${LOCALBASE}/share\| ; \
63	/OPTIM_FLAGS=/s\|-O2\|-fPIC\| ; \	57	/OPTIM_FLAGS=/s\|-O2\|-fPIC\| ; \
64	s\|_daylight=yes\|_daylight=no\|' ${EDELIB_WRKSRC}/configure	58	s\|_daylight=yes\|_daylight=no\|' ${EDELIB_WRKSRC}/configure
		59	@${REINPLACE_CMD} -e \
		60	's\| -liconv\| ${ICONV_LIB}\|' ${WRKSRC}/configure
		61	@${REINPLACE_CMD} -e \
		62	's\|$$(CC)\|@CXX@\| ; \
		63	s\|-lstdc++\|\|' ${WRKSRC}/Jamconfig.in
65		64
66	pre-configure:	65	pre-configure:
67	@(cd ${EDELIB_WRKSRC} \	66	@(cd ${EDELIB_WRKSRC} \
Lines 75-88 Link Here
75		74
76	pre-build:	75	pre-build:
77	@(cd ${EDELIB_WRKSRC} \	76	@(cd ${EDELIB_WRKSRC} \
78	&& ${LOCALBASE}/bin/jam ${_make_jobs} \	77	&& ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER} \
79	&& ${LOCALBASE}/bin/jam ${INSTALL_TARGET})	78	&& ${LOCALBASE}/bin/jam ${INSTALL_TARGET})
80		79
81	do-build:	80	do-build:
82	@(cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam ${_make_jobs})	81	@(cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER})
83		82
84	do-install:	83	do-install:
85	@(cd ${INSTALL_WRKSRC} && ${LOCALBASE}/bin/jam ${INSTALL_TARGET})	84	@(cd ${INSTALL_WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" \
86	@-update-mime-database ${PREFIX}/share/mime	85	${LOCALBASE}/bin/jam ${INSTALL_TARGET})
		86	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images
		87	@(cd ${WRKSRC}/doc/manual/images && ${COPYTREE_SHARE} . \
		88	${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images)
		89	.for i in ede-about ede-autostart ede-bell-conf ede-bug-report ede-crasher \
		90	ede-calc ede-conf ede-desktop ede-desktop-conf ede-dialog \
		91	ede-keyboard-conf ede-notify-daemon ede-screensaver-conf \
		92	ede-image-view ede-launch emountd ede-timedate ede-tip \
		93	ede-tip-compiler ede-preferred-applications evoke ede-shutdown \
		94	ede-panel ede-menu-spec-test pekwm
		95	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
		96	.endfor
87		97
88	.include <bsd.port.mk>	98	.include <bsd.port.mk>

Line 0 Link Here

(-)x11-wm/ede/files/patch-pekwm__Observabe.cc (+50 lines)
	1	--- pekwm/Observable.cc.orig
	2	+++ pekwm/Observable.cc
	3	@@ -10,10 +10,12 @@
	4	#include "config.h"
	5	#endif // HAVE_CONFIG_H
	6
	7	+#include <algorithm>
	8	+
	9	#include "Observable.hh"
	10	#include "Observer.hh"
	11
	12	-using SLIST_NAMESPACE::slist;
	13	+using std::vector;
	14
	15	/**
	16	* Notify all observers.
	17	@@ -21,11 +23,10 @@
	18	void
	19	Observable::notifyObservers(Observation *observation)
	20	{
	21	- if (_observers.size()) {
	22	- slist<Observer*>::iterator it(_observers.begin());
	23	- for (; it != _observers.end(); ++it) {
	24	- (*it)->notify(this, observation);
	25	- }
	26	+ vector<Observer*>::const_iterator it(_observers.begin());
	27	+ vector<Observer*>::const_iterator end(_observers.end());
	28	+ for (; it != end; ++it) {
	29	+ (*it)->notify(this, observation);
	30	}
	31	}
	32
	33	@@ -35,7 +36,7 @@
	34	void
	35	Observable::addObserver(Observer *observer)
	36	{
	37	- _observers.push_front(observer);
	38	+ _observers.push_back(observer);
	39	}
	40
	41	/**
	42	@@ -44,7 +45,5 @@
	43	void
	44	Observable::removeObserver(Observer *observer)
	45	{
	46	- if (_observers.size()) {
	47	- _observers.remove(observer);
	48	- }
	49	+ _observers.erase(std::remove(_observers.begin(), _observers.end(), observer), _observers.end());
	50	}

Line 0 Link Here

(-)x11-wm/ede/files/patch-pekwm__Observabe.hh (+24 lines)
	1	--- pekwm/Observable.hh.orig
	2	+++ pekwm/Observable.hh
	3	@@ -9,11 +9,7 @@
	4	#ifndef _OBSERVABLE_HH_
	5	#define _OBSERVABLE_HH_
	6
	7	-#ifdef HAVE_SLIST
	8	-#include <slist>
	9	-#else // HAVE_EXT_SLIST
	10	-#include <ext/slist>
	11	-#endif // HAVE_SLIST
	12	+#include <vector>
	13
	14	class Observer;
	15
	16	@@ -36,7 +32,7 @@
	17	void removeObserver(Observer *observer);
	18
	19	private:
	20	- SLIST_NAMESPACE::slist<Observer> _observers; /< List of observers. /
	21	+ std::vector<Observer> _observers; /< List of observers. /
	22	};
	23
	24	#endif // _OBSERVABLE_HH_