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

fluxbox's 0.1.8 bugfix 1 applied; bump patchlevel to p1;

Browse Source 
from maintainer Han <han@mijncomputer.nl>
This commit is contained in:
lebel 2002-04-27 13:25:59 +00:00
parent d1a6ef61fe
commit 0e156d507e
5 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/fluxbox/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2002/04/19 18:26:08 lebel Exp $
# $OpenBSD: Makefile,v 1.5 2002/04/27 13:25:59 lebel Exp $
COMMENT= "Blackbox-derived window manager with Gnome and KDE support"
DISTNAME= fluxbox-0.1.8
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
NEED_VERSION= 1.522
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fluxbox
MASTER_SITE_SUBDIR= fluxbox
HOMEPAGE= http://fluxbox.sourceforge.net/
@ -17,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-gnome --enable-kde
USE_X11= Yes

19
x11/fluxbox/patches/patch-src_Font_cc Normal file
View File

@ -0,0 +1,19 @@
--- src/Font.cc.orig Wed Mar 27 19:47:44 2002
+++ src/Font.cc Sat Apr 27 06:06:23 2002
@@ -25,6 +25,8 @@
#include "Font.hh"
#include "StringUtil.hh"
+#include "i18n.hh"
+
//use gnu extensions
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -53,6 +55,7 @@ m_display(display) {
m_font.fontstruct = 0;
m_font.set_extents = 0;
m_font.set = 0;
+ m_multibyte = I18n::instance()->multibyte();
if (name!=0) {
load(name);
}

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

@ -0,0 +1,11 @@
--- src/Theme.cc.orig Thu Apr 4 13:28:19 2002
+++ src/Theme.cc Sat Apr 27 06:06:23 2002
@@ -382,7 +382,7 @@ void Theme::loadMenuStyle() {
//---------- font
m_menustyle.framefont->loadFromDatabase(m_database, "menu.frame.font", "Menu.Frame.Font");
- m_menustyle.titlefont->loadFromDatabase(m_database, "menu.Title.font", "Menu.Title.Font");
+ m_menustyle.titlefont->loadFromDatabase(m_database, "menu.title.font", "Menu.Title.Font");
/*
if (I18n::instance()->multibyte()) {

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

@ -0,0 +1,11 @@
--- src/Window.cc.orig Wed Apr 17 09:24:59 2002
+++ src/Window.cc Sat Apr 27 06:06:23 2002
@@ -3348,7 +3348,7 @@ void FluxboxWindow::motionNotifyEvent(XM
int cur_id = screen->getCurrentWorkspaceID();
int new_id = cur_id;
const int warpPad = screen->getEdgeSnapThreshold();
- if (me->x_root >= int(screen->getWidth()) - warpPad &&
+ if (me->x_root >= int(screen->getWidth()) - warpPad - 1 &&
frame.x < int(me->x_root - frame.grab_x - screen->getBorderWidth())) {
new_id = (cur_id + 1) % screen->getCount();
dx = -me->x_root;

24
x11/fluxbox/patches/patch-src_i18n_hh Normal file
View File

@ -0,0 +1,24 @@
--- src/i18n.hh.orig Thu Apr 4 12:16:59 2002
+++ src/i18n.hh Sat Apr 27 06:06:23 2002
@@ -29,15 +29,19 @@
#include "../nls/blackbox-nls.hh"
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif // HAVE_CONFIG_H
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif // HAVE_LOCALE_H
-#ifdef HAVE_NL_TYPES_H
+#ifdef HAVE_NL_TYPES_H
// this is needed for linux libc5 systems
extern "C" {
-# include <nl_types.h>
+# include <nl_types.h>
}
+
#endif // HAVE_NL_TYPES_H
#ifdef __CYGWIN32__