On Wed, 6 Sep 2023 12:50:14 +0200 Bastian Germann <b...@debian.org> wrote:
It should be possible to patch out the gtk2 using packages mono-profiler and
mono-tools-gui.
I have implemented this and am uploading a NMU to DELAYED/10 because the
gtk-sharp2 dependency
will lead to autoremoval of mono-tools.
diff -Nru mono-tools-4.2/debian/changelog mono-tools-4.2/debian/changelog
--- mono-tools-4.2/debian/changelog 2020-12-28 12:16:28.000000000 +0000
+++ mono-tools-4.2/debian/changelog 2023-09-09 07:04:07.000000000 +0000
@@ -1,3 +1,10 @@
+mono-tools (4.2-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop binary packages that depend on gtk-sharp2.
+
+ -- Bastian Germann <b...@debian.org> Sat, 09 Sep 2023 07:04:07 +0000
+
mono-tools (4.2-3.1) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
diff -Nru mono-tools-4.2/debian/control mono-tools-4.2/debian/control
--- mono-tools-4.2/debian/control 2019-02-15 19:51:38.000000000 +0000
+++ mono-tools-4.2/debian/control 2023-09-09 07:04:07.000000000 +0000
@@ -3,19 +3,18 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-gr...@lists.alioth.debian.org>
Uploaders: Mirco Bauer <mee...@debian.org>, Sebastian Dröge <sl...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: cli-common-dev (>= 0.8~exp2~),
+Build-Depends: debhelper (>= 7.0.50~),
+ cli-common-dev,
+ dh-xsp
+Build-Depends-Indep:
pkg-config,
dh-autoreconf,
mono-devel (>= 3.0.6),
zip,
- libgtk2.0-cil-dev (>= 2.0),
- libglade2.0-cil-dev (>= 2.0),
libnunit-cil-dev,
libmono-cecil-cil-dev,
# libwebkit-cil-dev,
monodoc-base (>= 1.1.9),
- dh-xsp,
libglib2.0-dev,
mono-csharp-shell
Standards-Version: 3.9.2
@@ -35,18 +34,6 @@
# .
# This package contains the GTK+ based viewer of the Mono documentation.
-Package: mono-tools-gui
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Replaces: gnunit (<< 1.2.1)
-Description: Various GUI tools for mono
- This package contains various GUI tools for use with Mono:
- - gasnview
- - ilcontrast
- - gui-compare
- - mperfmon
- - gsharp
-
Package: mono-tools-devel
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
@@ -68,15 +55,6 @@
common problems with the code, problems that compiler do not typically
check or have not historically checked.
-Package: mono-profiler
-Architecture: all
-Depends: libmono-profiler, ${cli:Depends}, ${misc:Depends}
-Description: Mono profiler
- This package contains utilities for profiling Mono CLI assemblies:
- - mprof-decoder
- - mprof-heap-viewer
- - emveepee
-
Package: monodoc-http
Provides: monodoc-viewer
Architecture: all
diff -Nru mono-tools-4.2/debian/mono-profiler.install
mono-tools-4.2/debian/mono-profiler.install
--- mono-tools-4.2/debian/mono-profiler.install 2017-02-13 08:25:02.000000000
+0000
+++ mono-tools-4.2/debian/mono-profiler.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/mono-tools/
-debian/tmp/usr/bin/mprof*
-debian/tmp/usr/bin/emveepee*
diff -Nru mono-tools-4.2/debian/mono-profiler.manpages
mono-tools-4.2/debian/mono-profiler.manpages
--- mono-tools-4.2/debian/mono-profiler.manpages 2017-02-13
08:25:02.000000000 +0000
+++ mono-tools-4.2/debian/mono-profiler.manpages 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mprof*
diff -Nru mono-tools-4.2/debian/mono-tools-gui.install
mono-tools-4.2/debian/mono-tools-gui.install
--- mono-tools-4.2/debian/mono-tools-gui.install 2019-02-15
19:51:31.000000000 +0000
+++ mono-tools-4.2/debian/mono-tools-gui.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#debian/tmp/usr/bin/ilcontrast
-#debian/tmp/usr/lib/ilcontrast/
-#debian/tmp/usr/share/applications/ilcontrast.desktop
-#debian/tmp/usr/share/pixmaps/ilcontrast.png
-debian/tmp/usr/bin/gui-compare
-debian/tmp/usr/lib/gui-compare/
-debian/tmp/usr/bin/mperfmon
-debian/tmp/usr/lib/mperfmon/
-debian/tmp/usr/bin/gsharp
-debian/tmp/usr/lib/gsharp/
-debian/tmp/usr/share/applications/gsharp.desktop
diff -Nru mono-tools-4.2/debian/mono-tools-gui.manpages
mono-tools-4.2/debian/mono-tools-gui.manpages
--- mono-tools-4.2/debian/mono-tools-gui.manpages 2017-02-13
08:25:02.000000000 +0000
+++ mono-tools-4.2/debian/mono-tools-gui.manpages 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mperfmon.1
diff -Nru mono-tools-4.2/debian/patches/exclude-gtk-sharp.patch
mono-tools-4.2/debian/patches/exclude-gtk-sharp.patch
--- mono-tools-4.2/debian/patches/exclude-gtk-sharp.patch 1970-01-01
00:00:00.000000000 +0000
+++ mono-tools-4.2/debian/patches/exclude-gtk-sharp.patch 2023-09-09
07:04:07.000000000 +0000
@@ -0,0 +1,13 @@
+Description: Exclude gtk-sharp2 dependent subdirs
+Author: Bastian Germann <b...@debian.org>
+---
+--- mono-tools-4.2.orig/Makefile.am
++++ mono-tools-4.2/Makefile.am
+@@ -1,5 +1,5 @@
+-SUBDIRS= po docbrowser asn1view create-native-map ilcontrast gui-compare \
+- gendarme mperfmon gsharp webdoc minvoke Mono.Profiler
++SUBDIRS= po asn1view create-native-map ilcontrast \
++ gendarme webdoc minvoke
+
+ #capture aclocal flags for autoreconf
+ ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)
diff -Nru mono-tools-4.2/debian/patches/prevent-gtk-sharp-search.patch
mono-tools-4.2/debian/patches/prevent-gtk-sharp-search.patch
--- mono-tools-4.2/debian/patches/prevent-gtk-sharp-search.patch
1970-01-01 00:00:00.000000000 +0000
+++ mono-tools-4.2/debian/patches/prevent-gtk-sharp-search.patch
2023-09-09 07:04:07.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Prevent pkg-config search for gtk-sharp2
+Author: Bastian Germann <b...@debian.org>
+---
+--- mono-tools-4.2.orig/configure.in
++++ mono-tools-4.2/configure.in
+@@ -50,8 +50,6 @@ AC_SUBST(MONODOC_LIBS)
+ AC_PATH_PROG(MDOC, mdoc, no)
+ AC_SUBST(MDOC)
+
+-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0)
+-AC_SUBST(GTK_SHARP_LIBS)
+
+ CSHARP_FLAGS=""
+
diff -Nru mono-tools-4.2/debian/patches/series
mono-tools-4.2/debian/patches/series
--- mono-tools-4.2/debian/patches/series 2019-02-15 19:57:32.000000000
+0000
+++ mono-tools-4.2/debian/patches/series 2023-09-09 07:04:07.000000000
+0000
@@ -1,3 +1,5 @@
dont_warnaserror_on_ziplib.patch
00-fix_build_system.patch
use-system-cecil-not-private-cecil.patch
+exclude-gtk-sharp.patch
+prevent-gtk-sharp-search.patch
