[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
fluxbox update to 0.9.11
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: fluxbox update to 0.9.11
- From: Matthieu Herrb <matthieu_(_dot_)_herrb_(_at_)_laas_(_dot_)_fr>
- Date: Sat, 15 Jan 2005 18:30:55 +0100
Hi
The following patch, which contains parts by espie, parts by me:
- updates the fluxbox port to 0.9.11
- removes build dependency on gmake
- fixes some of the 64 bit issues with XChangeProperty() and friends I
found.
--
Matthieu
Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/fluxbox/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 17 Dec 2004 15:18:32 -0000 1.31
+++ Makefile 15 Jan 2005 17:30:37 -0000
@@ -2,7 +2,7 @@
COMMENT= "window manager based on the original Blackbox code"
-VERSION= 0.9.9
+VERSION= 0.9.11
DISTNAME= fluxbox-${VERSION}
CATEGORIES= x11
@@ -22,11 +22,15 @@
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS= --enable-kde --enable-xinerama
-USE_GMAKE= Yes
+#USE_GMAKE= Yes
USE_X11= Yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
+SEPARATE_BUILD= simple
+
+CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
+
+
+#CPPFLAGS="-I${LOCALBASE}/include"
+#LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/fluxbox/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 5 Jan 2005 17:53:54 -0000 1.18
+++ distinfo 15 Jan 2005 17:30:37 -0000
@@ -1,4 +1,5 @@
-MD5 (fluxbox-0.9.9.tar.gz) = b0c637b1b6baa646f99877321b5d9e53
-RMD160 (fluxbox-0.9.9.tar.gz) = 3cb4ad83b8870de0bce9d7cd340e56801db62e39
-SHA1 (fluxbox-0.9.9.tar.gz) = c3feff5bbed1d9e4512618db16bcd1964500d44e
+MD5 (fluxbox-0.9.11.tar.gz) = 453e9170a6ab0a4df91ffaccd1604465
+RMD160 (fluxbox-0.9.11.tar.gz) = 60d37766e50871fb366f3828c55e94173c09f850
+SHA1 (fluxbox-0.9.11.tar.gz) = 92f7b4d9b39d8ee3fc05ee57d50b67696dd3cd69
+SIZE (fluxbox-0.9.11.tar.gz) = 851770
SIZE (fluxbox-0.9.9.tar.gz) = 723342
Index: patches/patch-nls_Makefile_am
===================================================================
RCS file: patches/patch-nls_Makefile_am
diff -N patches/patch-nls_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nls_Makefile_am 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- nls/Makefile.am.orig Mon Jan 10 04:06:57 2005
++++ nls/Makefile.am Mon Jan 10 04:07:17 2005
+@@ -17,5 +17,5 @@ distclean-local:
+ rm -f *\~
+
+ fluxbox-nls.hh:
+- chmod +x nlsinfo
+- ./nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
++ chmod +x ${srcdir}/nlsinfo
++ ${srcdir}/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
Index: patches/patch-nls_Makefile_in
===================================================================
RCS file: patches/patch-nls_Makefile_in
diff -N patches/patch-nls_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nls_Makefile_in 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- nls/Makefile.in.orig Mon Jan 10 04:07:22 2005
++++ nls/Makefile.in Mon Jan 10 04:07:47 2005
+@@ -361,8 +361,8 @@ distclean-local:
+ rm -f *\~
+
+ fluxbox-nls.hh:
+- chmod +x nlsinfo
+- ./nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
++ chmod +x ${srcdir}/nlsinfo
++ ${srcdir}/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-src_Ewmh_cc
===================================================================
RCS file: patches/patch-src_Ewmh_cc
diff -N patches/patch-src_Ewmh_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Ewmh_cc 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,56 @@
+--- src/Ewmh.cc.orig Fri Nov 19 13:01:35 2004
++++ src/Ewmh.cc Tue Jan 11 00:19:48 2005
+@@ -399,7 +399,7 @@ void Ewmh::updateCurrentWorkspace(BScree
+ * This MUST be set and updated by the Window Manager.
+ *
+ */
+- unsigned int workspace = screen.currentWorkspaceID();
++ unsigned long workspace = screen.currentWorkspaceID();
+ screen.rootWindow().changeProperty(m_net_current_desktop,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+@@ -416,7 +416,7 @@ void Ewmh::updateWorkspaceCount(BScreen
+ * Window Manager to indicate the number of virtual
+ * desktops.
+ */
+- unsigned int numworkspaces = screen.getCount();
++ unsigned long numworkspaces = screen.getCount();
+ screen.rootWindow().changeProperty(m_net_number_of_desktops,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+@@ -434,7 +434,7 @@ void Ewmh::updateViewPort(BScreen &scree
+ * desktops, this MUST always be set to (0,0).
+ *
+ */
+- int value[2] = {0, 0}; // we dont support large desktops
++ long value[2] = {0, 0}; // we dont support large desktops
+ screen.rootWindow().changeProperty(m_net_desktop_viewport,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+@@ -454,7 +454,7 @@ void Ewmh::updateGeometry(BScreen &scree
+ * Window Manager.
+ *
+ */
+- int value[2] = {screen.width(), screen.height()};
++ long value[2] = {screen.width(), screen.height()};
+ screen.rootWindow().changeProperty(m_net_desktop_geometry,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+@@ -481,7 +481,7 @@ void Ewmh::updateWorkarea(BScreen &scree
+ * Not sure how to handle xinerama stuff here.
+ * So i'm just doing this on the first head.
+ */
+- unsigned int *coords = new unsigned int[4*screen.getCount()];
++ unsigned long *coords = new unsigned long[4*screen.getCount()];
+ for (unsigned int i=0; i<screen.getCount()*4; i+=4) {
+ // x, y
+ coords[i] = screen.maxLeft(0);
+@@ -520,7 +520,7 @@ void Ewmh::updateHints(FluxboxWindow &wi
+ }
+
+ void Ewmh::updateWorkspace(FluxboxWindow &win) {
+- int workspace = win.workspaceNumber();
++ long workspace = win.workspaceNumber();
+ if (win.isStuck())
+ workspace = 0xFFFFFFFF; // appear on all desktops/workspaces
+
Index: patches/patch-src_FbCommands_cc
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/fluxbox/patches/patch-src_FbCommands_cc,v
retrieving revision 1.3
diff -u -r1.3 patch-src_FbCommands_cc
--- patches/patch-src_FbCommands_cc 28 Apr 2004 18:10:34 -0000 1.3
+++ patches/patch-src_FbCommands_cc 15 Jan 2005 17:30:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_FbCommands_cc,v 1.3 2004/04/28 18:10:34 robert Exp $
---- src/FbCommands.cc.orig Sun Apr 18 13:51:59 2004
-+++ src/FbCommands.cc Sun Apr 18 13:53:17 2004
-@@ -65,7 +65,7 @@
+--- src/FbCommands.cc.orig Tue Nov 30 21:25:11 2004
++++ src/FbCommands.cc Tue Jan 11 00:16:40 2005
+@@ -131,7 +131,7 @@ void ExecuteCmd::execute() {
displaystring += intbuff;
setsid();
putenv(const_cast<char *>(displaystring.c_str()));
Index: patches/patch-src_FbTk_FbPixmap_cc
===================================================================
RCS file: patches/patch-src_FbTk_FbPixmap_cc
diff -N patches/patch-src_FbTk_FbPixmap_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_FbTk_FbPixmap_cc 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,11 @@
+--- src/FbTk/FbPixmap.cc.orig Fri Nov 19 13:01:39 2004
++++ src/FbTk/FbPixmap.cc Tue Jan 11 00:16:40 2005
+@@ -286,7 +286,7 @@ Pixmap FbPixmap::getRootPixmap(int scree
+ Atom real_type;
+ int real_format;
+ unsigned long items_read, items_left;
+- unsigned int *data;
++ unsigned long *data;
+
+ unsigned int prop = 0;
+ static const char* prop_ids[] = {
Index: patches/patch-src_Gnome_cc
===================================================================
RCS file: patches/patch-src_Gnome_cc
diff -N patches/patch-src_Gnome_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Gnome_cc 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,36 @@
+--- src/Gnome.cc.orig Fri Nov 19 13:01:35 2004
++++ src/Gnome.cc Tue Jan 11 00:16:40 2005
+@@ -234,13 +234,13 @@ void Gnome::updateCurrentWorkspace(BScre
+ }
+
+ void Gnome::updateWorkspaceCount(BScreen &screen) {
+- int numworkspaces = screen.getCount();
++ long numworkspaces = screen.getCount();
+ screen.rootWindow().changeProperty(m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *)&numworkspaces, 1);
+ }
+
+ void Gnome::updateWorkspace(FluxboxWindow &win) {
+- int val = win.workspaceNumber();
++ long val = win.workspaceNumber();
+ if (win.isStuck()) {
+ val = -1;
+ }
+@@ -259,7 +259,7 @@ void Gnome::updateWorkspace(FluxboxWindo
+
+ void Gnome::updateState(FluxboxWindow &win) {
+ //translate to gnome win state
+- int state=0;
++ long state=0;
+ if (win.isStuck())
+ state |= WIN_STATE_STICKY;
+ if (win.isIconic())
+@@ -279,7 +279,7 @@ void Gnome::updateState(FluxboxWindow &w
+ void Gnome::updateLayer(FluxboxWindow &win) {
+ //TODO - map from flux layers to gnome ones
+ // our layers are in the opposite direction to GNOME
+- int layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum();
++ long layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum();
+
+ FluxboxWindow::ClientList::iterator client_it = win.clientList().begin();
+ FluxboxWindow::ClientList::iterator client_it_end = win.clientList().end();
Index: patches/patch-src_Window_hh
===================================================================
RCS file: patches/patch-src_Window_hh
diff -N patches/patch-src_Window_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Window_hh 15 Jan 2005 17:30:37 -0000
@@ -0,0 +1,19 @@
+--- src/Window.hh.orig Tue Nov 30 21:25:11 2004
++++ src/Window.hh Tue Jan 11 00:16:40 2005
+@@ -143,13 +143,13 @@ public:
+
+ typedef struct _blackbox_hints {
+ unsigned long flags, attrib, workspace, stack;
+- int decoration;
++ long decoration;
+ } BlackboxHints;
+
+ typedef struct _blackbox_attributes {
+ unsigned long flags, attrib, workspace, stack;
+- int premax_x, premax_y;
+- unsigned int premax_w, premax_h;
++ long premax_x, premax_y;
++ unsigned long premax_w, premax_h;
+ } BlackboxAttributes;
+
+ typedef std::list<WinClient *> ClientList;
Index: patches/patch-util_fbrun_FbRun_cc
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/fluxbox/patches/patch-util_fbrun_FbRun_cc,v
retrieving revision 1.2
diff -u -r1.2 patch-util_fbrun_FbRun_cc
--- patches/patch-util_fbrun_FbRun_cc 28 Apr 2004 18:10:34 -0000 1.2
+++ patches/patch-util_fbrun_FbRun_cc 15 Jan 2005 17:30:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_fbrun_FbRun_cc,v 1.2 2004/04/28 18:10:34 robert Exp $
---- util/fbrun/FbRun.cc.orig Sun Apr 18 14:00:22 2004
-+++ util/fbrun/FbRun.cc Sun Apr 18 14:00:39 2004
-@@ -110,7 +110,7 @@
+--- util/fbrun/FbRun.cc.orig Fri Nov 19 13:01:44 2004
++++ util/fbrun/FbRun.cc Tue Jan 11 00:16:40 2005
+@@ -117,7 +117,7 @@ void FbRun::run(const std::string &comma
// fork and execute program
if (!fork()) {
setsid();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- pkg/PLIST 18 Sep 2004 13:19:26 -0000 1.13
+++ pkg/PLIST 15 Jan 2005 17:30:37 -0000
@@ -17,50 +17,6 @@
share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
-share/fluxbox/nls/
-share/fluxbox/nls/C/
-share/fluxbox/nls/C/fluxbox.cat
-share/fluxbox/nls/POSIX
-share/fluxbox/nls/US_ASCII
-share/fluxbox/nls/bg_BG/
-share/fluxbox/nls/bg_BG/fluxbox.cat
-share/fluxbox/nls/da_DK/
-share/fluxbox/nls/da_DK/fluxbox.cat
-share/fluxbox/nls/de_DE/
-share/fluxbox/nls/de_DE/fluxbox.cat
-share/fluxbox/nls/en
-share/fluxbox/nls/en_US
-share/fluxbox/nls/es
-share/fluxbox/nls/es_ES/
-share/fluxbox/nls/es_ES/fluxbox.cat
-share/fluxbox/nls/et_EE/
-share/fluxbox/nls/et_EE/fluxbox.cat
-share/fluxbox/nls/fr
-share/fluxbox/nls/fr_FR/
-share/fluxbox/nls/fr_FR/fluxbox.cat
-share/fluxbox/nls/it_IT/
-share/fluxbox/nls/it_IT/fluxbox.cat
-share/fluxbox/nls/ja_JP/
-share/fluxbox/nls/ja_JP/fluxbox.cat
-share/fluxbox/nls/lv
-share/fluxbox/nls/lv_LV/
-share/fluxbox/nls/lv_LV/fluxbox.cat
-share/fluxbox/nls/nl_NL/
-share/fluxbox/nls/nl_NL/fluxbox.cat
-share/fluxbox/nls/pl_PL/
-share/fluxbox/nls/pl_PL/fluxbox.cat
-share/fluxbox/nls/pt_BR/
-share/fluxbox/nls/pt_BR/fluxbox.cat
-share/fluxbox/nls/pt_PT/
-share/fluxbox/nls/pt_PT/fluxbox.cat
-share/fluxbox/nls/ru_RU/
-share/fluxbox/nls/ru_RU/fluxbox.cat
-share/fluxbox/nls/sl_SI/
-share/fluxbox/nls/sl_SI/fluxbox.cat
-share/fluxbox/nls/sv_SE/
-share/fluxbox/nls/sv_SE/fluxbox.cat
-share/fluxbox/nls/tr_TR/
-share/fluxbox/nls/tr_TR/fluxbox.cat
share/fluxbox/styles/
share/fluxbox/styles/Artwiz
share/fluxbox/styles/BlueFlux/
Visit your host, monkey.org