dcsharp/fixes.diff

   1 $NetBSD: patch-aa,v 1.2 2009/01/06 18:54:51 kefren Exp $
   2 --- SConstruct.orig     2007-10-26 12:11:04.000000000 +0300
   3 +++ SConstruct  2008-04-24 21:34:37.000000000 +0300
   4 @@ -12,7 +12,7 @@
   5  opts.Add(PathOption('LIBDIR', 'System library path', '$PREFIX/lib'));
   6  opts.Add(PathOption('BINDIR', 'System executable path', '$PREFIX/bin'));
   7  opts.Add(PathOption('SHAREDIR', 'System shared data path', '$PREFIX/share'));
   8 -opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '/etc'));
   9 +opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '$PREFIX/share'));
  10  opts.Add(PathOption('DESTDIR', 'System base installation path', '/'));
  11
  12  opts.Add(BoolOption('DEBUG', 'Compile with debug information', 0));
  13 @@ -179,7 +179,7 @@
  14         env['RESOURCE'] = Split('')
  15         env['CSCFLAGS'] = Split('')
  16
  17 -env = Environment(options = opts)
  18 +env = Environment(ENV = os.environ, options = opts)
  19  conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
  20                                         'CheckPKG' : CheckPKG })
  21  Help(opts.GenerateHelpText(env))
  22 $NetBSD: patch-ab,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
  23 --- gtk/src/General/VisibleColumnsWindow.cs.orig        2008-04-24 12:24:49.000000000 +0300
  24 +++ gtk/src/General/VisibleColumnsWindow.cs     2007-10-26 12:11:04.000000000 +0300
  25 @@ -69,12 +69,12 @@
  26                         CellRendererToggle toggleRenderer = new CellRendererToggle();
  27                         toggleRenderer.Toggled += OnColumnToggled;
  28                         column = treeView.AppendColumn(null, toggleRenderer);
  29 -                       column.SetCellDataFunc(toggleRenderer, SetToggleColumn);
  30 +                       column.SetCellDataFunc(toggleRenderer, (Gtk.TreeCellDataFunc)SetToggleColumn);
  31
  32                         CellRendererText textRenderer = new CellRendererText();
  33                         column = treeView.AppendColumn(Catalog.GetString("Name"),
  34                                 textRenderer);
  35 -                       column.SetCellDataFunc(textRenderer, SetNameColumn);
  36 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetNameColumn);
  37
  38                         // Model
  39                         store = new ListStore(typeof(TreeViewColumn));
  40 @@ -90,7 +90,7 @@
  41
  42                 #region Methods
  43
  44 -               public static void ConnectToWidget(Widget widget, Action action,
  45 +               public static void ConnectToWidget(Widget widget, Gtk.Action action,
  46                         TreeViewColumn[] columns, params TreeViewColumn[] inactiveColumns)
  47                 {
  48                         if (widget == null)
  49 $NetBSD: patch-ac,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
  50 --- gtk/src/HubWindow.cs.orig   2008-04-24 12:12:20.000000000 +0300
  51 +++ gtk/src/HubWindow.cs        2007-10-26 12:11:04.000000000 +0300
  52 @@ -122,12 +122,12 @@
  53
  54                         CellRendererPixbuf pixbufRenderer = new CellRendererPixbuf();
  55                         column.PackStart(pixbufRenderer , false);
  56 -                       column.SetCellDataFunc(pixbufRenderer, SetPixbuf);
  57 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)SetPixbuf);
  58
  59                         CellRendererText textRenderer = new CellRendererText();
  60                         textRenderer.Ellipsize = Pango.EllipsizeMode.End;
  61                         column.PackStart(textRenderer , true);
  62 -                       column.SetCellDataFunc(textRenderer, SetName);
  63 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetName);
  64
  65                         // Events
  66                         addHubButton.Clicked += OnAddHubButtonClicked;
  67 $NetBSD: patch-ad,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
  68 --- gtk/src/MainWindow.cs.old   2008-04-24 12:17:45.000000000 +0300
  69 +++ gtk/src/MainWindow.cs       2007-10-26 12:11:04.000000000 +0300
  70 @@ -45,11 +45,11 @@
  71                 private Page currentPage;
  72                 private ActionGroup pageActions;
  73                 private uint mergeId;
  74 -               private Dictionary<MenuItem, Action> itemToAction;
  75 +               private Dictionary<MenuItem, Gtk.Action> itemToAction;
  76
  77                 private UIManager uim;
  78                 private ActionGroup actionGroup;
  79 -               private Action closeAction;
  80 +               private Gtk.Action closeAction;
  81                 private ToggleAction toolbarVisibleAction;
  82                 private RadioAction layoutTabsAction;
  83
  84 @@ -85,7 +85,7 @@
  85                         }
  86                         this.favoriteHubManager = favoriteHubManager;
  87
  88 -                       itemToAction = new Dictionary<MenuItem, Action>();
  89 +                       itemToAction = new Dictionary<MenuItem, Gtk.Action>();
  90
  91                         Window.Title = Util.AppName;
  92
  93 @@ -399,7 +399,7 @@
  94
  95                 private void OnMenuItemSelected(object obj, EventArgs args)
  96                 {
  97 -                       Action action;
  98 +                       Gtk.Action action;
  99                         if (itemToAction.TryGetValue((MenuItem)obj, out action) &&
 100                                 action.Tooltip != null)
 101                         {
 102 $NetBSD: patch-ae,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 103 --- gtk/src/Page/DownloadPage.cs.old    2008-04-24 11:22:07.000000000 +0300
 104 +++ gtk/src/Page/DownloadPage.cs        2007-10-26 12:11:04.000000000 +0300
 105 @@ -36,10 +36,10 @@
 106                 private MessageArea messageArea;
 107
 108                 private ActionGroup actionGroup;
 109 -               private Action startAction;
 110 -               private Action stopAction;
 111 -               private Action removeAction;
 112 -               private Action clearAction;
 113 +               private Gtk.Action startAction;
 114 +               private Gtk.Action stopAction;
 115 +               private Gtk.Action removeAction;
 116 +               private Gtk.Action clearAction;
 117
 118                 private DownloadStore downloadStore;
 119                 private TreePath virtualRoot;
 120 $NetBSD: patch-af,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 121 --- gtk/src/Page/PageManagerTree.cs.old 2008-04-24 12:23:26.000000000 +0300
 122 +++ gtk/src/Page/PageManagerTree.cs     2007-10-26 12:11:04.000000000 +0300
 123 @@ -117,12 +117,12 @@
 124
 125                         pixbufRenderer = new CellRendererPixbuf();
 126                         column.PackStart(pixbufRenderer , false);
 127 -                       column.SetCellDataFunc(pixbufRenderer, PixbufDataHandler);
 128 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)PixbufDataHandler);
 129
 130                         textRenderer = new CellRendererText();
 131                         textRenderer.Ellipsize = Pango.EllipsizeMode.End;
 132                         column.PackStart(textRenderer , true);
 133 -                       column.SetCellDataFunc(textRenderer, TextDataHandler);
 134 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)TextDataHandler);
 135
 136                         // Events
 137                         favoriteHubManager.HubsSorted += OnFavoriteHubsSorted;
 138 $NetBSD: patch-ag,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 139 --- gtk/src/Page/SearchPage.cs.old      2008-04-24 12:26:20.000000000 +0300
 140 +++ gtk/src/Page/SearchPage.cs  2007-10-26 12:11:04.000000000 +0300
 141 @@ -150,7 +150,7 @@
 142                                 {
 143                                         if (renderer is CellRendererText)
 144                                         {
 145 -                                               column.SetCellDataFunc(renderer, SetTextStyle);
 146 +                                               column.SetCellDataFunc(renderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 147                                         }
 148                                 }
 149                         }
 150 @@ -468,7 +468,7 @@
 151                         item.Show();
 152
 153                         // Search by TTH
 154 -                       Action searchAction = actionGroup["SearchTTH"];
 155 +                       Gtk.Action searchAction = actionGroup["SearchTTH"];
 156                         searchAction.Sensitive = searchButton.Sensitive && GetSelectedTTH() != null;
 157                         menu.Append(searchAction.CreateMenuItem());
 158                 }
 159 $NetBSD: patch-ah,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 160 --- gtk/src/Page/UploadPage.cs.old      2008-04-24 11:22:21.000000000 +0300
 161 +++ gtk/src/Page/UploadPage.cs  2007-10-26 12:11:04.000000000 +0300
 162 @@ -40,9 +40,9 @@
 163                 private uint timeout;
 164
 165                 private ActionGroup actionGroup;
 166 -               private Action stopAction;
 167 -               private Action removeAction;
 168 -               private Action clearAction;
 169 +               private Gtk.Action stopAction;
 170 +               private Gtk.Action removeAction;
 171 +               private Gtk.Action clearAction;
 172
 173                 [Widget]
 174                 private ScrolledWindow scrolledWindow;
 175 $NetBSD: patch-ai,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 176 --- gtk/src/View/DownloadView.cs.old    2008-04-24 12:22:29.000000000 +0300
 177 +++ gtk/src/View/DownloadView.cs        2007-10-26 12:11:04.000000000 +0300
 178 @@ -76,7 +76,7 @@
 179                         column = GetColumn("Progress");
 180                         progressRenderer = (CellRendererProgress)column.CellRenderers[0];
 181
 182 -                       column.SetCellDataFunc(progressRenderer, SetProgressVisible);
 183 +                       column.SetCellDataFunc(progressRenderer, (Gtk.TreeCellDataFunc)SetProgressVisible);
 184                 }
 185
 186                 #region Methods
 187 $NetBSD: patch-aj,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 188 --- gtk/src/View/FileListView.cs        2008-04-24 12:17:17.000000000 +0300
 189 +++ gtk/src/View/FileListView.cs        2007-10-26 12:11:04.000000000 +0300
 190 @@ -68,7 +68,7 @@
 191
 192                         pixbufRenderer = new CellRendererPixbuf();
 193                         column.PackStart(pixbufRenderer , false);
 194 -                       column.SetCellDataFunc(pixbufRenderer, SetPixbuf);
 195 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)SetPixbuf);
 196
 197                         textRenderer = new CellRendererText();
 198                         column.PackStart(textRenderer , true);
 199 $NetBSD: patch-ak,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 200 --- gtk/src/View/SearchResultView.cs.old        2008-04-24 12:20:56.000000000 +0300
 201 +++ gtk/src/View/SearchResultView.cs    2007-10-26 12:11:04.000000000 +0300
 202 @@ -30,10 +30,10 @@
 203         public class SearchResultView : ExtendedTreeView
 204         {
 205                 private ActionGroup actionGroup;
 206 -               private Action downloadAction;
 207 -               private Action saveAsAction;
 208 -               private Action fileListAction;
 209 -               private Action matchQueueAction;
 210 +               private Gtk.Action downloadAction;
 211 +               private Gtk.Action saveAsAction;
 212 +               private Gtk.Action fileListAction;
 213 +               private Gtk.Action matchQueueAction;
 214
 215                 #region Constructors
 216
 217 @@ -86,7 +86,7 @@
 218
 219                         pixbufRenderer = new CellRendererPixbuf();
 220                         column.PackStart(pixbufRenderer , false);
 221 -                       column.SetCellDataFunc(pixbufRenderer, SetPixbuf);
 222 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)SetPixbuf);
 223
 224                         textRenderer = new CellRendererText();
 225                         textRenderer.Ellipsize = Pango.EllipsizeMode.End;
 226 $NetBSD: patch-al,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 227 --- gtk/src/View/TransferView.cs.old    2008-04-24 12:18:11.000000000 +0300
 228 +++ gtk/src/View/TransferView.cs        2007-10-26 12:11:04.000000000 +0300
 229 @@ -61,14 +61,14 @@
 230
 231                         pixbufRenderer = new CellRendererPixbuf();
 232                         column.PackStart(pixbufRenderer, false);
 233 -                       column.SetCellDataFunc(pixbufRenderer, SetPixbuf);
 234 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)SetPixbuf);
 235
 236                         textRenderer = new CellRendererText();
 237                         textRenderer.Ellipsize = Pango.EllipsizeMode.End;
 238                         column.PackStart(textRenderer, true);
 239                         column.AddAttribute(textRenderer, "text",
 240                                 (int)TransferStoreColumn.Name);
 241 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 242 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 243
 244                         ExpanderColumn = column;
 245
 246 @@ -77,7 +77,7 @@
 247                         column = AppendColumn(Catalog.GetString("Size"), textRenderer,
 248                                 "text", (int)TransferStoreColumn.SizeText);
 249                         column.SortColumnId = (int)TransferStoreColumn.Size;
 250 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 251 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 252
 253                         // Status
 254                         textRenderer = new CellRendererText();
 255 @@ -85,7 +85,7 @@
 256                         column = AppendColumn(Catalog.GetString("Status"), textRenderer);
 257                         column.Resizable = true;
 258                         column.MinWidth = 100;
 259 -                       column.SetCellDataFunc(textRenderer, SetStatusText);
 260 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetStatusText);
 261
 262                         // Progress
 263                         progressRenderer = new CellRendererProgress();
 264 @@ -102,7 +102,7 @@
 265                         column = AppendColumn(Catalog.GetString("Time Left"), textRenderer,
 266                                 "text", (int)TransferStoreColumn.TimeLeft);
 267                         column.SortColumnId = (int)TransferStoreColumn.TimeLeft;
 268 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 269 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 270                 }
 271
 272                 #region Methods
 273 $NetBSD: patch-am,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 274 --- gtk/src/View/UploadView.cs.old      2008-04-24 12:15:50.000000000 +0300
 275 +++ gtk/src/View/UploadView.cs  2007-10-26 12:11:04.000000000 +0300
 276 @@ -39,7 +39,7 @@
 277                                 "text", (int)UploadStore.Column.Started);
 278                         column = GetColumn(0);
 279                         column.SortColumnId = (int)UploadStore.Column.Started;
 280 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 281 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 282
 283                         // Directory
 284                         textRenderer = new CellRendererText();
 285 @@ -50,7 +50,7 @@
 286                         column.Expand = true;
 287                         column.Resizable = true;
 288                         column.SortColumnId = (int)TransferStoreColumn.Directory;
 289 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 290 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 291
 292                         // User
 293                         textRenderer = new CellRendererText();
 294 @@ -59,7 +59,7 @@
 295                         column = GetColumn(3);
 296                         column.Resizable = true;
 297                         column.SortColumnId = (int)UploadStore.Column.User;
 298 -                       column.SetCellDataFunc(textRenderer, SetTextStyle);
 299 +                       column.SetCellDataFunc(textRenderer, (Gtk.TreeCellDataFunc)SetTextStyle);
 300                 }
 301
 302                 #region Methods
 303 $NetBSD: patch-an,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 304 --- gtk/src/View/UserView.cs.old        2008-04-24 12:21:54.000000000 +0300
 305 +++ gtk/src/View/UserView.cs    2007-10-26 12:11:04.000000000 +0300
 306 @@ -68,7 +68,7 @@
 307
 308                         pixbufRenderer = new CellRendererPixbuf();
 309                         column.PackStart(pixbufRenderer , false);
 310 -                       column.SetCellDataFunc(pixbufRenderer, RenderUserPixbuf);
 311 +                       column.SetCellDataFunc(pixbufRenderer, (Gtk.TreeCellDataFunc)RenderUserPixbuf);
 312
 313                         textRenderer = new CellRendererText();
 314                         textRenderer.Ellipsize = Pango.EllipsizeMode.End;
 315 @@ -140,9 +140,9 @@
 316
 317                 protected override void OnPopulatePopup(Menu menu)
 318                 {
 319 -                       Action fileListAction = actionGroup["FileList"];
 320 -                       Action messageAction = actionGroup["PrivateMessage"];
 321 -                       Action infoAction = actionGroup["Information"];
 322 +                       Gtk.Action fileListAction = actionGroup["FileList"];
 323 +                       Gtk.Action messageAction = actionGroup["PrivateMessage"];
 324 +                       Gtk.Action infoAction = actionGroup["Information"];
 325
 326                         TreeIter iter;
 327                         if (Selection.GetSelected(out iter))
 328 $NetBSD: patch-ao,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 329 --- gtk/SConscript.orig 2008-04-25 09:23:52.000000000 +0300
 330 +++ gtk/SConscript      2008-04-25 09:25:00.000000000 +0300
 331 @@ -100,8 +100,8 @@
 332
 333  env.Alias("install", env.InstallProgram(lib_dir, '#bin/DCSharp.exe'))
 334  env.Alias("install", env.InstallData(lib_dir, '#bin/DCSharp.exe.config'))
 335 -env.Alias("install", env.InstallLibrary(lib_dir, '#lib/NDesk.DBus.dll'))
 336 -env.Alias("install", env.InstallLibrary(lib_dir, '#lib/NDesk.DBus.GLib.dll'))
 337 -env.Alias("install", env.InstallData(lib_dir, '#lib/NDesk.DBus.GLib.dll.config'))
 338 +# env.Alias("install", env.InstallLibrary(lib_dir, '#lib/NDesk.DBus.dll'))
 339 +# env.Alias("install", env.InstallLibrary(lib_dir, '#lib/NDesk.DBus.GLib.dll'))
 340 +# env.Alias("install", env.InstallData(lib_dir, '#lib/NDesk.DBus.GLib.dll.config'))
 341
 342  SConscript('po/SConscript')
 343 $NetBSD: patch-ap,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $
 344 --- bin/dcsharp.in.orig 2009-06-01 22:02:09.808221668 +0200
 345 +++ bin/dcsharp.in      2009-06-01 22:02:18.054711697 +0200
 346 @@ -7,4 +7,4 @@
 347  export MONO_PATH="$MONO_PATH:$LIB_DIR/dcsharp"
 348  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_DIR/dcsharp"
 349
 350 -exec mono "$LIB_DIR/dcsharp/DCSharp.exe" "$@"
 351 +exec dbus-launch mono "$LIB_DIR/dcsharp/DCSharp.exe" "$@"