commit gtk-sharp3 for openSUSE:Factory

29 Sep 2020

Hello community,

here is the log from the commit of package gtk-sharp3 for openSUSE:Factory checked in at 2020-09-29 19:03:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtk-sharp3 (Old)
 and      /work/SRC/openSUSE:Factory/.gtk-sharp3.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gtk-sharp3"

Tue Sep 29 19:03:25 2020 rev:6 rq:838401 version:2.99.4

Changes:
--------

--- /work/SRC/openSUSE:Factory/gtk-sharp3/gtk-sharp3.changes	2020-04-16 23:02:57.363659419 +0200
+++ /work/SRC/openSUSE:Factory/.gtk-sharp3.new.4249/gtk-sharp3.changes	2020-09-29 19:03:34.785902960 +0200
@@ -1,0 +2,7 @@
+Tue Sep 29 01:23:22 UTC 2020 - Marguerite Su <i@marguerite.su>
+
+- drop cs8-build-fix.patch, upstreamed
+- fix libexecdir. mono can't use libexecdir because /usr/lib
+  is fixed in pkgconfig
+
+-------------------------------------------------------------------

Old:
----
  cs8-build-fix.patch
  gtk-sharp3-git.2017.01.16.9ef7d3f39.tar.xz

New:
----
  gtk-sharp3-git.2020.01.10.9dc89137b.tar.xz

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

Other differences:
------------------
++++++ gtk-sharp3.spec ++++++
--- /var/tmp/diff_new_pack.13EN5A/_old	2020-09-29 19:03:36.697905282 +0200
+++ /var/tmp/diff_new_pack.13EN5A/_new	2020-09-29 19:03:36.701905287 +0200
@@ -16,7 +16,7 @@
 #
 
 
-%define vsuffix git.2017.01.16.9ef7d3f39
+%define vsuffix git.2020.01.10.9dc89137b
 Name:           gtk-sharp3
 # package "libmono-profiler-gui-thread-check0-devel" does not allow us to add even a single symbol to version string without invoking rpmlint warning "W: filename-too-long-for-joliet"
 Version:        2.99.4
@@ -24,11 +24,10 @@
 Summary:        C-Sharp Language Bindings for GTK+
 License:        GPL-2.0-only
 Group:          System/GUI/GNOME
-URL:            https://github.com/mono/gtk-sharp
+URL:            https:/github.com/mono/gtk-sharp
 Source:         gtk-sharp3-%{vsuffix}.tar.xz
 Source99:       create-source-archive.sh
 Patch1:         profiler-update.patch
-Patch2:         cs8-build-fix.patch
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libmono-2_0-devel
 BuildRequires:  librsvg-devel
@@ -148,12 +147,11 @@
 %prep
 %setup -q -n gtk-sharp3-%{vsuffix}
 %patch1 -p1
-%patch2 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --libexecdir=%{_libexecdir} --enable-debug
+%configure --libexecdir=%{_prefix}/lib/ --enable-debug
 make %{?_smp_mflags}
 
 %install
@@ -168,18 +166,18 @@
 %{_libdir}/libgtksharpglue-3.so
 %{_libdir}/libgiosharpglue-3.so
 %{_libdir}/libpangosharpglue-3.so
-%{_libexecdir}/mono/gtk-sharp-3.0/atk-sharp.dll
-%{_libexecdir}/mono/gtk-sharp-3.0/cairo-sharp.dll
-%{_libexecdir}/mono/gtk-sharp-3.0/gdk-sharp.dll
-%{_libexecdir}/mono/gtk-sharp-3.0/gtk-dotnet.dll
-%{_libexecdir}/mono/gtk-sharp-3.0/gtk-sharp.dll
-%{_libexecdir}/mono/gtk-sharp-3.0/pango-sharp.dll
-%{_libexecdir}/mono/gac/atk-sharp/
-%{_libexecdir}/mono/gac/cairo-sharp/
-%{_libexecdir}/mono/gac/gdk-sharp/
-%{_libexecdir}/mono/gac/gtk-dotnet/
-%{_libexecdir}/mono/gac/gtk-sharp/
-%{_libexecdir}/mono/gac/pango-sharp/
+%{_prefix}/lib/mono/gtk-sharp-3.0/atk-sharp.dll
+%{_prefix}/lib/mono/gtk-sharp-3.0/cairo-sharp.dll
+%{_prefix}/lib/mono/gtk-sharp-3.0/gdk-sharp.dll
+%{_prefix}/lib/mono/gtk-sharp-3.0/gtk-dotnet.dll
+%{_prefix}/lib/mono/gtk-sharp-3.0/gtk-sharp.dll
+%{_prefix}/lib/mono/gtk-sharp-3.0/pango-sharp.dll
+%{_prefix}/lib/mono/gac/atk-sharp/
+%{_prefix}/lib/mono/gac/cairo-sharp/
+%{_prefix}/lib/mono/gac/gdk-sharp/
+%{_prefix}/lib/mono/gac/gtk-dotnet/
+%{_prefix}/lib/mono/gac/gtk-sharp/
+%{_prefix}/lib/mono/gac/pango-sharp/
 
 %files devel
 %{_libdir}/pkgconfig/gtk-sharp-3.0.pc
