Hello community, here is the log from the commit of package gtksourceview-sharp2 checked in at Thu Mar 27 21:26:47 CET 2008. -------- --- GNOME/gtksourceview-sharp2/gtksourceview-sharp2.changes 2007-08-16 23:58:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/gtksourceview-sharp2/gtksourceview-sharp2.changes 2008-03-26 18:43:06.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 26 15:56:57 MST 2008 - wberrier@novell.com + +- Update to 0.12 (new gtk# requires this version) + +------------------------------------------------------------------- Old: ---- gtksourceview-sharp-2.0-0.11.tar.bz2 New: ---- gtksourceview-sharp-2.0-0.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtksourceview-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.o32379/_old 2008-03-27 21:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.o32379/_new 2008-03-27 21:24:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gtksourceview-sharp2 (Version 0.11) +# spec file for package gtksourceview-sharp2 (Version 0.12) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,13 +10,14 @@ # norootforbuild + Name: gtksourceview-sharp2 BuildRequires: gnome-sharp2 gtk-sharp2-gapi gtksourceview-devel mono-devel monodoc-core -Version: 0.11 -Release: 19 +Version: 0.12 +Release: 1 License: GPL v2 or later BuildArch: noarch -URL: http://www.go-mono.org/ +Url: http://www.go-mono.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gtksourceview-sharp-2.0-%{version}.tar.bz2 Summary: GtkSourceView bindings for Mono @@ -25,17 +26,13 @@ #Requires: gtksourceview >= 1.0 glib-sharp2 gnome-sharp2 Provides: gtksourceview-sharp-2_0 Obsoletes: gtksourceview-sharp-2_0 -AutoReqprov: on +AutoReqProv: on # suse's gnome went from /opt/gnome to /usr, act accordingly %define gtksourceview_prefix %(pkg-config --variable=prefix gtksourceview-1.0) %if 0%{?suse_version} %if %suse_version >= 1030 BuildRequires: -gtksourceview-devel gtksourceview18-devel %endif -# So that .config references can be resolved... -%if %suse_version == 1000 -BuildRequires: gtksourceview -%endif %endif # Fedora options (Bug in fedora images where 'abuild' user is the same id as 'nobody') %if 0%{?fedora_version} @@ -83,68 +80,67 @@ %{_prefix}/lib/mono/gtksourceview-sharp-2.0 %{_prefix}/share/pkgconfig/gtksourceview-sharp-2.0.pc %{_prefix}/share/gapi-2.0/gtksourceview-api.xml -%{_prefix}/lib/monodoc -# auto dep/req generation for older distros (it will take a while for the .config scanning to get upstream) -%if 0%{?suse_version} <= 1040 || 0%{?fedora_version} <= 7 -%if 0%{?fedora_version} +%{_prefix}/lib/monodoc/sources/gtksourceview-sharp-docs* +%if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' -%endif %changelog -* Thu Aug 16 2007 - wberrier@suse.de +* Tue Feb 26 2008 wberrier@novell.com +- Update to 0.12 (new gtk# requires this version) +* Thu Aug 16 2007 wberrier@suse.de - add noarch again (even though this package depends on binary libraries, the package itself contains no architecture dependant code, and can run on any platform where mono runs) - Update to use gtksourceview18 package (this package hasn't been ported to use 1.9 yet) -* Tue Jun 12 2007 - ro@suse.de +* Tue Jun 12 2007 ro@suse.de - remove noarch: this package depends on binary libraries -* Wed Jun 06 2007 - wberrier@novell.com +* Wed Jun 06 2007 wberrier@novell.com - remove upstream patch (also remove autoreconf, since there's no patches) - Update to 0.11 -removes circular dependency on 'monodoc' in mono-tools -updated samples -* Wed May 16 2007 - wberrier@novell.com +* Wed May 16 2007 wberrier@novell.com - Fix BuildRequires for suse 10.0 (so .config can be resolved) -* Wed Apr 11 2007 - wberrier@novell.com +* Wed Apr 11 2007 wberrier@novell.com - Add mono dep/req for older distros -* Sat Apr 07 2007 - wberrier@novell.com +* Fri Apr 06 2007 wberrier@novell.com - Adapt for buildservice, add monodoc patch so only monodoc-core is needed, not mono-tools. Clean up BuildRequires some more. -* Mon Feb 12 2007 - aj@suse.de +* Mon Feb 12 2007 aj@suse.de - Remove unneeded BuildRequires. -* Thu Jan 25 2007 - ro@suse.de +* Wed Jan 24 2007 ro@suse.de - GNOME moved to /usr -* Fri Oct 20 2006 - ro@suse.de +* Thu Oct 19 2006 ro@suse.de - added mono-devel to buildrequires -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 13 2006 - gekker@suse.de +* Fri Jan 13 2006 gekker@suse.de - Fixup nfb and Requires for new gtk-sharp2 packaging -* Thu Nov 17 2005 - wberrier@suse.de +* Wed Nov 16 2005 wberrier@suse.de - Remove icu deps -* Fri Oct 21 2005 - ro@suse.de +* Thu Oct 20 2005 ro@suse.de - rename package, provide and obsolete old name -* Thu Sep 22 2005 - ro@suse.de +* Thu Sep 22 2005 ro@suse.de - added norootforbuild -* Wed Sep 21 2005 - wberrier@suse.de +* Wed Sep 21 2005 wberrier@suse.de - Use the buildroot and package the docs for monodoc (bug #116196) -* Sat Sep 17 2005 - wberrier@suse.de +* Fri Sep 16 2005 wberrier@suse.de - Only package correct files (Bug #116196) -* Fri Aug 26 2005 - ro@suse.de +* Fri Aug 26 2005 ro@suse.de - nfb: monodoc -> monodoc-core -* Mon Aug 15 2005 - aj@suse.de +* Mon Aug 15 2005 aj@suse.de - Require 2.6.13 or newer kernel. -* Sun Aug 14 2005 - aj@suse.de +* Sun Aug 14 2005 aj@suse.de - Add check-build.sh script. -* Mon Aug 08 2005 - ro@suse.de +* Sun Aug 07 2005 ro@suse.de - fix location of pkgconfig files -* Mon Aug 08 2005 - ro@suse.de +* Sun Aug 07 2005 ro@suse.de - rename package to gtksourceview-sharp-2_0 (no "." allowed in name) -* Thu Aug 04 2005 - wberrier@suse.de +* Thu Aug 04 2005 wberrier@suse.de - Initial package ++++++ gtksourceview-sharp-2.0-0.11.tar.bz2 -> gtksourceview-sharp-2.0-0.12.tar.bz2 ++++++ ++++ 3023 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/ChangeLog new/gtksourceview-sharp-2.0-0.12/ChangeLog --- old/gtksourceview-sharp-2.0-0.11/ChangeLog 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/ChangeLog 2008-02-27 00:30:05.000000000 +0100 @@ -1,3 +1,23 @@ +2008-02-26 Wade Berrier <wberrier@novell.com> + + * configure.in: version bump -> 0.12 + +2007-12-03 Mike Kestner <mkestner@novell.com> + + * gtksourceview/Gtk.metadata: hide SourcePrintJob.SetupFromView. + * gtksourceview/Makefile.am: dependencies for fixup and new custom. + * gtksourceview/SourcePrintJob.custom: obsolete compat member + and SetupFromView manual impl for new generator versions. + * sample/PrintSample.cs: update to corrected SetupFromView. + +2007-11-08 Mike Kestner <mkestner@novell.com> + + * gtksourceview/SourceStyleSchemeAdapter.custom: new custom + property needed because of the custom interface prop. This + should be reworked in 2.0 to use element_type attrs in the + api to automatically do all this without customizations. + [Fixes #336541] + 2007-04-20 Wade Berrier <wberrier@novell.com> * configure.in: version bump -> 0.11 (been too long) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/configure.in new/gtksourceview-sharp-2.0-0.12/configure.in --- old/gtksourceview-sharp-2.0-0.11/configure.in 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/configure.in 2008-02-27 00:30:05.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(README) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gtksourceview-sharp-2.0, 0.11) +AM_INIT_AUTOMAKE(gtksourceview-sharp-2.0, 0.12) AM_MAINTAINER_MODE dnl Defines CC to avoid warnings diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/doc/en/GtkSourceView/SourceLanguagesManager.xml new/gtksourceview-sharp-2.0-0.12/doc/en/GtkSourceView/SourceLanguagesManager.xml --- old/gtksourceview-sharp-2.0-0.11/doc/en/GtkSourceView/SourceLanguagesManager.xml 2007-04-20 20:31:00.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/doc/en/GtkSourceView/SourceLanguagesManager.xml 2008-02-27 00:30:12.000000000 +0100 @@ -10,7 +10,7 @@ </AssemblyInfo> <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement> <Docs> - <summary>To be added</summary> + <summary>This class contains the default collection of <see cref="T:GtkSourceView.SourceLanguage" /> objects.</summary> <remarks>To be added</remarks> </Docs> <Base> @@ -88,7 +88,7 @@ <ReturnValue /> <Parameters /> <Docs> - <summary>To be added</summary> + <summary>Constructs and initializes a new instance of <see cref="T:GtkSourceView.SourceLanguagesManager" /> containing the default language definitions.</summary> <returns>a <see cref="T:GtkSourceView.SourceLanguagesManager" /></returns> <remarks>To be added</remarks> </Docs> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/doc/en/GtkSourceView/SourceView.xml new/gtksourceview-sharp-2.0-0.12/doc/en/GtkSourceView/SourceView.xml --- old/gtksourceview-sharp-2.0-0.11/doc/en/GtkSourceView/SourceView.xml 2007-04-20 20:31:00.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/doc/en/GtkSourceView/SourceView.xml 2008-02-27 00:30:12.000000000 +0100 @@ -10,8 +10,59 @@ </AssemblyInfo> <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement> <Docs> - <summary>To be added</summary> - <remarks>To be added</remarks> + <summary>This class extends <see cref="T:Gtk.TextView" />, adding support for syntax highlighting.</summary> + <remarks> + <para>In order to be useful, the internal <see cref="T:GtkSourceView.SourceBuffer" /> must have a <see cref="T:GtkSourceView.SourceLanguage" /> assigned to it. The default languages are stored in a <see cref="T:GtkSourceView.SourceLanguagesManager" />.</para> + <example> + <para>The following example creates an editor that highlights C# code.</para> + <code lang="C#">using Gtk; +using GtkSourceView; + +public class SourceViewExample +{ + public static void Main () + { + // Initialize GTK. + Application.Init (); + + // Create a containing window. + Window window = new Window ("SourceView Example"); + window.DeleteEvent += OnDelete; + window.SetDefaultSize (400, 300); + + // Create the language manager. + SourceLanguagesManager manager = new SourceLanguagesManager (); + + // Get the C# source language definition. + SourceLanguage language = manager.GetLanguageFromMimeType ("text/x-csharp"); + + // Create a buffer for the language and enable highlighting. + SourceBuffer buffer = new SourceBuffer (language); + buffer.Highlight = true; + + // Create a view for the buffer. + SourceView view = new SourceView (buffer); + + // Create a scrolled window and add the view. + ScrolledWindow scrolled_window = new ScrolledWindow (); + scrolled_window.Add (view); + + // Add the scrolled window to the window and show it. + window.Add (scrolled_window); + window.ShowAll (); + + // Run the application. + Application.Run (); + } + + // Quit when the window is closed. + static void OnDelete (object o, DeleteEventArgs e) + { + Application.Quit (); + } +}</code> + </example> + </remarks> </Docs> <Base> <BaseTypeName>Gtk.TextView</BaseTypeName> Files old/gtksourceview-sharp-2.0-0.11/doc/gtksourceview-sharp-docs.zip and new/gtksourceview-sharp-2.0-0.12/doc/gtksourceview-sharp-docs.zip differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/doc/Makefile.am new/gtksourceview-sharp-2.0-0.12/doc/Makefile.am --- old/gtksourceview-sharp-2.0-0.11/doc/Makefile.am 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/doc/Makefile.am 2008-02-27 00:30:05.000000000 +0100 @@ -25,3 +25,6 @@ mkdir -p $(distdir)/en/GtkSourceView cp $(srcdir)/en/GtkSourceView/*.xml $(distdir)/en/GtkSourceView/ + +push: + scp gtksourceview-sharp-docs.* root@www.go-mono.com:/usr/lib/monodoc/sources/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/gtksourceview/Gtk.metadata new/gtksourceview-sharp-2.0-0.12/gtksourceview/Gtk.metadata --- old/gtksourceview-sharp-2.0-0.11/gtksourceview/Gtk.metadata 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/gtksourceview/Gtk.metadata 2008-02-27 00:30:05.000000000 +0100 @@ -13,6 +13,7 @@ <attr path="/api/namespace/object[@cname='GtkSourceLanguage']/method[@name='SetMimeTypes']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GtkSourceLanguage']/method[@name='GetTags']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GtkSourceLanguagesManager']/method[@name='GetAvailableLanguages']" name="hidden">1</attr> + <attr path="/api/namespace/object[@cname='GtkSourcePrintJob']/method[@name='SetupFromView']" name="hidden">1</attr> <attr path="/api/namespace/interface[@cname='GtkSourceStyleScheme']/method[@name='GetStyleNames']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GtkSourceTagTable']/method[@name='AddTags']" name="hidden">1</attr> <attr path="/api/namespace/class[@name='Global']/method[@name='KeywordListTagNew']" name="hidden">1</attr> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/gtksourceview/Makefile.am new/gtksourceview-sharp-2.0-0.12/gtksourceview/Makefile.am --- old/gtksourceview-sharp-2.0-0.11/gtksourceview/Makefile.am 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/gtksourceview/Makefile.am 2008-02-27 00:30:05.000000000 +0100 @@ -15,7 +15,7 @@ all: $(LIBRARY) -gtksourceview-api.xml: +gtksourceview-api.xml: gtksourceview-api.raw Gtk.metadata cp $(srcdir)/gtksourceview-api.raw gtksourceview-api.xml chmod u+w gtksourceview-api.xml $(GAPI_FIXUP) --api=gtksourceview-api.xml --metadata=$(srcdir)/Gtk.metadata @@ -34,7 +34,9 @@ SourceBuffer.custom \ SourceLanguage.custom \ SourceLanguagesManager.custom \ +SourcePrintJob.custom \ SourceStyleScheme.custom \ +SourceStyleSchemeAdapter.custom \ SourceTagTable.custom build_customs = $(addprefix $(srcdir)/, $(customs)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/gtksourceview/SourcePrintJob.custom new/gtksourceview-sharp-2.0-0.12/gtksourceview/SourcePrintJob.custom --- old/gtksourceview-sharp-2.0-0.11/gtksourceview/SourcePrintJob.custom 1970-01-01 01:00:00.000000000 +0100 +++ new/gtksourceview-sharp-2.0-0.12/gtksourceview/SourcePrintJob.custom 2008-02-27 00:30:05.000000000 +0100 @@ -0,0 +1,36 @@ +// SourcePrintJob.custom - Gtk SourcePrintJob class customizations +// +// Author: Mike Kestner (mkestner@novell.com) +// +// Copyright (C) 2007 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete ("Replaced by SetupFromView")] + public GtkSourceView.SourceView upFromView { + set { + gtk_source_print_job_setup_from_view(Handle, value == null ? IntPtr.Zero : value.Handle); + } + } + + [DllImport("gtksourceview-1.0")] + static extern void gtk_source_print_job_setup_from_view(IntPtr raw, IntPtr view); + + public void SetupFromView(GtkSourceView.SourceView view) + { + gtk_source_print_job_setup_from_view(Handle, view == null ? IntPtr.Zero : view.Handle); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/gtksourceview/SourceStyleSchemeAdapter.custom new/gtksourceview-sharp-2.0-0.12/gtksourceview/SourceStyleSchemeAdapter.custom --- old/gtksourceview-sharp-2.0-0.11/gtksourceview/SourceStyleSchemeAdapter.custom 1970-01-01 01:00:00.000000000 +0100 +++ new/gtksourceview-sharp-2.0-0.12/gtksourceview/SourceStyleSchemeAdapter.custom 2008-02-27 00:30:05.000000000 +0100 @@ -0,0 +1,9 @@ + + [DllImport ("libgtksourceview-1.0")] + static extern IntPtr gtk_source_style_scheme_get_style_names (IntPtr handle); + + public string[] StyleNames { + get { + return (string[]) GLib.Marshaller.ListToArray (new GLib.SList (gtk_source_style_scheme_get_style_names (Handle), typeof(string), false, false), typeof (string)); + } + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/missing new/gtksourceview-sharp-2.0-0.12/missing --- old/gtksourceview-sharp-2.0-0.11/missing 2006-11-25 12:29:49.000000000 +0100 +++ new/gtksourceview-sharp-2.0-0.12/missing 2007-09-21 21:03:07.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gtksourceview-sharp-2.0-0.11/sample/PrintSample.cs new/gtksourceview-sharp-2.0-0.12/sample/PrintSample.cs --- old/gtksourceview-sharp-2.0-0.11/sample/PrintSample.cs 2007-04-20 20:30:54.000000000 +0200 +++ new/gtksourceview-sharp-2.0-0.12/sample/PrintSample.cs 2008-02-27 00:30:05.000000000 +0100 @@ -47,8 +47,7 @@ SourcePrintJob spj = new SourcePrintJob (null); // quickly setup the buffer, font and wrapping - // FIXME: should be SetupFromView (view); - spj.upFromView = tv; + spj.SetupFromView (tv); // print line numbers every 5 lines spj.PrintNumbers = 5; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org