build: Remove webkitgtk hack

SparkleShare/Linux/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = Pixmaps
 ASSEMBLY = SparkleShare
 TARGET = exe
 
-LINK = $(REF_SPARKLESHARE) $(NOTIFY_SHARP_LIBS) -r:../../tmp-deps/webkitgtk-sharp.dll
+LINK = $(REF_SPARKLESHARE) $(NOTIFY_SHARP_LIBS) $(WEBKITGTK_SHARP_LIBS)
 
 if HAVE_APP_INDICATOR
 BUILD_DEFINES="-define:HAVE_APP_INDICATOR"

configure.ac

@@ -66,12 +66,12 @@ AC_ARG_ENABLE(appindicator,
 
 OSNAME=`uname -s`
 if test "$OSNAME" = "Linux" ; then
-	dnl check for webkit-sharp
-	PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)
-	if test "x$have_webkit_sharp" = "xno" ; then
-		AC_ERROR("webkit-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
+	dnl check for webkitgtk-sharp
+	PKG_CHECK_MODULES(WEBKIT_SHARP, webkitgtk-sharp-3.0, have_webkitgtk_sharp=yes, have_webkitgtk_sharp=no)
+	if test "x$have_webkitgtk_sharp" = "xno" ; then
+		AC_ERROR("webkitgtk-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
 	fi
-	AC_SUBST(WEBKIT_SHARP_LIBS)
+	AC_SUBST(WEBKITGTK_SHARP_LIBS)
 
 	dnl check for notify-sharp
 	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)

tmp-deps/libwebkitgtksharpglue-1.10.2.la

@@ -1,41 +0,0 @@
-# libwebkitgtksharpglue-1.10.2.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libwebkitgtksharpglue-1.10.2.so'
-
-# Names of this library.
-library_names='libwebkitgtksharpglue-1.10.2.so libwebkitgtksharpglue-1.10.2.so libwebkitgtksharpglue-1.10.2.so'
-
-# The name of the static archive.
-old_library='libwebkitgtksharpglue-1.10.2.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -lwebkitgtk-3.0 -lgtk-3 -lsoup-2.4 -ljavascriptcoregtk-3.0 -lgdk-3 -latk-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 /usr/lib/x86_64-linux-gnu/libcairo-gobject.la -lpango-1.0 /usr/lib/x86_64-linux-gnu/libcairo.la -lgio-2.0 -lgobject-2.0 -lglib-2.0'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libwebkitgtksharpglue-1.10.2.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/local/lib'