Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2013-06-05 17:45:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2013-03-21 10:40:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2013-06-05 17:45:58.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 4 14:47:06 UTC 2013 - mhruse...@suse.com
+
+- Fixed build against Factory (gtkmm/*.h -> gtkmm.h)
+- Use system c++-connector:
+ mysql-workbench-5.2.47-system-cppconn.patch
+
+-------------------------------------------------------------------
New:
----
mysql-workbench-5.2.47-system-cppconn.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.tBdoRk/_old 2013-06-05 17:45:59.000000000 +0200
+++ /var/tmp/diff_new_pack.tBdoRk/_new 2013-06-05 17:45:59.000000000 +0200
@@ -27,6 +27,7 @@
Source1: openSUSE_(Vendor_Package).xml
Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch
+Patch2: mysql-workbench-5.2.47-system-cppconn.patch
Summary: A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -102,12 +103,19 @@
%setup -q -n %{name}-gpl-%{version}-src
%patch0 -p1
%patch1 -p1
+%patch2
for j in gpattern.h gmessages.h gthread.h gbase64.h gunicode.h gerror.h
gquark.h gtypes.h gmacros.h ; do
for i in `grep -Rl "glib/$j" .`; do
- sed -i "s|glib/$j|glib.h|" $i;
+ sed -i "s|glib/$j|glib.h|" $i
done
done
+%if 0%{?suse_version} > 1230
+for i in `grep -Rl "include.*gtkmm/" .`; do
+ sed -i 's|gtkmm/[^>"]*|gtkmm.h|' $i
+done
+%endif
rm -rf ext/ctemplate
+rm -rf ext/cppconn
%build
export SUSE_ASNEEDED=0
++++++ mysql-workbench-5.2.47-system-cppconn.patch ++++++
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -487,8 +487,6 @@ res/mysql.profiles/Makefile
res/sqlidedata/Makefile
ext/Makefile
ext/scintilla/gtk/Makefile
-ext/cppconn/Makefile
-ext/cppconn/driver/Makefile
ext/vsqlite++/Makefile
ext/vsqlite++/src/sqlite/Makefile
backend/Makefile
Index: ext/Makefile.am
===================================================================
--- ext/Makefile.am.orig
+++ ext/Makefile.am
@@ -3,7 +3,7 @@ if BUILD_ANTLR_RUNTIME
antlr_dirs=antlr-runtime
endif
-SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs)
+SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs)
if BUNDLE_UTILITIES
all-am:
Index: ext/Makefile.in
===================================================================
--- ext/Makefile.in.orig
+++ ext/Makefile.in
@@ -53,7 +53,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime ctemplate
+DIST_SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime ctemplate
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -223,7 +223,7 @@ top_srcdir = @top_srcdir@
unixodbc = @unixodbc@
@BUILD_CTEMPLATE_TRUE@ctemplate_dirs = ctemplate
@BUILD_ANTLR_RUNTIME_TRUE@antlr_dirs = antlr-runtime
-SUBDIRS = scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
+SUBDIRS = scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
all: all-recursive
.SUFFIXES:
Index: backend/wbprivate/sqlide/wb_sql_editor_form.cpp
===================================================================
--- backend/wbprivate/sqlide/wb_sql_editor_form.cpp.orig
+++ backend/wbprivate/sqlide/wb_sql_editor_form.cpp
@@ -49,7 +49,7 @@
// this doesn't belong here, but there's no other workaround for having access
to mysql_info
// because of that we also need to link wbprivate directly to the connector,
making their
// dynamic loading pretty much useless
-#include <cppconn/../driver/mysql_connection.h>
+#include <mysql_connection.h>
#include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
Index: backend/wbpublic/grtdb/diff_dbobjectmatch.cpp
===================================================================
--- backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.orig
+++ backend/wbpublic/grtdb/diff_dbobjectmatch.cpp
@@ -22,7 +22,7 @@
// this doesn't belong here, but there's no other workaround for having access
to mysql_info
// because of that we also need to link wbprivate directly to the connector,
making their
// dynamic loading pretty much useless
-#include <cppconn/../driver/mysql_connection.h>
+#include <mysql_connection.h>
#include <cppconn/metadata.h>
@@ -686,4 +686,4 @@ grt::DictRef grt::NormalizedComparer::ge
result.set("maxIndexCommentLength",
grt::IntegerRef(_maxIndexCommentLength));
result.set("maxColumnCommentLength",
grt::IntegerRef(_maxColumnCommentLength));
return result;
-};
\ No newline at end of file
+};
Index: frontend/linux/workbench/Makefile.am
===================================================================
--- frontend/linux/workbench/Makefile.am.orig
+++ frontend/linux/workbench/Makefile.am
@@ -54,14 +54,13 @@ 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)/ext/scintilla/gtk/libwbscintilla.la\
$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
$(top_srcdir)/library/canvas/src/libmdcanvas.la\
$(top_srcdir)/library/mysql-parser/libmysqlparser.la\
@CTEMPLATE_LIBS@\
@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@
@MYSQL_LIBS@ @SQLITE3_LIBS@\
- -lX11
+ -lX11 -lmysqlcppconn
#precompiled.h.gch: precompiled.h
# $(CXXCOMPILE) precompiled.h -o precompiled.h.gch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
