Attachment #155289 for bug #199251

View | Details | Raw Unified | Return to bug 199251
Collapse All | Expand All





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

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 \

SHEBANG_FILES=	doc/asciidoc/asciidoc.py
python_OLD_CMD=	${SETENV} python
python_CMD=	${PYTHON_CMD}
USE_XORG=	xcomposite xft xinerama xkbfile xpm xrandr
USE_CSTD=	gnu89
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PEKWM_CXXFLAGS="${CXXFLAGS}" \

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|| ; \




--- ../edelib/src/WindowUtils.cpp.orig
+++ ../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()) {

Return to bug 199251

Lines 3-9 Link Here

(-)x11-wm/ede/Makefile (-4 / +5 lines)
3		3
4	PORTNAME= ede	4	PORTNAME= ede
5	PORTVERSION= 2.1	5	PORTVERSION= 2.1
6	PORTREVISION= 1	6	PORTREVISION= 2
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-23 Link Here
16	LICENSE= GPLv2 LGPL20	16	LICENSE= GPLv2 LGPL20
17	LICENSE_COMB= multi	17	LICENSE_COMB= multi
18		18
19	BROKEN= Fails to link, tries to use internal fltk symbols
20
21	BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \	19	BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
22	jam:${PORTSDIR}/devel/jam	20	jam:${PORTSDIR}/devel/jam
23	LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \	21	LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
Lines 30-36 Link Here
30	SHEBANG_FILES= doc/asciidoc/asciidoc.py	28	SHEBANG_FILES= doc/asciidoc/asciidoc.py
31	python_OLD_CMD= ${SETENV} python	29	python_OLD_CMD= ${SETENV} python
32	python_CMD= ${PYTHON_CMD}	30	python_CMD= ${PYTHON_CMD}
33	USE_XORG= xcomposite xft xinerama xpm xrandr	31	USE_XORG= xcomposite xft xinerama xkbfile xpm xrandr
34	USE_CSTD= gnu89	32	USE_CSTD= gnu89
35	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes
36	CONFIGURE_ENV= PEKWM_CXXFLAGS="${CXXFLAGS}" \	34	CONFIGURE_ENV= PEKWM_CXXFLAGS="${CXXFLAGS}" \
Lines 56-61 Link Here
56	EDELIB_DISTFILE=${EDELIB_DISTNAME}${EXTRACT_SUFX}	54	EDELIB_DISTFILE=${EDELIB_DISTNAME}${EXTRACT_SUFX}
57	EDELIB_WRKSRC= ${WRKDIR}/${EDELIB_DISTNAME}	55	EDELIB_WRKSRC= ${WRKDIR}/${EDELIB_DISTNAME}
58		56
		57	post-extract:
		58	@${LN} -sf ${EDELIB_WRKSRC} ${WRKDIR}/${EDELIB_NAME}
		59
59	post-patch:	60	post-patch:
60	@${REINPLACE_CMD} -e \	61	@${REINPLACE_CMD} -e \
61	'/DEVELOPER_FLAGS=/s\|-pedantic\|\| ; \	62	'/DEVELOPER_FLAGS=/s\|-pedantic\|\| ; \

Line 0 Link Here

(-)x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp (+45 lines)
	1	--- ../edelib/src/WindowUtils.cpp.orig
	2	+++ ../edelib/src/WindowUtils.cpp
	3	@@ -1,5 +1,5 @@
	4	/*
	5	- * $Id: WindowUtils.cpp 3106 2011-10-21 20:26:08Z karijes $
	6	+ * $Id: WindowUtils.cpp 3592 2014-12-02 12:48:07Z karijes $
	7	*
	8	* Window utils
	9	* Copyright (c) 1998-2006 by Bill Spitzak and others
	10	@@ -33,8 +33,10 @@
	11	* These are defined in FLTK as hidden variables for some internal hacks, but are used here.
	12	* XXX: possible changes in future FLTK versions
	13	*/
	14	+#if 0
	15	extern char fl_show_iconic;
	16	extern int fl_disable_transient_for;
	17	+#endif
	18
	19	EDELIB_NS_BEGIN
	20
	21	@@ -165,7 +167,7 @@
	22	XChangeProperty(fl_display, xp->xid, XA_WM_CLASS, XA_STRING, 8, 0, (unsigned char *)buffer, p-buffer-1);
	23	}
	24
	25	- if(win->non_modal() && xp->next && !fl_disable_transient_for) {
	26	+ if(win->non_modal() && xp->next /* && !fl_disable_transient_for */) {
	27	// find some other window to be "transient for":
	28	Fl_Window* wp = xp->next->w;
	29	while(wp->parent())
	30	@@ -193,13 +195,14 @@
	31	XWMHints *hints = XAllocWMHints();
	32	hints->input = True;
	33	hints->flags = InputHint;
	34	-
	35	+#if 0
	36	if(fl_show_iconic) {
	37	hints->flags \|= StateHint;
	38	hints->initial_state = IconicState;
	39	fl_show_iconic = 0;
	40	showit = 0;
	41	}
	42	+#endif
	43
	44	// This is not removed so it can be used with windows inherited from Fl_Window
	45	if(win->icon()) {