From 29145bbdfe36c21ca8c1a5e495be1018b376c748 Mon Sep 17 00:00:00 2001 From: Maik Greubel Date: Fri, 22 Apr 2011 18:20:15 +0200 Subject: [PATCH 1/5] Fix compilation of sample (WebKit.Application <> Gtk.Application issue) --- samples/FunnyBrowser.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/FunnyBrowser.cs b/samples/FunnyBrowser.cs index 37d8075..2a96305 100644 --- a/samples/FunnyBrowser.cs +++ b/samples/FunnyBrowser.cs @@ -40,10 +40,10 @@ public static void Main (string[] args) { string url = (args.Length > 0) ? args[0] : ""; - Application.Init (); + Gtk.Application.Init (); MainWindow window = new MainWindow (url); window.Show (); - Application.Run (); + Gtk.Application.Run (); } } @@ -181,7 +181,7 @@ private void CreateFindbar () protected void OnDeleteEvent (object sender, DeleteEventArgs args) { - Application.Quit (); + Gtk.Application.Quit (); args.RetVal = true; } From 2c74972db236856f0e55f47171f20d605adcef49 Mon Sep 17 00:00:00 2001 From: Maik Greubel Date: Fri, 22 Apr 2011 18:21:08 +0200 Subject: [PATCH 2/5] Fix build on x86_64 --- configure.ac | 2 +- doc/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8bddb7c..b195d47 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,7 @@ if test "x$GACUTIL" = "xno" ; then AC_MSG_ERROR([No gacutil tool found]) fi -GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(prefix)/lib' +GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(libdir)' AC_SUBST(RUNTIME) AC_SUBST(CSC) diff --git a/doc/Makefile.am b/doc/Makefile.am index 7400c74..5c7e77f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ if ENABLE_MONODOC TARGETS = $(ASSEMBLY_NAME)-docs.source $(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree -docsdir = $(prefix)/lib/monodoc/sources +docsdir = $(libdir)/monodoc/sources docs_DATA = $(TARGETS) else TARGETS = From c9b5a93de077643dfb1fd9e472d95ddc8ced88d7 Mon Sep 17 00:00:00 2001 From: Maik Greubel Date: Tue, 26 Apr 2011 20:50:21 +0200 Subject: [PATCH 3/5] - Do some package configuration specific tasks (enable-monodoc) - Since now the API will be regenerated using autogen.sh --- autogen.sh | 3 + configure.ac | 76 +- sources/webkit-sharp-api.raw | 7272 +++++++++++++++++++++++++++++++++- webkit-sharp.spec.in | 37 +- 4 files changed, 7191 insertions(+), 197 deletions(-) diff --git a/autogen.sh b/autogen.sh index 152c5f3..6b8b351 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,3 +2,6 @@ autoreconf -i --force --warnings=none ./configure --enable-maintainer-mode $* + +# And now, regenerate the API +make -C sources api diff --git a/configure.ac b/configure.ac index 8bddb7c..d15d2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,15 @@ AM_INIT_AUTOMAKE AM_MAINTAINER_MODE AC_PROG_INSTALL +dnl Version information +MONO_REQUIRED_VERSION=2.6.0 +WEBKIT_REQUIRED_VERSION=1.3 +GTKSHARP_REQUIRED_VERSION=1.9.0 + +AC_SUBST(MONO_REQUIRED_VERSION) +AC_SUBST(WEBKIT_REQUIRED_VERSION) +AC_SUBST(GTKSHARP_REQUIRED_VERSION) + dnl Package settings ASSEMBLY_NAME=$PACKAGE ASSEMBLY_VERSION="1.1.15.0" @@ -15,6 +24,8 @@ ASSEMBLY_DESCRIPTION="WebKit bindings for Mono" ASSEMBLY_COMPANY="Novell, Inc." ASSEMBLY_COPYRIGHT="2008, 2009 Novell, Inc." ASSEMBLY_PC=$ASSEMBLY_NAME-1.0 +ASSEMBLY_LICENSE="X11/MIT" +ASSEMBLY_URL="http://www.go-mono.org/" AC_SUBST(ASSEMBLY_NAME) AC_SUBST(ASSEMBLY_VERSION) @@ -25,6 +36,19 @@ AC_SUBST(ASSEMBLY_DESCRIPTION) AC_SUBST(ASSEMBLY_COMPANY) AC_SUBST(ASSEMBLY_COPYRIGHT) AC_SUBST(ASSEMBLY_PC) +AC_SUBST(ASSEMBLY_LICENSE) +AC_SUBST(ASSEMBLY_URL) + +dnl Add additional configuration options +AC_ARG_ENABLE(monodoc, +AS_HELP_STRING([--enable-monodoc],[Enable the generation of documentation using monodoc (defaults to yes)]), +[ case "${enableval}" in + yes) enable_monodoc="yes" ;; + no) enable_monodoc="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-monodoc) ;; + esac ], +[ enable_monodoc="yes" ]) + dnl Check for pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -32,11 +56,18 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR(['pkg-config' is not in your PATH.]) fi -dnl Check for Mono -PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false) -PKG_CHECK_MODULES(MONO_DEPENDENCY, mint >= 1.0, has_mint=true, has_mint=false) +dnl Check for mono +PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED_VERSION, has_mono="yes", has_mono="no") +if test "x$has_mono" = "xno" ; then + AC_MSG_ERROR([Mono at version at least $MONO_REQUIRED_VERSION not found]) +fi + +dnl Check for mono interpreter (mint) +PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mint="yes", has_mint="no") -if test "x$has_mono" = "xtrue"; then + +dnl Check whether to use Mono or Mint +if test "x$has_mono" = "xyes"; then if test `uname -s` = "Darwin"; then AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(CSC, mcs, no) @@ -49,7 +80,7 @@ if test "x$has_mono" = "xtrue"; then LIB_SUFFIX= fi else - if test "x$has_mint" = "xtrue"; then + if test "x$has_mint" = "xyes"; then AC_PATH_PROG(RUNTIME, mint, no) AC_PATH_PROG(CSC, mcs, no) LIB_PREFIX=.so @@ -86,17 +117,21 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) dnl Check for gtk-sharp -PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 1.9.0) +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GTK_SHARP_CFLAGS) AC_SUBST(GTK_SHARP_LIBS) gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0` AC_SUBST(gtksharp_prefix) dnl Check for WebKit -PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.1.15) +PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= $WEBKIT_REQUIRED_VERSION) AC_SUBST(WEBKIT_LIBS) webkit_prefix=`pkg-config --variable=prefix webkit-1.0` +webkit_version=`pkg-config --modversion webkit-1.0` +ASSEMBLY_PACKAGE_VERSION=$webkit_version + AC_SUBST(webkit_prefix) +AC_SUBST(ASSEMBLY_PACKAGE_VERSION) dnl Check for gapi AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) @@ -136,20 +171,30 @@ fi AC_SUBST(GAPI_CODEGEN) dnl Check for monodoc -AC_PATH_PROG(MDASSEMBLER, mdassembler, no) -AC_PATH_PROG(MONODOCER, monodocer, no) -if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then - enable_monodoc=no - doc_sources_dir= +# We check existance only if documentation is wanted +if test "x$enable_monodoc" = "xyes" ; then + AC_PATH_PROG(MDASSEMBLER, mdassembler, no) + AC_PATH_PROG(MONODOCER, monodocer, no) + if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then + enable_monodoc=no + doc_sources_dir= + else + enable_monodoc=yes + doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" + fi else - enable_monodoc=yes - doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" + MDASSEMBLER= + MONODOCER= fi +echo "checking whether to create documentation... $enable_monodoc" + AC_SUBST(MDASSEMBLER) AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") +AC_SUBST(enable_monodoc) + AC_CONFIG_FILES([ Makefile webkit-sharp.spec @@ -169,6 +214,7 @@ echo "---------------------" echo "" echo " * Installation prefix: $prefix" echo " * compiler: $CSC" -echo " * Documentation: $enable_monodoc ($MONODOC)" +echo " * Documentation: $enable_monodoc ($MONODOCER)" +echo " * WebKit version: $webkit_version" echo "" diff --git a/sources/webkit-sharp-api.raw b/sources/webkit-sharp-api.raw index ef5414e..609fce0 100644 --- a/sources/webkit-sharp-api.raw +++ b/sources/webkit-sharp-api.raw @@ -7,6 +7,11 @@ --> + + + + + @@ -22,12 +27,19 @@ + + + + + + + @@ -56,6 +68,25 @@ + + + + + + + + + + + + + + + + + + + @@ -71,133 +102,7001 @@ - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + - + - - + + + + + + + - + + + + + + + + + - + + - - + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + - - + + - + - - - - - - + + + - - + + - + + + + + - + - - + + + + + - + - - - - + + + + + + + + + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + - - + + - - + + - + - + + + + + + + + + + + + - @@ -287,6 +7186,9 @@ + + + @@ -365,6 +7267,9 @@ + + + @@ -399,6 +7304,9 @@ + + + @@ -408,6 +7316,22 @@ + + + + + + + + + + + + + + + + @@ -442,6 +7366,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -560,6 +7532,9 @@ + + + @@ -578,6 +7553,9 @@ + + + @@ -608,9 +7586,15 @@ + + + + + + @@ -754,6 +7738,12 @@ + + + + + + @@ -795,6 +7785,7 @@ + @@ -806,114 +7797,23 @@ - + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -923,6 +7823,18 @@ + + + + + + + + + + + + @@ -935,6 +7847,12 @@ + + + + + + @@ -948,5 +7866,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/webkit-sharp.spec.in b/webkit-sharp.spec.in index 2a72770..b72192e 100644 --- a/webkit-sharp.spec.in +++ b/webkit-sharp.spec.in @@ -1,16 +1,27 @@ +%define create_documentation @ENABLE_MONODOC@ + Name: webkit-sharp -Url: http://www.go-mono.org/ -BuildRequires: gtk-sharp2 gtk-sharp2-gapi libwebkit-devel mono-devel monodoc-core -Requires: libwebkit => 1.1.15 gtk-sharp2 -License: X11/MIT +Url: @ASSEMBLY_URL@ +License: @ASSEMBLY_LICENSE@ Group: Development/Libraries/Other -Summary: WebKit bindings for Mono -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: @VERSION@ +Summary: @ASSEMBLY_DESCRIPTION@ +Version: @ASSEMBLY_PACKAGE_VERSION@ Release: 1 -BuildArch: noarch Source: webkit-sharp-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: gtk-sharp2 >= @GTKSHARP_REQUIRED_VERSION@ +BuildRequires: gtk-sharp2-gapi +BuildRequires: mono-devel >= @MONO_REQUIRED_VERSION@ +%if %create_documentation = yes +BuildRequires: monodoc-core +%endif + +Requires: libwebkit >= @WEBKIT_REQUIRED_VERSION@ +Requires: gtk-sharp2 >= @GTKSHARP_REQUIRED_VERSION@ +Requires: mono >= @MONO_REQUIRED_VERSION@ + %description WebKit is a web content engine, derived from KHTML and KJS from KDE, and used primarily in Apple's Safari browser. It is made to be embedded in other @@ -19,10 +30,10 @@ applications, such as mail readers, or web browsers. This package provides Mono bindings for WebKit libraries. %prep -%setup -q -n webkit-sharp-%{version} -q +%setup -q %build -./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +%configure make %install @@ -40,11 +51,13 @@ rm -rf "$RPM_BUILD_ROOT" %{_prefix}/lib/pkgconfig/webkit-sharp-1.0.pc %changelog +* Tue Apr 26 2011 Maik Greubel 1.3.10-1 +- Update to webkitgtk 1.3.10 +- Some package configuration related changes + * Wed Oct 08 2009 shana@jitted.com - Update to libwebkit 1.1.15 * Mon May 12 2008 ecanuto@novell.com - Initial package - - From fe188c62a2ce52c328dcbb611f41e4be95a4c169 Mon Sep 17 00:00:00 2001 From: Maik Greubel Date: Tue, 26 Apr 2011 21:02:27 +0200 Subject: [PATCH 4/5] - Make the configuration file more readable --- configure.ac | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index d2efaf6..b2375da 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,4 @@ +dnl The initialization part AC_INIT([webkit-sharp], [0.3]) AC_CONFIG_SRCDIR([README]) AC_CANONICAL_TARGET @@ -56,12 +57,14 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR(['pkg-config' is not in your PATH.]) fi + dnl Check for mono PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED_VERSION, has_mono="yes", has_mono="no") if test "x$has_mono" = "xno" ; then AC_MSG_ERROR([Mono at version at least $MONO_REQUIRED_VERSION not found]) fi + dnl Check for mono interpreter (mint) PKG_CHECK_MODULES(MINT_DEPENDENCY, mint >= $MONO_REQUIRED_VERSION, has_mint="yes", has_mint="no") @@ -97,11 +100,21 @@ else fi fi +AC_SUBST(LIB_PREFIX) +AC_SUBST(LIB_SUFFIX) +AC_SUBST(RUNTIME) + + +dnl C# compiler checks CS="C#" if test "x$CSC" = "xno" ; then AC_MSG_ERROR([No $CS compiler found]) fi +AC_SUBST(CSC) + + +dnl Global Assembly Cache util check AC_PATH_PROG(GACUTIL, gacutil, no) if test "x$GACUTIL" = "xno" ; then AC_MSG_ERROR([No gacutil tool found]) @@ -109,30 +122,30 @@ fi GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(libdir)' -AC_SUBST(RUNTIME) -AC_SUBST(CSC) AC_SUBST(GACUTIL) AC_SUBST(GACUTIL_FLAGS) -AC_SUBST(LIB_PREFIX) -AC_SUBST(LIB_SUFFIX) + dnl Check for gtk-sharp PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) +gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0` + AC_SUBST(GTK_SHARP_CFLAGS) AC_SUBST(GTK_SHARP_LIBS) -gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0` AC_SUBST(gtksharp_prefix) + dnl Check for WebKit PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= $WEBKIT_REQUIRED_VERSION) -AC_SUBST(WEBKIT_LIBS) webkit_prefix=`pkg-config --variable=prefix webkit-1.0` webkit_version=`pkg-config --modversion webkit-1.0` ASSEMBLY_PACKAGE_VERSION=$webkit_version +AC_SUBST(WEBKIT_LIBS) AC_SUBST(webkit_prefix) AC_SUBST(ASSEMBLY_PACKAGE_VERSION) + dnl Check for gapi AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) if test "x$GAPI_PARSER" = "xno"; then @@ -144,7 +157,6 @@ if test "x$GAPI_PARSER" = "xno"; then AC_MSG_RESULT($GAPI_PARSER) GAPI_PARSER="$MONO $GAPI_PARSER" fi -AC_SUBST(GAPI_PARSER) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) if test "x$GAPI_FIXUP" = "xno"; then @@ -156,7 +168,6 @@ if test "x$GAPI_FIXUP" = "xno"; then AC_MSG_RESULT($GAPI_FIXUP) GAPI_FIXUP="$MONO $GAPI_FIXUP" fi -AC_SUBST(GAPI_FIXUP) AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) if test "x$GAPI_CODEGEN" = "xno"; then @@ -168,8 +179,12 @@ if test "x$GAPI_CODEGEN" = "xno"; then AC_MSG_RESULT([$GAPI_CODEGEN]) GAPI_CODEGEN="$MONO $GAPI_CODEGEN" fi + +AC_SUBST(GAPI_PARSER) +AC_SUBST(GAPI_FIXUP) AC_SUBST(GAPI_CODEGEN) + dnl Check for monodoc # We check existance only if documentation is wanted if test "x$enable_monodoc" = "xyes" ; then @@ -186,15 +201,15 @@ else MDASSEMBLER= MONODOCER= fi -echo "checking whether to create documentation... $enable_monodoc" - -AC_SUBST(MDASSEMBLER) -AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") +AC_SUBST(MDASSEMBLER) +AC_SUBST(MONODOCER) AC_SUBST(enable_monodoc) + +dnl Configuration files AC_CONFIG_FILES([ Makefile webkit-sharp.spec @@ -206,6 +221,9 @@ AC_CONFIG_FILES([ sources/webkit-sharp.dll.config ]) AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h ]],[[]]) + + +dnl Output for user info AC_OUTPUT echo "" From 51f35ffc1ed04c192e1954f055b0986c31041665 Mon Sep 17 00:00:00 2001 From: Maik Greubel Date: Sun, 17 May 2015 19:24:42 +0200 Subject: [PATCH 5/5] Update and rename README to README.md --- README | 1 - README.md | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 8b13789..0000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ - diff --git a/README.md b/README.md new file mode 100644 index 0000000..91503d2 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ + +This project is unmaintained and I will delete it soon. If someone like it, please fork. +==