diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch')
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch new file mode 100644 index 000000000000..6e9a4d5e1410 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch @@ -0,0 +1,43 @@ +--- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200 ++++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200 +@@ -18,6 +18,9 @@ + find_package(PkgConfig REQUIRED) + + find_package(GTK2 2.20 REQUIRED gtk gtkmm) ++if (NOT GTK2_FOUND) ++ message( FATAL_ERROR "Not all GTK2 components were found!" ) ++endif() + pkg_check_modules(GTHREAD REQUIRED gthread-2.0) + pkg_check_modules(GMODULE REQUIRED gmodule-2.0) + set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}) +@@ -32,7 +35,8 @@ + endif () + + # All known publicly available versions of Antlr3C are buggy +- ++# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973 ++# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too + if (SKIP_BUNDLED_ANTLR) + find_package(Antlr3C) + endif () +@@ -89,7 +93,8 @@ + pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12) + pkg_check_modules(UUID REQUIRED uuid) + pkg_check_modules(LIBZIP REQUIRED libzip) +-if (UNIX) ++ ++if (UNIX AND USE_GNOME_KEYRING) + pkg_check_modules(GNOME_KEYRING gnome-keyring-1) + if (GNOME_KEYRING_FOUND) + set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING") +@@ -99,7 +104,10 @@ + set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING") + endif() + endif() ++ if (NOT GNOME_KEYRING_FOUND) ++ message( FATAL_ERROR "Gnome keyring libraries could not be found" ) ++ endif() + endif() + + include (CheckFunctionExists) + |