File mysql-workbench-unbundle-libscintilla.patch of Package mysql-workbench

Overview Repositories Revisions Requests Users Attributes Meta

File mysql-workbench-unbundle-libscintilla.patch of Package mysql-workbench (Revision 27b3582b44521b39393c1d5613d0a15c)

Currently displaying revision 27b3582b44521b39393c1d5613d0a15c , Show latest

diff -uNr mysql-workbench-community-6.3.9-src.orig/backend/wbpublic/CMakeLists.txt mysql-workbench-community-6.3.9-src/backend/wbpublic/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/backend/wbpublic/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/backend/wbpublic/CMakeLists.txt	2017-03-13 00:09:28.882117822 +0200
@@ -181,7 +181,7 @@
 
 target_compile_options(wbpublic PUBLIC ${WB_CXXFLAGS})
 
-target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt mtemplate ${VSQLITE_LIBRARIES} wbscintilla parsers ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES})
+target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc grt mtemplate ${VSQLITE_LIBRARIES} scintilla parsers ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES} ${GDAL_LIBRARIES})
 
 if(BUILD_FOR_TESTS)
   target_link_libraries(wbpublic gcov)
diff -uNr mysql-workbench-community-6.3.9-src.orig/ext/CMakeLists.txt mysql-workbench-community-6.3.9-src/ext/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/ext/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/ext/CMakeLists.txt	2017-03-13 00:31:39.596701003 +0200
@@ -1,2 +1 @@
-add_subdirectory(scintilla/gtk)
-file(MAKE_DIRECTORY "antlr-runtime/m4")
\ No newline at end of file
+file(MAKE_DIRECTORY "antlr-runtime/m4")
diff -uNr mysql-workbench-community-6.3.9-src.orig/frontend/linux/workbench/CMakeLists.txt mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/frontend/linux/workbench/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/frontend/linux/workbench/CMakeLists.txt	2017-03-13 00:09:19.606171515 +0200
@@ -103,7 +103,7 @@
     wbbase
     grt
     cdbc
-    wbscintilla
+    scintilla
     mdcanvasgtk
     mdcanvas
     parsers
diff -uNr mysql-workbench-community-6.3.9-src.orig/library/forms/CMakeLists.txt mysql-workbench-community-6.3.9-src/library/forms/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/library/forms/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/library/forms/CMakeLists.txt	2017-03-13 00:10:17.849812469 +0200
@@ -132,7 +132,7 @@
 
 target_compile_options(mforms PUBLIC ${WB_CXXFLAGS})
 
-target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas wbscintilla ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES})
+target_link_libraries(mforms linux_utilities mdcanvasgtk mdcanvas scintilla ${CAIRO_LIBRARIES} ${GTK3_LIBRARIES} ${GNOME_KEYRING_LIBRARIES})
 
 if(BUILD_FOR_TESTS)
   target_link_libraries(mforms gcov)
diff -uNr mysql-workbench-community-6.3.9-src.orig/library/forms/swig/CMakeLists.txt mysql-workbench-community-6.3.9-src/library/forms/swig/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/library/forms/swig/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/library/forms/swig/CMakeLists.txt	2017-03-13 00:10:43.853636877 +0200
@@ -47,7 +47,7 @@
 set_source_files_properties(mforms.i PROPERTIES CPLUSPLUS ON)
 set_property(SOURCE mforms.i PROPERTY SWIG_FLAGS -w512 -fvirtual -DSWIG_PYTHON_LEGACY_BOOL)
 swig_add_module(mforms python mforms.i)
-swig_link_libraries(mforms mforms wbscintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
+swig_link_libraries(mforms mforms scintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
 set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS ${SOURCE_FILE_COMPILE_FLAGS})
 
 target_compile_options(_mforms PUBLIC ${WB_CXXFLAGS})
diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.diff.reporting/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/db.mysql.diff.reporting/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.diff.reporting/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/plugins/db.mysql.diff.reporting/CMakeLists.txt	2017-03-13 00:11:17.157400180 +0200
@@ -42,7 +42,7 @@
 	PREFIX ""
 )
 
-target_link_libraries(db.mysql.diff.reporting.wbp grt mforms wbscintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
+target_link_libraries(db.mysql.diff.reporting.wbp grt mforms scintilla ${GTK3_LIBRARIES} ${LIBXML2_LIBRARIES})
 
 if(BUILD_FOR_TESTS)
   target_link_libraries(db.mysql.diff.reporting.wbp gcov)
diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.editors/linux/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/db.mysql.editors/linux/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/plugins/db.mysql.editors/linux/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/plugins/db.mysql.editors/linux/CMakeLists.txt	2017-03-13 00:11:56.273107276 +0200
@@ -72,7 +72,7 @@
 target_compile_options(db.mysql.editors.wbp PUBLIC ${WB_CXXFLAGS})
 
 add_dependencies(db.mysql.editors.wbp parsers)
-target_link_libraries(db.mysql.editors.wbp linux_utilities wbscintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES})
+target_link_libraries(db.mysql.editors.wbp linux_utilities scintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES})
 
 if(BUILD_FOR_TESTS)
   target_link_libraries(db.mysql.editors.wbp gcov)
@@ -94,7 +94,7 @@
   target_compile_options(db.mysql.editors.wbp.debug PUBLIC ${WB_CXXFLAGS})
 
   add_dependencies(db.mysql.editors.wbp.debug parsers)
-  target_link_libraries(db.mysql.editors.wbp.debug linux_utilities wbscintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES})
+  target_link_libraries(db.mysql.editors.wbp.debug linux_utilities scintilla wbpublic ${GRT_LIBRARIES} ${GTK3_LIBRARIES} ${SIGC++_LIBRARIES})
   target_link_libraries(db.mysql.editors.wbp.debug gcov)
   set_target_properties(db.mysql.editors.wbp.debug
                         PROPERTIES VERSION   ${WB_VERSION}
diff -uNr mysql-workbench-community-6.3.9-src.orig/plugins/wb.model.snippets/CMakeLists.txt mysql-workbench-community-6.3.9-src/plugins/wb.model.snippets/CMakeLists.txt
--- mysql-workbench-community-6.3.9-src.orig/plugins/wb.model.snippets/CMakeLists.txt	2017-02-03 20:40:18.000000000 +0200
+++ mysql-workbench-community-6.3.9-src/plugins/wb.model.snippets/CMakeLists.txt	2017-03-13 00:12:41.684749892 +0200
@@ -32,7 +32,7 @@
 
 target_compile_options(wb.model.snippets.wbp PUBLIC ${WB_CXXFLAGS})
 
-target_link_libraries(wb.model.snippets.wbp wbscintilla)
+target_link_libraries(wb.model.snippets.wbp scintilla)
 
 if(BUILD_FOR_TESTS)
   target_link_libraries(wb.model.snippets.wbp gcov)

Places

File mysql-workbench-unbundle-libscintilla.patch of Package mysql-workbench (Revision 27b3582b44521b39393c1d5613d0a15c)

Places