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

grab the fluxbox patches from the website.

Browse Source 
--
Based on patches from the MAINTAINER and lebel@
This commit is contained in:
brad 2002-05-06 19:22:24 +00:00
parent 97e8155129
commit 2102f9abb0
10 changed files with 18 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/fluxbox/Makefile
View File

@ -1,17 +1,23 @@
# $OpenBSD: Makefile,v 1.7 2002/05/03 13:30:22 brad Exp $
# $OpenBSD: Makefile,v 1.8 2002/05/06 19:22:24 brad Exp $
COMMENT= "Blackbox-derived window manager with Gnome and KDE support"
DISTNAME= fluxbox-0.1.8
VERSION= 0.1.8
DISTNAME= fluxbox-${VERSION}
PKGNAME= ${DISTNAME}p2
CATEGORIES= x11
NEED_VERSION= 1.522
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
NEED_VERSION= 1.522
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fluxbox
MASTER_SITES0= http://fluxbox.sourceforge.net/download/patches/
HOMEPAGE= http://fluxbox.sourceforge.net/
PATCHFILES= fluxbox-${VERSION}-bugfix1.patch:0 \
fluxbox-${VERSION}-bugfix2.patch:0
PATCH_DIST_STRIP= -p1
MAINTAINER= Han Boetes <han@mijncomputer.nl>
HOMEPAGE= http://fluxbox.sourceforge.net/
MAINTAINER= Han Boetes <han@mijncomputer.nl>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

6
x11/fluxbox/distinfo
View File

@ -1,3 +1,9 @@
MD5 (fluxbox-0.1.8-bugfix1.patch) = 9f381526357889e14b0fa4e7d6bd8462
MD5 (fluxbox-0.1.8-bugfix2.patch) = 43e9d0d8b6d2a9b0769e8c3fbc33b505
MD5 (fluxbox-0.1.8.tar.gz) = 599b5d25ab4c088df229387460a86cda
RMD160 (fluxbox-0.1.8-bugfix1.patch) = 432592b38c2e6da747697ca8292f88597121c629
RMD160 (fluxbox-0.1.8-bugfix2.patch) = 3cbb19df9663d50c4117af6824a897f053e6a16e
RMD160 (fluxbox-0.1.8.tar.gz) = 6d3de710d5051f4e511bbe86656f7eca71f86f1d
SHA1 (fluxbox-0.1.8-bugfix1.patch) = add82f5c1dfedbb65dab997fae074906cc03a4cf
SHA1 (fluxbox-0.1.8-bugfix2.patch) = 0cd2dd731a4243c063fbde2f8f9b8d679af986ce
SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3

42
x11/fluxbox/patches/patch-src_Configmenu_cc
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-src_Configmenu_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
--- src/Configmenu.cc.orig Fri Apr 12 17:14:09 2002
+++ src/Configmenu.cc Fri May 3 12:27:19 2002
@@ -195,6 +195,8 @@ void Configmenu::itemSelected(int button
break;
}
+ //save resources
+ Fluxbox::instance()->save_rc();
}
}
@@ -290,6 +292,10 @@ void Configmenu::Focusmenu::itemSelected
break;
}
+ //save resources
+ Fluxbox::instance()->save_rc();
+
+ //toggle options
setItemSelected(0, !(configmenu->screen->isSloppyFocus() ||
configmenu->screen->isSemiSloppyFocus()));
setItemSelected(1, configmenu->screen->isSloppyFocus());
@@ -427,6 +433,8 @@ void Configmenu::Placementmenu::itemSele
break;
}
+ //save resources
+ Fluxbox::instance()->save_rc();
}
}
}
@@ -638,7 +646,8 @@ void Configmenu::Tabmenu::itemSelected(i
configmenu->screen->saveTabRotateVertical(True);
break;
}
-
+ //save resources
+ Fluxbox::instance()->save_rc();
Fluxbox::instance()->reconfigureTabs(); //TODO
setSelected();
}

20
x11/fluxbox/patches/patch-src_Font_cc
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_Font_cc,v 1.2 2002/05/03 13:47:10 lebel Exp $
--- 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);
}

13
x11/fluxbox/patches/patch-src_Tab_cc
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_Tab_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
--- src/Tab.cc.orig Mon Apr 15 00:27:57 2002
+++ src/Tab.cc Fri May 3 12:27:19 2002
@@ -63,7 +63,8 @@ Tab::Tab(FluxboxWindow *win, Tab *prev,
if ((m_win->getScreen()->getTabPlacement() == PLEFT ||
m_win->getScreen()->getTabPlacement() == PRIGHT) &&
- m_win->getScreen()->isTabRotateVertical()) {
+ m_win->getScreen()->isTabRotateVertical() &&
+ !m_win->isShaded()) {
m_size_w = m_win->getScreen()->getTabHeight();
m_size_h = m_win->getScreen()->getTabWidth();
} else {

12
x11/fluxbox/patches/patch-src_Theme_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Theme_cc,v 1.2 2002/05/03 13:47:10 lebel Exp $
--- 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()) {

15
x11/fluxbox/patches/patch-src_Window_cc
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Window_cc,v 1.5 2002/05/03 13:47:10 lebel Exp $
--- src/Window.cc.orig Fri May 3 12:26:27 2002
+++ src/Window.cc Fri May 3 12:27:19 2002
@@ -239,8 +239,9 @@ tab(0)
// adjust the window decorations based on transience and window sizes
if (transient) {
- decorations.maximize = decorations.handle =
- decorations.border = functions.maximize = false;
+ decorations.maximize = functions.maximize = false;
+ //we can still use the handles to resize it
+ decorations.handle = decorations.border = true;
}
if ((client.normal_hint_flags & PMinSize) &&

11
x11/fluxbox/patches/patch-src_fluxbox_cc
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_fluxbox_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
--- src/fluxbox.cc.orig Sat Apr 20 12:10:48 2002
+++ src/fluxbox.cc Fri May 3 12:27:19 2002
@@ -1701,7 +1701,6 @@ void Fluxbox::shutdown(void) {
XSync(getXDisplay(), False);
- save_rc();
}
//------ save_rc --------

19
x11/fluxbox/patches/patch-src_fluxbox_hh
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_fluxbox_hh,v 1.1 2002/05/03 13:30:23 brad Exp $
--- src/fluxbox.hh.orig Fri Apr 12 15:02:12 2002
+++ src/fluxbox.hh Fri May 3 12:27:19 2002
@@ -135,6 +135,7 @@ public:
void saveToolbarSearch(Window, Toolbar *);
void saveTabSearch(Window, Tab *);
void saveGroupSearch(Window, FluxboxWindow *);
+ void save_rc(void);
void removeMenuSearch(Window);
void removeWindowSearch(Window);
void removeToolbarSearch(Window);
@@ -240,7 +241,6 @@ protected:
Fluxbox(int, char **, char * = 0, char * = 0);
char *getRcFilename();
void load_rc(void);
- void save_rc(void);
void reload_rc(void);
void real_rereadMenu(void);
void real_reconfigure(void);

25
x11/fluxbox/patches/patch-src_i18n_hh
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_i18n_hh,v 1.2 2002/05/03 13:47:10 lebel Exp $
--- 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__