Hello community,

here is the log from the commit of package gtk-sharp2 for openSUSE:Leap:15.2 
checked in at 2020-05-14 06:51:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gtk-sharp2 (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.gtk-sharp2.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gtk-sharp2"

Thu May 14 06:51:27 2020 rev:17 rq:805402 version:2.12.45

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/gtk-sharp2/gtk-sharp2.changes  2020-01-15 
15:09:28.558040813 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.gtk-sharp2.new.2738/gtk-sharp2.changes        
2020-05-14 06:51:38.219723023 +0200
@@ -1,0 +2,7 @@
+Wed Jan 29 13:59:49 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Update to version 2.12.45: no changelogs provided.
+- Add gtk-sharp2-csharp8.patch: Fix build failure with mcs caused
+  by C#8 changes in mcs. Fixes build with mono-core 6.4.
+
+-------------------------------------------------------------------

Old:
----
  gtk-sharp-2.12.41.tar.gz

New:
----
  gtk-sharp-2.12.45.tar.gz
  gtk-sharp2-csharp8.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gtk-sharp2.spec ++++++
--- /var/tmp/diff_new_pack.dG9qKw/_old  2020-05-14 06:51:38.639723929 +0200
+++ /var/tmp/diff_new_pack.dG9qKw/_new  2020-05-14 06:51:38.643723937 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package gtk-sharp2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,16 +12,16 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define _name gtk-sharp
 
 Name:           gtk-sharp2
-Url:            https://github.com/mono/gtk-sharp
+URL:            https://github.com/mono/gtk-sharp
 Summary:        .Net Language Bindings for GTK+
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/GUI/GNOME
 %ifarch ppc64
 Obsoletes:      gtk-sharp2-64bit
@@ -38,11 +38,13 @@
 BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
 BuildRequires:  vte-devel
-Version:        2.12.41
+Version:        2.12.45
 Release:        0
-Source:         %{_name}-%{version}.tar.gz
+Source0:        
https://download.mono-project.com/sources/gtk-sharp212/%{_name}-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE fix "64bit-portability-issue" error at windowmanager.c:113
 Patch1:         fix-64bit-portability-issue.patch
+# PATCH-FIX-UPSTREAM gtk-sharp2-csharp8.patch [email protected] -- Fix 
build failure with mcs caused by C#8 changes in mcs
+Patch2:         gtk-sharp2-csharp8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -50,7 +52,7 @@
 
 %package gapi
 Summary:        C Source Parser and C Generator
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/GUI/GNOME
 Requires:       perl-XML-LibXML
 Requires:       perl-XML-LibXML-Common
@@ -63,7 +65,7 @@
 
 %package -n gtk-sharp2-doc
 Summary:        Monodoc documentation for gtk-sharp2
-License:        LGPL-2.1
+License:        LGPL-2.1-only
 Group:          System/GUI/GNOME
 
 %description -n gtk-sharp2-doc
@@ -71,7 +73,7 @@
 
 %package -n glib-sharp2
 Summary:        Mono bindings for glib
-License:        LGPL-2.1
+License:        LGPL-2.1-only
 Group:          System/GUI/GNOME
 
 %description -n glib-sharp2
@@ -79,7 +81,7 @@
 
 %package -n glade-sharp2
 Summary:        Mono bindings for glade
-License:        LGPL-2.1
+License:        LGPL-2.1-only
 Group:          System/GUI/GNOME
 
 %description -n glade-sharp2
@@ -87,7 +89,7 @@
 
 %package -n gtk-sharp2-complete
 Summary:        GTK+ and GNOME bindings for Mono (virtual package)
-License:        LGPL-2.1
+License:        LGPL-2.1-only
 Group:          System/GUI/GNOME
 Requires:       glade-sharp2 = %{version}-%{release}
 Requires:       glib-sharp2 = %{version}-%{release}
@@ -105,9 +107,10 @@
 %prep
 %setup -q -n %{_name}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
-NOCONFIGURE=yes ./bootstrap-2.12
+autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # That should come frmo mono-core now
 #export MONO_CAIRO_LIBS=$(pkg-config --libs mono-cairo | sed 's:2.0:4.5:')

++++++ gtk-sharp-2.12.41.tar.gz -> gtk-sharp-2.12.45.tar.gz ++++++
++++ 246264 lines of diff (skipped)

++++++ gtk-sharp2-csharp8.patch ++++++
>From 3faabd7bdce8f3e3e59f0ee945f4f36ea6d3e870 Mon Sep 17 00:00:00 2001
From: Ankit Jain <[email protected]>
Date: Tue, 19 Feb 2019 23:31:12 -0500
Subject: [PATCH] Fix build failure with mcs caused by C#8 changes in mcs

Recent addition of C#8 features to mcs possibly broke this:

```
mcs -out:WidgetViewer.exe -r:../../glib/glib-sharp.dll 
-r:../../pango/pango-sharp.dll -r:../../atk/atk-sharp.dll 
-r:../../gdk/gdk-sharp.dll -r:../../gtk/gtk-sharp.dll ./TestCheckButton.cs 
./TestColorSelection.cs ./TestRadioButton.cs ./TestRange.cs ./TestStatusbar.cs 
./TestDialog.cs ./TestFlipping.cs ./TestSizeGroup.cs ./TestCombo.cs 
./TestComboBox.cs ./WidgetViewer.cs
./TestCombo.cs(17,14): warning CS0612: `Gtk.Combo' is obsolete
./TestRange.cs(35,6): error CS0104: `Range' is an ambiguous reference between 
`System.Range' and `Gtk.Range'
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol 
related to previous error)
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll 
(Location of the symbol related to previous error)
./TestRange.cs(35,13): error CS0030: Cannot convert type `Gtk.HScale' to 
`System.Range'
./TestRange.cs(42,6): error CS0104: `Range' is an ambiguous reference between 
`System.Range' and `Gtk.Range'
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol 
related to previous error)
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll 
(Location of the symbol related to previous error)
./TestRange.cs(42,13): error CS0030: Cannot convert type `Gtk.HScrollbar' to 
`System.Range'
./TestRange.cs(62,6): error CS0104: `Range' is an ambiguous reference between 
`System.Range' and `Gtk.Range'
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol 
related to previous error)
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll 
(Location of the symbol related to previous error)
./TestRange.cs(62,13): error CS0030: Cannot convert type `Gtk.VScale' to 
`System.Range'
```

This is because the compiler is resolving `Range` in the test as `System.Range`
instead of `Gtk.Range`, so we disambiguate it.

/cc @marek-safar
---
 sample/test/TestRange.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
index 82fb81105..3da945e69 100644
--- a/sample/test/TestRange.cs
+++ b/sample/test/TestRange.cs
@@ -9,6 +9,8 @@
 using System;
 
 using Gtk;
+// disambiguate, Gtk.Range vs System.Range
+using Range=Gtk.Range;
 
 namespace WidgetViewer {
 


Reply via email to