NetBSD Problem Report #16121
Received: (qmail 16880 invoked from network); 29 Mar 2002 23:56:20 -0000
Message-Id: <200203292356.g2TNuER14962@pr93.lublin.sdi.tpnet.pl>
Date: Sat, 30 Mar 2002 00:56:14 +0100 (CET)
From: doc@pr93.lublin.sdi.tpnet.pl
Reply-To: doc@pr93.lublin.sdi.tpnet.pl
To: gnats-bugs@gnats.netbsd.org
Subject: Fluxbox windowmanager upgrade
X-Send-Pr-Version: 3.95
>Number: 16121
>Category: pkg
>Synopsis: Fluxbox windowmanager upgrade
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Mar 29 23:57:00 +0000 2002
>Closed-Date: Wed May 08 14:44:07 +0000 2002
>Last-Modified: Wed May 13 13:29:29 +0000 2015
>Originator: michal@pasternak.w.lub.pl
>Release: NetBSD 1.5.3_RC1
>Organization:
/* Michal Pasternak, http://mp.w.lub.pl, +48606570000 */
>Environment:
System: NetBSD pr93.lublin.sdi.tpnet.pl 1.5.3_RC1 NetBSD 1.5.3_RC1 (ELEET) #0: Thu Mar 28 12:28:34 CET 2002 doc@pr93.lublin.sdi.tpnet.pl:/usr/src/sys/arch/i386/compile/ELEET i386
Architecture: i386
Machine: i386
>Description:
Update of fluxbox windowmanager package
>How-To-Repeat:
>Fix:
http://lublin.t1.pl/wm_fluxbox.tgz
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback
State-Changed-By: zuntum
State-Changed-When: Fri Mar 29 16:37:21 PST 2002
State-Changed-Why:
Please provide 'cvs diff' output instead of tarball when you're requesting package updates so the update can be done more easily.
From: =?iso-8859-2?Q?Micha=B3?= Pasternak <doc@lublin.t1.pl>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/16121
Date: Sat, 30 Mar 2002 13:13:12 +0100
Diff.
Index: fluxbox/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 2002/01/04 02:05:33 1.1.1.1
+++ Makefile 2002/03/30 12:00:08
@@ -1,20 +1,35 @@
# $NetBSD: Makefile,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
#
-DISTNAME= fluxbox-0.1.5
+DISTNAME= fluxbox-0.1.7
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
-MAINTAINER= jmcneill@invisible.yi.org
+MAINTAINER= michal@pasternak.w.lub.pl
HOMEPAGE= http://fluxbox.sourceforge.net/
COMMENT= Window Manager for X based on Blackbox
+GCC_VERSION!= ${CC} --version
+.if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3"
+.include "../../lang/gcc/Makefile.gcc"
+.endif
+
USE_BUILDLINK_ONLY= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
+
+CONFIGURE_ARGS+= --enable-kde --enable-gnome
+#CONFLICTS= blackbox-*
-CONFIGURE_ARGS+= --enable-kde
-CONFLICTS= blackbox-*
+post-install:
+ ${MKDIR} ${PREFIX}/share/doc/fluxbox/
+ ${CP} ${WRKDIR}/${DISTNAME}/data/README* \
+ ${WRKDIR}/${DISTNAME}/data/generate_menu \
+ ${WRKDIR}/${DISTNAME}/data/menu.in \
+ ${WRKDIR}/${DISTNAME}/data/menu.pre \
+ ${WRKDIR}/${DISTNAME}/data/init.in \
+ ${WRKDIR}/${DISTNAME}/data/titlebar \
+ ${PREFIX}/share/doc/fluxbox
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
Index: fluxbox/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST 2002/01/04 02:05:33 1.1.1.1
+++ PLIST 2002/03/30 12:00:08
@@ -10,6 +10,7 @@
share/fluxbox/nls/C/blackbox.cat
share/fluxbox/nls/POSIX
share/fluxbox/nls/US_ASCII
+share/fluxbox/nls/bg_BG
share/fluxbox/nls/da_DK/blackbox.cat
share/fluxbox/nls/en
share/fluxbox/nls/en_US
@@ -18,8 +19,10 @@
share/fluxbox/nls/et_EE/blackbox.cat
share/fluxbox/nls/fr
share/fluxbox/nls/fr_FR/blackbox.cat
-share/fluxbox/nls/it_IT
+share/fluxbox/nls/it_IT/blackbox.cat
+share/fluxbox/nls/ja_JP/blackbox.cat
share/fluxbox/nls/pt_BR/blackbox.cat
+share/fluxbox/nls/pt_PT/blackbox.cat
share/fluxbox/nls/ru_RU/blackbox.cat
share/fluxbox/nls/sv_SE/blackbox.cat
share/fluxbox/nls/tr_TR/blackbox.cat
@@ -45,15 +48,27 @@
share/fluxbox/styles/Twice
share/fluxbox/styles/qnx-photon
share/fluxbox/titlebar
+share/doc/fluxbox/README
+share/doc/fluxbox/README.menu
+share/doc/fluxbox/README.style
+share/doc/fluxbox/menu.in
+share/doc/fluxbox/menu.pre
+share/doc/fluxbox/generate_menu
+share/doc/fluxbox/init.in
+share/doc/fluxbox/titlebar
@dirrm share/fluxbox/styles
@dirrm share/fluxbox/nls/tr_TR
@dirrm share/fluxbox/nls/sv_SE
@dirrm share/fluxbox/nls/ru_RU
@dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/pt_PT
@dirrm share/fluxbox/nls/fr_FR
+@dirrm share/fluxbox/nls/ja_JP
+@dirrm share/fluxbox/nls/it_IT
@dirrm share/fluxbox/nls/et_EE
@dirrm share/fluxbox/nls/es_ES
@dirrm share/fluxbox/nls/da_DK
@dirrm share/fluxbox/nls/C
@dirrm share/fluxbox/nls
@dirrm share/fluxbox
+@dirrm share/doc/fluxbox
Index: fluxbox/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 2002/01/04 02:05:33 1.1.1.1
+++ distinfo 2002/03/30 12:00:08
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
-SHA1 (fluxbox-0.1.5.tar.gz) = 6ff53154dffa7b43c45d0f41c76c30373424d764
-Size (fluxbox-0.1.5.tar.gz) = 332234 bytes
-SHA1 (patch-aa) = 03ce0369139c0aee22df2a6e5c5e2c24d06ff1f3
-SHA1 (patch-ab) = 0a61ec2f94ec5d54e071a064a5b0034815800c04
-SHA1 (patch-ac) = 746e8af05d9ada9323beb46546f96db1e0b8e2af
+SHA1 (fluxbox-0.1.7.tar.gz) = 46369195bbe654e677558d5a64f33f1d9369a114
+Size (fluxbox-0.1.7.tar.gz) = 430253 bytes
+SHA1 (patch-aa) = 587ab0f6bf65a5c5a8f48e305296202ae36cec2c
+SHA1 (patch-ab) = bab25d0907a17828fbe4c2ef18127d65b5ab53e1
+SHA1 (patch-ac) = 03ce0369139c0aee22df2a6e5c5e2c24d06ff1f3
Index: fluxbox/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patch-aa 2002/01/04 02:05:33 1.1.1.1
+++ patch-aa 2002/03/30 12:00:08
@@ -1,17 +1,47 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
-
---- src/i18n.hh.orig Sat Dec 29 01:30:44 2001
-+++ src/i18n.hh Sat Dec 29 01:31:16 2001
-@@ -58,7 +58,12 @@
-
- inline const int &multibyte(void) const { return mb; }
+$NetBSD$
+--- src/fluxbox.hh~ Fri Mar 1 16:28:56 2002
++++ src/fluxbox.hh Fri Mar 29 19:52:21 2002
+@@ -88,6 +88,22 @@
+ #include <string>
+ #include <vector>
-+#ifndef __NetBSD__
-+ /*
-+ * Compilation dies here on NetBSD -- luckily, nothing uses this function
-+ */
- inline const nl_catd &getCatalogFd(void) const { return catalog_fd; }
-+#endif // __NetBSD__
++ template <class Z>
++ class DataSearch {
++ private:
++ Window window;
++ Z *data;
++
++
++ public:
++ DataSearch(Window w, Z *d) { window = w; data = d; }
++
++ inline const Window &getWindow(void) const { return window; }
++ inline Z *getData(void) { return data; }
++ };
++
++
++
+ class Fluxbox : public BaseDisplay, public TimeoutHandler {
+ public:
+
+@@ -187,20 +203,6 @@
- const char *getMessage(int, int, const char * = 0);
- void openCatalog(const char *);
+ enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
+ #endif // HAVE_STRFTIME
+-
+- template <class Z>
+- class DataSearch {
+- private:
+- Window window;
+- Z *data;
+-
+-
+- public:
+- DataSearch(Window w, Z *d) { window = w; data = d; }
+-
+- inline const Window &getWindow(void) const { return window; }
+- inline Z *getData(void) { return data; }
+- };
+
+ typedef std::vector<Fluxbox::Titlebar> TitlebarList;
+
Index: fluxbox/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patch-ab 2002/01/04 02:05:33 1.1.1.1
+++ patch-ab 2002/03/30 12:00:08
@@ -1,27 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
-
---- src/misc.cc.orig Thu Dec 27 04:05:34 2001
-+++ src/misc.cc Thu Dec 27 04:02:59 2001
-@@ -390,8 +390,10 @@
- void DrawString(Display *display, Window w, GC gc, FFont *font,
- unsigned int text_w, unsigned int size_w,
- unsigned int bevel_w, char *text) {
--//Draw title string
-
-+ if (!text || text_w<1 || size_w < 1 || !font || !display)
-+ return;
-+
- unsigned int l = text_w;
- int dlen=strlen(text);
- int dx=bevel_w*2;
-@@ -446,7 +448,9 @@
- unsigned int align, unsigned int text_w,
- unsigned int size_w, unsigned int size_h,
- unsigned int bevel_w, char *text) {
--
-+ if (!text || text_w<1 || size_w < 1 || !font || !display)
-+ return;
-+
- unsigned int l = text_w;
- int dlen = strlen(text);
- int dx = bevel_w * 2;
+$NetBSD$
+--- src/Screen.cc Thu Feb 28 16:46:01 2002
++++ src/Screen.cc Fri Mar 8 12:19:20 2002
+@@ -879,4 +879,5 @@
+ if ((*it)->getWindowID() == w) {
+- Netizen *n = *netizenList.erase(it);
++ Netizen *n = *it;
+ delete n;
++ netizenList.erase(it);
+ break;
Index: fluxbox/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fluxbox/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patch-ac 2002/01/04 02:05:33 1.1.1.1
+++ patch-ac 2002/03/30 12:00:08
@@ -1,47 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+$NetBSD: patch-aa,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
---- src/fluxbox.hh.orig Thu Dec 27 04:19:09 2001
-+++ src/fluxbox.hh Thu Dec 27 04:21:26 2001
-@@ -87,6 +87,20 @@
- #include <string>
- #include <vector>
+--- src/i18n.hh.orig Sat Dec 29 01:30:44 2001
++++ src/i18n.hh Sat Dec 29 01:31:16 2001
+@@ -58,7 +58,12 @@
+
+ inline const int &multibyte(void) const { return mb; }
-+template <class Z>
-+class DataSearch {
-+ private:
-+ Window window;
-+ Z *data;
-+
-+
-+ public:
-+ DataSearch(Window w, Z *d) { window = w; data = d; }
-+
-+ inline const Window &getWindow(void) const { return window; }
-+ inline Z *getData(void) { return data; }
-+};
-+
- class Fluxbox : public BaseDisplay, public TimeoutHandler {
- public:
-
-@@ -191,21 +205,6 @@
- enum { B_AmericanDate = 1, B_EuropeanDate };
- #endif // HAVE_STRFTIME
-
-- template <class Z>
-- class DataSearch {
-- private:
-- Window window;
-- Z *data;
--
--
-- public:
-- DataSearch(Window w, Z *d) { window = w; data = d; }
--
-- inline const Window &getWindow(void) const { return window; }
-- inline Z *getData(void) { return data; }
-- };
--
--
- private:
- typedef struct MenuTimestamp {
- char *filename;
++#ifndef __NetBSD__
++ /*
++ * Compilation dies here on NetBSD -- luckily, nothing uses this function
++ */
+ inline const nl_catd &getCatalogFd(void) const { return catalog_fd; }
++#endif // __NetBSD__
+
+ const char *getMessage(int, int, const char * = 0);
+ void openCatalog(const char *);
--
/* Michal Pasternak, http://mp.w.lub.pl, +48606570000 */
State-Changed-From-To: feedback->open
State-Changed-By: wiz
State-Changed-When: Wed May 8 04:31:54 PDT 2002
State-Changed-Why:
Feedback supplied.
State-Changed-From-To: open->closed
State-Changed-By: wiz
State-Changed-When: Wed May 8 07:43:45 PDT 2002
State-Changed-Why:
fluxbox package is at 0.1.8. thanks for the PR.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.