[geany/geany-plugins] 2c7aaa: webhelper, markdown: Make gtk3-only

Chow Loong Jin git-noreply at xxxxx
Wed May 30 05:21:14 UTC 2018


Branch:      refs/heads/master
Author:      Chow Loong Jin <hyperair at debian.org>
Committer:   Chow Loong Jin <hyperair at debian.org>
Date:        Thu, 18 Jan 2018 16:34:38 UTC
Commit:      2c7aaa82556a5c55638353e9df77cc25b044e0a0
             https://github.com/geany/geany-plugins/commit/2c7aaa82556a5c55638353e9df77cc25b044e0a0

Log Message:
-----------
webhelper, markdown: Make gtk3-only

webkit2gtk-4.0 doesn't exist for gtk2.


Modified Paths:
--------------
    build/markdown.m4
    build/webhelper.m4

Modified: build/markdown.m4
6 lines changed, 2 insertions(+), 4 deletions(-)
===================================================================
@@ -49,12 +49,10 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
     GTK_VERSION=2.16
     WEBKIT_VERSION=1.1.13
 
-    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
-                  [webkit_package=webkit2gtk-4.0])
-
+    GP_CHECK_PLUGIN_GTK3_ONLY([markdown])
     GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN],
                          [$GP_GTK_PACKAGE >= ${GTK_VERSION}
-                          $webkit_package >= ${WEBKIT_VERSION}
+                          webkit2gtk-4.0 >= ${WEBKIT_VERSION}
                           gthread-2.0])
 
     GP_COMMIT_PLUGIN_STATUS([Markdown])


Modified: build/webhelper.m4
5 lines changed, 2 insertions(+), 3 deletions(-)
===================================================================
@@ -19,14 +19,13 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
         fi
     fi
 
-    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
-                  [webkit_package=webkit2gtk-4.0])
+    GP_CHECK_PLUGIN_GTK3_ONLY([webhelper])
     GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER],
                          [$GP_GTK_PACKAGE >= ${GTK_VERSION}
                           glib-2.0 >= ${GLIB_VERSION}
                           gio-2.0 >= ${GIO_VERSION}
                           gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}
-                          $webkit_package >= ${WEBKIT_VERSION}
+                          webkit2gtk-4.0 >= ${WEBKIT_VERSION}
                           gthread-2.0])
 
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list