Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
databases/mysql-workbench/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.46 2015/05/04 21:14:24 wiz Exp $
# $NetBSD: Makefile,v 1.47 2015/07/07 11:43:47 joerg Exp $
DISTNAME= mysql-workbench-gpl-5.2.33b-src
PKGNAME= ${DISTNAME:S/-gpl//:S/b-src$//}
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= bash gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-system-ctemplate
LUA_VERSIONS_INCOMPATIBLE= 52
LUA_VERSIONS_INCOMPATIBLE= 52 53
CHECK_PORTABILITY_SKIP= build/make_dmg.sh
CHECK_PORTABILITY_SKIP+=ext/ctemplate/ctemplate-src/configure.ac

7
databases/mysql-workbench/distinfo
View File

@@ -1,19 +1,23 @@
$NetBSD: distinfo,v 1.9 2013/06/27 15:48:42 joerg Exp $
$NetBSD: distinfo,v 1.10 2015/07/07 11:45:52 joerg 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_model_wb__component__physical.cpp) = 710cfb3f90f1112536d86461291531cdbe25a61b
SHA1 (patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp) = 11d65a32058c646602a6caecbef05883efad85c2
SHA1 (patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp) = b5f422fb5de8f9853c3536a08ee2470ab17cbe96
SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b
SHA1 (patch-backend_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb
SHA1 (patch-backend_wbprivate_workbench_wb__model__file.cpp) = 96231a6cc7969a70196a1e4505549d1a75d7f485
SHA1 (patch-backend_wbprivate_workbench_wb__module.cpp) = 4a7869cf1a223eaa57904801477a258f3c526319
SHA1 (patch-backend_wbpublic_grt_grt__structs__tree.cpp) = 46a5f6e66c1bf154ce0e759b8d1671ba889cfe82
SHA1 (patch-backend_wbpublic_sqlide_recordset__text__storage.cpp) = 709217d0421ebdb4074157f69fa68af12ba0b02e
SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63
SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4
SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
SHA1 (patch-ext_scintilla_gtk_ScintillaGTK.cxx) = 5900ce9f440a59833d3779c6f3700a2b47f74edf
SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
SHA1 (patch-frontend_linux_workbench_Makefile.in) = ad1146700a3d657089b73d86daf8e1da1b6722c6
SHA1 (patch-frontend_linux_workbench_main.cpp) = 0ffcf6695f8aaf52be437d2d9281f788692cccaf
SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978
SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b
@@ -24,6 +28,7 @@ SHA1 (patch-library_canvas_src_mdc__text.cpp) = 376bea4a00e321a9972a299652f6cf38
SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
SHA1 (patch-library_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559
SHA1 (patch-library_grt_src_grtpp.h) = a5c0dd74ffb9352329f2e3b123f46edbaf7220a6
SHA1 (patch-library_grt_src_grtpp__shell.cpp) = f2d31b23c1966d256d9a139cd328742da562654d
SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2
SHA1 (patch-library_grt_src_grtpp__shell__lua__help.cpp) = 526f90d787e7fb64fc51a8cd63382e1c9e15b316

15
databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
Can't use dynamic_cast as the type information is normally not present.
--- backend/wbprivate/sqlide/wb_sql_editor_form.cpp.orig 2015-06-28 18:41:49.000000000 +0000
+++ backend/wbprivate/sqlide/wb_sql_editor_form.cpp
@@ -1728,7 +1728,7 @@ grt::StringRef Db_sql_editor::do_exec_sq
goto stop_processing_sql_script;
}
- sql::mysql::MySQL_Connection* mysql_connection = dynamic_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection());
+ sql::mysql::MySQL_Connection* mysql_connection = reinterpret_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection());
sql::SQLString last_statement_info;
if (mysql_connection != NULL)
last_statement_info = mysql_connection->getLastStatementInfo();

