Merge lp:~meberl/inkscape/extension-fixes into lp:~inkscape.dev/inkscape/trunk

[meberl]

- Restructured CMake a bit, the install targets are now in src/CMakeLists.txt.
- CMake build now links the inkscape and inkview executables against the libinkscape_base library that is installed. This can be verified with ldd.
- Fixed a bug in the extension system. The plugin loader searches for the binary in the directory of the inx file.

[Mc (mc...)]

Just tested, and cannot run after installing :

./inkscape: error while loading shared libraries: libgdl_LIB.so: cannot open shared object file: No such file or directory

$ ldd ./inkscape
 linux-vdso.so.1 (0x00007fff3d133000)
 libinkscape_base.so => /home/mc/[...install path...]/bin/./../lib/libinkscape_base.so (0x00007f6a2e5b6000)
 libgdl_LIB.so => not found
 libnrtype_LIB.so => not found
 libcroco_LIB.so => not found
 libavoid_LIB.so => not found
 libcola_LIB.so => not found
 libvpsc_LIB.so => not found
 liblivarot_LIB.so => not found
 libuemf_LIB.so => not found
 lib2geom_LIB.so => not found
 libdepixelize_LIB.so => not found
 libutil_LIB.so => not found
 libgc_LIB.so => not found
 libpangocairo-1.0.so.0 => /usr/lib/x86_64-linux-gnu/libpangocairo-1.0.so.0 (0x00007f6a2e368000)
[...]

review: Needs Fixing (test)

[Mc (mc...)]

Ok, I fixed it. Merging.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-16 17:26:13 +0000
+++ CMakeLists.txt	2016-04-29 09:53:54 +0000
@@ -19,6 +19,8 @@
 set(INKSCAPE_VERSION 0.91+devel)
 set(PROJECT_NAME inkscape)
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/")
+
 
 cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths
 cmake_policy(SET CMP0005 NEW) # proper define quoting
@@ -173,10 +175,7 @@
 # Installation
 # -----------------------------------------------------------------------------
 if(UNIX)
-    install(
-        PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape ${EXECUTABLE_OUTPUT_PATH}/inkview
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-	)
+    #The install directive for the binaries and libraries are found in src/CMakeList.txt
 
     install(
 	FILES ${CMAKE_BINARY_DIR}/inkscape.desktop

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-04-16 17:24:08 +0000
+++ src/CMakeLists.txt	2016-04-29 09:53:54 +0000
@@ -558,6 +558,8 @@
 endif()
 
 
+
+
 # Link the inkscape_base library against all external dependencies
 target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS})
 
@@ -565,3 +567,11 @@
 target_link_libraries(inkscape inkscape_base )
 target_link_libraries(inkview inkscape_base)
 
+#Define the installation
+install(
+  TARGETS inkscape_base inkscape inkview 
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+)
+
+  

=== modified file 'src/extension/loader.cpp'
--- src/extension/loader.cpp	2016-04-21 06:14:10 +0000
+++ src/extension/loader.cpp	2016-04-29 09:53:54 +0000
@@ -74,7 +74,7 @@
                     _getInkscapeVersion GetInkscapeVersion = NULL;
                     
                     // build the path where to look for the plugin
-                    gchar *path = g_build_filename(_baseDirectory, name, (char *) NULL);
+                    gchar *path = g_build_filename(_baseDirectory.c_str(), name, (char *) NULL);
                     module = g_module_open(path, G_MODULE_BIND_LOCAL);
                     g_free(path);
                     

=== modified file 'src/extension/loader.h'
--- src/extension/loader.h	2016-04-12 09:43:56 +0000
+++ src/extension/loader.h	2016-04-29 09:53:54 +0000
@@ -31,7 +31,7 @@
      * 
      * @param dir is the path where the plugin should be loaded from.
      */
-    void set_base_directory(const gchar *dir) {
+    void set_base_directory(std::string dir) {
         _baseDirectory = dir;
     }
 
@@ -51,7 +51,7 @@
     Implementation::Implementation *load_implementation(Inkscape::XML::Document *doc);
 
 private:
-    const gchar *_baseDirectory; /**< The base directory to load a plugin from */
+    std::string _baseDirectory; /**< The base directory to load a plugin from */
 
 
 };
@@ -70,4 +70,4 @@
   fill-column:99
   End:
 */
-// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:
\ No newline at end of file
+// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:

=== modified file 'src/extension/system.cpp'
--- src/extension/system.cpp	2016-04-12 09:43:56 +0000
+++ src/extension/system.cpp	2016-04-29 09:53:54 +0000
@@ -47,7 +47,7 @@
 
 static void open_internal(Inkscape::Extension::Extension *in_plug, gpointer in_data);
 static void save_internal(Inkscape::Extension::Extension *in_plug, gpointer in_data);
-static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp);
+static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp, std::string* baseDir);
 
 /**
  * \return   A new document created from the filename passed in
@@ -422,7 +422,7 @@
  * case could apply to modules that are built in (like the SVG load/save functions).
  */
 static Extension *
-build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp)
+build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp, std::string* baseDir)
 {
     enum {
         MODULE_EXTENSION,
@@ -490,7 +490,9 @@
             }
             case MODULE_PLUGIN: {
                 Inkscape::Extension::Loader loader = Inkscape::Extension::Loader();
-                loader.set_base_directory ( Inkscape::Application::profile_path("extensions"));
+                if( baseDir != NULL){
+                    loader.set_base_directory ( *baseDir );
+                }
                 imp = loader.load_implementation(doc);
                 break;
             }
@@ -546,7 +548,8 @@
 build_from_file(gchar const *filename)
 {
     Inkscape::XML::Document *doc = sp_repr_read_file(filename, INKSCAPE_EXTENSION_URI);
-    Extension *ext = build_from_reprdoc(doc, NULL);
+    std::string dir = Glib::path_get_dirname(filename);
+    Extension *ext = build_from_reprdoc(doc, NULL, &dir);
     if (ext != NULL)
         Inkscape::GC::release(doc);
     else
@@ -568,7 +571,7 @@
 {
     Inkscape::XML::Document *doc = sp_repr_read_mem(buffer, strlen(buffer), INKSCAPE_EXTENSION_URI);
     g_return_val_if_fail(doc != NULL, NULL);
-    Extension *ext = build_from_reprdoc(doc, in_imp);
+    Extension *ext = build_from_reprdoc(doc, in_imp, NULL);
     Inkscape::GC::release(doc);
     return ext;
 }