gplugin: attivata introspection e relocation.

diff --git a/packages/mingw-w64-gplugin/001-win.patch b/packages/mingw-w64-gplugin/001-win.patch
index 5c1634c16d7132aa3122220bbc8a101f69d8f23c..88b5992cd1117c5c31bfc4db9b655cdf0db7bbe8 100644 (file)
--- a/packages/mingw-w64-gplugin/001-win.patch
+++ b/packages/mingw-w64-gplugin/001-win.patch
@@ -1,5 +1,16 @@
---- ./gplugin/CMakeLists.txt.orig      2015-05-06 22:29:53.416138100 +0200
-+++ ./gplugin/CMakeLists.txt   2015-05-06 22:30:02.902002900 +0200
+--- ./cmake/Modules/GObjectIntrospection.cmake.orig    2015-02-22 23:39:10.000000000 +0100
++++ ./cmake/Modules/GObjectIntrospection.cmake 2015-05-10 19:44:47.568256600 +0200
+@@ -181,7 +181,7 @@
+       set(ENV{CFLAGS} ${GIR_REAL_CFLAGS})
+       add_custom_command(
+               OUTPUT ${GIR_FILENAME}
+-              COMMAND ${GIR_SCANNER} ${GIR_SCANNER_ARGS}
++              COMMAND CC=${CMAKE_C_COMPILER} ${GIR_SCANNER} ${GIR_SCANNER_ARGS}
+                       --namespace=${GIR_NAMESPACE}
+                       --nsversion=${GIR_NSVERSION}
+                       ${GIR_REAL_CFLAGS}
+--- ./gplugin/CMakeLists.txt.orig      2015-02-22 23:39:10.000000000 +0100
++++ ./gplugin/CMakeLists.txt   2015-05-10 19:44:47.620258900 +0200
 @@ -196,14 +196,6 @@
  add_executable(gplugin-query gplugin-query.c)
  target_link_libraries(gplugin-query ${GLIB_LIBRARIES} gplugin)
@@ -15,3 +26,35 @@
  ###############################################################################
  # loader-tests static library
  ###############################################################################
+--- ./gplugin/gplugin-manager.c.orig   2015-05-10 20:02:00.022359200 +0200
++++ ./gplugin/gplugin-manager.c        2015-05-10 20:02:12.100326200 +0200
+@@ -1119,7 +1119,11 @@
+ gplugin_manager_add_default_paths(void) {
+       gchar *path;
+ 
+-      path = g_build_filename(PREFIX, "lib", "gplugin", NULL);
++      gchar *dir;
++
++      dir = g_win32_get_package_installation_directory_of_module (NULL);
++      path = g_build_filename(dir, "lib", "gplugin", NULL);
++      g_free (dir);
+       gplugin_manager_prepend_path(path);
+       g_free(path);
+ 
+--- ./gplugin-gtk/gplugin-gtk-plugin-info.c.orig       2015-05-10 20:00:56.780137100 +0200
++++ ./gplugin-gtk/gplugin-gtk-plugin-info.c    2015-05-10 20:01:16.721412000 +0200
+@@ -239,8 +239,13 @@
+ 
+       /* load the ui from the GtkBuilder file */
+       priv->builder = gtk_builder_new();
+-      filename = g_build_filename(PREFIX, "share", "gplugin", "gplugin-gtk",
++
++      gchar *dir;
++
++      dir = g_win32_get_package_installation_directory_of_module (NULL);
++      filename = g_build_filename(dir, "share", "gplugin", "gplugin-gtk",
+                                   "gplugin-gtk-plugin-info.ui", NULL);
++      g_free (dir);
+       gtk_builder_add_from_file(priv->builder, filename, &error);
+       if(error) {
+               g_warning("%s", error->message);

diff --git a/packages/mingw-w64-gplugin/PKGBUILD b/packages/mingw-w64-gplugin/PKGBUILD
index 09ad47773cf76ae13fb665e1d2806ca8a8f8cc09..663b90f79fc58bbf71aead7a50819d5e91c321b6 100644 (file)
--- a/packages/mingw-w64-gplugin/PKGBUILD
+++ b/packages/mingw-w64-gplugin/PKGBUILD
@@ -17,7 +17,7 @@ options=('strip' '!debug' 'staticlibs')
 source=(https://bitbucket.org/rw_grim/${_realname}/get/v$pkgver.tar.bz2
         001-win.patch)
 sha256sums=('fe0d6e450ff9f63e866bf75344cb561985dccae1e89e4162c20d07d961b71fc9'
-            '095b3ac2ff6c41db2463b4e8fce51d7304cd7f7ed751fc706707442b0a40b340')
+            '583b969c8d67fd303cf219e5a6f475be8f4f535711324966efc57479fe031153')
 
 prepare() {
   cd rw_grim-gplugin-9f4dea11d6eb
@@ -38,7 +38,6 @@ build() {
     -DBUILD_LUA="Off" \
     -DBUILD_PYTHON="Off" \
     -DBUILD_SEED="Off" \
-    -DBUILD_GIR="Off" \
     -DTESTING_ENABLED="Off" \
     -G "MSYS Makefiles" \
    ../rw_grim-gplugin-9f4dea11d6eb