13
databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grt__structs__tree.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-backend_wbpublic_grt_grt__structs__tree.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
--- backend/wbpublic/grt/grt_structs_tree.cpp.orig 2015-06-28 17:50:16.000000000 +0000
+++ backend/wbpublic/grt/grt_structs_tree.cpp
@@ -140,7 +140,7 @@ std::string StructsTreeBE::get_field_des
Node *n= get_node_for_id(node);
if (n == NULL)
- return false;
+ return "";
switch (n->type)
{

31
databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordset__text__storage.cpp Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-backend_wbpublic_sqlide_recordset__text__storage.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
--- backend/wbpublic/sqlide/recordset_text_storage.cpp.orig 2015-06-28 17:59:17.000000000 +0000
+++ backend/wbpublic/sqlide/recordset_text_storage.cpp
@@ -162,7 +162,7 @@ void Recordset_text_storage::do_serializ
if (!pre_tpl)
g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str());
else
- pre_tpl->ReloadIfChanged();
+ pre_tpl->ReloadAllIfChanged();
}
if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
{
@@ -171,7 +171,7 @@ void Recordset_text_storage::do_serializ
if (!post_tpl)
g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
else
- post_tpl->ReloadIfChanged();
+ post_tpl->ReloadAllIfChanged();
}
}
@@ -180,7 +180,7 @@ void Recordset_text_storage::do_serializ
throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
}
- tpl->ReloadIfChanged();
+ tpl->ReloadAllIfChanged();
std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
BOOST_FOREACH (const Parameters::value_type &param, _parameters)

27
databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-frontend_linux_workbench_Makefile.in,v 1.1 2015/07/07 11:45:52 joerg Exp $
--- frontend/linux/workbench/Makefile.in.orig 2015-06-28 18:32:27.000000000 +0000
+++ frontend/linux/workbench/Makefile.in
@@ -71,10 +71,8 @@ mysql_workbench_bin_DEPENDENCIES = \
$(top_srcdir)/library/base/libwbbase.la \
$(top_srcdir)/library/grt/src/libgrt.la \
$(top_srcdir)/library/dbc/libcdbc.la \
- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \
$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \
- $(top_srcdir)/library/canvas/src/libmdcanvas.la \
- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la
+ $(top_srcdir)/library/canvas/src/libmdcanvas.la
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -315,10 +313,8 @@ mysql_workbench_bin_LDADD = \
$(top_srcdir)/library/base/libwbbase.la\
$(top_srcdir)/library/grt/src/libgrt.la\
$(top_srcdir)/library/dbc/libcdbc.la\
- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
$(top_srcdir)/library/canvas/src/libmdcanvas.la\
- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
@CTEMPLATE_LIBS@\
@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
-lX11

42
databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h Normal file
View File

@@ -0,0 +1,42 @@
$NetBSD: patch-library_grt_src_grtpp.h,v 1.1 2015/07/07 11:45:52 joerg Exp $
--- library/grt/src/grtpp.h.orig 2015-06-28 17:13:25.000000000 +0000
+++ library/grt/src/grtpp.h
@@ -855,8 +855,6 @@ namespace grt {
IterType iter;
- TypedListConstIterator() : iter(0) {}
-
TypedListConstIterator(const TypedListConstIterator &content) : iter(content.iter) {}
TypedListConstIterator(const IterType &content)
@@ -895,6 +893,9 @@ namespace grt {
++iter;
return temp;
}
+
+ private:
+ TypedListConstIterator() {}
};
template<class C>
@@ -909,8 +910,6 @@ namespace grt {
IterType iter;
- TypedListConstReverseIterator() {}
-
TypedListConstReverseIterator(const TypedListConstReverseIterator &content) : iter(content.iter) {}
TypedListConstReverseIterator(const IterType &content)
@@ -949,6 +948,9 @@ namespace grt {
++iter;
return temp;
}
+
+ private:
+ TypedListConstReverseIterator() {}
};