mirror of
https://abf.rosa.ru/djam/mysql-gui-tools.git
synced 2025-02-23 16:52:56 +00:00
Automatic import for version 5.0
This commit is contained in:
Rosa
commit
65d815fd58
22 changed files with 1255 additions and 0 deletions
4
.abf.yml
Normal file
4
.abf.yml
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
sources:
|
||||||
|
"mysql-administrator-doc.tar.bz2": cd122aa4b920f7524ee30d6ace31a584c9096c13
|
||||||
|
"mysql-gui-tools-5.0r14.tar.gz": 080964818d24dd857c2e36041756f2647dc2d9ad
|
||||||
|
"mysql-query-browser-doc.tar.bz2": 03e217674b536f356261d6501e1d0dc728a63a80
|
||||||
11
mysql-administrator-1.1.5-shellbang.patch
Normal file
11
mysql-administrator-1.1.5-shellbang.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- mysql-administrator/source/linux/mysql-administrator 2008-09-12 10:55:33.000000000 -0400
|
||||||
|
+++ mysql-administrator/source/linux/mysql-administrator.oden 2009-10-05 08:13:19.000000000 -0400
|
||||||
|
@@ -1,6 +1,8 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
+#!/bin/sh
|
||||||
|
PRG="$0"
|
||||||
|
+export DEBUG_DONT_SPAWN_FETCHES=1
|
||||||
|
|
||||||
|
# need this for relative symlinks
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
11
mysql-administrator-help.patch
Normal file
11
mysql-administrator-help.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- source/linux/MAdministrator.cc
|
||||||
|
+++ source/linux/MAdministrator.cc
|
||||||
|
@@ -802,7 +802,7 @@
|
||||||
|
if (!Glib::file_test(path, Glib::FILE_TEST_EXISTS))
|
||||||
|
path= "/usr/share/doc/packages/mysql-administrator/administrator.html"; // location in SUSE^M
|
||||||
|
|
||||||
|
- g_spawn_command_line_async(ufmt("gnome-help ghelp:///%s >& /dev/null",path.c_str()).c_str(), NULL);
|
||||||
|
+ g_spawn_command_line_async(ufmt("xdg-open %s",path.c_str()).c_str(), NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
10
mysql-gui-common-pkg-config.patch
Normal file
10
mysql-gui-common-pkg-config.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- configure.in
|
||||||
|
+++ configure.in
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CXX
|
||||||
|
+PKG_PROG_PKG_CONFIG
|
||||||
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
|
AC_CHECK_TOOL(PKG_CONFIG, pkg-config)
|
||||||
24
mysql-gui-common-unused-func.patch
Normal file
24
mysql-gui-common-unused-func.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
--- library/mysql-resultset/source/MYXResultSetStorage.cc
|
||||||
|
+++ library/mysql-resultset/source/MYXResultSetStorage.cc
|
||||||
|
@@ -423,9 +423,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
+/*
|
||||||
|
MYXRSCompareStatus MYXResultSetStorage::get_compare_status(bigint row, int column)
|
||||||
|
{
|
||||||
|
- /*
|
||||||
|
switch (_resultset->rows[row].diff&MYX_RD_MASK)
|
||||||
|
{
|
||||||
|
case MYX_RD_OTHER_ONLY:
|
||||||
|
@@ -438,8 +438,9 @@
|
||||||
|
return MCSDiffers;
|
||||||
|
default:
|
||||||
|
return MCSMatch;
|
||||||
|
- }*/
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+*/
|
||||||
|
|
||||||
|
|
||||||
|
MYXRSEditStatus MYXResultSetStorage::get_edit_status(bigint row, int column) const
|
||||||
32
mysql-gui-common-warnings.patch
Normal file
32
mysql-gui-common-warnings.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
--- library/generic-canvas/source/myx_gc_figure.cpp
|
||||||
|
+++ library/generic-canvas/source/myx_gc_figure.cpp
|
||||||
|
@@ -3164,7 +3164,8 @@
|
||||||
|
// Convert depth map so that unused values become 0 (transparent).
|
||||||
|
unsigned char* run = buffer;
|
||||||
|
for (int i = 0; i < bufferSize; ++i)
|
||||||
|
- *run = 255 - *run++;
|
||||||
|
+ *run = 255 - *(run + 1);
|
||||||
|
+ run++;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Release frame buffer binding to enable normal rendering again.
|
||||||
|
--- library/grt-modules/source/myx_grt_mysql_transformation.c
|
||||||
|
+++ library/grt-modules/source/myx_grt_mysql_transformation.c
|
||||||
|
@@ -2432,7 +2432,7 @@
|
||||||
|
// add changed table options
|
||||||
|
for(i= 0; data[i].key != NULL; i++)
|
||||||
|
{
|
||||||
|
- if(data[i].value != "")
|
||||||
|
+ if(strcmp(data[i].value,""))
|
||||||
|
{
|
||||||
|
sql= str_g_append_and_free(sql, g_strdup_printf(", %s", data[i].value));
|
||||||
|
g_free(data[i].value);
|
||||||
|
@@ -2514,7 +2514,7 @@
|
||||||
|
// add changed routine options
|
||||||
|
for(i= 0; data[i].key != NULL; i++)
|
||||||
|
{
|
||||||
|
- if(data[i].value != "")
|
||||||
|
+ if(strcmp(data[i].value,""))
|
||||||
|
{
|
||||||
|
sql= str_g_append_and_free(sql, g_strdup_printf(" %s", data[i].value));
|
||||||
|
g_free(data[i].value);
|
||||||
|
|
@ -0,0 +1,76 @@
|
||||||
|
--- mysql-administrator/library/source/myx_backup.c 2008-10-16 04:40:40.000000000 -0400
|
||||||
|
+++ mysql-administrator/library/source/myx_backup.c.oden 2009-10-05 08:45:05.000000000 -0400
|
||||||
|
@@ -545,7 +545,7 @@ int dump_dummy_tables_for_views(MYX_BS_S
|
||||||
|
status->current_table_quoted);
|
||||||
|
else
|
||||||
|
sql= g_strdup_printf("DROP TABLE IF EXISTS %s;\n", status->current_table_quoted);
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, sql));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", sql));
|
||||||
|
g_free(sql);
|
||||||
|
|
||||||
|
if (status->qualified)
|
||||||
|
@@ -553,7 +553,7 @@ int dump_dummy_tables_for_views(MYX_BS_S
|
||||||
|
status->current_table_quoted);
|
||||||
|
else
|
||||||
|
sql= g_strdup_printf("DROP VIEW IF EXISTS %s;\n", status->current_table_quoted);
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, sql));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", sql));
|
||||||
|
g_free(sql);
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -572,7 +572,7 @@ int dump_dummy_tables_for_views(MYX_BS_S
|
||||||
|
status->current_table_quoted);
|
||||||
|
else
|
||||||
|
sql= g_strdup_printf("CREATE TABLE %s (\n", status->current_table_quoted);
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, sql));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", sql));
|
||||||
|
g_free(sql);
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -2910,7 +2910,7 @@ int write_sql_file_header(MYX_BS_STATUS
|
||||||
|
if (status->options & MYX_B_COMPATIBILITY_MODE)
|
||||||
|
BufferEnd= strmov(BufferEnd, ",MYSQL323");
|
||||||
|
strmov(BufferEnd, "' */;\n\n\n");
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, Buffer));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", Buffer));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -3011,7 +3011,7 @@ int write_create_statement_to_file(MYX_B
|
||||||
|
else
|
||||||
|
drop_string= g_strdup_printf("\nDROP TABLE IF EXISTS %s;", status->current_table_quoted);
|
||||||
|
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, drop_string));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", drop_string));
|
||||||
|
g_free(drop_string);
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -3037,7 +3037,7 @@ int write_create_statement_to_file(MYX_B
|
||||||
|
drop_string= g_strdup_printf("\nDROP %s %s;\n", object_name[type][0], status->current_table_quoted);
|
||||||
|
};
|
||||||
|
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, drop_string));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", drop_string));
|
||||||
|
g_free(drop_string);
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -3116,7 +3116,7 @@ int write_triggers_to_file(MYX_BS_STATUS
|
||||||
|
else
|
||||||
|
drop_string= g_strdup_printf("\nDROP TRIGGER /*!50030 IF EXISTS */ %s;\n", quoted_trigger);
|
||||||
|
|
||||||
|
- SAFE_IO(fprintf(status->sql_file, drop_string));
|
||||||
|
+ SAFE_IO(fprintf(status->sql_file, "%s", drop_string));
|
||||||
|
g_free(drop_string);
|
||||||
|
};
|
||||||
|
|
||||||
|
--- mysql-administrator/source/util/mabackup.cc 2008-09-12 10:55:54.000000000 -0400
|
||||||
|
+++ mysql-administrator/source/util/mabackup.cc.oden 2009-10-05 08:56:20.000000000 -0400
|
||||||
|
@@ -56,7 +56,7 @@ static inline void chk(bool cond, const
|
||||||
|
{
|
||||||
|
if(!cond)
|
||||||
|
{
|
||||||
|
- g_print(errtext);
|
||||||
|
+ g_print("%s", errtext);
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
8
mysql-gui-tools-5.0r14-garbage_fix.diff
Normal file
8
mysql-gui-tools-5.0r14-garbage_fix.diff
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
--- mysql-gui-common/library/base-library/source/myx_database_model.c 2008-10-13 13:36:12.000000000 +0200
|
||||||
|
+++ mysql-gui-common/library/base-library/source/myx_database_model.c.oden 2008-11-05 19:44:12.000000000 +0100
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-// Copyright (C) 2003 - 2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
+// Copyright (C) 2003 - 2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
|
#include "myx_public_interface.h"
|
||||||
|
#include "myx_util.h"
|
||||||
10
mysql-gui-tools-5.0r14-gnome_cflags.diff
Normal file
10
mysql-gui-tools-5.0r14-gnome_cflags.diff
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- mysql-query-browser/configure.in 2007-04-27 14:06:36.000000000 -0400
|
||||||
|
+++ mysql-query-browser/configure.in.oden 2009-10-05 09:07:23.000000000 -0400
|
||||||
|
@@ -73,6 +73,7 @@
|
||||||
|
PKG_CHECK_MODULES(GNOME, [libglade-2.0
|
||||||
|
gthread-2.0
|
||||||
|
libxml-2.0 >= 2.6.2
|
||||||
|
+ libgnome-2.0
|
||||||
|
$gtkhtml
|
||||||
|
gtkmm-2.4])
|
||||||
|
AC_SUBST(GNOME_CFLAGS)
|
||||||
11
mysql-gui-tools-5.0r14-invalid_const_char_conversion.diff
Normal file
11
mysql-gui-tools-5.0r14-invalid_const_char_conversion.diff
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- mysql-gui-common/source/linux/MySQLGRT/MGRT.cc 2006-09-05 18:04:50.000000000 -0400
|
||||||
|
+++ mysql-gui-common/source/linux/MySQLGRT/MGRT.cc.oden 2009-10-05 08:33:31.000000000 -0400
|
||||||
|
@@ -891,7 +891,7 @@ void MGRT::set_global_value(const char *
|
||||||
|
|
||||||
|
void MGRT::unset_global_value(const char *path)
|
||||||
|
{
|
||||||
|
- char *end= strrchr(path, '/');
|
||||||
|
+ const char *end= strrchr(path, '/');
|
||||||
|
std::string subpath(path, end-path);
|
||||||
|
MYX_GRT_VALUE *dict;
|
||||||
|
|
||||||
8
mysql-gui-tools-bash.patch
Normal file
8
mysql-gui-tools-bash.patch
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
--- mysql-gui-tools-5.0r6/mysql-gui-common/mkjava.sh.wiget 2006-12-01 17:12:53.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r6/mysql-gui-common/mkjava.sh 2006-11-30 18:34:25.000000000 +0100
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#/bin/bash
|
||||||
|
+#!/bin/bash
|
||||||
|
#
|
||||||
|
# Java stuff build script
|
||||||
|
#
|
||||||
13
mysql-gui-tools-gcc42.patch
Normal file
13
mysql-gui-tools-gcc42.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
--- mysql-gui-tools-5.0r5/mysql-gui-common/library/utilities/include/myx_util_functions.h.orig 2006-11-27 21:04:53.000000000 +0000
|
||||||
|
+++ mysql-gui-tools-5.0r5/mysql-gui-common/library/utilities/include/myx_util_functions.h 2006-11-27 21:05:41.000000000 +0000
|
||||||
|
@@ -98,8 +98,8 @@
|
||||||
|
typedef __int64 longlong;
|
||||||
|
typedef unsigned __int64 ulonglong;
|
||||||
|
#else
|
||||||
|
-# define min(a,b) ((a)<(b)?(a):(b))
|
||||||
|
-# define max(a,b) ((a)>(b)?(a):(b))
|
||||||
|
+ static inline size_t min( size_t a, size_t b ) { return ( ( a < b ) ? a : b ); }
|
||||||
|
+ static inline size_t max( size_t a, size_t b ) { return ( ( a > b ) ? a : b ); }
|
||||||
|
|
||||||
|
typedef unsigned char uint8;
|
||||||
|
typedef unsigned char uchar;
|
||||||
79
mysql-gui-tools-gcc43.diff
Normal file
79
mysql-gui-tools-gcc43.diff
Normal file
|
|
@ -0,0 +1,79 @@
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-gui-common/library/generic-canvas/source/myx_gc_variant.cpp mysql-gui-tools-5.0r14.oden/mysql-gui-common/library/generic-canvas/source/myx_gc_variant.cpp
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-gui-common/library/generic-canvas/source/myx_gc_variant.cpp 2005-07-21 09:56:59.000000000 -0400
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-gui-common/library/generic-canvas/source/myx_gc_variant.cpp 2009-10-05 08:22:36.000000000 -0400
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
* @brief Implementation of a general purpose variant data type.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
-
|
||||||
|
+#include <cstdio>
|
||||||
|
#include "myx_gc_variant.h"
|
||||||
|
#include "myx_gc_datatypes.h"
|
||||||
|
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-gui-common/library/grt-wb-controller/source/GraphRenderer.cpp mysql-gui-tools-5.0r14.oden/mysql-gui-common/library/grt-wb-controller/source/GraphRenderer.cpp
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-gui-common/library/grt-wb-controller/source/GraphRenderer.cpp 2006-03-16 12:04:33.000000000 -0500
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-gui-common/library/grt-wb-controller/source/GraphRenderer.cpp 2009-10-05 08:22:10.000000000 -0400
|
||||||
|
@@ -10,6 +10,8 @@ const int GraphRenderer::K2;
|
||||||
|
const int GraphRenderer::K3;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <climits>
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
// equals for doubles
|
||||||
|
// algorithm by D.E.Knuth (TAOCP Vol.3 Sec. 4.2.2)
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MGFileBrowserList.cc mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MGFileBrowserList.cc
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MGFileBrowserList.cc 2006-07-25 16:03:52.000000000 -0400
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MGFileBrowserList.cc 2009-10-05 08:22:10.000000000 -0400
|
||||||
|
@@ -20,8 +20,11 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <errno.h>
|
||||||
|
+#include <string.h>
|
||||||
|
#include <stdio.h> /* rename() in FreeBSD */
|
||||||
|
|
||||||
|
+#include <cstring>
|
||||||
|
+
|
||||||
|
|
||||||
|
|
||||||
|
MGFileBrowserList::MGFileBrowserList(const Glib::ustring &title,
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc 2005-03-13 08:16:59.000000000 -0500
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc 2009-10-05 08:22:10.000000000 -0400
|
||||||
|
@@ -16,6 +16,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
#include "MGHMeterGraphPlotter.h"
|
||||||
|
+#include <string.h>
|
||||||
|
+
|
||||||
|
+#include <cstring>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MySQLGRT/MGRTValueTree.h mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MySQLGRT/MGRTValueTree.h
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-gui-common/source/linux/MySQLGRT/MGRTValueTree.h 2006-03-02 23:30:10.000000000 -0500
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-gui-common/source/linux/MySQLGRT/MGRTValueTree.h 2009-10-05 08:22:10.000000000 -0400
|
||||||
|
@@ -50,7 +50,7 @@ class MGRTValueTree : public Gtk::TreeVi
|
||||||
|
void set_icon(Gtk::TreeRow row, MGRTValue value);
|
||||||
|
void add_value_item(Gtk::TreeIter iter, MGRTValue value);
|
||||||
|
|
||||||
|
- void add_list_to_store(MGRTValue list, Gtk::TreeRow *parent, std::list<MYX_GRT_VALUE*> *list);
|
||||||
|
+ void add_list_to_store(MGRTValue list1, Gtk::TreeRow *parent, std::list<MYX_GRT_VALUE*> *list2);
|
||||||
|
void add_dict_to_store(MGRTValue dict, Gtk::TreeRow &parent, std::list<MYX_GRT_VALUE*> *list);
|
||||||
|
|
||||||
|
void remember_path(Gtk::TreeView *tree, const Gtk::TreeModel::Path &path, std::list<MYX_GRT_VALUE*> &list);
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r14/mysql-query-browser/source/linux/MGCodeEditor.cc mysql-gui-tools-5.0r14.oden/mysql-query-browser/source/linux/MGCodeEditor.cc
|
||||||
|
--- mysql-gui-tools-5.0r14/mysql-query-browser/source/linux/MGCodeEditor.cc 2007-01-29 13:20:57.000000000 -0500
|
||||||
|
+++ mysql-gui-tools-5.0r14.oden/mysql-query-browser/source/linux/MGCodeEditor.cc 2009-10-05 08:22:10.000000000 -0400
|
||||||
|
@@ -16,8 +16,11 @@
|
||||||
|
|
||||||
|
#include "MGCodeEditor.h"
|
||||||
|
|
||||||
|
+#include <string.h>
|
||||||
|
#include <gtksourceview/gtksourcelanguagesmanager.h>
|
||||||
|
|
||||||
|
+#include <cstring>
|
||||||
|
+
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
31
mysql-gui-tools-global.patch
Normal file
31
mysql-gui-tools-global.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
--- mysql-gui-common/library/base-library/source/myx_library.c 2008-10-13 07:36:12.000000000 -0400
|
||||||
|
+++ mysql-gui-common/library/base-library/source/myx_library.c.oden 2009-10-05 08:14:19.000000000 -0400
|
||||||
|
@@ -51,6 +51,28 @@ typedef char pbool; /* Mixed
|
||||||
|
typedef short pshort; /* Mixed prototypes can take short int */
|
||||||
|
typedef float pfloat; /* Mixed prototypes can take float */
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
|
||||||
|
+ But that's already covered by the __attribute__ tests above, so this is
|
||||||
|
+ just a convenience macro.
|
||||||
|
+*/
|
||||||
|
+#ifndef ATTRIBUTE_FORMAT
|
||||||
|
+# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+
|
||||||
|
+ __attribute__((format(...))) on a function pointer is not supported
|
||||||
|
+ until gcc 3.1
|
||||||
|
+*/
|
||||||
|
+#ifndef ATTRIBUTE_FORMAT_FPTR
|
||||||
|
+# if (GCC_VERSION >= 3001)
|
||||||
|
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
|
||||||
|
+# else
|
||||||
|
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n)
|
||||||
|
+# endif /* GNUC >= 3.1 */
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <m_ctype.h>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
11
mysql-gui-tools-gtksourceview-cflags.patch
Normal file
11
mysql-gui-tools-gtksourceview-cflags.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- mysql-query-browser/source/linux/Makefile.am 2009-10-05 09:00:43.000000000 -0400
|
||||||
|
+++ mysql-query-browser/source/linux/Makefile.am.oden 2009-10-05 09:01:59.000000000 -0400
|
||||||
|
@@ -61,7 +61,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-compile-warnings=yes --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
|
||||||
|
+ (cd gtksourceview; ./configure --enable-compile-warnings=yes --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -D_GNU_SOURCE -fno-strict-aliasing")
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
|
-make -C gtksourceview distclean
|
||||||
72
mysql-gui-tools-mdv_conf.diff
Normal file
72
mysql-gui-tools-mdv_conf.diff
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-administrator/res/linux/admin_preferences.glade mysql-gui-tools-5.0r9.oden/mysql-administrator/res/linux/admin_preferences.glade
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-administrator/res/linux/admin_preferences.glade 2006-08-14 02:12:18.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-administrator/res/linux/admin_preferences.glade 2007-01-21 16:29:52.000000000 +0100
|
||||||
|
@@ -88,7 +88,7 @@
|
||||||
|
<widget class="GtkLabel" id="label34">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">The path for the script to be used to start and stop
|
||||||
|
-MySQL locally, Usually located at /etc/init.d/mysql
|
||||||
|
+MySQL locally, Usually located at /etc/rc.d/init.d/mysqld
|
||||||
|
and invoked with start or stop as the argument.</property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MAdministrator.cc mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MAdministrator.cc
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MAdministrator.cc 2007-01-17 03:59:17.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MAdministrator.cc 2007-01-21 16:33:40.000000000 +0100
|
||||||
|
@@ -988,7 +988,7 @@
|
||||||
|
void MAdministrator::open_merlin_page()
|
||||||
|
{
|
||||||
|
// system("gnome-www-browser http://www.mysql.com/network/&");
|
||||||
|
- system("firefox http://www.mysql.com/network/&");
|
||||||
|
+ system("www-browser http://www.mysql.com/network/&");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MAPreferences.cc mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MAPreferences.cc
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MAPreferences.cc 2006-08-01 20:59:54.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MAPreferences.cc 2007-01-21 16:31:10.000000000 +0100
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
backup_profiles_directory= "backup_profiles";
|
||||||
|
last_backup_directory= Glib::get_home_dir();
|
||||||
|
|
||||||
|
- start_script_path= "/etc/init.d/mysql";
|
||||||
|
+ start_script_path= "/etc/rc.d/init.d/mysqld";
|
||||||
|
|
||||||
|
show_user_global_privileges= false;
|
||||||
|
show_user_table_column_privileges= false;
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MInstanceInfo.cc mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MInstanceInfo.cc
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-administrator/source/linux/MInstanceInfo.cc 2006-08-03 04:44:46.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/MInstanceInfo.cc 2007-01-21 16:34:29.000000000 +0100
|
||||||
|
@@ -830,7 +830,7 @@
|
||||||
|
}
|
||||||
|
#ifdef MYSQLD_PID_FILE_TRY_GUESS
|
||||||
|
char *paths[]= {
|
||||||
|
- "/var/lock/subsys/mysql",
|
||||||
|
+ "/var/lock/subsys/mysqld",
|
||||||
|
"/var/run/mysqld/mysqld.pid",
|
||||||
|
"/var/run/mysql/mysqld.pid"
|
||||||
|
"/var/lib/mysqld/mysqld.pid",
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-administrator/source/linux/myadmin.h mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/myadmin.h
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-administrator/source/linux/myadmin.h 2006-08-03 04:44:46.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-administrator/source/linux/myadmin.h 2007-01-21 16:35:10.000000000 +0100
|
||||||
|
@@ -83,7 +83,7 @@
|
||||||
|
/* system specific paths */
|
||||||
|
#define DEFAULT_INNODB_DATADIR "/var/lib/mysql"
|
||||||
|
|
||||||
|
-#define DEFAULT_MY_CNF_PATH "/etc/mysql/my.cnf"
|
||||||
|
+#define DEFAULT_MY_CNF_PATH "/etc/my.cnf"
|
||||||
|
#define MY_CNF_PATH_TRY_GUESS
|
||||||
|
|
||||||
|
#define DEFAULT_MYSQLD_PID_FILE "/var/lib/mysqld/mysqld.pid"
|
||||||
|
diff -Naur mysql-gui-tools-5.0r9/mysql-gui-common/source/linux/MGExecSU.cc mysql-gui-tools-5.0r9.oden/mysql-gui-common/source/linux/MGExecSU.cc
|
||||||
|
--- mysql-gui-tools-5.0r9/mysql-gui-common/source/linux/MGExecSU.cc 2006-09-26 16:48:35.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r9.oden/mysql-gui-common/source/linux/MGExecSU.cc 2007-01-21 16:36:51.000000000 +0100
|
||||||
|
@@ -432,7 +432,7 @@
|
||||||
|
|
||||||
|
myg_datadir= "../../res/linux";
|
||||||
|
|
||||||
|
- MGExecSU *exsu= new MGExecSU("testing", "/etc/init.d/mysql stop");
|
||||||
|
+ MGExecSU *exsu= new MGExecSU("testing", "/etc/rc.d/init.d/mysqld stop");
|
||||||
|
|
||||||
|
exsu->signal_output().connect(sigc::ptr_fun(&handle_output));
|
||||||
|
exsu->signal_finished().connect(sigc::bind<MGExecSU*>(sigc::ptr_fun(&handle_end), exsu));
|
||||||
70
mysql-gui-tools-no-DISABLE_DEPRECATED.diff
Normal file
70
mysql-gui-tools-no-DISABLE_DEPRECATED.diff
Normal file
|
|
@ -0,0 +1,70 @@
|
||||||
|
diff -Naur mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/aclocal.m4 mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/aclocal.m4
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/aclocal.m4 2005-05-18 05:39:44.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/aclocal.m4 2008-07-28 14:53:52.000000000 +0200
|
||||||
|
@@ -6929,7 +6929,7 @@
|
||||||
|
AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
|
||||||
|
[
|
||||||
|
if test $USE_MAINTAINER_MODE = yes; then
|
||||||
|
- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED"
|
||||||
|
+ DISABLE_DEPRECATED=""
|
||||||
|
else
|
||||||
|
DISABLE_DEPRECATED=""
|
||||||
|
fi
|
||||||
|
diff -Naur mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am 2005-04-15 00:00:33.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am 2008-07-28 14:54:06.000000000 +0200
|
||||||
|
@@ -9,10 +9,6 @@
|
||||||
|
INCLUDES = \
|
||||||
|
-DDATADIR=\""$(datadir)"\" \
|
||||||
|
-DG_LOG_DOMAIN=\"GtkSourceView\"\
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
-I$(top_srcdir) -I$(srcdir) \
|
||||||
|
$(WARN_CFLAGS) \
|
||||||
|
$(DEP_CFLAGS)
|
||||||
|
diff -Naur mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2005-04-15 00:00:33.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2008-07-28 14:53:59.000000000 +0200
|
||||||
|
@@ -202,10 +202,6 @@
|
||||||
|
INCLUDES = \
|
||||||
|
-DDATADIR=\""$(datadir)"\" \
|
||||||
|
-DG_LOG_DOMAIN=\"GtkSourceView\"\
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
-I$(top_srcdir) -I$(srcdir) \
|
||||||
|
$(WARN_CFLAGS) \
|
||||||
|
$(DEP_CFLAGS)
|
||||||
|
diff -Naur mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.am mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.am
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.am 2005-03-13 15:42:26.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.am 2008-07-28 14:54:21.000000000 +0200
|
||||||
|
@@ -1,11 +1,6 @@
|
||||||
|
INCLUDES = \
|
||||||
|
-DDATADIR=\""$(datadir)"\" \
|
||||||
|
-DG_LOG_DOMAIN=\"GtkSourceView\"\
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED \
|
||||||
|
- -DGNOME_DISABLE_DEPRECATED \
|
||||||
|
-I$(top_srcdir) -I$(srcdir) \
|
||||||
|
$(WARN_CFLAGS) \
|
||||||
|
$(DEP_CFLAGS) \
|
||||||
|
diff -Naur mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in 2005-03-13 15:42:26.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/gtksourceview/tests/Makefile.in 2008-07-28 14:54:15.000000000 +0200
|
||||||
|
@@ -197,11 +197,6 @@
|
||||||
|
INCLUDES = \
|
||||||
|
-DDATADIR=\""$(datadir)"\" \
|
||||||
|
-DG_LOG_DOMAIN=\"GtkSourceView\"\
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED \
|
||||||
|
- -DGNOME_DISABLE_DEPRECATED \
|
||||||
|
-I$(top_srcdir) -I$(srcdir) \
|
||||||
|
$(WARN_CFLAGS) \
|
||||||
|
$(DEP_CFLAGS) \
|
||||||
144
mysql-gui-tools-sigc_2.1.1_api_fixes.diff
Normal file
144
mysql-gui-tools-sigc_2.1.1_api_fixes.diff
Normal file
|
|
@ -0,0 +1,144 @@
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MABackupPanel.cc mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MABackupPanel.cc
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MABackupPanel.cc 2007-02-28 14:51:50.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MABackupPanel.cc 2007-11-08 16:21:44.000000000 +0100
|
||||||
|
@@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup()
|
||||||
|
|
||||||
|
if (_inst->check_connection())
|
||||||
|
{
|
||||||
|
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
(sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
|
||||||
|
50);
|
||||||
|
dlg->show();
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MACatalogsPanel.cc mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MACatalogsPanel.cc
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MACatalogsPanel.cc 2007-02-21 01:48:34.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MACatalogsPanel.cc 2007-11-08 16:21:23.000000000 +0100
|
||||||
|
@@ -1488,7 +1488,7 @@ void MACatalogsPanel::maint_next_page()
|
||||||
|
|
||||||
|
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
|
||||||
|
_maint_dlg_xml->get_note("note")->set_current_page(4);
|
||||||
|
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
|
||||||
|
status= (MYX_TABLE_COMMAND_STATUSES*)
|
||||||
|
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
|
||||||
|
@@ -1528,7 +1528,7 @@ void MACatalogsPanel::maint_next_page()
|
||||||
|
|
||||||
|
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
|
||||||
|
_maint_dlg_xml->get_note("note")->set_current_page(4);
|
||||||
|
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
|
||||||
|
status= (MYX_TABLE_COMMAND_STATUSES*)
|
||||||
|
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
|
||||||
|
@@ -1568,7 +1568,7 @@ void MACatalogsPanel::maint_next_page()
|
||||||
|
|
||||||
|
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
|
||||||
|
_maint_dlg_xml->get_note("note")->set_current_page(4);
|
||||||
|
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
|
||||||
|
|
||||||
|
status= (MYX_TABLE_COMMAND_STATUSES*)
|
||||||
|
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MAdministrator.h mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MAdministrator.h
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MAdministrator.h 2007-03-27 15:09:56.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MAdministrator.h 2007-11-08 16:21:37.000000000 +0100
|
||||||
|
@@ -66,7 +66,7 @@ class MAdministrator : public Glib::Obje
|
||||||
|
|
||||||
|
sigc::signal0<void> _signal_prefs_changed;
|
||||||
|
|
||||||
|
- SigC::Connection _pulse_conn;
|
||||||
|
+ sigc::connection _pulse_conn;
|
||||||
|
bool pulse_progress();
|
||||||
|
|
||||||
|
void setup_sidebar();
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MARestorePanel.cc mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MARestorePanel.cc
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MARestorePanel.cc 2006-09-26 20:12:56.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MARestorePanel.cc 2007-11-08 16:21:16.000000000 +0100
|
||||||
|
@@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perf
|
||||||
|
op_aborted= false;
|
||||||
|
|
||||||
|
{
|
||||||
|
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
|
||||||
|
50);
|
||||||
|
|
||||||
|
@@ -854,7 +854,7 @@ void MARestorePanel::perform_restore()
|
||||||
|
//{
|
||||||
|
MYX_BACKUP_ERROR err;
|
||||||
|
|
||||||
|
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
|
||||||
|
(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
|
||||||
|
50);
|
||||||
|
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MAServerConnectionsPanel.h mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MAServerConnectionsPanel.h
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/MAServerConnectionsPanel.h 2005-04-22 05:21:41.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-administrator/source/linux/MAServerConnectionsPanel.h 2007-11-08 16:21:32.000000000 +0100
|
||||||
|
@@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public
|
||||||
|
|
||||||
|
Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
|
||||||
|
|
||||||
|
- SigC::Connection _timer;
|
||||||
|
+ sigc::connection _timer;
|
||||||
|
|
||||||
|
int _current_page;
|
||||||
|
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-gui-common/source/linux/MGConnectDialog.cc mysql-gui-tools-5.0r12.oden/mysql-gui-common/source/linux/MGConnectDialog.cc
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-gui-common/source/linux/MGConnectDialog.cc 2006-12-05 23:44:08.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-gui-common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100
|
||||||
|
@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed
|
||||||
|
// select back the original item
|
||||||
|
((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
|
||||||
|
|
||||||
|
- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
|
||||||
|
+ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
|
||||||
|
&MGConnectDialog::preferences_closed));
|
||||||
|
- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
|
||||||
|
+ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
|
||||||
|
&MGConnectDialog::preferences_changed));
|
||||||
|
MGPreferencesEditor::instance()->show(true);
|
||||||
|
MGPreferencesEditor::instance()->set_modal(true);
|
||||||
|
@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa
|
||||||
|
{
|
||||||
|
Gtk::Button *btn;
|
||||||
|
pid_t ping_pid= 0;
|
||||||
|
- SigC::Connection input_handler;
|
||||||
|
+ sigc::connection input_handler;
|
||||||
|
int rc;
|
||||||
|
bool pinging= false;
|
||||||
|
int myerror= 0;
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-gui-common/source/linux/MGTreeTooltip.h mysql-gui-tools-5.0r12.oden/mysql-gui-common/source/linux/MGTreeTooltip.h
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-gui-common/source/linux/MGTreeTooltip.h 2005-10-07 13:31:36.000000000 +0200
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-gui-common/source/linux/MGTreeTooltip.h 2007-11-08 16:21:49.000000000 +0100
|
||||||
|
@@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Objec
|
||||||
|
|
||||||
|
WillShowSignal _show_signal;
|
||||||
|
|
||||||
|
- SigC::Connection _timeout;
|
||||||
|
+ sigc::connection _timeout;
|
||||||
|
|
||||||
|
void expose_event(GdkEventExpose *event);
|
||||||
|
void leave_event(GdkEventCrossing *event);
|
||||||
|
diff -Naurp mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQResultTab.h mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/MQResultTab.h
|
||||||
|
--- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQResultTab.h 2006-12-06 16:50:09.000000000 +0100
|
||||||
|
+++ mysql-gui-tools-5.0r12.oden/mysql-query-browser/source/linux/MQResultTab.h 2007-11-08 16:21:09.000000000 +0100
|
||||||
|
@@ -45,7 +45,7 @@ class MQResultTab : public MQBaseTab {
|
||||||
|
|
||||||
|
Gtk::Paned *paned;
|
||||||
|
|
||||||
|
- SigC::Connection scroll_con;
|
||||||
|
+ sigc::connection scroll_con;
|
||||||
|
};
|
||||||
|
|
||||||
|
enum CompareAction {
|
||||||
|
@@ -71,7 +71,7 @@ class MQResultTab : public MQBaseTab {
|
||||||
|
|
||||||
|
bool _vertical;
|
||||||
|
|
||||||
|
- SigC::Connection _sync_con1, _sync_con2;
|
||||||
|
+ sigc::connection _sync_con1, _sync_con2;
|
||||||
|
|
||||||
|
void scrolled(MQResultSetView *sender);
|
||||||
|
void activated(MQResultSetView *sender);
|
||||||
14
mysql-gui-tools.chema_change_freeze_bug.patch
Normal file
14
mysql-gui-tools.chema_change_freeze_bug.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
diff -ruN mysql-gui-tools-5.0r11.ORIG/mysql-query-browser/source/linux/MQQueryDispatcher.cc mysql-gui-tools-5.0r11/mysql-query-browser/source/linux/MQQueryDispatcher.cc
|
||||||
|
--- mysql-gui-tools-5.0r11.ORIG/mysql-query-browser/source/linux/MQQueryDispatcher.cc 2007-02-21 01:31:19.000000000 +0000
|
||||||
|
+++ mysql-gui-tools-5.0r11/mysql-query-browser/source/linux/MQQueryDispatcher.cc 2007-11-09 15:31:38.000000000 +0000
|
||||||
|
@@ -558,8 +558,8 @@
|
||||||
|
|
||||||
|
Gtk::Main::instance()->run();
|
||||||
|
|
||||||
|
- while(!req->is_complete())
|
||||||
|
- ;
|
||||||
|
+// while(!req->is_complete())
|
||||||
|
+// ;
|
||||||
|
|
||||||
|
return sps;
|
||||||
|
}
|
||||||
579
mysql-gui-tools.spec
Normal file
579
mysql-gui-tools.spec
Normal file
|
|
@ -0,0 +1,579 @@
|
||||||
|
%define build_java 0
|
||||||
|
%define build_autotools 1
|
||||||
|
%define build_administrator 1
|
||||||
|
%define build_query_browser 1
|
||||||
|
|
||||||
|
# commandline overrides:
|
||||||
|
# rpm -ba|--rebuild --with 'xxx'
|
||||||
|
%{?_with_java: %{expand: %%global build_java 1}}
|
||||||
|
%{?_without_java: %{expand: %%global build_java 0}}
|
||||||
|
%{?_with_autotools: %{expand: %%global build_autotools 1}}
|
||||||
|
%{?_without_autotools: %{expand: %%global build_autotools 0}}
|
||||||
|
%{?_with_administrator: %{expand: %%global build_administrator 1}}
|
||||||
|
%{?_without_administrator: %{expand: %%global build_administrator 0}}
|
||||||
|
%{?_with_query_browser: %{expand: %%global build_query_browser 1}}
|
||||||
|
%{?_without_query_browser: %{expand: %%global build_query_browser 0}}
|
||||||
|
|
||||||
|
%define r_ver r14
|
||||||
|
|
||||||
|
%define ma_realversion 1.2.12
|
||||||
|
%define qb_realversion 1.2.12
|
||||||
|
|
||||||
|
%define libname %mklibname 0
|
||||||
|
|
||||||
|
Summary: GUI Tools for MySQL 5.0 - common files
|
||||||
|
Name: mysql-gui-tools
|
||||||
|
Group: Databases
|
||||||
|
Version: 5.0
|
||||||
|
Release: %mkrel 1.%{r_ver}.6
|
||||||
|
License: GPL
|
||||||
|
URL: http://www.mysql.com/products/tools/
|
||||||
|
Source: ftp://ftp.sunet.se/pub/databases/relational/mysql/Downloads/MySQLGUITools/%{name}-%{version}%{r_ver}.tar.gz
|
||||||
|
Source1: mysql-administrator-doc.tar.bz2
|
||||||
|
Source2: mysql-query-browser-doc.tar.bz2
|
||||||
|
Patch0: mysql-gui-tools-mdv_conf.diff
|
||||||
|
Patch2: mysql-administrator-1.1.5-shellbang.patch
|
||||||
|
Patch3: mysql-administrator-help.patch
|
||||||
|
Patch4: mysql-query-browser.patch
|
||||||
|
Patch5: mysql-query-browser-gcc4.patch
|
||||||
|
Patch6: mysql-gui-common-pkg-config.patch
|
||||||
|
Patch7: mysql-gui-common-unused-func.patch
|
||||||
|
Patch8: mysql-gui-common-warnings.patch
|
||||||
|
Patch10: mysql-gui-tools-gcc42.patch
|
||||||
|
Patch11: mysql-gui-tools-bash.patch
|
||||||
|
Patch12: mysql-gui-tools-global.patch
|
||||||
|
Patch14: mysql-gui-tools-sigc_2.1.1_api_fixes.diff
|
||||||
|
Patch15: mysql-gui-tools.chema_change_freeze_bug.patch
|
||||||
|
Patch17: mysql-gui-tools-gcc43.diff
|
||||||
|
Patch18: mysql-gui-tools-no-DISABLE_DEPRECATED.diff
|
||||||
|
Patch19: mysql-gui-tools-5.0r14-garbage_fix.diff
|
||||||
|
Patch20: mysql-gui-tools-5.0r14-invalid_const_char_conversion.diff
|
||||||
|
Patch21: mysql-gui-tools-5.0r14-format_not_a_string_literal_and_no_format_arguments.diff
|
||||||
|
Patch22: mysql-gui-tools-gtksourceview-cflags.patch
|
||||||
|
Patch23: mysql-gui-tools-5.0r14-gnome_cflags.diff
|
||||||
|
BuildRequires: autoconf2.5
|
||||||
|
BuildRequires: expat-devel
|
||||||
|
BuildRequires: file
|
||||||
|
BuildRequires: gettext-devel
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: glibmm2.4-devel
|
||||||
|
BuildRequires: gtk2-devel
|
||||||
|
BuildRequires: gtkmm2.4-devel >= 2.6
|
||||||
|
BuildRequires: imagemagick
|
||||||
|
BuildRequires: libext2fs-devel
|
||||||
|
BuildRequires: libglade2.0-devel >= 2.5
|
||||||
|
BuildRequires: libsigc++2.0-devel
|
||||||
|
BuildRequires: libslang-devel
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
|
%if %mdkversion < 200700
|
||||||
|
BuildRequires: libgtkhtml-3.6-devel
|
||||||
|
BuildRequires: liblua-devel >= 5.0.2
|
||||||
|
BuildRequires: Mesa-devel
|
||||||
|
BuildRequires: MesaGLU-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: libfcgi-devel
|
||||||
|
BuildRequires: gtkhtml-3.14-devel
|
||||||
|
BuildRequires: lua5.0-devel
|
||||||
|
BuildRequires: mesagl-devel
|
||||||
|
BuildRequires: mesaglu-devel
|
||||||
|
%endif
|
||||||
|
%if %{build_java}
|
||||||
|
BuildRequires: junit
|
||||||
|
BuildRequires: java-gcj-compat-devel
|
||||||
|
BuildRequires: jpackage-utils
|
||||||
|
%endif
|
||||||
|
BuildRequires: gettext
|
||||||
|
BuildRequires: libgnome2-devel
|
||||||
|
BuildRequires: libgnomeprint-devel >= 2.2.0
|
||||||
|
BuildRequires: mysql-devel >= 5.0
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: pcre-devel >= 5.0
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
BuildRequires: python-devel
|
||||||
|
BuildRequires: readline-devel
|
||||||
|
BuildRequires: termcap-devel
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
|
|
||||||
|
%description
|
||||||
|
GUI Tools for MySQL 5.0 is a suite of applications written for developing and
|
||||||
|
managing MySQL servers.
|
||||||
|
|
||||||
|
This package contains data files and libraries for MySQL GUI Tools. Actual
|
||||||
|
applications are in packages mysql-administrator, mysql-query-browser and
|
||||||
|
mysql-workbench
|
||||||
|
|
||||||
|
%if %{build_administrator}
|
||||||
|
%package -n mysql-administrator
|
||||||
|
Summary: Administration tool for MySQL 5.0
|
||||||
|
Group: Databases
|
||||||
|
Requires: mysql-gui-tools = %{version}
|
||||||
|
|
||||||
|
%description -n mysql-administrator
|
||||||
|
MySQL Administrator is a powerful graphical administration console that enables
|
||||||
|
you to easily administer your MySQL environment and gain significantly better
|
||||||
|
visibility into how your databases are operating. MySQL Administrator now
|
||||||
|
integrates database management and maintenance into a single, seamless
|
||||||
|
environment, with a clear and intuitive graphical user interface.
|
||||||
|
|
||||||
|
This is MySQL Administrator %{ma_realversion}.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_query_browser}
|
||||||
|
%package -n mysql-query-browser
|
||||||
|
Summary: Query shell for MySQL 5.0
|
||||||
|
Group: Databases
|
||||||
|
Requires: mysql-gui-tools = %{version}
|
||||||
|
|
||||||
|
%description -n mysql-query-browser
|
||||||
|
MySQL Query Browser is a GUI tool for executing SQL queries. It will display
|
||||||
|
the result in a list where you can edit its contents and save. It has several
|
||||||
|
auxiliar features to facilitate work, such as query "bookmarking", query
|
||||||
|
history, syntax highlighting and online help.
|
||||||
|
|
||||||
|
This is MySQL QueryBrowser %{qb_realversion}.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%prep
|
||||||
|
|
||||||
|
%setup -q -n %{name}-%{version}%{r_ver} -a1 -a2
|
||||||
|
|
||||||
|
# fixups
|
||||||
|
mv common mysql-gui-common
|
||||||
|
|
||||||
|
mv administrator/* mysql-administrator/
|
||||||
|
rm -rf administrator
|
||||||
|
|
||||||
|
mv query-browser/* mysql-query-browser/
|
||||||
|
rm -rf query-browser
|
||||||
|
|
||||||
|
# will probably never work on linux
|
||||||
|
rm -rf migration-tool
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
%patch2 -p0
|
||||||
|
|
||||||
|
pushd mysql-administrator
|
||||||
|
%patch3
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd mysql-query-browser
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd mysql-gui-common
|
||||||
|
%patch6
|
||||||
|
%patch7
|
||||||
|
%patch8
|
||||||
|
popd
|
||||||
|
|
||||||
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
%patch12 -p0
|
||||||
|
%patch14 -p1
|
||||||
|
%patch15 -p1
|
||||||
|
%patch17 -p1
|
||||||
|
%patch18 -p1
|
||||||
|
%patch19 -p0
|
||||||
|
%patch20 -p0
|
||||||
|
%patch21 -p0
|
||||||
|
%patch22 -p0
|
||||||
|
%patch23 -p0
|
||||||
|
|
||||||
|
%if %{build_java}
|
||||||
|
# remove binary-only jars from filesystem
|
||||||
|
%{__rm} mysql-gui-common/res/java/jtds-1.2.jar
|
||||||
|
%{__rm} mysql-gui-common/res/java/junit.jar
|
||||||
|
%{__ln_s} %{_javadir}/junit.jar mysql-gui-common/res/java/junit.jar
|
||||||
|
%{__rm} mysql-gui-common/res/java/mysql-connector-java-5.0.4-bin.jar
|
||||||
|
%{__rm} mysql-gui-common/res/java/sapdbc-7_6_00_12_4339.jar
|
||||||
|
|
||||||
|
# remove references to binary jars from java Makefile
|
||||||
|
%{__perl} -pi -e 's/^javalib_DATA=.*/javalib_DATA=/' mysql-gui-common/source/java/Makefile.{am,in}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# strip away annoying ^M
|
||||||
|
find . -type f|xargs file|grep 'CRLF'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
|
||||||
|
find . -type f|xargs file|grep 'text'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
|
||||||
|
|
||||||
|
%build
|
||||||
|
export CPPFLAGS="-D_GNU_SOURCE=1"
|
||||||
|
|
||||||
|
pushd mysql-gui-common
|
||||||
|
%if %{build_autotools}
|
||||||
|
sh ./autogen.sh \
|
||||||
|
--prefix=%{_prefix} \
|
||||||
|
--bindir=%{_bindir} \
|
||||||
|
--sbindir=%{_sbindir} \
|
||||||
|
--sysconfdir=%{_sysconfdir} \
|
||||||
|
--datadir=%{_datadir} \
|
||||||
|
--includedir=%{_includedir} \
|
||||||
|
--libdir=%{_libdir} \
|
||||||
|
--libexecdir=%{_libexecdir} \
|
||||||
|
--localstatedir=%{_localstatedir}/lib \
|
||||||
|
--mandir=%{_mandir} \
|
||||||
|
--enable-grt \
|
||||||
|
--enable-python-modules \
|
||||||
|
%if %mdkversion >= 200700
|
||||||
|
--enable-fastcgi \
|
||||||
|
%if %{build_java}
|
||||||
|
--enable-java-modules \
|
||||||
|
--with-java-includes=%{java_home}/include \
|
||||||
|
%else
|
||||||
|
--disable-java-modules \
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
--enable-readline \
|
||||||
|
--enable-canvas \
|
||||||
|
--with-bonobo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%configure2_5x \
|
||||||
|
--enable-grt \
|
||||||
|
--enable-python-modules \
|
||||||
|
%if %mdkversion >= 200700
|
||||||
|
--enable-fastcgi \
|
||||||
|
%if %{build_java}
|
||||||
|
--enable-java-modules \
|
||||||
|
--with-java-includes=%{java_home}/include \
|
||||||
|
%else
|
||||||
|
--disable-java-modules \
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
--enable-readline \
|
||||||
|
--enable-canvas \
|
||||||
|
--with-bonobo
|
||||||
|
|
||||||
|
%make
|
||||||
|
popd
|
||||||
|
|
||||||
|
%if %{build_administrator}
|
||||||
|
# administrator
|
||||||
|
pushd mysql-administrator
|
||||||
|
%if %{build_autotools}
|
||||||
|
sh ./autogen.sh \
|
||||||
|
--prefix=%{_prefix} \
|
||||||
|
--bindir=%{_bindir} \
|
||||||
|
--sbindir=%{_sbindir} \
|
||||||
|
--sysconfdir=%{_sysconfdir} \
|
||||||
|
--datadir=%{_datadir} \
|
||||||
|
--includedir=%{_includedir} \
|
||||||
|
--libdir=%{_libdir} \
|
||||||
|
--libexecdir=%{_libexecdir} \
|
||||||
|
--localstatedir=%{_localstatedir}/lib \
|
||||||
|
--mandir=%{_mandir} \
|
||||||
|
--with-bonobo
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%configure2_5x \
|
||||||
|
--with-bonobo
|
||||||
|
|
||||||
|
%make
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_query_browser}
|
||||||
|
# query-browser
|
||||||
|
pushd mysql-query-browser
|
||||||
|
%if %{build_autotools}
|
||||||
|
sh ./autogen.sh \
|
||||||
|
--prefix=%{_prefix} \
|
||||||
|
--bindir=%{_bindir} \
|
||||||
|
--sbindir=%{_sbindir} \
|
||||||
|
--sysconfdir=%{_sysconfdir} \
|
||||||
|
--datadir=%{_datadir} \
|
||||||
|
--includedir=%{_includedir} \
|
||||||
|
--libdir=%{_libdir} \
|
||||||
|
--libexecdir=%{_libexecdir} \
|
||||||
|
--localstatedir=%{_localstatedir}/lib \
|
||||||
|
--mandir=%{_mandir} \
|
||||||
|
%if %mdkversion < 200700
|
||||||
|
--with-gtkhtml=libgtkhtml-3.6 \
|
||||||
|
%else
|
||||||
|
--with-gtkhtml=libgtkhtml-3.14 \
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
--with-bonobo \
|
||||||
|
--disable-maintainer-mode
|
||||||
|
|
||||||
|
%configure2_5x \
|
||||||
|
%if %mdkversion < 200700
|
||||||
|
--with-gtkhtml=libgtkhtml-3.6 \
|
||||||
|
%else
|
||||||
|
--with-gtkhtml=libgtkhtml-3.14 \
|
||||||
|
%endif
|
||||||
|
--with-bonobo \
|
||||||
|
--disable-maintainer-mode
|
||||||
|
|
||||||
|
%make
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
%makeinstall_std -C mysql-gui-common
|
||||||
|
|
||||||
|
# fix some menu entries and stuff...
|
||||||
|
install -d %{buildroot}%{_miconsdir}
|
||||||
|
install -d %{buildroot}%{_iconsdir}
|
||||||
|
install -d %{buildroot}%{_liconsdir}
|
||||||
|
|
||||||
|
%if %{build_administrator}
|
||||||
|
################################################################################
|
||||||
|
# mysql-administrator
|
||||||
|
%makeinstall_std -C mysql-administrator
|
||||||
|
|
||||||
|
rm -f %{buildroot}%{_datadir}/applications/MySQLAdministrator.desktop
|
||||||
|
cat > %{buildroot}%{_datadir}/applications/mysql-administrator.desktop << EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=MySQL Administrator
|
||||||
|
Comment=MySQL Administration Tool
|
||||||
|
Exec=%{_bindir}/mysql-administrator
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Icon=mysql-administrator
|
||||||
|
Categories=X-MandrivaLinux-MoreApplications-Databases;GTK;Database;Development;Application;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# make some icons
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_Admin_48x48.png -resize 16x16 %{buildroot}%{_miconsdir}/mysql-administrator.png
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_Admin_48x48.png -resize 32x32 %{buildroot}%{_iconsdir}/mysql-administrator.png
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_Admin_48x48.png -resize 48x48 %{buildroot}%{_liconsdir}/mysql-administrator.png
|
||||||
|
|
||||||
|
%find_lang mysql-administrator --all-name
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_query_browser}
|
||||||
|
################################################################################
|
||||||
|
# mysql-query-browser
|
||||||
|
%makeinstall_std -C mysql-query-browser
|
||||||
|
|
||||||
|
rm -f %{buildroot}%{_datadir}/applications/MySQLQueryBrowser.desktop
|
||||||
|
cat > %{buildroot}%{_datadir}/applications/mysql-query-browser.desktop << EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=MySQL Query Browser
|
||||||
|
Comment=MySQL Query Tool
|
||||||
|
Exec=%{_bindir}/mysql-query-browser
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Icon=mysql-query-browser
|
||||||
|
Categories=X-MandrivaLinux-MoreApplications-Databases;GTK;Database;Development;Application;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# make some icons
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_QueryBrowser_48x48.png -resize 16x16 %{buildroot}%{_miconsdir}/mysql-query-browser.png
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_QueryBrowser_48x48.png -resize 32x32 %{buildroot}%{_iconsdir}/mysql-query-browser.png
|
||||||
|
convert %{buildroot}%{_datadir}/mysql-gui/MySQLIcon_QueryBrowser_48x48.png -resize 48x48 %{buildroot}%{_liconsdir}/mysql-query-browser.png
|
||||||
|
|
||||||
|
%find_lang mysql-query-browser --all-name
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_administrator}
|
||||||
|
%if %mdkversion < 200900
|
||||||
|
%post -n mysql-administrator
|
||||||
|
%update_menus
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %mdkversion < 200900
|
||||||
|
%postun -n mysql-administrator
|
||||||
|
%clean_menus
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_query_browser}
|
||||||
|
%if %mdkversion < 200900
|
||||||
|
%post -n mysql-query-browser
|
||||||
|
%update_menus
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %mdkversion < 200900
|
||||||
|
%postun -n mysql-query-browser
|
||||||
|
%clean_menus
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%doc mysql-gui-common/COPYING
|
||||||
|
%doc mysql-gui-common/README
|
||||||
|
%doc mysql-gui-common/README.translating
|
||||||
|
%dir %{_datadir}/mysql-gui
|
||||||
|
%{_datadir}/mysql-gui/common/*
|
||||||
|
%if %mdkversion >= 200700
|
||||||
|
%if %{build_java}
|
||||||
|
%{_libdir}/mysql-gui/libmyx_grt_java*
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_administrator}
|
||||||
|
%files -n mysql-administrator -f mysql-administrator.lang
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%doc mysql-administrator/ChangeLog
|
||||||
|
%doc mysql-administrator/COPYING
|
||||||
|
%doc mysql-administrator/res/FAQ
|
||||||
|
%doc mysql-administrator/doc/*
|
||||||
|
%attr(0755,root,root) %{_bindir}/mabackup
|
||||||
|
%attr(0755,root,root) %{_bindir}/mysql-administrator
|
||||||
|
%attr(0755,root,root) %{_bindir}/mysql-administrator-bin
|
||||||
|
%dir %{_datadir}/mysql-gui/administrator
|
||||||
|
%{_datadir}/mysql-gui/MySQLIcon_Admin*
|
||||||
|
%{_datadir}/mysql-gui/administrator/*
|
||||||
|
%{_datadir}/applications/mysql-administrator.desktop
|
||||||
|
%{_iconsdir}/mysql-administrator.png
|
||||||
|
%{_liconsdir}/mysql-administrator.png
|
||||||
|
%{_miconsdir}/mysql-administrator.png
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_query_browser}
|
||||||
|
%files -n mysql-query-browser -f mysql-query-browser.lang
|
||||||
|
%defattr(-, root, root)
|
||||||
|
%doc mysql-query-browser/COPYING
|
||||||
|
%doc mysql-query-browser/res/ChangeLog
|
||||||
|
%doc mysql-query-browser/doc/*
|
||||||
|
%dir %{_datadir}/mysql-gui/query-browser
|
||||||
|
%{_datadir}/mysql-gui/query-browser/*
|
||||||
|
%attr(0755,root,root) %{_bindir}/mysql-query-browser
|
||||||
|
%attr(0755,root,root) %{_bindir}/mysql-query-browser-bin
|
||||||
|
%{_datadir}/mysql-gui/MySQLIcon_Query*
|
||||||
|
%{_datadir}/applications/mysql-query-browser.desktop
|
||||||
|
%{_iconsdir}/mysql-query-browser.png
|
||||||
|
%{_liconsdir}/mysql-query-browser.png
|
||||||
|
%{_miconsdir}/mysql-query-browser.png
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Feb 18 2010 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r14.6mdv2010.1
|
||||||
|
+ Revision: 507521
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Wed Feb 10 2010 Luis Daniel Lucio Quiroz <dlucio@mandriva.org> 5.0-1.r14.5mdv2010.1
|
||||||
|
+ Revision: 503923
|
||||||
|
- Rebuild to see if it fixes a gtk segfoult
|
||||||
|
|
||||||
|
* Mon Oct 05 2009 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r14.4mdv2010.0
|
||||||
|
+ Revision: 454058
|
||||||
|
- fix deps (libgnome2-devel)
|
||||||
|
- fix deps (libuuid-devel)
|
||||||
|
- P20: fix invalid const char conversion (ubuntu)
|
||||||
|
- P21: fix format string errors
|
||||||
|
- added rediffed P22, P23 to fix build (fedora)
|
||||||
|
- rediffed some patches
|
||||||
|
- rebuild
|
||||||
|
- lowercase ImageMagick
|
||||||
|
|
||||||
|
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Sun Dec 07 2008 Funda Wang <fwang@mandriva.org> 5.0-1.r14.2mdv2009.1
|
||||||
|
+ Revision: 311565
|
||||||
|
- rebuild against new mysql
|
||||||
|
|
||||||
|
* Wed Nov 05 2008 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r14.1mdv2009.1
|
||||||
|
+ Revision: 300134
|
||||||
|
- 5.0r14
|
||||||
|
- drop redundant patches; P1,P9,P13
|
||||||
|
- fix silly typo (P19)
|
||||||
|
- mysql-workbench-5.0.26 will be packaged soon
|
||||||
|
|
||||||
|
* Fri Sep 12 2008 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r12.5mdv2009.0
|
||||||
|
+ Revision: 284154
|
||||||
|
- fix #41956 (documentatation not avaiilable)
|
||||||
|
|
||||||
|
* Mon Jul 28 2008 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r12.4mdv2009.0
|
||||||
|
+ Revision: 251196
|
||||||
|
- make it build with P18 and using CPPFLAGS="-D_GNU_SOURCE=1" (thanks goetz)
|
||||||
|
- make it possible to not build certain components
|
||||||
|
- added gcc43 fixes (P17)
|
||||||
|
- still won't compile, problems with the bundled mysql-query-browser/source/linux/gtksourceview
|
||||||
|
|
||||||
|
+ Pixel <pixel@mandriva.com>
|
||||||
|
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||||
|
- adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
|
||||||
|
|
||||||
|
* Sun Feb 17 2008 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r12.3mdv2008.1
|
||||||
|
+ Revision: 169563
|
||||||
|
- fix deps
|
||||||
|
- fix #37836 (MySQL query browser freezes when selecting a schema to open)
|
||||||
|
|
||||||
|
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||||
|
- drop old menu
|
||||||
|
- kill re-definition of %%buildroot on Pixel's request
|
||||||
|
|
||||||
|
+ Olivier Blin <oblin@mandriva.com>
|
||||||
|
- restore BuildRoot
|
||||||
|
|
||||||
|
* Thu Nov 08 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r12.2mdv2008.1
|
||||||
|
+ Revision: 106942
|
||||||
|
- new upstream P1 that hopefully fixes #33291 (mysql-query-browser becomes read only after libmysql upgrade)
|
||||||
|
- added patches from suse and pld (P2-P13)
|
||||||
|
- added P14 to make it build with latest sigc++-2.1.1 (G?\195?\182tz Waschk)
|
||||||
|
- fix deps
|
||||||
|
|
||||||
|
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||||
|
- do not harcode icon extension
|
||||||
|
- kill desktop-file-validate's error: string list key "Categories" in group "Desktop Entry" does not have a semicolon (";") as trailing character
|
||||||
|
|
||||||
|
* Tue May 15 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r12.1mdv2008.0
|
||||||
|
+ Revision: 26869
|
||||||
|
- 5.0r12
|
||||||
|
|
||||||
|
|
||||||
|
* Wed Apr 04 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r11.1mdv2007.1
|
||||||
|
+ Revision: 150588
|
||||||
|
- 5.0r11
|
||||||
|
|
||||||
|
* Wed Mar 14 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r10.2mdv2007.1
|
||||||
|
+ Revision: 143621
|
||||||
|
- build it against libgtkhtml-3.14
|
||||||
|
|
||||||
|
* Sun Mar 04 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-1.r10.1mdv2007.1
|
||||||
|
+ Revision: 132103
|
||||||
|
- make it build (P1) and make it possible to skip the autopoo mangling
|
||||||
|
- 5.0r10
|
||||||
|
|
||||||
|
* Sun Jan 21 2007 Oden Eriksson <oeriksson@mandriva.com> 5.0-0.3.r9.1mdv2007.1
|
||||||
|
+ Revision: 111409
|
||||||
|
- increase release (0.3.x)
|
||||||
|
- 5.0r9
|
||||||
|
- rediffed P0
|
||||||
|
- make it backportable again (java)
|
||||||
|
|
||||||
|
* Sun Jan 07 2007 David Walluck <walluck@mandriva.org> 5.0-0.2.r8.4mdv2007.1
|
||||||
|
+ Revision: 105121
|
||||||
|
- BuildRequires: java-gcj-compat-devel
|
||||||
|
- enable java support
|
||||||
|
|
||||||
|
* Thu Dec 21 2006 Oden Eriksson <oeriksson@mandriva.com> 5.0-0.2.r8.3mdv2007.1
|
||||||
|
+ Revision: 101086
|
||||||
|
- make it backportable for cs4
|
||||||
|
- use www-browser instead of gnome-www-browser in MAdministrator.cc
|
||||||
|
|
||||||
|
* Thu Dec 21 2006 Oden Eriksson <oeriksson@mandriva.com> 5.0-0.2.r8.2mdv2007.1
|
||||||
|
+ Revision: 101004
|
||||||
|
- fix release
|
||||||
|
- 5.0r8
|
||||||
|
|
||||||
|
* Fri Dec 08 2006 Oden Eriksson <oeriksson@mandriva.com> 5.0-0.2.r6.1mdv2007.1
|
||||||
|
+ Revision: 93645
|
||||||
|
- added the remaining missing build deps
|
||||||
|
- rebuilt due to build system flux
|
||||||
|
- added libext2fs-devel as a build dep
|
||||||
|
- fix deps
|
||||||
|
- added mysql-gui-tools-mdv_conf.diff (P0) to set some mdv defaults
|
||||||
|
- Import mysql-gui-tools
|
||||||
|
|
||||||
|
* Thu Dec 07 2006 Oden Eriksson <oeriksson@mandriva.com> 5.0-0.1.r6.1mdv2007.1
|
||||||
|
- 5.0r6
|
||||||
|
- initial Mandriva package
|
||||||
|
- merged spec file stuff from the mysql-administrator and mysql-query-browser packages
|
||||||
|
|
||||||
26
mysql-query-browser-gcc4.patch
Normal file
26
mysql-query-browser-gcc4.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
--- source/linux/MGCellRendererBlob.h
|
||||||
|
+++ source/linux/MGCellRendererBlob.h
|
||||||
|
@@ -26,19 +26,20 @@
|
||||||
|
#include <gtkmm/textview.h>
|
||||||
|
#include <gtkmm/eventbox.h>
|
||||||
|
|
||||||
|
-
|
||||||
|
+#define __STDC_FORMAT_MACROS 1
|
||||||
|
+#include <inttypes.h>
|
||||||
|
|
||||||
|
// I don't like this, but until I find a better alternative, it'll stay like this
|
||||||
|
inline void str2data(const std::string &str, gpointer *data, gsize *size)
|
||||||
|
{
|
||||||
|
- sscanf(str.c_str(), "%p %lu", data, size);
|
||||||
|
+ sscanf(str.c_str(), "%p %" __PRIPTR_PREFIX "u", data, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline std::string data2str(gpointer data, gsize size)
|
||||||
|
{
|
||||||
|
char buffer[128];
|
||||||
|
- sprintf(buffer, "%p %lu", data, size);
|
||||||
|
+ sprintf(buffer, "%p %" __PRIPTR_PREFIX "u", data, size);
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
11
mysql-query-browser.patch
Normal file
11
mysql-query-browser.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- source/linux/Makefile.am
|
||||||
|
+++ source/linux/Makefile.am
|
||||||
|
@@ -60,7 +60,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 CFLAGS="$(CFLAGS) -fno-strict-aliasing")
|
||||||
|
+ (cd gtksourceview; ./configure --enable-compile-warnings=yes --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
|
-make -C gtksourceview distclean
|
||||||
Loading…
Add table
Reference in a new issue