Thu May 24 18:54:17 2012 UTC ()
databases/mysql-workbench: Fix unportable patch, add DragonFly fix

One patch was hardcoded for NetBSD, return it closer to intention without
breaking NetBSD.  It's still not great, but a little better.


(marino)
diff -r1.3 -r1.4 pkgsrc/databases/mysql-workbench/distinfo
diff -r0 -r1.1 pkgsrc/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql-workbench/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql-workbench/Attic/distinfo 2012/05/09 05:38:18 1.3
+++ pkgsrc/databases/mysql-workbench/Attic/distinfo 2012/05/24 18:54:16 1.4
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.3 2012/05/09 05:38:18 dholland Exp $ 1$NetBSD: distinfo,v 1.4 2012/05/24 18:54:16 marino Exp $
2 2
3SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed 3SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed
4RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c 4RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c
5Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes 5Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes
6SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b 6SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b
7SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984 7SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
8SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459 8SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
9SHA1 (patch-library_base_international_file.cpp) = 55a6910d63b29db1ba8ea6d17bc7c42ac8897162 9SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978
 10SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b
10SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f 11SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f
11SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a 12SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a
12SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce 13SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
13SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1 14SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
14SHA1 (patch-library_grt_src_grtpp__util_cpp) = e3b8a89c8fefd11f37a3ea7123a85857d7c14e31 15SHA1 (patch-library_grt_src_grtpp__util_cpp) = e3b8a89c8fefd11f37a3ea7123a85857d7c14e31
15SHA1 (patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp) = 8424f1e3bafc3cd05799bc43701059cb22245cd0 16SHA1 (patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp) = 8424f1e3bafc3cd05799bc43701059cb22245cd0
16SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de 17SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de
17SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df 18SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df
18SHA1 (patch-plugins_db_mysql_backend_db__plugin__be_cpp) = 2ab6955e6d769a0b0164ec9a841a1d67101bd935 19SHA1 (patch-plugins_db_mysql_backend_db__plugin__be_cpp) = 2ab6955e6d769a0b0164ec9a841a1d67101bd935
19SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c 20SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c
File Added: pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_file_utilities.cpp
$NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino Exp $

--- library/base/file_utilities.cpp.orig	2011-03-17 12:48:44.000000000 +0000
+++ library/base/file_utilities.cpp
@@ -31,6 +31,9 @@
 #include <fcntl.h>
 #include <sys/file.h>
 #endif
+#ifdef __DragonFly__
+#include <sys/stat.h>
+#endif
 
 namespace base {
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_international_file.cpp (expand / switch to unified diff)

--- pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_international_file.cpp 2011/05/16 12:40:50 1.1.1.1
+++ pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_international_file.cpp 2012/05/24 18:54:17 1.2
@@ -1,18 +1,13 @@ @@ -1,18 +1,13 @@
1$NetBSD: patch-library_base_international_file.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $ 1$NetBSD: patch-library_base_international_file.cpp,v 1.2 2012/05/24 18:54:17 marino Exp $
2 2
3Use const string for iconv on all platforms. 3--- library/base/international_file.cpp.orig 2011-03-17 12:48:42.000000000 +0000
4 
5--- library/base/international_file.cpp.orig 2011-05-16 08:33:28.000000000 +0000 
6+++ library/base/international_file.cpp 4+++ library/base/international_file.cpp
7@@ -257,11 +257,7 @@ boost::int64_t read_char_from_intl_file( 5@@ -257,7 +257,7 @@ boost::int64_t read_char_from_intl_file(
8 else 6 else
9 { 7 {
10 gunichar utf8_char= g_utf8_get_char(file->next_utf8_char); 8 gunichar utf8_char= g_utf8_get_char(file->next_utf8_char);
11-#ifdef _WIN32 9-#ifdef _WIN32
 10+#ifndef __DragonFly__
12 const char * cur_utf8_char= file->next_utf8_char; 11 const char * cur_utf8_char= file->next_utf8_char;
13-#else 12 #else
14- char * cur_utf8_char= file->next_utf8_char; 13 char * cur_utf8_char= file->next_utf8_char;
15-#endif 
16 file->next_utf8_char= g_utf8_next_char(file->next_utf8_char); 
17  
18 *bytes_read= (int) (file->next_utf8_char - cur_utf8_char);