geany 0.20
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 13 Jan 2011 03:31:57 +0000 (21:31 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 13 Jan 2011 03:31:57 +0000 (21:31 -0600)
0.20-gmodule.patch [moved from 0.18-g_module_build_path.patch with 63% similarity]
geany-plugins-0.20-1.cygport [moved from geany-plugins-0.18-1.cygport with 80% similarity]
setup.hint

similarity index 63%
rename from 0.18-g_module_build_path.patch
rename to 0.20-gmodule.patch
index d356bc7dee97950299e1a99edfc7882a5424d896..61ba8eb4d41a42d59f00353093f48eada39511ee 100644 (file)
@@ -1,5 +1,5 @@
---- origsrc/geany-plugins-0.18/geanylua/geanylua.c     2009-10-27 11:23:27.000000000 -0500
-+++ src/geany-plugins-0.18/geanylua/geanylua.c 2010-01-28 03:44:46.075895500 -0600
+--- origsrc/geany-plugins-0.20/geanylua/geanylua.c     2010-06-10 11:46:27.000000000 -0500
++++ src/geany-plugins-0.20/geanylua/geanylua.c 2011-01-12 19:26:44.928374400 -0600
 @@ -42,7 +42,7 @@
  
  #include "glspi_ver.h"
@@ -9,17 +9,18 @@
  
  #define CB_COPY(field) plugin_callbacks[i].field=glspi_geany_callbacks[i].field;
  
-@@ -155,11 +155,11 @@ void plugin_init(GeanyData *data)
-       main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
+@@ -200,12 +200,12 @@ void plugin_init(GeanyData *data)
  
        geany_data=data;
+       /* first try the user config path */
 -      libname=g_build_path(G_DIR_SEPARATOR_S, data->app->configdir, "plugins", "geanylua", SUPPORT_LIB, NULL);
 +      libname=g_module_build_path(g_build_path(G_DIR_SEPARATOR_S, data->app->configdir, "plugins", "geanylua", NULL), SUPPORT_LIB);
-       if ( !g_file_test(libname,G_FILE_TEST_IS_REGULAR) ) {
+       if (!load_support_lib(libname)) {
+               /* try the system path */
                gchar *libdir=get_lib_dir();
                g_free(libname);
 -              libname=g_build_path(G_DIR_SEPARATOR_S, libdir, "geany-plugins", "geanylua", SUPPORT_LIB, NULL);
 +              libname=g_module_build_path(g_build_path(G_DIR_SEPARATOR_S, libdir, "geany-plugins", "geanylua", NULL), SUPPORT_LIB);
                g_free(libdir);
-       }
-       if ( !g_file_test(libname,G_FILE_TEST_IS_REGULAR) ) {
+               if (!load_support_lib(libname)) {
+                       g_printerr(_("%s: Can't find support library %s!\n"), PLUGIN_NAME, libname);
similarity index 80%
rename from geany-plugins-0.18-1.cygport
rename to geany-plugins-0.20-1.cygport
index 4d1807c30ffc6683c31ed3bbc609d4d1437bd822..375c147ddf9032b09b29dcafc049f3d9231b7130 100644 (file)
@@ -5,9 +5,10 @@ HOMEPAGE="http://plugins.geany.org/"
 SRC_URI="http://plugins.geany.org/geany-plugins/${P}.tar.bz2"
 
 PATCH_URI="
-       0.18-g_module_build_path.patch
+       0.20-gmodule.patch
        0.18-no-undefined.patch
        0.18-vpath.patch
 "
 
 ACLOCAL_FLAGS="-I build/cache -I build"
+CYGCONF_ARGS="RST2HTML=/usr/bin/rst2html.py"
index 8f51214b0739e1971c32bc2554b4f881c480ddfc..e6851d76700e6a848e4408b9f4bac636dec3bc7b 100644 (file)
@@ -1,5 +1,5 @@
 category: Devel Gnome
-requires: geany libenchant1 libgcc1 libgdk_pixbuf2.0_0 libglib2.0_0 libgtk2.0_0 libgtkspell0 libintl8 libpango1.0_0 lua
+requires: geany libctpl2 libenchant1 libgcc1 libgdk_pixbuf2.0_0 libglib2.0_0 libgtk2.0_0 libgtkspell0 libintl8 libpango1.0_0 libsoup2.4_1 libwebkit1.0_2 libxml2 lua
 sdesc: "Collection of plugins for Geany"
 ldesc: "The Geany-plugins project is a collection of different plugins 
 for Geany, the lightweight IDE."
This page took 0.045132 seconds and 5 git commands to generate.