pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
patches for bamf
Module Name: pkgsrc-wip
Committed By: jaypatelani <jaypatelani%gmail.com@localhost>
Pushed By: jaypatelani
Date: Fri Aug 21 23:49:56 2020 +0530
Changeset: 8cf8ab10ac419c3e393d4db5c4b8d4981f7f4771
Modified Files:
bamf/distinfo
Added Files:
bamf/patches/patch-configure.ac
bamf/patches/patch-lib_libbamf_bamf-application.c
bamf/patches/patch-lib_libbamf_bamf-control.c
bamf/patches/patch-lib_libbamf_bamf-factory.c
bamf/patches/patch-lib_libbamf_bamf-matcher.c
bamf/patches/patch-lib_libbamf_bamf-tab.c
bamf/patches/patch-lib_libbamf_bamf-view.c
bamf/patches/patch-lib_libbamf_bamf-window.c
bamf/patches/patch-src_bamf-application.c
bamf/patches/patch-src_bamf-control.c
bamf/patches/patch-src_bamf-daemon.c
bamf/patches/patch-src_bamf-legacy-screen.c
bamf/patches/patch-src_bamf-legacy-window.c
bamf/patches/patch-src_bamf-matcher.c
bamf/patches/patch-src_bamf-tab.c
bamf/patches/patch-src_bamf-view.c
bamf/patches/patch-src_bamf-window.c
Log Message:
patches for bamf
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8cf8ab10ac419c3e393d4db5c4b8d4981f7f4771
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bamf/distinfo | 17 ++++++++
bamf/patches/patch-configure.ac | 13 ++++++
bamf/patches/patch-lib_libbamf_bamf-application.c | 40 ++++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-control.c | 40 ++++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-factory.c | 40 ++++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-matcher.c | 42 +++++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-tab.c | 37 +++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-view.c | 42 +++++++++++++++++++
bamf/patches/patch-lib_libbamf_bamf-window.c | 42 +++++++++++++++++++
bamf/patches/patch-src_bamf-application.c | 49 +++++++++++++++++++++++
bamf/patches/patch-src_bamf-control.c | 40 ++++++++++++++++++
bamf/patches/patch-src_bamf-daemon.c | 41 +++++++++++++++++++
bamf/patches/patch-src_bamf-legacy-screen.c | 42 +++++++++++++++++++
bamf/patches/patch-src_bamf-legacy-window.c | 42 +++++++++++++++++++
bamf/patches/patch-src_bamf-matcher.c | 32 +++++++++++++++
bamf/patches/patch-src_bamf-tab.c | 47 ++++++++++++++++++++++
bamf/patches/patch-src_bamf-view.c | 47 ++++++++++++++++++++++
bamf/patches/patch-src_bamf-window.c | 47 ++++++++++++++++++++++
18 files changed, 700 insertions(+)
diffs:
diff --git a/bamf/distinfo b/bamf/distinfo
index 08bda97db7..5c03530fc1 100644
--- a/bamf/distinfo
+++ b/bamf/distinfo
@@ -4,3 +4,20 @@ SHA1 (bamf-0.5.4.tar.gz) = b83a5464f22345394beb2479b943850f751eb9db
RMD160 (bamf-0.5.4.tar.gz) = 9b94f57efdfa053bbb05345a53ac3571149897d0
SHA512 (bamf-0.5.4.tar.gz) = 68a587d387ea1190b59207af81c9617aa8ebacb36b8eb6a790c62ccbd534c13bfd7cdb7b3b40a0c9109f5ec8da341b13743362506b080579a56ccf10e340de94
Size (bamf-0.5.4.tar.gz) = 638756 bytes
+SHA1 (patch-configure.ac) = 4bbb27a6b1d61fc165f7ae81322435d9aba5175a
+SHA1 (patch-lib_libbamf_bamf-application.c) = 770de8bd3812a42ce54a19b8d6fe6be946ad4465
+SHA1 (patch-lib_libbamf_bamf-control.c) = fde482dc652385d9021bb6893edb3787062994b3
+SHA1 (patch-lib_libbamf_bamf-factory.c) = b3fdc98d849acd357b659f7b0a1cb7048670c870
+SHA1 (patch-lib_libbamf_bamf-matcher.c) = cbf0e008f913584233b8905913819e194eab6f18
+SHA1 (patch-lib_libbamf_bamf-tab.c) = 454df651282ab01fae42f52abd35116eff19d6c0
+SHA1 (patch-lib_libbamf_bamf-view.c) = cc99fc72d69dc6978cabe73d64f079083604e5eb
+SHA1 (patch-lib_libbamf_bamf-window.c) = 6fbcf6b7b696f60e4365710c2dadb5905213f049
+SHA1 (patch-src_bamf-application.c) = cdd002775e3c3fb6259870dd861b8d410f33ca87
+SHA1 (patch-src_bamf-control.c) = 616d55862bb5ff9603c2df0643a5d7dc1a809f45
+SHA1 (patch-src_bamf-daemon.c) = 89248e06468582ebd7e95c222b5296980030026b
+SHA1 (patch-src_bamf-legacy-screen.c) = 373726c4e4475fbf0cfa5573cd7d6a9f833edec1
+SHA1 (patch-src_bamf-legacy-window.c) = af7c067a3b53c69d7c70798a303f0b393b29e124
+SHA1 (patch-src_bamf-matcher.c) = c7b82d4e303bce0e6daf73efa6abaa7e0de21d86
+SHA1 (patch-src_bamf-tab.c) = 395cfd3aef6115af2de61437f7cdff3b4813e208
+SHA1 (patch-src_bamf-view.c) = 66d471372a00a246600fb1202dd6181b46caf899
+SHA1 (patch-src_bamf-window.c) = acfae6d721f6871a5d284dfe0e1b42ed91c15f7d
diff --git a/bamf/patches/patch-configure.ac b/bamf/patches/patch-configure.ac
new file mode 100644
index 0000000000..4d38ea7adc
--- /dev/null
+++ b/bamf/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.ac.orig 2020-08-21 13:24:25.319985039 +0000
++++ configure.ac
+@@ -44,7 +44,7 @@ PKG_PROG_PKG_CONFIG
+ #
+ # glib
+ #
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+
+ #
+ # gdbus-codegen
diff --git a/bamf/patches/patch-lib_libbamf_bamf-application.c b/bamf/patches/patch-lib_libbamf_bamf-application.c
new file mode 100644
index 0000000000..e2e423d1c6
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-application.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-application.c.orig 2020-08-21 13:27:42.363343437 +0000
++++ lib/libbamf/bamf-application.c
+@@ -45,10 +45,6 @@
+ #include <gio/gdesktopappinfo.h>
+ #include <string.h>
+
+-G_DEFINE_TYPE (BamfApplication, bamf_application, BAMF_TYPE_VIEW);
+-
+-#define BAMF_APPLICATION_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_APPLICATION, BamfApplicationPrivate))
+
+ enum
+ {
+@@ -71,6 +67,7 @@ struct _BamfApplicationPrivate
+ int show_stubs;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfApplication, bamf_application, BAMF_TYPE_VIEW);
+ /**
+ * bamf_application_get_supported_mime_types:
+ * @application: a #BamfApplication
+@@ -711,7 +708,6 @@ bamf_application_class_init (BamfApplica
+ view_class->set_sticky = bamf_application_set_sticky;
+ view_class->click_behavior = bamf_application_get_click_suggestion;
+
+- g_type_class_add_private (obj_class, sizeof (BamfApplicationPrivate));
+
+ application_signals [DESKTOP_FILE_UPDATED] =
+ g_signal_new (BAMF_APPLICATION_SIGNAL_DESKTOP_FILE_UPDATED,
+@@ -743,7 +739,7 @@ bamf_application_init (BamfApplication *
+ {
+ BamfApplicationPrivate *priv;
+
+- priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
++ priv = self->priv = bamf_application_get_instance_private (self);
+ priv->show_stubs = -1;
+
+ g_signal_connect (self, "child-added", G_CALLBACK (bamf_application_on_child_added), NULL);
diff --git a/bamf/patches/patch-lib_libbamf_bamf-control.c b/bamf/patches/patch-lib_libbamf_bamf-control.c
new file mode 100644
index 0000000000..839329e564
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-control.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-control.c.orig 2020-08-21 13:31:43.215667750 +0000
++++ lib/libbamf/bamf-control.c
+@@ -39,16 +39,13 @@
+ #include "bamf-control.h"
+ #include "bamf-view-private.h"
+
+-G_DEFINE_TYPE (BamfControl, bamf_control, G_TYPE_OBJECT);
+-
+-#define BAMF_CONTROL_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_CONTROL, BamfControlPrivate))
+-
+ struct _BamfControlPrivate
+ {
+ BamfDBusControl *proxy;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfControl, bamf_control, G_TYPE_OBJECT);
++
+ /* Globals */
+ static BamfControl * default_control = NULL;
+
+@@ -87,7 +84,6 @@ bamf_control_class_init (BamfControlClas
+ obj_class->dispose = bamf_control_dispose;
+ obj_class->finalize = bamf_control_finalize;
+
+- g_type_class_add_private (obj_class, sizeof (BamfControlPrivate));
+ obj_class->dispose = bamf_control_dispose;
+ }
+
+@@ -97,7 +93,7 @@ bamf_control_init (BamfControl *self)
+ BamfControlPrivate *priv;
+ GError *error = NULL;
+
+- priv = self->priv = BAMF_CONTROL_GET_PRIVATE (self);
++ priv = self->priv = bamf_control_get_instance_private (self);
+
+ priv->proxy = _bamf_dbus_control_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_NONE,
diff --git a/bamf/patches/patch-lib_libbamf_bamf-factory.c b/bamf/patches/patch-lib_libbamf_bamf-factory.c
new file mode 100644
index 0000000000..e9f34cd161
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-factory.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-factory.c.orig 2020-08-21 13:35:11.363543004 +0000
++++ lib/libbamf/bamf-factory.c
+@@ -40,17 +40,14 @@
+ #include "bamf-application-private.h"
+ #include "bamf-view-private.h"
+
+-G_DEFINE_TYPE (BamfFactory, bamf_factory, G_TYPE_OBJECT);
+-
+-#define BAMF_FACTORY_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_FACTORY, BamfFactoryPrivate))
+-
+ struct _BamfFactoryPrivate
+ {
+ GHashTable *open_views;
+ GList *allocated_views;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfFactory, bamf_factory, G_TYPE_OBJECT);
++
+ static BamfFactory *static_factory = NULL;
+
+ static void on_view_weak_unref (BamfFactory *self, BamfView *view_was_here);
+@@ -108,14 +105,13 @@ bamf_factory_class_init (BamfFactoryClas
+ obj_class->dispose = bamf_factory_dispose;
+ obj_class->finalize = bamf_factory_finalize;
+
+- g_type_class_add_private (obj_class, sizeof (BamfFactoryPrivate));
+ }
+
+
+ static void
+ bamf_factory_init (BamfFactory *self)
+ {
+- self->priv = BAMF_FACTORY_GET_PRIVATE (self);
++ self->priv = bamf_factory_get_instance_private (self);
+ self->priv->open_views = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+ }
diff --git a/bamf/patches/patch-lib_libbamf_bamf-matcher.c b/bamf/patches/patch-lib_libbamf_bamf-matcher.c
new file mode 100644
index 0000000000..05efb36e9c
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-matcher.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-matcher.c.orig 2020-08-21 13:42:08.090363505 +0000
++++ lib/libbamf/bamf-matcher.c
+@@ -42,11 +42,6 @@
+ #include "bamf-view-private.h"
+ #include "bamf-factory.h"
+
+-G_DEFINE_TYPE (BamfMatcher, bamf_matcher, G_TYPE_OBJECT);
+-
+-#define BAMF_MATCHER_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_MATCHER, BamfMatcherPrivate))
+-
+ enum
+ {
+ VIEW_OPENED,
+@@ -68,6 +63,8 @@ struct _BamfMatcherPrivate
+ BamfApplication *active_application;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfMatcher, bamf_matcher, G_TYPE_OBJECT);
++
+ static BamfMatcher * default_matcher = NULL;
+
+ static void bamf_matcher_dispose (GObject *object);
+@@ -87,7 +84,6 @@ bamf_matcher_class_init (BamfMatcherClas
+ {
+ GObjectClass *obj_class = G_OBJECT_CLASS (klass);
+
+- g_type_class_add_private (obj_class, sizeof (BamfMatcherPrivate));
+ obj_class->dispose = bamf_matcher_dispose;
+ obj_class->finalize = bamf_matcher_finalize;
+
+@@ -279,7 +275,7 @@ bamf_matcher_init (BamfMatcher *self)
+ BamfMatcherPrivate *priv;
+ GError *error = NULL;
+
+- priv = self->priv = BAMF_MATCHER_GET_PRIVATE (self);
++ priv = self->priv = bamf_matcher_get_instance_private (self);
+ priv->cancellable = g_cancellable_new ();
+ priv->proxy = _bamf_dbus_matcher_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_NONE,
diff --git a/bamf/patches/patch-lib_libbamf_bamf-tab.c b/bamf/patches/patch-lib_libbamf_bamf-tab.c
new file mode 100644
index 0000000000..2c270509d6
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-tab.c
@@ -0,0 +1,37 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-tab.c.orig 2020-08-21 13:51:19.813165873 +0000
++++ lib/libbamf/bamf-tab.c
+@@ -29,8 +29,6 @@
+ #include "bamf-tab.h"
+ #include "bamf-view-private.h"
+
+-#define BAMF_TAB_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE (object, BAMF_TYPE_TAB, BamfTabPrivate))
+-
+ enum
+ {
+ PROP_0,
+@@ -47,7 +45,7 @@ struct _BamfTabPrivate
+
+ static void bamf_tab_unset_proxy (BamfTab *self);
+
+-G_DEFINE_TYPE (BamfTab, bamf_tab, BAMF_TYPE_VIEW);
++G_DEFINE_TYPE_WITH_PRIVATE (BamfTab, bamf_tab, BAMF_TYPE_VIEW);
+
+ static void
+ on_proxy_property_change (GObject *gobject, GParamSpec *pspec, gpointer user_data)
+@@ -170,13 +168,12 @@ bamf_tab_class_init (BamfTabClass *klass
+ FALSE, G_PARAM_READABLE);
+ g_object_class_install_property (obj_class, PROP_IS_FOREGROUND_TAB, pspec);
+
+- g_type_class_add_private (obj_class, sizeof(BamfTabPrivate));
+ }
+
+ static void
+ bamf_tab_init (BamfTab *self)
+ {
+- self->priv = BAMF_TAB_GET_PRIVATE (self);
++ self->priv = bamf_tab_get_instance_private (self);
+ }
+
+ BamfTab *
diff --git a/bamf/patches/patch-lib_libbamf_bamf-view.c b/bamf/patches/patch-lib_libbamf_bamf-view.c
new file mode 100644
index 0000000000..c0ad988769
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-view.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-view.c.orig 2020-08-21 13:54:16.025518785 +0000
++++ lib/libbamf/bamf-view.c
+@@ -43,11 +43,6 @@
+ #include "bamf-tab.h"
+ #include "bamf-window.h"
+
+-G_DEFINE_TYPE (BamfView, bamf_view, G_TYPE_INITIALLY_UNOWNED);
+-
+-#define BAMF_VIEW_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_VIEW, BamfViewPrivate))
+-
+ enum
+ {
+ ACTIVE_CHANGED,
+@@ -93,6 +88,8 @@ struct _BamfViewPrivate
+ gboolean sticky;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfView, bamf_view, G_TYPE_INITIALLY_UNOWNED);
++
+ static void bamf_view_unset_proxy (BamfView *self);
+
+ /**
+@@ -943,7 +940,6 @@ bamf_view_class_init (BamfViewClass *kla
+ properties[PROP_USER_VISIBLE] = g_param_spec_boolean ("user-visible", "user-visible", "user-visible", FALSE, G_PARAM_READABLE);
+ g_object_class_install_property (obj_class, PROP_USER_VISIBLE, properties[PROP_USER_VISIBLE]);
+
+- g_type_class_add_private (obj_class, sizeof (BamfViewPrivate));
+
+ view_signals [ACTIVE_CHANGED] =
+ g_signal_new (BAMF_VIEW_SIGNAL_ACTIVE_CHANGED,
+@@ -1050,7 +1046,7 @@ bamf_view_init (BamfView *self)
+ {
+ BamfViewPrivate *priv;
+
+- priv = self->priv = BAMF_VIEW_GET_PRIVATE (self);
++ priv = self->priv = bamf_view_get_instance_private (self);
+ priv->cancellable = g_cancellable_new ();
+ priv->is_closed = TRUE;
+ priv->reload_children = TRUE;
diff --git a/bamf/patches/patch-lib_libbamf_bamf-window.c b/bamf/patches/patch-lib_libbamf_bamf-window.c
new file mode 100644
index 0000000000..6457fc5cf4
--- /dev/null
+++ b/bamf/patches/patch-lib_libbamf_bamf-window.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- lib/libbamf/bamf-window.c.orig 2020-08-21 13:57:00.460655597 +0000
++++ lib/libbamf/bamf-window.c
+@@ -40,11 +40,6 @@
+ #include "bamf-window.h"
+ #include "bamf-factory.h"
+
+-G_DEFINE_TYPE (BamfWindow, bamf_window, BAMF_TYPE_VIEW);
+-
+-#define BAMF_WINDOW_GET_PRIVATE(o) \
+- (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_WINDOW, BamfWindowPrivate))
+-
+ struct _BamfWindowPrivate
+ {
+ BamfDBusItemWindow *proxy;
+@@ -56,6 +51,8 @@ struct _BamfWindowPrivate
+ BamfWindowMaximizationType maximized;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfWindow, bamf_window, BAMF_TYPE_VIEW);
++
+ enum
+ {
+ MONITOR_CHANGED,
+@@ -412,7 +409,6 @@ bamf_window_class_init (BamfWindowClass
+ GObjectClass *obj_class = G_OBJECT_CLASS (klass);
+ BamfViewClass *view_class = BAMF_VIEW_CLASS (klass);
+
+- g_type_class_add_private (obj_class, sizeof (BamfWindowPrivate));
+
+ obj_class->dispose = bamf_window_dispose;
+ view_class->active_changed = bamf_window_active_changed;
+@@ -442,7 +438,7 @@ bamf_window_init (BamfWindow *self)
+ {
+ BamfWindowPrivate *priv;
+
+- priv = self->priv = BAMF_WINDOW_GET_PRIVATE (self);
++ priv = self->priv = bamf_window_get_instance_private (self);
+ priv->xid = 0;
+ priv->pid = 0;
+ priv->type = BAMF_WINDOW_UNKNOWN;
diff --git a/bamf/patches/patch-src_bamf-application.c b/bamf/patches/patch-src_bamf-application.c
new file mode 100644
index 0000000000..90951c56c5
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-application.c
@@ -0,0 +1,49 @@
+$NetBSD$
+
+--- src/bamf-application.c.orig 2020-08-21 14:00:31.952964663 +0000
++++ src/bamf-application.c
+@@ -27,13 +27,9 @@
+ #include <string.h>
+ #include <gio/gdesktopappinfo.h>
+
+-#define BAMF_APPLICATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_APPLICATION, BamfApplicationPrivate))
+
+ static void bamf_application_dbus_application_iface_init (BamfDBusItemApplicationIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfApplication, bamf_application, BAMF_TYPE_VIEW,
+- G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_APPLICATION,
+- bamf_application_dbus_application_iface_init));
++
+
+ struct _BamfApplicationPrivate
+ {
+@@ -48,6 +44,11 @@ struct _BamfApplicationPrivate
+ gboolean show_stubs;
+ };
+
++G_DEFINE_TYPE_WITH_CODE (BamfApplication, bamf_application, BAMF_TYPE_VIEW,
++ G_ADD_PRIVATE(BamfApplication)
++ G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_APPLICATION,
++ bamf_application_dbus_application_iface_init));
++
+ enum
+ {
+ SUPPORTED_MIMES_CHANGED,
+@@ -1377,7 +1378,7 @@ static void
+ bamf_application_init (BamfApplication * self)
+ {
+ BamfApplicationPrivate *priv;
+- priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
++ priv = self->priv = bamf_application_get_instance_private (self);
+
+ priv->app_type = BAMF_APPLICATION_SYSTEM;
+ priv->show_stubs = TRUE;
+@@ -1447,7 +1448,7 @@ bamf_application_class_init (BamfApplica
+ klass->get_close_when_empty = bamf_application_default_get_close_when_empty;
+ klass->supported_mimes_changed = bamf_application_supported_mime_types_changed;
+
+- g_type_class_add_private (klass, sizeof (BamfApplicationPrivate));
++
+
+ application_signals[SUPPORTED_MIMES_CHANGED] =
+ g_signal_new ("supported-mimes-changed",
diff --git a/bamf/patches/patch-src_bamf-control.c b/bamf/patches/patch-src_bamf-control.c
new file mode 100644
index 0000000000..3a19a8ae26
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-control.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- src/bamf-control.c.orig 2020-08-21 17:04:33.301925635 +0000
++++ src/bamf-control.c
+@@ -26,9 +26,6 @@
+ #include "bamf-daemon.h"
+ #include "bamf-matcher.h"
+
+-G_DEFINE_TYPE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
+-#define BAMF_CONTROL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_CONTROL, BamfControlPrivate))
+
+ struct _BamfControlPrivate
+ {
+@@ -37,6 +34,8 @@ struct _BamfControlPrivate
+ GList *sources;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
++
+ static void
+ bamf_control_on_launched_callback (GDBusConnection *connection,
+ const gchar *sender_name,
+@@ -147,7 +146,7 @@ on_dbus_handle_create_local_desktop_file
+ static void
+ bamf_control_init (BamfControl * self)
+ {
+- self->priv = BAMF_CONTROL_GET_PRIVATE (self);
++ self->priv = bamf_control_get_instance_private (self);
+ self->priv->sources = NULL;
+
+ /* Registering signal callbacks to reply to dbus method calls */
+@@ -194,7 +193,6 @@ bamf_control_class_init (BamfControlClas
+ obj_class->constructed = bamf_control_constructed;
+ obj_class->finalize = bamf_control_finalize;
+
+- g_type_class_add_private (klass, sizeof (BamfControlPrivate));
+ }
+
+ void
diff --git a/bamf/patches/patch-src_bamf-daemon.c b/bamf/patches/patch-src_bamf-daemon.c
new file mode 100644
index 0000000000..06898117e3
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-daemon.c
@@ -0,0 +1,41 @@
+$NetBSD$
+
+--- src/bamf-daemon.c.orig 2020-08-21 17:07:26.617706808 +0000
++++ src/bamf-daemon.c
+@@ -21,10 +21,6 @@
+ #include "bamf-matcher.h"
+ #include "bamf-control.h"
+
+-G_DEFINE_TYPE (BamfDaemon, bamf_daemon, G_TYPE_OBJECT);
+-#define BAMF_DAEMON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+- BAMF_TYPE_DAEMON, BamfDaemonPrivate))
+-
+ static BamfDaemon *instance = NULL;
+
+ struct _BamfDaemonPrivate
+@@ -34,6 +30,8 @@ struct _BamfDaemonPrivate
+ GMainLoop *loop;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfDaemon, bamf_daemon, G_TYPE_OBJECT);
++
+ gboolean
+ bamf_daemon_is_running (BamfDaemon *self)
+ {
+@@ -165,7 +163,7 @@ static void
+ bamf_daemon_init (BamfDaemon *self)
+ {
+ BamfDaemonPrivate *priv;
+- priv = self->priv = BAMF_DAEMON_GET_PRIVATE (self);
++ priv = self->priv = bamf_daemon_get_instance_private (self);
+
+ priv->loop = g_main_loop_new (NULL, FALSE);
+ }
+@@ -178,7 +176,6 @@ bamf_daemon_class_init (BamfDaemonClass
+ object_class->dispose = bamf_daemon_dispose;
+ object_class->finalize = bamf_daemon_finalize;
+
+- g_type_class_add_private (klass, sizeof (BamfDaemonPrivate));
+ }
+
+ BamfDaemon *
diff --git a/bamf/patches/patch-src_bamf-legacy-screen.c b/bamf/patches/patch-src_bamf-legacy-screen.c
new file mode 100644
index 0000000000..606fd5c44b
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-legacy-screen.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/bamf-legacy-screen.c.orig 2020-08-21 17:09:53.372707266 +0000
++++ src/bamf-legacy-screen.c
+@@ -26,10 +26,6 @@
+ #include <libsn/sn.h>
+ #undef SN_API_NOT_YET_FROZEN
+
+-G_DEFINE_TYPE (BamfLegacyScreen, bamf_legacy_screen, G_TYPE_OBJECT);
+-#define BAMF_LEGACY_SCREEN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_LEGACY_SCREEN, BamfLegacyScreenPrivate))
+-
+ static BamfLegacyScreen *static_screen = NULL;
+
+ enum
+@@ -61,6 +57,8 @@ struct _BamfLegacyScreenPrivate
+ GDataInputStream *stream;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfLegacyScreen, bamf_legacy_screen, G_TYPE_OBJECT);
++
+ static void
+ handle_window_closed (BamfLegacyWindow *window, BamfLegacyScreen *self)
+ {
+@@ -459,7 +457,7 @@ bamf_legacy_screen_finalize (GObject *ob
+ static void
+ bamf_legacy_screen_init (BamfLegacyScreen * self)
+ {
+- self->priv = BAMF_LEGACY_SCREEN_GET_PRIVATE (self);
++ self->priv = bamf_legacy_screen_get_instance_private (self);
+ }
+
+ static void
+@@ -469,8 +467,6 @@ bamf_legacy_screen_class_init (BamfLegac
+
+ object_class->finalize = bamf_legacy_screen_finalize;
+
+- g_type_class_add_private (klass, sizeof (BamfLegacyScreenPrivate));
+-
+ legacy_screen_signals [WINDOW_OPENING] =
+ g_signal_new (BAMF_LEGACY_SCREEN_SIGNAL_WINDOW_OPENING,
+ G_OBJECT_CLASS_TYPE (klass),
diff --git a/bamf/patches/patch-src_bamf-legacy-window.c b/bamf/patches/patch-src_bamf-legacy-window.c
new file mode 100644
index 0000000000..bf33ecd531
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-legacy-window.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/bamf-legacy-window.c.orig 2020-08-21 17:14:27.361957778 +0000
++++ src/bamf-legacy-window.c
+@@ -29,10 +29,6 @@
+ #include <glibtop/procuid.h>
+ #include <stdio.h>
+
+-G_DEFINE_TYPE (BamfLegacyWindow, bamf_legacy_window, G_TYPE_OBJECT);
+-#define BAMF_LEGACY_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_LEGACY_WINDOW, BamfLegacyWindowPrivate))
+-
+ #define WNCK_WINDOW_BAMF_DATA "bamf-legacy-window"
+
+ enum
+@@ -59,6 +55,8 @@ struct _BamfLegacyWindowPrivate
+ gboolean is_closed;
+ };
+
++G_DEFINE_TYPE_WITH_PRIVATE (BamfLegacyWindow, bamf_legacy_window, G_TYPE_OBJECT);
++
+ gboolean
+ bamf_legacy_window_is_active (BamfLegacyWindow *self)
+ {
+@@ -704,7 +702,7 @@ bamf_legacy_window_dispose (GObject *obj
+ static void
+ bamf_legacy_window_init (BamfLegacyWindow * self)
+ {
+- self->priv = BAMF_LEGACY_WINDOW_GET_PRIVATE (self);
++ self->priv = bamf_legacy_window_get_instance_private (self);
+
+ g_signal_connect (wnck_screen_get_default (), "window-closed",
+ (GCallback) handle_window_closed, self);
+@@ -717,8 +715,6 @@ bamf_legacy_window_class_init (BamfLegac
+
+ object_class->dispose = bamf_legacy_window_dispose;
+
+- g_type_class_add_private (klass, sizeof (BamfLegacyWindowPrivate));
+-
+ legacy_window_signals [NAME_CHANGED] =
+ g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_NAME_CHANGED,
+ G_OBJECT_CLASS_TYPE (klass),
diff --git a/bamf/patches/patch-src_bamf-matcher.c b/bamf/patches/patch-src_bamf-matcher.c
new file mode 100644
index 0000000000..b37da393e6
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-matcher.c
@@ -0,0 +1,32 @@
+$NetBSD$
+
+--- src/bamf-matcher.c.orig 2020-08-21 17:17:52.997412942 +0000
++++ src/bamf-matcher.c
+@@ -33,9 +33,7 @@
+ #define EXEC_DESKTOP_FILE_OVERRIDE "--desktop_file_hint"
+ #define ENV_DESKTOP_FILE_OVERRIDE "BAMF_DESKTOP_FILE_HINT"
+
+-G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
+-#define BAMF_MATCHER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+- BAMF_TYPE_MATCHER, BamfMatcherPrivate))
++G_DEFINE_TYPE_WITH_PRIVATE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
+
+ enum
+ {
+@@ -3111,7 +3109,7 @@ bamf_matcher_init (BamfMatcher * self)
+ BamfLegacyScreen *screen;
+ int i;
+
+- priv = self->priv = BAMF_MATCHER_GET_PRIVATE (self);
++ priv = self->priv = bamf_matcher_get_instance_private (self);
+
+ priv->bad_prefixes = g_array_sized_new (FALSE, TRUE, sizeof (GRegex *),
+ G_N_ELEMENTS (EXEC_BAD_PREFIXES));
+@@ -3274,7 +3272,6 @@ bamf_matcher_class_init (BamfMatcherClas
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+- g_type_class_add_private (klass, sizeof (BamfMatcherPrivate));
+ object_class->dispose = bamf_matcher_dispose;
+ object_class->finalize = bamf_matcher_finalize;
+
diff --git a/bamf/patches/patch-src_bamf-tab.c b/bamf/patches/patch-src_bamf-tab.c
new file mode 100644
index 0000000000..ef98b65aff
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-tab.c
@@ -0,0 +1,47 @@
+$NetBSD$
+
+--- src/bamf-tab.c.orig 2020-08-21 17:22:28.970915645 +0000
++++ src/bamf-tab.c
+@@ -26,13 +26,7 @@
+
+ #include "bamf-tab.h"
+
+-#define BAMF_TAB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_TAB, BamfTabPrivate))
+-
+ static void bamf_tab_dbus_iface_init (BamfDBusItemTabIface *iface);
+-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (BamfTab, bamf_tab, BAMF_TYPE_VIEW,
+- G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_TAB,
+- bamf_tab_dbus_iface_init));
+
+ enum
+ {
+@@ -48,6 +42,11 @@ struct _BamfTabPrivate
+ BamfDBusItemTab *dbus_iface;
+ };
+
++G_DEFINE_ABSTRACT_TYPE_WITH_CODE (BamfTab, bamf_tab, BAMF_TYPE_VIEW,
++ G_ADD_PRIVATE(BamfTab)
++ G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_TAB,
++ bamf_tab_dbus_iface_init));
++
+ static const gchar *
+ bamf_tab_get_view_type (BamfView *view)
+ {
+@@ -170,7 +169,7 @@ on_dbus_handle_request_preview (BamfDBus
+ static void
+ bamf_tab_init (BamfTab *self)
+ {
+- self->priv = BAMF_TAB_GET_PRIVATE (self);
++ self->priv = bamf_tab_get_instance_private (self);
+
+ self->priv->dbus_iface = _bamf_dbus_item_tab_skeleton_new ();
+
+@@ -208,7 +207,6 @@ bamf_tab_class_init (BamfTabClass * klas
+ g_object_class_override_property (object_class, PROP_XID, "xid");
+ g_object_class_override_property (object_class, PROP_IS_FOREGROUND_TAB, "is-foreground-tab");
+
+- g_type_class_add_private (klass, sizeof (BamfTabPrivate));
+ }
+
+
diff --git a/bamf/patches/patch-src_bamf-view.c b/bamf/patches/patch-src_bamf-view.c
new file mode 100644
index 0000000000..a14b3cd72e
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-view.c
@@ -0,0 +1,47 @@
+$NetBSD$
+
+--- src/bamf-view.c.orig 2020-08-21 17:26:22.927143856 +0000
++++ src/bamf-view.c
+@@ -20,13 +20,8 @@
+
+ #include "bamf-view.h"
+
+-#define BAMF_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+- BAMF_TYPE_VIEW, BamfViewPrivate))
+
+ static void bamf_view_dbus_view_iface_init (BamfDBusItemViewIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfView, bamf_view, BAMF_DBUS_ITEM_TYPE_OBJECT_SKELETON,
+- G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_VIEW,
+- bamf_view_dbus_view_iface_init));
+
+ #define STARTING_MAX_WAIT 15
+
+@@ -84,6 +79,11 @@ struct _BamfViewPrivate
+ guint active_changed_idle;
+ };
+
++G_DEFINE_TYPE_WITH_CODE (BamfView, bamf_view, BAMF_DBUS_ITEM_TYPE_OBJECT_SKELETON,
++ G_ADD_PRIVATE(BamfView)
++ G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_VIEW,
++ bamf_view_dbus_view_iface_init));
++
+ static gboolean
+ on_active_changed_idle (gpointer data)
+ {
+@@ -964,7 +964,7 @@ bamf_view_set_property (GObject *object,
+ static void
+ bamf_view_init (BamfView * self)
+ {
+- self->priv = BAMF_VIEW_GET_PRIVATE (self);
++ self->priv = bamf_view_get_instance_private (self);
+
+ /* Initializing the dbus interface */
+ self->priv->dbus_iface = _bamf_dbus_item_view_skeleton_new ();
+@@ -1031,7 +1031,6 @@ bamf_view_class_init (BamfViewClass * kl
+ object_class->get_property = bamf_view_get_property;
+ object_class->set_property = bamf_view_set_property;
+
+- g_type_class_add_private (klass, sizeof (BamfViewPrivate));
+
+ /* Overriding the properties defined in the interface, this is needed
+ * but we actually don't use these properties, as we act like a proxy */
diff --git a/bamf/patches/patch-src_bamf-window.c b/bamf/patches/patch-src_bamf-window.c
new file mode 100644
index 0000000000..ce362613a8
--- /dev/null
+++ b/bamf/patches/patch-src_bamf-window.c
@@ -0,0 +1,47 @@
+$NetBSD$
+
+--- src/bamf-window.c.orig 2020-08-21 17:30:11.363207557 +0000
++++ src/bamf-window.c
+@@ -33,13 +33,7 @@
+ #define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
+ #define SNAP_SECURITY_LABEL_PREFIX "snap."
+
+-#define BAMF_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_WINDOW, BamfWindowPrivate))
+-
+ static void bamf_window_dbus_iface_init (BamfDBusItemWindowIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfWindow, bamf_window, BAMF_TYPE_VIEW,
+- G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_WINDOW,
+- bamf_window_dbus_iface_init));
+
+ static GList *bamf_windows = NULL;
+
+@@ -64,6 +58,11 @@ struct _BamfWindowPrivate
+ #endif
+ };
+
++G_DEFINE_TYPE_WITH_CODE (BamfWindow, bamf_window, BAMF_TYPE_VIEW,
++ G_ADD_PRIVATE(BamfWindow)
++ G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_WINDOW,
++ bamf_window_dbus_iface_init));
++
+ BamfLegacyWindow *
+ bamf_window_get_window (BamfWindow *self)
+ {
+@@ -658,7 +657,7 @@ bamf_window_finalize (GObject *object)
+ static void
+ bamf_window_init (BamfWindow * self)
+ {
+- self->priv = BAMF_WINDOW_GET_PRIVATE (self);
++ self->priv = bamf_window_get_instance_private (self);
+
+ /* Initializing the dbus interface */
+ self->priv->dbus_iface = _bamf_dbus_item_window_skeleton_new ();
+@@ -726,7 +725,6 @@ bamf_window_class_init (BamfWindowClass
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+ g_object_class_install_property (object_class, PROP_WINDOW, pspec);
+
+- g_type_class_add_private (klass, sizeof (BamfWindowPrivate));
+ }
+
+ BamfWindow *
Home |
Main Index |
Thread Index |
Old Index