Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/alienarena/PKGBUILD
	community/mumble/PKGBUILD
	community/mysql-workbench/PKGBUILD
	community/paintown/PKGBUILD
	community/ufoai/PKGBUILD
	core/dcron/PKGBUILD
	core/udev/PKGBUILD
	extra/qt/PKGBUILD
	extra/texlive-bin/PKGBUILD
	testing/opencv/PKGBUILD
	testing/pciutils/PKGBUILD
	testing/usbutils/PKGBUILD

2 files changed, 128 insertions, 11 deletions

diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 856db7eec..5934210e6 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 42510 2011-03-17 12:19:39Z andrea $
+# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
 
 pkgname=mysql-workbench
-pkgver=5.2.33
-pkgrel=2
+epoch=1
+pkgver=5.2.33b
+pkgrel=1
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://dev.mysql.com/workbench/"
+url="http://wb.mysql.com/"
 license=('GPL2')
-depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect')
+depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl'
+         'libsigc++' 'python-paramiko' 'python-pexpect')
 makedepends=('boost' 'curl' 'mesa')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
-        ArchLinux.xml arch.patch python27.patch)
-md5sums=('d97a1512c8c8ad54ae83441f8ea5c4b8'
+        ArchLinux.xml arch.patch python27.patch gcc46.patch)
+md5sums=('850e081eeaea87a88c408483817e4b1f'
          'c2f986cd5737413d020c55db32713c48'
          '23430d24400fd65c9fd872bd8e2411e5'
-         '47bc4cdfaa035a0132392e94c462ebf7')
+         '47bc4cdfaa035a0132392e94c462ebf7'
+         '8e7a6d5aa59b73727e862724f115d90a')
 
 build() {
-  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
+  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
 
   cp "${srcdir}/ArchLinux.xml" res/mysql.profiles
   patch -Np1 -i ${srcdir}/arch.patch
 
   patch -Np0 -i ${srcdir}/python27.patch
+  patch -p1 -i ${srcdir}/gcc46.patch
 
   #we use System provided libraries
   rm -rf ext/curl
@@ -35,14 +39,14 @@ build() {
   rm -rf ext/libsigc++
 
   export CPPFLAGS=$(pkg-config --cflags sigc++-2.0)
-  unset LDFLAGS
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
 
   ./autogen.sh --prefix=/usr --disable-debug --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
+  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
 
   make DESTDIR="${pkgdir}" install
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py
diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch
new file mode 100644
index 000000000..9daa162c8
--- /dev/null
+++ b/community/mysql-workbench/gcc46.patch
@@ -0,0 +1,113 @@
+diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp
+--- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46	2011-03-23 17:05:33.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp	2011-03-23 17:06:02.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "grts/structs.workbench.model.reporting.h"

+ #include "grts/structs.workbench.physical.h"

+ 

+-

++namespace wb {

+ void register_all_metaclasses()

+ {

+   register_structs_app_xml();

+@@ -46,3 +46,6 @@ void register_all_metaclasses()

+   register_structs_workbench_model_reporting_xml();

+   register_structs_workbench_physical_xml();  

+ }

++// end of namespace wb

++}

++

+diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
+--- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46	2011-03-23 16:56:16.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp	2011-03-23 17:07:36.000000000 +0100
+@@ -31,7 +31,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((Glib::RefPtr<Gtk::TreeModel> &)model);
+ 
+   combo->pack_start(color_combo_columns->image);
+ 
+diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46	2011-03-23 17:04:17.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp	2011-03-23 17:04:40.000000000 +0100
+@@ -32,10 +32,11 @@
+ #include <math.h>
+ #include "base/log.h"
+ ENABLE_LOG("mforms.utils")
+-
+ using namespace mforms;
+ 
++namespace mforms {
+ GThread *_mforms_main_thread=0;
++}
+ 
+ static std::map<std::string, int> remembered_message_answers;
+ static std::string remembered_message_answer_file;
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46	2011-03-17 13:48:45.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp	2011-03-23 16:44:22.000000000 +0100
+@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP 
+ 
+ //============================================================================
+ 
++namespace grt {
++
+ static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd)
+ {
+   MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group;
+@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g
+   }
+ }
+ 
++// End of namspace grt
++}
++
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46	2011-03-17 13:48:41.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp	2011-03-23 16:44:22.000000000 +0100
+@@ -187,7 +187,7 @@ NL
+ };
+ 
+ 
+-void grt_shell_show_python_help(grt::GRT *grt, const char *command)
++void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command)
+ {
+   if (!command || !*command)
+     grt->send_output(
+diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h
+--- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46	2011-03-17 13:48:39.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h	2011-03-23 16:44:22.000000000 +0100
+@@ -21,6 +21,8 @@
+ #ifndef __grtpp_shell_python_help_h__
+ #define __grtpp_shell_python_help_h__
+ 
++namespace grt {
+ void grt_shell_show_python_help(grt::GRT *grt, const char *command);
++}
+ 
+-#endif /* __grtpp_shell_python_help_h__ */
+\ Pas de fin de ligne à la fin du fichier.
++#endif /* __grtpp_shell_python_help_h__ */
+diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h
+--- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46	2011-03-23 16:51:30.000000000 +0100
++++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h	2011-03-23 16:52:33.000000000 +0100
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <cstddef>
+ #include "ctemplate/template.h"
+ 
+ #include "grt/common.h"
+--- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~	2011-05-04 00:57:31.029029610 -0700
++++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in	2011-05-04 00:57:45.162361700 -0700
+@@ -54,6 +54,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <cstddef>
+ #include <ctemplate/template_dictionary_interface.h>
+ #include <ctemplate/template_string.h>
+ #include <ctemplate/template_modifiers.h>