wip/plank: Backported fixes from plank 0.11.89 to make it build again. Porting of plank 0.11.89 currently blocked by the lack of gnome-menus-3

[Matthias Petermann <mp%petermann-it.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Sat May 15 15:47:00 2021 +0200
Changeset:	ee481b6df38d95a22d0e5a3dd62d67fb1d7d2e52

Modified Files:
	plank/Makefile
	plank/distinfo
Added Files:
	plank/patches/patch-lib_Drawing_Renderer.vala
	plank/patches/patch-lib_Drawing_Theme.vala
	plank/patches/patch-lib_Items_DockContainer.vala
	plank/patches/patch-lib_Items_DockItem.vala
	plank/patches/patch-lib_Services_Preferences.vala
	plank/patches/patch-lib_Services_Settings.vala

Log Message:
wip/plank: Backported fixes from plank 0.11.89 to make it build again. Porting of plank 0.11.89 currently blocked by the lack of gnome-menus-3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee481b6df38d95a22d0e5a3dd62d67fb1d7d2e52

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 plank/Makefile                                    |  1 +
 plank/distinfo                                    |  6 ++++
 plank/patches/patch-lib_Drawing_Renderer.vala     | 18 ++++++++++++
 plank/patches/patch-lib_Drawing_Theme.vala        | 24 +++++++++++++++
 plank/patches/patch-lib_Items_DockContainer.vala  | 18 ++++++++++++
 plank/patches/patch-lib_Items_DockItem.vala       | 18 ++++++++++++
 plank/patches/patch-lib_Services_Preferences.vala | 36 +++++++++++++++++++++++
 plank/patches/patch-lib_Services_Settings.vala    | 27 +++++++++++++++++
 8 files changed, 148 insertions(+)

diffs:
diff --git a/plank/Makefile b/plank/Makefile
index 51bc98caa5..10e1f95036 100644
--- a/plank/Makefile
+++ b/plank/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	plank-0.11.4
+PKGREVISION=	1
 CATEGORIES=	wm gnome
 MASTER_SITES=	http://launchpad.net/plank/1.0/${PKGVERSION_NOREV}/+download/
 EXTRACT_SUFX=	.tar.xz
diff --git a/plank/distinfo b/plank/distinfo
index f9a0a88c3e..f25c8beb9c 100644
--- a/plank/distinfo
+++ b/plank/distinfo
@@ -7,4 +7,10 @@ Size (plank-0.11.4.tar.xz) = 1022640 bytes
 SHA1 (patch-configure) = 469978f44015b81880bb0249034684a196774ec8
 SHA1 (patch-docs_Makefile.am) = 3ecb420aaf6ff6d346792be4e201e47b6947ebc8
 SHA1 (patch-docs_Makefile.in) = 0d189a3d619bc441ce2ad3e8ba8e354c6999d691
+SHA1 (patch-lib_Drawing_Renderer.vala) = 6d28b3c86629b76547b037b0f5f5982f67dabbf0
+SHA1 (patch-lib_Drawing_Theme.vala) = 30a4c4d39cd9635860aca96e822a3496a56ad41e
+SHA1 (patch-lib_Items_DockContainer.vala) = 9d9091fef496da763e4d0e8d0f28acbe812e4fd3
+SHA1 (patch-lib_Items_DockItem.vala) = d70f355590bd3ffb0fd42a48c980b373dbfc5fa3
 SHA1 (patch-lib_Makefile.in) = d5d929ad332d5fec859eb169f3e65b8c80a5bd31
+SHA1 (patch-lib_Services_Preferences.vala) = 07c593ab6a00624037049ca956dbbcb09b745e04
+SHA1 (patch-lib_Services_Settings.vala) = 663553fda854be9c31051fbc8303b7e7ed7d6a68
diff --git a/plank/patches/patch-lib_Drawing_Renderer.vala b/plank/patches/patch-lib_Drawing_Renderer.vala
new file mode 100644
index 0000000000..f92c8fdf89
--- /dev/null
+++ b/plank/patches/patch-lib_Drawing_Renderer.vala
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Drawing/Renderer.vala.orig  2021-05-15 13:21:33.222562026 +0000
++++ lib/Drawing/Renderer.vala
+@@ -38,7 +38,7 @@ namespace Plank
+        /**
+         * Creates a new animation renderer.
+         */
+-       public Renderer (Gtk.Widget widget)
++       protected Renderer (Gtk.Widget widget)
+        {
+            Object (widget : widget);
+        }
diff --git a/plank/patches/patch-lib_Drawing_Theme.vala b/plank/patches/patch-lib_Drawing_Theme.vala
new file mode 100644
index 0000000000..e36b9b875e
--- /dev/null
+++ b/plank/patches/patch-lib_Drawing_Theme.vala
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Drawing/Theme.vala.orig 2021-05-15 13:22:18.493326252 +0000
++++ lib/Drawing/Theme.vala
+@@ -82,12 +82,12 @@ namespace Plank
+        File? theme_folder;
+        Gtk.StyleContext style_context;
+
+-       public Theme ()
++       protected Theme ()
+        {
+            theme_folder = get_theme_folder (DEFAULT_NAME);
+        }
+
+-       public Theme.with_name (string name)
++       protected Theme.with_name (string name)
+        {
+            theme_folder = get_theme_folder (name);
+        }
diff --git a/plank/patches/patch-lib_Items_DockContainer.vala b/plank/patches/patch-lib_Items_DockContainer.vala
new file mode 100644
index 0000000000..80b573524f
--- /dev/null
+++ b/plank/patches/patch-lib_Items_DockContainer.vala
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Items/DockContainer.vala.orig   2021-05-15 13:23:05.690755513 +0000
++++ lib/Items/DockContainer.vala
+@@ -76,7 +76,7 @@ namespace Plank
+        /**
+         * Creates a new container for dock elements.
+         */
+-       public DockContainer ()
++       protected DockContainer ()
+        {
+            Object ();
+        }
diff --git a/plank/patches/patch-lib_Items_DockItem.vala b/plank/patches/patch-lib_Items_DockItem.vala
new file mode 100644
index 0000000000..672fd77a36
--- /dev/null
+++ b/plank/patches/patch-lib_Items_DockItem.vala
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Items/DockItem.vala.orig    2021-05-15 13:23:45.995070431 +0000
++++ lib/Items/DockItem.vala
+@@ -133,7 +133,7 @@ namespace Plank
+        /**
+         * Creates a new dock item.
+         */
+-       public DockItem ()
++       protected DockItem ()
+        {
+            GLib.Object (Prefs: new DockItemPreferences ());
+        }
diff --git a/plank/patches/patch-lib_Services_Preferences.vala b/plank/patches/patch-lib_Services_Preferences.vala
new file mode 100644
index 0000000000..d5833e5c89
--- /dev/null
+++ b/plank/patches/patch-lib_Services_Preferences.vala
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Services/Preferences.vala.orig  2021-05-15 13:24:49.046738188 +0000
++++ lib/Services/Preferences.vala
+@@ -65,7 +65,7 @@ namespace Plank
+        /**
+         * Creates a new preferences object with no backing file.
+         */
+-       public Preferences ()
++       protected Preferences ()
+        {
+        }
+
+@@ -151,7 +151,7 @@ namespace Plank
+         *
+         * @param file the {@link GLib.File} of the backing file for this preferences
+         */
+-       public Preferences.with_file (GLib.File file)
++       protected Preferences.with_file (GLib.File file)
+        {
+            init_from_file (file);
+        }
+@@ -161,7 +161,7 @@ namespace Plank
+         *
+         * @param filename of the backing file for this preferences
+         */
+-       public Preferences.with_filename (string filename)
++       protected Preferences.with_filename (string filename)
+        {
+            init_from_file (Paths.AppConfigFolder.get_child (filename));
+        }
diff --git a/plank/patches/patch-lib_Services_Settings.vala b/plank/patches/patch-lib_Services_Settings.vala
new file mode 100644
index 0000000000..646e7f0ae2
--- /dev/null
+++ b/plank/patches/patch-lib_Services_Settings.vala
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Backport of plank 0.11.89 fix "Constructors of abstract classes
+should not be public" (fb624c21c19c7114eef5a1932a43b099ef0555da)
+Without this fix, plank is not building anymore with recent pkgsrc.
+Porting of plan 0.11.89 currently is blocked by the lack of gnome-menus-3
+
+--- lib/Services/Settings.vala.orig 2021-05-15 13:25:39.528936265 +0000
++++ lib/Services/Settings.vala
+@@ -33,7 +33,7 @@ namespace Plank
+        /**
+         * {@inheritDoc}
+         */
+-       public Settings (string schema)
++       protected Settings (string schema)
+        {
+            Object (settings: new GLib.Settings (schema));
+        }
+@@ -41,7 +41,7 @@ namespace Plank
+        /**
+         * {@inheritDoc}
+         */
+-       public Settings.with_path (string schema, string path)
++       protected Settings.with_path (string schema, string path)
+        {
+            Object (settings: new GLib.Settings.with_path (schema, path));
+        }