Hello community,
here is the log from the commit of package gecko-sharp2
checked in at Sat Jul 14 18:05:07 CEST 2007.
--------
--- GNOME/gecko-sharp2/gecko-sharp2.changes 2007-06-14 02:40:44.000000000 +0200
+++ /mounts/work_src_done/NOARCH/gecko-sharp2/gecko-sharp2.changes 2007-07-14 18:01:40.142177000 +0200
@@ -1,0 +2,11 @@
+Fri Jul 06 18:06:25 MST 2007 - wberrier@novell.com
+
+- Update to 0.12
+ -Depend on monodoc-core instead of mono-tools to break cyclic dep
+ -Resolve naming conflicts in automake files
+ -Remove upstreamed patches:
+ gecko-sharp2-r69353_break_cyclic_dep.patch
+ gecko-sharp2-r69372_fix_autoconf_docdir.patch
+
+
+-------------------------------------------------------------------
Old:
----
gecko-sharp-2.0-0.11.tar.gz
gecko-sharp2-r69353_break_cyclic_dep.patch
gecko-sharp2-r69372_fix_autoconf_docdir.patch
New:
----
gecko-sharp-2.0-0.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gecko-sharp2.spec ++++++
--- /var/tmp/diff_new_pack.l30441/_old 2007-07-14 18:04:57.000000000 +0200
+++ /var/tmp/diff_new_pack.l30441/_new 2007-07-14 18:04:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gecko-sharp2 (Version 0.11)
+# spec file for package gecko-sharp2 (Version 0.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,14 +12,12 @@
Name: gecko-sharp2
BuildRequires: gtk-sharp2 gtk-sharp2-gapi gtk2-devel mono-devel monodoc-core
-Version: 0.11
-Release: 113
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), MOZILLA PUBLIC LICENSE (MPL/NPL)
+Version: 0.12
+Release: 1
+License: LGPL v2 or later, MOZILLA PUBLIC LICENSE (MPL/NPL)
BuildArch: noarch
URL: www.monodevelop.com
Source0: gecko-sharp-2.0-%{version}.tar.gz
-Patch0: gecko-sharp2-r69353_break_cyclic_dep.patch
-Patch1: gecko-sharp2-r69372_fix_autoconf_docdir.patch
Summary: Gecko bindings for Mono
Group: Development/Libraries/Other
Provides: gecko-sharp-2_0 gecko-sharp2-docs
@@ -80,12 +78,9 @@
%prep
%setup -q -n gecko-sharp-2.0-%{version}
-%patch0
-%patch1
%build
%{?env_options}
-autoreconf -fi
./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var
%install
@@ -114,6 +109,13 @@
%endif
%changelog
+* Fri Jul 06 2007 - wberrier@novell.com
+- Update to 0.12
+ -Depend on monodoc-core instead of mono-tools to break cyclic dep
+ -Resolve naming conflicts in automake files
+ -Remove upstreamed patches:
+ gecko-sharp2-r69353_break_cyclic_dep.patch
+ gecko-sharp2-r69372_fix_autoconf_docdir.patch
* Wed Apr 11 2007 - wberrier@novell.com
- Add mono dep/req for older distros
* Wed Jan 03 2007 - wberrier@suse.de
++++++ gecko-sharp-2.0-0.11.tar.gz -> gecko-sharp-2.0-0.12.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/ChangeLog new/gecko-sharp-2.0-0.12/ChangeLog
--- old/gecko-sharp-2.0-0.11/ChangeLog 2005-05-14 22:06:02.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/ChangeLog 2006-12-22 20:57:47.000000000 +0100
@@ -1,3 +1,25 @@
+2006-12-22 Wade Berrier
+
+ * configure.in: version bump -> 0.12
+
+2006-12-11 Wade Berrier
+
+ * configure.in: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
+2006-04-13 Zac Bowling
+
+ * sample/Makefile.am: added Glib to WebThumbnailer
+ * sample/WebThumbnailer.cs: Add timming hacks and updated save
+ function (Savev seems broken, but Save is better). Fixed other minor
+ issues.
+ * sample/webthumbnailer.sh: Added, detects mozilla/firefox directory
+ to find libgtkembedmoz.so
+ * sample/gtkmoztest.sh: Added, detects mozilla/firefox directory to
+ find libgtkembedmoz.so
+ * sample/MozWindow.cs: updated GTK# to not use obsolete toolbar
+ functions
+
2005-05-14 Ben Maurer
* configure.in: Bump for release and tag.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/configure new/gecko-sharp-2.0-0.12/configure
--- old/gecko-sharp-2.0-0.11/configure 2005-09-09 06:07:32.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/configure 2006-12-22 20:57:51.000000000 +0100
@@ -272,7 +272,7 @@
PACKAGE_BUGREPORT=
ac_unique_file="README"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT API_VERSION MONO MCS PATH LD_LIBRARY_PATH PKG_CONFIG BUILD_GTK_CFLAGS BUILD_GTK_LIBS BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC LIB_PREFIX LIB_SUFFIX GTK_SHARP_CFLAGS GTK_SHARP_LIBS GAPI_CFLAGS GAPI_LIBS MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOC ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE GACUTIL GACUTIL_FLAGS WINBUILD_TRUE WINBUILD_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT API_VERSION MONO MCS PATH LD_LIBRARY_PATH PKG_CONFIG BUILD_GTK_CFLAGS BUILD_GTK_LIBS BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC LIB_PREFIX LIB_SUFFIX GTK_SHARP_CFLAGS GTK_SHARP_LIBS GAPI_CFLAGS GAPI_LIBS MONODOC_REQUIRED_VERSION MONODOC_DEPENDENCY_CFLAGS MONODOC_DEPENDENCY_LIBS MONODOCER ENABLE_MONODOC_TRUE ENABLE_MONODOC_FALSE GACUTIL GACUTIL_FLAGS WINBUILD_TRUE WINBUILD_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1620,7 +1620,7 @@
# Define the identity of the package.
PACKAGE=gecko-sharp-2.0
- VERSION=0.11
+ VERSION=0.12
cat >>confdefs.h <<_ACEOF
@@ -2587,16 +2587,16 @@
if test "x$enable_monodoc" = "xyes"; then
- # Extract the first word of "monodoc", so it can be a program name with args.
-set dummy monodoc; ac_word=$2
+ # Extract the first word of "monodocer", so it can be a program name with args.
+set dummy monodocer; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MONODOC+set}" = set; then
+if test "${ac_cv_path_MONODOCER+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $MONODOC in
+ case $MONODOCER in
[\\/]* | ?:[\\/]*)
- ac_cv_path_MONODOC="$MONODOC" # Let the user override the test with a path.
+ ac_cv_path_MONODOCER="$MONODOCER" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2606,32 +2606,32 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MONODOC="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_MONODOCER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
- test -z "$ac_cv_path_MONODOC" && ac_cv_path_MONODOC="no"
+ test -z "$ac_cv_path_MONODOCER" && ac_cv_path_MONODOCER="no"
;;
esac
fi
-MONODOC=$ac_cv_path_MONODOC
+MONODOCER=$ac_cv_path_MONODOCER
-if test -n "$MONODOC"; then
- echo "$as_me:$LINENO: result: $MONODOC" >&5
-echo "${ECHO_T}$MONODOC" >&6
+if test -n "$MONODOCER"; then
+ echo "$as_me:$LINENO: result: $MONODOCER" >&5
+echo "${ECHO_T}$MONODOCER" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- if test x$MONODOC = xno; then
+ if test x$MONODOCER = xno; then
enable_monodoc=no
fi
else
- MONODOC=
+ MONODOCER=
fi
@@ -3439,7 +3439,7 @@
s,@MONODOC_REQUIRED_VERSION@,$MONODOC_REQUIRED_VERSION,;t t
s,@MONODOC_DEPENDENCY_CFLAGS@,$MONODOC_DEPENDENCY_CFLAGS,;t t
s,@MONODOC_DEPENDENCY_LIBS@,$MONODOC_DEPENDENCY_LIBS,;t t
-s,@MONODOC@,$MONODOC,;t t
+s,@MONODOCER@,$MONODOCER,;t t
s,@ENABLE_MONODOC_TRUE@,$ENABLE_MONODOC_TRUE,;t t
s,@ENABLE_MONODOC_FALSE@,$ENABLE_MONODOC_FALSE,;t t
s,@GACUTIL@,$GACUTIL,;t t
@@ -3722,7 +3722,7 @@
echo ""
echo " * Installation prefix: $prefix"
echo " * compiler: $CSC"
-echo " * Documentation: $enable_monodoc ($MONODOC)"
+echo " * Documentation: $enable_monodoc ($MONODOCER)"
echo ""
echo "---"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/configure.in new/gecko-sharp-2.0-0.12/configure.in
--- old/gecko-sharp-2.0-0.11/configure.in 2005-09-09 05:05:18.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/configure.in 2006-12-22 20:57:47.000000000 +0100
@@ -1,6 +1,6 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gecko-sharp-2.0, 0.11)
+AM_INIT_AUTOMAKE(gecko-sharp-2.0, 0.12)
AM_MAINTAINER_MODE
API_VERSION=2.0.0.0
@@ -108,15 +108,15 @@
PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
if test "x$enable_monodoc" = "xyes"; then
- AC_PATH_PROG(MONODOC, monodoc, no)
- if test x$MONODOC = xno; then
+ AC_PATH_PROG(MONODOCER, monodocer, no)
+ if test x$MONODOCER = xno; then
enable_monodoc=no
fi
else
- MONODOC=
+ MONODOCER=
fi
-AC_SUBST(MONODOC)
+AC_SUBST(MONODOCER)
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
@@ -154,7 +154,7 @@
echo ""
echo " * Installation prefix: $prefix"
echo " * compiler: $CSC"
-echo " * Documentation: $enable_monodoc ($MONODOC)"
+echo " * Documentation: $enable_monodoc ($MONODOCER)"
echo ""
echo "---"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/doc/ChangeLog new/gecko-sharp-2.0-0.12/doc/ChangeLog
--- old/gecko-sharp-2.0-0.11/doc/ChangeLog 2005-09-09 06:11:51.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/doc/ChangeLog 2006-12-22 20:57:47.000000000 +0100
@@ -1,3 +1,13 @@
+2006-12-11 Wade Berrier
+
+ * Makefile.am: rename some vars: docdir -> monodocdir
+ as 'docdir' is overwritten with newer autofoo versions
+
+2006-12-11 Wade Berrier
+
+ * Makefile.am: use monodocer instead of monodoc to break
+ cyclic dep on mono-tools
+
2005-09-08 Wade Berrier
* Makefile.am: don't use pkgconfig for monodoc location
Files old/gecko-sharp-2.0-0.11/doc/gecko-sharp-docs.zip and new/gecko-sharp-2.0-0.12/doc/gecko-sharp-docs.zip differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/doc/Makefile.am new/gecko-sharp-2.0-0.12/doc/Makefile.am
--- old/gecko-sharp-2.0-0.11/doc/Makefile.am 2005-09-09 06:11:51.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/doc/Makefile.am 2006-12-22 20:57:47.000000000 +0100
@@ -1,18 +1,18 @@
if ENABLE_MONODOC
-docdir = $(prefix)/lib/monodoc/sources
-doc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
+monodocdir = $(prefix)/lib/monodoc/sources
+monodoc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
endif
noinst_DATA = $(TARGETS)
ASSEMBLER = mdassembler
-UPDATER = $(MONODOC) --update
gecko-sharp-docs.zip gecko-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(ASSEMBLER) --ecma $(srcdir)/en -o gecko-sharp-docs
update:
- $(UPDATER) ../gtkmozembed-sharp/gecko-sharp.dll -o ./en -f
+ rm -Rf ./en/Gecko/* ./en/GtkSharp.GeckoSharp/*
+ $(MONODOCER) -updateto:./en -path:. -assembly:../gtkmozembed/gecko-sharp.dll
CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/doc/Makefile.in new/gecko-sharp-2.0-0.12/doc/Makefile.in
--- old/gecko-sharp-2.0-0.11/doc/Makefile.in 2005-09-09 06:07:31.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/doc/Makefile.in 2006-12-22 20:57:50.000000000 +0100
@@ -54,9 +54,9 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(docdir)"
-docDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(doc_DATA) $(noinst_DATA)
+am__installdirs = "$(DESTDIR)$(monodocdir)"
+monodocDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(monodoc_DATA) $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -99,7 +99,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MONO = @MONO@
-MONODOC = @MONODOC@
+MONODOCER = @MONODOCER@
MONODOC_DEPENDENCY_CFLAGS = @MONODOC_DEPENDENCY_CFLAGS@
MONODOC_DEPENDENCY_LIBS = @MONODOC_DEPENDENCY_LIBS@
MONODOC_REQUIRED_VERSION = @MONODOC_REQUIRED_VERSION@
@@ -157,11 +157,10 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-@ENABLE_MONODOC_TRUE@docdir = $(prefix)/lib/monodoc/sources
-@ENABLE_MONODOC_TRUE@doc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
+@ENABLE_MONODOC_TRUE@monodocdir = $(prefix)/lib/monodoc/sources
+@ENABLE_MONODOC_TRUE@monodoc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source
noinst_DATA = $(TARGETS)
ASSEMBLER = mdassembler
-UPDATER = $(MONODOC) --update
CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree
EXTRA_DIST = gecko-sharp-docs.source gecko-sharp-docs.tree gecko-sharp-docs.zip
all: all-am
@@ -197,22 +196,22 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
-install-docDATA: $(doc_DATA)
+install-monodocDATA: $(monodoc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- @list='$(doc_DATA)'; for p in $$list; do \
+ test -z "$(monodocdir)" || $(mkdir_p) "$(DESTDIR)$(monodocdir)"
+ @list='$(monodoc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ echo " $(monodocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(monodocdir)/$$f'"; \
+ $(monodocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(monodocdir)/$$f"; \
done
-uninstall-docDATA:
+uninstall-monodocDATA:
@$(NORMAL_UNINSTALL)
- @list='$(doc_DATA)'; for p in $$list; do \
+ @list='$(monodoc_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
- rm -f "$(DESTDIR)$(docdir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(monodocdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(monodocdir)/$$f"; \
done
tags: TAGS
TAGS:
@@ -255,7 +254,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(docdir)"; do \
+ for dir in "$(DESTDIR)$(monodocdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -301,7 +300,7 @@
info-am:
-install-data-am: install-docDATA
+install-data-am: install-monodocDATA
install-exec-am:
@@ -327,24 +326,25 @@
ps-am:
-uninstall-am: uninstall-docDATA uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-monodocDATA
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-data install-data-am \
- install-docDATA install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-exec install-exec-am install-info install-info-am \
+ install-man install-monodocDATA install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-docDATA \
- uninstall-info-am
+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+ uninstall-monodocDATA
gecko-sharp-docs.zip gecko-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(ASSEMBLER) --ecma $(srcdir)/en -o gecko-sharp-docs
update:
- $(UPDATER) ../gtkmozembed-sharp/gecko-sharp.dll -o ./en -f
+ rm -Rf ./en/Gecko/* ./en/GtkSharp.GeckoSharp/*
+ $(MONODOCER) -updateto:./en -path:. -assembly:../gtkmozembed/gecko-sharp.dll
dist-hook:
mkdir -p $(distdir)/en
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/gecko-sharp-2.0.pc new/gecko-sharp-2.0-0.12/gecko-sharp-2.0.pc
--- old/gecko-sharp-2.0-0.11/gecko-sharp-2.0.pc 2005-09-09 06:07:34.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/gecko-sharp-2.0.pc 2006-12-22 20:57:53.000000000 +0100
@@ -4,6 +4,6 @@
Name: Gecko#
Description: Gecko# - A Gtk# Mozilla binding
-Version: 0.11
+Version: 0.12
Requires: gtk-sharp-2.0
Libs: -r:${prefix}/lib/mono/gecko-sharp-2.0/gecko-sharp.dll
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/gtkmozembed/Makefile.in new/gecko-sharp-2.0-0.12/gtkmozembed/Makefile.in
--- old/gecko-sharp-2.0-0.11/gtkmozembed/Makefile.in 2005-09-09 06:07:31.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/gtkmozembed/Makefile.in 2006-12-22 20:57:50.000000000 +0100
@@ -91,7 +91,7 @@
MAKEINFO = @MAKEINFO@
MCS = mcs
MONO = @MONO@
-MONODOC = @MONODOC@
+MONODOCER = @MONODOCER@
MONODOC_DEPENDENCY_CFLAGS = @MONODOC_DEPENDENCY_CFLAGS@
MONODOC_DEPENDENCY_LIBS = @MONODOC_DEPENDENCY_LIBS@
MONODOC_REQUIRED_VERSION = @MONODOC_REQUIRED_VERSION@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/Makefile.in new/gecko-sharp-2.0-0.12/Makefile.in
--- old/gecko-sharp-2.0-0.11/Makefile.in 2005-09-09 06:07:32.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/Makefile.in 2006-12-22 20:57:51.000000000 +0100
@@ -122,7 +122,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MONO = @MONO@
-MONODOC = @MONODOC@
+MONODOCER = @MONODOCER@
MONODOC_DEPENDENCY_CFLAGS = @MONODOC_DEPENDENCY_CFLAGS@
MONODOC_DEPENDENCY_LIBS = @MONODOC_DEPENDENCY_LIBS@
MONODOC_REQUIRED_VERSION = @MONODOC_REQUIRED_VERSION@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/sample/Makefile.am new/gecko-sharp-2.0-0.12/sample/Makefile.am
--- old/gecko-sharp-2.0-0.11/sample/Makefile.am 2005-05-14 01:08:25.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/sample/Makefile.am 2006-12-22 20:57:46.000000000 +0100
@@ -15,5 +15,6 @@
WebThumbnailer.exe: $(srcdir)/WebThumbnailer.cs
$(MCS) -lib:@top_builddir@/gtkmozembed \
-r:gecko-sharp.dll \
+ -pkg:glib-sharp-2.0 \
-pkg:gtk-sharp-2.0 $(srcdir)/WebThumbnailer.cs \
-out:WebThumbnailer.exe
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/sample/Makefile.in new/gecko-sharp-2.0-0.12/sample/Makefile.in
--- old/gecko-sharp-2.0-0.11/sample/Makefile.in 2005-09-09 06:07:31.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/sample/Makefile.in 2006-12-22 20:57:51.000000000 +0100
@@ -88,7 +88,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MONO = @MONO@
-MONODOC = @MONODOC@
+MONODOCER = @MONODOCER@
MONODOC_DEPENDENCY_CFLAGS = @MONODOC_DEPENDENCY_CFLAGS@
MONODOC_DEPENDENCY_LIBS = @MONODOC_DEPENDENCY_LIBS@
MONODOC_REQUIRED_VERSION = @MONODOC_REQUIRED_VERSION@
@@ -314,6 +314,7 @@
WebThumbnailer.exe: $(srcdir)/WebThumbnailer.cs
$(MCS) -lib:@top_builddir@/gtkmozembed \
-r:gecko-sharp.dll \
+ -pkg:glib-sharp-2.0 \
-pkg:gtk-sharp-2.0 $(srcdir)/WebThumbnailer.cs \
-out:WebThumbnailer.exe
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/sample/MozWindow.cs new/gecko-sharp-2.0-0.12/sample/MozWindow.cs
--- old/gecko-sharp-2.0-0.11/sample/MozWindow.cs 2004-03-25 06:47:39.000000000 +0100
+++ new/gecko-sharp-2.0-0.12/sample/MozWindow.cs 2006-12-22 20:57:46.000000000 +0100
@@ -100,20 +100,29 @@
Toolbar toolbar = new Toolbar();
toolbar.ToolbarStyle = ToolbarStyle.Both;
toolbar.Orientation = Orientation.Horizontal;
+ toolbar.ShowArrow = false;
hbox.PackStart(toolbar, false, false, 0);
- toolbar.AppendItem("Go Back", "Go Back", "Go Back",
- new Label("Go Back"), new SignalFunc (back_clicked_cb));
-
- toolbar.AppendItem("Stop", "Stop", "Stop",
- new Label("Stop"), new SignalFunc (stop_clicked_cb));
-
- toolbar.AppendItem("Forward", "Go Forward", "Go Forward",
- new Label("Go Forward"), new SignalFunc (forward_clicked_cb));
-
- toolbar.AppendItem("Reload", "Reload", "Reload",
- new Label("Reload"), new SignalFunc (reload_clicked_cb));
-
+ ToolButton backButton = new ToolButton("Go Back");
+ backButton.Clicked += new EventHandler (back_clicked_cb);
+ backButton.Label = "Go Back";
+ toolbar.Insert(backButton, -1);
+
+ ToolButton stopButton = new ToolButton("Stop");
+ stopButton.Clicked += new EventHandler (stop_clicked_cb);
+ stopButton.Label = "Stop";
+ toolbar.Insert(stopButton, -1);
+
+ ToolButton forwardButton = new ToolButton("Forward");
+ forwardButton.Clicked += new EventHandler (forward_clicked_cb);
+ forwardButton.Label = "Forward";
+ toolbar.Insert(forwardButton, -1);
+
+ ToolButton reloadButton = new ToolButton("Reload");
+ reloadButton.Clicked += new EventHandler (reload_clicked_cb);
+ reloadButton.Label = "Reload";
+ toolbar.Insert(reloadButton, -1);
+
editbox = new Entry();
editbox.Activated += new EventHandler(entry_act);
hbox.PackStart (editbox, true, true, 0);
@@ -259,22 +268,22 @@
moz.LoadUrl(editbox.Text);
}
- void back_clicked_cb ()
+ void back_clicked_cb (object obj, EventArgs args)
{
moz.GoBack();
}
- void stop_clicked_cb ()
+ void stop_clicked_cb (object obj, EventArgs args)
{
moz.StopLoad();
}
- void forward_clicked_cb ()
+ void forward_clicked_cb (object obj, EventArgs args)
{
moz.GoForward();
}
- void reload_clicked_cb ()
+ void reload_clicked_cb (object obj, EventArgs args)
{
moz.Reload(0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/sample/WebThumbnailer.cs new/gecko-sharp-2.0-0.12/sample/WebThumbnailer.cs
--- old/gecko-sharp-2.0-0.11/sample/WebThumbnailer.cs 2004-06-14 18:25:39.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/sample/WebThumbnailer.cs 2006-12-22 20:57:46.000000000 +0100
@@ -11,11 +11,12 @@
using System;
using Gtk;
using Gecko;
+using GLib;
class X {
static WebControl wc;
- static string output = "shot.png";
- static string url;
+ static string output = null;
+ static string url = null;
static int width = -1;
static int height = -1;
@@ -56,33 +57,42 @@
}
if (url == null)
Help ();
+ if (output == null)
+ output = "shot.png";
Application.Init();
Window w = new Window ("test");
wc = new WebControl ();
wc.LoadUrl (args [0]);
- wc.NetStop += MakeShot;
wc.Show ();
+ wc.LocChange += WaitABit;
wc.SetSizeRequest (1024, 768);
w.Add (wc);
w.ShowAll ();
+ //GLib.Timeout.Add(700, new TimeoutHandler(MakeShot));
Application.Run();
}
static void Help ()
{
- Console.WriteLine ("Usage is: webshot [-width N] [-height N] url [shot]");
+ Console.WriteLine ("Usage is: WebThumbnailer [-width N] [-height N] url [shot]");
Environment.Exit (0);
}
- static void MakeShot (object sender, EventArgs a)
+ static void WaitABit (object sender, EventArgs e)
{
+ GLib.Timeout.Add(1000, new TimeoutHandler(MakeShot));
+ }
+
+ static bool MakeShot ()
+ {
+ Console.WriteLine(wc.Location);
Gdk.Window win = wc.GdkWindow;
int iwidth = wc.Allocation.Width;
int iheight = wc.Allocation.Height;
Gdk.Pixbuf p = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, false, 8, iwidth, iheight);
Gdk.Pixbuf scaled;
-
+
p.GetFromDrawable (win, win.Colormap, 0, 0, 0, 0, iwidth, iheight);
if (width == -1){
if (height == -1)
@@ -95,8 +105,9 @@
else
scaled = p.ScaleSimple (width, height, Gdk.InterpType.Hyper);
}
-
- scaled.Savev (output, "png", null, null);
- Application.Quit ();
+
+ scaled.Save (output, "png");
+ Application.Quit ();
+ return true;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gecko-sharp-2.0-0.11/sources/Makefile.in new/gecko-sharp-2.0-0.12/sources/Makefile.in
--- old/gecko-sharp-2.0-0.11/sources/Makefile.in 2005-09-09 06:07:31.000000000 +0200
+++ new/gecko-sharp-2.0-0.12/sources/Makefile.in 2006-12-22 20:57:51.000000000 +0100
@@ -88,7 +88,7 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MONO = @MONO@
-MONODOC = @MONODOC@
+MONODOCER = @MONODOCER@
MONODOC_DEPENDENCY_CFLAGS = @MONODOC_DEPENDENCY_CFLAGS@
MONODOC_DEPENDENCY_LIBS = @MONODOC_DEPENDENCY_LIBS@
MONODOC_REQUIRED_VERSION = @MONODOC_REQUIRED_VERSION@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org