@@ -188,16 +186,16 @@
 %{_libdir}/pkgconfig/glib-sharp-3.0.pc
 
 %files gapi
-%dir %{_libexecdir}/gapi-3.0
+%dir %{_prefix}/lib/gapi-3.0
 %{_bindir}/gapi3-codegen
 %{_bindir}/gapi3-fixup
 %{_bindir}/gapi3-parser
 %{_datadir}/gapi-3.0
-%{_libexecdir}/gapi-3.0/gapi_codegen.exe
-%{_libexecdir}/gapi-3.0/gapi-fixup.exe
-%{_libexecdir}/gapi-3.0/gapi-parser.exe
-%{_libexecdir}/gapi-3.0/gapi_pp.pl
-%{_libexecdir}/gapi-3.0/gapi2xml.pl
+%{_prefix}/lib/gapi-3.0/gapi_codegen.exe
+%{_prefix}/lib/gapi-3.0/gapi-fixup.exe
+%{_prefix}/lib/gapi-3.0/gapi-parser.exe
+%{_prefix}/lib/gapi-3.0/gapi_pp.pl
+%{_prefix}/lib/gapi-3.0/gapi2xml.pl
 
 %files -n gtk-sharp3-gapi-devel
 %{_libdir}/pkgconfig/gapi-3.0.pc
@@ -205,15 +203,15 @@
 %files -n gtk-sharp3-doc
 %license COPYING
 %doc README
-%{_libexecdir}/monodoc
+%{_prefix}/lib/monodoc
 
 %files -n glib-sharp3
-%{_libexecdir}/mono/gac/glib-sharp/
-%{_libexecdir}/mono/gtk-sharp-3.0/glib-sharp.dll
+%{_prefix}/lib/mono/gac/glib-sharp/
+%{_prefix}/lib/mono/gtk-sharp-3.0/glib-sharp.dll
 
 %files -n gio-sharp3
-%{_libexecdir}/mono/gac/gio-sharp/
-%{_libexecdir}/mono/gtk-sharp-3.0/gio-sharp.dll
+%{_prefix}/lib/mono/gac/gio-sharp/
+%{_prefix}/lib/mono/gtk-sharp-3.0/gio-sharp.dll
 
 %files -n gio-sharp3-devel
 %{_libdir}/pkgconfig/gio-sharp-3.0.pc
@@ -225,6 +223,6 @@
 %{_libdir}/libmono-profiler-gui-thread-check.so
 
 %files -n gtk-sharp3-complete
-%dir %{_libexecdir}/mono/gtk-sharp-3.0
+%dir %{_prefix}/lib/mono/gtk-sharp-3.0
 
 %changelog

++++++ gtk-sharp3-git.2017.01.16.9ef7d3f39.tar.xz -> gtk-sharp3-git.2020.01.10.9dc89137b.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/Makefile.include new/gtk-sharp3-git.2020.01.10.9dc89137b/Makefile.include
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/Makefile.include	2018-02-10 14:37:21.271675359 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/Makefile.include	2020-03-17 13:49:00.619195751 +0100
@@ -50,7 +50,7 @@
 	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
 
 build_sources = $(addprefix $(srcdir)/, $(sources))
-build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix -r:, $(references)) $(addsuffix .dll, $(MONO_CAIRO_LIBS))
 
 $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
 	@rm -f $(ASSEMBLY).mdb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/README new/gtk-sharp3-git.2020.01.10.9dc89137b/README
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/README	2018-02-10 14:37:21.271675359 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/README	2020-03-17 13:49:00.619195751 +0100
@@ -107,3 +107,5 @@
 
     Also, anyone wishing to hack Gtk# is encouraged to join the Gtk#
     mailing list. And to visit the #gtk# IRC channel (on irc.gnome.org).
+
+Join the chat at https://gitter.im/mono/gtk-sharp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/audit/makefile new/gtk-sharp3-git.2020.01.10.9dc89137b/audit/makefile
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/audit/makefile	2018-02-10 14:37:21.295675224 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/audit/makefile	2020-03-17 13:49:00.651195991 +0100
@@ -1,4 +1,4 @@
-MCS=dmcs
+MCS=csc
 
 COMMON_SOURCES = \
 	AssemblyResolver.cs	\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/autogen.sh new/gtk-sharp3-git.2020.01.10.9dc89137b/autogen.sh
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/autogen.sh	2018-02-10 14:37:21.295675224 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/autogen.sh	2020-03-17 13:49:00.651195991 +0100
@@ -13,18 +13,18 @@
   DIE=1
 }
 
