summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorGrant Goodyear <g2boojum@gentoo.org>2002-05-14 20:35:25 +0000
committerGrant Goodyear <g2boojum@gentoo.org>2002-05-14 20:35:25 +0000
commit18d724dd18af51ae606da4a400b1a3453034434e (patch)
tree4a8a4589d4b47c2987ea3324ff54db535ff3f198 /x11-wm
parentUpstream bugfix #2 added. Closes bug #2517. (diff)
downloadgentoo-2-18d724dd18af51ae606da4a400b1a3453034434e.tar.gz
gentoo-2-18d724dd18af51ae606da4a400b1a3453034434e.tar.bz2
gentoo-2-18d724dd18af51ae606da4a400b1a3453034434e.zip
New ebuild downloads the patches itself.
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch48
-rw-r--r--x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch100
2 files changed, 0 insertions, 148 deletions
diff --git a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch
deleted file mode 100644
index 936683d5a6fd..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -U 1 -r fluxbox-0.1.8/src/Font.cc fluxbox-0.1.8-bugfix/src/Font.cc
---- fluxbox-0.1.8/src/Font.cc Wed Mar 27 19:47:44 2002
-+++ fluxbox-0.1.8-bugfix/src/Font.cc Fri Apr 26 19:27:47 2002
-@@ -27,2 +27,4 @@
- #include "StringUtil.hh"
-+#include "i18n.hh"
-+
- //use gnu extensions
-@@ -55,2 +57,3 @@
- m_font.set = 0;
-+ m_multibyte = I18n::instance()->multibyte();
- if (name!=0) {
-diff -U 1 -r fluxbox-0.1.8/src/Theme.cc fluxbox-0.1.8-bugfix/src/Theme.cc
---- fluxbox-0.1.8/src/Theme.cc Thu Apr 4 13:28:19 2002
-+++ fluxbox-0.1.8-bugfix/src/Theme.cc Fri Apr 26 19:33:32 2002
-@@ -384,3 +384,3 @@
- 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");
- /*
-diff -U 1 -r fluxbox-0.1.8/src/Window.cc fluxbox-0.1.8-bugfix/src/Window.cc
---- fluxbox-0.1.8/src/Window.cc Wed Apr 17 09:24:59 2002
-+++ fluxbox-0.1.8-bugfix/src/Window.cc Fri Apr 26 19:57:18 2002
-@@ -3350,3 +3350,3 @@
- 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())) {
-diff -U 1 -r fluxbox-0.1.8/src/i18n.hh fluxbox-0.1.8-bugfix/src/i18n.hh
---- fluxbox-0.1.8/src/i18n.hh Thu Apr 4 12:16:59 2002
-+++ fluxbox-0.1.8-bugfix/src/i18n.hh Fri Apr 26 19:40:46 2002
-@@ -31,2 +31,5 @@
-
-+#ifdef HAVE_CONFIG_H
-+# include "../config.h"
-+#endif // HAVE_CONFIG_H
- #ifdef HAVE_LOCALE_H
-@@ -35,7 +38,8 @@
-
--#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
diff --git a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch
deleted file mode 100644
index 914b21de21d2..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Only in fluxbox-0.1.8-bugfix2/: fluxbox-0.1.8-bugfix1.patch
-diff -U 1 -r fluxbox-0.1.8/src/Configmenu.cc fluxbox-0.1.8-bugfix2/src/Configmenu.cc
---- fluxbox-0.1.8/src/Configmenu.cc Fri Apr 12 17:14:09 2002
-+++ fluxbox-0.1.8-bugfix2/src/Configmenu.cc Fri May 3 10:41:09 2002
-@@ -197,2 +197,4 @@
- }
-+ //save resources
-+ Fluxbox::instance()->save_rc();
- }
-@@ -292,2 +294,6 @@
-
-+ //save resources
-+ Fluxbox::instance()->save_rc();
-+
-+ //toggle options
- setItemSelected(0, !(configmenu->screen->isSloppyFocus() ||
-@@ -429,2 +435,4 @@
- }
-+ //save resources
-+ Fluxbox::instance()->save_rc();
- }
-@@ -640,3 +648,4 @@
- }
--
-+ //save resources
-+ Fluxbox::instance()->save_rc();
- Fluxbox::instance()->reconfigureTabs(); //TODO
-diff -U 1 -r fluxbox-0.1.8/src/Tab.cc fluxbox-0.1.8-bugfix2/src/Tab.cc
---- fluxbox-0.1.8/src/Tab.cc Mon Apr 15 00:27:57 2002
-+++ fluxbox-0.1.8-bugfix2/src/Tab.cc Fri May 3 10:44:18 2002
-@@ -65,3 +65,4 @@
- m_win->getScreen()->getTabPlacement() == PRIGHT) &&
-- m_win->getScreen()->isTabRotateVertical()) {
-+ m_win->getScreen()->isTabRotateVertical() &&
-+ !m_win->isShaded()) {
- m_size_w = m_win->getScreen()->getTabHeight();
-diff -U 1 -r fluxbox-0.1.8/src/Window.cc fluxbox-0.1.8-bugfix2/src/Window.cc
---- fluxbox-0.1.8/src/Window.cc Wed Apr 17 09:24:59 2002
-+++ fluxbox-0.1.8-bugfix2/src/Window.cc Fri May 3 10:34:31 2002
-@@ -241,4 +241,5 @@
- 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;
- }
-diff -U 1 -r fluxbox-0.1.8/src/fluxbox.cc fluxbox-0.1.8-bugfix2/src/fluxbox.cc
---- fluxbox-0.1.8/src/fluxbox.cc Sat Apr 20 12:10:48 2002
-+++ fluxbox-0.1.8-bugfix2/src/fluxbox.cc Fri May 3 10:47:20 2002
-@@ -1703,3 +1703,2 @@
-
-- save_rc();
- }
-diff -U 1 -r fluxbox-0.1.8/src/fluxbox.hh fluxbox-0.1.8-bugfix2/src/fluxbox.hh
---- fluxbox-0.1.8/src/fluxbox.hh Fri Apr 12 15:02:12 2002
-+++ fluxbox-0.1.8-bugfix2/src/fluxbox.hh Fri May 3 10:46:28 2002
-@@ -137,2 +137,3 @@
- void saveGroupSearch(Window, FluxboxWindow *);
-+ void save_rc(void);
- void removeMenuSearch(Window);
-@@ -242,3 +243,2 @@
- void load_rc(void);
-- void save_rc(void);
- void reload_rc(void);
-diff -U 1 -r fluxbox-0.1.8/src/Toolbar.cc fluxbox-0.1.8-bugfix/src/Toolbar.cc
---- fluxbox-0.1.8/src/Toolbar.cc Wed Apr 10 01:16:28 2002
-+++ fluxbox-0.1.8-bugfix/src/Toolbar.cc Fri May 3 14:48:51 2002
-@@ -1170,3 +1170,3 @@
- screen->getWorkspacemenu()->update();
--
-+ Fluxbox::instance()->save_rc();
- reconfigure();
-@@ -1314,5 +1314,7 @@
- toolbar->on_top = change;
-- setItemSelected(1, change);
-+ screen()->saveToolbarOnTop(toolbar->on_top);
-+ setItemSelected(1, change);
-
- if (toolbar->isOnTop()) toolbar->screen->raiseWindows((Window *) 0, 0);
-+
- break;
-@@ -1324,2 +1326,3 @@
- toolbar->do_auto_hide = change;
-+ screen()->saveToolbarAutoHide(toolbar->do_auto_hide);
- setItemSelected(2, change);
-@@ -1338,2 +1341,3 @@
- }
-+ Fluxbox::instance()->save_rc();
- }
-@@ -1417,3 +1421,3 @@
- #endif // SLIT
--
-+ Fluxbox::instance()->save_rc();
- }
-@@ -1461,3 +1465,3 @@
- #endif // SLIT
--
-+ Fluxbox::instance()->save_rc();
- }