Ticket #1495: dports-fluxbox.diff

Portfile

@@ -15 +15 @@
 master_sites     sourceforge
 checksums       md5 f097b97127461fa3f6f4af4048c75cfc
 depends_lib     lib:libX11.6:XFree86 lib:libXext.6:XFree86
+patchfiles      patch-src_Resource_hh patch-src_Tab_cc patch-src_Toolbar_cc \
+                patch-src_fluxbox_hh patch-util_fbrun_FbRun_hh

new file files/patch-src_Resource_hh

@@ +1 @@
+--- src/Resource.hh.orig        Thu Jul 29 21:04:30 2004
++++ src/Resource.hh     Thu Jul 29 21:22:14 2004
+@@ -66,16 +66,9 @@
+ {
+ public:        
+        Resource(ResourceManager &rm, T val, 
+-       const std::string &name, const std::string &altname):
+-       Resource_base(name, altname),
+-       m_value(val), m_defaultval(val),
+-       m_rm(rm)
+-       {
+-               m_rm.addResource(*this); // add this to resource handler
+-       }
+-       virtual ~Resource() {
+-               m_rm.removeResource(*this); // remove this from resource handler
+-       }
++       const std::string &name, const std::string &altname);
++
++       virtual ~Resource();
+ 
+        inline void setDefaultValue() {  m_value = m_defaultval; }
+        void setFromString(const char *strval);
+@@ -128,5 +121,18 @@
+        static bool m_init;
+        ResourceList m_resourcelist;
+ };
++
++template <typename T>
++Resource<T>::Resource(ResourceManager &rm, T val, const std::string &name, 
++                       const std::string &altname):
++       Resource_base(name, altname), m_value(val), m_defaultval(val), 
++       m_rm(rm) {
++                m_rm.addResource(*this); // add this to resource handler
++}
++
++template <typename T>
++Resource<T>::~Resource() {
++                m_rm.removeResource(*this); // remove this from resource handler
++}
+ 
+ #endif //_RESOURCE_HH_

new file files/patch-src_Tab_cc

@@ +1 @@
+--- src/Tab.cc.orig     Tue Feb 25 03:00:22 2003
++++ src/Tab.cc  Tue Feb 25 03:01:31 2003
+@@ -1011,14 +1011,14 @@
+        Fluxbox *fluxbox = Fluxbox::instance();
+        if (m_prev) {   //if this have a chain to "the left" (previous tab) then set it's next to this next
+                m_prev->m_next = m_next;
+-               if(!m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
++               if(!m_next && !m_prev->m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
+                        m_prev->m_win->setTab(false);
+                else
+                        tmp = m_prev;
+        } 
+        if (m_next) {   //if this have a chain to "the right" (next tab) then set it's prev to this prev
+                m_next->m_prev = m_prev;
+-               if(!m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
++               if(!m_prev && !m_next->m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
+                        m_next->m_win->setTab(false);
+                else
+                        tmp = m_next;

new file files/patch-src_Toolbar_cc

@@ +1 @@
+diff -u -r src/Toolbar.cc.orig src/Toolbar.cc
+--- src/Toolbar.cc.orig Sat Dec  7 22:41:57 2002
++++ src/Toolbar.cc      Tue Oct 28 01:03:30 2003
+@@ -204,6 +204,7 @@
+ }
+                
+ void Toolbar::reconfigure() {
++       I18n *i18n = I18n::instance();
+        int head_x = 0,
+                        head_y = 0,
+                        head_w,
+@@ -318,6 +319,7 @@
+                frame.clock_w = 0;
+ #else // !HAVE_STRFTIME
+        
++       using namespace FBNLS;
+        frame.clock_w = screen()->getToolbarStyle()->font.textWidth(
+                i18n->getMessage(
+                        ToolbarSet, ToolbarNoStrftimeLength,
+@@ -521,6 +523,7 @@
+ void Toolbar::checkClock(bool redraw, bool date) {
+        time_t tmp = 0;
+        struct tm *tt = 0;
++       I18n *i18n = I18n::instance();
+ 
+        if ((tmp = time(NULL)) != -1) {
+                if (! (tt = localtime(&tmp))) {
+@@ -545,9 +549,11 @@
+                        return;
+ #else // !HAVE_STRFTIME
+                char t[9];
++               using namespace FBNLS;
++
+                if (date) {
+                        // format the date... with special consideration for y2k ;)
+-                       if (screen()->getDateFormat() == Blackbox::B_EuropeanDate) {
++                       if (screen()->getDateFormat() == Fluxbox::B_EuropeanDate) {
+                                sprintf(t,
+                                        i18n->getMessage(
+                                                ToolbarSet, ToolbarNoStrftimeDateFormatEu,
+@@ -1101,6 +1107,8 @@
+                CommonSet, CommonAutoHide,
+                "Auto hide"),
+                2);
++
++       using namespace FBNLS;
+        insert(i18n->getMessage(
+                ToolbarSet, ToolbarEditWkspcName,
+                "Edit current workspace name"),

new file files/patch-src_fluxbox_hh

@@ +1 @@
+diff -u -r src/fluxbox.hh.orig src/fluxbox.hh
+--- src/fluxbox.hh.orig Sat Dec  7 09:15:26 2002
++++ src/fluxbox.hh      Mon Oct 27 23:34:49 2003
+@@ -184,7 +184,7 @@
+ 
+ #ifndef         HAVE_STRFTIME
+ 
+-       enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
++       enum { B_AmericanDate = 1, B_EuropeanDate };
+ #endif // HAVE_STRFTIME
+        
+        typedef std::vector<Fluxbox::Titlebar> TitlebarList;

new file files/patch-util_fbrun_FbRun_hh

@@ +1 @@
+diff -u -r util/fbrun/FbRun.hh.orig util/fbrun/FbRun.hh
+--- util/fbrun/FbRun.hh.orig Sat Dec  7 09:15:27 2002
++++ util/fbrun/FbRun.hh Mon Oct 27 23:57:51 2003
+@@ -29,6 +29,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cassert>
+ 
+ /**
+        Creates and managed a run window