Attachment #26826 for bug #45685

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

Lines 7-24 Link Here

(-)fluxbox/Makefile (+17 lines)
7		7
8	PORTNAME= fluxbox	8	PORTNAME= fluxbox
9	PORTVERSION= 0.1.13	9	PORTVERSION= 0.1.13
		10	PORTREVISION= 1
10	CATEGORIES= x11-wm	11	CATEGORIES= x11-wm
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
13		14
		15	.if defined(WITH_REMEMBER)
		16	PATCH_SITES= http://www.raisdorf.net/files/FreeBSD/
		17	PATCHFILES= remember-patch-0.1.13.gz
		18	PATCH_DIST_STRIP= -p1
		19	.endif
		20
14	MAINTAINER= hendrik@scholz.net	21	MAINTAINER= hendrik@scholz.net
15		22
16	RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools	23	RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools
		24	.if defined(WITH_REMEMBER)
		25	BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14
		26	.endif
17		27
18	USE_X_PREFIX= yes	28	USE_X_PREFIX= yes
19	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
20	USE_GNOMENG= yes	30	USE_GNOMENG= yes
21	WANT_GNOME= yes	31	WANT_GNOME= yes
		32	.if defined(WITH_REMEMBER)
		33	USE_GMAKE= yes
		34	CONFIGURE_ENV= AUTOMAKE="${AUTOMAKE}"
		35	.endif
22	CONFIGURE_ARGS= --disable-newwmspec	36	CONFIGURE_ARGS= --disable-newwmspec
23	.if defined(WITH_KDE) \|\| defined(PACKAGE_BUILDING)	37	.if defined(WITH_KDE) \|\| defined(PACKAGE_BUILDING)
24	CONFIGURE_ARGS+= --enable-kde	38	CONFIGURE_ARGS+= --enable-kde
Lines 44-49 Link Here
44	.endif	58	.endif
45	.if !defined(WITH_KDE)	59	.if !defined(WITH_KDE)
46	@${ECHO_CMD} "WITH_KDE - Enable KDE slit support"	60	@${ECHO_CMD} "WITH_KDE - Enable KDE slit support"
		61	.endif
		62	.if !defined(WITH_REMEMBER)
		63	@${ECHO_CMD} "WITH_REMEMBER - Enable the unofficial remember patch"
47	.endif	64	.endif
48	@${ECHO_CMD} ""	65	@${ECHO_CMD} ""
49		66

Line 1 Link Here

(-)fluxbox/distinfo (+1 lines)
1	MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083	1	MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
		2	MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63

Line 0 Link Here

(-)fluxbox/files/patch-src::Font.cc (+11 lines)
	1	--- src/Font.cc.orig Fri Oct 25 23:07:07 2002
	2	+++ src/Font.cc Sun Nov 24 18:23:28 2002
	3	@@ -140,7 +140,7 @@
	4	if (name == 0)
	5	return false;
	6	bool ret_val = m_fontimp->load(name);
	7	- if (ret_val && name == 0) { //prevent from having a bad fontimp
	8	+ if (ret_val && name != 0) { //prevent from having a bad fontimp
	9	m_fontstr = name; // if the load really succeded then set font string
	10	} else {
	11	m_fontstr = "";




--- src/Screen.cc.orig	Sun Nov 17 12:27:50 2002
+++ src/Screen.cc	Sun Nov 24 18:23:28 2002
@@ -284,7 +284,7 @@
 	image_control->setDither(*resource.image_dither);
 	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(), 
 			image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
-
+	theme->reconfigure(*resource.antialias);
 
 	const char *s =	i18n->getMessage(
 		FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
@@ -447,7 +447,6 @@
 
 	XFree(children);
 	XFlush(getBaseDisplay()->getXDisplay());
-	theme->reconfigure(*resource.antialias);
 }
 
 namespace {

Return to bug 45685

Line 0 Link Here

(-)fluxbox/files/patch-src::Screen.cc (+19 lines)
	1	--- src/Screen.cc.orig Sun Nov 17 12:27:50 2002
	2	+++ src/Screen.cc Sun Nov 24 18:23:28 2002
	3	@@ -284,7 +284,7 @@
	4	image_control->setDither(*resource.image_dither);
	5	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(),
	6	image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
	7	-
	8	+ theme->reconfigure(*resource.antialias);
	9
	10	const char *s = i18n->getMessage(
	11	FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
	12	@@ -447,7 +447,6 @@
	13
	14	XFree(children);
	15	XFlush(getBaseDisplay()->getXDisplay());
	16	- theme->reconfigure(*resource.antialias);
	17	}
	18
	19	namespace {