Revision: 1974
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1974&view=rev
Author: hyperair
Date: 2011-03-10 17:40:57 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Bundle gpgme.m4 so autogen doesn't depend on gpgme
Modified Paths:
--------------
trunk/geany-plugins/Makefile.am
Added Paths:
-----------
trunk/geany-plugins/build/bundled/
trunk/geany-plugins/build/bundled/gpgme.m4
Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am 2011-03-10 17:38:07 UTC (rev 1973)
+++ trunk/geany-plugins/Makefile.am 2011-03-10 17:40:57 UTC (rev 1974)
@@ -24,7 +24,7 @@
updatechecker \
webhelper
-ACLOCAL_AMFLAGS = -I build/cache -I build --install
+ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled --install
SUBDIRS = \
po \
Added: trunk/geany-plugins/build/bundled/gpgme.m4
===================================================================
--- trunk/geany-plugins/build/bundled/gpgme.m4 (rev 0)
+++ trunk/geany-plugins/build/bundled/gpgme.m4 2011-03-10 17:40:57 UTC (rev 1974)
@@ -0,0 +1,307 @@
+# gpgme.m4 - autoconf macro to detect GPGME.
+# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+[ AC_ARG_WITH(gpgme-prefix,
+ AC_HELP_STRING([--with-gpgme-prefix=PFX],
+ [prefix where GPGME is installed (optional)]),
+ gpgme_config_prefix="$withval", gpgme_config_prefix="")
+ if test "x$gpgme_config_prefix" != x ; then
+ GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
+ fi
+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+
+ if test "$GPGME_CONFIG" != "no" ; then
+ gpgme_version=`$GPGME_CONFIG --version`
+ fi
+ gpgme_version_major=`echo $gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ gpgme_version_minor=`echo $gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ gpgme_version_micro=`echo $gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+])
+
+dnl AM_PATH_GPGME([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_gpgme_api=0
+ min_gpgme_version="$tmp"
+ fi
+
+ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+ ok=no
+ if test "$GPGME_CONFIG" != "no" ; then
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+ req_minor=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+ req_micro=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$gpgme_version_minor" -eq "$req_minor"; then
+ if test "$gpgme_version_micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
+ GPGME_LIBS=`$GPGME_CONFIG --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ GPGME_CFLAGS=""
+ GPGME_LIBS=""
+ AC_MSG_RESULT(no)
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GPGME_CFLAGS)
+ AC_SUBST(GPGME_LIBS)
+])
+
+dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME_PTH],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_gpgme_api=0
+ min_gpgme_version="$tmp"
+ fi
+
+ AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version)
+ ok=no
+ if test "$GPGME_CONFIG" != "no" ; then
+ if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+ req_minor=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+ req_micro=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$gpgme_version_minor" -eq "$req_minor"; then
+ if test "$gpgme_version_micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags`
+ GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ GPGME_PTH_CFLAGS=""
+ GPGME_PTH_LIBS=""
+ AC_MSG_RESULT(no)
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GPGME_PTH_CFLAGS)
+ AC_SUBST(GPGME_PTH_LIBS)
+])
+
+dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
+dnl and GPGME_PTHREAD_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_gpgme_api=0
+ min_gpgme_version="$tmp"
+ fi
+
+ AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
+ ok=no
+ if test "$GPGME_CONFIG" != "no" ; then
+ if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+ req_minor=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+ req_micro=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$gpgme_version_minor" -eq "$req_minor"; then
+ if test "$gpgme_version_micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
+ GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ GPGME_PTHREAD_CFLAGS=""
+ GPGME_PTHREAD_LIBS=""
+ AC_MSG_RESULT(no)
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GPGME_PTHREAD_CFLAGS)
+ AC_SUBST(GPGME_PTHREAD_LIBS)
+])
+
+
+dnl AM_PATH_GPGME_GLIB([MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpgme-glib and define GPGME_GLIB_CFLAGS and GPGME_GLIB_LIBS.
+dnl
+AC_DEFUN([AM_PATH_GPGME_GLIB],
+[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+ req_gpgme_api=0
+ min_gpgme_version="$tmp"
+ fi
+
+ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+ ok=no
+ if test "$GPGME_CONFIG" != "no" ; then
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+ req_minor=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+ req_micro=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+ else
+ if test "$gpgme_version_minor" -eq "$req_minor"; then
+ if test "$gpgme_version_micro" -ge "$req_micro"; then
+ ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+ fi
+ fi
+ fi
+ fi
+ if test $ok = yes; then
+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ GPGME_GLIB_CFLAGS=""
+ GPGME_GLIB_LIBS=""
+ AC_MSG_RESULT(no)
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GPGME_GLIB_CFLAGS)
+ AC_SUBST(GPGME_GLIB_LIBS)
+])
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1973
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1973&view=rev
Author: hyperair
Date: 2011-03-10 17:38:07 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Call AC_MSG_ERROR if AM_PATH_GPGME fails
If --enable-geanypg is passed, we must disable automagic detection of
dependencies and fail immediately if we can't find stuff.
This commit happened due to an assumption that AM_PATH_GPGME fails the configure
script if it didn't find gpgme.
Modified Paths:
--------------
trunk/geany-plugins/build/geanypg.m4
Modified: trunk/geany-plugins/build/geanypg.m4
===================================================================
--- trunk/geany-plugins/build/geanypg.m4 2011-03-10 16:13:27 UTC (rev 1972)
+++ trunk/geany-plugins/build/geanypg.m4 2011-03-10 17:38:07 UTC (rev 1973)
@@ -4,7 +4,9 @@
if test "$enable_geanypg" = "auto"; then
AM_PATH_GPGME(, enable_geanypg=yes, enable_geanypg=no)
else
- AM_PATH_GPGME
+ AM_PATH_GPGME(,,
+ [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and
+ GPGME_LIBS if it is installed.])])
fi
AM_CONDITIONAL(ENABLE_GEANYPG, test "$enable_geanypg" = "yes")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1972
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1972&view=rev
Author: frlan
Date: 2011-03-10 16:13:27 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Remove old folder
Removed Paths:
-------------
trunk/geany-plugins/htmltable/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1971
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1971&view=rev
Author: colombanw
Date: 2011-03-10 15:48:00 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
WebHelper: Initialize GLib's threading system for WebKit to use it
WebKit uses threads but don't seem to initialize the thread system,
causing troubles with GLib versions that doesn't enable threads by
default (< 2.24). So, initialize the thread system ourselves.
Closes #3189033
Modified Paths:
--------------
trunk/geany-plugins/build/webhelper.m4
trunk/geany-plugins/webhelper/src/gwh-plugin.c
Modified: trunk/geany-plugins/build/webhelper.m4
===================================================================
--- trunk/geany-plugins/build/webhelper.m4 2011-03-10 15:47:35 UTC (rev 1970)
+++ trunk/geany-plugins/build/webhelper.m4 2011-03-10 15:48:00 UTC (rev 1971)
@@ -23,7 +23,8 @@
glib-2.0 >= ${GLIB_VERSION}
gio-2.0 >= ${GIO_VERSION}
gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}
- webkit-1.0 >= ${WEBKIT_VERSION}])
+ webkit-1.0 >= ${WEBKIT_VERSION}
+ gthread-2.0])
GP_STATUS_PLUGIN_ADD([WebHelper], [$enable_webhelper])
Modified: trunk/geany-plugins/webhelper/src/gwh-plugin.c
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-03-10 15:47:35 UTC (rev 1970)
+++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-03-10 15:48:00 UTC (rev 1971)
@@ -416,6 +416,11 @@
* (g_quark_from_static_string() for example) so it's not safe to remove it */
plugin_module_make_resident (geany_plugin);
+ /* webkit uses threads but don't initialize the thread system */
+ if (! g_thread_supported ()) {
+ g_thread_init (NULL);
+ }
+
load_config ();
gwh_keybindings_init ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1970
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1970&view=rev
Author: colombanw
Date: 2011-03-10 15:47:35 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
GeanyGenDoc: don't shadow global declaration of read()
Modified Paths:
--------------
trunk/geany-plugins/geanygendoc/src/ggd-options.c
Modified: trunk/geany-plugins/geanygendoc/src/ggd-options.c
===================================================================
--- trunk/geany-plugins/geanygendoc/src/ggd-options.c 2011-03-09 06:41:13 UTC (rev 1969)
+++ trunk/geany-plugins/geanygendoc/src/ggd-options.c 2011-03-10 15:47:35 UTC (rev 1970)
@@ -458,7 +458,7 @@
/*
* ggd_opt_group_manage_key_file:
* @group: A #GgdOptGroup
- * @read: Whether to read (%TRUE) or write (%FALSE) the group to or from the
+ * @load: Whether to read (%TRUE) or write (%FALSE) the group to or from the
* given key file
* @key_file: A #GKeyFile
*
@@ -466,7 +466,7 @@
*/
static void
ggd_opt_group_manage_key_file (GgdOptGroup *group,
- gboolean read,
+ gboolean load,
GKeyFile *key_file)
{
GgdOptEntry *entry;
@@ -478,7 +478,7 @@
case G_TYPE_BOOLEAN: {
gboolean *setting = (gboolean *)entry->optvar;
- if (read) {
+ if (load) {
gboolean v;
v = g_key_file_get_boolean (key_file, group->name, entry->key, &err);
@@ -494,7 +494,7 @@
case G_TYPE_STRING: {
gchar **setting = (gchar **)entry->optvar;
- if (read) {
+ if (load) {
gchar *str;
str = g_key_file_get_string (key_file, group->name, entry->key, &err);
@@ -517,7 +517,7 @@
group->name, entry->key, err->message);
g_error_free (err);
} else {
- if (read) {
+ if (load) {
ggd_opt_entry_sync_to_proxy (entry);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.