GNOME.org
 

[gnome-build-meta/abderrahim/42.beta: 6/7] add a few patches


commit dfab0590535bc6c753a9c738d0f06ac930a3e09d
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Feb 17 22:27:26 2022 +0100

    add a few patches

 elements/core-deps/folks.bst                       |  2 +
 elements/core/gnome-bluetooth-1.0.bst              |  2 +
 elements/core/simple-scan.bst                      |  2 +
 ...enerics-Add-missing-generic-type-argument.patch | 83 ++++++++++++++++++++++
 .../0001-sendto-Make-sendto-optional.patch         | 32 +++++++++
 ...bility-conflict-of-constant-and-its-value.patch | 25 +++++++
 6 files changed, 146 insertions(+)
---
diff --git a/elements/core-deps/folks.bst b/elements/core-deps/folks.bst
index 38a9504ae..be9b34ddd 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -4,6 +4,8 @@ sources:
 - kind: tar
   url: gnome_downloads:folks/0.15/folks-0.15.4.tar.xz
   ref: e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f
+- kind: patch
+  path: files/folks/0001-folks-generics-Add-missing-generic-type-argument.patch
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
diff --git a/elements/core/gnome-bluetooth-1.0.bst b/elements/core/gnome-bluetooth-1.0.bst
index eedb77b32..678bc5963 100644
--- a/elements/core/gnome-bluetooth-1.0.bst
+++ b/elements/core/gnome-bluetooth-1.0.bst
@@ -4,6 +4,8 @@ sources:
 - kind: tar
   url: gnome_downloads:gnome-bluetooth/3.34/gnome-bluetooth-3.34.5.tar.xz
   ref: 6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+- kind: patch
+  path: files/gnome-bluetooth/0001-sendto-Make-sendto-optional.patch
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index f003a2726..e75aba353 100644
--- a/elements/core/simple-scan.bst
+++ b/elements/core/simple-scan.bst
@@ -3,6 +3,8 @@ sources:
 - kind: tar
   url: gnome_downloads:simple-scan/40/simple-scan-40.7.tar.xz
   ref: 7c551852cb5af7d34aa989f8ad5ede3cbe31828cf8dd5aec2b2b6fdcd1ac3d53