-if [ -z "$LIBTOOL" ]; then
-  LIBTOOL=`which glibtool 2>/dev/null` 
-  if [ ! -x "$LIBTOOL" ]; then
-    LIBTOOL=`which libtool`
+if [ -z "$LIBTOOLIZE" ]; then
+  LIBTOOLIZE=`which glibtoolize 2>/dev/null`
+  if [ ! -x "$LIBTOOLIZE" ]; then
+    LIBTOOLIZE=`which libtoolize`
   fi
 fi
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
+  ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`libtool' installed to compile Gtk#."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    echo "**Error**: You must have \`libtoolize' installed to compile Gtk#."
+    echo "Get ftp://ftp.gnu.org/gnu/libtool/libtool-1.2.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   }
@@ -67,8 +67,6 @@
 esac
 
 
-LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
-
 if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
   if test -z "$NO_LIBTOOLIZE" ; then 
     echo "Running $LIBTOOLIZE..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/azure-pipelines.yml new/gtk-sharp3-git.2020.01.10.9dc89137b/azure-pipelines.yml
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/azure-pipelines.yml	1970-01-01 01:00:00.000000000 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/azure-pipelines.yml	2020-03-17 13:49:00.651195991 +0100
@@ -0,0 +1,26 @@
+trigger:
+  - master
+  - gtk-sharp-2-12-branch
+
+pr:
+  - master
+  - gtk-sharp-2-12-branch
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+- bash: sudo apt install -y build-essential libtool autoconf automake gettext libglade2-dev libglib2.0-dev libgtk2.0-dev libgtk-3-dev libpango1.0-dev mono-devel monodoc-base pkg-config
+  displayName: Install Dependencies
+
+- bash: |
+    export CFLAGS=-ggdb3
+
+    if [ -e ./bootstrap-2.12 ]; then
+      ./bootstrap-2.12
+    else
+      ./autogen.sh
+    fi
+
+    make -w
+  displayName: Build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/configure.ac new/gtk-sharp3-git.2020.01.10.9dc89137b/configure.ac
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/configure.ac	2018-02-10 14:37:21.299675201 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/configure.ac	2020-03-17 13:49:00.651195991 +0100
@@ -133,7 +133,7 @@
 	RUNTIME="mono$RUNTIME_DEBUG_FLAGS"
 fi
 
-AC_PATH_PROG(CSC, mcs, no)
+AC_PATH_PROG(CSC, csc, no)
 if test `uname -s` = "Darwin"; then
 	LIB_PREFIX=
 	LIB_SUFFIX=.dylib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/glib/ValueArray.cs new/gtk-sharp3-git.2020.01.10.9dc89137b/glib/ValueArray.cs
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/glib/ValueArray.cs	2018-02-10 14:37:21.407674592 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/glib/ValueArray.cs	2020-03-17 13:49:00.807197163 +0100
@@ -43,7 +43,7 @@
 
 		public ValueArray (IntPtr raw)
 		{
-			handle = raw;
+			handle = g_value_array_copy (raw);
 		}
 		
 		~ValueArray ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/gtk/gui-thread-check/profiler/gui-thread-check.c new/gtk-sharp3-git.2020.01.10.9dc89137b/gtk/gui-thread-check/profiler/gui-thread-check.c
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/gtk/gui-thread-check/profiler/gui-thread-check.c	2018-02-10 14:37:21.415674547 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/gtk/gui-thread-check/profiler/gui-thread-check.c	2020-03-17 13:49:00.819197253 +0100
@@ -86,6 +86,10 @@
 	}
 }
 
+#ifndef MONO_PROFILE_ENTER_LEAVE
+#define MONO_PROFILE_ENTER_LEAVE (1 << 12)
+#endif
+
 void
 mono_profiler_startup (const char *desc)
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk-sharp3-git.2017.01.16.9ef7d3f39/sample/test/TestRange.cs new/gtk-sharp3-git.2020.01.10.9dc89137b/sample/test/TestRange.cs
--- old/gtk-sharp3-git.2017.01.16.9ef7d3f39/sample/test/TestRange.cs	2018-02-10 14:37:21.443674390 +0100
+++ new/gtk-sharp3-git.2020.01.10.9dc89137b/sample/test/TestRange.cs	2020-03-17 13:49:00.831197343 +0100
@@ -9,6 +9,8 @@
 using System;
 
 using Gtk;
+// disambiguate, Gtk.Range vs System.Range
+using Range=Gtk.Range;
 
 namespace WidgetViewer {

    

root

tags

participants (1)