Fix up for modular X and compilation with GCC 4.1

Package-Manager: portage-2.1.1_rc1

2 files changed, 161 insertions, 2 deletions

diff --git a/dev-util/rhide/files/digest-rhide-1.5.20050823 b/dev-util/rhide/files/digest-rhide-1.5.20050823
index 9cd148c31a8f..77530fe27bd8 100644
--- a/dev-util/rhide/files/digest-rhide-1.5.20050823
+++ b/dev-util/rhide/files/digest-rhide-1.5.20050823
@@ -1,4 +1,12 @@
+MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
+RMD160 5e2d2fe150276c5be513d5c3427bbe6f2c9d0696 gdb-6.1.1.tar.bz2 12586670
+SHA256 c340fcfc7483f75c210879bb7c0ed3c760ae458f6a5137dbffb305b27a735893 gdb-6.1.1.tar.bz2 12586670
 MD5 a63feb8650a1b1c472e116e30feeb3c4 rhide-1.5.20050823.tar.bz2 765258
-MD5 938319aabc91b765fd2408bfacafc5c7 tvision-2.10.20050824.tar.bz2 863122
+RMD160 2c256565921a26a4e2ba8b903a130850133b3eed rhide-1.5.20050823.tar.bz2 765258
+SHA256 e7f3d314ea409b1286154adcd45e89dfcf362572efe3f742006786bd5344bd88 rhide-1.5.20050823.tar.bz2 765258
 MD5 05a676191694ebf4ac8573e119bdb61b setedit-0.5.5.20050828.tar.bz2 1960480
-MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
+RMD160 e59dfeb51936e1a915037c744734dc052c4f66fd setedit-0.5.5.20050828.tar.bz2 1960480
+SHA256 da7b2dc9f494b75bc67bd357d8602ad987512866cfa3caf94556655ccc272e8a setedit-0.5.5.20050828.tar.bz2 1960480
+MD5 938319aabc91b765fd2408bfacafc5c7 tvision-2.10.20050824.tar.bz2 863122
+RMD160 51d760b395760370e830d5e499bb12f6f09d5c5e tvision-2.10.20050824.tar.bz2 863122
+SHA256 ff1f16eb61548b50701d86dbe11ecd1078a1f735825e4df45afb317ea53ee456 tvision-2.10.20050824.tar.bz2 863122
diff --git a/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch b/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch
new file mode 100644
index 000000000000..8b9c161c72de
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5.20050823-gcc41.patch
@@ -0,0 +1,151 @@
+--- tvision/include/compatlayer.h
++++ tvision/include/compatlayer.h
+@@ -812,10 +812,6 @@
+    #define _GNU_SOURCE
+    #define CLY_getline getline
+   #endif
+-  // Avoid including libintl.h, we have the prototypes
+-  // This is a temporal workaround.
+-  #undef  _LIBINTL_H
+-  #define _LIBINTL_H 1
+  #endif
+ 
+  /* Solaris using gcc but not glibc */
+--- setedit/infview/include/inf.h
++++ setedit/infview/include/inf.h
+@@ -310,7 +310,7 @@
+ 
+  virtual TPalette& getPalette() const;
+  virtual void close();
+- virtual TInfWindow::~TInfWindow();
++ virtual ~TInfWindow();
+  TInfViewer *viewer;
+  Boolean isTheOne;
+  static void SetMagicEditorInfoTranslation() { TInfViewer::TranslateName=1; };
+--- setedit/setedit/runprog.cc
++++ setedit/setedit/runprog.cc
+@@ -89,17 +89,15 @@
+  if (!Command[0])
+     strcpy(Command,"make");
+ 
+- #pragma pack(1)
+  struct
+  {
+-  char   ComAux[maxCommand]  __attribute__((packed));
++  char   ComAux[maxCommand];
+-  uint32 Options             __attribute__((packed));
++  uint32 Options;
+-  uint32 OpsScroll           __attribute__((packed));
++  uint32 OpsScroll;
+-  uint32 OpsScrHz            __attribute__((packed));
++  uint32 OpsScrHz;
+-  char   Lines[4]            __attribute__((packed));
++  char   Lines[4];
+-  TListBoxRec tl             __attribute__((packed));
++  TListBoxRec tl;
+  } box;
+- #pragma pack()
+  strcpy(box.ComAux,Command);
+  box.Options=Options & (~edsmScrollMask);
+  box.OpsScroll=(Options & edsmScrollMask)/edsmScrollShifter;
+--- rhide-1.5.20050823/rhgdb/include/rhgdb.h
++++ rhide-1.5.20050823/rhgdb/include/rhgdb.h
+@@ -46,8 +46,8 @@
+ extern int use_dual_display;
+ class TDirList;
+ extern TDirList *src_dirs;
+-class TDisassemblerWindow;
++class TWindow;
+-extern TDisassemblerWindow *dis_win;
++extern TWindow *dis_win;
+ class TDataWindow;
+ 
+ void STEP(int _switch_to_user = 1);
+--- rhide-1.5.20050823/rhgdb/main.cc
++++ rhide-1.5.20050823/rhgdb/main.cc
+@@ -119,7 +119,7 @@
+ int tabsize = 8;
+ int use_dual_display = 0;
+ 
+-TDisassemblerWindow *dis_win = NULL;
++TWindow *dis_win = NULL;
+ 
+ static void ReadOptions(char *);
+ static void SaveOptions(char *);
+@@ -426,7 +426,7 @@
+     TRect r(1, 1, 79, 20);
+ 
+     dis_win = new TDisassemblerWindow(r, _("Disassembler window"));
+-    AddWindow(dis_win, (TWindow **) & dis_win);
++    AddWindow(dis_win, & dis_win);
+   }
+ }
+ 
+@@ -443,18 +443,18 @@
+   if (TProgram::deskTop->execView(insp) == cmOK)
+   {
+     insp->getData(buf);
+-    TInspector *w = new TInspector(TProgram::deskTop->getExtent(), buf);
++    TWindow *w = new TInspector(TProgram::deskTop->getExtent(), buf);
+ 
+     w->helpCtx = hcInspector;
+     w->options |= ofCentered;
+-    w->update(buf);
++    ((TInspector *) w)->update(buf);
+-    AddWindow(w, (TWindow **) & w);
++    AddWindow(w, & w);
+   }
+   TObject::destroy(insp);
+ }
+ 
+ 
+-static TDataWindow *stack_win = NULL;
++static TWindow *stack_win = NULL;
+ 
+ void
+ RHGDBApp::handleEvent(TEvent & event)
+@@ -498,7 +498,7 @@
+         case cmDisWindow:
+           OpenDisWin();
+           if (debugger_started())
+-            dis_win->update(stop_pc);
++            ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+           clearEvent(event);
+           break;
+         case cmDataWindow:
+@@ -511,7 +511,7 @@
+           if (!stack_win)
+           {
+             if ((stack_win = TDataWindow::stackWindow()))
+-              AddWindow(stack_win, (TWindow **) & stack_win);
++              AddWindow(stack_win, & stack_win);
+           }
+           else
+             stack_win->select();
+@@ -676,7 +676,7 @@
+   UpdateCallStackWindow();
+   TDataWindow::updateAll();
+   if (dis_win)
+-    dis_win->update(stop_pc);
++    ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+ }
+ 
+ static void InitDebuggerInterface();
+@@ -1060,7 +1060,7 @@
+     else if (main_line != 0)
+     {
+       OpenDisWin();
+-      dis_win->update(main_line);
++      ((TDisassemblerWindow *) dis_win)->update(main_line);
+     }
+   }
+   app->run();
+@@ -1227,7 +1227,7 @@
+   {
+     extern unsigned long stop_pc;
+ 
+-    dis_win->update(stop_pc);
++    ((TDisassemblerWindow *) dis_win)->update(stop_pc);
+   }
+   if (select_dis_win)
+     dis_win->select();