+- kind: patch
+  path: files/simple-scan/0001-Fix-accessibility-conflict-of-constant-and-its-value.patch
 build-depends:
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/files/folks/0001-folks-generics-Add-missing-generic-type-argument.patch 
b/files/folks/0001-folks-generics-Add-missing-generic-type-argument.patch
new file mode 100644
index 000000000..be541e27e
--- /dev/null
+++ b/files/folks/0001-folks-generics-Add-missing-generic-type-argument.patch
@@ -0,0 +1,83 @@
+From c44d8e323affd7f1043f300f3325b358cd5b5f0b Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz ubuntu com>
+Date: Sun, 30 Jan 2022 19:42:32 +0100
+Subject: [PATCH] folks-generics: Add missing generic type argument
+
+---
+ folks/folks-generics.vapi |  2 +-
+ folks/small-set.c         | 15 ++++-----------
+ folks/small-set.h         |  5 ++++-
+ 3 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/folks/folks-generics.vapi b/folks/folks-generics.vapi
+index 389025b6..c8a06e96 100644
+--- a/folks/folks-generics.vapi
++++ b/folks/folks-generics.vapi
+@@ -37,7 +37,7 @@ namespace Folks
+     internal SmallSet (owned Gee.HashDataFunc<G>? item_hash = null,
+         owned Gee.EqualDataFunc<G>? item_equals = null);
+ 
+-    internal static SmallSet<G> copy (Gee.Iterable<G> iterable,
++    internal static SmallSet<G> copy<G> (Gee.Iterable<G> iterable,
+         owned Gee.HashDataFunc<G>? item_hash = null,
+         owned Gee.EqualDataFunc<G>? item_equals = null);
+ 
+diff --git a/folks/small-set.c b/folks/small-set.c
+index b5a19683..39790755 100644
+--- a/folks/small-set.c
++++ b/folks/small-set.c
+@@ -337,7 +337,10 @@ _folks_small_set_new_take_array (GPtrArray *arr,
+  * Returns: (transfer full):
+  */
+ FolksSmallSet *
+-folks_small_set_copy (GeeIterable *iterable,
++folks_small_set_copy (GType item_type,
++    GBoxedCopyFunc item_dup,
++    GDestroyNotify item_free,
++    GeeIterable *iterable,
+     GeeHashDataFunc item_hash,
+     gpointer item_hash_data,
+     GDestroyNotify item_hash_data_free,
+@@ -347,10 +350,6 @@ folks_small_set_copy (GeeIterable *iterable,
+ {
+   FolksSmallSet *self;
+   GeeIterator *iter;
+-  GeeTraversableIface *traversable_iface;
+-  GType item_type;
+-  GBoxedCopyFunc item_dup;
+-  GDestroyNotify item_free;
+ 
+   /* Deliberately not allowing for subclasses here: this class is not
+    * subclassable, and it's slower if we do check for subclasses. */
+@@ -376,12 +375,6 @@ folks_small_set_copy (GeeIterable *iterable,
+       return self;
+     }
+ 
+-  traversable_iface = GEE_TRAVERSABLE_GET_INTERFACE (iterable);
+-  g_assert (traversable_iface != NULL);
+-  item_type = traversable_iface->get_g_type ((GeeTraversable *) iterable);
+-  item_dup = traversable_iface->get_g_dup_func ((GeeTraversable *) iterable);
+-  item_free = traversable_iface->get_g_destroy_func ((GeeTraversable *) iterable);
+-
+   self = folks_small_set_new (item_type, item_dup, item_free,
+       item_hash, item_hash_data, item_hash_data_free,
+       item_equals, item_equals_data, item_equals_data_free);
+diff --git a/folks/small-set.h b/folks/small-set.h
+index e61f387e..5df54ce3 100644
+--- a/folks/small-set.h
++++ b/folks/small-set.h
+@@ -68,7 +68,10 @@ folks_small_set_empty (GType item_type,
+     GBoxedCopyFunc item_dup,
+     GDestroyNotify item_free);
+ 
+-FolksSmallSet *folks_small_set_copy (GeeIterable *iterable,
++FolksSmallSet *folks_small_set_copy (GType item_type,
++    GBoxedCopyFunc item_dup,
++    GDestroyNotify item_free,
++    GeeIterable *iterable,
+     GeeHashDataFunc item_hash,
+     gpointer item_hash_data,
+     GDestroyNotify item_hash_data_free,
+-- 
+2.35.0
+
diff --git a/files/gnome-bluetooth/0001-sendto-Make-sendto-optional.patch 
b/files/gnome-bluetooth/0001-sendto-Make-sendto-optional.patch
new file mode 100644
index 000000000..43b2f9b3b
--- /dev/null
+++ b/files/gnome-bluetooth/0001-sendto-Make-sendto-optional.patch
@@ -0,0 +1,32 @@
+diff --git a/meson.build b/meson.build
+index 79bf7a24..7a3065f0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -108,7 +108,9 @@ m_dep = cc.find_library('m')
+ 
+ subdir('icons')
+ subdir('lib')
+-subdir('sendto')
++if get_option('sendto')
++  subdir('sendto')
++endif
+ 
+ if enable_gtk_doc
+   subdir('docs/reference/libgnome-bluetooth')
+@@ -136,6 +138,7 @@ output += '        Compiler....................:  ' + cc.get_id() + '\n\n'
+ output += '        Compiler Flags..............:  ' + ' '.join(compiler_flags) + '\n'
+ output += '        Prefix......................:  ' + gnomebt_prefix + '\n'
+ output += '        Documentation...............:  ' + enable_gtk_doc.to_string() + '\n'
++output += '        Send-to.....................:  ' + get_option('sendto').to_string() + '\n'
+ output += '        GObject-Introspection.......:  ' + enable_gir.to_string()
+ message(output)
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 1defb70d..eed1137c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
++option('sendto', type: 'boolean', value: true, description: 'Whether to build and install bluetooth-sendto')
+ option('icon_update', type: 'boolean', value: true, description: 'Enable icon cache update')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends 
on GObject)')
diff --git a/files/simple-scan/0001-Fix-accessibility-conflict-of-constant-and-its-value.patch 
b/files/simple-scan/0001-Fix-accessibility-conflict-of-constant-and-its-value.patch
new file mode 100644
index 000000000..fd5233635
--- /dev/null
+++ b/files/simple-scan/0001-Fix-accessibility-conflict-of-constant-and-its-value.patch
@@ -0,0 +1,25 @@
+From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz ubuntu com>
+Date: Sat, 6 Nov 2021 19:46:07 +0100
+Subject: [PATCH] Fix accessibility conflict of constant and its value
+
+---
+ src/simple-scan.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simple-scan.vala b/src/simple-scan.vala
+index c15a5418..71f32de9 100644
+--- a/src/simple-scan.vala
++++ b/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
+     static bool show_version;
+     static bool debug_enabled;
+     static string? fix_pdf_filename = null;
+-    public const OptionEntry[] options =
++    const OptionEntry[] options =
+     {
+         { "version", 'v', 0, OptionArg.NONE, ref show_version,
+           /* Help string for command line --version flag */
+-- 
+2.35.0
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]