From 5014ef45c390eeff88fd16ec608ddf7a39694e3e Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Sun, 24 Nov 2002 22:07:56 +0000 Subject: - Add back knob for unofficial remember patch - Add Xft patch - bump PORTREVISION PR: ports/45685 Submitted by: maintainer --- x11-wm/fluxbox-devel/Makefile | 17 +++++++++++++++++ x11-wm/fluxbox-devel/distinfo | 1 + x11-wm/fluxbox-devel/files/patch-src::Font.cc | 11 +++++++++++ x11-wm/fluxbox-devel/files/patch-src::Screen.cc | 19 +++++++++++++++++++ x11-wm/fluxbox/Makefile | 17 +++++++++++++++++ x11-wm/fluxbox/distinfo | 1 + x11-wm/fluxbox/files/patch-src::Font.cc | 11 +++++++++++ x11-wm/fluxbox/files/patch-src::Screen.cc | 19 +++++++++++++++++++ 8 files changed, 96 insertions(+) create mode 100644 x11-wm/fluxbox-devel/files/patch-src::Font.cc create mode 100644 x11-wm/fluxbox-devel/files/patch-src::Screen.cc create mode 100644 x11-wm/fluxbox/files/patch-src::Font.cc create mode 100644 x11-wm/fluxbox/files/patch-src::Screen.cc (limited to 'x11-wm') diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile index 388669a17a49..df7dc4c56c40 100644 --- a/x11-wm/fluxbox-devel/Makefile +++ b/x11-wm/fluxbox-devel/Makefile @@ -7,18 +7,32 @@ PORTNAME= fluxbox PORTVERSION= 0.1.13 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +.if defined(WITH_REMEMBER) +PATCH_SITES= http://www.raisdorf.net/files/FreeBSD/ +PATCHFILES= remember-patch-0.1.13.gz +PATCH_DIST_STRIP= -p1 +.endif + MAINTAINER= hendrik@scholz.net RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools +.if defined(WITH_REMEMBER) +BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 +.endif USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOMENG= yes WANT_GNOME= yes +.if defined(WITH_REMEMBER) +USE_GMAKE= yes +CONFIGURE_ENV= AUTOMAKE="${AUTOMAKE}" +.endif CONFIGURE_ARGS= --disable-newwmspec .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde @@ -44,6 +58,9 @@ pre-everything:: .endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" +.endif +.if !defined(WITH_REMEMBER) + @${ECHO_CMD} "WITH_REMEMBER - Enable the unofficial remember patch" .endif @${ECHO_CMD} "" diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo index 001d0b366ba3..f2d48e02ab2a 100644 --- a/x11-wm/fluxbox-devel/distinfo +++ b/x11-wm/fluxbox-devel/distinfo @@ -1 +1,2 @@ MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083 +MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63 diff --git a/x11-wm/fluxbox-devel/files/patch-src::Font.cc b/x11-wm/fluxbox-devel/files/patch-src::Font.cc new file mode 100644 index 000000000000..f4a567db7071 --- /dev/null +++ b/x11-wm/fluxbox-devel/files/patch-src::Font.cc @@ -0,0 +1,11 @@ +--- src/Font.cc.orig Fri Oct 25 23:07:07 2002 ++++ src/Font.cc Sun Nov 24 18:23:28 2002 +@@ -140,7 +140,7 @@ + if (name == 0) + return false; + bool ret_val = m_fontimp->load(name); +- if (ret_val && name == 0) { //prevent from having a bad fontimp ++ if (ret_val && name != 0) { //prevent from having a bad fontimp + m_fontstr = name; // if the load really succeded then set font string + } else { + m_fontstr = ""; diff --git a/x11-wm/fluxbox-devel/files/patch-src::Screen.cc b/x11-wm/fluxbox-devel/files/patch-src::Screen.cc new file mode 100644 index 000000000000..d0b73e2c6c6b --- /dev/null +++ b/x11-wm/fluxbox-devel/files/patch-src::Screen.cc @@ -0,0 +1,19 @@ +--- 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 { diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 388669a17a49..df7dc4c56c40 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -7,18 +7,32 @@ PORTNAME= fluxbox PORTVERSION= 0.1.13 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +.if defined(WITH_REMEMBER) +PATCH_SITES= http://www.raisdorf.net/files/FreeBSD/ +PATCHFILES= remember-patch-0.1.13.gz +PATCH_DIST_STRIP= -p1 +.endif + MAINTAINER= hendrik@scholz.net RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools +.if defined(WITH_REMEMBER) +BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 +.endif USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOMENG= yes WANT_GNOME= yes +.if defined(WITH_REMEMBER) +USE_GMAKE= yes +CONFIGURE_ENV= AUTOMAKE="${AUTOMAKE}" +.endif CONFIGURE_ARGS= --disable-newwmspec .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde @@ -44,6 +58,9 @@ pre-everything:: .endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" +.endif +.if !defined(WITH_REMEMBER) + @${ECHO_CMD} "WITH_REMEMBER - Enable the unofficial remember patch" .endif @${ECHO_CMD} "" diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo index 001d0b366ba3..f2d48e02ab2a 100644 --- a/x11-wm/fluxbox/distinfo +++ b/x11-wm/fluxbox/distinfo @@ -1 +1,2 @@ MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083 +MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63 diff --git a/x11-wm/fluxbox/files/patch-src::Font.cc b/x11-wm/fluxbox/files/patch-src::Font.cc new file mode 100644 index 000000000000..f4a567db7071 --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src::Font.cc @@ -0,0 +1,11 @@ +--- src/Font.cc.orig Fri Oct 25 23:07:07 2002 ++++ src/Font.cc Sun Nov 24 18:23:28 2002 +@@ -140,7 +140,7 @@ + if (name == 0) + return false; + bool ret_val = m_fontimp->load(name); +- if (ret_val && name == 0) { //prevent from having a bad fontimp ++ if (ret_val && name != 0) { //prevent from having a bad fontimp + m_fontstr = name; // if the load really succeded then set font string + } else { + m_fontstr = ""; diff --git a/x11-wm/fluxbox/files/patch-src::Screen.cc b/x11-wm/fluxbox/files/patch-src::Screen.cc new file mode 100644 index 000000000000..d0b73e2c6c6b --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src::Screen.cc @@ -0,0 +1,19 @@ +--- 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 { -- cgit v1.2.3