| 1 |
graaff 13/11/09 09:46:15 |
| 2 |
|
| 3 |
Added: mysql-workbench-6.0.8-CMakeLists.patch |
| 4 |
Log: |
| 5 |
Version bump, closing bug 490740. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mysql-workbench-6.0.8-CMakeLists.patch |
| 16 |
=================================================================== |
| 17 |
--- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200 |
| 18 |
+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200 |
| 19 |
@@ -18,6 +18,9 @@ |
| 20 |
find_package(PkgConfig REQUIRED) |
| 21 |
|
| 22 |
find_package(GTK2 2.6.2 REQUIRED gtk gtkmm) |
| 23 |
+if (NOT GTK2_FOUND) |
| 24 |
+ message( FATAL_ERROR "Not all GTK2 components were found!" ) |
| 25 |
+endif() |
| 26 |
pkg_check_modules(GTHREAD REQUIRED gthread-2.0) |
| 27 |
pkg_check_modules(GMODULE REQUIRED gmodule-2.0) |
| 28 |
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}) |
| 29 |
@@ -32,7 +35,8 @@ |
| 30 |
endif () |
| 31 |
|
| 32 |
# All known publicly available versions of Antlr3C are buggy |
| 33 |
- |
| 34 |
+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973 |
| 35 |
+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too |
| 36 |
if (SKIP_BUNDLED_ANTLR) |
| 37 |
find_package(Antlr3C) |
| 38 |
endif () |
| 39 |
@@ -71,8 +75,8 @@ |
| 40 |
find_package(TinyXML REQUIRED) |
| 41 |
|
| 42 |
if (UNIX) |
| 43 |
- option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF) |
| 44 |
- if (USE_UNIXODBC) |
| 45 |
+ option(USE_IODBC "Use iODBC instead of unixODBC" ON) |
| 46 |
+ if (NOT USE_IODBC) |
| 47 |
find_package(UNIXODBC REQUIRED) |
| 48 |
set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES}) |
| 49 |
set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS}) |
| 50 |
@@ -89,7 +93,8 @@ |
| 51 |
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12) |
| 52 |
pkg_check_modules(UUID REQUIRED uuid) |
| 53 |
pkg_check_modules(LIBZIP REQUIRED libzip) |
| 54 |
-if (UNIX) |
| 55 |
+ |
| 56 |
+if (UNIX AND USE_GNOME_KEYRING) |
| 57 |
pkg_check_modules(GNOME_KEYRING gnome-keyring-1) |
| 58 |
if (GNOME_KEYRING_FOUND) |
| 59 |
set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING") |
| 60 |
@@ -99,7 +104,10 @@ |
| 61 |
set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING") |
| 62 |
endif() |
| 63 |
endif() |
| 64 |
+ if (NOT GNOME_KEYRING_FOUND) |
| 65 |
+ message( FATAL_ERROR "Gnome keyring libraries could not be found" ) |
| 66 |
+ endif() |
| 67 |
endif() |
| 68 |
|
| 69 |
include (CheckFunctionExists) |
Archives