packages: mysql-workbench/mysql-workbench.spec, mysql-workbench/mysql-workb...

Wed Jul 22 22:51:58 CEST 2009

Author: arvenil                      Date: Wed Jul 22 20:51:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.1.16
- BR: boost-devel (build with system boost)
- added gcc 4.4 patch

---- Files affected:
packages/mysql-workbench:
   mysql-workbench.spec (1.8 -> 1.9) , mysql-workbench-gcc44.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.8 packages/mysql-workbench/mysql-workbench.spec:1.9

--- packages/mysql-workbench/mysql-workbench.spec:1.8	Wed Apr  1 21:25:30 2009
+++ packages/mysql-workbench/mysql-workbench.spec	Wed Jul 22 22:51:53 2009
@@ -11,17 +11,19 @@
 Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
-Version:	5.1.9
+Version:	5.1.16
 Release:	0.1
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-oss-%{version}.tar.gz
-# Source0-md5:	4a18e49feea11a15a1956f890dccb406
+# Source0-md5:	e2f4ddea185e6988887d28a62e7cbbb5
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-gcc44.patch
 URL:		http://dev.mysql.com/workbench/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	boost-devel
 BuildRequires:	cairo-devel >= 1.3.12
 BuildRequires:	ctemplate-devel
 BuildRequires:	glib2-devel
@@ -51,9 +53,9 @@
 
 %prep
 %setup -q -n %{name}-oss-%{version}
+rm -rf ext/boost
 %patch0 -p1
-%{__sed} -i -e 's#/lib/#/%{_lib}/#g' frontend/linux/workbench/%{name}
-%{__sed} -i -e 's#!/bin/bash#!/bin/sh#g' frontend/linux/workbench/%{name}
+%patch1 -p1
 
 %build
 %{__glib_gettextize}
@@ -100,6 +102,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/07/22 20:51:53  arvenil
+- up to 5.1.16
+- BR: boost-devel (build with system boost)
+- added gcc 4.4 patch
+
 Revision 1.8  2009/04/01 19:25:30  arvenil
 - up to 5.1.9
 - added --as-needed problem to TODO

================================================================
Index: packages/mysql-workbench/mysql-workbench-gcc44.patch
diff -u /dev/null packages/mysql-workbench/mysql-workbench-gcc44.patch:1.1
--- /dev/null	Wed Jul 22 22:51:58 2009
+++ packages/mysql-workbench/mysql-workbench-gcc44.patch	Wed Jul 22 22:51:53 2009
@@ -0,0 +1,80 @@
+http://remi.fedorapeople.org/mysql-workbench-oss-5.1.12-gcc44.patch
+diff -up mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp.gcc44 mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp
+--- mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp.gcc44	2009-05-01 09:46:32.000000000 +0200
++++ mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp	2009-05-01 09:46:47.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include <cppconn/exception.h>
+ #include <sstream>
+ #include <math.h>
++#include <cstdio> 
+ 
+ 
+ namespace sql
+diff -up mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_rset_metadata.cpp.gcc44 mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_rset_metadata.cpp
+--- mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_rset_metadata.cpp.gcc44	2009-05-01 09:44:13.000000000 +0200
++++ mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_rset_metadata.cpp	2009-05-01 09:45:41.000000000 +0200
+@@ -10,6 +10,7 @@
+ */
+ 
+ #include <stdlib.h>
++#include <cstdio> 
+ 
+ #include "mysql_util.h"
+ #include "mysql_art_resultset.h"
+diff -up mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp.gcc44 mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp
+--- mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp.gcc44	2009-04-23 18:00:53.000000000 +0200
++++ mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp	2009-05-01 09:47:54.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include "mysql_resultbind.h"
+ 
+ #include <string.h>
++#include <cstdio> 
+ 
+ namespace sql
+ {
+diff -up mysql-workbench-oss-5.1.12/library/canvas/src/mdc_algorithms.cpp.gcc44 mysql-workbench-oss-5.1.12/library/canvas/src/mdc_algorithms.cpp
+--- mysql-workbench-oss-5.1.12/library/canvas/src/mdc_algorithms.cpp.gcc44	2009-05-01 09:49:00.000000000 +0200
++++ mysql-workbench-oss-5.1.12/library/canvas/src/mdc_algorithms.cpp	2009-05-01 09:50:51.000000000 +0200
+@@ -1,6 +1,8 @@
++#include <cstdio> 
+ #include "stdafx.h"
+ #include "mdc_algorithms.h"
+ 
++
+ using namespace mdc;
+ 
+ 
+diff -up mysql-workbench-oss-5.1.12/library/canvas/src/mdc_area_group.cpp.gcc44 mysql-workbench-oss-5.1.12/library/canvas/src/mdc_area_group.cpp
+diff -up mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h.gcc44 mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h
+--- mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h.gcc44	2009-05-01 09:54:19.000000000 +0200
++++ mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h	2009-05-01 09:53:57.000000000 +0200
+@@ -12,6 +12,7 @@
+ #include <assert.h>
+ #include <algorithm>
+ #include <typeinfo>
++#include <cstdio> 
+ 
+ #include <sigc++/sigc++.h>
+ 
+diff -up mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp.gcc44 mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp
+--- mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp.gcc44	2009-05-01 09:58:49.000000000 +0200
++++ mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp	2009-05-01 09:59:06.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include "stdafx.h"
+ 
+ #include <mforms/mforms.h>
++#include <cstdio> 
+ 
+ 
+ using namespace mforms;
+diff -up mysql-workbench-oss-5.1.12/library/forms/mforms.cpp.gcc44 mysql-workbench-oss-5.1.12/library/forms/mforms.cpp
+--- mysql-workbench-oss-5.1.12/library/forms/mforms.cpp.gcc44	2009-05-01 10:00:27.000000000 +0200
++++ mysql-workbench-oss-5.1.12/library/forms/mforms.cpp	2009-05-01 10:00:40.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <string.h>
+ #include "mforms/mforms.h"
+ #include "mforms/simpleform.h"
++#include <cstdio> 
+ 
+ using namespace mforms;
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.8&r2=1.9&f=u

