Revbump after updating graphics/cairo

10 files changed, 41 insertions, 48 deletions

diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile
index 030cc49898b..1551a4c6e92 100644
--- a/databases/mysql-workbench/Makefile
+++ b/databases/mysql-workbench/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/06/14 07:44:23 sbd Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/07 19:16:20 adam Exp $
 
-DISTNAME=	mysql-workbench-gpl-5.2.33b-src
+DISTNAME=	mysql-workbench-gpl-5.2.42-src
 PKGNAME=	${DISTNAME:S/-gpl//:S/b-src$//}
-PKGREVISION=	10
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQLGUITools/}
 
diff --git a/databases/mysql-workbench/distinfo b/databases/mysql-workbench/distinfo
index 9f674cbc03b..a2a1c20d526 100644
--- a/databases/mysql-workbench/distinfo
+++ b/databases/mysql-workbench/distinfo
@@ -1,20 +1,13 @@
-$NetBSD: distinfo,v 1.4 2012/05/24 18:54:16 marino Exp $
+$NetBSD: distinfo,v 1.5 2012/09/07 19:16:20 adam Exp $
 
-SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed
-RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c
-Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes
-SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b
-SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
-SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
-SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978
-SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b
-SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f
-SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a
-SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
-SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
-SHA1 (patch-library_grt_src_grtpp__util_cpp) = e3b8a89c8fefd11f37a3ea7123a85857d7c14e31
-SHA1 (patch-modules_db_mysql_sqlparser_src_mysql__sql__parser__fe_cpp) = 8424f1e3bafc3cd05799bc43701059cb22245cd0
-SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 3ac7af043be0dd52fe2634e2ac49682c5d4e51de
-SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = f12583b61b29f9ae2ef3aaf30b9281dc67b230df
-SHA1 (patch-plugins_db_mysql_backend_db__plugin__be_cpp) = 2ab6955e6d769a0b0164ec9a841a1d67101bd935
-SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 490c35fce386d9e3b8bc3f801db0316c712f103c
+SHA1 (mysql-workbench-gpl-5.2.42-src.tar.gz) = 1c71aa6732ac0beaac00e799fa097bd20d20d3bf
+RMD160 (mysql-workbench-gpl-5.2.42-src.tar.gz) = 1fa7191a4e33755944f3fe8278716a8d2052981e
+Size (mysql-workbench-gpl-5.2.42-src.tar.gz) = 30498256 bytes
+SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 0b19f91c792978900d0b485aa401d81d6994d68c
+SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = 55eba68ef0e1af28b92697531fb7509cde1a62ed
+SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = f598aab9ee21a79d1f581701e586bdacbfa3221e
+SHA1 (patch-library_base_file_utilities.cpp) = 1ecd888a0e4100f748770c5af937f99b2cfc0b73
+SHA1 (patch-library_canvas_src_stdafx_h) = e98a12d7ae9b830ed7bb3001c515eea245b7dc09
+SHA1 (patch-modules_db_mysql_sqlparser_src_stdafx_h) = 4cbb6d7e7eb080eeddeff9bcae5e72569e5014f8
+SHA1 (patch-modules_wb_mysql_import_src_stdafx_h) = aae768306e549c552d3256532afc5fb12821d3eb
+SHA1 (patch-plugins_wb_printing_backend_stdafx_h) = 77ef2048dd9d41364a7a73738bae04d2948048c8
diff --git a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h
index d6a07d2a021..da6481d7704 100644
--- a/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_workbench_stdafx_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-backend_wbprivate_workbench_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-backend_wbprivate_workbench_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- backend/wbprivate/workbench/stdafx.h~	2011-03-17 12:48:42.000000000 +0000
+--- backend/wbprivate/workbench/stdafx.h.orig	2011-03-17 12:48:42.000000000 +0000
 +++ backend/wbprivate/workbench/stdafx.h
-@@ -39,7 +39,6 @@
+@@ -65,7 +65,6 @@
  #include <gl/glu.h>
  
  #include <glib.h>
diff --git a/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h b/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h
index 0c0f92487ae..9a48ed73957 100644
--- a/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-backend_windows_wbprivate_wr_src_stdafx_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-backend_windows_wbprivate_wr_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-backend_windows_wbprivate_wr_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- backend/windows/wbprivate.wr/src/stdafx.h~	2011-03-17 12:48:41.000000000 +0000
+--- backend/windows/wbprivate.wr/src/stdafx.h.orig	2011-03-17 12:48:41.000000000 +0000
 +++ backend/windows/wbprivate.wr/src/stdafx.h
-@@ -48,7 +48,7 @@
+@@ -65,7 +65,7 @@
  
  #include <gl/glu.h>
  
