Merge branch 'geany:master' into bracketcolors_v1_clean

geany · Mar 11, 2023 · e8a1d98 · e8a1d98
2 parents b0cea01 + dc6980e
commit e8a1d98
Show file tree

Hide file tree

Showing 6 changed files with 254 additions and 593 deletions.
diff --git a/build/webhelper.m4 b/build/webhelper.m4
@@ -19,14 +19,13 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
         fi
     fi
 
-    GP_CHECK_GTK3([webkit_package=webkitgtk-3.0],
-                  [webkit_package=webkit-1.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])
 
 

diff --git a/webhelper/src/Makefile.am b/webhelper/src/Makefile.am
@@ -34,7 +34,8 @@ webhelper_la_CPPFLAGS = $(AM_CPPFLAGS) \
 webhelper_la_CFLAGS   = $(AM_CFLAGS) \
                         $(WEBHELPER_CFLAGS)
 webhelper_la_LIBADD   = $(COMMONLIBS) \
-                        $(WEBHELPER_LIBS)
+                        $(WEBHELPER_LIBS) \
+                        -lm
 
 # These are generated in $(srcdir) because they are part of the distribution,
 # and should anyway only be regenerated if the .tpl changes, which is a