Attachment 155289 Details for Bug 199251 – x11-wm_ede.diff

[patch] x11-wm_ede.diff

x11-wm_ede.diff (text/plain), 2.84 KB, created by tkato432 on 2015-04-06 18:57:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-04-06 18:57:34 UTC

Size: 2.84 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/ede/Makefile x11-wm/ede/Makefile
>--- /usr/ports/x11-wm/ede/Makefile	2015-02-15 02:35:07.138068000 +0900
>+++ x11-wm/ede/Makefile	2015-04-07 00:00:00.000000000 +0900
>@@ -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 @@
> 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,7 +28,7 @@
> 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}" \
>@@ -56,6 +54,9 @@
> 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|| ; \
>diff -urN /usr/ports/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp
>--- /usr/ports/x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ x11-wm/ede/files/patch-edelib__src__WindowUtils.cpp	2015-04-07 00:00:00.000000000 +0900
>@@ -0,0 +1,45 @@
>+--- ../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()) {

Actions: View | Diff

Attachments on bug 199251: 155289