diff --git a/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp b/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp
index 6afa779094d..7327bd069b4 100644
--- a/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp
+++ b/databases/mysql-workbench/patches/patch-frontend_linux_linux_utilities_toolbar_manager.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-frontend_linux_linux_utilities_toolbar_manager.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $
+$NetBSD: patch-frontend_linux_linux_utilities_toolbar_manager.cpp,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix building with newer Gtkmm.
 
---- frontend/linux/linux_utilities/toolbar_manager.cpp.orig	2011-05-16 11:11:25.000000000 +0000
+--- frontend/linux/linux_utilities/toolbar_manager.cpp.orig	2012-08-09 20:57:01.000000000 +0000
 +++ frontend/linux/linux_utilities/toolbar_manager.cpp
-@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
+@@ -30,7 +30,7 @@ static Gtk::ComboBox *create_color_combo
    }
  
    Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns);
--  Gtk::ComboBox *combo= new Gtk::ComboBox(model);
-+  Gtk::ComboBox *combo= new Gtk::ComboBox(model, false);
+-  Gtk::ComboBox *combo= new Gtk::ComboBox(Glib::RefPtr<Gtk::TreeModel>(model));
++  Gtk::ComboBox *combo= new Gtk::ComboBox(Glib::RefPtr<Gtk::TreeModel>(model), false);
  
    combo->pack_start(color_combo_columns->image);
  
diff --git a/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
index 30d92966c38..6272f10c9ac 100644
--- a/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
+++ b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino Exp $
+$NetBSD: patch-library_base_file_utilities.cpp,v 1.2 2012/09/07 19:16:20 adam Exp $
 
---- library/base/file_utilities.cpp.orig	2011-03-17 12:48:44.000000000 +0000
+--- library/base/file_utilities.cpp.orig	2012-08-09 20:56:59.000000000 +0000
 +++ library/base/file_utilities.cpp
-@@ -31,6 +31,9 @@
+@@ -32,6 +32,9 @@
  #include <fcntl.h>
  #include <sys/file.h>
  #endif
@@ -11,4 +11,4 @@ $NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino
 +#endif
  
  namespace base {
- 
+   
diff --git a/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h
index 7f432c22573..66991cef14b 100644
--- a/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-library_canvas_src_stdafx_h
@@ -1,13 +1,13 @@
-$NetBSD: patch-library_canvas_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-library_canvas_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- library/canvas/src/stdafx.h~	2011-03-17 12:48:45.000000000 +0000
+--- library/canvas/src/stdafx.h.orig	2012-08-09 20:56:56.000000000 +0000
 +++ library/canvas/src/stdafx.h
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
+ #include <gl/gl.h>
  #include <gl/glu.h>
  
- 
 -#include <glib/gthread.h>
 +#include <glib.h>
  
diff --git a/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h
index a8147c27097..333564b1de7 100644
--- a/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-modules_db_mysql_sqlparser_src_stdafx_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-modules_db_mysql_sqlparser_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-modules_db_mysql_sqlparser_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- modules/db.mysql.sqlparser/src/stdafx.h~	2011-03-17 12:48:45.000000000 +0000
+--- modules/db.mysql.sqlparser/src/stdafx.h.orig	2011-03-17 12:48:45.000000000 +0000
 +++ modules/db.mysql.sqlparser/src/stdafx.h
 @@ -32,7 +32,7 @@
  #include <algorithm>
diff --git a/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h b/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h
index 4b7c2821a50..46104bad703 100644
--- a/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-modules_wb_mysql_import_src_stdafx_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-modules_wb_mysql_import_src_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-modules_wb_mysql_import_src_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- modules/wb.mysql.import/src/stdafx.h~	2011-03-17 12:48:31.000000000 +0000
+--- modules/wb.mysql.import/src/stdafx.h.orig	2011-03-17 12:48:31.000000000 +0000
 +++ modules/wb.mysql.import/src/stdafx.h
 @@ -10,7 +10,7 @@
  #include <algorithm>
diff --git a/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h b/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h
index cf6bfb3d4e4..0b46bba86b8 100644
--- a/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h
+++ b/databases/mysql-workbench/patches/patch-plugins_wb_printing_backend_stdafx_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-plugins_wb_printing_backend_stdafx_h,v 1.1 2012/05/07 18:40:35 dholland Exp $
+$NetBSD: patch-plugins_wb_printing_backend_stdafx_h,v 1.2 2012/09/07 19:16:20 adam Exp $
 
 Fix build with latest glib2.
 
---- plugins/wb.printing/backend/stdafx.h~	2011-03-17 12:48:42.000000000 +0000
+--- plugins/wb.printing/backend/stdafx.h.orig	2011-03-17 12:48:42.000000000 +0000
 +++ plugins/wb.printing/backend/stdafx.h
-@@ -46,7 +46,7 @@
+@@ -44,7 +44,7 @@
  #include <gl/gl.h>
  #include <gl/glu.h>