commit mysql-workbench for openSUSE:Factory
Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2015-03-30 19:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-11 16:44:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2015-03-30 19:33:23.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Mar 27 16:08:01 UTC 2015 - sfalken@opensuse.org + +- Patched to work with CMake >=3.2, as X11 is no longer magically + implied as a linked library +- Added: + + mysql-workbench-cmake-3.2.patch + +------------------------------------------------------------------- New: ---- mysql-workbench-cmake-3.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.cJLExC/_old 2015-03-30 19:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.cJLExC/_new 2015-03-30 19:33:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mysql-workbench # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,8 @@ # This only exist in mysql 5.6.x but the if code didn't work # So disable it Patch3: mysql-workbench-mysql_options4.patch +# PATCH-FIX-UPSTREAM sfalken@opensuse.org +Patch4: mysql-workbench-cmake-3.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Keep them alphabetic order @@ -141,6 +143,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # FIX this is too much on obs Out of Memory use ++++++ mysql-workbench-cmake-3.2.patch ++++++ Index: mysql-workbench-community-6.2.3-src/CMakeLists.txt =================================================================== --- mysql-workbench-community-6.2.3-src.orig/CMakeLists.txt +++ mysql-workbench-community-6.2.3-src/CMakeLists.txt @@ -77,6 +77,7 @@ endif() find_package(LibXml2 REQUIRED) find_package(OpenGL REQUIRED) +find_package(X11 REQUIRED) find_package(CTemplate) find_package(MySQLCppConn REQUIRED) Index: mysql-workbench-community-6.2.3-src/frontend/linux/workbench/CMakeLists.txt =================================================================== --- mysql-workbench-community-6.2.3-src.orig/frontend/linux/workbench/CMakeLists.txt +++ mysql-workbench-community-6.2.3-src/frontend/linux/workbench/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories(. ${LIBZIP_INCLUDE_DIRS} ${MYSQLCPPCONN_INCLUDE_DIRS} ${GRT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} ) #link_directories(${PROJECT_BINARY_DIR}/mysqlcppconnector/lib ${PROJECT_BINARY_DIR}/antlr-wb) @@ -102,6 +103,7 @@ target_link_libraries(mysql-workbench-bi ${LIBZIP_LIBRARIES} ${MYSQL_LIBRARIES} ${SQLITE3_LIBRARIES} + ${X11_LIBRARIES} ) install(TARGETS mysql-workbench-bin DESTINATION ${WB_INSTALL_DIR_EXECUTABLE})
participants (1)
-
root@hilbert.suse.de