cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.9.12. work by espie and me, lots of feedback by david@. ok david@

Browse Source
This commit is contained in:
matthieu 2005-01-23 12:44:10 +00:00
parent dd321d251b
commit a695f17e9c
14 changed files with 215 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11/fluxbox/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2004/12/17 15:18:32 alek Exp $
# $OpenBSD: Makefile,v 1.32 2005/01/23 12:44:10 matthieu Exp $
COMMENT= "window manager based on the original Blackbox code"
VERSION= 0.9.9
VERSION= 0.9.12
DISTNAME= fluxbox-${VERSION}
CATEGORIES= x11
@ -15,18 +15,22 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender c \
fontconfig freetype m stdc++
WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
fontconfig Imlib2 ltdl freetype stdc++ m c expat
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS= --enable-kde --enable-xinerama
CONFIGURE_ARGS= --enable-xinerama --enable-imlib2
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
NO_REGRESS= Yes
SEPARATE_BUILD= simple
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= Imlib2.2::graphics/imlib2
CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
.include <bsd.port.mk>

8
x11/fluxbox/distinfo
View File

@ -1,4 +1,4 @@
MD5 (fluxbox-0.9.9.tar.gz) = b0c637b1b6baa646f99877321b5d9e53
RMD160 (fluxbox-0.9.9.tar.gz) = 3cb4ad83b8870de0bce9d7cd340e56801db62e39
SHA1 (fluxbox-0.9.9.tar.gz) = c3feff5bbed1d9e4512618db16bcd1964500d44e
SIZE (fluxbox-0.9.9.tar.gz) = 723342
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

12
x11/fluxbox/patches/patch-data_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$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 *\~

21
x11/fluxbox/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,21 @@
$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

11
x11/fluxbox/patches/patch-nls_Makefile_am Normal file
View File

@ -0,0 +1,11 @@
$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

14
x11/fluxbox/patches/patch-nls_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$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:

57
x11/fluxbox/patches/patch-src_Ewmh_cc Normal file
View File

@ -0,0 +1,57 @@
$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

8
x11/fluxbox/patches/patch-src_FbCommands_cc
View File

@ -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 @@
$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()));

12
x11/fluxbox/patches/patch-src_FbTk_FbPixmap_cc Normal file
View File

@ -0,0 +1,12 @@
$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[] = {

37
x11/fluxbox/patches/patch-src_Gnome_cc Normal file
View File

@ -0,0 +1,37 @@
$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();

20
x11/fluxbox/patches/patch-src_Window_hh Normal file
View File

@ -0,0 +1,20 @@
$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;

8
x11/fluxbox/patches/patch-util_fbrun_FbRun_cc
View File

@ -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 @@
$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();

10
x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.1 2005/01/14 05:53:02 david Exp $
--- util/fluxbox-generate_menu.in.orig Sun Apr 25 12:15:49 2004
+++ util/fluxbox-generate_menu.in Thu Jan 13 23:48:13 2005
@@ -1199,7 +1199,6 @@ append_submenu "${FBSETTINGSMENU}"
$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.2 2005/01/23 12:44:10 matthieu Exp $
--- util/fluxbox-generate_menu.in.orig Wed Jan 5 16:25:44 2005
+++ util/fluxbox-generate_menu.in Sat Jan 22 12:01:32 2005
@@ -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 "[stylesdir] (/usr/share/commonbox/styles/)"
append_menu_end
append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"

46
x11/fluxbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2004/09/18 13:19:26 espie Exp $
@comment $OpenBSD: PLIST,v 1.14 2005/01/23 12:44:10 matthieu Exp $
@conflict blackbox-*
@conflict openbox-*
bin/bsetroot
@ -17,50 +17,6 @@ share/fluxbox/
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/