[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
UPDATE: fluxbox-0.9.13
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: UPDATE: fluxbox-0.9.13
- From: David Krause <openbsd_(_at_)_davidkrause_(_dot_)_com>
- Date: Sun, 15 May 2005 18:26:04 -0500
I believe all the patches have been integrated upstream. I'm checking
again to make sure though. There is some issue with fbgm (it now uses
grep -m, which we don't have).
David
Index: x11/fluxbox/Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- x11/fluxbox/Makefile 7 Feb 2005 18:20:12 -0000 1.33
+++ x11/fluxbox/Makefile 15 May 2005 21:18:11 -0000
@@ -2,7 +2,7 @@
COMMENT= "window manager based on the original Blackbox code"
-VERSION= 0.9.12
+VERSION= 0.9.13
DISTNAME= fluxbox-${VERSION}
CATEGORIES= x11
Index: x11/fluxbox/distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- x11/fluxbox/distinfo 23 Jan 2005 12:44:10 -0000 1.19
+++ x11/fluxbox/distinfo 15 May 2005 21:18:11 -0000
@@ -1,4 +1,4 @@
-MD5 (fluxbox-0.9.12.tar.gz) = e4e6821d9e7a4b3f64c0d8069dbff8b8
-RMD160 (fluxbox-0.9.12.tar.gz) = c382f1dcf4de23c75142bda2d752924bc4071428
-SHA1 (fluxbox-0.9.12.tar.gz) = 5030d5c443f280a48f728535c45bd3a0fdb77c8c
-SIZE (fluxbox-0.9.12.tar.gz) = 871825
+MD5 (fluxbox-0.9.13.tar.gz) = aa0ad2392524242fdc25eca58c028553
+RMD160 (fluxbox-0.9.13.tar.gz) = 8191b985d8fb7f43e97b8d5040afd9ebbd14a08b
+SHA1 (fluxbox-0.9.13.tar.gz) = dddfb557c7f539e8c941b2a9be224da0dc18dc29
+SIZE (fluxbox-0.9.13.tar.gz) = 899873
Index: x11/fluxbox/patches/patch-data_Makefile_in
===================================================================
RCS file: x11/fluxbox/patches/patch-data_Makefile_in
diff -N x11/fluxbox/patches/patch-data_Makefile_in
--- x11/fluxbox/patches/patch-data_Makefile_in 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-data_Makefile_in,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- data/Makefile.in.orig Mon Jan 17 22:51:03 2005
-+++ data/Makefile.in Sat Jan 22 15:26:16 2005
-@@ -372,7 +372,7 @@ uninstall-info: uninstall-info-recursive
- uninstall-recursive
-
-
--DEFAULT _STYLE = @DEFAULT_STYLE@
-+DEFAULT_STYLE = @DEFAULT_STYLE@
- all-local: menu init
- distclean-local:
- rm -f *\~
Index: x11/fluxbox/patches/patch-ltmain_sh
===================================================================
RCS file: x11/fluxbox/patches/patch-ltmain_sh
diff -N x11/fluxbox/patches/patch-ltmain_sh
--- x11/fluxbox/patches/patch-ltmain_sh 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- ltmain.sh.orig Mon Jan 17 22:50:49 2005
-+++ ltmain.sh Sat Jan 22 15:26:14 2005
-@@ -561,7 +561,7 @@ if test -z "$show_help"; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-- trimedcc="${CC/${host}-}"
-+ trimedcc="${CC#${host}-}"
- case "$base_compile " in
- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- tagname=CC
-@@ -954,7 +954,7 @@ EOF
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-- trimedcc="${CC/${host}-}"
-+ trimedcc="${CC#${host}-}"
- case $base_compile in
- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- tagname=CC
Index: x11/fluxbox/patches/patch-nls_Makefile_am
===================================================================
RCS file: x11/fluxbox/patches/patch-nls_Makefile_am
diff -N x11/fluxbox/patches/patch-nls_Makefile_am
--- x11/fluxbox/patches/patch-nls_Makefile_am 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nls_Makefile_am,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- 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: x11/fluxbox/patches/patch-nls_Makefile_in
===================================================================
RCS file: x11/fluxbox/patches/patch-nls_Makefile_in
diff -N x11/fluxbox/patches/patch-nls_Makefile_in
--- x11/fluxbox/patches/patch-nls_Makefile_in 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-nls_Makefile_in,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- nls/Makefile.in.orig Mon Jan 17 22:51:04 2005
-+++ nls/Makefile.in Sat Jan 22 12:00:25 2005
-@@ -363,8 +363,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: x11/fluxbox/patches/patch-src_Ewmh_cc
===================================================================
RCS file: x11/fluxbox/patches/patch-src_Ewmh_cc
diff -N x11/fluxbox/patches/patch-src_Ewmh_cc
--- x11/fluxbox/patches/patch-src_Ewmh_cc 23 Jan 2005 12:44:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-src_Ewmh_cc,v 1.3 2005/01/23 12:44:10 matthieu Exp $
---- src/Ewmh.cc.orig Mon Jan 17 19:37:46 2005
-+++ src/Ewmh.cc Sat Jan 22 12:00:25 2005
-@@ -415,7 +415,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,
-@@ -432,7 +432,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,
-@@ -450,7 +450,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,
-@@ -470,7 +470,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,
-@@ -497,7 +497,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);
-@@ -568,7 +568,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: x11/fluxbox/patches/patch-src_FbCommands_cc
===================================================================
RCS file: x11/fluxbox/patches/patch-src_FbCommands_cc
diff -N x11/fluxbox/patches/patch-src_FbCommands_cc
--- x11/fluxbox/patches/patch-src_FbCommands_cc 23 Jan 2005 12:44:10 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_FbCommands_cc,v 1.4 2005/01/23 12:44:10 matthieu Exp $
---- 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()));
-- execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
-+ execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), (void *)NULL);
- exit(0);
- }
- #else // __EMX__
Index: x11/fluxbox/patches/patch-src_FbTk_FbPixmap_cc
===================================================================
RCS file: x11/fluxbox/patches/patch-src_FbTk_FbPixmap_cc
diff -N x11/fluxbox/patches/patch-src_FbTk_FbPixmap_cc
--- x11/fluxbox/patches/patch-src_FbTk_FbPixmap_cc 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_FbTk_FbPixmap_cc,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- src/FbTk/FbPixmap.cc.orig Fri Dec 10 10:21:51 2004
-+++ src/FbTk/FbPixmap.cc Sat Jan 22 12:00:25 2005
-@@ -288,7 +288,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: x11/fluxbox/patches/patch-src_Gnome_cc
===================================================================
RCS file: x11/fluxbox/patches/patch-src_Gnome_cc
diff -N x11/fluxbox/patches/patch-src_Gnome_cc
--- x11/fluxbox/patches/patch-src_Gnome_cc 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_Gnome_cc,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- 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: x11/fluxbox/patches/patch-src_Window_hh
===================================================================
RCS file: x11/fluxbox/patches/patch-src_Window_hh
diff -N x11/fluxbox/patches/patch-src_Window_hh
--- x11/fluxbox/patches/patch-src_Window_hh 23 Jan 2005 12:44:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_Window_hh,v 1.1 2005/01/23 12:44:10 matthieu Exp $
---- 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: x11/fluxbox/patches/patch-util_fbrun_FbRun_cc
===================================================================
RCS file: x11/fluxbox/patches/patch-util_fbrun_FbRun_cc
diff -N x11/fluxbox/patches/patch-util_fbrun_FbRun_cc
--- x11/fluxbox/patches/patch-util_fbrun_FbRun_cc 23 Jan 2005 12:44:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_fbrun_FbRun_cc,v 1.3 2005/01/23 12:44:10 matthieu Exp $
---- 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();
-- execl("/bin/sh", "/bin/sh", "-c", command.c_str(), 0);
-+ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (void *)NULL);
- exit(0); //exit child
- }
-
Index: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
===================================================================
RCS file: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
diff -N x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
--- x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in 23 Jan 2005 20:58:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.3 2005/01/23 20:58:29 david Exp $
---- util/fluxbox-generate_menu.in.orig Wed Jan 5 09:25:44 2005
-+++ util/fluxbox-generate_menu.in Sun Jan 23 14:49:52 2005
-@@ -85,7 +85,7 @@ Options:
-
- Only for packagers:
-
-- -p prefix; default is /usr/local
-+ -p prefix; default is @PREFIX@
- -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
- -q KDE-prefix; idem dito
-
-@@ -801,7 +801,7 @@ if [ ! "${INSTALL}" = Yes ]; then
- # Your favourite terminal. Put the command in quotes if you want to use
- # options. Put a backslash in before odd chars
- # MY_TERM='Eterm --tint \#123456'
--# MY_TERM='aterm -tint $(random_color)'
-+# MY_TERM='aterm -tint \$(random_color)'
-
- # Your favourite browser. You can also specify options.
- # MY_BROWSER=mozilla
-@@ -837,7 +837,7 @@ if [ ! "${INSTALL}" = Yes ]; then
-
-
- # Sepparate the list of background-dirs with semicolumns ':'
--# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:/usr/local/share/fluxbox/backgrounds/:/usr/share/wallpapers"
-+# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
-
-
- # --- Boolean variables.
-@@ -949,8 +949,8 @@ if [ -w "${MENUFILENAME}" ]; then
- if [ -f ${MENUFILENAME}.firstbak ]; then
- cp ${MENUFILENAME} ${MENUFILENAME}.firstbak
- fi
-- if [ -s "${MENUFILE}" ]; then
-- mv ${MENUFILE} ${MENUFILE}.bak
-+ if [ -s "${MENUFILENAME}" ]; then
-+ mv ${MENUFILENAME} ${MENUFILENAME}.bak
- fi
- fi
-
-@@ -1241,7 +1241,6 @@ append_submenu "${FBSETTINGSMENU}"
-
- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
-- append "[stylesdir] (/usr/share/commonbox/styles/)"
- append_menu_end
-
- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
-@@ -1286,7 +1285,7 @@ append_submenu "${FBSETTINGSMENU}"
- fi
- fi
-
-- append "[workspaces] (${WORKSPACEMENU})"
-+ append "[workspaces] (${WORKSPACEMENU})"
-
- append_submenu ${TOOLS}
- normal_find fluxconf fluxkeys fluxmenu
Index: x11/fluxbox/patches/patch-util_startfluxbox_in
===================================================================
RCS file: x11/fluxbox/patches/patch-util_startfluxbox_in
diff -N x11/fluxbox/patches/patch-util_startfluxbox_in
--- x11/fluxbox/patches/patch-util_startfluxbox_in 14 Jan 2005 05:46:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_startfluxbox_in,v 1.1 2005/01/14 05:46:30 david Exp $
---- util/startfluxbox.in.orig Fri Nov 19 06:01:44 2004
-+++ util/startfluxbox.in Thu Jan 13 00:38:38 2005
-@@ -24,7 +24,7 @@ else
- @pkgbindir@/bsetroot -solid black
-
- # This shows the fluxbox-splash-screen
--# fbsetbg -C /usr/share/fluxbox/splash.jpg
-+# fbsetbg -C @pkgdatadir@/splash.jpg
-
- # Other examples. Check man xset for details.
- #
Visit your host, monkey.org