[Pkg-mono-svn-commits] rev 3599 - in mono-tools/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Thu Mar 20 15:03:21 UTC 2008
Author: slomo
Date: 2008-03-20 15:03:20 +0000 (Thu, 20 Mar 2008)
New Revision: 3599
Added:
mono-tools/trunk/debian/patches/04_gnome-sharp.patch
Removed:
mono-tools/trunk/debian/patches/04_no-gtkhtml.dpatch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/monodoc-browser.install
mono-tools/trunk/debian/patches/00list
Log:
* debian/control,
debian/monodoc-browser.install,
debian/patches/04_no-gtkhtml.dpatch:
+ Build and ship the GtkHTML backend of monodoc-browser again instead of
the gecko one. This also enabled printing again.
* debian/patches/04_gnome-sharp.patch:
+ Also link to gnome-sharp-2.0 as it's required by gnunit.
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2008-02-18 00:05:58 UTC (rev 3598)
+++ mono-tools/trunk/debian/changelog 2008-03-20 15:03:20 UTC (rev 3599)
@@ -1,3 +1,15 @@
+mono-tools (1.2.6-4) unstable; urgency=low
+
+ * debian/control,
+ debian/monodoc-browser.install,
+ debian/patches/04_no-gtkhtml.dpatch:
+ + Build and ship the GtkHTML backend of monodoc-browser again instead of
+ the gecko one. This also enabled printing again.
+ * debian/patches/04_gnome-sharp.patch:
+ + Also link to gnome-sharp-2.0 as it's required by gnunit.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 20 Mar 2008 16:02:07 +0100
+
mono-tools (1.2.6-3) unstable; urgency=low
[ Sam Hocevar ]
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2008-02-18 00:05:58 UTC (rev 3598)
+++ mono-tools/trunk/debian/control 2008-03-20 15:03:20 UTC (rev 3599)
@@ -4,7 +4,7 @@
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2.6-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), monodoc-base (>= 1.1.9), libxul-dev
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2.6-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), libgnome2.0-cil (>= 2.0), libgtkhtml3.16-cil, monodoc-base (>= 1.1.9), libxul-dev
Standards-Version: 3.7.3
Package: monodoc-browser
Modified: mono-tools/trunk/debian/monodoc-browser.install
===================================================================
--- mono-tools/trunk/debian/monodoc-browser.install 2008-02-18 00:05:58 UTC (rev 3598)
+++ mono-tools/trunk/debian/monodoc-browser.install 2008-03-20 15:03:20 UTC (rev 3599)
@@ -1,5 +1,5 @@
debian/tmp/usr/bin/monodoc
debian/tmp/usr/lib/monodoc/browser.exe
-debian/tmp/usr/lib/monodoc/GeckoHtmlRender.dll
+debian/tmp/usr/lib/monodoc/GtkHtmlHtmlRender.dll
debian/tmp/usr/share/pixmaps/monodoc.png
debian/tmp/usr/share/applications/monodoc.desktop
Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list 2008-02-18 00:05:58 UTC (rev 3598)
+++ mono-tools/trunk/debian/patches/00list 2008-03-20 15:03:20 UTC (rev 3599)
@@ -1,4 +1,4 @@
01_use_real_nunit
02_startup_mono_path
03_mozilla-home.dpatch
-04_no-gtkhtml.dpatch
+04_gnome-sharp.patch
Added: mono-tools/trunk/debian/patches/04_gnome-sharp.patch
===================================================================
--- mono-tools/trunk/debian/patches/04_gnome-sharp.patch (rev 0)
+++ mono-tools/trunk/debian/patches/04_gnome-sharp.patch 2008-03-20 15:03:20 UTC (rev 3599)
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/configure.in.old 2008-03-20 15:59:48.000000000 +0100
++++ mono-tools/configure.in 2008-03-20 15:59:58.000000000 +0100
+@@ -37,7 +37,7 @@
+ AC_SUBST(MONODOC_LIBS)
+
+
+-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0)
++PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0)
+ #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
+ AC_SUBST(GTK_SHARP_LIBS)
+
+--- mono-tools/configure.old 2008-03-20 15:59:51.000000000 +0100
++++ mono-tools/configure 2008-03-20 16:00:35.000000000 +0100
+@@ -3062,12 +3062,12 @@
+ pkg_cv_GTK_SHARP_CFLAGS="$GTK_SHARP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
++ pkg_cv_GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3080,12 +3080,12 @@
+ pkg_cv_GTK_SHARP_LIBS="$GTK_SHARP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
++ pkg_cv_GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3104,14 +3104,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
++ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0"`
+ else
+- GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
++ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_SHARP_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0) were not met:
+
+ $GTK_SHARP_PKG_ERRORS
+
+@@ -3122,7 +3122,7 @@
+ and GTK_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) were not met:
++echo "$as_me: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0) were not met:
+
+ $GTK_SHARP_PKG_ERRORS
+
Deleted: mono-tools/trunk/debian/patches/04_no-gtkhtml.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_no-gtkhtml.dpatch 2008-02-18 00:05:58 UTC (rev 3598)
+++ mono-tools/trunk/debian/patches/04_no-gtkhtml.dpatch 2008-03-20 15:03:20 UTC (rev 3599)
@@ -1,290 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-tools-1.2.4.old/docbrowser/browser.cs 2007-04-20 06:42:46.000000000 +0200
-+++ mono-tools-1.2.4/docbrowser/browser.cs 2007-05-17 13:02:19.000000000 +0200
-@@ -160,7 +160,6 @@
- [Glade.Widget] MenuItem postcomment;
- [Glade.Widget] public MenuItem cut1;
- [Glade.Widget] public MenuItem paste1;
-- [Glade.Widget] public MenuItem print;
- [Glade.Widget] public MenuItem close_tab;
- public Notebook tabs_nb;
- public Tab CurrentTab;
-@@ -423,10 +422,8 @@
- if (CurrentTab.Tab_mode == Mode.Viewer) {
- CurrentTab.history.ActivateCurrent();
- paste1.Sensitive = false;
-- print.Sensitive = true;
- } else {
- paste1.Sensitive = true;
-- print.Sensitive = false;
- }
-
- if (tree_browser.SelectedNode != CurrentTab.CurrentNode)
-@@ -795,33 +792,6 @@
- {
- Application.Quit ();
- }
-- void on_print_activate (object sender, EventArgs e)
-- {
-- // desactivate css temporary
-- if (UseGecko)
-- HelpSource.use_css = false;
--
-- string url = CurrentUrl;
-- string html;
-- Node cur = CurrentTab.CurrentNode;
-- Node n;
--
-- // deal with the two types of urls
-- if (cur.tree.HelpSource != null) {
-- html = cur.tree.HelpSource.GetText (url, out n);
-- if (html == null)
-- html = help_tree.RenderUrl (url, out n);
-- } else {
-- html = help_tree.RenderUrl (url, out n);
-- }
--
-- // sending Html to be printed.
-- if (html != null)
-- CurrentTab.html.Print (html);
--
-- if (UseGecko)
-- HelpSource.use_css = true;
-- }
-
- void OnCommentsActivate (object o, EventArgs args)
- {
-@@ -2417,13 +2387,11 @@
- this.Page = 0;
- browser.cut1.Sensitive = false;
- browser.paste1.Sensitive = false;
-- browser.print.Sensitive = true;
- EditImg.Visible = false;
- } else {
- this.Page = 1;
- browser.cut1.Sensitive = true;
- browser.paste1.Sensitive = true;
-- browser.print.Sensitive = false;
- EditImg.Visible = true;
- }
-
-diff -Naur mono-tools-1.2.4.old/docbrowser/browser.glade mono-tools-1.2.4/docbrowser/browser.glade
---- mono-tools-1.2.4.old/docbrowser/browser.glade 2007-04-20 06:42:46.000000000 +0200
-+++ mono-tools-1.2.4/docbrowser/browser.glade 2007-05-17 13:00:22.000000000 +0200
-@@ -83,28 +83,6 @@
- </child>
-
- <child>
-- <widget class="GtkImageMenuItem" id="print">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">_Print...</property>
-- <property name="use_underline">True</property>
-- <signal name="activate" handler="on_print_activate" last_modification_time="Tue, 30 Aug 2005 05:02:29 GMT"/>
-- <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
--
-- <child internal-child="image">
-- <widget class="GtkImage" id="image119">
-- <property name="visible">True</property>
-- <property name="stock">gtk-print</property>
-- <property name="icon_size">1</property>
-- <property name="xalign">0.5</property>
-- <property name="yalign">0.5</property>
-- <property name="xpad">0</property>
-- <property name="ypad">0</property>
-- </widget>
-- </child>
-- </widget>
-- </child>
--
-- <child>
- <widget class="GtkMenuItem" id="separator2">
- <property name="visible">True</property>
- </widget>
---- mono-tools-1.2.6/configure.in 2007-12-13 14:05:39.000000000 +0100
-+++ mono-tools-1.2.6/configure.in.old 2007-12-13 14:04:39.000000000 +0100
-@@ -42,12 +42,12 @@
- AC_SUBST(GTK_SHARP_LIBS)
-
-
--PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no)
-+PKG_CHECK_MODULES(GTKHTML_SHARP, foobar, enable_gtkhtml=yes, enable_gtkhtml=no)
- if test "x$enable_gtkhtml" = "xyes"; then
- GTKHTMLDLLCOPY=`pkg-config --variable=Libraries gtkhtml-sharp-3.14`
- CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
- else
--PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
-+PKG_CHECK_MODULES(GTKHTML_SHARP, foobar, enable_gtkhtml=yes, enable_gtkhtml=no)
- CSHARP_FLAGS=
- GTKHTMLDLLCOPY=
- fi
---- mono-tools-1.2.6/configure 2007-12-13 14:06:17.000000000 +0100
-+++ mono-tools-1.2.6/configure.old 2007-12-13 14:05:43.000000000 +0100
-@@ -3177,12 +3177,12 @@
- pkg_cv_GTKHTML_SHARP_CFLAGS="$GTKHTML_SHARP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-sharp-3.14\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtkhtml-sharp-3.14") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"foobar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "foobar") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-sharp-3.14" 2>/dev/null`
-+ pkg_cv_GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "foobar" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3195,12 +3195,12 @@
- pkg_cv_GTKHTML_SHARP_LIBS="$GTKHTML_SHARP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-sharp-3.14\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtkhtml-sharp-3.14") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"foobar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "foobar") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "gtkhtml-sharp-3.14" 2>/dev/null`
-+ pkg_cv_GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "foobar" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3219,9 +3219,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkhtml-sharp-3.14"`
-+ GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "foobar"`
- else
-- GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkhtml-sharp-3.14"`
-+ GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "foobar"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTKHTML_SHARP_PKG_ERRORS" >&5
-@@ -3239,7 +3239,7 @@
- enable_gtkhtml=yes
- fi
- if test "x$enable_gtkhtml" = "xyes"; then
--GTKHTMLDLLCOPY=`pkg-config --variable=Libraries gtkhtml-sharp-3.14`
-+GTKHTMLDLLCOPY=`pkg-config --variable=Libraries foobar`
- CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
- else
-
-@@ -3252,12 +3252,12 @@
- pkg_cv_GTKHTML_SHARP_CFLAGS="$GTKHTML_SHARP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-sharp-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtkhtml-sharp-2.0") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"foobar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "foobar") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-sharp-2.0" 2>/dev/null`
-+ pkg_cv_GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "foobar" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3270,12 +3270,12 @@
- pkg_cv_GTKHTML_SHARP_LIBS="$GTKHTML_SHARP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-sharp-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtkhtml-sharp-2.0") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"foobar\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "foobar") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "gtkhtml-sharp-2.0" 2>/dev/null`
-+ pkg_cv_GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "foobar" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3294,9 +3294,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkhtml-sharp-2.0"`
-+ GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "foobar"`
- else
-- GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkhtml-sharp-2.0"`
-+ GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "foobar"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTKHTML_SHARP_PKG_ERRORS" >&5
---- mono-tools-1.2.6/docbrowser/Makefile.am 2007-12-13 14:06:45.000000000 +0100
-+++ mono-tools-1.2.6/docbrowser/Makefile.am.old 2007-12-13 14:06:40.000000000 +0100
-@@ -1,5 +1,5 @@
- monodocdir=$(prefix)/lib/monodoc
--noinst_DATA = admin.exe
-+noinst_DATA =
-
-
- if ENABLE_GECKO
---- mono-tools-1.2.6/docbrowser/Makefile.in 2007-12-13 14:07:00.000000000 +0100
-+++ mono-tools-1.2.6/docbrowser/Makefile.in.old 2007-12-13 14:06:50.000000000 +0100
-@@ -194,7 +194,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- monodocdir = $(prefix)/lib/monodoc
--noinst_DATA = admin.exe
-+noinst_DATA =
- @ENABLE_GECKO_TRUE at GECKO_TARGET = GeckoHtmlRender.dll
- @ENABLE_GTKHTML_TRUE at GECKO_PRINTING_DEF = "-d:USE_GTKHTML_PRINT"
- @ENABLE_GTKHTML_TRUE at GTKHTML_TARGET = GtkHtmlHtmlRender.dll
---- mono-tools-1.2.6/docbrowser/PrintManager.cs.old 2007-12-13 14:16:48.000000000 +0100
-+++ mono-tools-1.2.6/docbrowser/PrintManager.cs 2007-12-13 14:17:39.000000000 +0100
-@@ -14,46 +14,9 @@
- namespace Monodoc {
- class PrintManager {
-
--#if GTKHTML_SHARP_3_14
- public static void Print (string html)
- {
-- new Gtk.HTML (html).PrintOperationRun (new PrintOperation (), PrintOperationAction.PrintDialog, null, null, null, null, null);
- }
--#else
-- // Fallback to the original GNOME Print API.
-- public static void Print (string html)
-- {
-- string caption = "Monodoc Printing";
--
-- Gnome.PrintJob pj = new Gnome.PrintJob (PrintConfig.Default ());
-- PrintDialog dialog = new PrintDialog (pj, caption, 0);
--
-- Gtk.HTML gtk_html = new Gtk.HTML (html);
-- gtk_html.PrintSetMaster (pj);
--
-- Gnome.PrintContext ctx = pj.Context;
-- gtk_html.Print (ctx);
--
-- pj.Close ();
--
-- // hello user
-- int response = dialog.Run ();
--
-- if (response == (int) PrintButtons.Cancel) {
-- dialog.Hide ();
-- dialog.Destroy ();
-- return;
-- } else if (response == (int) PrintButtons.Print) {
-- pj.Print ();
-- } else if (response == (int) PrintButtons.Preview) {
-- new PrintJobPreview (pj, caption).Show ();
-- }
--
-- ctx.Close ();
-- dialog.Hide ();
-- dialog.Destroy ();
-- }
--#endif
- }
- }
-
More information about the Pkg-mono-svn-commits
mailing list