[Pkg-cli-libs-commits] [gtk-sharp2] 03/04: debian/patches/*: refreshed and removed patches included by new upstream version
Mirco Bauer
meebey at moszumanska.debian.org
Thu Oct 27 05:07:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
meebey pushed a commit to branch master
in repository gtk-sharp2.
commit 9c6224b6e223a1df6f64ae229e0732bd8ee83cb7
Author: Mirco Bauer <meebey at debian.org>
Date: Sun Oct 2 21:01:08 2016 +0800
debian/patches/*: refreshed and removed patches included by new upstream version
Dropped patches as already included in new upstream version:
debian/patches/0001-glib-Fix-native-GLib-warnings-when-disposing-SourceP.patch
debian/patches/0002-Check-that-source_handlers-contains-the-tag.patch
debian/patches/04_fix_glib_2.31_threading
debian/patches/05_glib_single_include
debian/patches/06_IconTheme_use_glib_marshaller
---
...tive-GLib-warnings-when-disposing-SourceP.patch | 42 -----------
...eck-that-source_handlers-contains-the-tag.patch | 24 ------
debian/patches/02_pcfiles | 28 ++++---
debian/patches/04_fix_glib_2.31_threading | 87 ----------------------
debian/patches/05_glib_single_include | 32 --------
debian/patches/06_IconTheme_use_glib_marshaller | 62 ---------------
debian/patches/series | 5 --
7 files changed, 16 insertions(+), 264 deletions(-)
diff --git a/debian/patches/0001-glib-Fix-native-GLib-warnings-when-disposing-SourceP.patch b/debian/patches/0001-glib-Fix-native-GLib-warnings-when-disposing-SourceP.patch
deleted file mode 100644
index e3f7b67..0000000
--- a/debian/patches/0001-glib-Fix-native-GLib-warnings-when-disposing-SourceP.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Bertrand Lorentz <bertrand.lorentz at gmail.com>
-Date: Sat, 5 Jul 2014 15:52:56 +0200
-Subject: [PATCH 1/2] glib: Fix native GLib warnings when disposing SourceProxy
- objects
-
-When an instance of SourceProxy was finalized, we would try to remove
-the corresponding source, even if it was already removed. This now
-causes native GLib to print out warnings because it can't find the
-source ID.
-
-Now Source.Remove only calls g_source_remove if we really had a handler
-registered for the ID we're removing.
-
-Origin: upstream, 2.12.26, commit:3a01260d87c738361f1b72673f73135b4d7545e7
-Bug-Debian: https://bugs.debian.org/776145
----
- glib/Source.cs | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/glib/Source.cs b/glib/Source.cs
-index b62c3c5..89e691f 100644
---- a/glib/Source.cs
-+++ b/glib/Source.cs
-@@ -54,9 +54,15 @@ namespace GLib {
-
- public static bool Remove (uint tag)
- {
-- lock (Source.source_handlers)
-- source_handlers.Remove (tag);
-- return g_source_remove (tag);
-+ // g_source_remove always returns true, so we follow that
-+ bool ret = true;
-+
-+ lock (Source.source_handlers) {
-+ if (source_handlers.Remove (tag)) {
-+ ret = g_source_remove (tag);
-+ }
-+ }
-+ return ret;
- }
- }
- }
diff --git a/debian/patches/0002-Check-that-source_handlers-contains-the-tag.patch b/debian/patches/0002-Check-that-source_handlers-contains-the-tag.patch
deleted file mode 100644
index a0794fd..0000000
--- a/debian/patches/0002-Check-that-source_handlers-contains-the-tag.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Cody Russell <cody at jhu.edu>
-Date: Fri, 11 Jul 2014 09:51:53 -0500
-Subject: [PATCH 2/2] Check that source_handlers contains the tag.
-
-Origin: upstream, 2.12.26, commit:9c78f7019c8622a3fc7a10c3d3dc8dcb5f44a289
-Bug-Debian: https://bugs.debian.org/776145
----
- glib/Source.cs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/glib/Source.cs b/glib/Source.cs
-index 89e691f..cf9f4ba 100644
---- a/glib/Source.cs
-+++ b/glib/Source.cs
-@@ -58,7 +58,8 @@ namespace GLib {
- bool ret = true;
-
- lock (Source.source_handlers) {
-- if (source_handlers.Remove (tag)) {
-+ if (source_handlers.Contains (tag)) {
-+ source_handlers.Remove (tag);
- ret = g_source_remove (tag);
- }
- }
diff --git a/debian/patches/02_pcfiles b/debian/patches/02_pcfiles
index 931f386..f9846a4 100644
--- a/debian/patches/02_pcfiles
+++ b/debian/patches/02_pcfiles
@@ -3,18 +3,20 @@
## DP: Fixes pcfiles to point to CLI Policy 0.7 install locations
@DPATCH@
-diff -urNad gtk-sharp2-2.12.9~/glade/glade-sharp-2.0.pc.in gtk-sharp2-2.12.9/glade/glade-sharp-2.0.pc.in
---- gtk-sharp2-2.12.9~/glade/glade-sharp-2.0.pc.in 2009-11-27 11:31:33.000000000 +0000
-+++ gtk-sharp2-2.12.9/glade/glade-sharp-2.0.pc.in 2009-11-27 11:37:57.000000000 +0000
+Index: gtk-sharp2/glade/glade-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp2.orig/glade/glade-sharp-2.0.pc.in 2016-10-02 20:55:48.728287425 +0800
++++ gtk-sharp2/glade/glade-sharp-2.0.pc.in 2016-10-02 20:55:48.724287431 +0800
@@ -9,4 +9,4 @@
Version: @VERSION@
Requires: gtk-sharp-2.0
Cflags: -I:${gapidir}/glade-api.xml
-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glade-sharp.dll
+Libs: -r:${libdir}/cli/glade-sharp-2.0/glade-sharp.dll
-diff -urNad gtk-sharp2-2.12.9~/glib/glib-sharp-2.0.pc.in gtk-sharp2-2.12.9/glib/glib-sharp-2.0.pc.in
---- gtk-sharp2-2.12.9~/glib/glib-sharp-2.0.pc.in 2009-11-27 11:31:33.000000000 +0000
-+++ gtk-sharp2-2.12.9/glib/glib-sharp-2.0.pc.in 2009-11-27 11:36:31.000000000 +0000
+Index: gtk-sharp2/glib/glib-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp2.orig/glib/glib-sharp-2.0.pc.in 2016-10-02 20:55:48.728287425 +0800
++++ gtk-sharp2/glib/glib-sharp-2.0.pc.in 2016-10-02 20:55:48.724287431 +0800
@@ -8,5 +8,5 @@
Description: GLib# - .NET Binding for the glib library.
Version: @VERSION@
@@ -22,9 +24,10 @@ diff -urNad gtk-sharp2-2.12.9~/glib/glib-sharp-2.0.pc.in gtk-sharp2-2.12.9/glib/
-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll
+Libs: -r:${libdir}/cli/glib-sharp-2.0/glib-sharp.dll
-diff -urNad gtk-sharp2-2.12.9~/gtk/gtk-sharp-2.0.pc.in gtk-sharp2-2.12.9/gtk/gtk-sharp-2.0.pc.in
---- gtk-sharp2-2.12.9~/gtk/gtk-sharp-2.0.pc.in 2009-11-27 11:31:33.000000000 +0000
-+++ gtk-sharp2-2.12.9/gtk/gtk-sharp-2.0.pc.in 2009-11-27 11:37:40.000000000 +0000
+Index: gtk-sharp2/gtk/gtk-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp2.orig/gtk/gtk-sharp-2.0.pc.in 2016-10-02 20:55:48.728287425 +0800
++++ gtk-sharp2/gtk/gtk-sharp-2.0.pc.in 2016-10-02 20:55:48.724287431 +0800
@@ -8,5 +8,5 @@
Description: Gtk# - GNOME .NET Binding
Version: @VERSION@
@@ -32,9 +35,10 @@ diff -urNad gtk-sharp2-2.12.9~/gtk/gtk-sharp-2.0.pc.in gtk-sharp2-2.12.9/gtk/gtk
-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll
+Libs: -r:${libdir}/cli/pango-sharp-2.0/pango-sharp.dll -r:${libdir}/cli/atk-sharp-2.0/atk-sharp.dll -r:${libdir}/cli/gdk-sharp-2.0/gdk-sharp.dll -r:${libdir}/cli/gtk-sharp-2.0/gtk-sharp.dll
Requires: glib-sharp-2.0
-diff -urNad gtk-sharp2-2.12.9~/gtkdotnet/gtk-dotnet-2.0.pc.in gtk-sharp2-2.12.9/gtkdotnet/gtk-dotnet-2.0.pc.in
---- gtk-sharp2-2.12.9~/gtkdotnet/gtk-dotnet-2.0.pc.in 2009-11-27 11:31:33.000000000 +0000
-+++ gtk-sharp2-2.12.9/gtkdotnet/gtk-dotnet-2.0.pc.in 2009-11-27 11:36:44.000000000 +0000
+Index: gtk-sharp2/gtkdotnet/gtk-dotnet-2.0.pc.in
+===================================================================
+--- gtk-sharp2.orig/gtkdotnet/gtk-dotnet-2.0.pc.in 2016-10-02 20:55:48.728287425 +0800
++++ gtk-sharp2/gtkdotnet/gtk-dotnet-2.0.pc.in 2016-10-02 20:55:48.724287431 +0800
@@ -7,4 +7,4 @@
Description: .NET Extensions for Gtk
Version: @VERSION@
diff --git a/debian/patches/04_fix_glib_2.31_threading b/debian/patches/04_fix_glib_2.31_threading
deleted file mode 100644
index ae43540..0000000
--- a/debian/patches/04_fix_glib_2.31_threading
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_glib_2.31_threading.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix build against glib >= 2.31
-## DP: GLib's threading support is included and initialised by default
-## DP: so Thread.Init () is now a no-op, and Thread.Supported is always true
-##
-## DP: glib removed the associated symbols.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/Thread.cs gtk-sharp2-2.12.10/glib/Thread.cs
---- gtk-sharp2-2.12.10~/glib/Thread.cs 2009-01-31 06:51:10.000000000 +1100
-+++ gtk-sharp2-2.12.10/glib/Thread.cs 2012-03-02 11:36:06.583379301 +1100
-@@ -28,21 +28,15 @@
- {
- private Thread () {}
-
-- [DllImport("libgthread-2.0-0.dll")]
-- static extern void g_thread_init (IntPtr i);
--
- public static void Init ()
- {
-- g_thread_init (IntPtr.Zero);
-+ // GLib automatically inits threads in 2.31 and above
- }
-
-- [DllImport("glibsharpglue-2")]
-- static extern bool glibsharp_g_thread_supported ();
--
- public static bool Supported
- {
- get {
-- return glibsharp_g_thread_supported ();
-+ return true;
- }
- }
- }
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/Makefile.am gtk-sharp2-2.12.10/glib/glue/Makefile.am
---- gtk-sharp2-2.12.10~/glib/glue/Makefile.am 2009-01-08 03:54:06.000000000 +1100
-+++ gtk-sharp2-2.12.10/glib/glue/Makefile.am 2012-03-02 11:35:13.059378013 +1100
-@@ -13,8 +13,7 @@
- type.c \
- unichar.c \
- value.c \
-- valuearray.c \
-- thread.c
-+ valuearray.c
-
- # Adding a new glue file?
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/thread.c gtk-sharp2-2.12.10/glib/glue/thread.c
---- gtk-sharp2-2.12.10~/glib/glue/thread.c 2009-01-08 03:54:06.000000000 +1100
-+++ gtk-sharp2-2.12.10/glib/glue/thread.c 1970-01-01 11:00:00.000000000 +1100
-@@ -1,32 +0,0 @@
--/* thread.c : glue functions for GLib.Thread
-- *
-- * Author: Alp Toker <alp at atoker.com>
-- *
-- * Copyright (c) 2005 Alp Toker
-- *
-- * 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.
-- */
--
--
--#include <glib/gthread.h>
--
--gboolean glibsharp_g_thread_supported (void);
--
--gboolean
--glibsharp_g_thread_supported ()
--{
-- return g_thread_supported ();
--}
--
diff --git a/debian/patches/05_glib_single_include b/debian/patches/05_glib_single_include
deleted file mode 100644
index b1152e5..0000000
--- a/debian/patches/05_glib_single_include
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_glib_single_include.dpatch by Colin Watson <cjwatson at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include <glib.h> rather than individual headers.
-## DP: http://bugs.debian.org/665550
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/list.c gtk-sharp2-2.12.10/glib/glue/list.c
---- gtk-sharp2-2.12.10~/glib/glue/list.c 2009-01-07 16:54:06.000000000 +0000
-+++ gtk-sharp2-2.12.10/glib/glue/list.c 2012-04-02 23:50:36.000000000 +0100
-@@ -20,7 +20,7 @@
- */
-
-
--#include <glib/glist.h>
-+#include <glib.h>
-
- /* Forward declarations */
- gpointer gtksharp_list_get_data (GList *l);
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/slist.c gtk-sharp2-2.12.10/glib/glue/slist.c
---- gtk-sharp2-2.12.10~/glib/glue/slist.c 2009-01-07 16:54:06.000000000 +0000
-+++ gtk-sharp2-2.12.10/glib/glue/slist.c 2012-04-02 23:50:40.000000000 +0100
-@@ -20,7 +20,7 @@
- */
-
-
--#include <glib/gslist.h>
-+#include <glib.h>
-
- /* Forward declarations */
- gpointer gtksharp_slist_get_data (GSList *l);
diff --git a/debian/patches/06_IconTheme_use_glib_marshaller b/debian/patches/06_IconTheme_use_glib_marshaller
deleted file mode 100644
index ec30b9e..0000000
--- a/debian/patches/06_IconTheme_use_glib_marshaller
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: IconThem: use the glib marshallers Use GLib.Marshaller
- instead of doing it per hand. This makes IconTheme.get_SearchPath()
- safe to use in 64-bit machines, as we don't try to make the pointer
- fit into a Int32.
-Author: Carlos Martín Nieto <cmn at dwim.me>
-
-Index: gtk-sharp2/gtk/IconTheme.custom
-===================================================================
---- gtk-sharp2.orig/gtk/IconTheme.custom 2012-09-02 18:22:23.517201189 +0200
-+++ gtk-sharp2/gtk/IconTheme.custom 2012-09-05 23:48:34.244916093 +0200
-@@ -71,9 +71,6 @@
-
- public string[] SearchPath {
- get {
-- string[] retval;
--
-- unsafe {
- int length;
- IntPtr raw_ret;
- if (IsWindowsPlatform)
-@@ -81,31 +78,22 @@
- else
- gtk_icon_theme_get_search_path (Handle, out raw_ret, out length);
-
-- int size = Marshal.SizeOf (typeof (IntPtr));
-- retval = new string[length];
-- for (int i = 0, j = 0; i < length; i++, j += size) {
-- IntPtr string_ptr = Marshal.ReadIntPtr (new IntPtr (raw_ret.ToInt32 () + j));
-- retval[i] = GLib.Marshaller.Utf8PtrToString (string_ptr);
-- }
--
-- g_strfreev (raw_ret);
-- }
--
-- return retval;
-+ return GLib.Marshaller.NullTermPtrToStringArray(raw_ret, true);
-+
- }
- set {
-- int cnt_path = value == null ? 0 : value.Length;
-- IntPtr[] native_path = new IntPtr [cnt_path];
-- for (int i = 0; i < cnt_path; i++)
-- native_path [i] = GLib.Marshaller.StringToPtrGStrdup (value[i]);
-+ IntPtr[] native_path;
-+ if (value == null)
-+ native_path = new IntPtr [0];
-+ else
-+ native_path = GLib.Marshaller.StringArrayToNullTermPointer (value);
-
- if (IsWindowsPlatform)
-- gtk_icon_theme_set_search_path_utf8 (Handle, native_path, native_path.Length);
-+ gtk_icon_theme_set_search_path_utf8 (Handle, native_path, value.Length);
- else
-- gtk_icon_theme_set_search_path (Handle, native_path, native_path.Length);
-+ gtk_icon_theme_set_search_path (Handle, native_path, value.Length);
-
-- for (int i = 0; i < native_path.Length; i++)
-- GLib.Marshaller.Free (native_path[i]);
-+ GLib.Marshaller.Free(native_path);
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 0158d40..24847e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
01_dllmaps
02_pcfiles
-04_fix_glib_2.31_threading
-05_glib_single_include
-06_IconTheme_use_glib_marshaller
-0001-glib-Fix-native-GLib-warnings-when-disposing-SourceP.patch
-0002-Check-that-source_handlers-contains-the-tag.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/gtk-sharp2.git
More information about the Pkg-cli-libs-commits
mailing list