aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Horn <niels.horn@slackbuilds.org>2011-05-02 15:57:46 -0300
committerNiels Horn <niels.horn@slackbuilds.org>2011-05-02 15:57:46 -0300
commit9b1bd9e6267f56b7dac50a9cdc200af6614dd368 (patch)
tree38d5cb94962d09784f23c870de1f3c75b1a19550
parentdcec8fbaf3af9a310c6bf73152012947684b8813 (diff)
development/mysql-workbench-gpl: Patched for new gtkmm.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
-rw-r--r--development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild6
-rw-r--r--development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch11
2 files changed, 16 insertions, 1 deletions
diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild b/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
index ad7bdeb833bed..bcf22efbf41ae 100644
--- a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
+++ b/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
@@ -4,10 +4,11 @@
# Written by André Geraldo Vieira <andre.geraldo@gmail.com>
+# Modified by the SlackBuilds.org team
PRGNAM=mysql-workbench-gpl
VERSION=${VERSION:-5.2.29}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCVERSION=$VERSION-src
@@ -54,6 +55,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+#Patch for gtkmm-2.24
+patch -p1 < $CWD/mysqlwb_gtkmm224.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./autogen.sh \
diff --git a/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch b/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch
new file mode 100644
index 0000000000000..ff55cc85828dc
--- /dev/null
+++ b/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch
@@ -0,0 +1,11 @@
+--- mysql-workbench-gpl-5.2.29-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2010-10-11 04:28:19.000000000 -0300
++++ mysql-workbench-gpl-5.2.29-src_patched/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-05-02 08:51:38.000000000 -0300
+@@ -31,7 +31,7 @@
+ }
+
+ 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);
+