SOURCES: mysql-query-browser-debian.patch (NEW) - some debian fixes

[arekm]

Author: arekm                        Date: Sun Oct  9 12:47:30 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- some debian fixes

---- Files affected:
SOURCES:
   mysql-query-browser-debian.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mysql-query-browser-debian.patch
diff -u /dev/null SOURCES/mysql-query-browser-debian.patch:1.1
--- /dev/null	Sun Oct  9 14:47:30 2005
+++ SOURCES/mysql-query-browser-debian.patch	Sun Oct  9 14:47:25 2005
@@ -0,0 +1,115 @@
+--- mysql-query-browser-1.1.14.orig/mysql-query-browser/source/linux/main.cc
++++ mysql-query-browser-1.1.14/mysql-query-browser/source/linux/main.cc
+@@ -253,12 +253,6 @@
+   if (!parse_cmd_line_args(argc, argv))
+     return 1;
+ 
+-  if (!getenv(PATH_ENV))
+-  {
+-    g_print(_("You must start this program using mysql-query-browser.\n"));
+-    exit(0);
+-  }
+-
+   // add search paths for images
+   {
+     std::string prefix= get_prefix()+DATADIRNAME"/mysql-gui";
+@@ -353,10 +347,7 @@
+ 
+ std::string get_prefix()
+ {
+-  if (getenv(PATH_ENV))
+-    return std::string(getenv(PATH_ENV))+"/";
+-  else
+-    return PREFIX"/";
++    return "/usr/";
+ }
+ 
+ 
+--- mysql-query-browser-1.1.14.orig/mysql-query-browser/source/linux/MQResultSetView.cc
++++ mysql-query-browser-1.1.14/mysql-query-browser/source/linux/MQResultSetView.cc
+@@ -1840,7 +1840,7 @@
+   editor->get_data(buffer, size);
+ 
+   path= (char*)((Glib::Object*)editor)->get_data("path");
+-  column= (int)((Glib::Object*)editor)->get_data("column");
++  column= (int)(long)((Glib::Object*)editor)->get_data("column");
+ 
+   Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path));
+   _model->set_value(iter, column*2, buffer, size);
+@@ -1868,7 +1868,7 @@
+ void MQResultSetView::blob_edit(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column)
+ {
+   gpointer fdata; 
+-  gsize fsize; 
++  guint fsize; 
+   Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path));
+ 
+   if (_model->get_value(iter, column*2, fdata, fsize))
+@@ -1894,7 +1894,7 @@
+ void MQResultSetView::blob_save(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column)
+ {
+   gpointer fdata; 
+-  gsize fsize;
++  guint fsize;
+   Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path));
+ 
+   if (_model->get_value(iter, column*2, fdata, fsize))
+@@ -1968,7 +1968,7 @@
+ void MQResultSetView::blob_view(CellRendererBlob *cell, Gtk::Widget *widget, const Glib::ustring &path, int column)
+ {
+   gpointer fdata; 
+-  gsize fsize; 
++  guint fsize; 
+   Gtk::TreeIter iter= _model->get_iter(Gtk::TreePath(path));
+ 
+   if (_model->get_value(iter, column*2, fdata, fsize))
+--- mysql-query-browser-1.1.14.orig/mysql-query-browser/source/linux/Makefile.in
++++ mysql-query-browser-1.1.14/mysql-query-browser/source/linux/Makefile.in
+@@ -583,7 +583,7 @@
+ # If a solution is found, this could be removed.
+ #
+ $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a:
+-	(cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make)
++	(cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests --enable-compile-warnings=yes; make)
+ 
+ clean-generic:
+ 	-make -C gtksourceview distclean
+--- mysql-query-browser-1.1.14.orig/mysql-query-browser/source/linux/MGResultSetModel.cc
++++ mysql-query-browser-1.1.14/mysql-query-browser/source/linux/MGResultSetModel.cc
+@@ -153,7 +153,7 @@
+   if (!parent)
+   {
+     iter->stamp= _stamp;
+-    iter->user_data= (gpointer)n;
++    iter->user_data= (gpointer)(long)n;
+     return true;
+   }
+   iter->stamp= 0;
+@@ -217,7 +217,7 @@
+     }
+   }
+   iter->stamp= _stamp;
+-  iter->user_data= (gpointer)row_index;
++  iter->user_data= (gpointer)(long)row_index;
+ 
+   return true;
+ }
+@@ -349,7 +349,7 @@
+     {
+       bool tmp= _disable_checks;
+       gpointer data= NULL;
+-      gsize size= 0;
++      guint size= 0;
+       bool is_blob;
+       switch (_resultset->columns[column/2].column_type)
+       {
+@@ -487,7 +487,7 @@
+ 
+   // make new iterator
+   iter.gobj()->stamp= _stamp;
+-  iter.gobj()->user_data= (gpointer)new_row;
++  iter.gobj()->user_data= (gpointer)(long)new_row;
+ 
+   // emit signal
+   row_inserted(get_path(iter), iter);
+
================================================================